From 3ecc253ffae338fbf085e3cfed062a74efb0584f Mon Sep 17 00:00:00 2001 From: Zhou Ting Date: Fri, 21 Jun 2024 11:25:23 +0800 Subject: [PATCH] Add no_proxy env for micro services (#140) Singed-off-by: Cao Huiyan Signed-off-by: Zhou Ting Co-authored-by: lvliang-intel Signed-off-by: sharanshirodkar7 --- comps/dataprep/milvus/README.md | 1 + comps/dataprep/qdrant/README.md | 2 ++ .../qdrant/docker/docker-compose-dataprep-qdrant.yaml | 1 + .../redis/langchain/docker/docker-compose-dataprep-redis.yaml | 1 + .../llama_index/docker/docker-compose-dataprep-redis.yaml | 1 + .../embeddings/langchain/docker/docker_compose_embedding.yaml | 1 + .../llama_index/docker/docker_compose_embedding.yaml | 1 + .../langchain/docker/docker_compose_guardrails.yaml | 1 + comps/llms/summarization/tgi/docker_compose_llm.yaml | 1 + comps/llms/text-generation/ray_serve/docker_compose_llm.yaml | 1 + comps/llms/text-generation/tgi/docker_compose_llm.yaml | 1 + comps/llms/text-generation/vllm/docker_compose_llm.yaml | 4 ++-- comps/ragas/tgi/docker_compose_llm.yaml | 1 + comps/reranks/langchain/docker/docker_compose_reranking.yaml | 1 + comps/retrievers/langchain/milvus/README.md | 1 + .../langchain/redis/docker/docker_compose_retriever.yaml | 1 + 16 files changed, 18 insertions(+), 2 deletions(-) diff --git a/comps/dataprep/milvus/README.md b/comps/dataprep/milvus/README.md index e698c400e..dbc3d256c 100644 --- a/comps/dataprep/milvus/README.md +++ b/comps/dataprep/milvus/README.md @@ -15,6 +15,7 @@ Please refer to this [readme](../../../vectorstores/langchain/milvus/README.md). ## Setup Environment Variables ```bash +export no_proxy=${your_no_proxy} export http_proxy=${your_http_proxy} export https_proxy=${your_http_proxy} export MILVUS=${your_milvus_host_ip} diff --git a/comps/dataprep/qdrant/README.md b/comps/dataprep/qdrant/README.md index 108a4c2fa..cd34061e5 100644 --- a/comps/dataprep/qdrant/README.md +++ b/comps/dataprep/qdrant/README.md @@ -15,6 +15,7 @@ Please refer to this [readme](../../../vectorstores/langchain/qdrant/README.md). ## Setup Environment Variables ```bash +export no_proxy=${your_no_proxy} export http_proxy=${your_http_proxy} export https_proxy=${your_http_proxy} export QDRANT=${host_ip} @@ -48,6 +49,7 @@ docker run -d --name="dataprep-qdrant-server" -p 6000:6000 --ipc=host -e http_pr ## Setup Environment Variables ```bash +export no_proxy=${your_no_proxy} export http_proxy=${your_http_proxy} export https_proxy=${your_http_proxy} export QDRANT=${host_ip} diff --git a/comps/dataprep/qdrant/docker/docker-compose-dataprep-qdrant.yaml b/comps/dataprep/qdrant/docker/docker-compose-dataprep-qdrant.yaml index add4a8bbc..e86dc2c4e 100644 --- a/comps/dataprep/qdrant/docker/docker-compose-dataprep-qdrant.yaml +++ b/comps/dataprep/qdrant/docker/docker-compose-dataprep-qdrant.yaml @@ -16,6 +16,7 @@ services: - "6000:6000" ipc: host environment: + no_proxy: ${no_proxy} http_proxy: ${http_proxy} https_proxy: ${https_proxy} QDRANT: ${QDRANT} diff --git a/comps/dataprep/redis/langchain/docker/docker-compose-dataprep-redis.yaml b/comps/dataprep/redis/langchain/docker/docker-compose-dataprep-redis.yaml index e82d55528..cd668397b 100644 --- a/comps/dataprep/redis/langchain/docker/docker-compose-dataprep-redis.yaml +++ b/comps/dataprep/redis/langchain/docker/docker-compose-dataprep-redis.yaml @@ -16,6 +16,7 @@ services: - "6007:6007" ipc: host environment: + no_proxy: ${no_proxy} http_proxy: ${http_proxy} https_proxy: ${https_proxy} REDIS_URL: ${REDIS_URL} diff --git a/comps/dataprep/redis/llama_index/docker/docker-compose-dataprep-redis.yaml b/comps/dataprep/redis/llama_index/docker/docker-compose-dataprep-redis.yaml index 8135a242c..ecb1bf4bd 100644 --- a/comps/dataprep/redis/llama_index/docker/docker-compose-dataprep-redis.yaml +++ b/comps/dataprep/redis/llama_index/docker/docker-compose-dataprep-redis.yaml @@ -16,6 +16,7 @@ services: - "6007:6007" ipc: host environment: + no_proxy: ${no_proxy} http_proxy: ${http_proxy} https_proxy: ${https_proxy} REDIS_URL: ${REDIS_URL} diff --git a/comps/embeddings/langchain/docker/docker_compose_embedding.yaml b/comps/embeddings/langchain/docker/docker_compose_embedding.yaml index 9c7b325bf..104557001 100644 --- a/comps/embeddings/langchain/docker/docker_compose_embedding.yaml +++ b/comps/embeddings/langchain/docker/docker_compose_embedding.yaml @@ -11,6 +11,7 @@ services: - "6000:6000" ipc: host environment: + no_proxy: ${no_proxy} http_proxy: ${http_proxy} https_proxy: ${https_proxy} TEI_EMBEDDING_ENDPOINT: ${TEI_EMBEDDING_ENDPOINT} diff --git a/comps/embeddings/llama_index/docker/docker_compose_embedding.yaml b/comps/embeddings/llama_index/docker/docker_compose_embedding.yaml index 90f1e52b9..62f5870b7 100644 --- a/comps/embeddings/llama_index/docker/docker_compose_embedding.yaml +++ b/comps/embeddings/llama_index/docker/docker_compose_embedding.yaml @@ -11,6 +11,7 @@ services: - "6000:6000" ipc: host environment: + no_proxy: ${no_proxy} http_proxy: ${http_proxy} https_proxy: ${https_proxy} TEI_EMBEDDING_ENDPOINT: ${TEI_EMBEDDING_ENDPOINT} diff --git a/comps/guardrails/langchain/docker/docker_compose_guardrails.yaml b/comps/guardrails/langchain/docker/docker_compose_guardrails.yaml index c398c05e3..625b7a223 100644 --- a/comps/guardrails/langchain/docker/docker_compose_guardrails.yaml +++ b/comps/guardrails/langchain/docker/docker_compose_guardrails.yaml @@ -22,6 +22,7 @@ services: - "9090:9090" ipc: host environment: + no_proxy: ${no_proxy} http_proxy: ${http_proxy} https_proxy: ${https_proxy} SAFETY_GUARD_ENDPOINT: ${SAFETY_GUARD_ENDPOINT} diff --git a/comps/llms/summarization/tgi/docker_compose_llm.yaml b/comps/llms/summarization/tgi/docker_compose_llm.yaml index 085526f66..41ae5d076 100644 --- a/comps/llms/summarization/tgi/docker_compose_llm.yaml +++ b/comps/llms/summarization/tgi/docker_compose_llm.yaml @@ -22,6 +22,7 @@ services: - "9000:9000" ipc: host environment: + no_proxy: ${no_proxy} http_proxy: ${http_proxy} https_proxy: ${https_proxy} TGI_LLM_ENDPOINT: ${TGI_LLM_ENDPOINT} diff --git a/comps/llms/text-generation/ray_serve/docker_compose_llm.yaml b/comps/llms/text-generation/ray_serve/docker_compose_llm.yaml index 570c61bcf..4a8f7bd84 100644 --- a/comps/llms/text-generation/ray_serve/docker_compose_llm.yaml +++ b/comps/llms/text-generation/ray_serve/docker_compose_llm.yaml @@ -41,6 +41,7 @@ services: - "9000:9000" ipc: host environment: + no_proxy: ${no_proxy} http_proxy: ${http_proxy} https_proxy: ${https_proxy} RAY_Serve_ENDPOINT: ${RAY_Serve_ENDPOINT} diff --git a/comps/llms/text-generation/tgi/docker_compose_llm.yaml b/comps/llms/text-generation/tgi/docker_compose_llm.yaml index a76433d66..e52475b30 100644 --- a/comps/llms/text-generation/tgi/docker_compose_llm.yaml +++ b/comps/llms/text-generation/tgi/docker_compose_llm.yaml @@ -20,6 +20,7 @@ services: - "9000:9000" ipc: host environment: + no_proxy: ${no_proxy} http_proxy: ${http_proxy} https_proxy: ${https_proxy} TGI_LLM_ENDPOINT: ${TGI_LLM_ENDPOINT} diff --git a/comps/llms/text-generation/vllm/docker_compose_llm.yaml b/comps/llms/text-generation/vllm/docker_compose_llm.yaml index 99d10aa33..355241ee8 100644 --- a/comps/llms/text-generation/vllm/docker_compose_llm.yaml +++ b/comps/llms/text-generation/vllm/docker_compose_llm.yaml @@ -12,9 +12,9 @@ services: volumes: - "./data:/data" environment: + no_proxy: ${no_proxy} http_proxy: ${http_proxy} https_proxy: ${https_proxy} - no_proxy: ${no_proxy} LLM_MODEL_ID: ${LLM_MODEL_ID} HF_TOKEN: ${HUGGINGFACEHUB_API_TOKEN} command: /bin/sh -c "cd / && export VLLM_CPU_KVCACHE_SPACE=40 && python3 -m vllm.entrypoints.openai.api_server --host 0.0.0.0 --model $LLM_MODEL_ID --port 80" @@ -25,9 +25,9 @@ services: - "9000:9000" ipc: host environment: + no_proxy: ${no_proxy} http_proxy: ${http_proxy} https_proxy: ${https_proxy} - no_proxy: ${no_proxy} vLLM_LLM_ENDPOINT: ${vLLM_LLM_ENDPOINT} LLM_MODEL_ID: ${LLM_MODEL_ID} HUGGINGFACEHUB_API_TOKEN: ${HUGGINGFACEHUB_API_TOKEN} diff --git a/comps/ragas/tgi/docker_compose_llm.yaml b/comps/ragas/tgi/docker_compose_llm.yaml index ebc6291af..65665c4e8 100644 --- a/comps/ragas/tgi/docker_compose_llm.yaml +++ b/comps/ragas/tgi/docker_compose_llm.yaml @@ -20,6 +20,7 @@ services: - "9000:9000" ipc: host environment: + no_proxy: ${no_proxy} http_proxy: ${http_proxy} https_proxy: ${https_proxy} TGI_LLM_ENDPOINT: ${TGI_LLM_ENDPOINT} diff --git a/comps/reranks/langchain/docker/docker_compose_reranking.yaml b/comps/reranks/langchain/docker/docker_compose_reranking.yaml index 4f6cc09e7..c2185eb3d 100644 --- a/comps/reranks/langchain/docker/docker_compose_reranking.yaml +++ b/comps/reranks/langchain/docker/docker_compose_reranking.yaml @@ -20,6 +20,7 @@ services: - "8000:8000" ipc: host environment: + no_proxy: ${no_proxy} http_proxy: ${http_proxy} https_proxy: ${https_proxy} TEI_RERANKING_ENDPOINT: ${TEI_RERANKING_ENDPOINT} diff --git a/comps/retrievers/langchain/milvus/README.md b/comps/retrievers/langchain/milvus/README.md index 3df06b2be..a0c2cfeba 100644 --- a/comps/retrievers/langchain/milvus/README.md +++ b/comps/retrievers/langchain/milvus/README.md @@ -15,6 +15,7 @@ Please refer to this [readme](../../../vectorstores/langchain/milvus/README.md). ## Setup Environment Variables ```bash +export no_proxy=${your_no_proxy} export http_proxy=${your_http_proxy} export https_proxy=${your_http_proxy} export MILVUS=${your_milvus_host_ip} diff --git a/comps/retrievers/langchain/redis/docker/docker_compose_retriever.yaml b/comps/retrievers/langchain/redis/docker/docker_compose_retriever.yaml index a7d9f5dc5..a973a636e 100644 --- a/comps/retrievers/langchain/redis/docker/docker_compose_retriever.yaml +++ b/comps/retrievers/langchain/redis/docker/docker_compose_retriever.yaml @@ -20,6 +20,7 @@ services: - "7000:7000" ipc: host environment: + no_proxy: ${no_proxy} http_proxy: ${http_proxy} https_proxy: ${https_proxy} REDIS_URL: ${REDIS_URL}