From f2fbc4707d6709bd555b0857e1098efedd070873 Mon Sep 17 00:00:00 2001 From: jayasankar Date: Tue, 11 Feb 2025 14:12:25 +0530 Subject: [PATCH 1/5] anything llm app integration --- docker/docker-compose-production.yml | 2 ++ docker/docker-compose-staging.yml | 32 +++++++++++++++++++ docker/nginx/default.conf | 16 ++++++++++ docker/nginx/prod/app.conf.template | 46 ++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+) diff --git a/docker/docker-compose-production.yml b/docker/docker-compose-production.yml index 40bca30a..be266f0f 100644 --- a/docker/docker-compose-production.yml +++ b/docker/docker-compose-production.yml @@ -465,6 +465,8 @@ services: container_name: redis-worker + + # Web Server web-server-local: image: nginx:latest diff --git a/docker/docker-compose-staging.yml b/docker/docker-compose-staging.yml index 2d6f4fd9..3764dd0b 100644 --- a/docker/docker-compose-staging.yml +++ b/docker/docker-compose-staging.yml @@ -458,6 +458,38 @@ services: container_name: redis-worker + anything-llm: + image: mintplexlabs/anythingllm:latest + ports: + - "8010:8010" + environment: + # Adjust for your environment + - STORAGE_DIR=/app/server/storage + - JWT_SECRET=${JWT_SECRET:-6710e067711c8001b6e509275dc6ef35} + - SERVER_PORT=8010 + - AUTH_TOKEN=${ANYTHING_LLM_PASSWORD:-hunter2} + - LLM_PROVIDER=generic-openai + - GENERIC_OPEN_AI_BASE_PATH=${VACHAN_AI_SERVED_MODEL_URI:-http://dov2prodconn.bridgeconn.com:8085} + - GENERIC_OPEN_AI_MODEL_PREF=mock-gpt-model + - GENERIC_OPEN_AI_MODEL_TOKEN_LIMIT=512 + - GENERIC_OPEN_AI_API_KEY=dummy-abc + - VECTOR_DB=lancedb + - WHISPER_PROVIDER=local + - TTS_PROVIDER=native + - PASSWORDMINCHAR=8 + volumes: + - ${ANYTHINGLLM_VOL:-/home/gitautodeploy/vachan_ai_data}:/app/server/storage + restart: always + profiles: + - local-run + - deployment + expose: + - 8010 + networks: + - VE-network + container_name: anything-llm + + # Web Server web-server-local: image: nginx:latest diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf index 4a4b8013..61b0fcbb 100644 --- a/docker/nginx/default.conf +++ b/docker/nginx/default.conf @@ -58,3 +58,19 @@ server { proxy_set_header X-Forwarded-Proto $scheme; } } + +server { + listen 80; + server_name anythingllm.vachanengine.org; # Replace with your desired domain + client_max_body_size 100M; + + location / { + proxy_buffering off; # Required for chunk-streaming + proxy_cache off; + proxy_pass http://anything-llm:8010/; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-Proto $scheme; + } +} diff --git a/docker/nginx/prod/app.conf.template b/docker/nginx/prod/app.conf.template index 0f7ad78f..30ccbda2 100644 --- a/docker/nginx/prod/app.conf.template +++ b/docker/nginx/prod/app.conf.template @@ -21,6 +21,25 @@ server { } } +# New HTTP server block for LLM domain +server { + listen 80; + listen [::]:80; + client_max_body_size 100M; + proxy_read_timeout 300; + proxy_connect_timeout 300; + proxy_send_timeout 300; + server_name ${VACHAN_LLM_DOMAIN}; + server_tokens off; + location /.well-known/acme-challenge/ { + root /var/www/certbot; + } + location / { + return 301 https://${VACHAN_LLM_DOMAIN}$request_uri; + } +} + + server { listen 443 default_server ssl http2; listen [::]:443 ssl http2; @@ -69,3 +88,30 @@ server { proxy_pass http://vachan-api:8000; } } + +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + + server_name ${VACHAN_LLM_DOMAIN}; + + client_max_body_size 100M; + + proxy_read_timeout 300; + proxy_connect_timeout 300; + proxy_send_timeout 300; + + ssl_certificate /etc/nginx/ssl/fullchain.pem; + ssl_certificate_key /etc/nginx/ssl/privkey.pem; + + location / { + proxy_buffering off; # Required for chunk-streaming + proxy_cache off; + proxy_pass http://anything-llm:8010/; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-Proto $scheme; + } + +} From 60f3a4a89f93299b5c396930ff0f88092d29563c Mon Sep 17 00:00:00 2001 From: jayasankar Date: Tue, 11 Feb 2025 14:19:28 +0530 Subject: [PATCH 2/5] container in production modified --- docker/docker-compose-production.yml | 31 +++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/docker/docker-compose-production.yml b/docker/docker-compose-production.yml index be266f0f..deb48289 100644 --- a/docker/docker-compose-production.yml +++ b/docker/docker-compose-production.yml @@ -465,7 +465,36 @@ services: container_name: redis-worker - + anything-llm: + image: mintplexlabs/anythingllm:latest + ports: + - "8010:8010" + environment: + # Adjust for your environment + - STORAGE_DIR=/app/server/storage + - JWT_SECRET=${JWT_SECRET:-6710e067711c8001b6e509275dc6ef35} + - SERVER_PORT=8010 + - AUTH_TOKEN=${ANYTHING_LLM_PASSWORD:-hunter2} + - LLM_PROVIDER=generic-openai + - GENERIC_OPEN_AI_BASE_PATH=${VACHAN_AI_SERVED_MODEL_URI:-http://dov2prodconn.bridgeconn.com:8085} + - GENERIC_OPEN_AI_MODEL_PREF=mock-gpt-model + - GENERIC_OPEN_AI_MODEL_TOKEN_LIMIT=512 + - GENERIC_OPEN_AI_API_KEY=dummy-abc + - VECTOR_DB=lancedb + - WHISPER_PROVIDER=local + - TTS_PROVIDER=native + - PASSWORDMINCHAR=8 + volumes: + - ${ANYTHINGLLM_VOL:-/home/gitautodeploy/vachan_ai_data}:/app/server/storage + restart: always + profiles: + - local-run + - deployment + expose: + - 8010 + networks: + - VE-network + container_name: anything-llm # Web Server web-server-local: From 93cdfede88031ebf805c7809bc0aa8a231b183b9 Mon Sep 17 00:00:00 2001 From: jayasankar Date: Tue, 11 Feb 2025 14:22:05 +0530 Subject: [PATCH 3/5] minor refactor --- docker/docker-compose-production.yml | 1 - docker/docker-compose-staging.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/docker/docker-compose-production.yml b/docker/docker-compose-production.yml index deb48289..64814576 100644 --- a/docker/docker-compose-production.yml +++ b/docker/docker-compose-production.yml @@ -470,7 +470,6 @@ services: ports: - "8010:8010" environment: - # Adjust for your environment - STORAGE_DIR=/app/server/storage - JWT_SECRET=${JWT_SECRET:-6710e067711c8001b6e509275dc6ef35} - SERVER_PORT=8010 diff --git a/docker/docker-compose-staging.yml b/docker/docker-compose-staging.yml index 3764dd0b..926f31ff 100644 --- a/docker/docker-compose-staging.yml +++ b/docker/docker-compose-staging.yml @@ -463,7 +463,6 @@ services: ports: - "8010:8010" environment: - # Adjust for your environment - STORAGE_DIR=/app/server/storage - JWT_SECRET=${JWT_SECRET:-6710e067711c8001b6e509275dc6ef35} - SERVER_PORT=8010 From c15e1e870d360eeb88b0d2620c5ec31b54ef30ec Mon Sep 17 00:00:00 2001 From: jayasankar Date: Tue, 11 Feb 2025 14:25:51 +0530 Subject: [PATCH 4/5] removed commeted line --- docker/nginx/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf index 61b0fcbb..38145521 100644 --- a/docker/nginx/default.conf +++ b/docker/nginx/default.conf @@ -61,7 +61,7 @@ server { server { listen 80; - server_name anythingllm.vachanengine.org; # Replace with your desired domain + server_name anythingllm.vachanengine.org; client_max_body_size 100M; location / { From 36de4026d3a5bf0b90d9fdbcd4e27ba6fd8fbb5e Mon Sep 17 00:00:00 2001 From: jayasankar Date: Wed, 12 Feb 2025 17:16:24 +0530 Subject: [PATCH 5/5] llm domain added in webserver with xert container --- docker/docker-compose-production.yml | 1 + docker/docker-compose-staging.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/docker/docker-compose-production.yml b/docker/docker-compose-production.yml index 64814576..1e55c4a7 100644 --- a/docker/docker-compose-production.yml +++ b/docker/docker-compose-production.yml @@ -531,6 +531,7 @@ services: - logs-vol:/var/log/nginx/ environment: - VACHAN_DOMAIN=${VACHAN_DOMAIN} + - VACHAN_LLM_DOMAIN=${VACHAN_LLM_DOMAIN} profiles: - deployment networks: diff --git a/docker/docker-compose-staging.yml b/docker/docker-compose-staging.yml index 926f31ff..227c04c5 100644 --- a/docker/docker-compose-staging.yml +++ b/docker/docker-compose-staging.yml @@ -524,6 +524,7 @@ services: - logs-vol:/var/log/nginx/ environment: - VACHAN_DOMAIN=${VACHAN_DOMAIN} + - VACHAN_LLM_DOMAIN=${VACHAN_LLM_DOMAIN} profiles: - deployment networks: