Skip to content

Merge FaqGen into ChatQnA #1654

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 4 commits into from
Mar 20, 2025
Merged

Conversation

XinyaoWa
Copy link
Collaborator

@XinyaoWa XinyaoWa commented Mar 12, 2025

Description

  1. Delete FaqGen
  2. Refactor FaqGen into ChatQnA, serve as a LLM selection.
  3. Combine all ChatQnA related Dockerfile into one

Issues

List the issue or RFC link this PR is working on. If there is no such link, please mark it as 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)
  • Others (enhancement, documentation, validation, etc.)

Dependencies

List the newly introduced 3rd party dependency if exists.

Tests

Describe the tests that you ran to verify your changes.

Copy link

github-actions bot commented Mar 12, 2025

Dependency Review

✅ No vulnerabilities or license issues found.

Scanned Files

  • FaqGen/ui/react/package.json
  • FaqGen/ui/svelte/package.json

@joshuayao joshuayao linked an issue Mar 13, 2025 that may be closed by this pull request
@XinyaoWa XinyaoWa force-pushed the faqgen_merge branch 4 times, most recently from 0a3b373 to 0ec52ee Compare March 13, 2025 13:29
@XinyaoWa XinyaoWa changed the title [WIP] Merge FaqGen into ChatQnA Merge FaqGen into ChatQnA Mar 13, 2025
@XinyaoWa XinyaoWa force-pushed the faqgen_merge branch 3 times, most recently from dca32af to 6b9acd0 Compare March 14, 2025 06:35
@XinyaoWa XinyaoWa requested a review from ZePan110 as a code owner March 14, 2025 06:35
Refactor FaqGen into ChatQnA, serve as a LLM selection

Signed-off-by: Xinyao Wang <xinyao.wang@intel.com>
Signed-off-by: Xinyao Wang <xinyao.wang@intel.com>
@XinyaoWa XinyaoWa force-pushed the faqgen_merge branch 3 times, most recently from 38236c3 to 33fe3b4 Compare March 17, 2025 09:11
Remove Dockerfile.faqgen, Dockerfile.without_rerank, Dockerfile.guardrails
Combine all types into Dockerfile, use env CHATQNA_TYPE to make selection

Signed-off-by: Xinyao Wang <xinyao.wang@intel.com>
@chensuyue
Copy link
Collaborator

This change will impact helm charts and benchmark, @yongfengdu @bjzhjing please aware.

@chensuyue
Copy link
Collaborator

chensuyue commented Mar 20, 2025

ROCm issue is not caused by this PR, it failed in main branch. So let's merge this PR first and create an issue to trace. #1699

@chensuyue chensuyue merged commit 6d24c1c into opea-project:main Mar 20, 2025
42 of 47 checks passed
chyundunovDatamonsters pushed a commit to chyundunovDatamonsters/OPEA-GenAIExamples that referenced this pull request Mar 21, 2025
1. Delete FaqGen
2. Refactor FaqGen into ChatQnA, serve as a LLM selection.
3. Combine all ChatQnA related Dockerfile into one

Signed-off-by: Xinyao Wang <xinyao.wang@intel.com>
Signed-off-by: Chingis Yundunov <YundunovCN@sibedge.com>
Comment on lines +4 to +14
chatqna_arg=$CHATQNA_TYPE

if [[ $chatqna_arg == "CHATQNA_FAQGEN" ]]; then
python chatqna.py --faqgen
elif [[ $chatqna_arg == "CHATQNA_NO_RERANK" ]]; then
python chatqna.py --without-rerank
elif [[ $chatqna_arg == "CHATQNA_GUARDRAILS" ]]; then
python chatqna.py --with-guardrails
else
python chatqna.py
fi
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this logic was added to a separate script instead of directly into chatqna.py?

chyundunovDatamonsters pushed a commit to chyundunovDatamonsters/OPEA-GenAIExamples that referenced this pull request Apr 1, 2025
1. Delete FaqGen
2. Refactor FaqGen into ChatQnA, serve as a LLM selection.
3. Combine all ChatQnA related Dockerfile into one

Signed-off-by: Xinyao Wang <xinyao.wang@intel.com>
Signed-off-by: Chingis Yundunov <YundunovCN@sibedge.com>
chyundunovDatamonsters pushed a commit to chyundunovDatamonsters/OPEA-GenAIExamples that referenced this pull request Apr 1, 2025
1. Delete FaqGen
2. Refactor FaqGen into ChatQnA, serve as a LLM selection.
3. Combine all ChatQnA related Dockerfile into one

Signed-off-by: Xinyao Wang <xinyao.wang@intel.com>
Signed-off-by: Chingis Yundunov <YundunovCN@sibedge.com>
chyundunovDatamonsters pushed a commit to chyundunovDatamonsters/OPEA-GenAIExamples that referenced this pull request May 16, 2025
1. Delete FaqGen
2. Refactor FaqGen into ChatQnA, serve as a LLM selection.
3. Combine all ChatQnA related Dockerfile into one

Signed-off-by: Xinyao Wang <xinyao.wang@intel.com>
Signed-off-by: Chingis Yundunov <c.yundunov@datamonsters.com>
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.

[Feature] Merge FaqGen to ChatQnA
4 participants