Skip to content
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

Refactor Retrievers #1138

Merged
merged 55 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
f648386
refactor pinecone
letonghan Jan 14, 2025
c289bd5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 14, 2025
2d9a062
Merge branch 'main' into refactor_retrievers
letonghan Jan 14, 2025
29ce7ce
format folders
letonghan Jan 14, 2025
ac88f8b
update cicd scripts
letonghan Jan 14, 2025
ef9b043
add env var for component registration
letonghan Jan 14, 2025
181b8c1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 14, 2025
358d6c9
remove wrong path in readme
letonghan Jan 14, 2025
8617e73
fix pinecone issue
letonghan Jan 14, 2025
079a088
add pgvector retriever
letonghan Jan 14, 2025
f7cd3d4
Merge branch 'main' into refactor_retrievers
letonghan Jan 14, 2025
1da007d
Merge branch 'refactor_retrievers' of https://github.com/opea-project…
letonghan Jan 14, 2025
025c999
refactor pgvector retriever
letonghan Jan 14, 2025
91dad96
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 14, 2025
579d79b
fix pgvector ci issue
letonghan Jan 14, 2025
27f049d
Merge branch 'refactor_retrievers' of https://github.com/opea-project…
letonghan Jan 14, 2025
bc45431
add requirements for pgvector
letonghan Jan 14, 2025
4276c08
update
letonghan Jan 14, 2025
ab2c511
refactor qdrant retriever
letonghan Jan 14, 2025
bf76ca3
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 14, 2025
461e76c
fix qdrant ci
letonghan Jan 14, 2025
f539529
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 14, 2025
b608471
refactor elasticsearch
letonghan Jan 14, 2025
a24ace2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 14, 2025
6416a1d
refactor neo4j and opensearch
letonghan Jan 14, 2025
2d9b2dc
Merge branch 'refactor_retrievers' of https://github.com/opea-project…
letonghan Jan 14, 2025
f311680
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 14, 2025
3e5aee6
fix pre-ci issue
letonghan Jan 14, 2025
846ac05
Merge branch 'refactor_retrievers' of https://github.com/opea-project…
letonghan Jan 14, 2025
286b0f0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 14, 2025
b672d03
refactor pathway
letonghan Jan 14, 2025
274a12d
Merge branch 'refactor_retrievers' of https://github.com/opea-project…
letonghan Jan 14, 2025
d7f52ca
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 14, 2025
59ff6d6
Merge branch 'main' into refactor_retrievers
ZePan110 Jan 15, 2025
6045f4c
add init file
letonghan Jan 15, 2025
55442c0
Merge branch 'main' into refactor_retrievers
letonghan Jan 15, 2025
61b3f07
refactor neo4j langchain into llama_index version for GraphRAG example
letonghan Jan 15, 2025
1e33ef6
Merge branch 'refactor_retrievers' of https://github.com/opea-project…
letonghan Jan 15, 2025
42b1ac2
Merge branch 'main' of https://github.com/opea-project/GenAIComps int…
letonghan Jan 15, 2025
ed7bde3
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 15, 2025
b9cb31a
fix dataprep neo4j dependency import issue
letonghan Jan 15, 2025
224d409
Merge branch 'refactor_retrievers' of https://github.com/opea-project…
letonghan Jan 15, 2025
0a8f3bb
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 15, 2025
3a4187f
add libcairo2 and libglib2.0-0 for dependencies
letonghan Jan 15, 2025
f31320b
refine relative import of dataprep neo4j
letonghan Jan 15, 2025
bfc0160
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 15, 2025
bfab20a
fix neo4j retrieval expected result
letonghan Jan 15, 2025
aabf58d
fix multimodal redis issue and add redis schema file
letonghan Jan 15, 2025
c4cddca
add log
letonghan Jan 15, 2025
4f4ce14
Merge branch 'main' of https://github.com/opea-project/GenAIComps int…
letonghan Jan 15, 2025
4f31174
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 15, 2025
a0298d4
enlarge sleep time for retriever server to start
letonghan Jan 15, 2025
99022e1
add docker compose yaml files
letonghan Jan 16, 2025
0744f5b
Merge branch 'main' of https://github.com/opea-project/GenAIComps int…
letonghan Jan 16, 2025
aa6e669
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 16, 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
48 changes: 0 additions & 48 deletions .github/workflows/docker/compose/retrievers-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,51 +7,3 @@ services:
build:
dockerfile: comps/retrievers/src/Dockerfile
image: ${REGISTRY:-opea}/retriever:${TAG:-latest}
retriever-redis:
build:
dockerfile: comps/retrievers/redis/langchain/Dockerfile
image: ${REGISTRY:-opea}/retriever-redis:${TAG:-latest}
retriever-qdrant:
build:
dockerfile: comps/retrievers/qdrant/haystack/Dockerfile
image: ${REGISTRY:-opea}/retriever-qdrant:${TAG:-latest}
retriever-vdms:
build:
dockerfile: comps/retrievers/vdms/langchain/Dockerfile
image: ${REGISTRY:-opea}/retriever-vdms:${TAG:-latest}
retriever-pgvector:
build:
dockerfile: comps/retrievers/pgvector/langchain/Dockerfile
image: ${REGISTRY:-opea}/retriever-pgvector:${TAG:-latest}
retriever-pinecone:
build:
dockerfile: comps/retrievers/pinecone/langchain/Dockerfile
image: ${REGISTRY:-opea}/retriever-pinecone:${TAG:-latest}
retriever-milvus:
build:
dockerfile: comps/retrievers/milvus/langchain/Dockerfile
image: ${REGISTRY:-opea}/retriever-milvus:${TAG:-latest}
retriever-redis-llamaindex:
build:
dockerfile: comps/retrievers/redis/llama_index/Dockerfile
image: ${REGISTRY:-opea}/retriever-redis-llamaindex:${TAG:-latest}
retriever-pathway:
build:
dockerfile: comps/retrievers/pathway/langchain/Dockerfile
image: ${REGISTRY:-opea}/retriever-pathway:${TAG:-latest}
retriever-neo4j:
build:
dockerfile: comps/retrievers/neo4j/langchain/Dockerfile
image: ${REGISTRY:-opea}/retriever-neo4j:${TAG:-latest}
retriever-neo4j-llamaindex:
build:
dockerfile: comps/retrievers/neo4j/llama_index/Dockerfile
image: ${REGISTRY:-opea}/retriever-neo4j-llamaindex:${TAG:-latest}
retriever-elasticsearch:
build:
dockerfile: comps/retrievers/elasticsearch/langchain/Dockerfile
image: ${REGISTRY:-opea}/retriever-elasticsearch:${TAG:-latest}
retriever-opensearch:
build:
dockerfile: comps/retrievers/opensearch/langchain/Dockerfile
image: ${REGISTRY:-opea}/retriever-opensearch:${TAG:-latest}
31 changes: 0 additions & 31 deletions comps/retrievers/README.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
shm_size: 1g
command: --model-id ${RETRIEVE_MODEL_ID}
retriever:
image: opea/retriever-elasticsearch:latest
image: opea/retriever:latest
container_name: retriever-elasticsearch
ports:
- "7000:7000"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
shm_size: 1g
command: --model-id ${RETRIEVE_MODEL_ID}
retriever:
image: opea/retriever-opensearch-server
image: opea/retriever:latests
container_name: retriever-opensearch-server
ports:
- "7000:7000"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
shm_size: 1g
command: --model-id ${RETRIEVE_MODEL_ID}
retriever:
image: opea/retriever-pathway:latest
image: opea/retriever:latest
container_name: retriever-pathway-server
ports:
- "7000:7000"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
shm_size: 1g
command: --model-id ${RETRIEVE_MODEL_ID}
retriever:
image: opea/retriever-pgvector:latest
image: opea/retriever:latest
container_name: retriever-pgvector
ports:
- "7000:7000"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
shm_size: 1g
command: --model-id ${RETRIEVE_MODEL_ID}
retriever:
image: opea/retriever-pinecone:latest
image: opea/retrievers:latest
container_name: retriever-pinecone-server
ports:
- "7000:7000"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
shm_size: 1g
command: --model-id ${RETRIEVE_MODEL_ID}
retriever:
image: opea/retriever-redis:latest
image: opea/retriever:latest
container_name: retriever-redis-server
ports:
- "7000:7000"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
shm_size: 1g
command: --model-id ${RETRIEVE_MODEL_ID}
retriever:
image: opea/retriever-vdms:latest
image: opea/retriever:latest
container_name: retriever-vdms-server
ports:
- "7000:7000"
Expand Down
28 changes: 0 additions & 28 deletions comps/retrievers/elasticsearch/langchain/Dockerfile

This file was deleted.

122 changes: 0 additions & 122 deletions comps/retrievers/elasticsearch/langchain/README.md

This file was deleted.

18 changes: 0 additions & 18 deletions comps/retrievers/elasticsearch/langchain/config.py

This file was deleted.

14 changes: 0 additions & 14 deletions comps/retrievers/elasticsearch/langchain/requirements.txt

This file was deleted.

Loading
Loading