From 0183dbce240c82beadaea0b131a43467dcacd0c4 Mon Sep 17 00:00:00 2001 From: letonghan Date: Fri, 20 Dec 2024 18:08:33 +0800 Subject: [PATCH] revert retrievers and vectorstores Signed-off-by: letonghan --- ...vus_langchain.yaml => docker-compose.yaml} | 0 comps/retrievers/{src => }/README.md | 0 .../deployment/docker_compose/README.md | 0 .../docker_compose/milvus_langchain.yaml | 34 ------------------ .../deployment/kubernetes/README.md | 0 .../elasticsearch/langchain/Dockerfile | 4 +-- .../elasticsearch/langchain/README.md | 4 +-- .../elasticsearch/langchain/config.py | 0 .../langchain}/elasticsearch_langchain.yaml | 0 .../elasticsearch/langchain/requirements.txt | 0 .../langchain/retriever_elasticsearch.py | 0 .../{src => }/milvus/langchain/Dockerfile | 6 ++-- .../{src => }/milvus/langchain/README.md | 6 ++-- .../milvus/langchain}/__init__.py | 2 +- .../{src => }/milvus/langchain/config.py | 2 +- .../milvus/langchain/requirements.txt | 2 +- .../milvus/langchain/retriever_milvus.py | 2 +- .../{src => }/neo4j/langchain/Dockerfile | 4 +-- .../{src => }/neo4j/langchain/README.md | 2 +- .../milvus => neo4j}/langchain/__init__.py | 0 .../{src => }/neo4j/langchain/config.py | 0 .../neo4j/langchain/requirements.txt | 0 .../neo4j/langchain/retriever_neo4j.py | 0 .../{src => }/neo4j/llama_index/Dockerfile | 4 +-- .../{src => }/neo4j/llama_index/README.md | 4 +-- .../llama_index}/__init__.py | 0 .../{src => }/neo4j/llama_index/config.py | 0 .../llama_index}/neo4j_llama_index.yaml | 0 .../neo4j/llama_index/requirements.txt | 0 .../retriever_community_answers_neo4j.py | 2 +- .../{src => }/neo4j/llama_index/set_env.sh | 0 .../{src => }/pathway/langchain/Dockerfile | 4 +-- .../{src => }/pathway/langchain/README.md | 6 ++-- .../{src => }/pathway/langchain/entrypoint.sh | 0 .../langchain}/pathway_langchain.yaml | 0 .../langchain/requirements-runtime.txt | 0 .../pathway/langchain/requirements.txt | 0 .../pathway/langchain/retriever_pathway.py | 0 .../{src => }/pgvector/langchain/Dockerfile | 4 +-- .../{src => }/pgvector/langchain/README.md | 4 +-- .../{src => }/pgvector/langchain/config.py | 0 .../langchain}/pgvector_langchain.yaml | 0 .../pgvector/langchain/requirements.txt | 0 .../pgvector/langchain/retriever_pgvector.py | 0 .../{src => }/pinecone/langchain/Dockerfile | 4 +-- .../langchain}/__init__.py | 0 .../{src => }/pinecone/langchain/config.py | 0 .../langchain}/pinecone_langchain.yaml | 0 .../pinecone/langchain/requirements.txt | 0 .../pinecone/langchain/retriever_pinecone.py | 0 .../{src => }/qdrant/haystack/Dockerfile | 4 +-- .../{src => }/qdrant/haystack/README.md | 4 +-- .../langchain => qdrant/haystack}/__init__.py | 0 .../qdrant/haystack/qdrant_config.py | 0 .../qdrant/haystack/requirements.txt | 0 .../qdrant/haystack/retriever_qdrant.py | 0 .../{src => }/redis/langchain/Dockerfile | 4 +-- .../{src => }/redis/langchain/README.md | 2 +- .../haystack => redis/langchain}/__init__.py | 0 .../{src => }/redis/langchain/redis_config.py | 0 .../langchain}/redis_langchain.yaml | 0 .../redis/langchain/redis_schema.yml | 0 .../redis/langchain/redis_schema_multi.yml | 0 .../redis/langchain/requirements.txt | 0 .../redis/langchain/retriever_redis.py | 2 +- .../{src => }/redis/llama_index/Dockerfile | 6 ++-- .../{src => }/redis/llama_index/README.md | 2 +- .../llama_index}/__init__.py | 0 .../redis/llama_index/redis_config.py | 0 .../llama_index}/redis_llama_index.yaml | 0 .../redis/llama_index/requirements.txt | 0 .../redis/llama_index/retriever_redis.py | 0 .../{src => }/vdms/langchain/Dockerfile | 4 +-- .../{src => }/vdms/langchain/README.md | 2 +- .../langchain}/__init__.py | 0 .../{src => }/vdms/langchain/requirements.txt | 0 .../vdms/langchain/retriever_vdms.py | 0 .../{src => }/vdms/langchain/vdms_config.py | 0 .../langchain}/vdms_langchain.yaml | 0 comps/vectorstores/{src => }/README.md | 0 .../langchain => vectorstores}/__init__.py | 0 comps/vectorstores/{src => }/chroma/README.md | 0 .../vectorstores/{src => chroma}/__init__.py | 0 .../deployment/docker_compose/README.md | 0 .../deployment/kubernetes/README.md | 0 .../{src => }/elasticsearch/README.md | 0 .../{src/chroma => elasticsearch}/__init__.py | 0 .../elasticsearch.yaml | 0 .../vectorstores/{src => }/lancedb/README.md | 0 .../elasticsearch => lancedb}/__init__.py | 0 comps/vectorstores/{src => }/milvus/README.md | 0 .../{src/lancedb => milvus}/__init__.py | 0 .../docker-compose.yaml} | 0 .../vectorstores/{src => }/milvus/milvus.yaml | 0 .../vectorstores/{src => }/pathway/Dockerfile | 0 .../vectorstores/{src => }/pathway/README.md | 0 .../{src/milvus => pathway}/__init__.py | 0 .../{src => }/pathway/data/nke-10k-2023.pdf | Bin .../{src => }/pathway/requirements.txt | 0 .../{src => }/pathway/vectorstore_pathway.py | 0 .../vectorstores/{src => }/pgvector/README.md | 0 .../{src/pathway => pgvector}/__init__.py | 0 .../vectorstores/{src => }/pgvector/init.sql | 0 .../docker_compose => pgvector}/pgvector.yaml | 0 .../vectorstores/{src => }/pinecone/README.md | 0 .../{src/pgvector => pinecone}/__init__.py | 0 comps/vectorstores/{src => }/qdrant/README.md | 0 .../{src/pinecone => qdrant}/__init__.py | 0 comps/vectorstores/{src => }/redis/README.md | 0 .../{src/qdrant => redis}/__init__.py | 0 .../docker_compose => redis}/redis.yaml | 0 comps/vectorstores/{src => }/vdms/README.md | 0 .../{src/redis => vdms}/__init__.py | 0 .../docker_compose => vdms}/vdms.yaml | 0 .../test_dataprep_elasticsearch_langchain.sh | 2 +- .../test_dataprep_milvus_langchain.sh | 2 +- ...est_dataprep_multimodal_redis_langchain.sh | 2 +- ...dataprep_neo4j_llama_index_on_intel_hpu.sh | 2 +- .../test_dataprep_pgvector_langchain.sh | 2 +- .../test_dataprep_pinecone_langchain.sh | 2 +- .../test_dataprep_qdrant_langchain.sh | 2 +- .../test_dataprep_redis_langchain_ray.sh | 2 +- .../test_dataprep_redis_llama_index.sh | 2 +- .../dataprep/test_dataprep_vdms_langchain.sh | 2 +- ...test_dataprep_vdms_multimodal_langchain.sh | 2 +- ...test_retrievers_elasticsearch_langchain.sh | 2 +- .../test_retrievers_milvus_langchain.sh | 2 +- .../test_retrievers_neo4j_langchain.sh | 2 +- ...trievers_neo4j_llama_index_on_intel_hpu.sh | 4 +-- .../test_retrievers_pathway_langchain.sh | 6 ++-- .../test_retrievers_pgvector_langchain.sh | 2 +- .../test_retrievers_pinecone_langchain.sh | 2 +- .../test_retrievers_qdrant_haystack.sh | 2 +- .../test_retrievers_redis_langchain.sh | 2 +- .../test_retrievers_vdms_langchain.sh | 2 +- .../vectorstores/test_vectorstores_milvus.sh | 2 +- .../vectorstores/test_vectorstores_pathway.sh | 4 +-- 137 files changed, 75 insertions(+), 109 deletions(-) rename comps/dataprep/milvus/langchain/{milvus_langchain.yaml => docker-compose.yaml} (100%) rename comps/retrievers/{src => }/README.md (100%) delete mode 100644 comps/retrievers/deployment/docker_compose/README.md delete mode 100644 comps/retrievers/deployment/docker_compose/milvus_langchain.yaml delete mode 100644 comps/retrievers/deployment/kubernetes/README.md rename comps/retrievers/{src => }/elasticsearch/langchain/Dockerfile (79%) rename comps/retrievers/{src => }/elasticsearch/langchain/README.md (97%) rename comps/retrievers/{src => }/elasticsearch/langchain/config.py (100%) rename comps/retrievers/{deployment/docker_compose => elasticsearch/langchain}/elasticsearch_langchain.yaml (100%) rename comps/retrievers/{src => }/elasticsearch/langchain/requirements.txt (100%) rename comps/retrievers/{src => }/elasticsearch/langchain/retriever_elasticsearch.py (100%) rename comps/retrievers/{src => }/milvus/langchain/Dockerfile (76%) rename comps/retrievers/{src => }/milvus/langchain/README.md (96%) rename comps/{vectorstores/src/vdms => retrievers/milvus/langchain}/__init__.py (50%) rename comps/retrievers/{src => }/milvus/langchain/config.py (94%) rename comps/retrievers/{src => }/milvus/langchain/requirements.txt (97%) rename comps/retrievers/{src => }/milvus/langchain/retriever_milvus.py (98%) rename comps/retrievers/{src => }/neo4j/langchain/Dockerfile (82%) rename comps/retrievers/{src => }/neo4j/langchain/README.md (98%) rename comps/retrievers/{src/milvus => neo4j}/langchain/__init__.py (100%) rename comps/retrievers/{src => }/neo4j/langchain/config.py (100%) rename comps/retrievers/{src => }/neo4j/langchain/requirements.txt (100%) rename comps/retrievers/{src => }/neo4j/langchain/retriever_neo4j.py (100%) rename comps/retrievers/{src => }/neo4j/llama_index/Dockerfile (82%) rename comps/retrievers/{src => }/neo4j/llama_index/README.md (96%) rename comps/retrievers/{src/neo4j/langchain => neo4j/llama_index}/__init__.py (100%) rename comps/retrievers/{src => }/neo4j/llama_index/config.py (100%) rename comps/retrievers/{deployment/docker_compose => neo4j/llama_index}/neo4j_llama_index.yaml (100%) rename comps/retrievers/{src => }/neo4j/llama_index/requirements.txt (100%) rename comps/retrievers/{src => }/neo4j/llama_index/retriever_community_answers_neo4j.py (98%) rename comps/retrievers/{src => }/neo4j/llama_index/set_env.sh (100%) rename comps/retrievers/{src => }/pathway/langchain/Dockerfile (80%) rename comps/retrievers/{src => }/pathway/langchain/README.md (95%) rename comps/retrievers/{src => }/pathway/langchain/entrypoint.sh (100%) rename comps/retrievers/{deployment/docker_compose => pathway/langchain}/pathway_langchain.yaml (100%) rename comps/retrievers/{src => }/pathway/langchain/requirements-runtime.txt (100%) rename comps/retrievers/{src => }/pathway/langchain/requirements.txt (100%) rename comps/retrievers/{src => }/pathway/langchain/retriever_pathway.py (100%) rename comps/retrievers/{src => }/pgvector/langchain/Dockerfile (80%) rename comps/retrievers/{src => }/pgvector/langchain/README.md (97%) rename comps/retrievers/{src => }/pgvector/langchain/config.py (100%) rename comps/retrievers/{deployment/docker_compose => pgvector/langchain}/pgvector_langchain.yaml (100%) rename comps/retrievers/{src => }/pgvector/langchain/requirements.txt (100%) rename comps/retrievers/{src => }/pgvector/langchain/retriever_pgvector.py (100%) rename comps/retrievers/{src => }/pinecone/langchain/Dockerfile (85%) rename comps/retrievers/{src/neo4j/llama_index => pinecone/langchain}/__init__.py (100%) rename comps/retrievers/{src => }/pinecone/langchain/config.py (100%) rename comps/retrievers/{deployment/docker_compose => pinecone/langchain}/pinecone_langchain.yaml (100%) rename comps/retrievers/{src => }/pinecone/langchain/requirements.txt (100%) rename comps/retrievers/{src => }/pinecone/langchain/retriever_pinecone.py (100%) rename comps/retrievers/{src => }/qdrant/haystack/Dockerfile (85%) rename comps/retrievers/{src => }/qdrant/haystack/README.md (94%) rename comps/retrievers/{src/pinecone/langchain => qdrant/haystack}/__init__.py (100%) rename comps/retrievers/{src => }/qdrant/haystack/qdrant_config.py (100%) rename comps/retrievers/{src => }/qdrant/haystack/requirements.txt (100%) rename comps/retrievers/{src => }/qdrant/haystack/retriever_qdrant.py (100%) rename comps/retrievers/{src => }/redis/langchain/Dockerfile (81%) rename comps/retrievers/{src => }/redis/langchain/README.md (99%) rename comps/retrievers/{src/qdrant/haystack => redis/langchain}/__init__.py (100%) rename comps/retrievers/{src => }/redis/langchain/redis_config.py (100%) rename comps/retrievers/{deployment/docker_compose => redis/langchain}/redis_langchain.yaml (100%) rename comps/retrievers/{src => }/redis/langchain/redis_schema.yml (100%) rename comps/retrievers/{src => }/redis/langchain/redis_schema_multi.yml (100%) rename comps/retrievers/{src => }/redis/langchain/requirements.txt (100%) rename comps/retrievers/{src => }/redis/langchain/retriever_redis.py (98%) rename comps/retrievers/{src => }/redis/llama_index/Dockerfile (79%) rename comps/retrievers/{src => }/redis/llama_index/README.md (98%) rename comps/retrievers/{src/redis/langchain => redis/llama_index}/__init__.py (100%) rename comps/retrievers/{src => }/redis/llama_index/redis_config.py (100%) rename comps/retrievers/{deployment/docker_compose => redis/llama_index}/redis_llama_index.yaml (100%) rename comps/retrievers/{src => }/redis/llama_index/requirements.txt (100%) rename comps/retrievers/{src => }/redis/llama_index/retriever_redis.py (100%) rename comps/retrievers/{src => }/vdms/langchain/Dockerfile (84%) rename comps/retrievers/{src => }/vdms/langchain/README.md (99%) rename comps/retrievers/{src/redis/llama_index => vdms/langchain}/__init__.py (100%) rename comps/retrievers/{src => }/vdms/langchain/requirements.txt (100%) rename comps/retrievers/{src => }/vdms/langchain/retriever_vdms.py (100%) rename comps/retrievers/{src => }/vdms/langchain/vdms_config.py (100%) rename comps/retrievers/{deployment/docker_compose => vdms/langchain}/vdms_langchain.yaml (100%) rename comps/vectorstores/{src => }/README.md (100%) rename comps/{retrievers/src/vdms/langchain => vectorstores}/__init__.py (100%) rename comps/vectorstores/{src => }/chroma/README.md (100%) rename comps/vectorstores/{src => chroma}/__init__.py (100%) delete mode 100644 comps/vectorstores/deployment/docker_compose/README.md delete mode 100644 comps/vectorstores/deployment/kubernetes/README.md rename comps/vectorstores/{src => }/elasticsearch/README.md (100%) rename comps/vectorstores/{src/chroma => elasticsearch}/__init__.py (100%) rename comps/vectorstores/{deployment/docker_compose => elasticsearch}/elasticsearch.yaml (100%) rename comps/vectorstores/{src => }/lancedb/README.md (100%) rename comps/vectorstores/{src/elasticsearch => lancedb}/__init__.py (100%) rename comps/vectorstores/{src => }/milvus/README.md (100%) rename comps/vectorstores/{src/lancedb => milvus}/__init__.py (100%) rename comps/vectorstores/{deployment/docker_compose/milvus.yaml => milvus/docker-compose.yaml} (100%) rename comps/vectorstores/{src => }/milvus/milvus.yaml (100%) rename comps/vectorstores/{src => }/pathway/Dockerfile (100%) rename comps/vectorstores/{src => }/pathway/README.md (100%) rename comps/vectorstores/{src/milvus => pathway}/__init__.py (100%) rename comps/vectorstores/{src => }/pathway/data/nke-10k-2023.pdf (100%) rename comps/vectorstores/{src => }/pathway/requirements.txt (100%) rename comps/vectorstores/{src => }/pathway/vectorstore_pathway.py (100%) rename comps/vectorstores/{src => }/pgvector/README.md (100%) rename comps/vectorstores/{src/pathway => pgvector}/__init__.py (100%) rename comps/vectorstores/{src => }/pgvector/init.sql (100%) rename comps/vectorstores/{deployment/docker_compose => pgvector}/pgvector.yaml (100%) rename comps/vectorstores/{src => }/pinecone/README.md (100%) rename comps/vectorstores/{src/pgvector => pinecone}/__init__.py (100%) rename comps/vectorstores/{src => }/qdrant/README.md (100%) rename comps/vectorstores/{src/pinecone => qdrant}/__init__.py (100%) rename comps/vectorstores/{src => }/redis/README.md (100%) rename comps/vectorstores/{src/qdrant => redis}/__init__.py (100%) rename comps/vectorstores/{deployment/docker_compose => redis}/redis.yaml (100%) rename comps/vectorstores/{src => }/vdms/README.md (100%) rename comps/vectorstores/{src/redis => vdms}/__init__.py (100%) rename comps/vectorstores/{deployment/docker_compose => vdms}/vdms.yaml (100%) diff --git a/comps/dataprep/milvus/langchain/milvus_langchain.yaml b/comps/dataprep/milvus/langchain/docker-compose.yaml similarity index 100% rename from comps/dataprep/milvus/langchain/milvus_langchain.yaml rename to comps/dataprep/milvus/langchain/docker-compose.yaml diff --git a/comps/retrievers/src/README.md b/comps/retrievers/README.md similarity index 100% rename from comps/retrievers/src/README.md rename to comps/retrievers/README.md diff --git a/comps/retrievers/deployment/docker_compose/README.md b/comps/retrievers/deployment/docker_compose/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/comps/retrievers/deployment/docker_compose/milvus_langchain.yaml b/comps/retrievers/deployment/docker_compose/milvus_langchain.yaml deleted file mode 100644 index d1f15bcf4..000000000 --- a/comps/retrievers/deployment/docker_compose/milvus_langchain.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -version: "3.8" - -services: - tei_service: - image: ghcr.io/huggingface/text-embeddings-inference:cpu-1.2 - container_name: tei-server - ports: - - "6060:80" - volumes: - - "./data:/data" - shm_size: 1g - command: --model-id ${RETRIEVE_MODEL_ID} - retriever: - image: opea/retriever-milvus:latest - container_name: retriever-milvus-server - ports: - - "7000:7000" - ipc: host - environment: - no_proxy: ${no_proxy} - http_proxy: ${http_proxy} - https_proxy: ${https_proxy} - MILVUS_HOST: ${MILVUS_HOST} - INDEX_NAME: ${INDEX_NAME} - TEI_EMBEDDING_ENDPOINT: ${TEI_EMBEDDING_ENDPOINT} - HUGGINGFACEHUB_API_TOKEN: ${HUGGINGFACEHUB_API_TOKEN} - restart: unless-stopped - -networks: - default: - driver: bridge diff --git a/comps/retrievers/deployment/kubernetes/README.md b/comps/retrievers/deployment/kubernetes/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/comps/retrievers/src/elasticsearch/langchain/Dockerfile b/comps/retrievers/elasticsearch/langchain/Dockerfile similarity index 79% rename from comps/retrievers/src/elasticsearch/langchain/Dockerfile rename to comps/retrievers/elasticsearch/langchain/Dockerfile index 17fdb7f3d..6c7bb903f 100644 --- a/comps/retrievers/src/elasticsearch/langchain/Dockerfile +++ b/comps/retrievers/elasticsearch/langchain/Dockerfile @@ -19,10 +19,10 @@ USER user RUN pip install --no-cache-dir --upgrade pip setuptools && \ if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch torchvision --index-url https://download.pytorch.org/whl/cpu; fi && \ - pip install --no-cache-dir -r /home/user/comps/retrievers/src/elasticsearch/langchain/requirements.txt + pip install --no-cache-dir -r /home/user/comps/retrievers/elasticsearch/langchain/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user -WORKDIR /home/user/comps/retrievers/src/elasticsearch/langchain +WORKDIR /home/user/comps/retrievers/elasticsearch/langchain ENTRYPOINT ["python", "retriever_elasticsearch.py"] diff --git a/comps/retrievers/src/elasticsearch/langchain/README.md b/comps/retrievers/elasticsearch/langchain/README.md similarity index 97% rename from comps/retrievers/src/elasticsearch/langchain/README.md rename to comps/retrievers/elasticsearch/langchain/README.md index 93b72fe9f..3a799de19 100644 --- a/comps/retrievers/src/elasticsearch/langchain/README.md +++ b/comps/retrievers/elasticsearch/langchain/README.md @@ -76,7 +76,7 @@ export TEI_EMBEDDING_ENDPOINT="http://${your_ip}:6060" ```bash cd ../../../../../ -docker build -t opea/retriever-elasticsearch:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/src/elasticsearch/langchain/Dockerfile . +docker build -t opea/retriever-elasticsearch:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/elasticsearch/langchain/Dockerfile . ``` To start a docker container, you have two options: @@ -95,7 +95,7 @@ docker run -d --name="retriever-elasticsearch" -p 7000:7000 --ipc=host -e http_p ### 2.4 Run Docker with Docker Compose (Option B) ```bash -cd comps/retrievers/src/elasticsearch/langchain +cd comps/retrievers/elasticsearch/langchain docker compose -f docker_compose_retriever.yaml up -d ``` diff --git a/comps/retrievers/src/elasticsearch/langchain/config.py b/comps/retrievers/elasticsearch/langchain/config.py similarity index 100% rename from comps/retrievers/src/elasticsearch/langchain/config.py rename to comps/retrievers/elasticsearch/langchain/config.py diff --git a/comps/retrievers/deployment/docker_compose/elasticsearch_langchain.yaml b/comps/retrievers/elasticsearch/langchain/elasticsearch_langchain.yaml similarity index 100% rename from comps/retrievers/deployment/docker_compose/elasticsearch_langchain.yaml rename to comps/retrievers/elasticsearch/langchain/elasticsearch_langchain.yaml diff --git a/comps/retrievers/src/elasticsearch/langchain/requirements.txt b/comps/retrievers/elasticsearch/langchain/requirements.txt similarity index 100% rename from comps/retrievers/src/elasticsearch/langchain/requirements.txt rename to comps/retrievers/elasticsearch/langchain/requirements.txt diff --git a/comps/retrievers/src/elasticsearch/langchain/retriever_elasticsearch.py b/comps/retrievers/elasticsearch/langchain/retriever_elasticsearch.py similarity index 100% rename from comps/retrievers/src/elasticsearch/langchain/retriever_elasticsearch.py rename to comps/retrievers/elasticsearch/langchain/retriever_elasticsearch.py diff --git a/comps/retrievers/src/milvus/langchain/Dockerfile b/comps/retrievers/milvus/langchain/Dockerfile similarity index 76% rename from comps/retrievers/src/milvus/langchain/Dockerfile rename to comps/retrievers/milvus/langchain/Dockerfile index 838ef18ce..94a482aaf 100644 --- a/comps/retrievers/src/milvus/langchain/Dockerfile +++ b/comps/retrievers/milvus/langchain/Dockerfile @@ -22,10 +22,10 @@ COPY comps /home/user/comps RUN pip install --no-cache-dir --upgrade pip setuptools && \ if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch --index-url https://download.pytorch.org/whl/cpu; fi && \ - pip install --no-cache-dir -r /home/user/comps/retrievers/src/milvus/langchain/requirements.txt + pip install --no-cache-dir -r /home/user/comps/retrievers/milvus/langchain/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user -WORKDIR /home/user/comps/retrievers/src/milvus/langchain +WORKDIR /home/user/comps/retrievers/milvus/langchain -ENTRYPOINT ["python", "retriever_milvus.py"] +ENTRYPOINT ["python", "retriever_milvus.py"] \ No newline at end of file diff --git a/comps/retrievers/src/milvus/langchain/README.md b/comps/retrievers/milvus/langchain/README.md similarity index 96% rename from comps/retrievers/src/milvus/langchain/README.md rename to comps/retrievers/milvus/langchain/README.md index 875a264fc..40a1ad332 100644 --- a/comps/retrievers/src/milvus/langchain/README.md +++ b/comps/retrievers/milvus/langchain/README.md @@ -10,7 +10,7 @@ pip install -r requirements.txt ### Start Milvus Server -Please refer to this [readme](../../../../vectorstores/src/milvus/README.md). +Please refer to this [readme](../../../vectorstores/milvus/README.md). ### Setup Environment Variables @@ -37,7 +37,7 @@ python retriever_redis.py ```bash cd ../../ -docker build -t opea/retriever-milvus:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/src/milvus/langchain/Dockerfile . +docker build -t opea/retriever-milvus:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/milvus/langchain/Dockerfile . ``` ### Run Docker with CLI @@ -100,4 +100,4 @@ curl http://localhost:7000/v1/retrieval \ -X POST \ -d "{\"text\":\"What is the revenue of Nike in 2023?\",\"embedding\":${your_embedding},\"search_type\":\"mmr\", \"k\":4, \"fetch_k\":20, \"lambda_mult\":0.5}" \ -H 'Content-Type: application/json' -``` +``` \ No newline at end of file diff --git a/comps/vectorstores/src/vdms/__init__.py b/comps/retrievers/milvus/langchain/__init__.py similarity index 50% rename from comps/vectorstores/src/vdms/__init__.py rename to comps/retrievers/milvus/langchain/__init__.py index 916f3a44b..4582b4f9a 100644 --- a/comps/vectorstores/src/vdms/__init__.py +++ b/comps/retrievers/milvus/langchain/__init__.py @@ -1,2 +1,2 @@ # Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 +# SPDX-License-Identifier: Apache-2.0 \ No newline at end of file diff --git a/comps/retrievers/src/milvus/langchain/config.py b/comps/retrievers/milvus/langchain/config.py similarity index 94% rename from comps/retrievers/src/milvus/langchain/config.py rename to comps/retrievers/milvus/langchain/config.py index b201b35c9..07bea1a07 100644 --- a/comps/retrievers/src/milvus/langchain/config.py +++ b/comps/retrievers/milvus/langchain/config.py @@ -15,4 +15,4 @@ MOSEC_EMBEDDING_MODEL = os.environ.get("MOSEC_EMBEDDING_MODEL", "/home/user/bce-embedding-base_v1") MOSEC_EMBEDDING_ENDPOINT = os.environ.get("MOSEC_EMBEDDING_ENDPOINT", "") os.environ["OPENAI_API_BASE"] = MOSEC_EMBEDDING_ENDPOINT -os.environ["OPENAI_API_KEY"] = "Dummy key" +os.environ["OPENAI_API_KEY"] = "Dummy key" \ No newline at end of file diff --git a/comps/retrievers/src/milvus/langchain/requirements.txt b/comps/retrievers/milvus/langchain/requirements.txt similarity index 97% rename from comps/retrievers/src/milvus/langchain/requirements.txt rename to comps/retrievers/milvus/langchain/requirements.txt index fd6e197c8..c138e4c24 100644 --- a/comps/retrievers/src/milvus/langchain/requirements.txt +++ b/comps/retrievers/milvus/langchain/requirements.txt @@ -22,4 +22,4 @@ python-docx==0.8.11 sentence_transformers shortuuid tiktoken -uvicorn +uvicorn \ No newline at end of file diff --git a/comps/retrievers/src/milvus/langchain/retriever_milvus.py b/comps/retrievers/milvus/langchain/retriever_milvus.py similarity index 98% rename from comps/retrievers/src/milvus/langchain/retriever_milvus.py rename to comps/retrievers/milvus/langchain/retriever_milvus.py index a4eb3ce43..9dafa86d7 100644 --- a/comps/retrievers/src/milvus/langchain/retriever_milvus.py +++ b/comps/retrievers/milvus/langchain/retriever_milvus.py @@ -120,4 +120,4 @@ async def retrieve(input: EmbedDoc) -> SearchedDoc: logger.info(f"[ retriever_milvus ] LOCAL_EMBEDDING_MODEL:{LOCAL_EMBEDDING_MODEL}") embeddings = HuggingFaceBgeEmbeddings(model_name=LOCAL_EMBEDDING_MODEL) - opea_microservices["opea_service@retriever_milvus"].start() + opea_microservices["opea_service@retriever_milvus"].start() \ No newline at end of file diff --git a/comps/retrievers/src/neo4j/langchain/Dockerfile b/comps/retrievers/neo4j/langchain/Dockerfile similarity index 82% rename from comps/retrievers/src/neo4j/langchain/Dockerfile rename to comps/retrievers/neo4j/langchain/Dockerfile index c6e006013..3609a34c4 100644 --- a/comps/retrievers/src/neo4j/langchain/Dockerfile +++ b/comps/retrievers/neo4j/langchain/Dockerfile @@ -24,10 +24,10 @@ COPY comps /home/user/comps RUN pip install --no-cache-dir --upgrade pip setuptools && \ if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch --index-url https://download.pytorch.org/whl/cpu; fi && \ - pip install --no-cache-dir -r /home/user/comps/retrievers/src/neo4j/langchain/requirements.txt + pip install --no-cache-dir -r /home/user/comps/retrievers/neo4j/langchain/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user -WORKDIR /home/user/comps/retrievers/src/neo4j/langchain +WORKDIR /home/user/comps/retrievers/neo4j/langchain ENTRYPOINT ["python", "retriever_neo4j.py"] diff --git a/comps/retrievers/src/neo4j/langchain/README.md b/comps/retrievers/neo4j/langchain/README.md similarity index 98% rename from comps/retrievers/src/neo4j/langchain/README.md rename to comps/retrievers/neo4j/langchain/README.md index bec1fd781..731abc20f 100644 --- a/comps/retrievers/src/neo4j/langchain/README.md +++ b/comps/retrievers/neo4j/langchain/README.md @@ -46,7 +46,7 @@ python retriever_neo4j.py ```bash cd ../../ -docker build -t opea/retriever-neo4j:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/src/neo4j/langchain/Dockerfile . +docker build -t opea/retriever-neo4j:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/neo4j/langchain/Dockerfile . ``` ### Run Docker with CLI diff --git a/comps/retrievers/src/milvus/langchain/__init__.py b/comps/retrievers/neo4j/langchain/__init__.py similarity index 100% rename from comps/retrievers/src/milvus/langchain/__init__.py rename to comps/retrievers/neo4j/langchain/__init__.py diff --git a/comps/retrievers/src/neo4j/langchain/config.py b/comps/retrievers/neo4j/langchain/config.py similarity index 100% rename from comps/retrievers/src/neo4j/langchain/config.py rename to comps/retrievers/neo4j/langchain/config.py diff --git a/comps/retrievers/src/neo4j/langchain/requirements.txt b/comps/retrievers/neo4j/langchain/requirements.txt similarity index 100% rename from comps/retrievers/src/neo4j/langchain/requirements.txt rename to comps/retrievers/neo4j/langchain/requirements.txt diff --git a/comps/retrievers/src/neo4j/langchain/retriever_neo4j.py b/comps/retrievers/neo4j/langchain/retriever_neo4j.py similarity index 100% rename from comps/retrievers/src/neo4j/langchain/retriever_neo4j.py rename to comps/retrievers/neo4j/langchain/retriever_neo4j.py diff --git a/comps/retrievers/src/neo4j/llama_index/Dockerfile b/comps/retrievers/neo4j/llama_index/Dockerfile similarity index 82% rename from comps/retrievers/src/neo4j/llama_index/Dockerfile rename to comps/retrievers/neo4j/llama_index/Dockerfile index ac6e2d8d6..1b601805d 100644 --- a/comps/retrievers/src/neo4j/llama_index/Dockerfile +++ b/comps/retrievers/neo4j/llama_index/Dockerfile @@ -26,10 +26,10 @@ COPY comps /home/user/comps RUN pip install --no-cache-dir --upgrade pip && \ if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch --index-url https://download.pytorch.org/whl/cpu; fi && \ - pip install --no-cache-dir -r /home/user/comps/retrievers/src/neo4j/llama_index/requirements.txt + pip install --no-cache-dir -r /home/user/comps/retrievers/neo4j/llama_index/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user -WORKDIR /home/user/comps/retrievers/src/neo4j/llama_index +WORKDIR /home/user/comps/retrievers/neo4j/llama_index ENTRYPOINT ["python", "retriever_community_answers_neo4j.py"] diff --git a/comps/retrievers/src/neo4j/llama_index/README.md b/comps/retrievers/neo4j/llama_index/README.md similarity index 96% rename from comps/retrievers/src/neo4j/llama_index/README.md rename to comps/retrievers/neo4j/llama_index/README.md index 9da84ff3f..eb6f01579 100644 --- a/comps/retrievers/src/neo4j/llama_index/README.md +++ b/comps/retrievers/neo4j/llama_index/README.md @@ -14,7 +14,7 @@ Retrieval follows these steps: ```bash cd ../../ -docker build -t opea/retriever-community-answers-neo4j:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/src/neo4j/llama_index/Dockerfile . +docker build -t opea/retriever-community-answers-neo4j:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/neo4j/llama_index/Dockerfile . ``` ### 2. Setup Environment Variables @@ -40,7 +40,7 @@ source ./set_env.sh Docker compose will start 5 microservices: retriever-neo4j-llamaindex, dataprep-neo4j-llamaindex, neo4j-apoc, tgi-gaudi-service and tei-embedding-service. Neo4j database supports embeddings natively so we do not need a separate vector store. Checkout the blog [Introducing the Property Graph Index: A Powerful New Way to Build Knowledge Graphs with LLMs](https://www.llamaindex.ai/blog/introducing-the-property-graph-index-a-powerful-new-way-to-build-knowledge-graphs-with-llms) for a better understanding of Property Graph Store and Index. ```bash -cd comps/retrievers/src/neo4j/llama_index +cd comps/retrievers/neo4j/llama_index docker compose -f compose.yaml up -d ``` diff --git a/comps/retrievers/src/neo4j/langchain/__init__.py b/comps/retrievers/neo4j/llama_index/__init__.py similarity index 100% rename from comps/retrievers/src/neo4j/langchain/__init__.py rename to comps/retrievers/neo4j/llama_index/__init__.py diff --git a/comps/retrievers/src/neo4j/llama_index/config.py b/comps/retrievers/neo4j/llama_index/config.py similarity index 100% rename from comps/retrievers/src/neo4j/llama_index/config.py rename to comps/retrievers/neo4j/llama_index/config.py diff --git a/comps/retrievers/deployment/docker_compose/neo4j_llama_index.yaml b/comps/retrievers/neo4j/llama_index/neo4j_llama_index.yaml similarity index 100% rename from comps/retrievers/deployment/docker_compose/neo4j_llama_index.yaml rename to comps/retrievers/neo4j/llama_index/neo4j_llama_index.yaml diff --git a/comps/retrievers/src/neo4j/llama_index/requirements.txt b/comps/retrievers/neo4j/llama_index/requirements.txt similarity index 100% rename from comps/retrievers/src/neo4j/llama_index/requirements.txt rename to comps/retrievers/neo4j/llama_index/requirements.txt diff --git a/comps/retrievers/src/neo4j/llama_index/retriever_community_answers_neo4j.py b/comps/retrievers/neo4j/llama_index/retriever_community_answers_neo4j.py similarity index 98% rename from comps/retrievers/src/neo4j/llama_index/retriever_community_answers_neo4j.py rename to comps/retrievers/neo4j/llama_index/retriever_community_answers_neo4j.py index 29b572678..830dc2775 100644 --- a/comps/retrievers/src/neo4j/llama_index/retriever_community_answers_neo4j.py +++ b/comps/retrievers/neo4j/llama_index/retriever_community_answers_neo4j.py @@ -46,7 +46,7 @@ RetrievalResponse, RetrievalResponseData, ) -from comps.dataprep.src.neo4j.llama_index.extract_graph_neo4j import GraphRAGStore, get_attribute_from_tgi_endpoint +from comps.dataprep.neo4j.llama_index.extract_graph_neo4j import GraphRAGStore, get_attribute_from_tgi_endpoint logger = CustomLogger("retriever_neo4j") logflag = os.getenv("LOGFLAG", False) diff --git a/comps/retrievers/src/neo4j/llama_index/set_env.sh b/comps/retrievers/neo4j/llama_index/set_env.sh similarity index 100% rename from comps/retrievers/src/neo4j/llama_index/set_env.sh rename to comps/retrievers/neo4j/llama_index/set_env.sh diff --git a/comps/retrievers/src/pathway/langchain/Dockerfile b/comps/retrievers/pathway/langchain/Dockerfile similarity index 80% rename from comps/retrievers/src/pathway/langchain/Dockerfile rename to comps/retrievers/pathway/langchain/Dockerfile index a71615bc2..3aba6ab45 100644 --- a/comps/retrievers/src/pathway/langchain/Dockerfile +++ b/comps/retrievers/pathway/langchain/Dockerfile @@ -19,10 +19,10 @@ USER user RUN pip install --no-cache-dir --upgrade pip setuptools && \ if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch torchvision --index-url https://download.pytorch.org/whl/cpu; fi && \ - pip install --no-cache-dir -r /home/user/comps/retrievers/src/pathway/langchain/requirements.txt + pip install --no-cache-dir -r /home/user/comps/retrievers/pathway/langchain/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user -WORKDIR /home/user/comps/retrievers/src/pathway/langchain +WORKDIR /home/user/comps/retrievers/pathway/langchain ENTRYPOINT ["bash", "entrypoint.sh"] diff --git a/comps/retrievers/src/pathway/langchain/README.md b/comps/retrievers/pathway/langchain/README.md similarity index 95% rename from comps/retrievers/src/pathway/langchain/README.md rename to comps/retrievers/pathway/langchain/README.md index b31b59171..8b365bc82 100644 --- a/comps/retrievers/src/pathway/langchain/README.md +++ b/comps/retrievers/pathway/langchain/README.md @@ -41,7 +41,7 @@ curl 127.0.0.1:6060/rerank \ #### Start Retriever Service Retriever service queries the Pathway vector store on incoming requests. -Make sure that Pathway vector store is already running, [see Pathway vector store here](../../../../vectorstores/src/pathway/README.md). +Make sure that Pathway vector store is already running, [see Pathway vector store here](../../../../vectorstores/pathway/README.md). Retriever service expects the Pathway host and port variables to connect to the vector DB. Set the Pathway vector store environment variables. @@ -52,7 +52,7 @@ export PATHWAY_PORT=8666 ```bash # make sure you are in the root folder of the repo -docker build -t opea/retriever-pathway:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/src/pathway/langchain/Dockerfile . +docker build -t opea/retriever-pathway:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/pathway/langchain/Dockerfile . docker run -p 7000:7000 -e PATHWAY_HOST=${PATHWAY_HOST} -e PATHWAY_PORT=${PATHWAY_PORT} -e http_proxy=$http_proxy -e https_proxy=$https_proxy --network="host" opea/retriever-pathway:latest ``` @@ -78,7 +78,7 @@ Note that following docker compose sets the `network_mode: host` in retriever im This will start the both the embedding and retriever services: ```bash -cd comps/retrievers/src/pathway/langchain +cd comps/retrievers/pathway/langchain docker compose -f docker_compose_retriever.yaml build docker compose -f docker_compose_retriever.yaml up diff --git a/comps/retrievers/src/pathway/langchain/entrypoint.sh b/comps/retrievers/pathway/langchain/entrypoint.sh similarity index 100% rename from comps/retrievers/src/pathway/langchain/entrypoint.sh rename to comps/retrievers/pathway/langchain/entrypoint.sh diff --git a/comps/retrievers/deployment/docker_compose/pathway_langchain.yaml b/comps/retrievers/pathway/langchain/pathway_langchain.yaml similarity index 100% rename from comps/retrievers/deployment/docker_compose/pathway_langchain.yaml rename to comps/retrievers/pathway/langchain/pathway_langchain.yaml diff --git a/comps/retrievers/src/pathway/langchain/requirements-runtime.txt b/comps/retrievers/pathway/langchain/requirements-runtime.txt similarity index 100% rename from comps/retrievers/src/pathway/langchain/requirements-runtime.txt rename to comps/retrievers/pathway/langchain/requirements-runtime.txt diff --git a/comps/retrievers/src/pathway/langchain/requirements.txt b/comps/retrievers/pathway/langchain/requirements.txt similarity index 100% rename from comps/retrievers/src/pathway/langchain/requirements.txt rename to comps/retrievers/pathway/langchain/requirements.txt diff --git a/comps/retrievers/src/pathway/langchain/retriever_pathway.py b/comps/retrievers/pathway/langchain/retriever_pathway.py similarity index 100% rename from comps/retrievers/src/pathway/langchain/retriever_pathway.py rename to comps/retrievers/pathway/langchain/retriever_pathway.py diff --git a/comps/retrievers/src/pgvector/langchain/Dockerfile b/comps/retrievers/pgvector/langchain/Dockerfile similarity index 80% rename from comps/retrievers/src/pgvector/langchain/Dockerfile rename to comps/retrievers/pgvector/langchain/Dockerfile index af00c0d0c..13b241b95 100644 --- a/comps/retrievers/src/pgvector/langchain/Dockerfile +++ b/comps/retrievers/pgvector/langchain/Dockerfile @@ -19,10 +19,10 @@ USER user RUN pip install --no-cache-dir --upgrade pip setuptools && \ if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch torchvision --index-url https://download.pytorch.org/whl/cpu; fi && \ - pip install --no-cache-dir -r /home/user/comps/retrievers/src/pgvector/langchain/requirements.txt + pip install --no-cache-dir -r /home/user/comps/retrievers/pgvector/langchain/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user -WORKDIR /home/user/comps/retrievers/src/pgvector/langchain +WORKDIR /home/user/comps/retrievers/pgvector/langchain ENTRYPOINT ["python", "retriever_pgvector.py"] diff --git a/comps/retrievers/src/pgvector/langchain/README.md b/comps/retrievers/pgvector/langchain/README.md similarity index 97% rename from comps/retrievers/src/pgvector/langchain/README.md rename to comps/retrievers/pgvector/langchain/README.md index 3d27b5869..ef11cd182 100644 --- a/comps/retrievers/src/pgvector/langchain/README.md +++ b/comps/retrievers/pgvector/langchain/README.md @@ -72,7 +72,7 @@ export TEI_EMBEDDING_ENDPOINT="http://${your_ip}:6060" ```bash cd ../../../../ -docker build -t opea/retriever-pgvector:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/src/pgvector/langchain/Dockerfile . +docker build -t opea/retriever-pgvector:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/pgvector/langchain/Dockerfile . ``` To start a docker container, you have two options: @@ -91,7 +91,7 @@ docker run -d --name="retriever-pgvector" -p 7000:7000 --ipc=host -e http_proxy= ### 2.4 Run Docker with Docker Compose (Option B) ```bash -cd comps/retrievers/src/pgvector/langchain +cd comps/retrievers/pgvector/langchain docker compose -f docker_compose_retriever.yaml up -d ``` diff --git a/comps/retrievers/src/pgvector/langchain/config.py b/comps/retrievers/pgvector/langchain/config.py similarity index 100% rename from comps/retrievers/src/pgvector/langchain/config.py rename to comps/retrievers/pgvector/langchain/config.py diff --git a/comps/retrievers/deployment/docker_compose/pgvector_langchain.yaml b/comps/retrievers/pgvector/langchain/pgvector_langchain.yaml similarity index 100% rename from comps/retrievers/deployment/docker_compose/pgvector_langchain.yaml rename to comps/retrievers/pgvector/langchain/pgvector_langchain.yaml diff --git a/comps/retrievers/src/pgvector/langchain/requirements.txt b/comps/retrievers/pgvector/langchain/requirements.txt similarity index 100% rename from comps/retrievers/src/pgvector/langchain/requirements.txt rename to comps/retrievers/pgvector/langchain/requirements.txt diff --git a/comps/retrievers/src/pgvector/langchain/retriever_pgvector.py b/comps/retrievers/pgvector/langchain/retriever_pgvector.py similarity index 100% rename from comps/retrievers/src/pgvector/langchain/retriever_pgvector.py rename to comps/retrievers/pgvector/langchain/retriever_pgvector.py diff --git a/comps/retrievers/src/pinecone/langchain/Dockerfile b/comps/retrievers/pinecone/langchain/Dockerfile similarity index 85% rename from comps/retrievers/src/pinecone/langchain/Dockerfile rename to comps/retrievers/pinecone/langchain/Dockerfile index 51011c21f..d6b7bcb2c 100644 --- a/comps/retrievers/src/pinecone/langchain/Dockerfile +++ b/comps/retrievers/pinecone/langchain/Dockerfile @@ -19,10 +19,10 @@ USER user RUN pip install --no-cache-dir --upgrade pip setuptools && \ if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch torchvision --index-url https://download.pytorch.org/whl/cpu; fi && \ - pip install --no-cache-dir --no-warn-script-location -r /home/user/comps/retrievers/src/pinecone/langchain/requirements.txt + pip install --no-cache-dir --no-warn-script-location -r /home/user/comps/retrievers/pinecone/langchain/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user -WORKDIR /home/user/comps/retrievers/src/pinecone/langchain +WORKDIR /home/user/comps/retrieverss/pinecone/langchain ENTRYPOINT ["python", "retriever_pinecone.py"] diff --git a/comps/retrievers/src/neo4j/llama_index/__init__.py b/comps/retrievers/pinecone/langchain/__init__.py similarity index 100% rename from comps/retrievers/src/neo4j/llama_index/__init__.py rename to comps/retrievers/pinecone/langchain/__init__.py diff --git a/comps/retrievers/src/pinecone/langchain/config.py b/comps/retrievers/pinecone/langchain/config.py similarity index 100% rename from comps/retrievers/src/pinecone/langchain/config.py rename to comps/retrievers/pinecone/langchain/config.py diff --git a/comps/retrievers/deployment/docker_compose/pinecone_langchain.yaml b/comps/retrievers/pinecone/langchain/pinecone_langchain.yaml similarity index 100% rename from comps/retrievers/deployment/docker_compose/pinecone_langchain.yaml rename to comps/retrievers/pinecone/langchain/pinecone_langchain.yaml diff --git a/comps/retrievers/src/pinecone/langchain/requirements.txt b/comps/retrievers/pinecone/langchain/requirements.txt similarity index 100% rename from comps/retrievers/src/pinecone/langchain/requirements.txt rename to comps/retrievers/pinecone/langchain/requirements.txt diff --git a/comps/retrievers/src/pinecone/langchain/retriever_pinecone.py b/comps/retrievers/pinecone/langchain/retriever_pinecone.py similarity index 100% rename from comps/retrievers/src/pinecone/langchain/retriever_pinecone.py rename to comps/retrievers/pinecone/langchain/retriever_pinecone.py diff --git a/comps/retrievers/src/qdrant/haystack/Dockerfile b/comps/retrievers/qdrant/haystack/Dockerfile similarity index 85% rename from comps/retrievers/src/qdrant/haystack/Dockerfile rename to comps/retrievers/qdrant/haystack/Dockerfile index 4d5b123c7..eda88428b 100644 --- a/comps/retrievers/src/qdrant/haystack/Dockerfile +++ b/comps/retrievers/qdrant/haystack/Dockerfile @@ -16,10 +16,10 @@ USER user COPY comps /home/user/comps RUN python -m pip install --no-cache-dir --upgrade pip setuptools && \ - python -m pip install --no-cache-dir -r /home/user/comps/retrievers/src/qdrant/haystack/requirements.txt + python -m pip install --no-cache-dir -r /home/user/comps/retrievers/qdrant/haystack/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user -WORKDIR /home/user/comps/retrievers/src/qdrant/haystack +WORKDIR /home/user/comps/retrievers/qdrant/haystack ENTRYPOINT ["python", "retriever_qdrant.py"] diff --git a/comps/retrievers/src/qdrant/haystack/README.md b/comps/retrievers/qdrant/haystack/README.md similarity index 94% rename from comps/retrievers/src/qdrant/haystack/README.md rename to comps/retrievers/qdrant/haystack/README.md index 92fa66790..2208432c0 100644 --- a/comps/retrievers/src/qdrant/haystack/README.md +++ b/comps/retrievers/qdrant/haystack/README.md @@ -10,7 +10,7 @@ pip install -r requirements.txt ### 1.2 Start Qdrant Server -Please refer to this [readme](../../../../vectorstores/src/qdrant/README.md). +Please refer to this [readme](../../../../vectorstores/qdrant/README.md). ### 1.3 Setup Environment Variables @@ -42,7 +42,7 @@ export TEI_EMBEDDING_ENDPOINT="http://${your_ip}:6060" ```bash cd ../../../../ -docker build -t opea/retriever-qdrant:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/src/qdrant/haystack/Dockerfile . +docker build -t opea/retriever-qdrant:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/qdrant/haystack/Dockerfile . ``` ### 2.3 Run Docker with CLI diff --git a/comps/retrievers/src/pinecone/langchain/__init__.py b/comps/retrievers/qdrant/haystack/__init__.py similarity index 100% rename from comps/retrievers/src/pinecone/langchain/__init__.py rename to comps/retrievers/qdrant/haystack/__init__.py diff --git a/comps/retrievers/src/qdrant/haystack/qdrant_config.py b/comps/retrievers/qdrant/haystack/qdrant_config.py similarity index 100% rename from comps/retrievers/src/qdrant/haystack/qdrant_config.py rename to comps/retrievers/qdrant/haystack/qdrant_config.py diff --git a/comps/retrievers/src/qdrant/haystack/requirements.txt b/comps/retrievers/qdrant/haystack/requirements.txt similarity index 100% rename from comps/retrievers/src/qdrant/haystack/requirements.txt rename to comps/retrievers/qdrant/haystack/requirements.txt diff --git a/comps/retrievers/src/qdrant/haystack/retriever_qdrant.py b/comps/retrievers/qdrant/haystack/retriever_qdrant.py similarity index 100% rename from comps/retrievers/src/qdrant/haystack/retriever_qdrant.py rename to comps/retrievers/qdrant/haystack/retriever_qdrant.py diff --git a/comps/retrievers/src/redis/langchain/Dockerfile b/comps/retrievers/redis/langchain/Dockerfile similarity index 81% rename from comps/retrievers/src/redis/langchain/Dockerfile rename to comps/retrievers/redis/langchain/Dockerfile index 2b24915aa..c2c5168f2 100644 --- a/comps/retrievers/src/redis/langchain/Dockerfile +++ b/comps/retrievers/redis/langchain/Dockerfile @@ -19,10 +19,10 @@ USER user RUN pip install --no-cache-dir --upgrade pip setuptools && \ if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch torchvision --index-url https://download.pytorch.org/whl/cpu; fi && \ - pip install --no-cache-dir -r /home/user/comps/retrievers/src/redis/langchain/requirements.txt + pip install --no-cache-dir -r /home/user/comps/retrievers/redis/langchain/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user -WORKDIR /home/user/comps/retrievers/src/redis/langchain +WORKDIR /home/user/comps/retrievers/redis/langchain ENTRYPOINT ["python", "retriever_redis.py"] diff --git a/comps/retrievers/src/redis/langchain/README.md b/comps/retrievers/redis/langchain/README.md similarity index 99% rename from comps/retrievers/src/redis/langchain/README.md rename to comps/retrievers/redis/langchain/README.md index 17b7747cb..2172bcbc1 100644 --- a/comps/retrievers/src/redis/langchain/README.md +++ b/comps/retrievers/redis/langchain/README.md @@ -81,7 +81,7 @@ export BRIDGE_TOWER_EMBEDDING=true ```bash cd ../../../../ -docker build -t opea/retriever-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/src/redis/langchain/Dockerfile . +docker build -t opea/retriever-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/redis/langchain/Dockerfile . ``` To start a docker container, you have two options: diff --git a/comps/retrievers/src/qdrant/haystack/__init__.py b/comps/retrievers/redis/langchain/__init__.py similarity index 100% rename from comps/retrievers/src/qdrant/haystack/__init__.py rename to comps/retrievers/redis/langchain/__init__.py diff --git a/comps/retrievers/src/redis/langchain/redis_config.py b/comps/retrievers/redis/langchain/redis_config.py similarity index 100% rename from comps/retrievers/src/redis/langchain/redis_config.py rename to comps/retrievers/redis/langchain/redis_config.py diff --git a/comps/retrievers/deployment/docker_compose/redis_langchain.yaml b/comps/retrievers/redis/langchain/redis_langchain.yaml similarity index 100% rename from comps/retrievers/deployment/docker_compose/redis_langchain.yaml rename to comps/retrievers/redis/langchain/redis_langchain.yaml diff --git a/comps/retrievers/src/redis/langchain/redis_schema.yml b/comps/retrievers/redis/langchain/redis_schema.yml similarity index 100% rename from comps/retrievers/src/redis/langchain/redis_schema.yml rename to comps/retrievers/redis/langchain/redis_schema.yml diff --git a/comps/retrievers/src/redis/langchain/redis_schema_multi.yml b/comps/retrievers/redis/langchain/redis_schema_multi.yml similarity index 100% rename from comps/retrievers/src/redis/langchain/redis_schema_multi.yml rename to comps/retrievers/redis/langchain/redis_schema_multi.yml diff --git a/comps/retrievers/src/redis/langchain/requirements.txt b/comps/retrievers/redis/langchain/requirements.txt similarity index 100% rename from comps/retrievers/src/redis/langchain/requirements.txt rename to comps/retrievers/redis/langchain/requirements.txt diff --git a/comps/retrievers/src/redis/langchain/retriever_redis.py b/comps/retrievers/redis/langchain/retriever_redis.py similarity index 98% rename from comps/retrievers/src/redis/langchain/retriever_redis.py rename to comps/retrievers/redis/langchain/retriever_redis.py index ad5adbae6..5737acb38 100644 --- a/comps/retrievers/src/redis/langchain/retriever_redis.py +++ b/comps/retrievers/redis/langchain/retriever_redis.py @@ -30,7 +30,7 @@ RetrievalResponse, RetrievalResponseData, ) -from comps.embeddings.multimodal.bridgetower import BridgeTowerEmbedding +from comps.embeddings.src.integrations.dependency.bridgetower import BridgeTowerEmbedding logger = CustomLogger("retriever_redis") logflag = os.getenv("LOGFLAG", False) diff --git a/comps/retrievers/src/redis/llama_index/Dockerfile b/comps/retrievers/redis/llama_index/Dockerfile similarity index 79% rename from comps/retrievers/src/redis/llama_index/Dockerfile rename to comps/retrievers/redis/llama_index/Dockerfile index 6550198a3..2e48e8eff 100644 --- a/comps/retrievers/src/redis/llama_index/Dockerfile +++ b/comps/retrievers/redis/llama_index/Dockerfile @@ -23,13 +23,13 @@ USER user RUN pip install --no-cache-dir --upgrade pip setuptools && \ if [ ${ARCH} = "cpu" ]; then \ - pip install --no-cache-dir --extra-index-url https://download.pytorch.org/whl/cpu -r /home/user/comps/retrievers/src/redis/llama_index/requirements.txt; \ + pip install --no-cache-dir --extra-index-url https://download.pytorch.org/whl/cpu -r /home/user/comps/retrievers/redis/llama_index/requirements.txt; \ else \ - pip install --no-cache-dir -r /home/user/comps/retrievers/src/redis/llama_index/requirements.txt; \ + pip install --no-cache-dir -r /home/user/comps/retrievers/redis/llama_index/requirements.txt; \ fi; ENV PYTHONPATH=$PYTHONPATH:/home/user -WORKDIR /home/user/comps/retrievers/src/redis/llama_index +WORKDIR /home/user/comps/retrievers/redis/llama_index ENTRYPOINT ["python", "retriever_redis.py"] diff --git a/comps/retrievers/src/redis/llama_index/README.md b/comps/retrievers/redis/llama_index/README.md similarity index 98% rename from comps/retrievers/src/redis/llama_index/README.md rename to comps/retrievers/redis/llama_index/README.md index f7a2e581b..9c3bca027 100644 --- a/comps/retrievers/src/redis/llama_index/README.md +++ b/comps/retrievers/redis/llama_index/README.md @@ -48,7 +48,7 @@ export INDEX_NAME=${your_index_name} ```bash cd ../../../.. -docker build -t opea/retriever-redis-llamaindex:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/src/redis/llama_index/Dockerfile . +docker build -t opea/retriever-redis-llamaindex:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/redis/llama_index/Dockerfile . ``` To start a docker container, you have two options: diff --git a/comps/retrievers/src/redis/langchain/__init__.py b/comps/retrievers/redis/llama_index/__init__.py similarity index 100% rename from comps/retrievers/src/redis/langchain/__init__.py rename to comps/retrievers/redis/llama_index/__init__.py diff --git a/comps/retrievers/src/redis/llama_index/redis_config.py b/comps/retrievers/redis/llama_index/redis_config.py similarity index 100% rename from comps/retrievers/src/redis/llama_index/redis_config.py rename to comps/retrievers/redis/llama_index/redis_config.py diff --git a/comps/retrievers/deployment/docker_compose/redis_llama_index.yaml b/comps/retrievers/redis/llama_index/redis_llama_index.yaml similarity index 100% rename from comps/retrievers/deployment/docker_compose/redis_llama_index.yaml rename to comps/retrievers/redis/llama_index/redis_llama_index.yaml diff --git a/comps/retrievers/src/redis/llama_index/requirements.txt b/comps/retrievers/redis/llama_index/requirements.txt similarity index 100% rename from comps/retrievers/src/redis/llama_index/requirements.txt rename to comps/retrievers/redis/llama_index/requirements.txt diff --git a/comps/retrievers/src/redis/llama_index/retriever_redis.py b/comps/retrievers/redis/llama_index/retriever_redis.py similarity index 100% rename from comps/retrievers/src/redis/llama_index/retriever_redis.py rename to comps/retrievers/redis/llama_index/retriever_redis.py diff --git a/comps/retrievers/src/vdms/langchain/Dockerfile b/comps/retrievers/vdms/langchain/Dockerfile similarity index 84% rename from comps/retrievers/src/vdms/langchain/Dockerfile rename to comps/retrievers/vdms/langchain/Dockerfile index 9e2cf7640..ce79a6b37 100644 --- a/comps/retrievers/src/vdms/langchain/Dockerfile +++ b/comps/retrievers/vdms/langchain/Dockerfile @@ -19,7 +19,7 @@ COPY comps /home/user/comps USER user RUN pip install --no-cache-dir --upgrade pip setuptools && \ if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch torchvision --index-url https://download.pytorch.org/whl/cpu; fi && \ - pip install --no-cache-dir -r /home/user/comps/retrievers/src/vdms/langchain/requirements.txt + pip install --no-cache-dir -r /home/user/comps/retrievers/vdms/langchain/requirements.txt RUN pip install --no-cache-dir -U \ huggingface-hub \ @@ -32,6 +32,6 @@ ENV HUGGINGFACEHUB_API_TOKEN=dummy ENV USECLIP 0 -WORKDIR /home/user/comps/retrievers/src/vdms/langchain +WORKDIR /home/user/comps/retrievers/vdms/langchain ENTRYPOINT ["python", "retriever_vdms.py"] diff --git a/comps/retrievers/src/vdms/langchain/README.md b/comps/retrievers/vdms/langchain/README.md similarity index 99% rename from comps/retrievers/src/vdms/langchain/README.md rename to comps/retrievers/vdms/langchain/README.md index 49ada9fc6..489df71c8 100644 --- a/comps/retrievers/src/vdms/langchain/README.md +++ b/comps/retrievers/vdms/langchain/README.md @@ -84,7 +84,7 @@ export TEI_EMBEDDING_ENDPOINT="http://${your_ip}:6060" ```bash cd ../../../../ -docker build -t opea/retriever-vdms:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/src/vdms/langchain/Dockerfile . +docker build -t opea/retriever-vdms:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/vdms/langchain/Dockerfile . ``` To start a docker container, you have two options: diff --git a/comps/retrievers/src/redis/llama_index/__init__.py b/comps/retrievers/vdms/langchain/__init__.py similarity index 100% rename from comps/retrievers/src/redis/llama_index/__init__.py rename to comps/retrievers/vdms/langchain/__init__.py diff --git a/comps/retrievers/src/vdms/langchain/requirements.txt b/comps/retrievers/vdms/langchain/requirements.txt similarity index 100% rename from comps/retrievers/src/vdms/langchain/requirements.txt rename to comps/retrievers/vdms/langchain/requirements.txt diff --git a/comps/retrievers/src/vdms/langchain/retriever_vdms.py b/comps/retrievers/vdms/langchain/retriever_vdms.py similarity index 100% rename from comps/retrievers/src/vdms/langchain/retriever_vdms.py rename to comps/retrievers/vdms/langchain/retriever_vdms.py diff --git a/comps/retrievers/src/vdms/langchain/vdms_config.py b/comps/retrievers/vdms/langchain/vdms_config.py similarity index 100% rename from comps/retrievers/src/vdms/langchain/vdms_config.py rename to comps/retrievers/vdms/langchain/vdms_config.py diff --git a/comps/retrievers/deployment/docker_compose/vdms_langchain.yaml b/comps/retrievers/vdms/langchain/vdms_langchain.yaml similarity index 100% rename from comps/retrievers/deployment/docker_compose/vdms_langchain.yaml rename to comps/retrievers/vdms/langchain/vdms_langchain.yaml diff --git a/comps/vectorstores/src/README.md b/comps/vectorstores/README.md similarity index 100% rename from comps/vectorstores/src/README.md rename to comps/vectorstores/README.md diff --git a/comps/retrievers/src/vdms/langchain/__init__.py b/comps/vectorstores/__init__.py similarity index 100% rename from comps/retrievers/src/vdms/langchain/__init__.py rename to comps/vectorstores/__init__.py diff --git a/comps/vectorstores/src/chroma/README.md b/comps/vectorstores/chroma/README.md similarity index 100% rename from comps/vectorstores/src/chroma/README.md rename to comps/vectorstores/chroma/README.md diff --git a/comps/vectorstores/src/__init__.py b/comps/vectorstores/chroma/__init__.py similarity index 100% rename from comps/vectorstores/src/__init__.py rename to comps/vectorstores/chroma/__init__.py diff --git a/comps/vectorstores/deployment/docker_compose/README.md b/comps/vectorstores/deployment/docker_compose/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/comps/vectorstores/deployment/kubernetes/README.md b/comps/vectorstores/deployment/kubernetes/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/comps/vectorstores/src/elasticsearch/README.md b/comps/vectorstores/elasticsearch/README.md similarity index 100% rename from comps/vectorstores/src/elasticsearch/README.md rename to comps/vectorstores/elasticsearch/README.md diff --git a/comps/vectorstores/src/chroma/__init__.py b/comps/vectorstores/elasticsearch/__init__.py similarity index 100% rename from comps/vectorstores/src/chroma/__init__.py rename to comps/vectorstores/elasticsearch/__init__.py diff --git a/comps/vectorstores/deployment/docker_compose/elasticsearch.yaml b/comps/vectorstores/elasticsearch/elasticsearch.yaml similarity index 100% rename from comps/vectorstores/deployment/docker_compose/elasticsearch.yaml rename to comps/vectorstores/elasticsearch/elasticsearch.yaml diff --git a/comps/vectorstores/src/lancedb/README.md b/comps/vectorstores/lancedb/README.md similarity index 100% rename from comps/vectorstores/src/lancedb/README.md rename to comps/vectorstores/lancedb/README.md diff --git a/comps/vectorstores/src/elasticsearch/__init__.py b/comps/vectorstores/lancedb/__init__.py similarity index 100% rename from comps/vectorstores/src/elasticsearch/__init__.py rename to comps/vectorstores/lancedb/__init__.py diff --git a/comps/vectorstores/src/milvus/README.md b/comps/vectorstores/milvus/README.md similarity index 100% rename from comps/vectorstores/src/milvus/README.md rename to comps/vectorstores/milvus/README.md diff --git a/comps/vectorstores/src/lancedb/__init__.py b/comps/vectorstores/milvus/__init__.py similarity index 100% rename from comps/vectorstores/src/lancedb/__init__.py rename to comps/vectorstores/milvus/__init__.py diff --git a/comps/vectorstores/deployment/docker_compose/milvus.yaml b/comps/vectorstores/milvus/docker-compose.yaml similarity index 100% rename from comps/vectorstores/deployment/docker_compose/milvus.yaml rename to comps/vectorstores/milvus/docker-compose.yaml diff --git a/comps/vectorstores/src/milvus/milvus.yaml b/comps/vectorstores/milvus/milvus.yaml similarity index 100% rename from comps/vectorstores/src/milvus/milvus.yaml rename to comps/vectorstores/milvus/milvus.yaml diff --git a/comps/vectorstores/src/pathway/Dockerfile b/comps/vectorstores/pathway/Dockerfile similarity index 100% rename from comps/vectorstores/src/pathway/Dockerfile rename to comps/vectorstores/pathway/Dockerfile diff --git a/comps/vectorstores/src/pathway/README.md b/comps/vectorstores/pathway/README.md similarity index 100% rename from comps/vectorstores/src/pathway/README.md rename to comps/vectorstores/pathway/README.md diff --git a/comps/vectorstores/src/milvus/__init__.py b/comps/vectorstores/pathway/__init__.py similarity index 100% rename from comps/vectorstores/src/milvus/__init__.py rename to comps/vectorstores/pathway/__init__.py diff --git a/comps/vectorstores/src/pathway/data/nke-10k-2023.pdf b/comps/vectorstores/pathway/data/nke-10k-2023.pdf similarity index 100% rename from comps/vectorstores/src/pathway/data/nke-10k-2023.pdf rename to comps/vectorstores/pathway/data/nke-10k-2023.pdf diff --git a/comps/vectorstores/src/pathway/requirements.txt b/comps/vectorstores/pathway/requirements.txt similarity index 100% rename from comps/vectorstores/src/pathway/requirements.txt rename to comps/vectorstores/pathway/requirements.txt diff --git a/comps/vectorstores/src/pathway/vectorstore_pathway.py b/comps/vectorstores/pathway/vectorstore_pathway.py similarity index 100% rename from comps/vectorstores/src/pathway/vectorstore_pathway.py rename to comps/vectorstores/pathway/vectorstore_pathway.py diff --git a/comps/vectorstores/src/pgvector/README.md b/comps/vectorstores/pgvector/README.md similarity index 100% rename from comps/vectorstores/src/pgvector/README.md rename to comps/vectorstores/pgvector/README.md diff --git a/comps/vectorstores/src/pathway/__init__.py b/comps/vectorstores/pgvector/__init__.py similarity index 100% rename from comps/vectorstores/src/pathway/__init__.py rename to comps/vectorstores/pgvector/__init__.py diff --git a/comps/vectorstores/src/pgvector/init.sql b/comps/vectorstores/pgvector/init.sql similarity index 100% rename from comps/vectorstores/src/pgvector/init.sql rename to comps/vectorstores/pgvector/init.sql diff --git a/comps/vectorstores/deployment/docker_compose/pgvector.yaml b/comps/vectorstores/pgvector/pgvector.yaml similarity index 100% rename from comps/vectorstores/deployment/docker_compose/pgvector.yaml rename to comps/vectorstores/pgvector/pgvector.yaml diff --git a/comps/vectorstores/src/pinecone/README.md b/comps/vectorstores/pinecone/README.md similarity index 100% rename from comps/vectorstores/src/pinecone/README.md rename to comps/vectorstores/pinecone/README.md diff --git a/comps/vectorstores/src/pgvector/__init__.py b/comps/vectorstores/pinecone/__init__.py similarity index 100% rename from comps/vectorstores/src/pgvector/__init__.py rename to comps/vectorstores/pinecone/__init__.py diff --git a/comps/vectorstores/src/qdrant/README.md b/comps/vectorstores/qdrant/README.md similarity index 100% rename from comps/vectorstores/src/qdrant/README.md rename to comps/vectorstores/qdrant/README.md diff --git a/comps/vectorstores/src/pinecone/__init__.py b/comps/vectorstores/qdrant/__init__.py similarity index 100% rename from comps/vectorstores/src/pinecone/__init__.py rename to comps/vectorstores/qdrant/__init__.py diff --git a/comps/vectorstores/src/redis/README.md b/comps/vectorstores/redis/README.md similarity index 100% rename from comps/vectorstores/src/redis/README.md rename to comps/vectorstores/redis/README.md diff --git a/comps/vectorstores/src/qdrant/__init__.py b/comps/vectorstores/redis/__init__.py similarity index 100% rename from comps/vectorstores/src/qdrant/__init__.py rename to comps/vectorstores/redis/__init__.py diff --git a/comps/vectorstores/deployment/docker_compose/redis.yaml b/comps/vectorstores/redis/redis.yaml similarity index 100% rename from comps/vectorstores/deployment/docker_compose/redis.yaml rename to comps/vectorstores/redis/redis.yaml diff --git a/comps/vectorstores/src/vdms/README.md b/comps/vectorstores/vdms/README.md similarity index 100% rename from comps/vectorstores/src/vdms/README.md rename to comps/vectorstores/vdms/README.md diff --git a/comps/vectorstores/src/redis/__init__.py b/comps/vectorstores/vdms/__init__.py similarity index 100% rename from comps/vectorstores/src/redis/__init__.py rename to comps/vectorstores/vdms/__init__.py diff --git a/comps/vectorstores/deployment/docker_compose/vdms.yaml b/comps/vectorstores/vdms/vdms.yaml similarity index 100% rename from comps/vectorstores/deployment/docker_compose/vdms.yaml rename to comps/vectorstores/vdms/vdms.yaml diff --git a/tests/dataprep/test_dataprep_elasticsearch_langchain.sh b/tests/dataprep/test_dataprep_elasticsearch_langchain.sh index c0fa0a779..a68bbac9f 100644 --- a/tests/dataprep/test_dataprep_elasticsearch_langchain.sh +++ b/tests/dataprep/test_dataprep_elasticsearch_langchain.sh @@ -16,7 +16,7 @@ function build_docker_images() { docker pull docker.elastic.co/elasticsearch/elasticsearch:8.16.0 # build dataprep image for elasticsearch - docker build --no-cache -t opea/dataprep-elasticsearch:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f $WORKPATH/comps/dataprep/src/elasticsearch/langchain/Dockerfile . + docker build --no-cache -t opea/dataprep-elasticsearch:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f $WORKPATH/comps/dataprep/elasticsearch/langchain/Dockerfile . if [ $? -ne 0 ]; then echo "opea/dataprep-elasticsearch built fail" exit 1 diff --git a/tests/dataprep/test_dataprep_milvus_langchain.sh b/tests/dataprep/test_dataprep_milvus_langchain.sh index 9bcce2797..de736fdd3 100644 --- a/tests/dataprep/test_dataprep_milvus_langchain.sh +++ b/tests/dataprep/test_dataprep_milvus_langchain.sh @@ -23,7 +23,7 @@ function build_docker_images() { function start_service() { # start milvus vector db - cd $WORKPATH/comps/dataprep/src/milvus/langchain/ + cd $WORKPATH/comps/dataprep/milvus/langchain/ # wget https://raw.githubusercontent.com/milvus-io/milvus/v2.4.9/configs/milvus.yaml # wget https://github.com/milvus-io/milvus/releases/download/v2.4.9/milvus-standalone-docker-compose.yml -O docker-compose.yml # sed '/- \${DOCKER_VOLUME_DIRECTORY:-\.}\/volumes\/milvus:\/var\/lib\/milvus/a \ \ \ \ \ \ - \${DOCKER_VOLUME_DIRECTORY:-\.}\/milvus.yaml:\/milvus\/configs\/milvus.yaml' -i docker-compose.yml diff --git a/tests/dataprep/test_dataprep_multimodal_redis_langchain.sh b/tests/dataprep/test_dataprep_multimodal_redis_langchain.sh index aca192677..664f72c62 100644 --- a/tests/dataprep/test_dataprep_multimodal_redis_langchain.sh +++ b/tests/dataprep/test_dataprep_multimodal_redis_langchain.sh @@ -24,7 +24,7 @@ caption_fn="${tmp_dir}/${image_name}.txt" function build_docker_images() { cd $WORKPATH echo $(pwd) - docker build --no-cache -t opea/dataprep-multimodal-redis:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/src/multimodal/redis/langchain/Dockerfile . + docker build --no-cache -t opea/dataprep-multimodal-redis:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/multimodal/redis/langchain/Dockerfile . if [ $? -ne 0 ]; then echo "opea/dataprep-multimodal-redis built fail" diff --git a/tests/dataprep/test_dataprep_neo4j_llama_index_on_intel_hpu.sh b/tests/dataprep/test_dataprep_neo4j_llama_index_on_intel_hpu.sh index 8a2471f86..aeacdea0a 100755 --- a/tests/dataprep/test_dataprep_neo4j_llama_index_on_intel_hpu.sh +++ b/tests/dataprep/test_dataprep_neo4j_llama_index_on_intel_hpu.sh @@ -11,7 +11,7 @@ ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { cd $WORKPATH echo $(pwd) - docker build --no-cache -t opea/dataprep-neo4j-llamaindex:comps --build-arg no_proxy=$no_proxy --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/src/neo4j/llama_index/Dockerfile . + docker build --no-cache -t opea/dataprep-neo4j-llamaindex:comps --build-arg no_proxy=$no_proxy --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/neo4j/llama_index/Dockerfile . if [ $? -ne 0 ]; then echo "opea/dataprep-neo4j-llamaindex built fail" exit 1 diff --git a/tests/dataprep/test_dataprep_pgvector_langchain.sh b/tests/dataprep/test_dataprep_pgvector_langchain.sh index 48d7a40e8..58592cb89 100644 --- a/tests/dataprep/test_dataprep_pgvector_langchain.sh +++ b/tests/dataprep/test_dataprep_pgvector_langchain.sh @@ -16,7 +16,7 @@ function build_docker_images() { docker pull pgvector/pgvector:0.7.0-pg16 # build dataprep image for pgvector - docker build --no-cache -t opea/dataprep-pgvector:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f $WORKPATH/comps/dataprep/src/pgvector/langchain/Dockerfile . + docker build --no-cache -t opea/dataprep-pgvector:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f $WORKPATH/comps/dataprep/pgvector/langchain/Dockerfile . if [ $? -ne 0 ]; then echo "opea/dataprep-pgvector built fail" exit 1 diff --git a/tests/dataprep/test_dataprep_pinecone_langchain.sh b/tests/dataprep/test_dataprep_pinecone_langchain.sh index c98152d88..2a4eda8ef 100644 --- a/tests/dataprep/test_dataprep_pinecone_langchain.sh +++ b/tests/dataprep/test_dataprep_pinecone_langchain.sh @@ -10,7 +10,7 @@ function build_docker_images() { cd $WORKPATH # build dataprep image for pinecone - docker build --no-cache -t opea/dataprep-pinecone:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f $WORKPATH/comps/dataprep/src/pinecone/langchain/Dockerfile . + docker build --no-cache -t opea/dataprep-pinecone:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f $WORKPATH/comps/dataprep/pinecone/langchain/Dockerfile . if [ $? -ne 0 ]; then echo "opea/dataprep-pinecone built fail" exit 1 diff --git a/tests/dataprep/test_dataprep_qdrant_langchain.sh b/tests/dataprep/test_dataprep_qdrant_langchain.sh index b6506438b..226d45475 100644 --- a/tests/dataprep/test_dataprep_qdrant_langchain.sh +++ b/tests/dataprep/test_dataprep_qdrant_langchain.sh @@ -12,7 +12,7 @@ function build_docker_images() { cd $WORKPATH # dataprep qdrant image - docker build --no-cache -t opea/dataprep-qdrant:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/src/qdrant/langchain/Dockerfile . + docker build --no-cache -t opea/dataprep-qdrant:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/qdrant/langchain/Dockerfile . if [ $? -ne 0 ]; then echo "opea/dataprep-qdrant built fail" exit 1 diff --git a/tests/dataprep/test_dataprep_redis_langchain_ray.sh b/tests/dataprep/test_dataprep_redis_langchain_ray.sh index b00ba4259..4a50fabaa 100644 --- a/tests/dataprep/test_dataprep_redis_langchain_ray.sh +++ b/tests/dataprep/test_dataprep_redis_langchain_ray.sh @@ -11,7 +11,7 @@ ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { echo "Building the docker images" cd $WORKPATH - docker build --no-cache -t opea/dataprep-on-ray-redis:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/src/redis/langchain_ray/Dockerfile . + docker build --no-cache -t opea/dataprep-on-ray-redis:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/redis/langchain_ray/Dockerfile . if [ $? -ne 0 ]; then echo "opea/dataprep-on-ray-redis built fail" exit 1 diff --git a/tests/dataprep/test_dataprep_redis_llama_index.sh b/tests/dataprep/test_dataprep_redis_llama_index.sh index eb5239f26..d76a99a85 100644 --- a/tests/dataprep/test_dataprep_redis_llama_index.sh +++ b/tests/dataprep/test_dataprep_redis_llama_index.sh @@ -11,7 +11,7 @@ ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { cd $WORKPATH echo $(pwd) - docker build --no-cache -t opea/dataprep-redis-llama-index:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/src/redis/llama_index/Dockerfile . + docker build --no-cache -t opea/dataprep-redis-llama-index:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/redis/llama_index/Dockerfile . if [ $? -ne 0 ]; then echo "opea/dataprep-redis-llama-index built fail" exit 1 diff --git a/tests/dataprep/test_dataprep_vdms_langchain.sh b/tests/dataprep/test_dataprep_vdms_langchain.sh index 295b4a4df..4fe0d0f0a 100644 --- a/tests/dataprep/test_dataprep_vdms_langchain.sh +++ b/tests/dataprep/test_dataprep_vdms_langchain.sh @@ -11,7 +11,7 @@ ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { cd $WORKPATH echo $(pwd) - docker build --no-cache -t opea/dataprep-vdms:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/src/vdms/langchain/Dockerfile . + docker build --no-cache -t opea/dataprep-vdms:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/vdms/langchain/Dockerfile . if [ $? -ne 0 ]; then echo "opea/dataprep-vdms built fail" diff --git a/tests/dataprep/test_dataprep_vdms_multimodal_langchain.sh b/tests/dataprep/test_dataprep_vdms_multimodal_langchain.sh index d9f78e4db..3dc70a7a3 100755 --- a/tests/dataprep/test_dataprep_vdms_multimodal_langchain.sh +++ b/tests/dataprep/test_dataprep_vdms_multimodal_langchain.sh @@ -11,7 +11,7 @@ ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { cd $WORKPATH echo $(pwd) - docker build --no-cache -t opea/dataprep-vdms:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/src/vdms/multimodal_langchain/Dockerfile . + docker build --no-cache -t opea/dataprep-vdms:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/vdms/multimodal_langchain/Dockerfile . if [ $? -ne 0 ]; then echo "opea/dataprep-vdms built fail" diff --git a/tests/retrievers/test_retrievers_elasticsearch_langchain.sh b/tests/retrievers/test_retrievers_elasticsearch_langchain.sh index 7f28d7968..53db592b5 100644 --- a/tests/retrievers/test_retrievers_elasticsearch_langchain.sh +++ b/tests/retrievers/test_retrievers_elasticsearch_langchain.sh @@ -10,7 +10,7 @@ ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { cd $WORKPATH - docker build --no-cache -t opea/retriever-elasticsearch:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/src/elasticsearch/langchain/Dockerfile . + docker build --no-cache -t opea/retriever-elasticsearch:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/elasticsearch/langchain/Dockerfile . if [ $? -ne 0 ]; then echo "opea/retriever-elasticsearch built fail" exit 1 diff --git a/tests/retrievers/test_retrievers_milvus_langchain.sh b/tests/retrievers/test_retrievers_milvus_langchain.sh index 4e44eed3b..baae17d7d 100644 --- a/tests/retrievers/test_retrievers_milvus_langchain.sh +++ b/tests/retrievers/test_retrievers_milvus_langchain.sh @@ -21,7 +21,7 @@ function build_docker_images() { function start_service() { # start milvus vector db - cd $WORKPATH/comps/dataprep/src/milvus/langchain/ + cd $WORKPATH/comps/dataprep/milvus/langchain/ # wget https://raw.githubusercontent.com/milvus-io/milvus/v2.4.9/configs/milvus.yaml # wget https://github.com/milvus-io/milvus/releases/download/v2.4.9/milvus-standalone-docker-compose.yml -O docker-compose.yml # sed '/- \${DOCKER_VOLUME_DIRECTORY:-\.}\/volumes\/milvus:\/var\/lib\/milvus/a \ \ \ \ \ \ - \${DOCKER_VOLUME_DIRECTORY:-\.}\/milvus.yaml:\/milvus\/configs\/milvus.yaml' -i docker-compose.yml diff --git a/tests/retrievers/test_retrievers_neo4j_langchain.sh b/tests/retrievers/test_retrievers_neo4j_langchain.sh index ca4fe2d5e..9855fe75f 100644 --- a/tests/retrievers/test_retrievers_neo4j_langchain.sh +++ b/tests/retrievers/test_retrievers_neo4j_langchain.sh @@ -13,7 +13,7 @@ function build_docker_images() { docker run -d -p 7474:7474 -p 7687:7687 -v ./data:/data -v ./plugins:/plugins --name test-comps-neo4j-apoc1 -e NEO4J_AUTH=neo4j/password -e NEO4J_PLUGINS=\[\"apoc\"\] neo4j:latest sleep 30s - docker build --no-cache -t opea/retriever-neo4j:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/src/neo4j/langchain/Dockerfile . + docker build --no-cache -t opea/retriever-neo4j:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/neo4j/langchain/Dockerfile . if [ $? -ne 0 ]; then echo "opea/retriever-neo4j built fail" exit 1 diff --git a/tests/retrievers/test_retrievers_neo4j_llama_index_on_intel_hpu.sh b/tests/retrievers/test_retrievers_neo4j_llama_index_on_intel_hpu.sh index 6c7e76745..3d252ffc1 100755 --- a/tests/retrievers/test_retrievers_neo4j_llama_index_on_intel_hpu.sh +++ b/tests/retrievers/test_retrievers_neo4j_llama_index_on_intel_hpu.sh @@ -11,7 +11,7 @@ ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { cd $WORKPATH echo "current dir: $PWD" - docker build --no-cache -t opea/retriever-neo4j-llamaindex:comps --build-arg no_proxy=$no_proxy --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/src/neo4j/llama_index/Dockerfile . + docker build --no-cache -t opea/retriever-neo4j-llamaindex:comps --build-arg no_proxy=$no_proxy --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/neo4j/llama_index/Dockerfile . if [ $? -ne 0 ]; then echo "opea/retriever-neo4j-llamaindex built fail" exit 1 @@ -19,7 +19,7 @@ function build_docker_images() { echo "opea/retriever-neo4j-llamaindex built successful" fi - docker build --no-cache -t opea/dataprep-neo4j-llamaindex:comps --build-arg no_proxy=$no_proxy --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/src/neo4j/llama_index/Dockerfile . + docker build --no-cache -t opea/dataprep-neo4j-llamaindex:comps --build-arg no_proxy=$no_proxy --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/neo4j/llama_index/Dockerfile . if [ $? -ne 0 ]; then echo "opea/dataprep-neo4j-llamaindex built fail" exit 1 diff --git a/tests/retrievers/test_retrievers_pathway_langchain.sh b/tests/retrievers/test_retrievers_pathway_langchain.sh index a4e86aa8f..33d60b025 100644 --- a/tests/retrievers/test_retrievers_pathway_langchain.sh +++ b/tests/retrievers/test_retrievers_pathway_langchain.sh @@ -10,11 +10,11 @@ ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { cd $WORKPATH - docker build --no-cache --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -t opea/vectorstore-pathway:comps -f comps/vectorstores/src/pathway/Dockerfile . + docker build --no-cache --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -t opea/vectorstore-pathway:comps -f comps/vectorstores/pathway/Dockerfile . cd $WORKPATH - docker build --no-cache -t opea/retriever-pathway:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/src/pathway/langchain/Dockerfile . + docker build --no-cache -t opea/retriever-pathway:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/pathway/langchain/Dockerfile . if [ $? -ne 0 ]; then echo "opea/retriever-pathway built fail" exit 1 @@ -46,7 +46,7 @@ function start_service() { export PATHWAY_HOST="0.0.0.0" export PATHWAY_PORT=5433 - docker run -d --name="test-comps-retriever-pathway-vectorstore" -e PATHWAY_HOST=${PATHWAY_HOST} -e PATHWAY_PORT=${PATHWAY_PORT} -e TEI_EMBEDDING_ENDPOINT=${TEI_EMBEDDING_ENDPOINT} -e http_proxy=$http_proxy -e https_proxy=$https_proxy -v $WORKPATH/comps/vectorstores/src/pathway/README.md:/app/data/README.md -p ${PATHWAY_PORT}:${PATHWAY_PORT} --network="host" opea/vectorstore-pathway:comps + docker run -d --name="test-comps-retriever-pathway-vectorstore" -e PATHWAY_HOST=${PATHWAY_HOST} -e PATHWAY_PORT=${PATHWAY_PORT} -e TEI_EMBEDDING_ENDPOINT=${TEI_EMBEDDING_ENDPOINT} -e http_proxy=$http_proxy -e https_proxy=$https_proxy -v $WORKPATH/comps/vectorstores/pathway/README.md:/app/data/README.md -p ${PATHWAY_PORT}:${PATHWAY_PORT} --network="host" opea/vectorstore-pathway:comps sleep 45s diff --git a/tests/retrievers/test_retrievers_pgvector_langchain.sh b/tests/retrievers/test_retrievers_pgvector_langchain.sh index 4fc2ee51a..40825de6b 100644 --- a/tests/retrievers/test_retrievers_pgvector_langchain.sh +++ b/tests/retrievers/test_retrievers_pgvector_langchain.sh @@ -9,7 +9,7 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { cd $WORKPATH - docker build --no-cache -t opea/retriever-pgvector:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/src/pgvector/langchain/Dockerfile . + docker build --no-cache -t opea/retriever-pgvector:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/pgvector/langchain/Dockerfile . if [ $? -ne 0 ]; then echo "opea/retriever-pgvector built fail" exit 1 diff --git a/tests/retrievers/test_retrievers_pinecone_langchain.sh b/tests/retrievers/test_retrievers_pinecone_langchain.sh index 39dc542d2..a6604e0e9 100644 --- a/tests/retrievers/test_retrievers_pinecone_langchain.sh +++ b/tests/retrievers/test_retrievers_pinecone_langchain.sh @@ -10,7 +10,7 @@ ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { cd $WORKPATH - docker build --no-cache -t opea/retriever-pinecone:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/src/pinecone/langchain/Dockerfile . + docker build --no-cache -t opea/retriever-pinecone:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/pinecone/langchain/Dockerfile . if [ $? -ne 0 ]; then echo "opea/retriever-pinecone built fail" exit 1 diff --git a/tests/retrievers/test_retrievers_qdrant_haystack.sh b/tests/retrievers/test_retrievers_qdrant_haystack.sh index 15e8a14f9..ccc4762c6 100644 --- a/tests/retrievers/test_retrievers_qdrant_haystack.sh +++ b/tests/retrievers/test_retrievers_qdrant_haystack.sh @@ -9,7 +9,7 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { cd $WORKPATH - docker build --no-cache -t opea/retriever-qdrant:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/src/qdrant/haystack/Dockerfile . + docker build --no-cache -t opea/retriever-qdrant:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/qdrant/haystack/Dockerfile . if [ $? -ne 0 ]; then echo "opea/retriever-qdrant built fail" exit 1 diff --git a/tests/retrievers/test_retrievers_redis_langchain.sh b/tests/retrievers/test_retrievers_redis_langchain.sh index 242f66c14..cd43a64da 100644 --- a/tests/retrievers/test_retrievers_redis_langchain.sh +++ b/tests/retrievers/test_retrievers_redis_langchain.sh @@ -10,7 +10,7 @@ ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { cd $WORKPATH - docker build --no-cache -t opea/retriever-redis:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/src/Dockerfile . + docker build --no-cache -t opea/retriever-redis:comps --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/Dockerfile . if [ $? -ne 0 ]; then echo "opea/retriever-redis built fail" exit 1 diff --git a/tests/retrievers/test_retrievers_vdms_langchain.sh b/tests/retrievers/test_retrievers_vdms_langchain.sh index bb8158d41..7e480b7d2 100644 --- a/tests/retrievers/test_retrievers_vdms_langchain.sh +++ b/tests/retrievers/test_retrievers_vdms_langchain.sh @@ -16,7 +16,7 @@ function build_docker_images() { --build-arg https_proxy=$https_proxy \ --build-arg http_proxy=$http_proxy \ --build-arg huggingfacehub_api_token=$hf_token\ - -f comps/retrievers/src/vdms/langchain/Dockerfile . + -f comps/retrievers/vdms/langchain/Dockerfile . } diff --git a/tests/vectorstores/test_vectorstores_milvus.sh b/tests/vectorstores/test_vectorstores_milvus.sh index 59e0d530c..59310127a 100644 --- a/tests/vectorstores/test_vectorstores_milvus.sh +++ b/tests/vectorstores/test_vectorstores_milvus.sh @@ -10,7 +10,7 @@ ip_address=$(hostname -I | awk '{print $1}') function start_service() { - cd $WORKPATH/comps/vectorstores/src/milvus + cd $WORKPATH/comps/vectorstores/milvus rm -rf volumes/ docker compose up -d diff --git a/tests/vectorstores/test_vectorstores_pathway.sh b/tests/vectorstores/test_vectorstores_pathway.sh index 08262254e..8ffbca887 100644 --- a/tests/vectorstores/test_vectorstores_pathway.sh +++ b/tests/vectorstores/test_vectorstores_pathway.sh @@ -10,7 +10,7 @@ ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { cd $WORKPATH - docker build --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -t opea/vectorstore-pathway:comps -f comps/vectorstores/src/pathway/Dockerfile . + docker build --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -t opea/vectorstore-pathway:comps -f comps/vectorstores/pathway/Dockerfile . cd $WORKPATH @@ -45,7 +45,7 @@ function start_service() { export PATHWAY_HOST="0.0.0.0" export PATHWAY_PORT=5437 - docker run -d --name="test-comps-vectorstore-pathway-ms" -e PATHWAY_HOST=${PATHWAY_HOST} -e PATHWAY_PORT=${PATHWAY_PORT} -e TEI_EMBEDDING_ENDPOINT=${TEI_EMBEDDING_ENDPOINT} -e http_proxy=$http_proxy -e https_proxy=$https_proxy -v $WORKPATH/comps/vectorstores/src/pathway/README.md:/app/data/README.md -p ${PATHWAY_PORT}:${PATHWAY_PORT} --network="host" opea/vectorstore-pathway:comps + docker run -d --name="test-comps-vectorstore-pathway-ms" -e PATHWAY_HOST=${PATHWAY_HOST} -e PATHWAY_PORT=${PATHWAY_PORT} -e TEI_EMBEDDING_ENDPOINT=${TEI_EMBEDDING_ENDPOINT} -e http_proxy=$http_proxy -e https_proxy=$https_proxy -v $WORKPATH/comps/vectorstores/pathway/README.md:/app/data/README.md -p ${PATHWAY_PORT}:${PATHWAY_PORT} --network="host" opea/vectorstore-pathway:comps sleep 70s