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

Add chatQnA UI manifest #669

Merged

Conversation

WenjiaoYue
Copy link
Collaborator

@WenjiaoYue WenjiaoYue commented Aug 27, 2024

Description

Add chatQnA UI manifest.

Issues

#657

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

no

Tests

kubectl apply -f chatqna.yaml

Signed-off-by: Yue, Wenjiao <[email protected]>
WenjiaoYue and others added 27 commits August 27, 2024 17:29
Signed-off-by: Yue, Wenjiao <[email protected]>
Signed-off-by: Yue, Wenjiao <[email protected]>
Signed-off-by: Yue, Wenjiao <[email protected]>
Signed-off-by: Yue, Wenjiao <[email protected]>
Signed-off-by: Yue, Wenjiao <[email protected]>
Signed-off-by: Yue, Wenjiao <[email protected]>
Signed-off-by: Yue, Wenjiao <[email protected]>
Signed-off-by: Yue, Wenjiao <[email protected]>
Signed-off-by: Yue, Wenjiao <[email protected]>
Signed-off-by: Yue, Wenjiao <[email protected]>
Signed-off-by: Yue, Wenjiao <[email protected]>
Signed-off-by: Yue, Wenjiao <[email protected]>
Signed-off-by: Yue, Wenjiao <[email protected]>
Signed-off-by: Yue, Wenjiao <[email protected]>
Signed-off-by: Yue, Wenjiao <[email protected]>
Signed-off-by: Yue, Wenjiao <[email protected]>
@chensuyue chensuyue added this to the v1.0 milestone Sep 5, 2024
@lvliang-intel lvliang-intel merged commit 758d236 into opea-project:main Sep 5, 2024
11 checks passed
ctao456 pushed a commit to ctao456/GenAIExamples that referenced this pull request Sep 6, 2024
* Add chatQnA UI manifest

Signed-off-by: Yue, Wenjiao <[email protected]>

* update port

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* add nginx config

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* update code

* update nginx config

Signed-off-by: Yue, Wenjiao <[email protected]>

* update nginx config

Signed-off-by: Yue, Wenjiao <[email protected]>

* update ui IP

Signed-off-by: Yue, Wenjiao <[email protected]>

* update yaml

Signed-off-by: Yue, Wenjiao <[email protected]>

* update api

Signed-off-by: Yue, Wenjiao <[email protected]>

* update env config

Signed-off-by: Yue, Wenjiao <[email protected]>

* update env

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* update specify node

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* update node-type

Signed-off-by: Yue, Wenjiao <[email protected]>

* update yaml

Signed-off-by: Yue, Wenjiao <[email protected]>

* update yaml

Signed-off-by: Yue, Wenjiao <[email protected]>

* delete nodeSelector

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* update dataprep api

Signed-off-by: Yue, Wenjiao <[email protected]>

* add node-type

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* delete specify nodeSelector

Signed-off-by: Yue, Wenjiao <[email protected]>

* delete useless space

Signed-off-by: Yue, Wenjiao <[email protected]>

---------

Signed-off-by: Yue, Wenjiao <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
ctao456 pushed a commit to ctao456/GenAIExamples that referenced this pull request Sep 6, 2024
* Add chatQnA UI manifest

Signed-off-by: Yue, Wenjiao <[email protected]>

* update port

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* add nginx config

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* update code

* update nginx config

Signed-off-by: Yue, Wenjiao <[email protected]>

* update nginx config

Signed-off-by: Yue, Wenjiao <[email protected]>

* update ui IP

Signed-off-by: Yue, Wenjiao <[email protected]>

* update yaml

Signed-off-by: Yue, Wenjiao <[email protected]>

* update api

Signed-off-by: Yue, Wenjiao <[email protected]>

* update env config

Signed-off-by: Yue, Wenjiao <[email protected]>

* update env

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* update specify node

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* update node-type

Signed-off-by: Yue, Wenjiao <[email protected]>

* update yaml

Signed-off-by: Yue, Wenjiao <[email protected]>

* update yaml

Signed-off-by: Yue, Wenjiao <[email protected]>

* delete nodeSelector

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* update dataprep api

Signed-off-by: Yue, Wenjiao <[email protected]>

* add node-type

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* delete specify nodeSelector

Signed-off-by: Yue, Wenjiao <[email protected]>

* delete useless space

Signed-off-by: Yue, Wenjiao <[email protected]>

---------

Signed-off-by: Yue, Wenjiao <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Chun Tao <[email protected]>
@lianhao
Copy link
Collaborator

lianhao commented Sep 6, 2024

I believe the ui+nginx doesn't work on k8s in this way, unless you make some manual tweak settings during installation, @Ruoyu-y have tested it, and may have more insights on it.

@Ruoyu-y
Copy link
Contributor

Ruoyu-y commented Sep 6, 2024

From the PR, i could see the UI deployment is done with NO environment variable set for backend service and data prep. Although nginx is up and running as a reverse proxy for the backend services, its ip address and port is not consumed by the UI. From my point of view, UI is not able to connect to the backend services for serving. @WenjiaoYue Any comments?

@WenjiaoYue
Copy link
Collaborator Author

WenjiaoYue commented Sep 6, 2024

No, the UI's .env configuration file has been updated to use relative paths. When Nginx proxies requests to the backend server, it automatically appends the configured backend URL to these relative paths. For example, if the frontend sends a request to /v1/chatqna, Nginx will forward it to http://backend_server/v1/chatqna. I have already tested this before submitting the PR, and it works fine. @Ruoyu-y @lianhao
image
image
image

@Ruoyu-y
Copy link
Contributor

Ruoyu-y commented Sep 6, 2024

No, the UI's .env configuration file has been updated to use relative paths. When Nginx proxies requests to the backend server, it automatically appends the configured backend URL to these relative paths. For example, if the frontend sends a request to /v1/chatqna, Nginx will forward it to http://backend_server/v1/chatqna. I have already tested this before submitting the PR, and it works fine. @Ruoyu-y @lianhao image image image

Got it. So this relative path will be automatically completed with nginx ip and port? Or the UI can directly call to these relative path which would be captured by nginx? (Can you help explain a bit?) Is this approach only work for svelte or it can also work for react?

@WenjiaoYue
Copy link
Collaborator Author

No, the UI's .env configuration file has been updated to use relative paths. When Nginx proxies requests to the backend server, it automatically appends the configured backend URL to these relative paths. For example, if the frontend sends a request to /v1/chatqna, Nginx will forward it to http://backend_server/v1/chatqna. I have already tested this before submitting the PR, and it works fine. @Ruoyu-y @lianhao image image image

Got it. So this relative path will be automatically completed with nginx ip and port? Or the UI can directly call to these relative path which would be captured by nginx? (Can you help explain a bit?) Is this approach only work for svelte or it can also work for react?

The .env file defines relative paths, and Nginx uses these paths to proxy requests to the specified backend URL. Nginx identifies and forwards requests through the location and proxy_pass directives, which automatically append the relative path to the backend URL. Only work for svelte, while React is developed by other developers, who can refer to this for modifications.

lianhao added a commit to lianhao/GenAIExamples that referenced this pull request Sep 6, 2024
- Update ChatQnA/CodeGen/CodeTrans/DocSum k8s manifest
  to avoid requiring creating directory for cache model.

- Add chatqna-guardrails manifest files.

- Fix bug opea-project#752 introduced by PR opea-project#669

Signed-off-by: Lianhao Lu <[email protected]>
yongfengdu pushed a commit that referenced this pull request Sep 6, 2024
- Update ChatQnA/CodeGen/CodeTrans/DocSum k8s manifest
  to avoid requiring creating directory for cache model.

- Add chatqna-guardrails manifest files.

- Fix bug #752 introduced by PR #669

Signed-off-by: Lianhao Lu <[email protected]>
xuechendi pushed a commit to xuechendi/GenAIExamples that referenced this pull request Sep 9, 2024
* Add chatQnA UI manifest

Signed-off-by: Yue, Wenjiao <[email protected]>

* update port

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* add nginx config

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* update code

* update nginx config

Signed-off-by: Yue, Wenjiao <[email protected]>

* update nginx config

Signed-off-by: Yue, Wenjiao <[email protected]>

* update ui IP

Signed-off-by: Yue, Wenjiao <[email protected]>

* update yaml

Signed-off-by: Yue, Wenjiao <[email protected]>

* update api

Signed-off-by: Yue, Wenjiao <[email protected]>

* update env config

Signed-off-by: Yue, Wenjiao <[email protected]>

* update env

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* update specify node

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* update node-type

Signed-off-by: Yue, Wenjiao <[email protected]>

* update yaml

Signed-off-by: Yue, Wenjiao <[email protected]>

* update yaml

Signed-off-by: Yue, Wenjiao <[email protected]>

* delete nodeSelector

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* update dataprep api

Signed-off-by: Yue, Wenjiao <[email protected]>

* add node-type

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* delete specify nodeSelector

Signed-off-by: Yue, Wenjiao <[email protected]>

* delete useless space

Signed-off-by: Yue, Wenjiao <[email protected]>

---------

Signed-off-by: Yue, Wenjiao <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
xuechendi pushed a commit to xuechendi/GenAIExamples that referenced this pull request Sep 9, 2024
- Update ChatQnA/CodeGen/CodeTrans/DocSum k8s manifest
  to avoid requiring creating directory for cache model.

- Add chatqna-guardrails manifest files.

- Fix bug opea-project#752 introduced by PR opea-project#669

Signed-off-by: Lianhao Lu <[email protected]>
dmsuehir pushed a commit to dmsuehir/GenAIExamples that referenced this pull request Sep 11, 2024
* Add chatQnA UI manifest

Signed-off-by: Yue, Wenjiao <[email protected]>

* update port

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* add nginx config

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* update code

* update nginx config

Signed-off-by: Yue, Wenjiao <[email protected]>

* update nginx config

Signed-off-by: Yue, Wenjiao <[email protected]>

* update ui IP

Signed-off-by: Yue, Wenjiao <[email protected]>

* update yaml

Signed-off-by: Yue, Wenjiao <[email protected]>

* update api

Signed-off-by: Yue, Wenjiao <[email protected]>

* update env config

Signed-off-by: Yue, Wenjiao <[email protected]>

* update env

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* update specify node

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* update node-type

Signed-off-by: Yue, Wenjiao <[email protected]>

* update yaml

Signed-off-by: Yue, Wenjiao <[email protected]>

* update yaml

Signed-off-by: Yue, Wenjiao <[email protected]>

* delete nodeSelector

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* update dataprep api

Signed-off-by: Yue, Wenjiao <[email protected]>

* add node-type

Signed-off-by: Yue, Wenjiao <[email protected]>

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

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

* delete specify nodeSelector

Signed-off-by: Yue, Wenjiao <[email protected]>

* delete useless space

Signed-off-by: Yue, Wenjiao <[email protected]>

---------

Signed-off-by: Yue, Wenjiao <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
dmsuehir pushed a commit to dmsuehir/GenAIExamples that referenced this pull request Sep 11, 2024
- Update ChatQnA/CodeGen/CodeTrans/DocSum k8s manifest
  to avoid requiring creating directory for cache model.

- Add chatqna-guardrails manifest files.

- Fix bug opea-project#752 introduced by PR opea-project#669

Signed-off-by: Lianhao Lu <[email protected]>
@WenjiaoYue WenjiaoYue deleted the wenjiao/chatQnA_add_manifest branch October 10, 2024 06:23
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.

5 participants