Skip to content

Updated SearchQnA to use nginx like ChatQnA#1769

Merged
lvliang-intel merged 47 commits into
opea-project:mainfrom
edlee123:searchqna_fix
May 20, 2025
Merged

Updated SearchQnA to use nginx like ChatQnA#1769
lvliang-intel merged 47 commits into
opea-project:mainfrom
edlee123:searchqna_fix

Conversation

@edlee123
Copy link
Copy Markdown
Contributor

@edlee123 edlee123 commented Apr 7, 2025

Description

Updated SearchQnA Xeon to be like ChatQnA that uses nginx component.

Key changes:

  • SearchQnA/ui/svelte/.env: updated BACKEND_BASE_URL since nginx will proxypass.
  • Update compose.yaml
    • SearchQnA/docker_compose/intel/cpu/xeon/compose.yaml: addition of searchqna-xeon-nginx-server (similar to ChatQnA)
    • SearchQnA/docker_compose/intel/hpu/gaudi/compose.yaml: addition of nginx server.
    • SearchQnA/docker_compose/amd/gpu/rocm/compose_vllm.yaml: addition of nginx server.
    • SearchQnA/docker_compose/amd/gpu/rocm/compose.yaml: addition of nginx server.
  • Update unit tests for above so that playwright is browsing to port 80 (nginx).
  • SearchQnA/docker_compose/intel/cpu/xeon/README.md: updated readme to reflect change.

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)
  • Others (enhancement, documentation, validation, etc.)

Dependencies

The SearchQnA Xeon example now uses nginx component from GenAIComps.

Tests

Kept the same tests. Also manually tested UI on cloud machine.

edlee123 added 3 commits April 6, 2025 22:58
Signed-off-by: Ed Lee <16417837+edlee123@users.noreply.github.com>
Signed-off-by: Ed Lee <16417837+edlee123@users.noreply.github.com>
Signed-off-by: Ed Lee <16417837+edlee123@users.noreply.github.com>
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 7, 2025

Dependency Review

✅ No vulnerabilities or license issues found.

Scanned Files

None

Comment thread SearchQnA/docker_compose/intel/cpu/xeon/README.md Outdated
Comment thread SearchQnA/docker_compose/intel/cpu/xeon/README.md Outdated
Comment thread SearchQnA/docker_compose/intel/cpu/xeon/README.md Outdated
Comment thread SearchQnA/docker_compose/intel/cpu/xeon/README.md Outdated
Comment thread SearchQnA/docker_compose/intel/cpu/xeon/README.md Outdated
Comment thread SearchQnA/docker_compose/intel/cpu/xeon/README.md Outdated
edlee123 and others added 9 commits April 9, 2025 08:56
Signed-off-by: Ed Lee <16417837+edlee123@users.noreply.github.com>
Signed-off-by: Ed Lee <16417837+edlee123@users.noreply.github.com>
Signed-off-by: Ed Lee <16417837+edlee123@users.noreply.github.com>
Signed-off-by: Ed Lee <16417837+edlee123@users.noreply.github.com>
Signed-off-by: Ed Lee <16417837+edlee123@users.noreply.github.com>
…inx port 80

Signed-off-by: Ed Lee <16417837+edlee123@users.noreply.github.com>
@edlee123 edlee123 changed the title Updated SearchQnA Xeon to use nginx like ChatQnA Updated SearchQnA to use nginx like ChatQnA Apr 11, 2025
@yinghu5 yinghu5 requested a review from Copilot April 25, 2025 01:50
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR updates the SearchQnA Xeon example to use an nginx component similar to ChatQnA. Key changes include updating the UI configuration for the new port, adding nginx services to various docker compose files for Intel and AMD platforms, and revising the README documentation to reflect these changes.

Reviewed Changes

Copilot reviewed 8 out of 13 changed files in this pull request and generated no comments.

Show a summary per file
File Description
SearchQnA/ui/svelte/playwright.config.ts Updated baseURL from port 5173 to 80 for nginx use.
SearchQnA/docker_image_build/build.yaml Added nginx build configuration.
SearchQnA/docker_compose/intel/hpu/gaudi/compose.yaml Added new nginx service for Intel HPU.
SearchQnA/docker_compose/intel/cpu/xeon/compose.yaml Added new nginx service for Intel Xeon.
SearchQnA/docker_compose/intel/cpu/xeon/README.md Updated build step to include nginx image build.
SearchQnA/docker_compose/amd/gpu/rocm/compose_vllm.yaml Added new nginx service for AMD ROCm with vLLM.
SearchQnA/docker_compose/amd/gpu/rocm/compose.yaml Added new nginx service for AMD ROCm.
SearchQnA/README.md Revised the architecture diagram and steps.
Files not reviewed (5)
  • SearchQnA/tests/test_compose_on_gaudi.sh: Language not supported
  • SearchQnA/tests/test_compose_on_rocm.sh: Language not supported
  • SearchQnA/tests/test_compose_on_xeon.sh: Language not supported
  • SearchQnA/tests/test_compose_vllm_on_rocm.sh: Language not supported
  • SearchQnA/ui/svelte/.env: Language not supported
Comments suppressed due to low confidence (1)

SearchQnA/docker_compose/amd/gpu/rocm/compose.yaml:175

  • [nitpick] The nginx service name here is inconsistent with the naming used in the Intel compose files (e.g., 'searchqna-xeon-nginx-server' and 'searchqna-gaudi-nginx-server'). Consider standardizing the service name to include a 'searchqna' prefix for clarity and consistency.
search-nginx-server:

@edlee123
Copy link
Copy Markdown
Contributor Author

edlee123 commented May 7, 2025

Hi @lvliang-intel and @Spycsh, any other feedback on this PR?

This adds nginx to SearchQnA, and updates the unit tests.

Comment thread SearchQnA/docker_compose/intel/cpu/README.md Outdated
Comment thread SearchQnA/docker_compose/intel/cpu/README.md Outdated
Comment thread SearchQnA/docker_compose/intel/cpu/README.md Outdated
Copy link
Copy Markdown
Collaborator

@yinghu5 yinghu5 left a comment

Choose a reason for hiding this comment

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

Good Updates. Just check if is there purpose to move up the Readme.md from SearchQnA/docker_compose/intel/cpu/xeon/README.md
to SearchQnA/docker_compose/intel/cpu/README.md
It may not align with other samples. and later the CI build doc failed.

xiguiw and others added 8 commits May 16, 2025 09:20
Signed-off-by: Ed Lee <16417837+edlee123@users.noreply.github.com>
Signed-off-by: Ed Lee <16417837+edlee123@users.noreply.github.com>
Signed-off-by: Ed Lee <16417837+edlee123@users.noreply.github.com>
…linking to the folder.

Signed-off-by: Ed Lee <16417837+edlee123@users.noreply.github.com>
@edlee123
Copy link
Copy Markdown
Contributor Author

You're right, thank you @lvliang-intel for the catch. I've instead updated the diagram to include Nginx in the SearchQnA/README.md

Good Updates. Just check if is there purpose to move up the Readme.md from SearchQnA/docker_compose/intel/cpu/xeon/README.md to SearchQnA/docker_compose/intel/cpu/README.md It may not align with other samples. and later the CI build doc failed.

Copy link
Copy Markdown
Collaborator

@yinghu5 yinghu5 left a comment

Choose a reason for hiding this comment

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

LGTM, thank you!

@lvliang-intel lvliang-intel merged commit e9153b8 into opea-project:main May 20, 2025
20 checks passed
alexsin368 pushed a commit to alexsin368/GenAIExamples that referenced this pull request Aug 13, 2025
Signed-off-by: Ed Lee <16417837+edlee123@users.noreply.github.com>
Signed-off-by: alexsin368 <alex.sin@intel.com>
cogniware-devops pushed a commit to Cogniware-Inc/GenAIExamples that referenced this pull request Dec 19, 2025
Signed-off-by: Ed Lee <16417837+edlee123@users.noreply.github.com>
Signed-off-by: cogniware-devops <ambarish.desai@cogniware.ai>
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.

6 participants