Merge branch 'refactor_comps' of https://github.com/opea-project/GenA…

…IComps into refactor_comps
opea-project · Dec 20, 2024 · 6c9cd31 · 6c9cd31
2 parents 0183dbc + 29c3c34
commit 6c9cd31
Show file tree

Hide file tree

Showing 200 changed files with 81 additions and 72 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → comps/agent/langchain/Dockerfile b/comps/agent/src/langchain/Dockerfile → comps/agent/langchain/Dockerfile