diff --git a/.github/workflows/docker/compose/agent-compose.yaml b/.github/workflows/docker/compose/agent-compose.yaml index 1b93201b2..fcff2be27 100644 --- a/.github/workflows/docker/compose/agent-compose.yaml +++ b/.github/workflows/docker/compose/agent-compose.yaml @@ -5,5 +5,5 @@ services: agent-langchain: build: - dockerfile: comps/agent/src/langchain/Dockerfile + dockerfile: comps/agent/langchain/Dockerfile image: ${REGISTRY:-opea}/agent-langchain:${TAG:-latest} diff --git a/.github/workflows/docker/compose/animation-compose.yaml b/.github/workflows/docker/compose/animation-compose.yaml index 9052a1ff9..957e4273c 100644 --- a/.github/workflows/docker/compose/animation-compose.yaml +++ b/.github/workflows/docker/compose/animation-compose.yaml @@ -5,13 +5,13 @@ services: animation: build: - dockerfile: comps/animation/src/wav2lip/Dockerfile + dockerfile: comps/animation/wav2lip/Dockerfile image: ${REGISTRY:-opea}/animation:${TAG:-latest} wav2lip: build: - dockerfile: comps/animation/src/wav2lip/dependency/Dockerfile + dockerfile: comps/animation/wav2lip/dependency/Dockerfile image: ${REGISTRY:-opea}/wav2lip:${TAG:-latest} wav2lip-gaudi: build: - dockerfile: comps/animation/src/wav2lip/dependency/Dockerfile.intel_hpu + dockerfile: comps/animation/wav2lip/dependency/Dockerfile.intel_hpu image: ${REGISTRY:-opea}/wav2lip-gaudi:${TAG:-latest} diff --git a/.github/workflows/docker/compose/asr-compose.yaml b/.github/workflows/docker/compose/asr-compose.yaml index dfda5484f..bf50634f8 100644 --- a/.github/workflows/docker/compose/asr-compose.yaml +++ b/.github/workflows/docker/compose/asr-compose.yaml @@ -5,13 +5,13 @@ services: asr: build: - dockerfile: comps/asr/src/whisper/Dockerfile + dockerfile: comps/asr/whisper/Dockerfile image: ${REGISTRY:-opea}/asr:${TAG:-latest} whisper: build: - dockerfile: comps/asr/src/whisper/dependency/Dockerfile + dockerfile: comps/asr/whisper/dependency/Dockerfile image: ${REGISTRY:-opea}/whisper:${TAG:-latest} whisper-gaudi: build: - dockerfile: comps/asr/src/whisper/dependency/Dockerfile.intel_hpu + dockerfile: comps/asr/whisper/dependency/Dockerfile.intel_hpu image: ${REGISTRY:-opea}/whisper-gaudi:${TAG:-latest} diff --git a/.github/workflows/docker/compose/chathistory-compose.yaml b/.github/workflows/docker/compose/chathistory-compose.yaml index 36a8e922c..987447fee 100644 --- a/.github/workflows/docker/compose/chathistory-compose.yaml +++ b/.github/workflows/docker/compose/chathistory-compose.yaml @@ -5,5 +5,5 @@ services: chathistory-mongo-server: build: - dockerfile: comps/chathistory/src/mongo/Dockerfile + dockerfile: comps/chathistory/mongo/Dockerfile image: ${REGISTRY:-opea}/chathistory-mongo-server:${TAG:-latest} diff --git a/.github/workflows/docker/compose/feedback_management-compose.yaml b/.github/workflows/docker/compose/feedback_management-compose.yaml index 0f671ca7c..0a3cfce66 100644 --- a/.github/workflows/docker/compose/feedback_management-compose.yaml +++ b/.github/workflows/docker/compose/feedback_management-compose.yaml @@ -5,5 +5,5 @@ services: feedbackmanagement: build: - dockerfile: comps/feedback_management/src/mongo/Dockerfile + dockerfile: comps/feedback_management/mongo/Dockerfile image: ${REGISTRY:-opea}/feedbackmanagement:${TAG:-latest} diff --git a/.github/workflows/docker/compose/finetuning-compose.yaml b/.github/workflows/docker/compose/finetuning-compose.yaml index 7cc0b2058..94e20941c 100644 --- a/.github/workflows/docker/compose/finetuning-compose.yaml +++ b/.github/workflows/docker/compose/finetuning-compose.yaml @@ -5,9 +5,9 @@ services: finetuning: build: - dockerfile: comps/finetuning/src/Dockerfile + dockerfile: comps/finetuning/Dockerfile image: ${REGISTRY:-opea}/finetuning:${TAG:-latest} finetuning-gaudi: build: - dockerfile: comps/finetuning/src/Dockerfile.intel_hpu + dockerfile: comps/finetuning/Dockerfile.intel_hpu image: ${REGISTRY:-opea}/finetuning-gaudi:${TAG:-latest} diff --git a/.github/workflows/docker/compose/guardrails-compose.yaml b/.github/workflows/docker/compose/guardrails-compose.yaml index 8bdd67a4c..72475218d 100644 --- a/.github/workflows/docker/compose/guardrails-compose.yaml +++ b/.github/workflows/docker/compose/guardrails-compose.yaml @@ -5,37 +5,37 @@ services: guardrails-tgi: build: - dockerfile: comps/guardrails/src/llama_guard/langchain/Dockerfile + dockerfile: comps/guardrails/llama_guard/langchain/Dockerfile image: ${REGISTRY:-opea}/guardrails-tgi:${TAG:-latest} guardrails-pii-detection: build: - dockerfile: comps/guardrails/src/pii_detection/Dockerfile + dockerfile: comps/guardrails/pii_detection/Dockerfile image: ${REGISTRY:-opea}/guardrails-pii-detection:${TAG:-latest} guardrails-bias-detection: build: - dockerfile: comps/guardrails/src/bias_detection/Dockerfile + dockerfile: comps/guardrails/bias_detection/Dockerfile image: ${REGISTRY:-opea}/guardrails-bias-detection:${TAG:-latest} guardrails-toxicity-detection: build: - dockerfile: comps/guardrails/src/toxicity_detection/Dockerfile + dockerfile: comps/guardrails/toxicity_detection/Dockerfile image: ${REGISTRY:-opea}/guardrails-toxicity-detection:${TAG:-latest} guardrails-wildguard: build: - dockerfile: comps/guardrails/src/wildguard/langchain/Dockerfile + dockerfile: comps/guardrails/wildguard/langchain/Dockerfile image: ${REGISTRY:-opea}/guardrails-wildguard:${TAG:-latest} guardrails-pii-predictionguard: build: - dockerfile: comps/guardrails/src/pii_detection/predictionguard/Dockerfile + dockerfile: comps/guardrails/pii_detection/predictionguard/Dockerfile image: ${REGISTRY:-opea}/guardrails-pii-predictionguard:${TAG:-latest} guardrails-toxicity-predictionguard: build: - dockerfile: comps/guardrails/src/toxicity_detection/predictionguard/Dockerfile + dockerfile: comps/guardrails/toxicity_detection/predictionguard/Dockerfile image: ${REGISTRY:-opea}/guardrails-toxicity-predictionguard:${TAG:-latest} guardrails-factuality-predictionguard: build: - dockerfile: comps/guardrails/src/factuality/predictionguard/Dockerfile + dockerfile: comps/guardrails/factuality/predictionguard/Dockerfile image: ${REGISTRY:-opea}/guardrails-factuality-predictionguard:${TAG:-latest} guardrails-injection-predictionguard: build: - dockerfile: comps/guardrails/src/prompt_injection/predictionguard/Dockerfile + dockerfile: comps/guardrails/prompt_injection/predictionguard/Dockerfile image: ${REGISTRY:-opea}/guardrails-injection-predictionguard:${TAG:-latest} diff --git a/.github/workflows/docker/compose/image2image-compose.yaml b/.github/workflows/docker/compose/image2image-compose.yaml index 9df9d2c92..7d3b45149 100644 --- a/.github/workflows/docker/compose/image2image-compose.yaml +++ b/.github/workflows/docker/compose/image2image-compose.yaml @@ -5,9 +5,9 @@ services: image2image: build: - dockerfile: comps/image2image/src/Dockerfile + dockerfile: comps/image2image/Dockerfile image: ${REGISTRY:-opea}/image2image:${TAG:-latest} image2image-gaudi: build: - dockerfile: comps/image2image/src/Dockerfile.intel_hpu + dockerfile: comps/image2image/Dockerfile.intel_hpu image: ${REGISTRY:-opea}/image2image-gaudi:${TAG:-latest} diff --git a/.github/workflows/docker/compose/image2video-compose.yaml b/.github/workflows/docker/compose/image2video-compose.yaml index 1aee33599..b74bea49f 100644 --- a/.github/workflows/docker/compose/image2video-compose.yaml +++ b/.github/workflows/docker/compose/image2video-compose.yaml @@ -5,13 +5,13 @@ services: image2video: build: - dockerfile: comps/image2video/src/Dockerfile + dockerfile: comps/image2video/Dockerfile image: ${REGISTRY:-opea}/image2video:${TAG:-latest} svd: build: - dockerfile: comps/image2video/src/dependency/Dockerfile + dockerfile: comps/image2video/dependency/Dockerfile image: ${REGISTRY:-opea}/svd:${TAG:-latest} svd-gaudi: build: - dockerfile: comps/image2video/src/dependency/Dockerfile.intel_hpu + dockerfile: comps/image2video/dependency/Dockerfile.intel_hpu image: ${REGISTRY:-opea}/svd-gaudi:${TAG:-latest} diff --git a/.github/workflows/docker/compose/intent_detection-compose.yaml b/.github/workflows/docker/compose/intent_detection-compose.yaml index e62f32db0..12b7a12b3 100644 --- a/.github/workflows/docker/compose/intent_detection-compose.yaml +++ b/.github/workflows/docker/compose/intent_detection-compose.yaml @@ -5,5 +5,5 @@ services: intent-detection-tgi: build: - dockerfile: comps/intent_detection/src/langchain/Dockerfile + dockerfile: comps/intent_detection/langchain/Dockerfile image: ${REGISTRY:-opea}/intent-detection-tgi:${TAG:-latest} diff --git a/.github/workflows/docker/compose/lvms-compose.yaml b/.github/workflows/docker/compose/lvms-compose.yaml index aaab0ef0b..6e89db0e3 100644 --- a/.github/workflows/docker/compose/lvms-compose.yaml +++ b/.github/workflows/docker/compose/lvms-compose.yaml @@ -5,41 +5,41 @@ services: lvm-tgi: build: - dockerfile: comps/lvms/src/tgi-llava/Dockerfile + dockerfile: comps/lvms/tgi-llava/Dockerfile image: ${REGISTRY:-opea}/lvm-tgi:${TAG:-latest} lvm-video-llama: build: - dockerfile: comps/lvms/src/video-llama/Dockerfile + dockerfile: comps/lvms/video-llama/Dockerfile image: ${REGISTRY:-opea}/lvm-video-llama:${TAG:-latest} video-llama-lvm-server: build: - dockerfile: comps/lvms/src/video-llama/dependency/Dockerfile + dockerfile: comps/lvms/video-llama/dependency/Dockerfile image: ${REGISTRY:-opea}/video-llama-lvm-server:${TAG:-latest} lvm-llava: build: - dockerfile: comps/lvms/src/llava/dependency/Dockerfile + dockerfile: comps/lvms/llava/dependency/Dockerfile image: ${REGISTRY:-opea}/lvm-llava:${TAG:-latest} lvm-llava-svc: build: - dockerfile: comps/lvms/src/llava/Dockerfile + dockerfile: comps/lvms/llava/Dockerfile image: ${REGISTRY:-opea}/lvm-llava-svc:${TAG:-latest} llava-gaudi: build: - dockerfile: comps/lvms/src/llava/dependency/Dockerfile.intel_hpu + dockerfile: comps/lvms/llava/dependency/Dockerfile.intel_hpu image: ${REGISTRY:-opea}/llava-gaudi:${TAG:-latest} lvm-predictionguard: build: - dockerfile: comps/lvms/src/predictionguard/Dockerfile + dockerfile: comps/lvms/predictionguard/Dockerfile image: ${REGISTRY:-opea}/lvm-predictionguard:${TAG:-latest} lvm-llama-vision: build: - dockerfile: comps/lvms/src/llama-vision/Dockerfile + dockerfile: comps/lvms/llama-vision/Dockerfile image: ${REGISTRY:-opea}/lvm-llama-vision:${TAG:-latest} lvm-llama-vision-tp: build: - dockerfile: comps/lvms/src/llama-vision/Dockerfile_tp + dockerfile: comps/lvms/llama-vision/Dockerfile_tp image: ${REGISTRY:-opea}/lvm-llama-vision-tp:${TAG:-latest} lvm-llama-vision-guard: build: - dockerfile: comps/lvms/src/llama-vision/Dockerfile_guard + dockerfile: comps/lvms/llama-vision/Dockerfile_guard image: ${REGISTRY:-opea}/lvm-llama-vision-guard:${TAG:-latest} diff --git a/.github/workflows/docker/compose/prompt_registry-compose.yaml b/.github/workflows/docker/compose/prompt_registry-compose.yaml index afa268c56..34d8973df 100644 --- a/.github/workflows/docker/compose/prompt_registry-compose.yaml +++ b/.github/workflows/docker/compose/prompt_registry-compose.yaml @@ -5,5 +5,5 @@ services: promptregistry-mongo-server: build: - dockerfile: comps/prompt_registry/src/mongo/Dockerfile + dockerfile: comps/prompt_registry/mongo/Dockerfile image: ${REGISTRY:-opea}/promptregistry-mongo-server:${TAG:-latest} diff --git a/.github/workflows/docker/compose/ragas-compose.yaml b/.github/workflows/docker/compose/ragas-compose.yaml index 9e4d55798..aedad1b89 100644 --- a/.github/workflows/docker/compose/ragas-compose.yaml +++ b/.github/workflows/docker/compose/ragas-compose.yaml @@ -3,5 +3,5 @@ services: ragas: build: - dockerfile: comps/ragas/src/tgi/langchain/Dockerfile + dockerfile: comps/ragas/tgi/langchain/Dockerfile image: ${REGISTRY:-opea}/ragas:${TAG:-latest} diff --git a/.github/workflows/docker/compose/text2image-compose.yaml b/.github/workflows/docker/compose/text2image-compose.yaml index 4734bde4d..1cd448e6a 100644 --- a/.github/workflows/docker/compose/text2image-compose.yaml +++ b/.github/workflows/docker/compose/text2image-compose.yaml @@ -5,9 +5,9 @@ services: text2image: build: - dockerfile: comps/text2image/src/Dockerfile + dockerfile: comps/text2image/Dockerfile image: ${REGISTRY:-opea}/text2image:${TAG:-latest} text2image-gaudi: build: - dockerfile: comps/text2image/src/Dockerfile.intel_hpu + dockerfile: comps/text2image/Dockerfile.intel_hpu image: ${REGISTRY:-opea}/text2image-gaudi:${TAG:-latest} diff --git a/.github/workflows/docker/compose/texttosql-compose.yaml b/.github/workflows/docker/compose/texttosql-compose.yaml index 97479d1c7..56c7b41fb 100644 --- a/.github/workflows/docker/compose/texttosql-compose.yaml +++ b/.github/workflows/docker/compose/texttosql-compose.yaml @@ -5,5 +5,5 @@ services: texttosql: build: - dockerfile: comps/texttosql/src/langchain/Dockerfile + dockerfile: comps/texttosql/langchain/Dockerfile image: ${REGISTRY:-opea}/texttosql:${TAG:-latest} diff --git a/.github/workflows/docker/compose/tts-compose.yaml b/.github/workflows/docker/compose/tts-compose.yaml index 16898d104..da0ca7c88 100644 --- a/.github/workflows/docker/compose/tts-compose.yaml +++ b/.github/workflows/docker/compose/tts-compose.yaml @@ -5,17 +5,17 @@ services: tts: build: - dockerfile: comps/tts/src/speecht5/Dockerfile + dockerfile: comps/tts/speecht5/Dockerfile image: ${REGISTRY:-opea}/tts:${TAG:-latest} speecht5: build: - dockerfile: comps/tts/src/speecht5/dependency/Dockerfile + dockerfile: comps/tts/speecht5/dependency/Dockerfile image: ${REGISTRY:-opea}/speecht5:${TAG:-latest} speecht5-gaudi: build: - dockerfile: comps/tts/src/speecht5/dependency/Dockerfile.intel_hpu + dockerfile: comps/tts/speecht5/dependency/Dockerfile.intel_hpu image: ${REGISTRY:-opea}/speecht5-gaudi:${TAG:-latest} gpt-sovits: build: - dockerfile: comps/tts/src/gpt-sovits/Dockerfile + dockerfile: comps/tts/gpt-sovits/Dockerfile image: ${REGISTRY:-opea}/gpt-sovits:${TAG:-latest} diff --git a/.github/workflows/docker/compose/vectorstores-compose.yaml b/.github/workflows/docker/compose/vectorstores-compose.yaml index ea90e4b2f..584927e95 100644 --- a/.github/workflows/docker/compose/vectorstores-compose.yaml +++ b/.github/workflows/docker/compose/vectorstores-compose.yaml @@ -5,5 +5,5 @@ services: vectorstore-pathway: build: - dockerfile: comps/vectorstores/src/pathway/Dockerfile + dockerfile: comps/vectorstores/pathway/Dockerfile image: ${REGISTRY:-opea}/vectorstore-pathway:${TAG:-latest} diff --git a/.github/workflows/docker/compose/web_retrievers-compose.yaml b/.github/workflows/docker/compose/web_retrievers-compose.yaml index fd0aae405..94f4fa8d2 100644 --- a/.github/workflows/docker/compose/web_retrievers-compose.yaml +++ b/.github/workflows/docker/compose/web_retrievers-compose.yaml @@ -5,5 +5,5 @@ services: web-retriever-chroma: build: - dockerfile: comps/web_retrievers/src/chroma/langchain/Dockerfile + dockerfile: comps/web_retrievers/chroma/langchain/Dockerfile image: ${REGISTRY:-opea}/web-retriever-chroma:${TAG:-latest} diff --git a/README.md b/README.md index 9b6be4a6c..8241f7cde 100644 --- a/README.md +++ b/README.md @@ -41,12 +41,12 @@ The initially supported `Microservices` are described in the below table. More ` | [Embedding](./comps/embeddings/src/README.md) | [LangChain](https://www.langchain.com)/[LlamaIndex](https://www.llamaindex.ai) | [BAAI/bge-base-en-v1.5](https://huggingface.co/BAAI/bge-base-en-v1.5) | [TEI-Gaudi](https://github.com/huggingface/tei-gaudi) | Gaudi2 | Embedding on Gaudi2 | | [Embedding](./comps/embeddings/src/README.md) | [LangChain](https://www.langchain.com)/[LlamaIndex](https://www.llamaindex.ai) | [BAAI/bge-base-en-v1.5](https://huggingface.co/BAAI/bge-base-en-v1.5) | [TEI](https://github.com/huggingface/text-embeddings-inference) | Xeon | Embedding on Xeon CPU | | [Retriever](./comps/retrievers/src/README.md) | [LangChain](https://www.langchain.com)/[LlamaIndex](https://www.llamaindex.ai) | [BAAI/bge-base-en-v1.5](https://huggingface.co/BAAI/bge-base-en-v1.5) | [TEI](https://github.com/huggingface/text-embeddings-inference) | Xeon | Retriever on Xeon CPU | -| [Reranking](./comps/reranks/tei/src/README.md) | [LangChain](https://www.langchain.com)/[LlamaIndex](https://www.llamaindex.ai) | [BAAI/bge-reranker-base](https://huggingface.co/BAAI/bge-reranker-base) | [TEI-Gaudi](https://github.com/huggingface/tei-gaudi) | Gaudi2 | Reranking on Gaudi2 | -| [Reranking](./comps/reranks/tei/src/README.md) | [LangChain](https://www.langchain.com)/[LlamaIndex](https://www.llamaindex.ai) | [BBAAI/bge-reranker-base](https://huggingface.co/BAAI/bge-reranker-base) | [TEI](https://github.com/huggingface/text-embeddings-inference) | Xeon | Reranking on Xeon CPU | -| [ASR](./comps/asr/whisper/src/README.md) | NA | [openai/whisper-small](https://huggingface.co/openai/whisper-small) | NA | Gaudi2 | Audio-Speech-Recognition on Gaudi2 | -| [ASR](./comps/asr/whisper/src/README.md) | NA | [openai/whisper-small](https://huggingface.co/openai/whisper-small) | NA | Xeon | Audio-Speech-RecognitionS on Xeon CPU | -| [TTS](./comps/tts/speecht5/src/README.md) | NA | [microsoft/speecht5_tts](https://huggingface.co/microsoft/speecht5_tts) | NA | Gaudi2 | Text-To-Speech on Gaudi2 | -| [TTS](./comps/tts/speecht5/src/README.md) | NA | [microsoft/speecht5_tts](https://huggingface.co/microsoft/speecht5_tts) | NA | Xeon | Text-To-Speech on Xeon CPU | +| [Reranking](./comps/reranks/src/README.md) | [LangChain](https://www.langchain.com)/[LlamaIndex](https://www.llamaindex.ai) | [BAAI/bge-reranker-base](https://huggingface.co/BAAI/bge-reranker-base) | [TEI-Gaudi](https://github.com/huggingface/tei-gaudi) | Gaudi2 | Reranking on Gaudi2 | +| [Reranking](./comps/reranks/src/README.md) | [LangChain](https://www.langchain.com)/[LlamaIndex](https://www.llamaindex.ai) | [BBAAI/bge-reranker-base](https://huggingface.co/BAAI/bge-reranker-base) | [TEI](https://github.com/huggingface/text-embeddings-inference) | Xeon | Reranking on Xeon CPU | +| [ASR](./comps/asr/whisper/README.md) | NA | [openai/whisper-small](https://huggingface.co/openai/whisper-small) | NA | Gaudi2 | Audio-Speech-Recognition on Gaudi2 | +| [ASR](./comps/asr/whisper/README.md) | NA | [openai/whisper-small](https://huggingface.co/openai/whisper-small) | NA | Xeon | Audio-Speech-RecognitionS on Xeon CPU | +| [TTS](./comps/tts/speecht5/README.md) | NA | [microsoft/speecht5_tts](https://huggingface.co/microsoft/speecht5_tts) | NA | Gaudi2 | Text-To-Speech on Gaudi2 | +| [TTS](./comps/tts/speecht5/README.md) | NA | [microsoft/speecht5_tts](https://huggingface.co/microsoft/speecht5_tts) | NA | Xeon | Text-To-Speech on Xeon CPU | | [Dataprep](./comps/dataprep/src/README.md) | [Qdrant](https://qdrant.tech/) | [sentence-transformers/all-MiniLM-L6-v2](https://huggingface.co/sentence-transformers/all-MiniLM-L6-v2) | NA | Gaudi2 | Dataprep on Gaudi2 | | [Dataprep](./comps/dataprep/src/README.md) | [Qdrant](https://qdrant.tech/) | [sentence-transformers/all-MiniLM-L6-v2](https://huggingface.co/sentence-transformers/all-MiniLM-L6-v2) | NA | Xeon | Dataprep on Xeon CPU | | [Dataprep](./comps/dataprep/src/README.md) | [Redis](https://redis.io/) | [BAAI/bge-base-en-v1.5](https://huggingface.co/BAAI/bge-base-en-v1.5) | NA | Gaudi2 | Dataprep on Gaudi2 | diff --git a/comps/agent/src/langchain/Dockerfile b/comps/agent/langchain/Dockerfile similarity index 100% rename from comps/agent/src/langchain/Dockerfile rename to comps/agent/langchain/Dockerfile diff --git a/comps/agent/src/langchain/README.md b/comps/agent/langchain/README.md similarity index 97% rename from comps/agent/src/langchain/README.md rename to comps/agent/langchain/README.md index 4c170e178..8d2e91930 100644 --- a/comps/agent/src/langchain/README.md +++ b/comps/agent/langchain/README.md @@ -28,14 +28,14 @@ Agents use LLM for reasoning and planning. We support 3 options of LLM engine: | Agent type | `strategy` arg | Validated LLMs (serving SW) | Notes | Example config yaml | | ---------------- | ----------------- | ------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------- | -| ReAct | `react_langchain` | [llama3.1-70B-Instruct](https://huggingface.co/meta-llama/Llama-3.1-70B-Instruct) (tgi-gaudi) (vllm-gaudi) | Only allows tools with one input variable | [react_langchain yaml](../../../../tests/agent/react_langchain.yaml) | -| ReAct | `react_langgraph` | GPT-4o-mini, [llama3.1-70B-Instruct](https://huggingface.co/meta-llama/Llama-3.1-70B-Instruct) (vllm-gaudi), | if using vllm, need to specify `--enable-auto-tool-choice --tool-call-parser ${model_parser}`, refer to vllm docs for more info | [react_langgraph yaml](../../../../tests/agent/react_vllm.yaml) | -| ReAct | `react_llama` | [llama3.1-70B-Instruct](https://huggingface.co/meta-llama/Llama-3.1-70B-Instruct) (tgi-gaudi) (vllm-gaudi) | Recommended for open-source LLMs, supports multiple tools and parallel tool calls. | [react_llama yaml](../../../../tests/agent/reactllama.yaml) | -| RAG agent | `rag_agent` | GPT-4o-mini | | [rag_agent yaml](../../../../tests/agent/ragagent_openai.yaml) | -| RAG agent | `rag_agent_llama` | [llama3.1-70B-Instruct](https://huggingface.co/meta-llama/Llama-3.1-70B-Instruct) (tgi-gaudi) (vllm-gaudi) | Recommended for open-source LLMs, only allows 1 tool with input variable to be "query" | [rag_agent_llama yaml](../../../../tests/agent/ragagent.yaml) | -| Plan and execute | `plan_execute` | GPT-4o-mini, [llama3.1-70B-Instruct](https://huggingface.co/meta-llama/Llama-3.1-70B-Instruct) (vllm-gaudi) | use `--guided-decoding-backend lm-format-enforcer` when launching vllm. | [plan_execute yaml](../../../../tests/agent/planexec_openai.yaml) | +| ReAct | `react_langchain` | [llama3.1-70B-Instruct](https://huggingface.co/meta-llama/Llama-3.1-70B-Instruct) (tgi-gaudi) (vllm-gaudi) | Only allows tools with one input variable | [react_langchain yaml](../../../tests/agent/react_langchain.yaml) | +| ReAct | `react_langgraph` | GPT-4o-mini, [llama3.1-70B-Instruct](https://huggingface.co/meta-llama/Llama-3.1-70B-Instruct) (vllm-gaudi), | if using vllm, need to specify `--enable-auto-tool-choice --tool-call-parser ${model_parser}`, refer to vllm docs for more info | [react_langgraph yaml](../../../tests/agent/react_vllm.yaml) | +| ReAct | `react_llama` | [llama3.1-70B-Instruct](https://huggingface.co/meta-llama/Llama-3.1-70B-Instruct) (tgi-gaudi) (vllm-gaudi) | Recommended for open-source LLMs, supports multiple tools and parallel tool calls. | [react_llama yaml](../../../tests/agent/reactllama.yaml) | +| RAG agent | `rag_agent` | GPT-4o-mini | | [rag_agent yaml](../../../tests/agent/ragagent_openai.yaml) | +| RAG agent | `rag_agent_llama` | [llama3.1-70B-Instruct](https://huggingface.co/meta-llama/Llama-3.1-70B-Instruct) (tgi-gaudi) (vllm-gaudi) | Recommended for open-source LLMs, only allows 1 tool with input variable to be "query" | [rag_agent_llama yaml](../../../tests/agent/ragagent.yaml) | +| Plan and execute | `plan_execute` | GPT-4o-mini, [llama3.1-70B-Instruct](https://huggingface.co/meta-llama/Llama-3.1-70B-Instruct) (vllm-gaudi) | use `--guided-decoding-backend lm-format-enforcer` when launching vllm. | [plan_execute yaml](../../../tests/agent/planexec_openai.yaml) | | SQL agent | `sql_agent_llama` | [llama3.1-70B-Instruct](https://huggingface.co/meta-llama/Llama-3.1-70B-Instruct) (vllm-gaudi) | database query tool is natively integrated using Langchain's [QuerySQLDataBaseTool](https://python.langchain.com/api_reference/community/tools/langchain_community.tools.sql_database.tool.QuerySQLDatabaseTool.html). User can also register their own tools with this agent. | [sql_agent_llama yaml](../../../../tests/agent/sql_agent_llama.yaml) | -| SQL agent | `sql_agent` | GPT-4o-mini | database query tool is natively integrated using Langchain's [QuerySQLDataBaseTool](https://python.langchain.com/api_reference/community/tools/langchain_community.tools.sql_database.tool.QuerySQLDatabaseTool.html). User can also register their own tools with this agent. | [sql_agent yaml](../../../../tests/agent/sql_agent_openai.yaml) | +| SQL agent | `sql_agent` | GPT-4o-mini | database query tool is natively integrated using Langchain's [QuerySQLDataBaseTool](https://python.langchain.com/api_reference/community/tools/langchain_community.tools.sql_database.tool.QuerySQLDatabaseTool.html). User can also register their own tools with this agent. | [sql_agent yaml](../../../tests/agent/sql_agent_openai.yaml) | ### 1.3 Tools diff --git a/comps/agent/src/langchain/agent.py b/comps/agent/langchain/agent.py similarity index 100% rename from comps/agent/src/langchain/agent.py rename to comps/agent/langchain/agent.py diff --git a/comps/agent/src/langchain/agent_arch.jpg b/comps/agent/langchain/agent_arch.jpg similarity index 100% rename from comps/agent/src/langchain/agent_arch.jpg rename to comps/agent/langchain/agent_arch.jpg diff --git a/comps/agent/src/langchain/requirements.txt b/comps/agent/langchain/requirements.txt similarity index 100% rename from comps/agent/src/langchain/requirements.txt rename to comps/agent/langchain/requirements.txt diff --git a/comps/agent/src/langchain/sql_agent.png b/comps/agent/langchain/sql_agent.png similarity index 100% rename from comps/agent/src/langchain/sql_agent.png rename to comps/agent/langchain/sql_agent.png diff --git a/comps/agent/src/langchain/sql_agent_llama.png b/comps/agent/langchain/sql_agent_llama.png similarity index 100% rename from comps/agent/src/langchain/sql_agent_llama.png rename to comps/agent/langchain/sql_agent_llama.png diff --git a/comps/agent/src/langchain/src/agent.py b/comps/agent/langchain/src/agent.py similarity index 100% rename from comps/agent/src/langchain/src/agent.py rename to comps/agent/langchain/src/agent.py diff --git a/comps/agent/src/langchain/src/config.py b/comps/agent/langchain/src/config.py similarity index 100% rename from comps/agent/src/langchain/src/config.py rename to comps/agent/langchain/src/config.py diff --git a/comps/agent/src/langchain/src/global_var.py b/comps/agent/langchain/src/global_var.py similarity index 100% rename from comps/agent/src/langchain/src/global_var.py rename to comps/agent/langchain/src/global_var.py diff --git a/comps/agent/src/langchain/src/persistence.py b/comps/agent/langchain/src/persistence.py similarity index 100% rename from comps/agent/src/langchain/src/persistence.py rename to comps/agent/langchain/src/persistence.py diff --git a/comps/agent/src/langchain/src/strategy/__init__.py b/comps/agent/langchain/src/strategy/__init__.py similarity index 100% rename from comps/agent/src/langchain/src/strategy/__init__.py rename to comps/agent/langchain/src/strategy/__init__.py diff --git a/comps/agent/src/langchain/src/strategy/base_agent.py b/comps/agent/langchain/src/strategy/base_agent.py similarity index 100% rename from comps/agent/src/langchain/src/strategy/base_agent.py rename to comps/agent/langchain/src/strategy/base_agent.py diff --git a/comps/agent/src/langchain/src/strategy/planexec/README.md b/comps/agent/langchain/src/strategy/planexec/README.md similarity index 100% rename from comps/agent/src/langchain/src/strategy/planexec/README.md rename to comps/agent/langchain/src/strategy/planexec/README.md diff --git a/comps/agent/src/langchain/src/strategy/planexec/__init__.py b/comps/agent/langchain/src/strategy/planexec/__init__.py similarity index 100% rename from comps/agent/src/langchain/src/strategy/planexec/__init__.py rename to comps/agent/langchain/src/strategy/planexec/__init__.py diff --git a/comps/agent/src/langchain/src/strategy/planexec/planner.py b/comps/agent/langchain/src/strategy/planexec/planner.py similarity index 100% rename from comps/agent/src/langchain/src/strategy/planexec/planner.py rename to comps/agent/langchain/src/strategy/planexec/planner.py diff --git a/comps/agent/src/langchain/src/strategy/planexec/prompt.py b/comps/agent/langchain/src/strategy/planexec/prompt.py similarity index 100% rename from comps/agent/src/langchain/src/strategy/planexec/prompt.py rename to comps/agent/langchain/src/strategy/planexec/prompt.py diff --git a/comps/agent/src/langchain/src/strategy/ragagent/README.md b/comps/agent/langchain/src/strategy/ragagent/README.md similarity index 100% rename from comps/agent/src/langchain/src/strategy/ragagent/README.md rename to comps/agent/langchain/src/strategy/ragagent/README.md diff --git a/comps/agent/src/langchain/src/strategy/ragagent/__init__.py b/comps/agent/langchain/src/strategy/ragagent/__init__.py similarity index 100% rename from comps/agent/src/langchain/src/strategy/ragagent/__init__.py rename to comps/agent/langchain/src/strategy/ragagent/__init__.py diff --git a/comps/agent/src/langchain/src/strategy/ragagent/planner.py b/comps/agent/langchain/src/strategy/ragagent/planner.py similarity index 100% rename from comps/agent/src/langchain/src/strategy/ragagent/planner.py rename to comps/agent/langchain/src/strategy/ragagent/planner.py diff --git a/comps/agent/src/langchain/src/strategy/ragagent/prompt.py b/comps/agent/langchain/src/strategy/ragagent/prompt.py similarity index 100% rename from comps/agent/src/langchain/src/strategy/ragagent/prompt.py rename to comps/agent/langchain/src/strategy/ragagent/prompt.py diff --git a/comps/agent/src/langchain/src/strategy/ragagent/utils.py b/comps/agent/langchain/src/strategy/ragagent/utils.py similarity index 100% rename from comps/agent/src/langchain/src/strategy/ragagent/utils.py rename to comps/agent/langchain/src/strategy/ragagent/utils.py diff --git a/comps/agent/src/langchain/src/strategy/react/__init__.py b/comps/agent/langchain/src/strategy/react/__init__.py similarity index 100% rename from comps/agent/src/langchain/src/strategy/react/__init__.py rename to comps/agent/langchain/src/strategy/react/__init__.py diff --git a/comps/agent/src/langchain/src/strategy/react/planner.py b/comps/agent/langchain/src/strategy/react/planner.py similarity index 100% rename from comps/agent/src/langchain/src/strategy/react/planner.py rename to comps/agent/langchain/src/strategy/react/planner.py diff --git a/comps/agent/src/langchain/src/strategy/react/prompt.py b/comps/agent/langchain/src/strategy/react/prompt.py similarity index 100% rename from comps/agent/src/langchain/src/strategy/react/prompt.py rename to comps/agent/langchain/src/strategy/react/prompt.py diff --git a/comps/agent/src/langchain/src/strategy/react/utils.py b/comps/agent/langchain/src/strategy/react/utils.py similarity index 100% rename from comps/agent/src/langchain/src/strategy/react/utils.py rename to comps/agent/langchain/src/strategy/react/utils.py diff --git a/comps/agent/src/langchain/src/strategy/sqlagent/README.md b/comps/agent/langchain/src/strategy/sqlagent/README.md similarity index 96% rename from comps/agent/src/langchain/src/strategy/sqlagent/README.md rename to comps/agent/langchain/src/strategy/sqlagent/README.md index d3e7d7e14..3704da56e 100644 --- a/comps/agent/src/langchain/src/strategy/sqlagent/README.md +++ b/comps/agent/langchain/src/strategy/sqlagent/README.md @@ -10,7 +10,7 @@ We currently have two types of SQL agents: The architecture of `sql_agent_llama` is shown in the figure below. The agent node takes user question, hints (optional) and history (when available), and thinks step by step to solve the problem. -![SQL Agent Llama Architecture](../../../assets/sql_agent_llama.png) +![SQL Agent Llama Architecture](../../../sql_agent_llama.png) ### Database schema: @@ -33,7 +33,7 @@ Due to the current limitations of open source LLMs and serving frameworks (tgi a The architecture of `sql_agent` is shown in the figure below. The agent node takes user question, hints (optional) and history (when available), and thinks step by step to solve the problem. The basic idea is the same as `sql_agent_llama`. However, since OpenAI APIs produce well-structured tool call objects, we don't need a special output parser. Instead, we only keep the query fixer. -![SQL Agent Architecture](../../../assets/sql_agent.png) +![SQL Agent Architecture](../../../sql_agent.png) ## Limitations diff --git a/comps/agent/src/langchain/src/strategy/sqlagent/__init__.py b/comps/agent/langchain/src/strategy/sqlagent/__init__.py similarity index 100% rename from comps/agent/src/langchain/src/strategy/sqlagent/__init__.py rename to comps/agent/langchain/src/strategy/sqlagent/__init__.py diff --git a/comps/agent/src/langchain/src/strategy/sqlagent/hint.py b/comps/agent/langchain/src/strategy/sqlagent/hint.py similarity index 100% rename from comps/agent/src/langchain/src/strategy/sqlagent/hint.py rename to comps/agent/langchain/src/strategy/sqlagent/hint.py diff --git a/comps/agent/src/langchain/src/strategy/sqlagent/planner.py b/comps/agent/langchain/src/strategy/sqlagent/planner.py similarity index 100% rename from comps/agent/src/langchain/src/strategy/sqlagent/planner.py rename to comps/agent/langchain/src/strategy/sqlagent/planner.py diff --git a/comps/agent/src/langchain/src/strategy/sqlagent/prompt.py b/comps/agent/langchain/src/strategy/sqlagent/prompt.py similarity index 100% rename from comps/agent/src/langchain/src/strategy/sqlagent/prompt.py rename to comps/agent/langchain/src/strategy/sqlagent/prompt.py diff --git a/comps/agent/src/langchain/src/strategy/sqlagent/sql_tools.py b/comps/agent/langchain/src/strategy/sqlagent/sql_tools.py similarity index 100% rename from comps/agent/src/langchain/src/strategy/sqlagent/sql_tools.py rename to comps/agent/langchain/src/strategy/sqlagent/sql_tools.py diff --git a/comps/agent/src/langchain/src/strategy/sqlagent/utils.py b/comps/agent/langchain/src/strategy/sqlagent/utils.py similarity index 100% rename from comps/agent/src/langchain/src/strategy/sqlagent/utils.py rename to comps/agent/langchain/src/strategy/sqlagent/utils.py diff --git a/comps/agent/src/langchain/src/thread.py b/comps/agent/langchain/src/thread.py similarity index 100% rename from comps/agent/src/langchain/src/thread.py rename to comps/agent/langchain/src/thread.py diff --git a/comps/agent/src/langchain/src/tools.py b/comps/agent/langchain/src/tools.py similarity index 100% rename from comps/agent/src/langchain/src/tools.py rename to comps/agent/langchain/src/tools.py diff --git a/comps/agent/src/langchain/src/utils.py b/comps/agent/langchain/src/utils.py similarity index 100% rename from comps/agent/src/langchain/src/utils.py rename to comps/agent/langchain/src/utils.py diff --git a/comps/agent/src/langchain/test.py b/comps/agent/langchain/test.py similarity index 100% rename from comps/agent/src/langchain/test.py rename to comps/agent/langchain/test.py diff --git a/comps/agent/src/langchain/test_assistant_api.py b/comps/agent/langchain/test_assistant_api.py similarity index 100% rename from comps/agent/src/langchain/test_assistant_api.py rename to comps/agent/langchain/test_assistant_api.py diff --git a/comps/agent/src/langchain/tools/custom_prompt.py b/comps/agent/langchain/tools/custom_prompt.py similarity index 100% rename from comps/agent/src/langchain/tools/custom_prompt.py rename to comps/agent/langchain/tools/custom_prompt.py diff --git a/comps/agent/src/langchain/tools/custom_tools.py b/comps/agent/langchain/tools/custom_tools.py similarity index 100% rename from comps/agent/src/langchain/tools/custom_tools.py rename to comps/agent/langchain/tools/custom_tools.py diff --git a/comps/agent/src/langchain/tools/custom_tools.yaml b/comps/agent/langchain/tools/custom_tools.yaml similarity index 100% rename from comps/agent/src/langchain/tools/custom_tools.yaml rename to comps/agent/langchain/tools/custom_tools.yaml diff --git a/comps/animation/src/wav2lip/Dockerfile b/comps/animation/wav2lip/Dockerfile similarity index 100% rename from comps/animation/src/wav2lip/Dockerfile rename to comps/animation/wav2lip/Dockerfile diff --git a/comps/animation/src/wav2lip/README.md b/comps/animation/wav2lip/README.md similarity index 100% rename from comps/animation/src/wav2lip/README.md rename to comps/animation/wav2lip/README.md diff --git a/comps/animation/src/wav2lip/animation.py b/comps/animation/wav2lip/animation.py similarity index 100% rename from comps/animation/src/wav2lip/animation.py rename to comps/animation/wav2lip/animation.py diff --git a/comps/animation/src/wav2lip/assets/audio/eg3_ref.wav b/comps/animation/wav2lip/assets/audio/eg3_ref.wav similarity index 100% rename from comps/animation/src/wav2lip/assets/audio/eg3_ref.wav rename to comps/animation/wav2lip/assets/audio/eg3_ref.wav diff --git a/comps/animation/src/wav2lip/assets/audio/sample_question.json b/comps/animation/wav2lip/assets/audio/sample_question.json similarity index 100% rename from comps/animation/src/wav2lip/assets/audio/sample_question.json rename to comps/animation/wav2lip/assets/audio/sample_question.json diff --git a/comps/animation/src/wav2lip/assets/audio/sample_whoareyou.json b/comps/animation/wav2lip/assets/audio/sample_whoareyou.json similarity index 100% rename from comps/animation/src/wav2lip/assets/audio/sample_whoareyou.json rename to comps/animation/wav2lip/assets/audio/sample_whoareyou.json diff --git a/comps/animation/src/wav2lip/assets/img/avatar1.jpg b/comps/animation/wav2lip/assets/img/avatar1.jpg similarity index 100% rename from comps/animation/src/wav2lip/assets/img/avatar1.jpg rename to comps/animation/wav2lip/assets/img/avatar1.jpg diff --git a/comps/animation/src/wav2lip/assets/img/avatar2.jpg b/comps/animation/wav2lip/assets/img/avatar2.jpg similarity index 100% rename from comps/animation/src/wav2lip/assets/img/avatar2.jpg rename to comps/animation/wav2lip/assets/img/avatar2.jpg diff --git a/comps/animation/src/wav2lip/assets/img/avatar3.png b/comps/animation/wav2lip/assets/img/avatar3.png similarity index 100% rename from comps/animation/src/wav2lip/assets/img/avatar3.png rename to comps/animation/wav2lip/assets/img/avatar3.png diff --git a/comps/animation/src/wav2lip/assets/img/avatar4.png b/comps/animation/wav2lip/assets/img/avatar4.png similarity index 100% rename from comps/animation/src/wav2lip/assets/img/avatar4.png rename to comps/animation/wav2lip/assets/img/avatar4.png diff --git a/comps/animation/src/wav2lip/assets/img/avatar5.png b/comps/animation/wav2lip/assets/img/avatar5.png similarity index 100% rename from comps/animation/src/wav2lip/assets/img/avatar5.png rename to comps/animation/wav2lip/assets/img/avatar5.png diff --git a/comps/animation/src/wav2lip/assets/img/avatar6.png b/comps/animation/wav2lip/assets/img/avatar6.png similarity index 100% rename from comps/animation/src/wav2lip/assets/img/avatar6.png rename to comps/animation/wav2lip/assets/img/avatar6.png diff --git a/comps/animation/src/wav2lip/assets/img/flowchart.png b/comps/animation/wav2lip/assets/img/flowchart.png similarity index 100% rename from comps/animation/src/wav2lip/assets/img/flowchart.png rename to comps/animation/wav2lip/assets/img/flowchart.png diff --git a/comps/animation/src/wav2lip/assets/img/gaudi.png b/comps/animation/wav2lip/assets/img/gaudi.png similarity index 100% rename from comps/animation/src/wav2lip/assets/img/gaudi.png rename to comps/animation/wav2lip/assets/img/gaudi.png diff --git a/comps/animation/src/wav2lip/assets/img/opea_gh_qr.png b/comps/animation/wav2lip/assets/img/opea_gh_qr.png similarity index 100% rename from comps/animation/src/wav2lip/assets/img/opea_gh_qr.png rename to comps/animation/wav2lip/assets/img/opea_gh_qr.png diff --git a/comps/animation/src/wav2lip/assets/img/opea_qr.png b/comps/animation/wav2lip/assets/img/opea_qr.png similarity index 100% rename from comps/animation/src/wav2lip/assets/img/opea_qr.png rename to comps/animation/wav2lip/assets/img/opea_qr.png diff --git a/comps/animation/src/wav2lip/assets/img/xeon.jpg b/comps/animation/wav2lip/assets/img/xeon.jpg similarity index 100% rename from comps/animation/src/wav2lip/assets/img/xeon.jpg rename to comps/animation/wav2lip/assets/img/xeon.jpg diff --git a/comps/animation/src/wav2lip/assets/outputs/results.mp4 b/comps/animation/wav2lip/assets/outputs/results.mp4 similarity index 100% rename from comps/animation/src/wav2lip/assets/outputs/results.mp4 rename to comps/animation/wav2lip/assets/outputs/results.mp4 diff --git a/comps/animation/src/wav2lip/check_animation_server.py b/comps/animation/wav2lip/check_animation_server.py similarity index 100% rename from comps/animation/src/wav2lip/check_animation_server.py rename to comps/animation/wav2lip/check_animation_server.py diff --git a/comps/animation/src/wav2lip/dependency/Dockerfile b/comps/animation/wav2lip/dependency/Dockerfile similarity index 100% rename from comps/animation/src/wav2lip/dependency/Dockerfile rename to comps/animation/wav2lip/dependency/Dockerfile diff --git a/comps/animation/src/wav2lip/dependency/Dockerfile.intel_hpu b/comps/animation/wav2lip/dependency/Dockerfile.intel_hpu similarity index 100% rename from comps/animation/src/wav2lip/dependency/Dockerfile.intel_hpu rename to comps/animation/wav2lip/dependency/Dockerfile.intel_hpu diff --git a/comps/animation/src/wav2lip/dependency/__init__.py b/comps/animation/wav2lip/dependency/__init__.py similarity index 100% rename from comps/animation/src/wav2lip/dependency/__init__.py rename to comps/animation/wav2lip/dependency/__init__.py diff --git a/comps/animation/src/wav2lip/dependency/check_wav2lip_server.py b/comps/animation/wav2lip/dependency/check_wav2lip_server.py similarity index 100% rename from comps/animation/src/wav2lip/dependency/check_wav2lip_server.py rename to comps/animation/wav2lip/dependency/check_wav2lip_server.py diff --git a/comps/animation/src/wav2lip/dependency/download_ckpts.sh b/comps/animation/wav2lip/dependency/download_ckpts.sh similarity index 100% rename from comps/animation/src/wav2lip/dependency/download_ckpts.sh rename to comps/animation/wav2lip/dependency/download_ckpts.sh diff --git a/comps/animation/src/wav2lip/dependency/entrypoint.sh b/comps/animation/wav2lip/dependency/entrypoint.sh similarity index 100% rename from comps/animation/src/wav2lip/dependency/entrypoint.sh rename to comps/animation/wav2lip/dependency/entrypoint.sh diff --git a/comps/animation/src/wav2lip/dependency/utils.py b/comps/animation/wav2lip/dependency/utils.py similarity index 100% rename from comps/animation/src/wav2lip/dependency/utils.py rename to comps/animation/wav2lip/dependency/utils.py diff --git a/comps/animation/src/wav2lip/dependency/wav2lip_server.py b/comps/animation/wav2lip/dependency/wav2lip_server.py similarity index 100% rename from comps/animation/src/wav2lip/dependency/wav2lip_server.py rename to comps/animation/wav2lip/dependency/wav2lip_server.py diff --git a/comps/animation/src/wav2lip/docker_run.sh b/comps/animation/wav2lip/docker_run.sh similarity index 100% rename from comps/animation/src/wav2lip/docker_run.sh rename to comps/animation/wav2lip/docker_run.sh diff --git a/comps/animation/src/wav2lip/requirements.txt b/comps/animation/wav2lip/requirements.txt similarity index 100% rename from comps/animation/src/wav2lip/requirements.txt rename to comps/animation/wav2lip/requirements.txt diff --git a/comps/asr/src/whisper/Dockerfile b/comps/asr/whisper/Dockerfile similarity index 100% rename from comps/asr/src/whisper/Dockerfile rename to comps/asr/whisper/Dockerfile diff --git a/comps/asr/src/whisper/README.md b/comps/asr/whisper/README.md similarity index 100% rename from comps/asr/src/whisper/README.md rename to comps/asr/whisper/README.md diff --git a/comps/asr/src/whisper/__init__.py b/comps/asr/whisper/__init__.py similarity index 100% rename from comps/asr/src/whisper/__init__.py rename to comps/asr/whisper/__init__.py diff --git a/comps/asr/src/whisper/asr.py b/comps/asr/whisper/asr.py similarity index 100% rename from comps/asr/src/whisper/asr.py rename to comps/asr/whisper/asr.py diff --git a/comps/asr/src/whisper/check_asr_server.py b/comps/asr/whisper/check_asr_server.py similarity index 100% rename from comps/asr/src/whisper/check_asr_server.py rename to comps/asr/whisper/check_asr_server.py diff --git a/comps/asr/src/whisper/dependency/Dockerfile b/comps/asr/whisper/dependency/Dockerfile similarity index 100% rename from comps/asr/src/whisper/dependency/Dockerfile rename to comps/asr/whisper/dependency/Dockerfile diff --git a/comps/asr/src/whisper/dependency/Dockerfile.intel_hpu b/comps/asr/whisper/dependency/Dockerfile.intel_hpu similarity index 100% rename from comps/asr/src/whisper/dependency/Dockerfile.intel_hpu rename to comps/asr/whisper/dependency/Dockerfile.intel_hpu diff --git a/comps/asr/src/whisper/dependency/__init__.py b/comps/asr/whisper/dependency/__init__.py similarity index 100% rename from comps/asr/src/whisper/dependency/__init__.py rename to comps/asr/whisper/dependency/__init__.py diff --git a/comps/asr/src/whisper/dependency/check_whisper_server.py b/comps/asr/whisper/dependency/check_whisper_server.py similarity index 100% rename from comps/asr/src/whisper/dependency/check_whisper_server.py rename to comps/asr/whisper/dependency/check_whisper_server.py diff --git a/comps/asr/src/whisper/dependency/whisper_model.py b/comps/asr/whisper/dependency/whisper_model.py similarity index 100% rename from comps/asr/src/whisper/dependency/whisper_model.py rename to comps/asr/whisper/dependency/whisper_model.py diff --git a/comps/asr/src/whisper/dependency/whisper_server.py b/comps/asr/whisper/dependency/whisper_server.py similarity index 100% rename from comps/asr/src/whisper/dependency/whisper_server.py rename to comps/asr/whisper/dependency/whisper_server.py diff --git a/comps/asr/src/whisper/requirements.txt b/comps/asr/whisper/requirements.txt similarity index 100% rename from comps/asr/src/whisper/requirements.txt rename to comps/asr/whisper/requirements.txt diff --git a/comps/chathistory/src/README.md b/comps/chathistory/README.md similarity index 100% rename from comps/chathistory/src/README.md rename to comps/chathistory/README.md diff --git a/comps/chathistory/src/assets/img/chathistory_flow.png b/comps/chathistory/assets/img/chathistory_flow.png similarity index 100% rename from comps/chathistory/src/assets/img/chathistory_flow.png rename to comps/chathistory/assets/img/chathistory_flow.png diff --git a/comps/chathistory/src/mongo/Dockerfile b/comps/chathistory/mongo/Dockerfile similarity index 100% rename from comps/chathistory/src/mongo/Dockerfile rename to comps/chathistory/mongo/Dockerfile diff --git a/comps/chathistory/src/mongo/README.md b/comps/chathistory/mongo/README.md similarity index 100% rename from comps/chathistory/src/mongo/README.md rename to comps/chathistory/mongo/README.md diff --git a/comps/chathistory/src/mongo/chathistory_mongo.py b/comps/chathistory/mongo/chathistory_mongo.py similarity index 100% rename from comps/chathistory/src/mongo/chathistory_mongo.py rename to comps/chathistory/mongo/chathistory_mongo.py diff --git a/comps/chathistory/src/mongo/config.py b/comps/chathistory/mongo/config.py similarity index 100% rename from comps/chathistory/src/mongo/config.py rename to comps/chathistory/mongo/config.py diff --git a/comps/chathistory/src/mongo/mongo_conn.py b/comps/chathistory/mongo/mongo_conn.py similarity index 100% rename from comps/chathistory/src/mongo/mongo_conn.py rename to comps/chathistory/mongo/mongo_conn.py diff --git a/comps/chathistory/src/mongo/mongo_store.py b/comps/chathistory/mongo/mongo_store.py similarity index 100% rename from comps/chathistory/src/mongo/mongo_store.py rename to comps/chathistory/mongo/mongo_store.py diff --git a/comps/chathistory/src/mongo/requirements.txt b/comps/chathistory/mongo/requirements.txt similarity index 100% rename from comps/chathistory/src/mongo/requirements.txt rename to comps/chathistory/mongo/requirements.txt diff --git a/comps/llms/deployment/docker_compose/text-generation_tgi.yaml b/comps/llms/deployment/docker_compose/text-generation_tgi.yaml index 36269aeea..63514f968 100644 --- a/comps/llms/deployment/docker_compose/text-generation_tgi.yaml +++ b/comps/llms/deployment/docker_compose/text-generation_tgi.yaml @@ -5,7 +5,7 @@ version: "3.8" services: tgi_service: - image: ghcr.io/huggingface/text-generation-inference:2.1.0 + image: ghcr.io/huggingface/text-generation-inference:2.4.0-intel-cpu container_name: tgi-service ports: - "8008:80" @@ -19,19 +19,28 @@ services: HF_TOKEN: ${HF_TOKEN} HF_HUB_DISABLE_PROGRESS_BARS: 1 HF_HUB_ENABLE_HF_TRANSFER: 0 - command: --model-id ${LLM_MODEL_ID} + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:8008/health"] + interval: 10s + timeout: 10s + retries: 30 + command: --model-id ${LLM_MODEL_ID} --cuda-graphs 0 llm: - image: opea/llm-tgi:latest - container_name: llm-tgi-server + image: opea/llm:latest + container_name: llm-server ports: - "9000:9000" ipc: host + depends_on: + tgi_service: + condition: service_healthy environment: no_proxy: ${no_proxy} http_proxy: ${http_proxy} https_proxy: ${https_proxy} - TGI_LLM_ENDPOINT: ${TGI_LLM_ENDPOINT} + LLM_ENDPOINT: ${LLM_ENDPOINT} HF_TOKEN: ${HF_TOKEN} + LLM_MODEL_ID: ${LLM_MODEL_ID} restart: unless-stopped networks: diff --git a/comps/llms/src/faq-generation/tgi/langchain/Dockerfile b/comps/llms/faq-generation/tgi/langchain/Dockerfile similarity index 100% rename from comps/llms/src/faq-generation/tgi/langchain/Dockerfile rename to comps/llms/faq-generation/tgi/langchain/Dockerfile diff --git a/comps/llms/src/faq-generation/tgi/langchain/README.md b/comps/llms/faq-generation/tgi/langchain/README.md similarity index 100% rename from comps/llms/src/faq-generation/tgi/langchain/README.md rename to comps/llms/faq-generation/tgi/langchain/README.md diff --git a/comps/llms/src/faq-generation/tgi/langchain/__init__.py b/comps/llms/faq-generation/tgi/langchain/__init__.py similarity index 100% rename from comps/llms/src/faq-generation/tgi/langchain/__init__.py rename to comps/llms/faq-generation/tgi/langchain/__init__.py diff --git a/comps/llms/deployment/docker_compose/faq-generation_tgi_langchain.yaml b/comps/llms/faq-generation/tgi/langchain/docker_compose_llm.yaml similarity index 100% rename from comps/llms/deployment/docker_compose/faq-generation_tgi_langchain.yaml rename to comps/llms/faq-generation/tgi/langchain/docker_compose_llm.yaml diff --git a/comps/llms/src/faq-generation/tgi/langchain/entrypoint.sh b/comps/llms/faq-generation/tgi/langchain/entrypoint.sh similarity index 100% rename from comps/llms/src/faq-generation/tgi/langchain/entrypoint.sh rename to comps/llms/faq-generation/tgi/langchain/entrypoint.sh diff --git a/comps/llms/src/faq-generation/tgi/langchain/llm.py b/comps/llms/faq-generation/tgi/langchain/llm.py similarity index 100% rename from comps/llms/src/faq-generation/tgi/langchain/llm.py rename to comps/llms/faq-generation/tgi/langchain/llm.py diff --git a/comps/llms/src/faq-generation/tgi/langchain/requirements-runtime.txt b/comps/llms/faq-generation/tgi/langchain/requirements-runtime.txt similarity index 100% rename from comps/llms/src/faq-generation/tgi/langchain/requirements-runtime.txt rename to comps/llms/faq-generation/tgi/langchain/requirements-runtime.txt diff --git a/comps/llms/src/faq-generation/tgi/langchain/requirements.txt b/comps/llms/faq-generation/tgi/langchain/requirements.txt similarity index 100% rename from comps/llms/src/faq-generation/tgi/langchain/requirements.txt rename to comps/llms/faq-generation/tgi/langchain/requirements.txt diff --git a/comps/llms/src/faq-generation/vllm/langchain/Dockerfile b/comps/llms/faq-generation/vllm/langchain/Dockerfile similarity index 100% rename from comps/llms/src/faq-generation/vllm/langchain/Dockerfile rename to comps/llms/faq-generation/vllm/langchain/Dockerfile diff --git a/comps/llms/src/faq-generation/vllm/langchain/README.md b/comps/llms/faq-generation/vllm/langchain/README.md similarity index 100% rename from comps/llms/src/faq-generation/vllm/langchain/README.md rename to comps/llms/faq-generation/vllm/langchain/README.md diff --git a/comps/llms/src/faq-generation/vllm/langchain/__init__.py b/comps/llms/faq-generation/vllm/langchain/__init__.py similarity index 100% rename from comps/llms/src/faq-generation/vllm/langchain/__init__.py rename to comps/llms/faq-generation/vllm/langchain/__init__.py diff --git a/comps/llms/deployment/docker_compose/faq-generation_vllm_langchain.yaml b/comps/llms/faq-generation/vllm/langchain/docker_compose_llm.yaml similarity index 100% rename from comps/llms/deployment/docker_compose/faq-generation_vllm_langchain.yaml rename to comps/llms/faq-generation/vllm/langchain/docker_compose_llm.yaml diff --git a/comps/llms/src/faq-generation/vllm/langchain/entrypoint.sh b/comps/llms/faq-generation/vllm/langchain/entrypoint.sh similarity index 100% rename from comps/llms/src/faq-generation/vllm/langchain/entrypoint.sh rename to comps/llms/faq-generation/vllm/langchain/entrypoint.sh diff --git a/comps/llms/src/faq-generation/vllm/langchain/llm.py b/comps/llms/faq-generation/vllm/langchain/llm.py similarity index 100% rename from comps/llms/src/faq-generation/vllm/langchain/llm.py rename to comps/llms/faq-generation/vllm/langchain/llm.py diff --git a/comps/llms/src/faq-generation/vllm/langchain/requirements-runtime.txt b/comps/llms/faq-generation/vllm/langchain/requirements-runtime.txt similarity index 100% rename from comps/llms/src/faq-generation/vllm/langchain/requirements-runtime.txt rename to comps/llms/faq-generation/vllm/langchain/requirements-runtime.txt diff --git a/comps/llms/src/faq-generation/vllm/langchain/requirements.txt b/comps/llms/faq-generation/vllm/langchain/requirements.txt similarity index 100% rename from comps/llms/src/faq-generation/vllm/langchain/requirements.txt rename to comps/llms/faq-generation/vllm/langchain/requirements.txt diff --git a/comps/llms/src/requirements.txt b/comps/llms/requirements.txt similarity index 100% rename from comps/llms/src/requirements.txt rename to comps/llms/requirements.txt diff --git a/comps/llms/src/text-generation/README.md b/comps/llms/src/text-generation/README.md index 5a8064c0e..04f04512d 100644 --- a/comps/llms/src/text-generation/README.md +++ b/comps/llms/src/text-generation/README.md @@ -14,7 +14,7 @@ pip install -r requirements.txt ### 1.2 Start 3rd-party TGI Service -Please refer to [3rd-party TGI](../../../3rd_parties/tgi/deployment/docker/README.md) to start a LLM endpoint and verify. +Please refer to [3rd-party TGI](../../../3rd_parties/tgi/deployment/docker/) to start a LLM endpoint and verify. ### 1.3 Start LLM Service with Python Script diff --git a/comps/llms/src/summarization/tgi/langchain/Dockerfile b/comps/llms/summarization/tgi/langchain/Dockerfile similarity index 100% rename from comps/llms/src/summarization/tgi/langchain/Dockerfile rename to comps/llms/summarization/tgi/langchain/Dockerfile diff --git a/comps/llms/src/summarization/tgi/langchain/README.md b/comps/llms/summarization/tgi/langchain/README.md similarity index 100% rename from comps/llms/src/summarization/tgi/langchain/README.md rename to comps/llms/summarization/tgi/langchain/README.md diff --git a/comps/llms/src/summarization/tgi/langchain/__init__.py b/comps/llms/summarization/tgi/langchain/__init__.py similarity index 100% rename from comps/llms/src/summarization/tgi/langchain/__init__.py rename to comps/llms/summarization/tgi/langchain/__init__.py diff --git a/comps/llms/deployment/docker_compose/summarization_tgi_langchain.yaml b/comps/llms/summarization/tgi/langchain/docker_compose_llm.yaml similarity index 100% rename from comps/llms/deployment/docker_compose/summarization_tgi_langchain.yaml rename to comps/llms/summarization/tgi/langchain/docker_compose_llm.yaml diff --git a/comps/llms/src/summarization/tgi/langchain/entrypoint.sh b/comps/llms/summarization/tgi/langchain/entrypoint.sh similarity index 100% rename from comps/llms/src/summarization/tgi/langchain/entrypoint.sh rename to comps/llms/summarization/tgi/langchain/entrypoint.sh diff --git a/comps/llms/src/summarization/tgi/langchain/llm.py b/comps/llms/summarization/tgi/langchain/llm.py similarity index 100% rename from comps/llms/src/summarization/tgi/langchain/llm.py rename to comps/llms/summarization/tgi/langchain/llm.py diff --git a/comps/llms/src/summarization/tgi/langchain/requirements-runtime.txt b/comps/llms/summarization/tgi/langchain/requirements-runtime.txt similarity index 100% rename from comps/llms/src/summarization/tgi/langchain/requirements-runtime.txt rename to comps/llms/summarization/tgi/langchain/requirements-runtime.txt diff --git a/comps/llms/src/summarization/tgi/langchain/requirements.txt b/comps/llms/summarization/tgi/langchain/requirements.txt similarity index 100% rename from comps/llms/src/summarization/tgi/langchain/requirements.txt rename to comps/llms/summarization/tgi/langchain/requirements.txt diff --git a/comps/llms/src/summarization/vllm/langchain/Dockerfile b/comps/llms/summarization/vllm/langchain/Dockerfile similarity index 100% rename from comps/llms/src/summarization/vllm/langchain/Dockerfile rename to comps/llms/summarization/vllm/langchain/Dockerfile diff --git a/comps/llms/src/summarization/vllm/langchain/README.md b/comps/llms/summarization/vllm/langchain/README.md similarity index 100% rename from comps/llms/src/summarization/vllm/langchain/README.md rename to comps/llms/summarization/vllm/langchain/README.md diff --git a/comps/llms/src/summarization/vllm/langchain/__init__.py b/comps/llms/summarization/vllm/langchain/__init__.py similarity index 100% rename from comps/llms/src/summarization/vllm/langchain/__init__.py rename to comps/llms/summarization/vllm/langchain/__init__.py diff --git a/comps/llms/deployment/docker_compose/summarization_vllm_langchain.yaml b/comps/llms/summarization/vllm/langchain/docker_compose_llm.yaml similarity index 100% rename from comps/llms/deployment/docker_compose/summarization_vllm_langchain.yaml rename to comps/llms/summarization/vllm/langchain/docker_compose_llm.yaml diff --git a/comps/llms/src/summarization/vllm/langchain/entrypoint.sh b/comps/llms/summarization/vllm/langchain/entrypoint.sh similarity index 100% rename from comps/llms/src/summarization/vllm/langchain/entrypoint.sh rename to comps/llms/summarization/vllm/langchain/entrypoint.sh diff --git a/comps/llms/src/summarization/vllm/langchain/llm.py b/comps/llms/summarization/vllm/langchain/llm.py similarity index 100% rename from comps/llms/src/summarization/vllm/langchain/llm.py rename to comps/llms/summarization/vllm/langchain/llm.py diff --git a/comps/llms/src/summarization/vllm/langchain/requirements-runtime.txt b/comps/llms/summarization/vllm/langchain/requirements-runtime.txt similarity index 100% rename from comps/llms/src/summarization/vllm/langchain/requirements-runtime.txt rename to comps/llms/summarization/vllm/langchain/requirements-runtime.txt diff --git a/comps/llms/src/summarization/vllm/langchain/requirements.txt b/comps/llms/summarization/vllm/langchain/requirements.txt similarity index 100% rename from comps/llms/src/summarization/vllm/langchain/requirements.txt rename to comps/llms/summarization/vllm/langchain/requirements.txt diff --git a/comps/llms/src/utils/lm-eval/Dockerfile b/comps/llms/utils/lm-eval/Dockerfile similarity index 100% rename from comps/llms/src/utils/lm-eval/Dockerfile rename to comps/llms/utils/lm-eval/Dockerfile diff --git a/comps/llms/src/utils/lm-eval/README.md b/comps/llms/utils/lm-eval/README.md similarity index 100% rename from comps/llms/src/utils/lm-eval/README.md rename to comps/llms/utils/lm-eval/README.md diff --git a/comps/llms/src/utils/lm-eval/requirements.txt b/comps/llms/utils/lm-eval/requirements.txt similarity index 100% rename from comps/llms/src/utils/lm-eval/requirements.txt rename to comps/llms/utils/lm-eval/requirements.txt diff --git a/comps/llms/src/utils/lm-eval/self_hosted_hf.py b/comps/llms/utils/lm-eval/self_hosted_hf.py similarity index 100% rename from comps/llms/src/utils/lm-eval/self_hosted_hf.py rename to comps/llms/utils/lm-eval/self_hosted_hf.py diff --git a/comps/prompt_registry/src/README.md b/comps/prompt_registry/README.md similarity index 100% rename from comps/prompt_registry/src/README.md rename to comps/prompt_registry/README.md diff --git a/comps/prompt_registry/deployment/docker_compose/README.md b/comps/prompt_registry/deployment/docker_compose/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/comps/prompt_registry/deployment/kubernetes/README.md b/comps/prompt_registry/deployment/kubernetes/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/comps/prompt_registry/src/mongo/Dockerfile b/comps/prompt_registry/mongo/Dockerfile similarity index 100% rename from comps/prompt_registry/src/mongo/Dockerfile rename to comps/prompt_registry/mongo/Dockerfile diff --git a/comps/prompt_registry/src/mongo/README.md b/comps/prompt_registry/mongo/README.md similarity index 100% rename from comps/prompt_registry/src/mongo/README.md rename to comps/prompt_registry/mongo/README.md diff --git a/comps/prompt_registry/src/mongo/config.py b/comps/prompt_registry/mongo/config.py similarity index 100% rename from comps/prompt_registry/src/mongo/config.py rename to comps/prompt_registry/mongo/config.py diff --git a/comps/prompt_registry/deployment/docker_compose/mongo.yaml b/comps/prompt_registry/mongo/docker-compose-prompt-registry-mongo.yaml similarity index 100% rename from comps/prompt_registry/deployment/docker_compose/mongo.yaml rename to comps/prompt_registry/mongo/docker-compose-prompt-registry-mongo.yaml diff --git a/comps/prompt_registry/src/mongo/mongo_conn.py b/comps/prompt_registry/mongo/mongo_conn.py similarity index 100% rename from comps/prompt_registry/src/mongo/mongo_conn.py rename to comps/prompt_registry/mongo/mongo_conn.py diff --git a/comps/prompt_registry/src/mongo/mongo_store.py b/comps/prompt_registry/mongo/mongo_store.py similarity index 100% rename from comps/prompt_registry/src/mongo/mongo_store.py rename to comps/prompt_registry/mongo/mongo_store.py diff --git a/comps/prompt_registry/src/mongo/prompt.py b/comps/prompt_registry/mongo/prompt.py similarity index 100% rename from comps/prompt_registry/src/mongo/prompt.py rename to comps/prompt_registry/mongo/prompt.py diff --git a/comps/prompt_registry/src/mongo/requirements.txt b/comps/prompt_registry/mongo/requirements.txt similarity index 100% rename from comps/prompt_registry/src/mongo/requirements.txt rename to comps/prompt_registry/mongo/requirements.txt diff --git a/comps/text2image/src/Dockerfile b/comps/text2image/Dockerfile similarity index 100% rename from comps/text2image/src/Dockerfile rename to comps/text2image/Dockerfile diff --git a/comps/text2image/src/Dockerfile.intel_hpu b/comps/text2image/Dockerfile.intel_hpu similarity index 100% rename from comps/text2image/src/Dockerfile.intel_hpu rename to comps/text2image/Dockerfile.intel_hpu diff --git a/comps/text2image/src/README.md b/comps/text2image/README.md similarity index 100% rename from comps/text2image/src/README.md rename to comps/text2image/README.md diff --git a/comps/text2image/src/__init__.py b/comps/text2image/__init__.py similarity index 100% rename from comps/text2image/src/__init__.py rename to comps/text2image/__init__.py diff --git a/comps/text2image/deployment/docker_compose/README.md b/comps/text2image/deployment/docker_compose/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/comps/text2image/deployment/kubernetes/README.md b/comps/text2image/deployment/kubernetes/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/comps/text2image/src/requirements.txt b/comps/text2image/requirements.txt similarity index 100% rename from comps/text2image/src/requirements.txt rename to comps/text2image/requirements.txt diff --git a/comps/text2image/src/text2image.py b/comps/text2image/text2image.py similarity index 100% rename from comps/text2image/src/text2image.py rename to comps/text2image/text2image.py diff --git a/comps/texttosql/src/README.md b/comps/texttosql/README.md similarity index 100% rename from comps/texttosql/src/README.md rename to comps/texttosql/README.md diff --git a/comps/texttosql/deployment/docker_compose/README.md b/comps/texttosql/deployment/docker_compose/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/comps/texttosql/deployment/kubernetes/README.md b/comps/texttosql/deployment/kubernetes/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/comps/texttosql/src/langchain/Dockerfile b/comps/texttosql/langchain/Dockerfile similarity index 100% rename from comps/texttosql/src/langchain/Dockerfile rename to comps/texttosql/langchain/Dockerfile diff --git a/comps/texttosql/src/langchain/README.md b/comps/texttosql/langchain/README.md similarity index 100% rename from comps/texttosql/src/langchain/README.md rename to comps/texttosql/langchain/README.md diff --git a/comps/texttosql/src/langchain/chinook.sql b/comps/texttosql/langchain/chinook.sql similarity index 100% rename from comps/texttosql/src/langchain/chinook.sql rename to comps/texttosql/langchain/chinook.sql diff --git a/comps/texttosql/deployment/docker_compose/langchain.yaml b/comps/texttosql/langchain/docker_compose_texttosql.yaml similarity index 100% rename from comps/texttosql/deployment/docker_compose/langchain.yaml rename to comps/texttosql/langchain/docker_compose_texttosql.yaml diff --git a/comps/texttosql/src/langchain/main.py b/comps/texttosql/langchain/main.py similarity index 100% rename from comps/texttosql/src/langchain/main.py rename to comps/texttosql/langchain/main.py diff --git a/comps/texttosql/src/langchain/requirements.txt b/comps/texttosql/langchain/requirements.txt similarity index 100% rename from comps/texttosql/src/langchain/requirements.txt rename to comps/texttosql/langchain/requirements.txt diff --git a/comps/texttosql/src/langchain/texttosql.py b/comps/texttosql/langchain/texttosql.py similarity index 100% rename from comps/texttosql/src/langchain/texttosql.py rename to comps/texttosql/langchain/texttosql.py diff --git a/comps/tts/deployment/docker_compose/README.md b/comps/tts/deployment/docker_compose/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/comps/tts/deployment/kubernetes/README.md b/comps/tts/deployment/kubernetes/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/comps/tts/src/gpt-sovits/Dockerfile b/comps/tts/gpt-sovits/Dockerfile similarity index 100% rename from comps/tts/src/gpt-sovits/Dockerfile rename to comps/tts/gpt-sovits/Dockerfile diff --git a/comps/tts/src/gpt-sovits/README.md b/comps/tts/gpt-sovits/README.md similarity index 100% rename from comps/tts/src/gpt-sovits/README.md rename to comps/tts/gpt-sovits/README.md diff --git a/comps/tts/src/gpt-sovits/__init__.py b/comps/tts/gpt-sovits/__init__.py similarity index 100% rename from comps/tts/src/gpt-sovits/__init__.py rename to comps/tts/gpt-sovits/__init__.py diff --git a/comps/tts/src/speecht5/Dockerfile b/comps/tts/speecht5/Dockerfile similarity index 100% rename from comps/tts/src/speecht5/Dockerfile rename to comps/tts/speecht5/Dockerfile diff --git a/comps/tts/src/speecht5/README.md b/comps/tts/speecht5/README.md similarity index 100% rename from comps/tts/src/speecht5/README.md rename to comps/tts/speecht5/README.md diff --git a/comps/tts/src/speecht5/__init__.py b/comps/tts/speecht5/__init__.py similarity index 100% rename from comps/tts/src/speecht5/__init__.py rename to comps/tts/speecht5/__init__.py diff --git a/comps/tts/src/speecht5/dependency/Dockerfile b/comps/tts/speecht5/dependency/Dockerfile similarity index 100% rename from comps/tts/src/speecht5/dependency/Dockerfile rename to comps/tts/speecht5/dependency/Dockerfile diff --git a/comps/tts/src/speecht5/dependency/Dockerfile.intel_hpu b/comps/tts/speecht5/dependency/Dockerfile.intel_hpu similarity index 100% rename from comps/tts/src/speecht5/dependency/Dockerfile.intel_hpu rename to comps/tts/speecht5/dependency/Dockerfile.intel_hpu diff --git a/comps/tts/src/speecht5/dependency/__init__.py b/comps/tts/speecht5/dependency/__init__.py similarity index 100% rename from comps/tts/src/speecht5/dependency/__init__.py rename to comps/tts/speecht5/dependency/__init__.py diff --git a/comps/tts/src/speecht5/dependency/speecht5_model.py b/comps/tts/speecht5/dependency/speecht5_model.py similarity index 100% rename from comps/tts/src/speecht5/dependency/speecht5_model.py rename to comps/tts/speecht5/dependency/speecht5_model.py diff --git a/comps/tts/src/speecht5/dependency/speecht5_server.py b/comps/tts/speecht5/dependency/speecht5_server.py similarity index 100% rename from comps/tts/src/speecht5/dependency/speecht5_server.py rename to comps/tts/speecht5/dependency/speecht5_server.py diff --git a/comps/tts/src/speecht5/requirements.txt b/comps/tts/speecht5/requirements.txt similarity index 100% rename from comps/tts/src/speecht5/requirements.txt rename to comps/tts/speecht5/requirements.txt diff --git a/comps/tts/src/speecht5/tts.py b/comps/tts/speecht5/tts.py similarity index 100% rename from comps/tts/src/speecht5/tts.py rename to comps/tts/speecht5/tts.py diff --git a/comps/web_retrievers/src/chroma/langchain/Dockerfile b/comps/web_retrievers/chroma/langchain/Dockerfile similarity index 78% rename from comps/web_retrievers/src/chroma/langchain/Dockerfile rename to comps/web_retrievers/chroma/langchain/Dockerfile index 7349b84bf..884cec524 100644 --- a/comps/web_retrievers/src/chroma/langchain/Dockerfile +++ b/comps/web_retrievers/chroma/langchain/Dockerfile @@ -19,13 +19,13 @@ COPY comps /home/user/comps 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/web_retrievers/src/chroma/langchain/requirements.txt; \ + pip install --no-cache-dir --extra-index-url https://download.pytorch.org/whl/cpu -r /home/user/comps/web_retrievers/chroma/langchain/requirements.txt; \ else \ - pip install --no-cache-dir -r /home/user/comps/web_retrievers/src/chroma/langchain/requirements.txt; \ + pip install --no-cache-dir -r /home/user/comps/web_retrievers/chroma/langchain/requirements.txt; \ fi ENV PYTHONPATH=$PYTHONPATH:/home/user -WORKDIR /home/user/comps/web_retrievers/src/chroma/langchain +WORKDIR /home/user/comps/web_retrievers/chroma/langchain ENTRYPOINT ["python", "retriever_chroma.py"] diff --git a/comps/web_retrievers/src/chroma/langchain/README.md b/comps/web_retrievers/chroma/langchain/README.md similarity index 97% rename from comps/web_retrievers/src/chroma/langchain/README.md rename to comps/web_retrievers/chroma/langchain/README.md index 7a312fa7b..49e741a8e 100644 --- a/comps/web_retrievers/src/chroma/langchain/README.md +++ b/comps/web_retrievers/chroma/langchain/README.md @@ -8,7 +8,7 @@ The Web Retriever Microservice is designed to efficiently search web pages relev ```bash cd ../../../../ -docker build -t opea/web-retriever-chroma:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/web_retrievers/src/chroma/langchain/Dockerfile . +docker build -t opea/web-retriever-chroma:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/web_retrievers/chroma/langchain/Dockerfile . ``` ### Start TEI Service diff --git a/comps/web_retrievers/src/chroma/langchain/__init__.py b/comps/web_retrievers/chroma/langchain/__init__.py similarity index 100% rename from comps/web_retrievers/src/chroma/langchain/__init__.py rename to comps/web_retrievers/chroma/langchain/__init__.py diff --git a/comps/web_retrievers/src/chroma/langchain/requirements.txt b/comps/web_retrievers/chroma/langchain/requirements.txt similarity index 100% rename from comps/web_retrievers/src/chroma/langchain/requirements.txt rename to comps/web_retrievers/chroma/langchain/requirements.txt diff --git a/comps/web_retrievers/src/chroma/langchain/retriever_chroma.py b/comps/web_retrievers/chroma/langchain/retriever_chroma.py similarity index 100% rename from comps/web_retrievers/src/chroma/langchain/retriever_chroma.py rename to comps/web_retrievers/chroma/langchain/retriever_chroma.py diff --git a/comps/web_retrievers/deployment/docker_compose/README.md b/comps/web_retrievers/deployment/docker_compose/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/comps/web_retrievers/deployment/kubernetes/README.md b/comps/web_retrievers/deployment/kubernetes/README.md deleted file mode 100644 index e69de29bb..000000000