Skip to content

Refactor dataprep microservice #1153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 90 commits into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from 70 commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
eafa1b2
refactor dataprep code
lvliang-intel Jan 14, 2025
ec817d7
Merge branch 'main' of https://github.com/opea-project/GenAIComps int…
lvliang-intel Jan 14, 2025
7c545a5
Dataprep code refactor
lvliang-intel Jan 15, 2025
ff6cdfc
Merge branch 'main' of https://github.com/opea-project/GenAIComps int…
lvliang-intel Jan 15, 2025
b0558dd
Merge branch 'main' of https://github.com/opea-project/GenAIComps int…
lvliang-intel Jan 15, 2025
ce3504c
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 15, 2025
29cc5c6
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 15, 2025
218da1b
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 15, 2025
1c8d870
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 15, 2025
3c0c6c3
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 15, 2025
b1635c0
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 15, 2025
2768c00
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 15, 2025
cab0a5d
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 15, 2025
7f66f78
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 15, 2025
f439f1c
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 15, 2025
6d931bc
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 15, 2025
8a4559c
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 15, 2025
4d92e05
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 15, 2025
4d6f1f9
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 15, 2025
632cbaa
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 15, 2025
c95c7b2
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 15, 2025
18dc889
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 15, 2025
0c82e24
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 15, 2025
31672f9
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 15, 2025
c7fc298
Merge branch 'main' into lvl/dataprep_refactor
lvliang-intel Jan 15, 2025
45e7709
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 15, 2025
946c3dd
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 15, 2025
aa50579
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 15, 2025
3b08e70
Merge branch 'main' of https://github.com/opea-project/GenAIComps int…
lvliang-intel Jan 16, 2025
6564215
Merge branch 'main' of https://github.com/opea-project/GenAIComps int…
lvliang-intel Jan 16, 2025
397585b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 16, 2025
9eb7ddc
Merge branch 'main' of https://github.com/opea-project/GenAIComps int…
lvliang-intel Jan 16, 2025
4c25eee
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 16, 2025
d98638e
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 16, 2025
205059a
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 16, 2025
85d74fb
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 16, 2025
46d8112
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 17, 2025
d6fb953
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 17, 2025
73b001d
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 17, 2025
02a1950
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 17, 2025
26c6c1b
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 17, 2025
8c6cd87
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 17, 2025
799a769
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 17, 2025
8330102
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 17, 2025
9d96178
Merge branch 'main' of https://github.com/opea-project/GenAIComps int…
lvliang-intel Jan 17, 2025
2ff4c74
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 17, 2025
f424b92
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 17, 2025
d44fae3
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 17, 2025
6660f9c
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 17, 2025
75afc38
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 17, 2025
3118877
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 17, 2025
9d4bc62
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 17, 2025
e99225d
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 17, 2025
818d954
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 17, 2025
a8fd5c8
Merge branch 'main' of https://github.com/opea-project/GenAIComps int…
lvliang-intel Jan 17, 2025
307f5ed
Merge branch 'main' of https://github.com/opea-project/GenAIComps int…
lvliang-intel Jan 17, 2025
2dd59df
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 17, 2025
dca220f
Merge branch 'main' into lvl/dataprep_refactor
lvliang-intel Jan 17, 2025
6820519
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 17, 2025
c4ff66e
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 17, 2025
320fa36
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 17, 2025
4c749e9
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 17, 2025
862585e
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 17, 2025
59cc3f7
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 18, 2025
5ea69bf
Merge branch 'main' of https://github.com/opea-project/GenAIComps int…
lvliang-intel Jan 18, 2025
1f97106
Merge branch 'main' of https://github.com/opea-project/GenAIComps int…
lvliang-intel Jan 18, 2025
04ae65f
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 18, 2025
012ad70
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 18, 2025
52159c6
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 18, 2025
2ad2752
Merge branch 'main' into lvl/dataprep_refactor
chensuyue Jan 19, 2025
ce1c62b
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 18, 2025
6d848f2
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 19, 2025
744541d
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 19, 2025
40b3aac
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 19, 2025
07e49f2
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 19, 2025
35fc7be
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 19, 2025
b256387
Merge branch 'main' of https://github.com/opea-project/GenAIComps int…
lvliang-intel Jan 19, 2025
9f9b2b0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 19, 2025
0ad3e95
Merge branch 'main' of https://github.com/opea-project/GenAIComps int…
lvliang-intel Jan 19, 2025
9ec463f
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 19, 2025
52cc446
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 19, 2025
9d91d73
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 19, 2025
31a0dfb
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 19, 2025
efb0f22
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 19, 2025
6f874eb
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 19, 2025
dc709da
Merge branch 'main' of https://github.com/opea-project/GenAIComps int…
lvliang-intel Jan 20, 2025
a4813ff
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 20, 2025
6ca467c
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 20, 2025
4d91a12
Merge branch 'main' of https://github.com/opea-project/GenAIComps int…
lvliang-intel Jan 20, 2025
9d12f72
Merge branch 'lvl/dataprep_refactor' of https://github.com/opea-proje…
lvliang-intel Jan 20, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 0 additions & 56 deletions .github/workflows/docker/compose/dataprep-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,59 +7,3 @@ services:
build:
dockerfile: comps/dataprep/src/Dockerfile
image: ${REGISTRY:-opea}/dataprep:${TAG:-latest}
dataprep-redis:
build:
dockerfile: comps/dataprep/redis/langchain/Dockerfile
image: ${REGISTRY:-opea}/dataprep-redis:${TAG:-latest}
dataprep-qdrant:
build:
dockerfile: comps/dataprep/qdrant/langchain/Dockerfile
image: ${REGISTRY:-opea}/dataprep-qdrant:${TAG:-latest}
dataprep-on-ray-redis:
build:
dockerfile: comps/dataprep/redis/langchain_ray/Dockerfile
image: ${REGISTRY:-opea}/dataprep-on-ray-redis:${TAG:-latest}
dataprep-multimodal-vdms:
build:
dockerfile: comps/dataprep/vdms/multimodal_langchain/Dockerfile
image: ${REGISTRY:-opea}/dataprep-multimodal-vdms:${TAG:-latest}
dataprep-multimodal-redis:
build:
dockerfile: comps/dataprep/multimodal/redis/langchain/Dockerfile
image: ${REGISTRY:-opea}/dataprep-multimodal-redis:${TAG:-latest}
dataprep-redis-llama-index:
build:
dockerfile: comps/dataprep/redis/llama_index/Dockerfile
image: ${REGISTRY:-opea}/dataprep-redis-llama-index:${TAG:-latest}
dataprep-milvus:
build:
dockerfile: comps/dataprep/milvus/langchain/Dockerfile
image: ${REGISTRY:-opea}/dataprep-milvus:${TAG:-latest}
dataprep-pgvector:
build:
dockerfile: comps/dataprep/pgvector/langchain/Dockerfile
image: ${REGISTRY:-opea}/dataprep-pgvector:${TAG:-latest}
dataprep-pinecone:
build:
dockerfile: comps/dataprep/pinecone/langchain/Dockerfile
image: ${REGISTRY:-opea}/dataprep-pinecone:${TAG:-latest}
dataprep-vdms:
build:
dockerfile: comps/dataprep/vdms/langchain/Dockerfile
image: ${REGISTRY:-opea}/dataprep-vdms:${TAG:-latest}
dataprep-neo4j:
build:
dockerfile: comps/dataprep/neo4j/langchain/Dockerfile
image: ${REGISTRY:-opea}/dataprep-neo4j:${TAG:-latest}
dataprep-neo4j-llamaindex:
build:
dockerfile: comps/dataprep/neo4j/llama_index/Dockerfile
image: ${REGISTRY:-opea}/dataprep-neo4j-llamaindex:${TAG:-latest}
dataprep-elasticsearch:
build:
dockerfile: comps/dataprep/elasticsearch/langchain/Dockerfile
image: ${REGISTRY:-opea}/dataprep-elasticsearch:${TAG:-latest}
dataprep-opensearch:
build:
dockerfile: comps/dataprep/opensearch/langchain/Dockerfile
image: ${REGISTRY:-opea}/dataprep-opensearch:${TAG:-latest}
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ The initially supported `Microservices` are described in the below table. More `
| [ASR](./comps/asr/src/README.md) | NA | [openai/whisper-small](https://huggingface.co/openai/whisper-small) | NA | Xeon | Audio-Speech-RecognitionS on Xeon CPU |
| [TTS](./comps/tts/src/README.md) | NA | [microsoft/speecht5_tts](https://huggingface.co/microsoft/speecht5_tts) | NA | Gaudi2 | Text-To-Speech on Gaudi2 |
| [TTS](./comps/tts/src/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 |
| [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 | Xeon | Dataprep on Xeon CPU |
| [Dataprep](./comps/dataprep/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/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/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 |
| [Dataprep](./comps/dataprep/README.md) | [Redis](https://redis.io/) | [BAAI/bge-base-en-v1.5](https://huggingface.co/BAAI/bge-base-en-v1.5) | NA | Xeon | Dataprep on Xeon CPU |
| [LLM](./comps/llms/src/text-generation/README.md) | [LangChain](https://www.langchain.com)/[LlamaIndex](https://www.llamaindex.ai) | [Intel/neural-chat-7b-v3-3](https://huggingface.co/Intel/neural-chat-7b-v3-3) | [TGI Gaudi](https://github.com/huggingface/tgi-gaudi) | Gaudi2 | LLM on Gaudi2 |
| [LLM](./comps/llms/src/text-generation/README.md) | [LangChain](https://www.langchain.com)/[LlamaIndex](https://www.llamaindex.ai) | [Intel/neural-chat-7b-v3-3](https://huggingface.co/Intel/neural-chat-7b-v3-3) | [TGI](https://github.com/huggingface/text-generation-inference) | Xeon | LLM on Xeon CPU |
| [LLM](./comps/llms/src/text-generation/README.md) | [LangChain](https://www.langchain.com)/[LlamaIndex](https://www.llamaindex.ai) | [Intel/neural-chat-7b-v3-3](https://huggingface.co/Intel/neural-chat-7b-v3-3) | [Ray Serve](https://github.com/ray-project/ray) | Gaudi2 | LLM on Gaudi2 |
Expand Down
26 changes: 19 additions & 7 deletions comps/dataprep/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,40 @@ export SUMMARIZE_IMAGE_VIA_LVM=1

## Dataprep Microservice with Redis

For details, please refer to this [readme](redis/README.md)
For details, please refer to this [readme](src/README_redis.md)

## Dataprep Microservice with Milvus

For details, please refer to this [readme](milvus/langchain/README.md)
For details, please refer to this [readme](src/README_milvus.md)

## Dataprep Microservice with Qdrant

For details, please refer to this [readme](qdrant/langchain/README.md)
For details, please refer to this [readme](src/README_qdrant.md)

## Dataprep Microservice with Pinecone

For details, please refer to this [readme](pinecone/langchain/README.md)
For details, please refer to this [readme](src/README_pinecone.md)

## Dataprep Microservice with PGVector

For details, please refer to this [readme](pgvector/langchain/README.md)
For details, please refer to this [readme](src/README_pgvector.md)

## Dataprep Microservice with VDMS

For details, please refer to this [readme](vdms/README.md)
For details, please refer to this [readme](src/README_vdms.md)

## Dataprep Microservice with Multimodal

For details, please refer to this [readme](multimodal/redis/langchain/README.md)
For details, please refer to this [readme](src/README_multimodal.md)

## Dataprep Microservice with ElasticSearch

For details, please refer to this [readme](src/README_elasticsearch.md)

## Dataprep Microservice with OpenSearch

For details, please refer to this [readme](src/README_opensearch.md)

## Dataprep Microservice with neo4j

For details, please refer to this [readme](src/README_neo4j_llamaindex.md)
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ services:
container_name: vdms-vector-db
ports:
- "55555:55555"
dataprep-vdms:
image: opea/dataprep-vdms:latest
container_name: dataprep-vdms-server
dataprep-vdms-multimodal:
image: opea/dataprep-vdms-multimodal:latest
container_name: dataprep-vdms--multimodal-server
ports:
- "6007:6007"
ipc: host
Expand Down
38 changes: 0 additions & 38 deletions comps/dataprep/elasticsearch/langchain/Dockerfile

This file was deleted.

2 changes: 0 additions & 2 deletions comps/dataprep/elasticsearch/langchain/__init__.py

This file was deleted.

23 changes: 0 additions & 23 deletions comps/dataprep/elasticsearch/langchain/config.py

This file was deleted.

Loading
Loading