-
Notifications
You must be signed in to change notification settings - Fork 136
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
Add local Rerank microservice for VideoRAGQnA #496
Conversation
Signed-off-by: BaoHuiling <huiling.bao@intel.com>
Signed-off-by: BaoHuiling <huiling.bao@intel.com>
Signed-off-by: BaoHuiling <huiling.bao@intel.com>
Signed-off-by: BaoHuiling <huiling.bao@intel.com>
for more information, see https://pre-commit.ci
Codecov ReportAll modified and coverable lines are covered by tests ✅
|
Signed-off-by: BaoHuiling <huiling.bao@intel.com>
for more information, see https://pre-commit.ci
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
@lvliang-intel @XuhuiRen Please help to review the code, thanks! It's almost the DDL, we still need some time for possible changes if required.🙂 |
@XuhuiRen @lvliang-intel hello, I know you should be busy around this time, but could you help to review the code? We are targeting to merge this in this release. Please also mention anyone else for review if it’s needed. |
Signed-off-by: BaoHuiling <huiling.bao@intel.com>
Signed-off-by: BaoHuiling <huiling.bao@intel.com>
Signed-off-by: BaoHuiling <huiling.bao@intel.com>
for more information, see https://pre-commit.ci
Signed-off-by: BaoHuiling <huiling.bao@intel.com>
for more information, see https://pre-commit.ci
From the perspectivity of functionality, i recommend to pending this PR after the PR for video embedding and PR for video retriever is merged. |
@lvliang-intelv Hi Liang, we have some conflict of this PR with #575 and planned to hold this PR for now , is it possible to undo this merge? Otherwise we could issue another bug fix for it. Which would you recommend ? |
@BaoHuiling, |
Got it, thanks! |
* initial commit Signed-off-by: BaoHuiling <huiling.bao@intel.com> * save Signed-off-by: BaoHuiling <huiling.bao@intel.com> * add readme, test script, fix bug Signed-off-by: BaoHuiling <huiling.bao@intel.com> * update video URL Signed-off-by: BaoHuiling <huiling.bao@intel.com> * use default Signed-off-by: BaoHuiling <huiling.bao@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * update core dependency Signed-off-by: BaoHuiling <huiling.bao@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * use p 5000 Signed-off-by: BaoHuiling <huiling.bao@intel.com> * use 5037 Signed-off-by: BaoHuiling <huiling.bao@intel.com> * update ctnr name Signed-off-by: BaoHuiling <huiling.bao@intel.com> * remove langsmith Signed-off-by: BaoHuiling <huiling.bao@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * add rerank algo desc in readme Signed-off-by: BaoHuiling <huiling.bao@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Signed-off-by: BaoHuiling <huiling.bao@intel.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: chen, suyue <suyue.chen@intel.com> Signed-off-by: Dong, Bo1 <bo1.dong@intel.com>
* initial commit Signed-off-by: BaoHuiling <huiling.bao@intel.com> * save Signed-off-by: BaoHuiling <huiling.bao@intel.com> * add readme, test script, fix bug Signed-off-by: BaoHuiling <huiling.bao@intel.com> * update video URL Signed-off-by: BaoHuiling <huiling.bao@intel.com> * use default Signed-off-by: BaoHuiling <huiling.bao@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * update core dependency Signed-off-by: BaoHuiling <huiling.bao@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * use p 5000 Signed-off-by: BaoHuiling <huiling.bao@intel.com> * use 5037 Signed-off-by: BaoHuiling <huiling.bao@intel.com> * update ctnr name Signed-off-by: BaoHuiling <huiling.bao@intel.com> * remove langsmith Signed-off-by: BaoHuiling <huiling.bao@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * add rerank algo desc in readme Signed-off-by: BaoHuiling <huiling.bao@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Signed-off-by: BaoHuiling <huiling.bao@intel.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: chen, suyue <suyue.chen@intel.com>
* add rerank with neural speed Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * add the code Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * add the code Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * fix mismatched response format w/wo streaming guardrails (#568) * fix mismatched response format w/wo streaming guardrails * fix & debug * fix & rm debug * [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: Dong, Bo1 <bo1.dong@intel.com> * Fix guardrails out handle logics for space linebreak and quote (#571) * fix mismatched response format w/wo streaming guardrails * fix & debug * fix & rm debug * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * debug * debug * debug * fix pre-space and linebreak * fix pre-space and linebreak * fix single/double quote * fix single/double quote * remove debug * [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: Dong, Bo1 <bo1.dong@intel.com> * BUG FIX: LVM security fix (#572) * add url validator Signed-off-by: BaoHuiling <huiling.bao@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * add validation for video_url Signed-off-by: BaoHuiling <huiling.bao@intel.com> --------- Signed-off-by: BaoHuiling <huiling.bao@intel.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * Modify output messages. (#569) * Reduced output. Signed-off-by: zepan <ze.pan@intel.com> * Output the location where the modified Dockerfile file is referenced. Signed-off-by: zepan <ze.pan@intel.com> * for test Signed-off-by: zepan <ze.pan@intel.com> * Restore test file. Signed-off-by: zepan <ze.pan@intel.com> --------- Signed-off-by: zepan <ze.pan@intel.com> Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * refine logging code. (#559) * add ut and refine logging code. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * update microservice port. --------- Co-authored-by: root <root@idc708073.jf.intel.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * adding lancedb to langchain vectorstores (#291) * adding lancedb to langchain vectorstores Signed-off-by: sharanshirodkar7 <ssharanshirodkar7@gmail.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Signed-off-by: sharanshirodkar7 <ssharanshirodkar7@gmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: lvliang-intel <liang1.lv@intel.com> Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * Refine Dataprep Milvus MS (#570) Signed-off-by: letonghan <letong.han@intel.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * final version Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * update the readme Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * add the sign Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * fix error for pre ci Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * add the ut Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * update docker file Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * update CI test log achieve (#577) Signed-off-by: chensuyue <suyue.chen@intel.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * Multimodal dataprep (#575) * multimodal embedding for MM RAG for videos Signed-off-by: Tiep Le <tiep.le@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * develop data prep first commit Signed-off-by: Tiep Le <tiep.le@intel.com> * develop dataprep microservice for multimodal data Signed-off-by: Tiep Le <tiep.le@intel.com> * multimodal langchain for dataprep Signed-off-by: Tiep Le <tiep.le@intel.com> * update README Signed-off-by: Tiep Le <tiep.le@intel.com> * update README Signed-off-by: Tiep Le <tiep.le@intel.com> * update README Signed-off-by: Tiep Le <tiep.le@intel.com> * update README Signed-off-by: Tiep Le <tiep.le@intel.com> * cosmetic Signed-off-by: Tiep Le <tiep.le@intel.com> * test for multimodal dataprep Signed-off-by: Tiep Le <tiep.le@intel.com> * update test Signed-off-by: Tiep Le <tiep.le@intel.com> * update test Signed-off-by: Tiep Le <tiep.le@intel.com> * update test Signed-off-by: Tiep Le <tiep.le@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * cosmetic update Signed-off-by: Tiep Le <tiep.le@intel.com> * remove langsmith Signed-off-by: Tiep Le <tiep.le@intel.com> * update API to remove /dataprep from API names and remove langsmith Signed-off-by: Tiep Le <tiep.le@intel.com> * update test Signed-off-by: Tiep Le <tiep.le@intel.com> * update the error message per PR reviewer Signed-off-by: Tiep Le <tiep.le@intel.com> --------- Signed-off-by: Tiep Le <tiep.le@intel.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * add: Pathway vector store and retriever as LangChain component (#342) * nb Signed-off-by: Berke <berkecanrizai1@gmail.com> * init changes Signed-off-by: Berke <berkecanrizai1@gmail.com> * docker Signed-off-by: Berke <berkecanrizai1@gmail.com> * example data Signed-off-by: Berke <berkecanrizai1@gmail.com> * docs(readme): update, add commands Signed-off-by: Berke <berkecanrizai1@gmail.com> * fix: formatting, data sources Signed-off-by: Berke <berkecanrizai1@gmail.com> * docs(readme): update instructions, add comments Signed-off-by: Berke <berkecanrizai1@gmail.com> * fix: rm unused parts Signed-off-by: Berke <berkecanrizai1@gmail.com> * fix: image name, compose env vars Signed-off-by: Berke <berkecanrizai1@gmail.com> * fix: rm unused part Signed-off-by: Berke <berkecanrizai1@gmail.com> * fix: logging name Signed-off-by: Berke <berkecanrizai1@gmail.com> * fix: env var Signed-off-by: Berke <berkecanrizai1@gmail.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Signed-off-by: Berke <berkecanrizai1@gmail.com> * fix: rename pw docker Signed-off-by: Berke <berkecanrizai1@gmail.com> * docs(readme): update input sources Signed-off-by: Berke <berkecanrizai1@gmail.com> * nb Signed-off-by: Berke <berkecanrizai1@gmail.com> * init changes Signed-off-by: Berke <berkecanrizai1@gmail.com> * fix: formatting, data sources Signed-off-by: Berke <berkecanrizai1@gmail.com> * docs(readme): update instructions, add comments Signed-off-by: Berke <berkecanrizai1@gmail.com> * fix: rm unused part Signed-off-by: Berke <berkecanrizai1@gmail.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Signed-off-by: Berke <berkecanrizai1@gmail.com> * fix: rename pw docker Signed-off-by: Berke <berkecanrizai1@gmail.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Signed-off-by: Berke <berkecanrizai1@gmail.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * feat: mv vector store, naming, clarify instructions, improve ingestion components Signed-off-by: Berke <berkecanrizai1@gmail.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * tests: add pw retriever test fix: update docker to include libmagic Signed-off-by: Berke <berkecanrizai1@gmail.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * implement suggestions from review, entrypoint, reqs, comments, https_proxy. Signed-off-by: Berke <berkecanrizai1@gmail.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix: update docker tags in test and readme Signed-off-by: Berke <berkecanrizai1@gmail.com> * tests: add separate pathway vectorstore test Signed-off-by: Berke <berkecanrizai1@gmail.com> --------- Signed-off-by: Berke <berkecanrizai1@gmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Sihan Chen <39623753+Spycsh@users.noreply.github.com> Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * Add local Rerank microservice for VideoRAGQnA (#496) * initial commit Signed-off-by: BaoHuiling <huiling.bao@intel.com> * save Signed-off-by: BaoHuiling <huiling.bao@intel.com> * add readme, test script, fix bug Signed-off-by: BaoHuiling <huiling.bao@intel.com> * update video URL Signed-off-by: BaoHuiling <huiling.bao@intel.com> * use default Signed-off-by: BaoHuiling <huiling.bao@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * update core dependency Signed-off-by: BaoHuiling <huiling.bao@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * use p 5000 Signed-off-by: BaoHuiling <huiling.bao@intel.com> * use 5037 Signed-off-by: BaoHuiling <huiling.bao@intel.com> * update ctnr name Signed-off-by: BaoHuiling <huiling.bao@intel.com> * remove langsmith Signed-off-by: BaoHuiling <huiling.bao@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * add rerank algo desc in readme Signed-off-by: BaoHuiling <huiling.bao@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Signed-off-by: BaoHuiling <huiling.bao@intel.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: chen, suyue <suyue.chen@intel.com> Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * Add Scan Container. (#560) Signed-off-by: zepan <ze.pan@intel.com> Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * fix SearchedMultimodalDoc in docarray (#583) Signed-off-by: BaoHuiling <huiling.bao@intel.com> Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * update image build yaml (#529) Signed-off-by: chensuyue <suyue.chen@intel.com> Signed-off-by: zepan <ze.pan@intel.com> Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * add microservice for intent detection (#131) * add microservice for intent detection Signed-off-by: Liangyx2 <yuxiang.liang@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * update license copyright Signed-off-by: Liangyx2 <yuxiang.liang@intel.com> * add ut Signed-off-by: Liangyx2 <yuxiang.liang@intel.com> * refine Signed-off-by: Liangyx2 <yuxiang.liang@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * update folder Signed-off-by: Liangyx2 <yuxiang.liang@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix test Signed-off-by: Liangyx2 <yuxiang.liang@intel.com> --------- Signed-off-by: Liangyx2 <yuxiang.liang@intel.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * Make the scanning method optional. (#580) Signed-off-by: zepan <ze.pan@intel.com> Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * add code owners (#586) Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * remove revision for tei (#584) Signed-off-by: letonghan <letong.han@intel.com> Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * Bug fix (#591) * Check if the document exists. Signed-off-by: zepan <ze.pan@intel.com> * Add flag output. Signed-off-by: zepan <ze.pan@intel.com> * Modify nginx readme. Signed-off-by: zepan <ze.pan@intel.com> * Modify document detection logic Signed-off-by: zepan <ze.pan@intel.com> --------- Signed-off-by: zepan <ze.pan@intel.com> Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * fix ut issue Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * merge the main Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * align with new pipeline Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * align with newest pipeline Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * upload code Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * update the ut Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * add docker path Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> * add the docker path Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> --------- Signed-off-by: Dong, Bo1 <bo1.dong@intel.com> Signed-off-by: BaoHuiling <huiling.bao@intel.com> Signed-off-by: zepan <ze.pan@intel.com> Signed-off-by: sharanshirodkar7 <ssharanshirodkar7@gmail.com> Signed-off-by: letonghan <letong.han@intel.com> Signed-off-by: chensuyue <suyue.chen@intel.com> Signed-off-by: Tiep Le <tiep.le@intel.com> Signed-off-by: Berke <berkecanrizai1@gmail.com> Signed-off-by: Liangyx2 <yuxiang.liang@intel.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Sihan Chen <39623753+Spycsh@users.noreply.github.com> Co-authored-by: Huiling Bao <huiling.bao@intel.com> Co-authored-by: ZePan110 <ze.pan@intel.com> Co-authored-by: lkk <33276950+lkk12014402@users.noreply.github.com> Co-authored-by: root <root@idc708073.jf.intel.com> Co-authored-by: Sharan Shirodkar <91109427+sharanshirodkar7@users.noreply.github.com> Co-authored-by: lvliang-intel <liang1.lv@intel.com> Co-authored-by: Letong Han <106566639+letonghan@users.noreply.github.com> Co-authored-by: chen, suyue <suyue.chen@intel.com> Co-authored-by: Tiep Le <97980157+tileintel@users.noreply.github.com> Co-authored-by: berkecanrizai <63911408+berkecanrizai@users.noreply.github.com> Co-authored-by: Liangyx2 <yuxiang.liang@intel.com> Co-authored-by: kevinintel <hanwen.chang@intel.com>
Description
The summary of the proposed changes as long as the relevant motivation and context.
Add support for local rerank for VideoRAGQnA with is a usecase of MMRAG. This rerank the video retrieved with local rerank algorithm. And format LVMVideoDoc for Video-Llama LVM microservice.
Issues
List the issue or RFC link this PR is working on. If there is no such link, please mark it as
n/a
.The RFC is still under review. opea-project/docs#49
Type of change
List the type of change like below. Please delete options that are not relevant.
Dependencies
List the newly introduced 3rd party dependency if exists.
N/A
Tests
Describe the tests that you ran to verify your changes.
https://github.com/siddhivelankar23/GenAIComps/blob/huiling-rerank/tests/test_reranks_video-rag-qna.sh build, start, validate, clean the microservice