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

Qdrant retriever microservice #216

Merged
merged 38 commits into from
Jul 9, 2024

Conversation

gadmarkovits
Copy link
Contributor

Description

A new retriever microservice that uses Qdrant as the document store through Haystack.

Issues

n/a

Type of change

List the type of change like below. Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds new functionality)
  • Breaking change (fix or feature that would break existing design and interface)

Dependencies

haystack-ai
qdrant-haystack

Tests

Followed the README in running the service and checking that it functions as required.

ganesanintel and others added 30 commits June 18, 2024 23:59
* Support PGvector service

Signed-off-by: V, Ganesan <[email protected]>
Signed-off-by: gadmarkovits <[email protected]>
Signed-off-by: chensuyue <[email protected]>
Signed-off-by: gadmarkovits <[email protected]>
* refine the vLLM docker compose

Signed-off-by: tianyil1 <[email protected]>

* update the vllm openai api call

Signed-off-by: tianyil1 <[email protected]>

* refine the default network configuration in the docker-compose

Signed-off-by: tianyil1 <[email protected]>

* refine the network config of docker compose and launch service

Signed-off-by: tianyil1 <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: tianyil1 <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: gadmarkovits <[email protected]>
Signed-off-by: Zahidul Haque <[email protected]>
Signed-off-by: gadmarkovits <[email protected]>
Signed-off-by: XuhuiRen <[email protected]>
Signed-off-by: gadmarkovits <[email protected]>
* Fix RAG performance issues

Signed-off-by: lvliang-intel <[email protected]>
Signed-off-by: gadmarkovits <[email protected]>
* add statistics

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: gadmarkovits <[email protected]>
* Add More Contents to the Table MicroService

Signed-off-by: zehao-intel <[email protected]>

* reorder

Signed-off-by: zehao-intel <[email protected]>

* Update README.md

* refine structure

Signed-off-by: zehao-intel <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix model

Signed-off-by: zehao-intel <[email protected]>

* refine table

Signed-off-by: zehao-intel <[email protected]>

* put llm to the ground

Signed-off-by: zehao-intel <[email protected]>

---------

Signed-off-by: zehao-intel <[email protected]>
Co-authored-by: Sihan Chen <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: gadmarkovits <[email protected]>
* add python coverage

Signed-off-by: chensuyue <[email protected]>

* docs update

Signed-off-by: chensuyue <[email protected]>

* Revert "add python coverage"

This reverts commit 69615b1.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: chensuyue <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: gadmarkovits <[email protected]>
…vllm release (opea-project#137)

Signed-off-by: tianyil1 <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: gadmarkovits <[email protected]>
* move file to langchain folder

Signed-off-by: letonghan <[email protected]>

* support dataprep with llama_index

Signed-off-by: letonghan <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* add e2e test script

Signed-off-by: letonghan <[email protected]>

* update test script name

Signed-off-by: letonghan <[email protected]>

---------

Signed-off-by: letonghan <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: gadmarkovits <[email protected]>
* fix stream=false doesn't work issue

Signed-off-by: letonghan <[email protected]>

* support embedding comp with llama_index

Signed-off-by: letonghan <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Add More Contents to the Table of MicroService (opea-project#141)

* Add More Contents to the Table MicroService

Signed-off-by: zehao-intel <[email protected]>

* reorder

Signed-off-by: zehao-intel <[email protected]>

* Update README.md

* refine structure

Signed-off-by: zehao-intel <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix model

Signed-off-by: zehao-intel <[email protected]>

* refine table

Signed-off-by: zehao-intel <[email protected]>

* put llm to the ground

Signed-off-by: zehao-intel <[email protected]>

---------

Signed-off-by: zehao-intel <[email protected]>
Co-authored-by: Sihan Chen <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Use common security content for OPEA projects (opea-project#151)

* add python coverage

Signed-off-by: chensuyue <[email protected]>

* docs update

Signed-off-by: chensuyue <[email protected]>

* Revert "add python coverage"

This reverts commit 69615b1.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: chensuyue <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Enable vLLM Gaudi support for LLM service based on officially habana vllm release (opea-project#137)

Signed-off-by: tianyil1 <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* support embedding comp with llama_index

Signed-off-by: letonghan <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* add test script for embedding llama_inde

Signed-off-by: letonghan <[email protected]>

* remove conflict requirements

Signed-off-by: letonghan <[email protected]>

* update test script

Signed-off-by: letonghan <[email protected]>

* udpate

Signed-off-by: letonghan <[email protected]>

* update

Signed-off-by: letonghan <[email protected]>

* update

Signed-off-by: letonghan <[email protected]>

* fix ut issue

Signed-off-by: letonghan <[email protected]>

---------

Signed-off-by: letonghan <[email protected]>
Signed-off-by: zehao-intel <[email protected]>
Signed-off-by: chensuyue <[email protected]>
Signed-off-by: tianyil1 <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: zehao-intel <[email protected]>
Co-authored-by: Sihan Chen <[email protected]>
Co-authored-by: chen, suyue <[email protected]>
Co-authored-by: Tianyi Liu <[email protected]>
Signed-off-by: gadmarkovits <[email protected]>
* Add Ollama Support

Signed-off-by: lvliang-intel <[email protected]>
Signed-off-by: gadmarkovits <[email protected]>
Signed-off-by: lvliang-intel <[email protected]>
Signed-off-by: gadmarkovits <[email protected]>
Signed-off-by: chensuyue <[email protected]>
Signed-off-by: letonghan <[email protected]>
Signed-off-by: gadmarkovits <[email protected]>
* add translation gateway

Signed-off-by: zehao-intel <[email protected]>

* fix import

Signed-off-by: zehao-intel <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: zehao-intel <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: gadmarkovits <[email protected]>
* Update LLM readme

Signed-off-by: lvliang-intel <[email protected]>

* update readme

Signed-off-by: lvliang-intel <[email protected]>

* update tgi readme

Signed-off-by: lvliang-intel <[email protected]>

* rollback requirements.txt

Signed-off-by: lvliang-intel <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: lvliang-intel <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: gadmarkovits <[email protected]>
* Use common security content for OPEA projects (opea-project#151)

* add python coverage

Signed-off-by: chensuyue <[email protected]>

* docs update

Signed-off-by: chensuyue <[email protected]>

* Revert "add python coverage"

This reverts commit 69615b1.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: chensuyue <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: jinjunzh <[email protected]>

* add milvus microservice

Signed-off-by: jinjunzh <[email protected]>

* fix the typo

Signed-off-by: jinjunzh <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Signed-off-by: jinjunzh <[email protected]>

---------

Signed-off-by: chensuyue <[email protected]>
Signed-off-by: jinjunzh <[email protected]>
Co-authored-by: chen, suyue <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: gadmarkovits <[email protected]>
Signed-off-by: Sun, Xuehao <[email protected]>
Signed-off-by: chensuyue <[email protected]>
Signed-off-by: gadmarkovits <[email protected]>
* add ray version document to redis

Signed-off-by: Chendi Xue <[email protected]>

* update test

Signed-off-by: Chendi Xue <[email protected]>

* Add test

Signed-off-by: Chendi Xue <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Add TIMEOUT in container environment and return status

Signed-off-by: Chendi Xue <[email protected]>

* rebase on new folder layout

Signed-off-by: Chendi Xue <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Chendi Xue <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: gadmarkovits <[email protected]>
Signed-off-by: Sun, Xuehao <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: gadmarkovits <[email protected]>
* supported bce model for rerank.

Signed-off-by: Xinyu Ye <[email protected]>

* change folder

Signed-off-by: Xinyu Ye <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* change path in test file.

Signed-off-by: Xinyu Ye <[email protected]>

---------

Signed-off-by: Xinyu Ye <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: gadmarkovits <[email protected]>
* Support vLLM XFT serving

Signed-off-by: lvliang-intel <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix access vllm issue

Signed-off-by: lvliang-intel <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* add permission for run.sh

Signed-off-by: lvliang-intel <[email protected]>

* add readme

Signed-off-by: lvliang-intel <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix proxy issue

Signed-off-by: lvliang-intel <[email protected]>

---------

Signed-off-by: lvliang-intel <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: gadmarkovits <[email protected]>
* update dataprep readme

Signed-off-by: letonghan <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: letonghan <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: gadmarkovits <[email protected]>
@gadmarkovits gadmarkovits force-pushed the retrievers_haystack branch from c375442 to a54d7c0 Compare June 19, 2024 07:00
@kevinintel kevinintel merged commit 9b658f4 into opea-project:main Jul 9, 2024
26 checks passed
yogeshmpandey pushed a commit to yogeshmpandey/GenAIComps that referenced this pull request Jul 10, 2024
* PGvector service (opea-project#86)

* Support PGvector service

Signed-off-by: V, Ganesan <[email protected]>
Signed-off-by: gadmarkovits <[email protected]>
Signed-off-by: Yogesh Pandey <[email protected]>
dwhitena pushed a commit to predictionguard/GenAIComps that referenced this pull request Jul 24, 2024
* PGvector service (opea-project#86)

* Support PGvector service

Signed-off-by: V, Ganesan <[email protected]>
Signed-off-by: gadmarkovits <[email protected]>
Signed-off-by: Daniel Whitenack <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.