From d73129cbf0958ba47c6fac242e2702a679ab9181 Mon Sep 17 00:00:00 2001 From: XinyaoWa Date: Tue, 10 Sep 2024 23:27:19 +0800 Subject: [PATCH] Refactor folder to support different vendors (#743) Signed-off-by: Xinyao Wang Signed-off-by: chensuyue --- .github/workflows/_example-workflow.yml | 20 ++- .github/workflows/_get-image-list.yml | 2 +- .github/workflows/_get-test-matrix.yml | 33 ++--- .github/workflows/_image-build.yml | 69 ---------- .github/workflows/_run-docker-compose.yml | 49 +++++-- .github/workflows/chatqna_benchmark.yml | 78 ----------- .../docker/compose/AudioQnA-compose.yaml | 10 -- .../docker/compose/ChatQnA-compose.yaml | 20 --- .../docker/compose/CodeGen-compose.yaml | 20 --- .../docker/compose/CodeTrans-compose.yaml | 15 --- .../docker/compose/DocSum-compose.yaml | 20 --- .../docker/compose/FaqGen-compose.yaml | 20 --- .../docker/compose/SearchQnA-compose.yaml | 15 --- .../docker/compose/Translation-compose.yaml | 15 --- .github/workflows/pr-docker-compose-e2e.yml | 14 +- .github/workflows/pr-gmc-e2e.yaml | 12 +- .github/workflows/pr-manifest-e2e.yml | 32 ++--- .github/workflows/push-image-build.yml | 46 ++----- .../workflows/push-infra-issue-creation.yml | 4 +- .github/workflows/scripts/build_push.sh | 72 ----------- .github/workflows/scripts/get_test_matrix.sh | 37 ++++++ .pre-commit-config.yaml | 4 +- AgentQnA/README.md | 4 +- .../intel/cpu/xeon/compose_openai.yaml} | 0 .../cpu/xeon}/launch_agent_service_openai.sh | 2 +- .../docker_image_build/.README | 0 ...eon.sh => _test_compose_openai_on_xeon.sh} | 6 +- AudioQnA/{docker => }/Dockerfile | 0 AudioQnA/README.md | 4 +- AudioQnA/{docker => }/audioqna.py | 0 .../intel/cpu}/xeon/README.md | 12 +- .../intel/cpu}/xeon/compose.yaml | 0 .../intel/hpu}/gaudi/README.md | 12 +- .../intel/hpu}/gaudi/compose.yaml | 0 .../build.yaml} | 13 +- .../kubernetes/{manifests => intel}/README.md | 0 .../{README.md => intel/README_gmc.md} | 2 +- .../cpu/xeon/gmc}/audioQnA_xeon.yaml | 0 .../cpu/xeon/manifest}/audioqna.yaml | 0 .../hpu/gaudi/gmc}/audioQnA_gaudi.yaml | 0 .../hpu/gaudi/manifest}/audioqna.yaml | 0 ...a_on_gaudi.sh => test_compose_on_gaudi.sh} | 10 +- ...qna_on_xeon.sh => test_compose_on_xeon.sh} | 10 +- AudioQnA/tests/test_gmc_on_gaudi.sh | 4 +- AudioQnA/tests/test_gmc_on_xeon.sh | 4 +- AudioQnA/{docker => }/ui/docker/Dockerfile | 0 AudioQnA/{docker => }/ui/svelte/.editorconfig | 0 AudioQnA/{docker => }/ui/svelte/.env | 0 AudioQnA/{docker => }/ui/svelte/.eslintignore | 0 AudioQnA/{docker => }/ui/svelte/.eslintrc.cjs | 0 .../{docker => }/ui/svelte/.prettierignore | 0 AudioQnA/{docker => }/ui/svelte/.prettierrc | 0 AudioQnA/{docker => }/ui/svelte/README.md | 4 +- AudioQnA/{docker => }/ui/svelte/package.json | 0 .../{docker => }/ui/svelte/postcss.config.cjs | 0 AudioQnA/{docker => }/ui/svelte/src/app.d.ts | 0 AudioQnA/{docker => }/ui/svelte/src/app.html | 0 .../{docker => }/ui/svelte/src/app.postcss | 0 .../src/lib/assets/icons/png/audio1.png | Bin .../src/lib/assets/icons/png/audio2.png | Bin .../icons/svelte/arrow-path-icon.svelte | 0 .../lib/assets/icons/svelte/assistant.svelte | 0 .../icons/svelte/chat-bubble-left-icon.svelte | 0 .../src/lib/assets/icons/svelte/chat.svelte | 0 .../lib/assets/icons/svelte/check-icon.svelte | 0 .../src/lib/assets/icons/svelte/intel.svelte | 0 .../svelte/loading-button-spinner-icon.svelte | 0 .../assets/icons/svelte/message-avatar.svelte | 0 .../lib/assets/icons/svelte/plus-icon.svelte | 0 .../lib/assets/icons/svelte/portrait.svelte | 0 .../assets/icons/svelte/voice-button.svelte | 0 .../assets/icons/svelte/x-mark-icon.svelte | 0 .../ui/svelte/src/lib/assets/icons/svg/1.svg | 0 .../ui/svelte/src/lib/assets/icons/svg/2.svg | 0 .../ui/svelte/src/lib/assets/icons/svg/3.svg | 0 .../ui/svelte/src/lib/assets/icons/svg/4.svg | 0 .../ui/svelte/src/lib/assets/icons/svg/5.svg | 0 .../lib/assets/icons/svg/Voice-Wave-Dark.svg | 0 .../lib/assets/icons/svg/stop-recording.svg | 0 .../src/lib/assets/icons/svg/upload.svg | 0 .../svelte/src/lib/assets/icons/svg/voice.svg | 0 .../src/lib/assets/icons/svg/voiceOff.svg | 0 .../src/lib/assets/icons/svg/voiceOn.svg | 0 .../ui/svelte/src/lib/common/sse.d.ts | 0 .../ui/svelte/src/lib/common/timediff.ts | 0 .../svelte/src/lib/components/layout.svelte | 0 .../src/lib/components/shared/shared-utils.ts | 0 .../src/lib/components/shared/shared.store.ts | 0 .../src/lib/components/shared/shared.type.ts | 0 .../src/lib/components/talkbot/store.ts | 0 .../components/talkbot/voice-button.svelte | 0 .../lib/components/talkbot/voice-wave.svelte | 0 .../lib/components/topnavigation/Index.svelte | 0 .../src/lib/modules/chat/chat-audio.svelte | 0 .../src/lib/modules/chat/chat-message.svelte | 0 .../src/lib/modules/chat/message-timer.svelte | 0 .../ui/svelte/src/lib/modules/chat/network.ts | 0 .../ui/svelte/src/routes/+layout.svelte | 0 .../ui/svelte/src/routes/+page.svelte | 0 .../{docker => }/ui/svelte/static/favicon.png | Bin .../{docker => }/ui/svelte/svelte.config.js | 0 .../ui/svelte/tailwind.config.cjs | 0 AudioQnA/{docker => }/ui/svelte/tsconfig.json | 0 .../{docker => }/ui/svelte/vite.config.ts | 0 ChatQnA/{docker => }/Dockerfile | 0 ...rfile_guardrails => Dockerfile.guardrails} | 0 ...rfile_no_wrapper => Dockerfile.no_wrapper} | 0 ...thout_rerank => Dockerfile.without_rerank} | 0 ChatQnA/README.md | 22 ++-- ChatQnA/{docker => }/chatqna.py | 0 ChatQnA/{docker => }/chatqna_guardrails.py | 0 ChatQnA/{docker => }/chatqna_no_wrapper.py | 0 .../{docker => }/chatqna_without_rerank.py | 0 .../intel/cpu}/aipc/README.md | 14 +- .../intel/cpu}/aipc/compose.yaml | 0 .../intel/cpu}/xeon/README.md | 24 ++-- .../intel/cpu}/xeon/README_qdrant.md | 20 +-- .../intel/cpu}/xeon/compose.yaml | 0 .../intel/cpu}/xeon/compose_no_wrapper.yaml | 0 .../intel/cpu}/xeon/compose_qdrant.yaml | 0 .../intel/cpu}/xeon/compose_vllm.yaml | 0 .../cpu}/xeon/compose_without_rerank.yaml | 0 .../intel/cpu}/xeon/set_env.sh | 0 .../intel/hpu}/gaudi/README.md | 38 +++--- .../intel/hpu}/gaudi/compose.yaml | 0 .../intel/hpu}/gaudi/compose_guardrails.yaml | 0 .../intel/hpu}/gaudi/compose_no_wrapper.yaml | 0 .../intel/hpu}/gaudi/compose_vllm.yaml | 0 .../intel/hpu}/gaudi/compose_vllm_ray.yaml | 0 .../hpu}/gaudi/compose_without_rerank.yaml | 0 .../hpu}/gaudi/how_to_validate_service.md | 10 +- .../intel/hpu}/gaudi/set_env.sh | 0 .../nvidia}/gpu/README.md | 14 +- .../nvidia}/gpu/compose.yaml | 0 .../nvidia}/gpu/set_env.sh | 0 .../build.yaml} | 38 +++--- .../kubernetes/{manifests => intel}/README.md | 0 .../{README.md => intel/README_gmc.md} | 2 +- .../cpu/xeon/gmc}/chatQnA_dataprep_xeon.yaml | 0 .../cpu/xeon/gmc}/chatQnA_switch_xeon.yaml | 0 .../cpu/xeon/gmc}/chatQnA_xeon.yaml | 0 .../xeon/manifest}/chatqna-guardrails.yaml | 0 .../cpu/xeon/manifest}/chatqna.yaml | 0 .../gaudi/gmc}/chatQnA_dataprep_gaudi.yaml | 0 .../hpu/gaudi/gmc}/chatQnA_gaudi.yaml | 0 .../hpu/gaudi/gmc}/chatQnA_switch_gaudi.yaml | 0 .../gaudi/manifest}/chatqna-guardrails.yaml | 0 .../hpu/gaudi/manifest}/chatqna.yaml | 0 ...sh => test_compose_guardrails_on_gaudi.sh} | 14 +- ...sh => test_compose_no_wrapper_on_gaudi.sh} | 14 +- ....sh => test_compose_no_wrapper_on_xeon.sh} | 14 +- ...a_on_gaudi.sh => test_compose_on_gaudi.sh} | 24 ++-- ...qna_on_xeon.sh => test_compose_on_xeon.sh} | 14 +- ...xeon.sh => test_compose_qdrant_on_xeon.sh} | 14 +- ...gaudi.sh => test_compose_vllm_on_gaudi.sh} | 14 +- ...n_xeon.sh => test_compose_vllm_on_xeon.sh} | 14 +- ...i.sh => test_compose_vllm_ray_on_gaudi.sh} | 14 +- ...> test_compose_without_rerank_on_gaudi.sh} | 14 +- ...=> test_compose_without_rerank_on_xeon.sh} | 14 +- ChatQnA/tests/test_gmc_on_gaudi.sh | 4 +- ChatQnA/tests/test_gmc_on_xeon.sh | 4 +- ChatQnA/tests/test_manifest_on_gaudi.sh | 4 +- ChatQnA/tests/test_manifest_on_xeon.sh | 4 +- ChatQnA/{docker => }/ui/docker/Dockerfile | 0 .../ui/docker/Dockerfile.react | 2 +- ChatQnA/{docker => }/ui/react/.env | 0 ChatQnA/{docker => }/ui/react/.env.production | 0 ChatQnA/{docker => }/ui/react/.eslintrc.cjs | 0 ChatQnA/{docker => }/ui/react/.gitignore | 0 ChatQnA/{docker => }/ui/react/README.md | 6 +- ChatQnA/{docker => }/ui/react/env.sh | 0 ChatQnA/{docker => }/ui/react/index.html | 0 ChatQnA/{docker => }/ui/react/nginx.conf | 0 ChatQnA/{docker => }/ui/react/package.json | 0 .../{docker => }/ui/react/postcss.config.cjs | 0 ChatQnA/{docker => }/ui/react/public/vite.svg | 0 ChatQnA/{docker => }/ui/react/src/App.scss | 0 ChatQnA/{docker => }/ui/react/src/App.tsx | 0 .../ui/react/src/__tests__/util.test.ts | 0 .../ui/react/src/assets/opea-icon-black.svg | 0 .../ui/react/src/assets/opea-icon-color.svg | 0 .../ui/react/src/assets/react.svg | 0 .../ui/react/src/common/client.ts | 0 .../{docker => }/ui/react/src/common/util.ts | 0 .../components/Conversation/Conversation.tsx | 0 .../Conversation/ConversationSideBar.tsx | 0 .../components/Conversation/DataSource.tsx | 0 .../Conversation/conversation.module.scss | 0 .../Message/conversationMessage.module.scss | 0 .../Message/conversationMessage.tsx | 0 .../UserInfoModal/UserInfoModal.tsx | 0 .../components/sidebar/sidebar.module.scss | 0 .../react/src/components/sidebar/sidebar.tsx | 0 ChatQnA/{docker => }/ui/react/src/config.ts | 0 ChatQnA/{docker => }/ui/react/src/index.scss | 0 ChatQnA/{docker => }/ui/react/src/main.tsx | 0 .../src/redux/Conversation/Conversation.ts | 0 .../redux/Conversation/ConversationSlice.ts | 0 .../ui/react/src/redux/User/user.d.ts | 0 .../ui/react/src/redux/User/userSlice.ts | 0 .../{docker => }/ui/react/src/redux/store.ts | 0 .../ui/react/src/redux/thunkUtil.ts | 0 .../react/src/styles/components/_context.scss | 0 .../react/src/styles/components/_sidebar.scss | 0 .../react/src/styles/components/content.scss | 0 .../src/styles/components/context.module.scss | 0 .../ui/react/src/styles/layout/_basics.scss | 0 .../ui/react/src/styles/layout/_flex.scss | 0 .../ui/react/src/styles/styles.scss | 0 .../{docker => }/ui/react/src/vite-env.d.ts | 0 ChatQnA/{docker => }/ui/react/tsconfig.json | 0 .../{docker => }/ui/react/tsconfig.node.json | 0 ChatQnA/{docker => }/ui/react/vite.config.ts | 0 ChatQnA/{docker => }/ui/svelte/.editorconfig | 0 ChatQnA/{docker => }/ui/svelte/.env | 0 ChatQnA/{docker => }/ui/svelte/.eslintignore | 0 ChatQnA/{docker => }/ui/svelte/.eslintrc.cjs | 0 .../{docker => }/ui/svelte/.prettierignore | 0 ChatQnA/{docker => }/ui/svelte/.prettierrc | 0 ChatQnA/{docker => }/ui/svelte/README.md | 6 +- ChatQnA/{docker => }/ui/svelte/package.json | 0 .../ui/svelte/playwright.config.ts | 0 .../{docker => }/ui/svelte/postcss.config.cjs | 0 ChatQnA/{docker => }/ui/svelte/src/app.d.ts | 0 ChatQnA/{docker => }/ui/svelte/src/app.html | 0 .../{docker => }/ui/svelte/src/app.postcss | 0 .../DocManagement/LinkfolderIcon.svelte | 0 .../lib/assets/DocManagement/fileIcon.svelte | 0 .../assets/DocManagement/folderIcon.svelte | 0 .../lib/assets/avatar/svelte/Delete.svelte | 0 .../lib/assets/chat/svelte/Assistant.svelte | 0 .../assets/chat/svelte/PaperAirplane.svelte | 0 .../assets/chat/svelte/PersonOutlined.svelte | 0 .../src/lib/assets/layout/css/driver.css | 0 .../src/lib/assets/upload/deleteIcon.svelte | 0 .../lib/assets/upload/loading-button.svelte | 0 .../svelte/src/lib/assets/upload/next.svelte | 0 .../src/lib/assets/upload/no-file.svelte | 0 .../src/lib/assets/upload/previous.svelte | 0 .../svelte/src/lib/assets/voice/svg/paste.svg | 0 .../src/lib/assets/voice/svg/uploadFile.svg | 0 .../src/lib/modules/chat/ChatMessage.svelte | 0 .../src/lib/modules/chat/MessageAvatar.svelte | 0 .../src/lib/modules/chat/MessageTimer.svelte | 0 .../src/lib/modules/frame/Layout.svelte | 0 .../ui/svelte/src/lib/network/chat/Network.ts | 0 .../svelte/src/lib/network/upload/Network.ts | 0 .../ui/svelte/src/lib/shared/Utils.ts | 0 .../lib/shared/components/chat/gallery.svelte | 0 .../components/doc_management/docCard.svelte | 0 .../treeView/svelte-tree.svelte | 0 .../treeView/tree-branch.svelte | 0 .../doc_management/treeView/tree-node.svelte | 0 .../shared/components/loading/Loading.svelte | 0 .../components/scrollbar/Scrollbar.svelte | 0 .../components/upload/PasteKnowledge.svelte | 0 .../components/upload/upload-knowledge.svelte | 0 .../components/upload/uploadFile.svelte | 0 .../src/lib/shared/constant/Interface.ts | 0 .../src/lib/shared/stores/common/Store.ts | 0 .../ui/svelte/src/routes/+layout.svelte | 0 .../ui/svelte/src/routes/+page.svelte | 0 .../ui/svelte/src/routes/+page.ts | 0 .../{docker => }/ui/svelte/static/favicon.png | Bin .../{docker => }/ui/svelte/svelte.config.js | 0 .../ui/svelte/tailwind.config.cjs | 0 .../ui/svelte/tests/chatQnA.spec.ts | 0 .../ui/svelte/tests/test_file.txt | 0 ChatQnA/{docker => }/ui/svelte/tsconfig.json | 0 ChatQnA/{docker => }/ui/svelte/vite.config.ts | 0 CodeGen/{docker => }/Dockerfile | 0 CodeGen/README.md | 16 +-- CodeGen/{docker => }/codegen.py | 0 .../intel/cpu}/xeon/README.md | 36 +++--- .../intel/cpu}/xeon/compose.yaml | 0 .../intel/hpu}/gaudi/README.md | 36 +++--- .../intel/hpu}/gaudi/compose.yaml | 0 .../build.yaml} | 5 +- .../kubernetes/{manifests => intel}/README.md | 0 .../{README.md => intel/README_gmc.md} | 0 .../cpu/xeon/gmc}/codegen_xeon.yaml | 0 .../cpu/xeon/manifest/README_react_ui.md} | 0 .../cpu/xeon/manifest}/codegen.yaml | 0 .../cpu/xeon/manifest/codegen_react_ui.yaml} | 0 .../hpu/gaudi/gmc}/codegen_gaudi.yaml | 0 .../hpu/gaudi/manifest}/codegen.yaml | 0 CodeGen/{docker => }/set_env.sh | 0 ...n_on_gaudi.sh => test_compose_on_gaudi.sh} | 14 +- ...gen_on_xeon.sh => test_compose_on_xeon.sh} | 14 +- CodeGen/tests/test_gmc_on_gaudi.sh | 4 +- CodeGen/tests/test_gmc_on_xeon.sh | 4 +- CodeGen/tests/test_manifest_on_gaudi.sh | 4 +- CodeGen/tests/test_manifest_on_xeon.sh | 4 +- CodeGen/{docker => }/ui/docker/Dockerfile | 0 .../{docker => }/ui/docker/Dockerfile.react | 0 CodeGen/{docker => }/ui/react/.env | 0 CodeGen/{docker => }/ui/react/.eslintrc.cjs | 0 CodeGen/{docker => }/ui/react/.gitignore | 0 CodeGen/{docker => }/ui/react/README.md | 2 +- CodeGen/{docker => }/ui/react/index.html | 0 CodeGen/{docker => }/ui/react/nginx.conf | 0 CodeGen/{docker => }/ui/react/package.json | 0 .../{docker => }/ui/react/postcss.config.cjs | 0 CodeGen/{docker => }/ui/react/src/App.scss | 0 CodeGen/{docker => }/ui/react/src/App.tsx | 0 .../ui/react/src/__tests__/util.test.ts | 0 .../ui/react/src/assets/opea-icon-black.svg | 0 .../ui/react/src/assets/opea-icon-color.svg | 0 .../ui/react/src/common/client.ts | 0 .../{docker => }/ui/react/src/common/util.ts | 0 .../react/src/components/CodeGen/CodeGen.tsx | 0 .../components/CodeGen/codeGen.module.scss | 0 .../Message/conversationMessage.module.scss | 0 .../Message/conversationMessage.tsx | 0 .../Shared/CodeRender/CodeRender.tsx | 0 .../Shared/CodeRender/codeRender.module.scss | 0 .../components/Shared/Markdown/Markdown.tsx | 0 .../Shared/Markdown/markdown.module.scss | 0 .../components/sidebar/sidebar.module.scss | 0 .../react/src/components/sidebar/sidebar.tsx | 0 CodeGen/{docker => }/ui/react/src/config.ts | 0 CodeGen/{docker => }/ui/react/src/index.scss | 0 CodeGen/{docker => }/ui/react/src/main.tsx | 0 .../react/src/styles/components/_context.scss | 0 .../react/src/styles/components/_sidebar.scss | 0 .../react/src/styles/components/content.scss | 0 .../src/styles/components/context.module.scss | 0 .../ui/react/src/styles/layout/_basics.scss | 0 .../ui/react/src/styles/layout/_flex.scss | 0 .../ui/react/src/styles/styles.scss | 0 .../{docker => }/ui/react/src/vite-env.d.ts | 0 CodeGen/{docker => }/ui/react/tsconfig.json | 0 .../{docker => }/ui/react/tsconfig.node.json | 0 CodeGen/{docker => }/ui/react/vite.config.ts | 0 CodeGen/{docker => }/ui/svelte/.editorconfig | 0 CodeGen/{docker => }/ui/svelte/.env | 0 CodeGen/{docker => }/ui/svelte/.eslintignore | 0 CodeGen/{docker => }/ui/svelte/.eslintrc.cjs | 0 CodeGen/{docker => }/ui/svelte/.npmrc | 0 .../{docker => }/ui/svelte/.prettierignore | 0 CodeGen/{docker => }/ui/svelte/.prettierrc | 0 CodeGen/{docker => }/ui/svelte/README.md | 2 +- CodeGen/{docker => }/ui/svelte/package.json | 0 .../ui/svelte/playwright.config.ts | 0 .../{docker => }/ui/svelte/postcss.config.cjs | 0 CodeGen/{docker => }/ui/svelte/src/app.d.ts | 0 CodeGen/{docker => }/ui/svelte/src/app.html | 0 CodeGen/{docker => }/ui/svelte/src/app.pcss | 0 .../{docker => }/ui/svelte/src/app.postcss | 0 .../ui/svelte/src/lib/InputAirPlane.svelte | 0 .../src/lib/assets/PaperAirplane.svelte | 0 .../assets/chat/svelte/PaperAirplane.svelte | 0 .../ui/svelte/src/lib/assets/imgLogo.svelte | 0 .../src/lib/assets/layout/css/driver.css | 0 .../src/lib/assets/loadingAnimation.svelte | 0 .../svelte/src/lib/assets/spinLoading.svelte | 0 .../svelte/src/lib/assets/summaryLogo.svelte | 0 .../{docker => }/ui/svelte/src/lib/doc.svelte | 0 .../ui/svelte/src/lib/dropFile.svelte | 0 .../ui/svelte/src/lib/header.svelte | 0 .../{docker => }/ui/svelte/src/lib/index.ts | 0 .../svelte/src/lib/modules/chat/Output.svelte | 0 .../src/lib/modules/frame/header.svelte | 0 .../ui/svelte/src/lib/network/chat/Network.ts | 0 .../ui/svelte/src/lib/shared/Network.ts | 0 .../ui/svelte/src/lib/shared/Store.ts | 0 .../ui/svelte/src/lib/shared/Utils.ts | 0 .../shared/components/loading/Loading.svelte | 0 .../components/scrollbar/Scrollbar.svelte | 0 .../ui/svelte/src/lib/summary.svelte | 0 .../ui/svelte/src/routes/+layout.svelte | 0 .../ui/svelte/src/routes/+page.svelte | 0 .../ui/svelte/src/routes/+page.ts | 0 .../{docker => }/ui/svelte/static/favicon.png | Bin .../{docker => }/ui/svelte/svelte.config.js | 0 .../ui/svelte/tailwind.config.cjs | 0 .../ui/svelte/tests/codeGen.spec.ts | 0 CodeGen/{docker => }/ui/svelte/tsconfig.json | 0 CodeGen/{docker => }/ui/svelte/vite.config.ts | 0 CodeTrans/{docker => }/Dockerfile | 0 CodeTrans/README.md | 16 +-- CodeTrans/{docker => }/code_translation.py | 0 .../intel/cpu}/xeon/README.md | 8 +- .../intel/cpu}/xeon/compose.yaml | 0 .../intel/hpu}/gaudi/README.md | 10 +- .../intel/hpu}/gaudi/compose.yaml | 0 .../build.yaml} | 5 +- .../kubernetes/{manifests => intel}/README.md | 0 .../{README.md => intel/README_gmc.md} | 0 .../cpu/xeon/gmc}/codetrans_xeon.yaml | 0 .../cpu/xeon/manifest}/codetrans.yaml | 0 .../hpu/gaudi/gmc}/codetrans_gaudi.yaml | 0 .../hpu/gaudi/manifest}/codetrans.yaml | 0 CodeTrans/{docker => }/set_env.sh | 0 ...s_on_gaudi.sh => test_compose_on_gaudi.sh} | 14 +- ...ans_on_xeon.sh => test_compose_on_xeon.sh} | 14 +- CodeTrans/tests/test_gmc_on_gaudi.sh | 4 +- CodeTrans/tests/test_gmc_on_xeon.sh | 4 +- CodeTrans/tests/test_manifest_on_gaudi.sh | 4 +- CodeTrans/tests/test_manifest_on_xeon.sh | 4 +- CodeTrans/{docker => }/ui/docker/Dockerfile | 0 CodeTrans/{docker => }/ui/svelte/.env | 0 CodeTrans/{docker => }/ui/svelte/.gitignore | 0 CodeTrans/{docker => }/ui/svelte/.npmrc | 0 CodeTrans/{docker => }/ui/svelte/README.md | 6 +- CodeTrans/{docker => }/ui/svelte/package.json | 0 .../ui/svelte/playwright.config.ts | 0 .../{docker => }/ui/svelte/postcss.config.cjs | 0 CodeTrans/{docker => }/ui/svelte/src/app.d.ts | 0 CodeTrans/{docker => }/ui/svelte/src/app.html | 0 CodeTrans/{docker => }/ui/svelte/src/app.pcss | 0 .../src/lib/assets/loadingAnimation.svelte | 0 .../src/lib/assets/translateIcon.svelte | 0 .../ui/svelte/src/lib/header.svelte | 0 .../ui/svelte/src/lib/shared/Network.ts | 0 .../ui/svelte/src/lib/shared/constant.ts | 0 .../ui/svelte/src/routes/+layout.svelte | 0 .../ui/svelte/src/routes/+page.svelte | 0 .../ui/svelte/src/routes/types.d.ts | 0 .../{docker => }/ui/svelte/static/favicon.png | Bin .../{docker => }/ui/svelte/svelte.config.js | 0 .../ui/svelte/tailwind.config.cjs | 0 .../ui/svelte/tests/codeTrans.spec.ts | 0 .../{docker => }/ui/svelte/tsconfig.json | 0 .../{docker => }/ui/svelte/vite.config.ts | 0 DocIndexRetriever/{docker => }/Dockerfile | 2 +- DocIndexRetriever/README.md | 4 +- .../intel}/README.md | 22 ++-- .../intel/cpu/xeon/compose.yaml} | 0 .../intel/hpu/gaudi/compose.yaml} | 0 .../build.yaml} | 8 +- .../{docker => }/retrieval_tool.py | 0 ...r_on_gaudi.sh => test_compose_on_gaudi.sh} | 20 +-- DocSum/{docker => }/Dockerfile | 0 DocSum/README.md | 14 +- .../intel/cpu}/xeon/README.md | 16 +-- .../intel/cpu}/xeon/compose.yaml | 0 .../intel/hpu}/gaudi/README.md | 10 +- .../intel/hpu}/gaudi/compose.yaml | 0 .../build.yaml} | 7 +- DocSum/{docker => }/docsum.py | 0 .../kubernetes/{manifests => intel}/README.md | 0 .../{README.md => intel/README_gmc.md} | 4 +- .../{ => intel/cpu/xeon/gmc}/docsum_xeon.yaml | 0 .../cpu/xeon/manifest}/docsum.yaml | 0 .../cpu/xeon/manifest}/ui/README.md | 0 .../cpu/xeon/manifest}/ui/react-docsum.yaml | 0 .../hpu/gaudi/gmc}/docsum_gaudi.yaml | 0 .../hpu/gaudi/manifest}/docsum.yaml | 0 DocSum/{docker => }/set_env.sh | 0 ...m_on_gaudi.sh => test_compose_on_gaudi.sh} | 14 +- ...sum_on_xeon.sh => test_compose_on_xeon.sh} | 14 +- DocSum/tests/test_gmc_on_gaudi.sh | 4 +- DocSum/tests/test_gmc_on_xeon.sh | 4 +- DocSum/tests/test_manifest_on_gaudi.sh | 4 +- DocSum/tests/test_manifest_on_xeon.sh | 4 +- DocSum/{docker => }/ui/docker/Dockerfile | 0 .../{docker => }/ui/docker/Dockerfile.react | 0 DocSum/{docker => }/ui/react/.env | 0 DocSum/{docker => }/ui/react/.eslintrc.cjs | 0 DocSum/{docker => }/ui/react/.gitignore | 0 DocSum/{docker => }/ui/react/README.md | 6 +- DocSum/{docker => }/ui/react/index.html | 0 DocSum/{docker => }/ui/react/nginx.conf | 0 DocSum/{docker => }/ui/react/package.json | 0 .../{docker => }/ui/react/postcss.config.cjs | 0 DocSum/{docker => }/ui/react/src/App.scss | 0 DocSum/{docker => }/ui/react/src/App.tsx | 0 .../ui/react/src/__tests__/util.test.ts | 0 .../ui/react/src/assets/opea-icon-black.svg | 0 .../ui/react/src/assets/opea-icon-color.svg | 0 .../ui/react/src/common/client.ts | 0 .../{docker => }/ui/react/src/common/util.ts | 0 .../ui/react/src/components/DocSum/DocSum.tsx | 0 .../src/components/DocSum/FileUpload.tsx | 0 .../src/components/DocSum/docSum.module.scss | 0 .../Shared/CodeRender/CodeRender.tsx | 0 .../Shared/CodeRender/codeRender.module.scss | 0 .../components/Shared/Markdown/Markdown.tsx | 0 .../Shared/Markdown/markdown.module.scss | 0 .../components/sidebar/sidebar.module.scss | 0 .../react/src/components/sidebar/sidebar.tsx | 0 DocSum/{docker => }/ui/react/src/config.ts | 0 DocSum/{docker => }/ui/react/src/index.scss | 0 DocSum/{docker => }/ui/react/src/main.tsx | 0 .../react/src/styles/components/_sidebar.scss | 0 .../react/src/styles/components/content.scss | 0 .../src/styles/components/context.module.scss | 0 .../ui/react/src/styles/layout/_basics.scss | 0 .../ui/react/src/styles/layout/_flex.scss | 0 .../ui/react/src/styles/styles.scss | 0 .../{docker => }/ui/react/src/vite-env.d.ts | 0 DocSum/{docker => }/ui/react/tsconfig.json | 0 .../{docker => }/ui/react/tsconfig.node.json | 0 DocSum/{docker => }/ui/react/vite.config.ts | 0 DocSum/{docker => }/ui/svelte/.env | 0 DocSum/{docker => }/ui/svelte/.gitignore | 0 DocSum/{docker => }/ui/svelte/.npmrc | 0 DocSum/{docker => }/ui/svelte/README.md | 8 +- DocSum/{docker => }/ui/svelte/package.json | 0 .../ui/svelte/playwright.config.ts | 0 .../{docker => }/ui/svelte/postcss.config.cjs | 0 DocSum/{docker => }/ui/svelte/src/app.d.ts | 0 DocSum/{docker => }/ui/svelte/src/app.html | 0 DocSum/{docker => }/ui/svelte/src/app.pcss | 0 .../ui/svelte/src/lib/assets/imgLogo.svelte | 0 .../ui/svelte/src/lib/assets/intelLogo.svelte | 0 .../src/lib/assets/loadingAnimation.svelte | 0 .../svelte/src/lib/assets/spinLoading.svelte | 0 .../svelte/src/lib/assets/summaryLogo.svelte | 0 .../{docker => }/ui/svelte/src/lib/doc.svelte | 0 .../ui/svelte/src/lib/dropFile.svelte | 0 .../ui/svelte/src/lib/header.svelte | 0 .../{docker => }/ui/svelte/src/lib/index.ts | 0 .../ui/svelte/src/lib/shared/Network.ts | 0 .../ui/svelte/src/lib/shared/Store.ts | 0 .../ui/svelte/src/lib/shared/Utils.ts | 0 .../ui/svelte/src/lib/summary.svelte | 0 .../ui/svelte/src/routes/+layout.svelte | 0 .../ui/svelte/src/routes/+page.svelte | 0 .../{docker => }/ui/svelte/static/favicon.png | Bin .../{docker => }/ui/svelte/svelte.config.js | 0 .../ui/svelte/tailwind.config.cjs | 0 .../ui/svelte/tests/docSum.spec.ts | 0 DocSum/{docker => }/ui/svelte/tsconfig.json | 0 DocSum/{docker => }/ui/svelte/vite.config.ts | 0 FaqGen/{docker => }/Dockerfile | 0 FaqGen/README.md | 4 +- .../intel/cpu}/xeon/README.md | 22 ++-- .../intel/cpu}/xeon/compose.yaml | 0 .../intel/hpu}/gaudi/README.md | 16 +-- .../intel/hpu}/gaudi/compose.yaml | 0 .../build.yaml} | 7 +- FaqGen/{docker => }/faqgen.py | 0 FaqGen/kubernetes/README.md | 0 FaqGen/kubernetes/helm-charts/README.md | 0 .../kubernetes/{manifests => intel}/README.md | 0 .../kubernetes/intel/README_gmc.md | 0 .../{ => intel/cpu/xeon/gmc}/faqgen_xeon.yaml | 0 .../cpu/xeon/manifest/README_react_ui.md} | 0 .../cpu/xeon/manifest}/faqgen.yaml | 0 .../cpu/xeon/manifest/faqgen_react_ui.yaml} | 0 .../cpu/xeon/manifest/faqgen_ui.yaml} | 0 .../hpu/gaudi/gmc}/faqgen_gaudi.yaml | 0 .../hpu/gaudi/manifest}/faqgen.yaml | 0 .../intel/hpu/gaudi/manifest/faqgen_ui.yaml | 46 +++++++ FaqGen/kubernetes/service-mesh/README.md | 0 ...n_on_gaudi.sh => test_compose_on_gaudi.sh} | 16 +-- ...gen_on_xeon.sh => test_compose_on_xeon.sh} | 16 +-- FaqGen/{docker => }/ui/docker/Dockerfile | 0 .../{docker => }/ui/docker/Dockerfile.react | 0 FaqGen/{docker => }/ui/react/.eslintrc.cjs | 0 FaqGen/{docker => }/ui/react/.gitignore | 0 FaqGen/{docker => }/ui/react/README.md | 4 +- FaqGen/{docker => }/ui/react/index.html | 0 FaqGen/{docker => }/ui/react/nginx.conf | 0 FaqGen/{docker => }/ui/react/package.json | 0 .../{docker => }/ui/react/postcss.config.cjs | 0 FaqGen/{docker => }/ui/react/public/vite.svg | 0 FaqGen/{docker => }/ui/react/src/App.scss | 0 FaqGen/{docker => }/ui/react/src/App.tsx | 0 .../ui/react/src/__tests__/util.test.ts | 0 .../ui/react/src/assets/opea-icon-black.svg | 0 .../ui/react/src/assets/opea-icon-color.svg | 0 .../ui/react/src/assets/react.svg | 0 .../ui/react/src/common/client.ts | 0 .../{docker => }/ui/react/src/common/util.ts | 0 .../ui/react/src/components/FaqGen/FaqGen.tsx | 0 .../src/components/FaqGen/FileUpload.tsx | 0 .../src/components/FaqGen/faqGen.module.scss | 0 .../Shared/CodeRender/CodeRender.tsx | 0 .../Shared/CodeRender/codeRender.module.scss | 0 .../components/Shared/Markdown/Markdown.tsx | 0 .../Shared/Markdown/markdown.module.scss | 0 .../components/sidebar/sidebar.module.scss | 0 .../react/src/components/sidebar/sidebar.tsx | 0 FaqGen/{docker => }/ui/react/src/config.ts | 0 FaqGen/{docker => }/ui/react/src/index.scss | 0 FaqGen/{docker => }/ui/react/src/main.tsx | 0 .../react/src/styles/components/_context.scss | 0 .../react/src/styles/components/_sidebar.scss | 0 .../react/src/styles/components/content.scss | 0 .../src/styles/components/context.module.scss | 0 .../ui/react/src/styles/layout/_basics.scss | 0 .../ui/react/src/styles/layout/_flex.scss | 0 .../ui/react/src/styles/styles.scss | 0 .../{docker => }/ui/react/src/vite-env.d.ts | 0 FaqGen/{docker => }/ui/react/tsconfig.json | 0 .../{docker => }/ui/react/tsconfig.node.json | 0 FaqGen/{docker => }/ui/react/vite.config.ts | 0 FaqGen/{docker => }/ui/svelte/.env | 0 FaqGen/{docker => }/ui/svelte/.gitignore | 0 FaqGen/{docker => }/ui/svelte/.npmrc | 0 FaqGen/{docker => }/ui/svelte/README.md | 2 +- FaqGen/{docker => }/ui/svelte/package.json | 0 .../ui/svelte/playwright.config.ts | 0 .../{docker => }/ui/svelte/postcss.config.cjs | 0 FaqGen/{docker => }/ui/svelte/src/app.d.ts | 0 FaqGen/{docker => }/ui/svelte/src/app.html | 0 FaqGen/{docker => }/ui/svelte/src/app.pcss | 0 .../ui/svelte/src/lib/assets/faqLogo.svelte | 0 .../ui/svelte/src/lib/assets/imgLogo.svelte | 0 .../ui/svelte/src/lib/assets/intelLogo.svelte | 0 .../src/lib/assets/loadingAnimation.svelte | 0 .../svelte/src/lib/assets/spinLoading.svelte | 0 .../{docker => }/ui/svelte/src/lib/doc.svelte | 0 .../ui/svelte/src/lib/dropFile.svelte | 0 .../{docker => }/ui/svelte/src/lib/faq.svelte | 0 .../ui/svelte/src/lib/header.svelte | 0 .../{docker => }/ui/svelte/src/lib/index.ts | 0 .../ui/svelte/src/lib/shared/Network.ts | 0 .../ui/svelte/src/lib/shared/Store.ts | 0 .../ui/svelte/src/lib/shared/Utils.ts | 0 .../ui/svelte/src/routes/+layout.svelte | 0 .../ui/svelte/src/routes/+page.svelte | 0 .../{docker => }/ui/svelte/static/favicon.png | Bin .../{docker => }/ui/svelte/svelte.config.js | 0 .../ui/svelte/tailwind.config.cjs | 0 .../ui/svelte/tests/faqGen.spec.ts | 0 FaqGen/{docker => }/ui/svelte/tsconfig.json | 0 FaqGen/{docker => }/ui/svelte/vite.config.ts | 0 InstructionTuning/README.md | 4 +- .../intel/cpu}/xeon/README.md | 2 +- .../intel/hpu}/gaudi/README.md | 2 +- ...ing_on_xeon.sh => test_compose_on_xeon.sh} | 5 +- ProductivitySuite/README.md | 4 +- .../intel/cpu}/xeon/README.md | 42 +++--- .../intel/cpu}/xeon/compose.yaml | 0 .../intel/cpu}/xeon/keycloak_setup_guide.md | 0 .../intel/cpu}/xeon/set_env.sh | 0 .../build.yaml} | 26 ++-- .../kubernetes/{manifests => intel}/README.md | 4 +- .../cpu/xeon/manifest}/chat_history.yaml | 0 .../cpu/xeon/manifest}/chatqna.yaml | 0 .../cpu/xeon/manifest}/codegen.yaml | 0 .../cpu/xeon/manifest}/docsum.yaml | 0 .../cpu/xeon/manifest}/faqgen.yaml | 0 .../cpu/xeon/manifest}/keycloak_install.yaml | 0 .../cpu/xeon/manifest}/mongo.yaml | 0 .../manifest}/productivity_suite_reactui.yaml | 0 .../cpu/xeon/manifest}/prompt_registry.yaml | 0 ...ite_on_xeon.sh => test_compose_on_xeon.sh} | 12 +- .../ui/docker/Dockerfile.react | 0 .../{docker => }/ui/react/.env.production | 0 .../{docker => }/ui/react/.eslintrc.cjs | 0 .../{docker => }/ui/react/.gitignore | 0 .../{docker => }/ui/react/README.md | 18 +-- .../{docker => }/ui/react/env.sh | 0 .../{docker => }/ui/react/index.html | 0 .../{docker => }/ui/react/nginx.conf | 0 .../{docker => }/ui/react/package.json | 0 .../{docker => }/ui/react/postcss.config.cjs | 0 .../{docker => }/ui/react/src/App.scss | 0 .../{docker => }/ui/react/src/App.tsx | 0 .../ui/react/src/__tests__/util.test.ts | 0 .../ui/react/src/assets/opea-icon-black.svg | 0 .../ui/react/src/assets/opea-icon-color.svg | 0 .../ui/react/src/assets/react.svg | 0 .../ui/react/src/common/client.ts | 0 .../{docker => }/ui/react/src/common/util.ts | 0 .../react/src/components/CodeGen/CodeGen.tsx | 0 .../components/CodeGen/codeGen.module.scss | 0 .../components/Conversation/Conversation.tsx | 0 .../Conversation/ConversationSideBar.tsx | 0 .../components/Conversation/DataSource.tsx | 0 .../Conversation/PromptTemplate.tsx | 0 .../Conversation/conversation.module.scss | 0 .../Conversation/dataSource.module.scss | 0 .../Conversation/promptTemplate.module.scss | 0 .../src/components/Conversation/settings.tsx | 0 .../ui/react/src/components/DocSum/DocSum.tsx | 0 .../src/components/DocSum/FileUpload.tsx | 0 .../src/components/DocSum/docSum.module.scss | 0 .../ui/react/src/components/FaqGen/FaqGen.tsx | 0 .../src/components/FaqGen/FileUpload.tsx | 0 .../src/components/FaqGen/faqGen.module.scss | 0 .../Message/conversationMessage.module.scss | 0 .../Message/conversationMessage.tsx | 0 .../Shared/CodeRender/CodeRender.tsx | 0 .../Shared/CodeRender/codeRender.module.scss | 0 .../components/Shared/Markdown/Markdown.tsx | 0 .../Shared/Markdown/markdown.module.scss | 0 .../components/sidebar/sidebar.module.scss | 0 .../react/src/components/sidebar/sidebar.tsx | 0 .../{docker => }/ui/react/src/config.ts | 0 .../{docker => }/ui/react/src/index.scss | 0 .../{docker => }/ui/react/src/keycloack.ts | 0 .../{docker => }/ui/react/src/main.tsx | 0 .../src/redux/Conversation/Conversation.ts | 0 .../redux/Conversation/ConversationSlice.ts | 0 .../ui/react/src/redux/Prompt/PromptSlice.ts | 0 .../ui/react/src/redux/User/user.d.ts | 0 .../ui/react/src/redux/User/userSlice.ts | 0 .../{docker => }/ui/react/src/redux/store.ts | 0 .../ui/react/src/redux/thunkUtil.ts | 0 .../react/src/styles/components/_sidebar.scss | 0 .../react/src/styles/components/content.scss | 0 .../src/styles/components/context.module.scss | 0 .../ui/react/src/styles/layout/_basics.scss | 0 .../ui/react/src/styles/layout/_flex.scss | 0 .../ui/react/src/styles/styles.scss | 0 .../{docker => }/ui/react/src/vite-env.d.ts | 0 .../{docker => }/ui/react/tsconfig.json | 0 .../{docker => }/ui/react/tsconfig.node.json | 0 .../{docker => }/ui/react/vite.config.ts | 0 README.md | 22 ++-- .../intel/cpu}/xeon/README.md | 2 +- ...ing_on_xeon.sh => test_compose_on_xeon.sh} | 11 +- SearchQnA/{docker => }/Dockerfile | 0 SearchQnA/README.md | 14 +- .../intel/cpu}/xeon/README.md | 10 +- .../intel/cpu}/xeon/compose.yaml | 0 .../intel/hpu}/gaudi/README.md | 8 +- .../intel/hpu}/gaudi/compose.yaml | 0 .../build.yaml} | 9 +- .../{README.md => intel/README_gmc.md} | 0 .../cpu/xeon/gmc}/searchQnA_xeon.yaml | 0 .../hpu/gaudi/gmc}/searchQnA_gaudi.yaml | 0 SearchQnA/{docker => }/searchqna.py | 0 SearchQnA/{docker => }/set_env.sh | 0 ...a_on_gaudi.sh => test_compose_on_gaudi.sh} | 14 +- ...qna_on_xeon.sh => test_compose_on_xeon.sh} | 14 +- SearchQnA/tests/test_gmc_on_gaudi.sh | 4 +- SearchQnA/tests/test_gmc_on_xeon.sh | 4 +- SearchQnA/{docker => }/ui/docker/Dockerfile | 0 .../{docker => }/ui/svelte/.editorconfig | 0 SearchQnA/{docker => }/ui/svelte/.env | 0 .../{docker => }/ui/svelte/.eslintignore | 0 .../{docker => }/ui/svelte/.eslintrc.cjs | 0 .../{docker => }/ui/svelte/.prettierignore | 0 SearchQnA/{docker => }/ui/svelte/.prettierrc | 0 SearchQnA/{docker => }/ui/svelte/README.md | 2 +- SearchQnA/{docker => }/ui/svelte/package.json | 0 .../ui/svelte/playwright.config.ts | 0 .../{docker => }/ui/svelte/postcss.config.cjs | 0 SearchQnA/{docker => }/ui/svelte/src/app.d.ts | 0 SearchQnA/{docker => }/ui/svelte/src/app.html | 0 .../{docker => }/ui/svelte/src/app.postcss | 0 .../lib/assets/avatar/svelte/Delete.svelte | 0 .../lib/assets/chat/svelte/Assistant.svelte | 0 .../assets/chat/svelte/PaperAirplane.svelte | 0 .../assets/chat/svelte/PersonOutlined.svelte | 0 .../src/lib/assets/header/intelLogo.svelte | 0 .../src/lib/assets/layout/css/driver.css | 0 .../svelte/src/lib/assets/upload/next.svelte | 0 .../src/lib/assets/upload/previous.svelte | 0 .../svelte/src/lib/assets/voice/svg/paste.svg | 0 .../src/lib/assets/voice/svg/uploadFile.svg | 0 .../src/lib/modules/chat/ChatMessage.svelte | 0 .../src/lib/modules/chat/MessageAvatar.svelte | 0 .../src/lib/modules/chat/MessageTimer.svelte | 0 .../src/lib/modules/frame/Layout.svelte | 0 .../ui/svelte/src/lib/network/chat/Network.ts | 0 .../svelte/src/lib/network/upload/Network.ts | 0 .../ui/svelte/src/lib/shared/Utils.ts | 0 .../shared/components/header/header.svelte | 0 .../shared/components/loading/Loading.svelte | 0 .../components/scrollbar/Scrollbar.svelte | 0 .../src/lib/shared/constant/Interface.ts | 0 .../src/lib/shared/stores/common/Store.ts | 0 .../ui/svelte/src/routes/+layout.svelte | 0 .../ui/svelte/src/routes/+page.svelte | 0 .../ui/svelte/src/routes/+page.ts | 0 .../{docker => }/ui/svelte/static/favicon.png | Bin .../{docker => }/ui/svelte/svelte.config.js | 0 .../ui/svelte/tailwind.config.cjs | 0 .../ui/svelte/tests/searchQnA.spec.ts | 0 .../{docker => }/ui/svelte/tsconfig.json | 0 .../{docker => }/ui/svelte/vite.config.ts | 0 Translation/{docker => }/Dockerfile | 0 Translation/README.md | 4 +- .../intel/cpu}/xeon/README.md | 10 +- .../intel/cpu}/xeon/compose.yaml | 0 .../intel/hpu}/gaudi/README.md | 6 +- .../intel/hpu}/gaudi/compose.yaml | 0 .../build.yaml} | 3 +- Translation/kubernetes/helm-charts/README.md | 0 .../{README.md => intel/README_gmc.md} | 0 .../cpu/xeon/gmc}/translation_xeon.yaml | 0 .../hpu/gaudi/gmc}/translation_gaudi.yaml | 0 Translation/kubernetes/manifests/README.md | 0 Translation/kubernetes/service-mesh/README.md | 0 ...n_on_gaudi.sh => test_compose_on_gaudi.sh} | 14 +- ...ion_on_xeon.sh => test_compose_on_xeon.sh} | 14 +- Translation/tests/test_gmc_on_gaudi.sh | 4 +- Translation/tests/test_gmc_on_xeon.sh | 4 +- Translation/{docker => }/translation.py | 0 Translation/{docker => }/ui/docker/Dockerfile | 0 Translation/{docker => }/ui/svelte/.env | 0 Translation/{docker => }/ui/svelte/.gitignore | 0 Translation/{docker => }/ui/svelte/.npmrc | 0 Translation/{docker => }/ui/svelte/README.md | 0 .../{docker => }/ui/svelte/package.json | 0 .../ui/svelte/playwright.config.ts | 0 .../{docker => }/ui/svelte/postcss.config.cjs | 0 .../{docker => }/ui/svelte/src/app.d.ts | 0 .../{docker => }/ui/svelte/src/app.html | 0 .../{docker => }/ui/svelte/src/app.pcss | 0 .../src/lib/assets/loadingAnimation.svelte | 0 .../svelte/src/lib/assets/summaryLogo.svelte | 0 .../ui/svelte/src/lib/header.svelte | 0 .../ui/svelte/src/lib/shared/Network.ts | 0 .../ui/svelte/src/lib/shared/constant.ts | 0 .../ui/svelte/src/routes/+layout.svelte | 0 .../ui/svelte/src/routes/+page.svelte | 0 .../ui/svelte/src/routes/types.d.ts | 0 .../{docker => }/ui/svelte/static/favicon.png | Bin .../{docker => }/ui/svelte/svelte.config.js | 0 .../ui/svelte/tailwind.config.cjs | 0 .../ui/svelte/tests/Translation.spec.ts | 0 .../{docker => }/ui/svelte/tsconfig.json | 0 .../{docker => }/ui/svelte/vite.config.ts | 0 VisualQnA/{docker => }/Dockerfile | 0 VisualQnA/README.md | 18 +-- .../src/lib/assets/imageData/images.json | 16 +-- .../intel/cpu}/xeon/README.md | 10 +- .../intel/cpu}/xeon/compose.yaml | 0 .../intel/cpu}/xeon/set_env.sh | 0 .../intel/hpu}/gaudi/README.md | 6 +- .../intel/hpu}/gaudi/compose.yaml | 0 .../intel/hpu}/gaudi/set_env.sh | 0 .../build.yaml} | 7 +- .../kubernetes/{manifests => intel}/README.md | 0 .../{README.md => intel/README_gmc.md} | 0 .../cpu/xeon/gmc}/visualqna_xeon.yaml | 0 .../cpu/xeon/manifest}/visualqna.yaml | 0 .../hpu/gaudi/gmc}/visualqna_gaudi.yaml | 0 .../hpu/gaudi/manifest}/visualqna.yaml | 0 ...a_on_gaudi.sh => test_compose_on_gaudi.sh} | 15 +-- ...qna_on_xeon.sh => test_compose_on_xeon.sh} | 15 +-- VisualQnA/{docker => }/ui/docker/Dockerfile | 0 .../{docker => }/ui/svelte/.editorconfig | 0 VisualQnA/{docker => }/ui/svelte/.env | 0 .../{docker => }/ui/svelte/.eslintignore | 0 .../{docker => }/ui/svelte/.eslintrc.cjs | 0 .../{docker => }/ui/svelte/.prettierignore | 0 VisualQnA/{docker => }/ui/svelte/.prettierrc | 0 VisualQnA/{docker => }/ui/svelte/package.json | 0 .../ui/svelte/playwright.config.ts | 0 .../{docker => }/ui/svelte/postcss.config.cjs | 0 VisualQnA/{docker => }/ui/svelte/src/app.d.ts | 0 VisualQnA/{docker => }/ui/svelte/src/app.html | 0 .../{docker => }/ui/svelte/src/app.postcss | 0 .../lib/assets/avatar/svelte/Delete.svelte | 0 .../lib/assets/chat/svelte/Assistant.svelte | 0 .../assets/chat/svelte/PaperAirplane.svelte | 0 .../assets/chat/svelte/PersonOutlined.svelte | 0 .../src/lib/assets/header/intelLogo.svelte | 0 .../src/lib/assets/layout/css/driver.css | 0 .../svelte/src/lib/assets/upload/help.svelte | 0 .../svelte/src/lib/assets/upload/next.svelte | 0 .../src/lib/assets/upload/previous.svelte | 0 .../svelte/src/lib/assets/voice/svg/paste.svg | 0 .../src/lib/assets/voice/svg/uploadFile.svg | 0 .../src/lib/modules/chat/ChatMessage.svelte | 0 .../src/lib/modules/chat/MessageAvatar.svelte | 0 .../src/lib/modules/chat/MessageTimer.svelte | 0 .../src/lib/modules/frame/Layout.svelte | 0 .../src/lib/modules/upload/upload.svelte | 0 .../src/lib/modules/upload/uploadImg.svelte | 0 .../ui/svelte/src/lib/network/chat/Network.ts | 0 .../svelte/src/lib/network/upload/Network.ts | 0 .../ui/svelte/src/lib/shared/Utils.ts | 0 .../shared/components/header/header.svelte | 0 .../shared/components/loading/Loading.svelte | 0 .../components/scrollbar/Scrollbar.svelte | 0 .../src/lib/shared/constant/Interface.ts | 0 .../src/lib/shared/stores/common/Store.ts | 0 .../ui/svelte/src/routes/+layout.svelte | 0 .../ui/svelte/src/routes/+page.svelte | 0 .../ui/svelte/src/routes/+page.ts | 0 .../{docker => }/ui/svelte/static/favicon.png | Bin .../{docker => }/ui/svelte/svelte.config.js | 0 .../ui/svelte/tailwind.config.cjs | 0 .../{docker => }/ui/svelte/tsconfig.json | 0 .../{docker => }/ui/svelte/vite.config.ts | 0 VisualQnA/{docker => }/visualqna.py | 0 docker_images_list.md | 122 +++++++++--------- 878 files changed, 915 insertions(+), 1184 deletions(-) delete mode 100644 .github/workflows/_image-build.yml delete mode 100644 .github/workflows/chatqna_benchmark.yml delete mode 100644 .github/workflows/docker/compose/AudioQnA-compose.yaml delete mode 100644 .github/workflows/docker/compose/ChatQnA-compose.yaml delete mode 100644 .github/workflows/docker/compose/CodeGen-compose.yaml delete mode 100644 .github/workflows/docker/compose/CodeTrans-compose.yaml delete mode 100644 .github/workflows/docker/compose/DocSum-compose.yaml delete mode 100644 .github/workflows/docker/compose/FaqGen-compose.yaml delete mode 100644 .github/workflows/docker/compose/SearchQnA-compose.yaml delete mode 100644 .github/workflows/docker/compose/Translation-compose.yaml delete mode 100755 .github/workflows/scripts/build_push.sh create mode 100644 .github/workflows/scripts/get_test_matrix.sh rename AgentQnA/{docker/openai/docker-compose-agent-openai.yaml => docker_compose/intel/cpu/xeon/compose_openai.yaml} (100%) rename AgentQnA/{docker/openai => docker_compose/intel/cpu/xeon}/launch_agent_service_openai.sh (87%) rename ChatQnA/docker/ui/react/src/styles/components/_context.scss => AgentQnA/docker_image_build/.README (100%) rename AgentQnA/tests/{_test_agentqna_on_xeon.sh => _test_compose_openai_on_xeon.sh} (92%) rename AudioQnA/{docker => }/Dockerfile (100%) rename AudioQnA/{docker => }/audioqna.py (100%) rename AudioQnA/{docker => docker_compose/intel/cpu}/xeon/README.md (93%) rename AudioQnA/{docker => docker_compose/intel/cpu}/xeon/compose.yaml (100%) rename AudioQnA/{docker => docker_compose/intel/hpu}/gaudi/README.md (92%) rename AudioQnA/{docker => docker_compose/intel/hpu}/gaudi/compose.yaml (100%) rename AudioQnA/{docker/docker_build_compose.yaml => docker_image_build/build.yaml} (82%) rename AudioQnA/kubernetes/{manifests => intel}/README.md (100%) rename AudioQnA/kubernetes/{README.md => intel/README_gmc.md} (93%) rename AudioQnA/kubernetes/{ => intel/cpu/xeon/gmc}/audioQnA_xeon.yaml (100%) rename AudioQnA/kubernetes/{manifests/xeon => intel/cpu/xeon/manifest}/audioqna.yaml (100%) rename AudioQnA/kubernetes/{ => intel/hpu/gaudi/gmc}/audioQnA_gaudi.yaml (100%) rename AudioQnA/kubernetes/{manifests/gaudi => intel/hpu/gaudi/manifest}/audioqna.yaml (100%) rename AudioQnA/tests/{test_audioqna_on_gaudi.sh => test_compose_on_gaudi.sh} (91%) rename AudioQnA/tests/{test_audioqna_on_xeon.sh => test_compose_on_xeon.sh} (90%) rename AudioQnA/{docker => }/ui/docker/Dockerfile (100%) rename AudioQnA/{docker => }/ui/svelte/.editorconfig (100%) rename AudioQnA/{docker => }/ui/svelte/.env (100%) rename AudioQnA/{docker => }/ui/svelte/.eslintignore (100%) rename AudioQnA/{docker => }/ui/svelte/.eslintrc.cjs (100%) rename AudioQnA/{docker => }/ui/svelte/.prettierignore (100%) rename AudioQnA/{docker => }/ui/svelte/.prettierrc (100%) rename AudioQnA/{docker => }/ui/svelte/README.md (82%) rename AudioQnA/{docker => }/ui/svelte/package.json (100%) rename AudioQnA/{docker => }/ui/svelte/postcss.config.cjs (100%) rename AudioQnA/{docker => }/ui/svelte/src/app.d.ts (100%) rename AudioQnA/{docker => }/ui/svelte/src/app.html (100%) rename AudioQnA/{docker => }/ui/svelte/src/app.postcss (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/png/audio1.png (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/png/audio2.png (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svelte/arrow-path-icon.svelte (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svelte/assistant.svelte (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svelte/chat-bubble-left-icon.svelte (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svelte/chat.svelte (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svelte/check-icon.svelte (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svelte/intel.svelte (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svelte/loading-button-spinner-icon.svelte (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svelte/message-avatar.svelte (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svelte/plus-icon.svelte (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svelte/portrait.svelte (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svelte/voice-button.svelte (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svelte/x-mark-icon.svelte (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svg/1.svg (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svg/2.svg (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svg/3.svg (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svg/4.svg (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svg/5.svg (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svg/Voice-Wave-Dark.svg (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svg/stop-recording.svg (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svg/upload.svg (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svg/voice.svg (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svg/voiceOff.svg (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/assets/icons/svg/voiceOn.svg (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/common/sse.d.ts (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/common/timediff.ts (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/components/layout.svelte (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/components/shared/shared-utils.ts (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/components/shared/shared.store.ts (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/components/shared/shared.type.ts (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/components/talkbot/store.ts (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/components/talkbot/voice-button.svelte (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/components/talkbot/voice-wave.svelte (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/components/topnavigation/Index.svelte (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/modules/chat/chat-audio.svelte (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/modules/chat/chat-message.svelte (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/modules/chat/message-timer.svelte (100%) rename AudioQnA/{docker => }/ui/svelte/src/lib/modules/chat/network.ts (100%) rename AudioQnA/{docker => }/ui/svelte/src/routes/+layout.svelte (100%) rename AudioQnA/{docker => }/ui/svelte/src/routes/+page.svelte (100%) rename AudioQnA/{docker => }/ui/svelte/static/favicon.png (100%) rename AudioQnA/{docker => }/ui/svelte/svelte.config.js (100%) rename AudioQnA/{docker => }/ui/svelte/tailwind.config.cjs (100%) rename AudioQnA/{docker => }/ui/svelte/tsconfig.json (100%) rename AudioQnA/{docker => }/ui/svelte/vite.config.ts (100%) rename ChatQnA/{docker => }/Dockerfile (100%) rename ChatQnA/{docker/Dockerfile_guardrails => Dockerfile.guardrails} (100%) rename ChatQnA/{docker/Dockerfile_no_wrapper => Dockerfile.no_wrapper} (100%) rename ChatQnA/{docker/Dockerfile_without_rerank => Dockerfile.without_rerank} (100%) rename ChatQnA/{docker => }/chatqna.py (100%) rename ChatQnA/{docker => }/chatqna_guardrails.py (100%) rename ChatQnA/{docker => }/chatqna_no_wrapper.py (100%) rename ChatQnA/{docker => }/chatqna_without_rerank.py (100%) rename ChatQnA/{docker => docker_compose/intel/cpu}/aipc/README.md (96%) rename ChatQnA/{docker => docker_compose/intel/cpu}/aipc/compose.yaml (100%) rename ChatQnA/{docker => docker_compose/intel/cpu}/xeon/README.md (96%) rename ChatQnA/{docker => docker_compose/intel/cpu}/xeon/README_qdrant.md (96%) rename ChatQnA/{docker => docker_compose/intel/cpu}/xeon/compose.yaml (100%) rename ChatQnA/{docker => docker_compose/intel/cpu}/xeon/compose_no_wrapper.yaml (100%) rename ChatQnA/{docker => docker_compose/intel/cpu}/xeon/compose_qdrant.yaml (100%) rename ChatQnA/{docker => docker_compose/intel/cpu}/xeon/compose_vllm.yaml (100%) rename ChatQnA/{docker => docker_compose/intel/cpu}/xeon/compose_without_rerank.yaml (100%) rename ChatQnA/{docker => docker_compose/intel/cpu}/xeon/set_env.sh (100%) rename ChatQnA/{docker => docker_compose/intel/hpu}/gaudi/README.md (95%) rename ChatQnA/{docker => docker_compose/intel/hpu}/gaudi/compose.yaml (100%) rename ChatQnA/{docker => docker_compose/intel/hpu}/gaudi/compose_guardrails.yaml (100%) rename ChatQnA/{docker => docker_compose/intel/hpu}/gaudi/compose_no_wrapper.yaml (100%) rename ChatQnA/{docker => docker_compose/intel/hpu}/gaudi/compose_vllm.yaml (100%) rename ChatQnA/{docker => docker_compose/intel/hpu}/gaudi/compose_vllm_ray.yaml (100%) rename ChatQnA/{docker => docker_compose/intel/hpu}/gaudi/compose_without_rerank.yaml (100%) rename ChatQnA/{docker => docker_compose/intel/hpu}/gaudi/how_to_validate_service.md (97%) rename ChatQnA/{docker => docker_compose/intel/hpu}/gaudi/set_env.sh (100%) rename ChatQnA/{docker => docker_compose/nvidia}/gpu/README.md (97%) rename ChatQnA/{docker => docker_compose/nvidia}/gpu/compose.yaml (100%) rename ChatQnA/{docker => docker_compose/nvidia}/gpu/set_env.sh (100%) rename ChatQnA/{docker/docker_build_compose.yaml => docker_image_build/build.yaml} (74%) rename ChatQnA/kubernetes/{manifests => intel}/README.md (100%) rename ChatQnA/kubernetes/{README.md => intel/README_gmc.md} (94%) rename ChatQnA/kubernetes/{ => intel/cpu/xeon/gmc}/chatQnA_dataprep_xeon.yaml (100%) rename ChatQnA/kubernetes/{ => intel/cpu/xeon/gmc}/chatQnA_switch_xeon.yaml (100%) rename ChatQnA/kubernetes/{ => intel/cpu/xeon/gmc}/chatQnA_xeon.yaml (100%) rename ChatQnA/kubernetes/{manifests/xeon => intel/cpu/xeon/manifest}/chatqna-guardrails.yaml (100%) rename ChatQnA/kubernetes/{manifests/xeon => intel/cpu/xeon/manifest}/chatqna.yaml (100%) rename ChatQnA/kubernetes/{ => intel/hpu/gaudi/gmc}/chatQnA_dataprep_gaudi.yaml (100%) rename ChatQnA/kubernetes/{ => intel/hpu/gaudi/gmc}/chatQnA_gaudi.yaml (100%) rename ChatQnA/kubernetes/{ => intel/hpu/gaudi/gmc}/chatQnA_switch_gaudi.yaml (100%) rename ChatQnA/kubernetes/{manifests/gaudi => intel/hpu/gaudi/manifest}/chatqna-guardrails.yaml (100%) rename ChatQnA/kubernetes/{manifests/gaudi => intel/hpu/gaudi/manifest}/chatqna.yaml (100%) rename ChatQnA/tests/{test_chatqna_guardrails_on_gaudi.sh => test_compose_guardrails_on_gaudi.sh} (94%) rename ChatQnA/tests/{test_chatqna_no_wrapper_on_gaudi.sh => test_compose_no_wrapper_on_gaudi.sh} (94%) rename ChatQnA/tests/{test_chatqna_no_wrapper_on_xeon.sh => test_compose_no_wrapper_on_xeon.sh} (95%) rename ChatQnA/tests/{test_chatqna_on_gaudi.sh => test_compose_on_gaudi.sh} (93%) rename ChatQnA/tests/{test_chatqna_on_xeon.sh => test_compose_on_xeon.sh} (95%) rename ChatQnA/tests/{test_chatqna_qdrant_on_xeon.sh => test_compose_qdrant_on_xeon.sh} (94%) rename ChatQnA/tests/{test_chatqna_vllm_on_gaudi.sh => test_compose_vllm_on_gaudi.sh} (93%) rename ChatQnA/tests/{test_chatqna_vllm_on_xeon.sh => test_compose_vllm_on_xeon.sh} (93%) rename ChatQnA/tests/{test_chatqna_vllm_ray_on_gaudi.sh => test_compose_vllm_ray_on_gaudi.sh} (93%) rename ChatQnA/tests/{test_chatqna_without_rerank_on_gaudi.sh => test_compose_without_rerank_on_gaudi.sh} (94%) rename ChatQnA/tests/{test_chatqna_without_rerank_on_xeon.sh => test_compose_without_rerank_on_xeon.sh} (95%) rename ChatQnA/{docker => }/ui/docker/Dockerfile (100%) rename {ProductivitySuite/docker => ChatQnA}/ui/docker/Dockerfile.react (94%) rename ChatQnA/{docker => }/ui/react/.env (100%) rename ChatQnA/{docker => }/ui/react/.env.production (100%) rename ChatQnA/{docker => }/ui/react/.eslintrc.cjs (100%) rename ChatQnA/{docker => }/ui/react/.gitignore (100%) rename ChatQnA/{docker => }/ui/react/README.md (86%) rename ChatQnA/{docker => }/ui/react/env.sh (100%) rename ChatQnA/{docker => }/ui/react/index.html (100%) rename ChatQnA/{docker => }/ui/react/nginx.conf (100%) rename ChatQnA/{docker => }/ui/react/package.json (100%) rename ChatQnA/{docker => }/ui/react/postcss.config.cjs (100%) rename ChatQnA/{docker => }/ui/react/public/vite.svg (100%) rename ChatQnA/{docker => }/ui/react/src/App.scss (100%) rename ChatQnA/{docker => }/ui/react/src/App.tsx (100%) rename ChatQnA/{docker => }/ui/react/src/__tests__/util.test.ts (100%) rename ChatQnA/{docker => }/ui/react/src/assets/opea-icon-black.svg (100%) rename ChatQnA/{docker => }/ui/react/src/assets/opea-icon-color.svg (100%) rename ChatQnA/{docker => }/ui/react/src/assets/react.svg (100%) rename ChatQnA/{docker => }/ui/react/src/common/client.ts (100%) rename ChatQnA/{docker => }/ui/react/src/common/util.ts (100%) rename ChatQnA/{docker => }/ui/react/src/components/Conversation/Conversation.tsx (100%) rename ChatQnA/{docker => }/ui/react/src/components/Conversation/ConversationSideBar.tsx (100%) rename ChatQnA/{docker => }/ui/react/src/components/Conversation/DataSource.tsx (100%) rename ChatQnA/{docker => }/ui/react/src/components/Conversation/conversation.module.scss (100%) rename ChatQnA/{docker => }/ui/react/src/components/Message/conversationMessage.module.scss (100%) rename ChatQnA/{docker => }/ui/react/src/components/Message/conversationMessage.tsx (100%) rename ChatQnA/{docker => }/ui/react/src/components/UserInfoModal/UserInfoModal.tsx (100%) rename ChatQnA/{docker => }/ui/react/src/components/sidebar/sidebar.module.scss (100%) rename ChatQnA/{docker => }/ui/react/src/components/sidebar/sidebar.tsx (100%) rename ChatQnA/{docker => }/ui/react/src/config.ts (100%) rename ChatQnA/{docker => }/ui/react/src/index.scss (100%) rename ChatQnA/{docker => }/ui/react/src/main.tsx (100%) rename ChatQnA/{docker => }/ui/react/src/redux/Conversation/Conversation.ts (100%) rename ChatQnA/{docker => }/ui/react/src/redux/Conversation/ConversationSlice.ts (100%) rename ChatQnA/{docker => }/ui/react/src/redux/User/user.d.ts (100%) rename ChatQnA/{docker => }/ui/react/src/redux/User/userSlice.ts (100%) rename ChatQnA/{docker => }/ui/react/src/redux/store.ts (100%) rename ChatQnA/{docker => }/ui/react/src/redux/thunkUtil.ts (100%) rename {CodeGen/docker => ChatQnA}/ui/react/src/styles/components/_context.scss (100%) rename ChatQnA/{docker => }/ui/react/src/styles/components/_sidebar.scss (100%) rename ChatQnA/{docker => }/ui/react/src/styles/components/content.scss (100%) rename ChatQnA/{docker => }/ui/react/src/styles/components/context.module.scss (100%) rename ChatQnA/{docker => }/ui/react/src/styles/layout/_basics.scss (100%) rename ChatQnA/{docker => }/ui/react/src/styles/layout/_flex.scss (100%) rename ChatQnA/{docker => }/ui/react/src/styles/styles.scss (100%) rename ChatQnA/{docker => }/ui/react/src/vite-env.d.ts (100%) rename ChatQnA/{docker => }/ui/react/tsconfig.json (100%) rename ChatQnA/{docker => }/ui/react/tsconfig.node.json (100%) rename ChatQnA/{docker => }/ui/react/vite.config.ts (100%) rename ChatQnA/{docker => }/ui/svelte/.editorconfig (100%) rename ChatQnA/{docker => }/ui/svelte/.env (100%) rename ChatQnA/{docker => }/ui/svelte/.eslintignore (100%) rename ChatQnA/{docker => }/ui/svelte/.eslintrc.cjs (100%) rename ChatQnA/{docker => }/ui/svelte/.prettierignore (100%) rename ChatQnA/{docker => }/ui/svelte/.prettierrc (100%) rename ChatQnA/{docker => }/ui/svelte/README.md (86%) rename ChatQnA/{docker => }/ui/svelte/package.json (100%) rename ChatQnA/{docker => }/ui/svelte/playwright.config.ts (100%) rename ChatQnA/{docker => }/ui/svelte/postcss.config.cjs (100%) rename ChatQnA/{docker => }/ui/svelte/src/app.d.ts (100%) rename ChatQnA/{docker => }/ui/svelte/src/app.html (100%) rename ChatQnA/{docker => }/ui/svelte/src/app.postcss (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/assets/DocManagement/LinkfolderIcon.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/assets/DocManagement/fileIcon.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/assets/DocManagement/folderIcon.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/assets/avatar/svelte/Delete.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/assets/chat/svelte/Assistant.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/assets/chat/svelte/PersonOutlined.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/assets/layout/css/driver.css (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/assets/upload/deleteIcon.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/assets/upload/loading-button.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/assets/upload/next.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/assets/upload/no-file.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/assets/upload/previous.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/assets/voice/svg/paste.svg (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/assets/voice/svg/uploadFile.svg (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/modules/chat/ChatMessage.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/modules/chat/MessageAvatar.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/modules/chat/MessageTimer.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/modules/frame/Layout.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/network/chat/Network.ts (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/network/upload/Network.ts (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/shared/Utils.ts (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/shared/components/chat/gallery.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/shared/components/doc_management/docCard.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/shared/components/doc_management/treeView/svelte-tree.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/shared/components/doc_management/treeView/tree-branch.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/shared/components/doc_management/treeView/tree-node.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/shared/components/loading/Loading.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/shared/components/upload/PasteKnowledge.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/shared/components/upload/upload-knowledge.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/shared/components/upload/uploadFile.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/shared/constant/Interface.ts (100%) rename ChatQnA/{docker => }/ui/svelte/src/lib/shared/stores/common/Store.ts (100%) rename ChatQnA/{docker => }/ui/svelte/src/routes/+layout.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/routes/+page.svelte (100%) rename ChatQnA/{docker => }/ui/svelte/src/routes/+page.ts (100%) rename ChatQnA/{docker => }/ui/svelte/static/favicon.png (100%) rename ChatQnA/{docker => }/ui/svelte/svelte.config.js (100%) rename ChatQnA/{docker => }/ui/svelte/tailwind.config.cjs (100%) rename ChatQnA/{docker => }/ui/svelte/tests/chatQnA.spec.ts (100%) rename ChatQnA/{docker => }/ui/svelte/tests/test_file.txt (100%) rename ChatQnA/{docker => }/ui/svelte/tsconfig.json (100%) rename ChatQnA/{docker => }/ui/svelte/vite.config.ts (100%) rename CodeGen/{docker => }/Dockerfile (100%) rename CodeGen/{docker => }/codegen.py (100%) rename CodeGen/{docker => docker_compose/intel/cpu}/xeon/README.md (89%) rename CodeGen/{docker => docker_compose/intel/cpu}/xeon/compose.yaml (100%) rename CodeGen/{docker => docker_compose/intel/hpu}/gaudi/README.md (89%) rename CodeGen/{docker => docker_compose/intel/hpu}/gaudi/compose.yaml (100%) rename CodeGen/{docker/docker_build_compose.yaml => docker_image_build/build.yaml} (92%) rename CodeGen/kubernetes/{manifests => intel}/README.md (100%) rename CodeGen/kubernetes/{README.md => intel/README_gmc.md} (100%) rename CodeGen/kubernetes/{ => intel/cpu/xeon/gmc}/codegen_xeon.yaml (100%) rename CodeGen/kubernetes/{manifests/xeon/ui/README.md => intel/cpu/xeon/manifest/README_react_ui.md} (100%) rename CodeGen/kubernetes/{manifests/xeon => intel/cpu/xeon/manifest}/codegen.yaml (100%) rename CodeGen/kubernetes/{manifests/xeon/ui/react-codegen.yaml => intel/cpu/xeon/manifest/codegen_react_ui.yaml} (100%) rename CodeGen/kubernetes/{ => intel/hpu/gaudi/gmc}/codegen_gaudi.yaml (100%) rename CodeGen/kubernetes/{manifests/gaudi => intel/hpu/gaudi/manifest}/codegen.yaml (100%) rename CodeGen/{docker => }/set_env.sh (100%) rename CodeGen/tests/{test_codegen_on_gaudi.sh => test_compose_on_gaudi.sh} (90%) rename CodeGen/tests/{test_codegen_on_xeon.sh => test_compose_on_xeon.sh} (90%) rename CodeGen/{docker => }/ui/docker/Dockerfile (100%) rename CodeGen/{docker => }/ui/docker/Dockerfile.react (100%) rename CodeGen/{docker => }/ui/react/.env (100%) rename CodeGen/{docker => }/ui/react/.eslintrc.cjs (100%) rename CodeGen/{docker => }/ui/react/.gitignore (100%) rename CodeGen/{docker => }/ui/react/README.md (88%) rename CodeGen/{docker => }/ui/react/index.html (100%) rename CodeGen/{docker => }/ui/react/nginx.conf (100%) rename CodeGen/{docker => }/ui/react/package.json (100%) rename CodeGen/{docker => }/ui/react/postcss.config.cjs (100%) rename CodeGen/{docker => }/ui/react/src/App.scss (100%) rename CodeGen/{docker => }/ui/react/src/App.tsx (100%) rename CodeGen/{docker => }/ui/react/src/__tests__/util.test.ts (100%) rename CodeGen/{docker => }/ui/react/src/assets/opea-icon-black.svg (100%) rename CodeGen/{docker => }/ui/react/src/assets/opea-icon-color.svg (100%) rename CodeGen/{docker => }/ui/react/src/common/client.ts (100%) rename CodeGen/{docker => }/ui/react/src/common/util.ts (100%) rename CodeGen/{docker => }/ui/react/src/components/CodeGen/CodeGen.tsx (100%) rename CodeGen/{docker => }/ui/react/src/components/CodeGen/codeGen.module.scss (100%) rename CodeGen/{docker => }/ui/react/src/components/Message/conversationMessage.module.scss (100%) rename CodeGen/{docker => }/ui/react/src/components/Message/conversationMessage.tsx (100%) rename CodeGen/{docker => }/ui/react/src/components/Shared/CodeRender/CodeRender.tsx (100%) rename CodeGen/{docker => }/ui/react/src/components/Shared/CodeRender/codeRender.module.scss (100%) rename CodeGen/{docker => }/ui/react/src/components/Shared/Markdown/Markdown.tsx (100%) rename CodeGen/{docker => }/ui/react/src/components/Shared/Markdown/markdown.module.scss (100%) rename CodeGen/{docker => }/ui/react/src/components/sidebar/sidebar.module.scss (100%) rename CodeGen/{docker => }/ui/react/src/components/sidebar/sidebar.tsx (100%) rename CodeGen/{docker => }/ui/react/src/config.ts (100%) rename CodeGen/{docker => }/ui/react/src/index.scss (100%) rename CodeGen/{docker => }/ui/react/src/main.tsx (100%) rename {FaqGen/docker => CodeGen}/ui/react/src/styles/components/_context.scss (100%) rename CodeGen/{docker => }/ui/react/src/styles/components/_sidebar.scss (100%) rename CodeGen/{docker => }/ui/react/src/styles/components/content.scss (100%) rename CodeGen/{docker => }/ui/react/src/styles/components/context.module.scss (100%) rename CodeGen/{docker => }/ui/react/src/styles/layout/_basics.scss (100%) rename CodeGen/{docker => }/ui/react/src/styles/layout/_flex.scss (100%) rename CodeGen/{docker => }/ui/react/src/styles/styles.scss (100%) rename CodeGen/{docker => }/ui/react/src/vite-env.d.ts (100%) rename CodeGen/{docker => }/ui/react/tsconfig.json (100%) rename CodeGen/{docker => }/ui/react/tsconfig.node.json (100%) rename CodeGen/{docker => }/ui/react/vite.config.ts (100%) rename CodeGen/{docker => }/ui/svelte/.editorconfig (100%) rename CodeGen/{docker => }/ui/svelte/.env (100%) rename CodeGen/{docker => }/ui/svelte/.eslintignore (100%) rename CodeGen/{docker => }/ui/svelte/.eslintrc.cjs (100%) rename CodeGen/{docker => }/ui/svelte/.npmrc (100%) rename CodeGen/{docker => }/ui/svelte/.prettierignore (100%) rename CodeGen/{docker => }/ui/svelte/.prettierrc (100%) rename CodeGen/{docker => }/ui/svelte/README.md (87%) rename CodeGen/{docker => }/ui/svelte/package.json (100%) rename CodeGen/{docker => }/ui/svelte/playwright.config.ts (100%) rename CodeGen/{docker => }/ui/svelte/postcss.config.cjs (100%) rename CodeGen/{docker => }/ui/svelte/src/app.d.ts (100%) rename CodeGen/{docker => }/ui/svelte/src/app.html (100%) rename CodeGen/{docker => }/ui/svelte/src/app.pcss (100%) rename CodeGen/{docker => }/ui/svelte/src/app.postcss (100%) rename CodeGen/{docker => }/ui/svelte/src/lib/InputAirPlane.svelte (100%) rename CodeGen/{docker => }/ui/svelte/src/lib/assets/PaperAirplane.svelte (100%) rename CodeGen/{docker => }/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte (100%) rename CodeGen/{docker => }/ui/svelte/src/lib/assets/imgLogo.svelte (100%) rename CodeGen/{docker => }/ui/svelte/src/lib/assets/layout/css/driver.css (100%) rename CodeGen/{docker => }/ui/svelte/src/lib/assets/loadingAnimation.svelte (100%) rename CodeGen/{docker => }/ui/svelte/src/lib/assets/spinLoading.svelte (100%) rename CodeGen/{docker => }/ui/svelte/src/lib/assets/summaryLogo.svelte (100%) rename CodeGen/{docker => }/ui/svelte/src/lib/doc.svelte (100%) rename CodeGen/{docker => }/ui/svelte/src/lib/dropFile.svelte (100%) rename CodeGen/{docker => }/ui/svelte/src/lib/header.svelte (100%) rename CodeGen/{docker => }/ui/svelte/src/lib/index.ts (100%) rename CodeGen/{docker => }/ui/svelte/src/lib/modules/chat/Output.svelte (100%) rename CodeGen/{docker => }/ui/svelte/src/lib/modules/frame/header.svelte (100%) rename CodeGen/{docker => }/ui/svelte/src/lib/network/chat/Network.ts (100%) rename CodeGen/{docker => }/ui/svelte/src/lib/shared/Network.ts (100%) rename CodeGen/{docker => }/ui/svelte/src/lib/shared/Store.ts (100%) rename CodeGen/{docker => }/ui/svelte/src/lib/shared/Utils.ts (100%) rename CodeGen/{docker => }/ui/svelte/src/lib/shared/components/loading/Loading.svelte (100%) rename CodeGen/{docker => }/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte (100%) rename CodeGen/{docker => }/ui/svelte/src/lib/summary.svelte (100%) rename CodeGen/{docker => }/ui/svelte/src/routes/+layout.svelte (100%) rename CodeGen/{docker => }/ui/svelte/src/routes/+page.svelte (100%) rename CodeGen/{docker => }/ui/svelte/src/routes/+page.ts (100%) rename CodeGen/{docker => }/ui/svelte/static/favicon.png (100%) rename CodeGen/{docker => }/ui/svelte/svelte.config.js (100%) rename CodeGen/{docker => }/ui/svelte/tailwind.config.cjs (100%) rename CodeGen/{docker => }/ui/svelte/tests/codeGen.spec.ts (100%) rename CodeGen/{docker => }/ui/svelte/tsconfig.json (100%) rename CodeGen/{docker => }/ui/svelte/vite.config.ts (100%) rename CodeTrans/{docker => }/Dockerfile (100%) rename CodeTrans/{docker => }/code_translation.py (100%) rename CodeTrans/{docker => docker_compose/intel/cpu}/xeon/README.md (96%) rename CodeTrans/{docker => docker_compose/intel/cpu}/xeon/compose.yaml (100%) rename CodeTrans/{docker => docker_compose/intel/hpu}/gaudi/README.md (94%) rename CodeTrans/{docker => docker_compose/intel/hpu}/gaudi/compose.yaml (100%) rename CodeTrans/{docker/docker_build_compose.yaml => docker_image_build/build.yaml} (90%) rename CodeTrans/kubernetes/{manifests => intel}/README.md (100%) rename CodeTrans/kubernetes/{README.md => intel/README_gmc.md} (100%) rename CodeTrans/kubernetes/{ => intel/cpu/xeon/gmc}/codetrans_xeon.yaml (100%) rename CodeTrans/kubernetes/{manifests/xeon => intel/cpu/xeon/manifest}/codetrans.yaml (100%) rename CodeTrans/kubernetes/{ => intel/hpu/gaudi/gmc}/codetrans_gaudi.yaml (100%) rename CodeTrans/kubernetes/{manifests/gaudi => intel/hpu/gaudi/manifest}/codetrans.yaml (100%) rename CodeTrans/{docker => }/set_env.sh (100%) rename CodeTrans/tests/{test_codetrans_on_gaudi.sh => test_compose_on_gaudi.sh} (92%) rename CodeTrans/tests/{test_codetrans_on_xeon.sh => test_compose_on_xeon.sh} (92%) rename CodeTrans/{docker => }/ui/docker/Dockerfile (100%) rename CodeTrans/{docker => }/ui/svelte/.env (100%) rename CodeTrans/{docker => }/ui/svelte/.gitignore (100%) rename CodeTrans/{docker => }/ui/svelte/.npmrc (100%) rename CodeTrans/{docker => }/ui/svelte/README.md (76%) rename CodeTrans/{docker => }/ui/svelte/package.json (100%) rename CodeTrans/{docker => }/ui/svelte/playwright.config.ts (100%) rename CodeTrans/{docker => }/ui/svelte/postcss.config.cjs (100%) rename CodeTrans/{docker => }/ui/svelte/src/app.d.ts (100%) rename CodeTrans/{docker => }/ui/svelte/src/app.html (100%) rename CodeTrans/{docker => }/ui/svelte/src/app.pcss (100%) rename CodeTrans/{docker => }/ui/svelte/src/lib/assets/loadingAnimation.svelte (100%) rename CodeTrans/{docker => }/ui/svelte/src/lib/assets/translateIcon.svelte (100%) rename CodeTrans/{docker => }/ui/svelte/src/lib/header.svelte (100%) rename CodeTrans/{docker => }/ui/svelte/src/lib/shared/Network.ts (100%) rename CodeTrans/{docker => }/ui/svelte/src/lib/shared/constant.ts (100%) rename CodeTrans/{docker => }/ui/svelte/src/routes/+layout.svelte (100%) rename CodeTrans/{docker => }/ui/svelte/src/routes/+page.svelte (100%) rename CodeTrans/{docker => }/ui/svelte/src/routes/types.d.ts (100%) rename CodeTrans/{docker => }/ui/svelte/static/favicon.png (100%) rename CodeTrans/{docker => }/ui/svelte/svelte.config.js (100%) rename CodeTrans/{docker => }/ui/svelte/tailwind.config.cjs (100%) rename CodeTrans/{docker => }/ui/svelte/tests/codeTrans.spec.ts (100%) rename CodeTrans/{docker => }/ui/svelte/tsconfig.json (100%) rename CodeTrans/{docker => }/ui/svelte/vite.config.ts (100%) rename DocIndexRetriever/{docker => }/Dockerfile (88%) rename DocIndexRetriever/{docker => docker_compose/intel}/README.md (89%) rename DocIndexRetriever/{docker/xeon/docker_compose.yaml => docker_compose/intel/cpu/xeon/compose.yaml} (100%) rename DocIndexRetriever/{docker/gaudi/docker_compose.yaml => docker_compose/intel/hpu/gaudi/compose.yaml} (100%) rename DocIndexRetriever/{docker/docker_build_compose.yaml => docker_image_build/build.yaml} (78%) rename DocIndexRetriever/{docker => }/retrieval_tool.py (100%) rename DocIndexRetriever/tests/{test_docindexretriever_on_gaudi.sh => test_compose_on_gaudi.sh} (90%) rename DocSum/{docker => }/Dockerfile (100%) rename DocSum/{docker => docker_compose/intel/cpu}/xeon/README.md (94%) rename DocSum/{docker => docker_compose/intel/cpu}/xeon/compose.yaml (100%) rename DocSum/{docker => docker_compose/intel/hpu}/gaudi/README.md (96%) rename DocSum/{docker => docker_compose/intel/hpu}/gaudi/compose.yaml (100%) rename DocSum/{docker/docker_build_compose.yaml => docker_image_build/build.yaml} (84%) rename DocSum/{docker => }/docsum.py (100%) rename DocSum/kubernetes/{manifests => intel}/README.md (100%) rename DocSum/kubernetes/{README.md => intel/README_gmc.md} (96%) rename DocSum/kubernetes/{ => intel/cpu/xeon/gmc}/docsum_xeon.yaml (100%) rename DocSum/kubernetes/{manifests/xeon => intel/cpu/xeon/manifest}/docsum.yaml (100%) rename DocSum/kubernetes/{manifests/xeon => intel/cpu/xeon/manifest}/ui/README.md (100%) rename DocSum/kubernetes/{manifests/xeon => intel/cpu/xeon/manifest}/ui/react-docsum.yaml (100%) rename DocSum/kubernetes/{ => intel/hpu/gaudi/gmc}/docsum_gaudi.yaml (100%) rename DocSum/kubernetes/{manifests/gaudi => intel/hpu/gaudi/manifest}/docsum.yaml (100%) rename DocSum/{docker => }/set_env.sh (100%) rename DocSum/tests/{test_docsum_on_gaudi.sh => test_compose_on_gaudi.sh} (91%) rename DocSum/tests/{test_docsum_on_xeon.sh => test_compose_on_xeon.sh} (91%) rename DocSum/{docker => }/ui/docker/Dockerfile (100%) rename DocSum/{docker => }/ui/docker/Dockerfile.react (100%) rename DocSum/{docker => }/ui/react/.env (100%) rename DocSum/{docker => }/ui/react/.eslintrc.cjs (100%) rename DocSum/{docker => }/ui/react/.gitignore (100%) rename DocSum/{docker => }/ui/react/README.md (81%) rename DocSum/{docker => }/ui/react/index.html (100%) rename DocSum/{docker => }/ui/react/nginx.conf (100%) rename DocSum/{docker => }/ui/react/package.json (100%) rename DocSum/{docker => }/ui/react/postcss.config.cjs (100%) rename DocSum/{docker => }/ui/react/src/App.scss (100%) rename DocSum/{docker => }/ui/react/src/App.tsx (100%) rename DocSum/{docker => }/ui/react/src/__tests__/util.test.ts (100%) rename DocSum/{docker => }/ui/react/src/assets/opea-icon-black.svg (100%) rename DocSum/{docker => }/ui/react/src/assets/opea-icon-color.svg (100%) rename DocSum/{docker => }/ui/react/src/common/client.ts (100%) rename DocSum/{docker => }/ui/react/src/common/util.ts (100%) rename DocSum/{docker => }/ui/react/src/components/DocSum/DocSum.tsx (100%) rename DocSum/{docker => }/ui/react/src/components/DocSum/FileUpload.tsx (100%) rename DocSum/{docker => }/ui/react/src/components/DocSum/docSum.module.scss (100%) rename DocSum/{docker => }/ui/react/src/components/Shared/CodeRender/CodeRender.tsx (100%) rename DocSum/{docker => }/ui/react/src/components/Shared/CodeRender/codeRender.module.scss (100%) rename DocSum/{docker => }/ui/react/src/components/Shared/Markdown/Markdown.tsx (100%) rename DocSum/{docker => }/ui/react/src/components/Shared/Markdown/markdown.module.scss (100%) rename DocSum/{docker => }/ui/react/src/components/sidebar/sidebar.module.scss (100%) rename DocSum/{docker => }/ui/react/src/components/sidebar/sidebar.tsx (100%) rename DocSum/{docker => }/ui/react/src/config.ts (100%) rename DocSum/{docker => }/ui/react/src/index.scss (100%) rename DocSum/{docker => }/ui/react/src/main.tsx (100%) rename DocSum/{docker => }/ui/react/src/styles/components/_sidebar.scss (100%) rename DocSum/{docker => }/ui/react/src/styles/components/content.scss (100%) rename DocSum/{docker => }/ui/react/src/styles/components/context.module.scss (100%) rename DocSum/{docker => }/ui/react/src/styles/layout/_basics.scss (100%) rename DocSum/{docker => }/ui/react/src/styles/layout/_flex.scss (100%) rename DocSum/{docker => }/ui/react/src/styles/styles.scss (100%) rename DocSum/{docker => }/ui/react/src/vite-env.d.ts (100%) rename DocSum/{docker => }/ui/react/tsconfig.json (100%) rename DocSum/{docker => }/ui/react/tsconfig.node.json (100%) rename DocSum/{docker => }/ui/react/vite.config.ts (100%) rename DocSum/{docker => }/ui/svelte/.env (100%) rename DocSum/{docker => }/ui/svelte/.gitignore (100%) rename DocSum/{docker => }/ui/svelte/.npmrc (100%) rename DocSum/{docker => }/ui/svelte/README.md (77%) rename DocSum/{docker => }/ui/svelte/package.json (100%) rename DocSum/{docker => }/ui/svelte/playwright.config.ts (100%) rename DocSum/{docker => }/ui/svelte/postcss.config.cjs (100%) rename DocSum/{docker => }/ui/svelte/src/app.d.ts (100%) rename DocSum/{docker => }/ui/svelte/src/app.html (100%) rename DocSum/{docker => }/ui/svelte/src/app.pcss (100%) rename DocSum/{docker => }/ui/svelte/src/lib/assets/imgLogo.svelte (100%) rename DocSum/{docker => }/ui/svelte/src/lib/assets/intelLogo.svelte (100%) rename DocSum/{docker => }/ui/svelte/src/lib/assets/loadingAnimation.svelte (100%) rename DocSum/{docker => }/ui/svelte/src/lib/assets/spinLoading.svelte (100%) rename DocSum/{docker => }/ui/svelte/src/lib/assets/summaryLogo.svelte (100%) rename DocSum/{docker => }/ui/svelte/src/lib/doc.svelte (100%) rename DocSum/{docker => }/ui/svelte/src/lib/dropFile.svelte (100%) rename DocSum/{docker => }/ui/svelte/src/lib/header.svelte (100%) rename DocSum/{docker => }/ui/svelte/src/lib/index.ts (100%) rename DocSum/{docker => }/ui/svelte/src/lib/shared/Network.ts (100%) rename DocSum/{docker => }/ui/svelte/src/lib/shared/Store.ts (100%) rename DocSum/{docker => }/ui/svelte/src/lib/shared/Utils.ts (100%) rename DocSum/{docker => }/ui/svelte/src/lib/summary.svelte (100%) rename DocSum/{docker => }/ui/svelte/src/routes/+layout.svelte (100%) rename DocSum/{docker => }/ui/svelte/src/routes/+page.svelte (100%) rename DocSum/{docker => }/ui/svelte/static/favicon.png (100%) rename DocSum/{docker => }/ui/svelte/svelte.config.js (100%) rename DocSum/{docker => }/ui/svelte/tailwind.config.cjs (100%) rename DocSum/{docker => }/ui/svelte/tests/docSum.spec.ts (100%) rename DocSum/{docker => }/ui/svelte/tsconfig.json (100%) rename DocSum/{docker => }/ui/svelte/vite.config.ts (100%) rename FaqGen/{docker => }/Dockerfile (100%) rename FaqGen/{docker => docker_compose/intel/cpu}/xeon/README.md (91%) rename FaqGen/{docker => docker_compose/intel/cpu}/xeon/compose.yaml (100%) rename FaqGen/{docker => docker_compose/intel/hpu}/gaudi/README.md (92%) rename FaqGen/{docker => docker_compose/intel/hpu}/gaudi/compose.yaml (100%) rename FaqGen/{docker/docker_build_compose.yaml => docker_image_build/build.yaml} (84%) rename FaqGen/{docker => }/faqgen.py (100%) delete mode 100644 FaqGen/kubernetes/README.md delete mode 100644 FaqGen/kubernetes/helm-charts/README.md rename FaqGen/kubernetes/{manifests => intel}/README.md (100%) rename DocSum/kubernetes/helm-charts/README.md => FaqGen/kubernetes/intel/README_gmc.md (100%) rename FaqGen/kubernetes/{ => intel/cpu/xeon/gmc}/faqgen_xeon.yaml (100%) rename FaqGen/kubernetes/{manifests/xeon/ui/README.md => intel/cpu/xeon/manifest/README_react_ui.md} (100%) rename FaqGen/kubernetes/{manifests/xeon => intel/cpu/xeon/manifest}/faqgen.yaml (100%) rename FaqGen/kubernetes/{manifests/xeon/ui/react-faqgen.yaml => intel/cpu/xeon/manifest/faqgen_react_ui.yaml} (100%) rename FaqGen/kubernetes/{manifests/ui.yaml => intel/cpu/xeon/manifest/faqgen_ui.yaml} (100%) rename FaqGen/kubernetes/{ => intel/hpu/gaudi/gmc}/faqgen_gaudi.yaml (100%) rename FaqGen/kubernetes/{manifests/gaudi => intel/hpu/gaudi/manifest}/faqgen.yaml (100%) create mode 100644 FaqGen/kubernetes/intel/hpu/gaudi/manifest/faqgen_ui.yaml delete mode 100644 FaqGen/kubernetes/service-mesh/README.md rename FaqGen/tests/{test_faqgen_on_gaudi.sh => test_compose_on_gaudi.sh} (91%) rename FaqGen/tests/{test_faqgen_on_xeon.sh => test_compose_on_xeon.sh} (91%) rename FaqGen/{docker => }/ui/docker/Dockerfile (100%) rename FaqGen/{docker => }/ui/docker/Dockerfile.react (100%) rename FaqGen/{docker => }/ui/react/.eslintrc.cjs (100%) rename FaqGen/{docker => }/ui/react/.gitignore (100%) rename FaqGen/{docker => }/ui/react/README.md (84%) rename FaqGen/{docker => }/ui/react/index.html (100%) rename FaqGen/{docker => }/ui/react/nginx.conf (100%) rename FaqGen/{docker => }/ui/react/package.json (100%) rename FaqGen/{docker => }/ui/react/postcss.config.cjs (100%) rename FaqGen/{docker => }/ui/react/public/vite.svg (100%) rename FaqGen/{docker => }/ui/react/src/App.scss (100%) rename FaqGen/{docker => }/ui/react/src/App.tsx (100%) rename FaqGen/{docker => }/ui/react/src/__tests__/util.test.ts (100%) rename FaqGen/{docker => }/ui/react/src/assets/opea-icon-black.svg (100%) rename FaqGen/{docker => }/ui/react/src/assets/opea-icon-color.svg (100%) rename FaqGen/{docker => }/ui/react/src/assets/react.svg (100%) rename FaqGen/{docker => }/ui/react/src/common/client.ts (100%) rename FaqGen/{docker => }/ui/react/src/common/util.ts (100%) rename FaqGen/{docker => }/ui/react/src/components/FaqGen/FaqGen.tsx (100%) rename FaqGen/{docker => }/ui/react/src/components/FaqGen/FileUpload.tsx (100%) rename FaqGen/{docker => }/ui/react/src/components/FaqGen/faqGen.module.scss (100%) rename FaqGen/{docker => }/ui/react/src/components/Shared/CodeRender/CodeRender.tsx (100%) rename FaqGen/{docker => }/ui/react/src/components/Shared/CodeRender/codeRender.module.scss (100%) rename FaqGen/{docker => }/ui/react/src/components/Shared/Markdown/Markdown.tsx (100%) rename FaqGen/{docker => }/ui/react/src/components/Shared/Markdown/markdown.module.scss (100%) rename FaqGen/{docker => }/ui/react/src/components/sidebar/sidebar.module.scss (100%) rename FaqGen/{docker => }/ui/react/src/components/sidebar/sidebar.tsx (100%) rename FaqGen/{docker => }/ui/react/src/config.ts (100%) rename FaqGen/{docker => }/ui/react/src/index.scss (100%) rename FaqGen/{docker => }/ui/react/src/main.tsx (100%) rename DocSum/kubernetes/service-mesh/README.md => FaqGen/ui/react/src/styles/components/_context.scss (100%) rename FaqGen/{docker => }/ui/react/src/styles/components/_sidebar.scss (100%) rename FaqGen/{docker => }/ui/react/src/styles/components/content.scss (100%) rename FaqGen/{docker => }/ui/react/src/styles/components/context.module.scss (100%) rename FaqGen/{docker => }/ui/react/src/styles/layout/_basics.scss (100%) rename FaqGen/{docker => }/ui/react/src/styles/layout/_flex.scss (100%) rename FaqGen/{docker => }/ui/react/src/styles/styles.scss (100%) rename FaqGen/{docker => }/ui/react/src/vite-env.d.ts (100%) rename FaqGen/{docker => }/ui/react/tsconfig.json (100%) rename FaqGen/{docker => }/ui/react/tsconfig.node.json (100%) rename FaqGen/{docker => }/ui/react/vite.config.ts (100%) rename FaqGen/{docker => }/ui/svelte/.env (100%) rename FaqGen/{docker => }/ui/svelte/.gitignore (100%) rename FaqGen/{docker => }/ui/svelte/.npmrc (100%) rename FaqGen/{docker => }/ui/svelte/README.md (91%) rename FaqGen/{docker => }/ui/svelte/package.json (100%) rename FaqGen/{docker => }/ui/svelte/playwright.config.ts (100%) rename FaqGen/{docker => }/ui/svelte/postcss.config.cjs (100%) rename FaqGen/{docker => }/ui/svelte/src/app.d.ts (100%) rename FaqGen/{docker => }/ui/svelte/src/app.html (100%) rename FaqGen/{docker => }/ui/svelte/src/app.pcss (100%) rename FaqGen/{docker => }/ui/svelte/src/lib/assets/faqLogo.svelte (100%) rename FaqGen/{docker => }/ui/svelte/src/lib/assets/imgLogo.svelte (100%) rename FaqGen/{docker => }/ui/svelte/src/lib/assets/intelLogo.svelte (100%) rename FaqGen/{docker => }/ui/svelte/src/lib/assets/loadingAnimation.svelte (100%) rename FaqGen/{docker => }/ui/svelte/src/lib/assets/spinLoading.svelte (100%) rename FaqGen/{docker => }/ui/svelte/src/lib/doc.svelte (100%) rename FaqGen/{docker => }/ui/svelte/src/lib/dropFile.svelte (100%) rename FaqGen/{docker => }/ui/svelte/src/lib/faq.svelte (100%) rename FaqGen/{docker => }/ui/svelte/src/lib/header.svelte (100%) rename FaqGen/{docker => }/ui/svelte/src/lib/index.ts (100%) rename FaqGen/{docker => }/ui/svelte/src/lib/shared/Network.ts (100%) rename FaqGen/{docker => }/ui/svelte/src/lib/shared/Store.ts (100%) rename FaqGen/{docker => }/ui/svelte/src/lib/shared/Utils.ts (100%) rename FaqGen/{docker => }/ui/svelte/src/routes/+layout.svelte (100%) rename FaqGen/{docker => }/ui/svelte/src/routes/+page.svelte (100%) rename FaqGen/{docker => }/ui/svelte/static/favicon.png (100%) rename FaqGen/{docker => }/ui/svelte/svelte.config.js (100%) rename FaqGen/{docker => }/ui/svelte/tailwind.config.cjs (100%) rename FaqGen/{docker => }/ui/svelte/tests/faqGen.spec.ts (100%) rename FaqGen/{docker => }/ui/svelte/tsconfig.json (100%) rename FaqGen/{docker => }/ui/svelte/vite.config.ts (100%) rename InstructionTuning/{docker => docker_compose/intel/cpu}/xeon/README.md (95%) rename InstructionTuning/{docker => docker_compose/intel/hpu}/gaudi/README.md (97%) rename InstructionTuning/tests/{test_instruction_tuning_on_xeon.sh => test_compose_on_xeon.sh} (98%) rename ProductivitySuite/{docker => docker_compose/intel/cpu}/xeon/README.md (94%) rename ProductivitySuite/{docker => docker_compose/intel/cpu}/xeon/compose.yaml (100%) rename ProductivitySuite/{docker => docker_compose/intel/cpu}/xeon/keycloak_setup_guide.md (100%) rename ProductivitySuite/{docker => docker_compose/intel/cpu}/xeon/set_env.sh (100%) rename ProductivitySuite/{docker/docker_build_compose.yaml => docker_image_build/build.yaml} (78%) rename ProductivitySuite/kubernetes/{manifests => intel}/README.md (93%) rename ProductivitySuite/kubernetes/{manifests/xeon => intel/cpu/xeon/manifest}/chat_history.yaml (100%) rename ProductivitySuite/kubernetes/{manifests/xeon => intel/cpu/xeon/manifest}/chatqna.yaml (100%) rename ProductivitySuite/kubernetes/{manifests/xeon => intel/cpu/xeon/manifest}/codegen.yaml (100%) rename ProductivitySuite/kubernetes/{manifests/xeon => intel/cpu/xeon/manifest}/docsum.yaml (100%) rename ProductivitySuite/kubernetes/{manifests/xeon => intel/cpu/xeon/manifest}/faqgen.yaml (100%) rename ProductivitySuite/kubernetes/{manifests/xeon => intel/cpu/xeon/manifest}/keycloak_install.yaml (100%) rename ProductivitySuite/kubernetes/{manifests/xeon => intel/cpu/xeon/manifest}/mongo.yaml (100%) rename ProductivitySuite/kubernetes/{manifests/xeon => intel/cpu/xeon/manifest}/productivity_suite_reactui.yaml (100%) rename ProductivitySuite/kubernetes/{manifests/xeon => intel/cpu/xeon/manifest}/prompt_registry.yaml (100%) rename ProductivitySuite/tests/{test_productivitysuite_on_xeon.sh => test_compose_on_xeon.sh} (97%) rename {ChatQnA/docker => ProductivitySuite}/ui/docker/Dockerfile.react (100%) rename ProductivitySuite/{docker => }/ui/react/.env.production (100%) rename ProductivitySuite/{docker => }/ui/react/.eslintrc.cjs (100%) rename ProductivitySuite/{docker => }/ui/react/.gitignore (100%) rename ProductivitySuite/{docker => }/ui/react/README.md (84%) rename ProductivitySuite/{docker => }/ui/react/env.sh (100%) rename ProductivitySuite/{docker => }/ui/react/index.html (100%) rename ProductivitySuite/{docker => }/ui/react/nginx.conf (100%) rename ProductivitySuite/{docker => }/ui/react/package.json (100%) rename ProductivitySuite/{docker => }/ui/react/postcss.config.cjs (100%) rename ProductivitySuite/{docker => }/ui/react/src/App.scss (100%) rename ProductivitySuite/{docker => }/ui/react/src/App.tsx (100%) rename ProductivitySuite/{docker => }/ui/react/src/__tests__/util.test.ts (100%) rename ProductivitySuite/{docker => }/ui/react/src/assets/opea-icon-black.svg (100%) rename ProductivitySuite/{docker => }/ui/react/src/assets/opea-icon-color.svg (100%) rename ProductivitySuite/{docker => }/ui/react/src/assets/react.svg (100%) rename ProductivitySuite/{docker => }/ui/react/src/common/client.ts (100%) rename ProductivitySuite/{docker => }/ui/react/src/common/util.ts (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/CodeGen/CodeGen.tsx (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/CodeGen/codeGen.module.scss (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/Conversation/Conversation.tsx (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/Conversation/ConversationSideBar.tsx (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/Conversation/DataSource.tsx (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/Conversation/PromptTemplate.tsx (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/Conversation/conversation.module.scss (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/Conversation/dataSource.module.scss (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/Conversation/promptTemplate.module.scss (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/Conversation/settings.tsx (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/DocSum/DocSum.tsx (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/DocSum/FileUpload.tsx (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/DocSum/docSum.module.scss (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/FaqGen/FaqGen.tsx (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/FaqGen/FileUpload.tsx (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/FaqGen/faqGen.module.scss (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/Message/conversationMessage.module.scss (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/Message/conversationMessage.tsx (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/Shared/CodeRender/CodeRender.tsx (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/Shared/CodeRender/codeRender.module.scss (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/Shared/Markdown/Markdown.tsx (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/Shared/Markdown/markdown.module.scss (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/sidebar/sidebar.module.scss (100%) rename ProductivitySuite/{docker => }/ui/react/src/components/sidebar/sidebar.tsx (100%) rename ProductivitySuite/{docker => }/ui/react/src/config.ts (100%) rename ProductivitySuite/{docker => }/ui/react/src/index.scss (100%) rename ProductivitySuite/{docker => }/ui/react/src/keycloack.ts (100%) rename ProductivitySuite/{docker => }/ui/react/src/main.tsx (100%) rename ProductivitySuite/{docker => }/ui/react/src/redux/Conversation/Conversation.ts (100%) rename ProductivitySuite/{docker => }/ui/react/src/redux/Conversation/ConversationSlice.ts (100%) rename ProductivitySuite/{docker => }/ui/react/src/redux/Prompt/PromptSlice.ts (100%) rename ProductivitySuite/{docker => }/ui/react/src/redux/User/user.d.ts (100%) rename ProductivitySuite/{docker => }/ui/react/src/redux/User/userSlice.ts (100%) rename ProductivitySuite/{docker => }/ui/react/src/redux/store.ts (100%) rename ProductivitySuite/{docker => }/ui/react/src/redux/thunkUtil.ts (100%) rename ProductivitySuite/{docker => }/ui/react/src/styles/components/_sidebar.scss (100%) rename ProductivitySuite/{docker => }/ui/react/src/styles/components/content.scss (100%) rename ProductivitySuite/{docker => }/ui/react/src/styles/components/context.module.scss (100%) rename ProductivitySuite/{docker => }/ui/react/src/styles/layout/_basics.scss (100%) rename ProductivitySuite/{docker => }/ui/react/src/styles/layout/_flex.scss (100%) rename ProductivitySuite/{docker => }/ui/react/src/styles/styles.scss (100%) rename ProductivitySuite/{docker => }/ui/react/src/vite-env.d.ts (100%) rename ProductivitySuite/{docker => }/ui/react/tsconfig.json (100%) rename ProductivitySuite/{docker => }/ui/react/tsconfig.node.json (100%) rename ProductivitySuite/{docker => }/ui/react/vite.config.ts (100%) rename RerankFinetuning/{docker => docker_compose/intel/cpu}/xeon/README.md (95%) rename RerankFinetuning/tests/{test_rerank_finetuning_on_xeon.sh => test_compose_on_xeon.sh} (96%) rename SearchQnA/{docker => }/Dockerfile (100%) rename SearchQnA/{docker => docker_compose/intel/cpu}/xeon/README.md (95%) rename SearchQnA/{docker => docker_compose/intel/cpu}/xeon/compose.yaml (100%) rename SearchQnA/{docker => docker_compose/intel/hpu}/gaudi/README.md (96%) rename SearchQnA/{docker => docker_compose/intel/hpu}/gaudi/compose.yaml (100%) rename SearchQnA/{docker/docker_build_compose.yaml => docker_image_build/build.yaml} (85%) rename SearchQnA/kubernetes/{README.md => intel/README_gmc.md} (100%) rename SearchQnA/kubernetes/{ => intel/cpu/xeon/gmc}/searchQnA_xeon.yaml (100%) rename SearchQnA/kubernetes/{ => intel/hpu/gaudi/gmc}/searchQnA_gaudi.yaml (100%) rename SearchQnA/{docker => }/searchqna.py (100%) rename SearchQnA/{docker => }/set_env.sh (100%) rename SearchQnA/tests/{test_searchqna_on_gaudi.sh => test_compose_on_gaudi.sh} (90%) rename SearchQnA/tests/{test_searchqna_on_xeon.sh => test_compose_on_xeon.sh} (89%) rename SearchQnA/{docker => }/ui/docker/Dockerfile (100%) rename SearchQnA/{docker => }/ui/svelte/.editorconfig (100%) rename SearchQnA/{docker => }/ui/svelte/.env (100%) rename SearchQnA/{docker => }/ui/svelte/.eslintignore (100%) rename SearchQnA/{docker => }/ui/svelte/.eslintrc.cjs (100%) rename SearchQnA/{docker => }/ui/svelte/.prettierignore (100%) rename SearchQnA/{docker => }/ui/svelte/.prettierrc (100%) rename SearchQnA/{docker => }/ui/svelte/README.md (94%) rename SearchQnA/{docker => }/ui/svelte/package.json (100%) rename SearchQnA/{docker => }/ui/svelte/playwright.config.ts (100%) rename SearchQnA/{docker => }/ui/svelte/postcss.config.cjs (100%) rename SearchQnA/{docker => }/ui/svelte/src/app.d.ts (100%) rename SearchQnA/{docker => }/ui/svelte/src/app.html (100%) rename SearchQnA/{docker => }/ui/svelte/src/app.postcss (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/assets/avatar/svelte/Delete.svelte (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/assets/chat/svelte/Assistant.svelte (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/assets/chat/svelte/PersonOutlined.svelte (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/assets/header/intelLogo.svelte (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/assets/layout/css/driver.css (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/assets/upload/next.svelte (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/assets/upload/previous.svelte (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/assets/voice/svg/paste.svg (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/assets/voice/svg/uploadFile.svg (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/modules/chat/ChatMessage.svelte (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/modules/chat/MessageAvatar.svelte (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/modules/chat/MessageTimer.svelte (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/modules/frame/Layout.svelte (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/network/chat/Network.ts (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/network/upload/Network.ts (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/shared/Utils.ts (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/shared/components/header/header.svelte (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/shared/components/loading/Loading.svelte (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/shared/constant/Interface.ts (100%) rename SearchQnA/{docker => }/ui/svelte/src/lib/shared/stores/common/Store.ts (100%) rename SearchQnA/{docker => }/ui/svelte/src/routes/+layout.svelte (100%) rename SearchQnA/{docker => }/ui/svelte/src/routes/+page.svelte (100%) rename SearchQnA/{docker => }/ui/svelte/src/routes/+page.ts (100%) rename SearchQnA/{docker => }/ui/svelte/static/favicon.png (100%) rename SearchQnA/{docker => }/ui/svelte/svelte.config.js (100%) rename SearchQnA/{docker => }/ui/svelte/tailwind.config.cjs (100%) rename SearchQnA/{docker => }/ui/svelte/tests/searchQnA.spec.ts (100%) rename SearchQnA/{docker => }/ui/svelte/tsconfig.json (100%) rename SearchQnA/{docker => }/ui/svelte/vite.config.ts (100%) rename Translation/{docker => }/Dockerfile (100%) rename Translation/{docker => docker_compose/intel/cpu}/xeon/README.md (94%) rename Translation/{docker => docker_compose/intel/cpu}/xeon/compose.yaml (100%) rename Translation/{docker => docker_compose/intel/hpu}/gaudi/README.md (95%) rename Translation/{docker => docker_compose/intel/hpu}/gaudi/compose.yaml (100%) rename Translation/{docker/docker_build_compose.yaml => docker_image_build/build.yaml} (94%) delete mode 100644 Translation/kubernetes/helm-charts/README.md rename Translation/kubernetes/{README.md => intel/README_gmc.md} (100%) rename Translation/kubernetes/{ => intel/cpu/xeon/gmc}/translation_xeon.yaml (100%) rename Translation/kubernetes/{ => intel/hpu/gaudi/gmc}/translation_gaudi.yaml (100%) delete mode 100644 Translation/kubernetes/manifests/README.md delete mode 100644 Translation/kubernetes/service-mesh/README.md rename Translation/tests/{test_translation_on_gaudi.sh => test_compose_on_gaudi.sh} (90%) rename Translation/tests/{test_translation_on_xeon.sh => test_compose_on_xeon.sh} (90%) rename Translation/{docker => }/translation.py (100%) rename Translation/{docker => }/ui/docker/Dockerfile (100%) rename Translation/{docker => }/ui/svelte/.env (100%) rename Translation/{docker => }/ui/svelte/.gitignore (100%) rename Translation/{docker => }/ui/svelte/.npmrc (100%) rename Translation/{docker => }/ui/svelte/README.md (100%) rename Translation/{docker => }/ui/svelte/package.json (100%) rename Translation/{docker => }/ui/svelte/playwright.config.ts (100%) rename Translation/{docker => }/ui/svelte/postcss.config.cjs (100%) rename Translation/{docker => }/ui/svelte/src/app.d.ts (100%) rename Translation/{docker => }/ui/svelte/src/app.html (100%) rename Translation/{docker => }/ui/svelte/src/app.pcss (100%) rename Translation/{docker => }/ui/svelte/src/lib/assets/loadingAnimation.svelte (100%) rename Translation/{docker => }/ui/svelte/src/lib/assets/summaryLogo.svelte (100%) rename Translation/{docker => }/ui/svelte/src/lib/header.svelte (100%) rename Translation/{docker => }/ui/svelte/src/lib/shared/Network.ts (100%) rename Translation/{docker => }/ui/svelte/src/lib/shared/constant.ts (100%) rename Translation/{docker => }/ui/svelte/src/routes/+layout.svelte (100%) rename Translation/{docker => }/ui/svelte/src/routes/+page.svelte (100%) rename Translation/{docker => }/ui/svelte/src/routes/types.d.ts (100%) rename Translation/{docker => }/ui/svelte/static/favicon.png (100%) rename Translation/{docker => }/ui/svelte/svelte.config.js (100%) rename Translation/{docker => }/ui/svelte/tailwind.config.cjs (100%) rename Translation/{docker => }/ui/svelte/tests/Translation.spec.ts (100%) rename Translation/{docker => }/ui/svelte/tsconfig.json (100%) rename Translation/{docker => }/ui/svelte/vite.config.ts (100%) rename VisualQnA/{docker => }/Dockerfile (100%) rename VisualQnA/{docker => docker_compose/intel/cpu}/xeon/README.md (96%) rename VisualQnA/{docker => docker_compose/intel/cpu}/xeon/compose.yaml (100%) rename VisualQnA/{docker => docker_compose/intel/cpu}/xeon/set_env.sh (100%) rename VisualQnA/{docker => docker_compose/intel/hpu}/gaudi/README.md (97%) rename VisualQnA/{docker => docker_compose/intel/hpu}/gaudi/compose.yaml (100%) rename VisualQnA/{docker => docker_compose/intel/hpu}/gaudi/set_env.sh (100%) rename VisualQnA/{docker/docker_build_compose.yaml => docker_image_build/build.yaml} (84%) rename VisualQnA/kubernetes/{manifests => intel}/README.md (100%) rename VisualQnA/kubernetes/{README.md => intel/README_gmc.md} (100%) rename VisualQnA/kubernetes/{ => intel/cpu/xeon/gmc}/visualqna_xeon.yaml (100%) rename VisualQnA/kubernetes/{manifests/xeon => intel/cpu/xeon/manifest}/visualqna.yaml (100%) rename VisualQnA/kubernetes/{ => intel/hpu/gaudi/gmc}/visualqna_gaudi.yaml (100%) rename VisualQnA/kubernetes/{manifests/gaudi => intel/hpu/gaudi/manifest}/visualqna.yaml (100%) rename VisualQnA/tests/{test_visualqna_on_gaudi.sh => test_compose_on_gaudi.sh} (92%) rename VisualQnA/tests/{test_visualqna_on_xeon.sh => test_compose_on_xeon.sh} (92%) rename VisualQnA/{docker => }/ui/docker/Dockerfile (100%) rename VisualQnA/{docker => }/ui/svelte/.editorconfig (100%) rename VisualQnA/{docker => }/ui/svelte/.env (100%) rename VisualQnA/{docker => }/ui/svelte/.eslintignore (100%) rename VisualQnA/{docker => }/ui/svelte/.eslintrc.cjs (100%) rename VisualQnA/{docker => }/ui/svelte/.prettierignore (100%) rename VisualQnA/{docker => }/ui/svelte/.prettierrc (100%) rename VisualQnA/{docker => }/ui/svelte/package.json (100%) rename VisualQnA/{docker => }/ui/svelte/playwright.config.ts (100%) rename VisualQnA/{docker => }/ui/svelte/postcss.config.cjs (100%) rename VisualQnA/{docker => }/ui/svelte/src/app.d.ts (100%) rename VisualQnA/{docker => }/ui/svelte/src/app.html (100%) rename VisualQnA/{docker => }/ui/svelte/src/app.postcss (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/assets/avatar/svelte/Delete.svelte (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/assets/chat/svelte/Assistant.svelte (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/assets/chat/svelte/PersonOutlined.svelte (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/assets/header/intelLogo.svelte (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/assets/layout/css/driver.css (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/assets/upload/help.svelte (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/assets/upload/next.svelte (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/assets/upload/previous.svelte (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/assets/voice/svg/paste.svg (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/assets/voice/svg/uploadFile.svg (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/modules/chat/ChatMessage.svelte (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/modules/chat/MessageAvatar.svelte (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/modules/chat/MessageTimer.svelte (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/modules/frame/Layout.svelte (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/modules/upload/upload.svelte (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/modules/upload/uploadImg.svelte (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/network/chat/Network.ts (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/network/upload/Network.ts (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/shared/Utils.ts (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/shared/components/header/header.svelte (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/shared/components/loading/Loading.svelte (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/shared/constant/Interface.ts (100%) rename VisualQnA/{docker => }/ui/svelte/src/lib/shared/stores/common/Store.ts (100%) rename VisualQnA/{docker => }/ui/svelte/src/routes/+layout.svelte (100%) rename VisualQnA/{docker => }/ui/svelte/src/routes/+page.svelte (100%) rename VisualQnA/{docker => }/ui/svelte/src/routes/+page.ts (100%) rename VisualQnA/{docker => }/ui/svelte/static/favicon.png (100%) rename VisualQnA/{docker => }/ui/svelte/svelte.config.js (100%) rename VisualQnA/{docker => }/ui/svelte/tailwind.config.cjs (100%) rename VisualQnA/{docker => }/ui/svelte/tsconfig.json (100%) rename VisualQnA/{docker => }/ui/svelte/vite.config.ts (100%) rename VisualQnA/{docker => }/visualqna.py (100%) diff --git a/.github/workflows/_example-workflow.yml b/.github/workflows/_example-workflow.yml index 121d6247d..bfc9de97a 100644 --- a/.github/workflows/_example-workflow.yml +++ b/.github/workflows/_example-workflow.yml @@ -46,13 +46,25 @@ jobs: - name: Clean Up Working Directory run: sudo rm -rf ${{github.workspace}}/* + - name: Get checkout ref + run: | + if [ "${{ github.event_name }}" == "pull_request" ] || [ "${{ github.event_name }}" == "pull_request_target" ]; then + echo "CHECKOUT_REF=refs/pull/${{ github.event.number }}/merge" >> $GITHUB_ENV + else + echo "CHECKOUT_REF=${{ github.ref }}" >> $GITHUB_ENV + fi + echo "checkout ref ${{ env.CHECKOUT_REF }}" + - name: Checkout out Repo uses: actions/checkout@v4 + with: + ref: ${{ env.CHECKOUT_REF }} + fetch-depth: 0 - name: Clone required Repo run: | - cd ${{ github.workspace }}/${{ inputs.example }}/docker - docker_compose_path=${{ github.workspace }}/${{ inputs.example }}/docker/docker_build_compose.yaml + cd ${{ github.workspace }}/${{ inputs.example }}/docker_image_build + docker_compose_path=${{ github.workspace }}/${{ inputs.example }}/docker_image_build/build.yaml if [[ $(grep -c "tei-gaudi:" ${docker_compose_path}) != 0 ]]; then git clone https://github.com/huggingface/tei-gaudi.git fi @@ -66,8 +78,8 @@ jobs: if: ${{ fromJSON(inputs.build) }} uses: opea-project/validation/actions/image-build@main with: - work_dir: ${{ github.workspace }}/${{ inputs.example }}/docker - docker_compose_path: ${{ github.workspace }}/${{ inputs.example }}/docker/docker_build_compose.yaml + work_dir: ${{ github.workspace }}/${{ inputs.example }}/docker_image_build + docker_compose_path: ${{ github.workspace }}/${{ inputs.example }}/docker_image_build/build.yaml registry: ${OPEA_IMAGE_REPO}opea tag: ${{ inputs.tag }} diff --git a/.github/workflows/_get-image-list.yml b/.github/workflows/_get-image-list.yml index f04925cf7..9abd893ec 100644 --- a/.github/workflows/_get-image-list.yml +++ b/.github/workflows/_get-image-list.yml @@ -37,7 +37,7 @@ jobs: examples=($(echo ${{ inputs.examples }} | tr ',' ' ')) for example in ${examples[@]} do - images=$(cat ${{ github.workspace }}/${example}/docker/docker_build_compose.yaml | yq -r '.[]' | jq 'keys' | jq -c '.') + images=$(cat ${{ github.workspace }}/${example}/docker_image_build/build.yaml | yq -r '.[]' | jq 'keys' | jq -c '.') image_list=$(echo ${image_list} | jq -s '.[0] + .[1] | unique' - <(echo ${images})) done fi diff --git a/.github/workflows/_get-test-matrix.yml b/.github/workflows/_get-test-matrix.yml index 677fdeac2..1883e1dca 100644 --- a/.github/workflows/_get-test-matrix.yml +++ b/.github/workflows/_get-test-matrix.yml @@ -11,14 +11,10 @@ on: required: false type: string default: '.github|README.md|*.txt' - xeon_server_label: + test_mode: required: false type: string - default: 'xeon' - gaudi_server_label: - required: false - type: string - default: 'gaudi' + default: 'docker_compose' outputs: run_matrix: description: "The matrix string" @@ -49,10 +45,9 @@ jobs: - name: Get test matrix id: get-test-matrix run: | - set -xe if [ "${{ github.event_name }}" == "pull_request" ] || [ "${{ github.event_name }}" == "pull_request_target" ]; then LATEST_COMMIT_SHA=$(curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ - "https://api.github.com/repos/opea-project/GenAIExamples/commits?sha=main" | jq -r '.[0].sha') + "https://api.github.com/repos/opea-project/GenAIExamples/commits?sha=${{ github.event.pull_request.base.ref }}" | jq -r '.[0].sha') echo "Latest commit SHA is $LATEST_COMMIT_SHA" base_commit=$LATEST_COMMIT_SHA else @@ -61,20 +56,8 @@ jobs: merged_commit=$(git log -1 --format='%H') changed_files="$(git diff --name-only ${base_commit} ${merged_commit} | \ grep -vE '${{ inputs.diff_excluded_files }}')" || true - examples=$(printf '%s\n' "${changed_files[@]}" | grep '/' | cut -d'/' -f1 | sort -u) - run_matrix="{\"include\":[" - for example in ${examples}; do - run_hardware="" - if [ $(printf '%s\n' "${changed_files[@]}" | grep ${example} | grep -c gaudi) != 0 ]; then run_hardware="gaudi"; fi - if [ $(printf '%s\n' "${changed_files[@]}" | grep ${example} | grep -c xeon) != 0 ]; then run_hardware="xeon ${run_hardware}"; fi - if [ "$run_hardware" == "" ]; then run_hardware="xeon gaudi"; fi - for hw in ${run_hardware}; do - if [ "$hw" == "gaudi" ] && [ "${{ inputs.gaudi_server_label }}" != "" ]; then - run_matrix="${run_matrix}{\"example\":\"${example}\",\"hardware\":\"${{ inputs.gaudi_server_label }}\"}," - elif [ "${{ inputs.xeon_server_label }}" != "" ]; then - run_matrix="${run_matrix}{\"example\":\"${example}\",\"hardware\":\"${{ inputs.xeon_server_label }}\"}," - fi - done - done - run_matrix=$run_matrix"]}" - echo "run_matrix=${run_matrix}" >> $GITHUB_OUTPUT + echo "changed_files=$changed_files" + export changed_files=$changed_files + export test_mode=${{ inputs.test_mode }} + export WORKSPACE=${{ github.workspace }} + bash .github/workflows/scripts/get_test_matrix.sh diff --git a/.github/workflows/_image-build.yml b/.github/workflows/_image-build.yml deleted file mode 100644 index 7e5f29df2..000000000 --- a/.github/workflows/_image-build.yml +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -name: Image Build -permissions: read-all -on: - workflow_call: - inputs: - image_repo: - required: false - type: string - image_tag: - required: true - type: string - mega_service: - required: true - type: string - runner_label: - required: false - type: string - default: 'docker-build-xeon' - outputs: - image_repo: - description: "The image repository used for the image build" - value: ${{ jobs.mega-image-build.outputs.image_repo }} - image_tag: - description: "The image tag used for the image build" - value: ${{ jobs.mega-image-build.outputs.image_tag }} - -jobs: - mega-image-build: - runs-on: ${{ inputs.runner_label }} - outputs: - image_repo: ${{ steps.build-megaservice-image.outputs.image_repo }} - image_tag: ${{ steps.build-megaservice-image.outputs.image_tag }} - steps: - - name: Clean up Working Directory - run: | - sudo rm -rf ${{github.workspace}}/* || true - - - name: Get checkout ref - run: | - if [ "${{ github.event_name }}" == "pull_request" ] || [ "${{ github.event_name }}" == "pull_request_target" ]; then - echo "CHECKOUT_REF=refs/pull/${{ github.event.number }}/merge" >> $GITHUB_ENV - else - echo "CHECKOUT_REF=${{ github.ref }}" >> $GITHUB_ENV - fi - echo "checkout ref ${{ env.CHECKOUT_REF }}" - - - name: Checkout out Repo - uses: actions/checkout@v4 - with: - ref: ${{ env.CHECKOUT_REF }} - fetch-depth: 0 - - - name: Building MegaService Docker Image - id: build-megaservice-image - env: - IMAGE_REPO: ${{ inputs.image_repo }} - IMAGE_TAG: ${{ inputs.image_tag }} - MEGA_SERVICE: ${{ inputs.mega_service }} - run: | - .github/workflows/scripts/build_push.sh ${{ env.MEGA_SERVICE}} - if [ -z "${{ env.IMAGE_REPO }}" ]; then - IMAGE_REPO=$OPEA_IMAGE_REPO - fi - echo "IMAGE_TAG=${IMAGE_TAG}" - echo "image_tag=$IMAGE_TAG" >> $GITHUB_OUTPUT - echo "image_repo=${IMAGE_REPO}" >> $GITHUB_OUTPUT diff --git a/.github/workflows/_run-docker-compose.yml b/.github/workflows/_run-docker-compose.yml index d7c778a08..ee92e611f 100644 --- a/.github/workflows/_run-docker-compose.yml +++ b/.github/workflows/_run-docker-compose.yml @@ -24,6 +24,10 @@ on: description: Hardware to run the test on required: true type: string + diff_excluded_files: + required: false + type: string + default: "" jobs: get-test-case: runs-on: ubuntu-latest @@ -52,10 +56,37 @@ jobs: shell: bash id: test-case-matrix run: | - set -x example_l=$(echo ${{ inputs.example }} | tr '[:upper:]' '[:lower:]') cd ${{ github.workspace }}/${{ inputs.example }}/tests - test_cases=$(find . -type f -name "test_${example_l}*on_${{ inputs.hardware }}.sh" -print | cut -d/ -f2 | jq -R '.' | jq -sc '.') + run_test_cases="" + + default_test_case=$(find . -type f -name "test_compose_on_${{ inputs.hardware }}.sh" | cut -d/ -f2) + if [ "$default_test_case" ]; then run_test_cases="$default_test_case"; fi + other_test_cases=$(find . -type f -name "test_compose_*_on_${{ inputs.hardware }}.sh" | cut -d/ -f2) + echo "default_test_case=$default_test_case" + echo "other_test_cases=$other_test_cases" + + if [ "${{ inputs.tag }}" == "ci" ]; then + base_commit=$(curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ + "https://api.github.com/repos/opea-project/GenAIExamples/commits?sha=${{ github.event.pull_request.base.ref }}" | jq -r '.[0].sha') + merged_commit=$(git log -1 --format='%H') + changed_files="$(git diff --name-only ${base_commit} ${merged_commit} | grep -vE '${{ inputs.diff_excluded_files }}')" || true + fi + + for test_case in $other_test_cases; do + if [ "${{ inputs.tag }}" == "ci" ]; then + flag=${test_case%_on_*} + flag=${flag#test_compose_} + if [[ $(printf '%s\n' "${changed_files[@]}" | grep ${{ inputs.example }} | grep ${flag}) ]]; then + run_test_cases="$run_test_cases $test_case" + fi + else + run_test_cases="$run_test_cases $test_case" + fi + done + + test_cases=$(echo $run_test_cases | tr ' ' '\n' | sort -u | jq -R '.' | jq -sc '.') + echo "test_cases=$test_cases" echo "test_cases=$test_cases" >> $GITHUB_OUTPUT run-test: @@ -101,11 +132,13 @@ jobs: shell: bash if: cancelled() || failure() run: | - cd ${{ github.workspace }}/${{ inputs.example }}/docker/${{ inputs.hardware }} - yaml_files=$(find . -type f -name "*compose*yaml") - for file in $yaml_files; do - docker compose -f ${file} stop && docker compose -f ${file} rm -f || true - done + cd ${{ github.workspace }}/${{ inputs.example }}/docker_compose + test_case=${{ matrix.test_case }} + flag=${test_case%_on_*} + flag=${flag#test_} + yaml_file=$(find . -type f -wholename "*${{ inputs.hardware }}/${flag}.yaml") + echo $yaml_file + docker compose -f $yaml_file stop && docker compose -f $yaml_file rm -f || true docker system prune -f docker rmi $(docker images --filter reference="*:5000/*/*" -q) || true @@ -113,5 +146,5 @@ jobs: if: ${{ !cancelled() }} uses: actions/upload-artifact@v4 with: - name: ${{ matrix.test_case }} + name: ${{ inputs.example }}_${{ matrix.test_case }} path: ${{ github.workspace }}/${{ inputs.example }}/tests/*.log diff --git a/.github/workflows/chatqna_benchmark.yml b/.github/workflows/chatqna_benchmark.yml deleted file mode 100644 index 9f67b48af..000000000 --- a/.github/workflows/chatqna_benchmark.yml +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -name: benchmark test with chatqna_benchmark - -on: - # pull_request: - # branches: [main] - # types: [opened, reopened, ready_for_review, synchronize] - # # inputs: - # # variables: - # # hardware: - # # description: 'Enter your param' #gaudi or xeon - # # required: true - # # default: xeon - schedule: - - cron: "35 0 * * 6" - workflow_dispatch: - inputs: - hardware: - description: 'Enter your hardware' #gaudi or xeon - required: true - default: gaudi - -jobs: - Example-test: - runs-on: ${{ github.event.inputs.hardware || 'gaudi' }} #xeon #gaudi - steps: - - name: Clean Up Working Directory - run: sudo rm -rf ${{github.workspace}}/* - - - name: Checkout out Repo - uses: actions/checkout@v4 - - - name: Clone repo GenAIEval - run: | - git clone https://github.com/opea-project/GenAIEval.git - cd GenAIEval && git checkout v0.6 - - - name: Run test - env: - HUGGINGFACEHUB_API_TOKEN: ${{ secrets.HUGGINGFACEHUB_API_TOKEN }} - GOOGLE_CSE_ID: ${{ secrets.GOOGLE_CSE_ID }} - GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }} - hardware: ${{ github.event.inputs.hardware || 'gaudi' }} #xeon - mode: perf - IMAGE_TAG: latest - IMAGE_REPO_GAUDI: ${{ vars.IMAGE_REPO_GAUDI }} - IMAGE_REPO_XEON: ${{ vars.IMAGE_REPO_XEON }} - run: | - # cd ${{ github.workspace }}/$example/tests - cd ${{ github.workspace }}/ChatQnA/tests - cp ../../GenAIEval/evals/benchmark/chatqna_benchmark.py . - cp ../../GenAIEval/evals/benchmark/data.json ${{ github.workspace }}/ChatQnA/docker/${hardware}/ - - if [ "$hardware" == "gaudi" ]; then IMAGE_REPO=$IMAGE_REPO_GAUDI; else IMAGE_REPO=$IMAGE_REPO_XEON; fi - export IMAGE_REPO=${IMAGE_REPO} - # example_l=$(echo $example | tr '[:upper:]' '[:lower:]') - if [ -f test_chatqna_on_${hardware}.sh ]; then timeout 30m bash test_chatqna_on_${hardware}.sh > ${hardware}_output.log; else echo "Test script not found, skip test!"; fi - - - name: Process log and save to JSON - env: - hardware: ${{ github.event.inputs.hardware || 'gaudi' }} #xeon - run: | - cd ${{ github.workspace }}/ChatQnA/tests - echo '{}' > ${hardware}_output.json - echo $(grep -a 'Total Requests:' ${hardware}_output.log | awk '{print "{\"total_requests\": \""$3 "\"}"}') > ${hardware}_output.json - echo $(grep -a 'P50 latency is' ${hardware}_output.log | awk '{print "{\"p50_latency\": \""$4 "\"}"}') >> ${hardware}_output.json - echo $(grep -a 'P99 latency is' ${hardware}_output.log | awk '{print "{\"p99_latency\": \""$4 "\"}"}') >> ${hardware}_output.json - jq -s 'add' ${hardware}_output.json > ${hardware}_final_output.json && mv ${hardware}_final_output.json ${hardware}_output.json - - - name: Publish pipeline artifact - if: ${{ !cancelled() }} - uses: actions/upload-artifact@v4 - with: - path: | - ${{ github.workspace }}/ChatQnA/tests/*.log - ${{ github.workspace }}/ChatQnA/tests/*.json diff --git a/.github/workflows/docker/compose/AudioQnA-compose.yaml b/.github/workflows/docker/compose/AudioQnA-compose.yaml deleted file mode 100644 index 9a48e6f1e..000000000 --- a/.github/workflows/docker/compose/AudioQnA-compose.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -# this file should be run in the root of the repo -services: - audioqna: - build: - context: docker - dockerfile: ./Dockerfile - image: ${REGISTRY:-opea}/audioqna:${TAG:-latest} diff --git a/.github/workflows/docker/compose/ChatQnA-compose.yaml b/.github/workflows/docker/compose/ChatQnA-compose.yaml deleted file mode 100644 index b78d53c30..000000000 --- a/.github/workflows/docker/compose/ChatQnA-compose.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -# this file should be run in the root of the repo -services: - chatqna: - build: - context: docker - dockerfile: ./Dockerfile - image: ${REGISTRY:-opea}/chatqna:${TAG:-latest} - chatqna-ui: - build: - context: docker/ui - dockerfile: ./docker/Dockerfile - image: ${REGISTRY:-opea}/chatqna-ui:${TAG:-latest} - chatqna-conversation-ui: - build: - context: docker/ui - dockerfile: ./docker/Dockerfile.react - image: ${REGISTRY:-opea}/chatqna-conversation-ui:${TAG:-latest} diff --git a/.github/workflows/docker/compose/CodeGen-compose.yaml b/.github/workflows/docker/compose/CodeGen-compose.yaml deleted file mode 100644 index 13ba74dba..000000000 --- a/.github/workflows/docker/compose/CodeGen-compose.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -# this file should be run in the root of the repo -services: - codegen: - build: - context: docker - dockerfile: ./Dockerfile - image: ${REGISTRY:-opea}/codegen:${TAG:-latest} - codegen-ui: - build: - context: docker/ui - dockerfile: ./docker/Dockerfile - image: ${REGISTRY:-opea}/codegen-ui:${TAG:-latest} - codegen-react-ui: - build: - context: docker/ui - dockerfile: ./docker/Dockerfile.react - image: ${REGISTRY:-opea}/codegen-conversation-ui:${TAG:-latest} diff --git a/.github/workflows/docker/compose/CodeTrans-compose.yaml b/.github/workflows/docker/compose/CodeTrans-compose.yaml deleted file mode 100644 index b9b4b34b3..000000000 --- a/.github/workflows/docker/compose/CodeTrans-compose.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -# this file should be run in the root of the repo -services: - codetrans: - build: - context: docker - dockerfile: ./Dockerfile - image: ${REGISTRY:-opea}/codetrans:${TAG:-latest} - codetrans-ui: - build: - context: docker/ui - dockerfile: ./docker/Dockerfile - image: ${REGISTRY:-opea}/codetrans-ui:${TAG:-latest} diff --git a/.github/workflows/docker/compose/DocSum-compose.yaml b/.github/workflows/docker/compose/DocSum-compose.yaml deleted file mode 100644 index 4e2ab4caf..000000000 --- a/.github/workflows/docker/compose/DocSum-compose.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -# this file should be run in the root of the repo -services: - docsum: - build: - context: docker - dockerfile: ./Dockerfile - image: ${REGISTRY:-opea}/docsum:${TAG:-latest} - docsum-ui: - build: - context: docker/ui - dockerfile: ./docker/Dockerfile - image: ${REGISTRY:-opea}/docsum-ui:${TAG:-latest} - docsum-react-ui: - build: - context: docker/ui - dockerfile: ./docker/Dockerfile.react - image: ${REGISTRY:-opea}/docsum-react-ui:${TAG:-latest} diff --git a/.github/workflows/docker/compose/FaqGen-compose.yaml b/.github/workflows/docker/compose/FaqGen-compose.yaml deleted file mode 100644 index 3cc97e314..000000000 --- a/.github/workflows/docker/compose/FaqGen-compose.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -# this file should be run in the root of the repo -services: - faqgen: - build: - context: docker - dockerfile: ./Dockerfile - image: ${REGISTRY:-opea}/faqgen:${TAG:-latest} - faqgen-ui: - build: - context: docker/ui - dockerfile: ./docker/Dockerfile - image: ${REGISTRY:-opea}/faqgen-ui:${TAG:-latest} - faqgen-react-ui: - build: - context: docker/ui - dockerfile: ./docker/Dockerfile.react - image: ${REGISTRY:-opea}/faqgen-react-ui:${TAG:-latest} diff --git a/.github/workflows/docker/compose/SearchQnA-compose.yaml b/.github/workflows/docker/compose/SearchQnA-compose.yaml deleted file mode 100644 index ac917dc47..000000000 --- a/.github/workflows/docker/compose/SearchQnA-compose.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -# this file should be run in the root of the repo -services: - searchqna: - build: - context: docker - dockerfile: ./Dockerfile - image: ${REGISTRY:-opea}/searchqna:${TAG:-latest} - searchqna-ui: - build: - context: docker/ui - dockerfile: ./docker/Dockerfile - image: ${REGISTRY:-opea}/searchqna-ui:${TAG:-latest} diff --git a/.github/workflows/docker/compose/Translation-compose.yaml b/.github/workflows/docker/compose/Translation-compose.yaml deleted file mode 100644 index b085a0c8f..000000000 --- a/.github/workflows/docker/compose/Translation-compose.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -# this file should be run in the root of the repo -services: - translation: - build: - context: docker - dockerfile: ./Dockerfile - image: ${REGISTRY:-opea}/translation:${TAG:-latest} - translation-ui: - build: - context: docker/ui - dockerfile: ./docker/Dockerfile - image: ${REGISTRY:-opea}/translation-ui:${TAG:-latest} diff --git a/.github/workflows/pr-docker-compose-e2e.yml b/.github/workflows/pr-docker-compose-e2e.yml index 66d9417e9..687ae047a 100644 --- a/.github/workflows/pr-docker-compose-e2e.yml +++ b/.github/workflows/pr-docker-compose-e2e.yml @@ -5,11 +5,14 @@ name: E2E test with docker compose on: pull_request_target: - branches: [main] + branches: ["main", "*rc"] types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped paths: - - "**/docker/**" - - "**/tests/**" + - "**/Dockerfile**" + - "**.py" + - "**/docker_compose/**" + - "**/docker_image_build/**" + - "**/tests/test_compose**" - "**/ui/**" - "!**.md" - "!**.txt" @@ -22,19 +25,22 @@ concurrency: jobs: get-test-matrix: + if: ${{ !github.event.pull_request.draft }} uses: ./.github/workflows/_get-test-matrix.yml with: - diff_excluded_files: '.github|README.md|*.txt|deprecate|kubernetes|manifest|gmc|assets' + diff_excluded_files: '.github|*.md|*.txt|kubernetes|manifest|gmc|assets|benchmark' example-test: needs: [get-test-matrix] strategy: matrix: ${{ fromJSON(needs.get-test-matrix.outputs.run_matrix) }} fail-fast: false + if: ${{ !github.event.pull_request.draft }} uses: ./.github/workflows/_run-docker-compose.yml with: registry: "opea" tag: "ci" example: ${{ matrix.example }} hardware: ${{ matrix.hardware }} + diff_excluded_files: '.github|*.md|*.txt|kubernetes|manifest|gmc|assets|benchmark' secrets: inherit diff --git a/.github/workflows/pr-gmc-e2e.yaml b/.github/workflows/pr-gmc-e2e.yaml index 5b3b04863..c2faf3a61 100644 --- a/.github/workflows/pr-gmc-e2e.yaml +++ b/.github/workflows/pr-gmc-e2e.yaml @@ -5,15 +5,14 @@ name: E2E test with GMC on: pull_request_target: - branches: [main] + branches: ["main", "*rc"] types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped paths: - - "**/kubernetes/**" + - "**/kubernetes/**/gmc/**" - "**/tests/test_gmc**" - "!**.md" - "!**.txt" - - "!**/kubernetes/manifests/**" - workflow_dispatch: + - "!**/kubernetes/**/manifests/**" concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} @@ -23,9 +22,8 @@ jobs: job1: uses: ./.github/workflows/_get-test-matrix.yml with: - diff_excluded_files: '.github|deprecated|docker|assets|*.md|*.txt' - xeon_server_label: 'xeon' - gaudi_server_label: 'gaudi' + diff_excluded_files: '.github|docker_compose|manifest|assets|*.md|*.txt' + test_mode: "gmc" gmc-test: needs: [job1] diff --git a/.github/workflows/pr-manifest-e2e.yml b/.github/workflows/pr-manifest-e2e.yml index 43626ba3e..7cd9108c6 100644 --- a/.github/workflows/pr-manifest-e2e.yml +++ b/.github/workflows/pr-manifest-e2e.yml @@ -4,14 +4,15 @@ name: E2E test with manifests on: - pull_request: - branches: [main] + pull_request_target: + branches: ["main", "*rc"] types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped paths: - - "**/kubernetes/manifests/**" + - "**/kubernetes/**/manifests/**" - "**/tests/test_manifest**" - "!**.md" - "!**.txt" + - "!**/kubernetes/**/gmc/**" workflow_dispatch: concurrency: @@ -22,27 +23,18 @@ jobs: job1: uses: ./.github/workflows/_get-test-matrix.yml with: - diff_excluded_files: '.github|deprecated|docker|assets|*.md|*.txt' - xeon_server_label: 'xeon' - gaudi_server_label: 'gaudi' + diff_excluded_files: '.github|docker_compose|gmc|assets|*.md|*.txt|benchmark' + test_mode: "manifest" - mega-image-build: + run-example: needs: job1 strategy: matrix: ${{ fromJSON(needs.job1.outputs.run_matrix) }} - uses: ./.github/workflows/_image-build.yml - with: - image_tag: ${{ github.event.pull_request.head.sha }} - mega_service: "${{ matrix.example }}" - runner_label: "docker-build-${{ matrix.hardware }}" - - manifest-test: - needs: [job1, mega-image-build] - strategy: - matrix: ${{ fromJSON(needs.job1.outputs.run_matrix) }} - uses: ./.github/workflows/_manifest-e2e.yml + fail-fast: false + uses: ./.github/workflows/_example-workflow.yml with: + node: ${{ matrix.hardware }} example: ${{ matrix.example }} - hardware: ${{ matrix.hardware }} - tag: ${{ needs.mega-image-build.outputs.image_tag }} + tag: ${{ github.event.pull_request.head.sha }} + test_k8s: true secrets: inherit diff --git a/.github/workflows/push-image-build.yml b/.github/workflows/push-image-build.yml index f79567bea..0576f854c 100644 --- a/.github/workflows/push-image-build.yml +++ b/.github/workflows/push-image-build.yml @@ -7,9 +7,8 @@ on: push: branches: [ 'main' ] paths: - - "**/docker/*.py" - - "**/docker/Dockerfile" - - "**/docker/ui/**" + - "**.py" + - "**Dockerfile" workflow_dispatch: concurrency: @@ -20,38 +19,15 @@ jobs: job1: uses: ./.github/workflows/_get-test-matrix.yml - mega-image-build: + image-build: needs: job1 strategy: matrix: - workload: ${{ fromJSON(needs.job1.outputs.run_matrix).include.*.example }} - hardware: ["gaudi","xeon"] - runs-on: docker-build-${{ matrix.hardware }} - steps: - - name: Clean up Working Directory - run: | - sudo rm -rf ${{github.workspace}}/* - - - name: Checkout out Repo - uses: actions/checkout@v4 - - - name: Check Docker Compose File Exists - env: - service: ${{ matrix.workload }} - run: | - docker_compose_path="${{ github.workspace }}/.github/workflows/docker/compose/${service}-compose.yaml" - if [ -e $docker_compose_path ]; then - echo "file_exists=true" >> $GITHUB_ENV - echo "docker_compose_path=${docker_compose_path}" >> $GITHUB_ENV - else - echo "file_exists=false" >> $GITHUB_ENV - echo "docker_compose_path=${docker_compose_path} for this service does not exist, so skipping image build for this service!!!" - fi - - - name: Build Image - if: env.file_exists == 'true' - uses: opea-project/validation/actions/image-build@main - with: - work_dir: ${{ github.workspace }}/${{ matrix.workload }} - docker_compose_path: ${{ env.docker_compose_path }} - registry: ${OPEA_IMAGE_REPO}opea + example: ${{ fromJSON(needs.job1.outputs.run_matrix).include.*.example }} + node: ["gaudi","xeon"] + fail-fast: false + uses: ./.github/workflows/_example-workflow.yml + with: + node: ${{ matrix.node }} + example: ${{ matrix.example }} + secrets: inherit diff --git a/.github/workflows/push-infra-issue-creation.yml b/.github/workflows/push-infra-issue-creation.yml index 8d317863b..fe651da2b 100644 --- a/.github/workflows/push-infra-issue-creation.yml +++ b/.github/workflows/push-infra-issue-creation.yml @@ -5,7 +5,7 @@ on: push: branches: [ 'main','issue' ] paths: - - "**/docker/*/compose*.yaml" + - "**/docker_compose/**/compose*.yaml" name: Create an issue to GenAIInfra on push jobs: @@ -25,7 +25,7 @@ jobs: base_commit=$(git rev-parse HEAD~1) merged_commit=$(git log -1 --format='%H') changed_files="$(git diff --name-only ${base_commit} ${merged_commit} | \ - grep -E '.*/docker/.*/compose.*.yaml')" || true + grep -E '.*/docker_compose/.*/compose.*.yaml')" || true examples=$(printf '%s\n' "${changed_files[@]}" | grep '/' | cut -d'/' -f1 | sort -u) format_examples=$(echo "$examples" | tr '\n' ',') diff --git a/.github/workflows/scripts/build_push.sh b/.github/workflows/scripts/build_push.sh deleted file mode 100755 index cb17027ad..000000000 --- a/.github/workflows/scripts/build_push.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -set -xe - -IMAGE_REPO=${IMAGE_REPO:-$OPEA_IMAGE_REPO} -IMAGE_TAG=${IMAGE_TAG:-latest} - -function getImagenameFromMega() { - echo $(echo "$1" | tr '[:upper:]' '[:lower:]') -} - -function checkExist() { - IMAGE_NAME=$1 - if [ $(curl -X GET http://localhost:5000/v2/opea/${IMAGE_NAME}/tags/list | grep -c ${IMAGE_TAG}) -ne 0 ]; then - echo "true" - else - echo "false" - fi -} - -function docker_build() { - # check if if IMAGE_TAG is not "latest" and the image exists in the registry - if [ "$IMAGE_TAG" != "latest" ] && [ "$(checkExist $1)" == "true" ]; then - echo "Image ${IMAGE_REPO}opea/$1:$IMAGE_TAG already exists in the registry" - return - fi - # docker_build - if [ -z "$2" ]; then - DOCKERFILE_PATH=Dockerfile - else - DOCKERFILE_PATH=$2 - fi - echo "Building ${IMAGE_REPO}opea/$1:$IMAGE_TAG using Dockerfile $DOCKERFILE_PATH" - # if https_proxy and http_proxy are set, pass them to docker build - if [ -z "$https_proxy" ]; then - docker build --no-cache -t ${IMAGE_REPO}opea/$1:$IMAGE_TAG -f $DOCKERFILE_PATH . - else - docker build --no-cache -t ${IMAGE_REPO}opea/$1:$IMAGE_TAG --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f $DOCKERFILE_PATH . - fi - docker push ${IMAGE_REPO}opea/$1:$IMAGE_TAG - docker rmi ${IMAGE_REPO}opea/$1:$IMAGE_TAG -} - -# $1 is like "apple orange pear" -for MEGA_SVC in $1; do - case $MEGA_SVC in - "ChatQnA"|"CodeGen"|"CodeTrans"|"DocSum"|"Translation"|"AudioQnA"|"SearchQnA"|"FaqGen") - cd $MEGA_SVC/docker - IMAGE_NAME="$(getImagenameFromMega $MEGA_SVC)" - docker_build ${IMAGE_NAME} - cd ui - docker_build ${IMAGE_NAME}-ui docker/Dockerfile - if [ "$MEGA_SVC" == "ChatQnA" ];then - docker_build ${IMAGE_NAME}-conversation-ui docker/Dockerfile.react - fi - if [ "$MEGA_SVC" == "DocSum" ];then - docker_build ${IMAGE_NAME}-react-ui docker/Dockerfile.react - fi - if [ "$MEGA_SVC" == "CodeGen" ];then - docker_build ${IMAGE_NAME}-react-ui docker/Dockerfile.react - fi - ;; - "VisualQnA") - echo "Not supported yet" - ;; - *) - echo "Unknown function: $MEGA_SVC" - ;; - esac -done diff --git a/.github/workflows/scripts/get_test_matrix.sh b/.github/workflows/scripts/get_test_matrix.sh new file mode 100644 index 000000000..ac373f350 --- /dev/null +++ b/.github/workflows/scripts/get_test_matrix.sh @@ -0,0 +1,37 @@ +#!/bin/bash +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +# example: 'ChatQnA', 'CodeGen', ... +# hardware: 'xeon', 'gaudi', ... + +set -e +changed_files=$changed_files +test_mode=$test_mode +run_matrix="{\"include\":[" +hardware_list="xeon gaudi" # current support hardware list + +examples=$(printf '%s\n' "${changed_files[@]}" | grep '/' | cut -d'/' -f1 | sort -u) +for example in ${examples}; do + cd $WORKSPACE/$example + if [[ ! $(find . -type f | grep ${test_mode}) ]]; then continue; fi + + run_hardware="" + if [[ $(printf '%s\n' "${changed_files[@]}" | grep ${example} | cut -d'/' -f2 | grep -E '*.py|Dockerfile*|ui|docker_image_build' ) ]]; then + # run test on all hardware if megaservice or ui code change + run_hardware=$hardware_list + else + for hardware in ${hardware_list}; do + if [[ $(printf '%s\n' "${changed_files[@]}" | grep ${example} | grep -c ${hardware}) != 0 ]]; then + run_hardware="${hardware} ${run_hardware}" + fi + done + fi + for hw in ${run_hardware}; do + run_matrix="${run_matrix}{\"example\":\"${example}\",\"hardware\":\"${hw}\"}," + done +done + +run_matrix=$run_matrix"]}" +echo "run_matrix=${run_matrix}" +echo "run_matrix=${run_matrix}" >> $GITHUB_OUTPUT diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f568b8b90..cc00d4286 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,9 +14,9 @@ repos: - id: check-json exclude: | (?x)^( - ChatQnA/docker/ui/svelte/tsconfig.json| + ChatQnA/svelte/tsconfig.json| SearchQnA/ui/svelte/tsconfig.json| - DocSum/docker/ui/svelte/tsconfig.json + DocSum/svelte/tsconfig.json )$ - id: check-yaml args: [--allow-multiple-documents] diff --git a/AgentQnA/README.md b/AgentQnA/README.md index 11f603d97..43371522e 100644 --- a/AgentQnA/README.md +++ b/AgentQnA/README.md @@ -36,7 +36,7 @@ This example showcases a hierarchical multi-agent system for question-answering ``` cd GenAIComps - docker build -t opea/comps-agent-langchain:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/agent/langchain/docker/Dockerfile . + docker build -t opea/comps-agent-langchain:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/agent/langchain/Dockerfile . ``` 2. Launch tool services
@@ -67,7 +67,7 @@ This example showcases a hierarchical multi-agent system for question-answering To use openai llm, run command below. ``` - cd docker/openai/ + cd docker_compose/intel/cpu/xeon bash launch_agent_service_openai.sh ``` diff --git a/AgentQnA/docker/openai/docker-compose-agent-openai.yaml b/AgentQnA/docker_compose/intel/cpu/xeon/compose_openai.yaml similarity index 100% rename from AgentQnA/docker/openai/docker-compose-agent-openai.yaml rename to AgentQnA/docker_compose/intel/cpu/xeon/compose_openai.yaml diff --git a/AgentQnA/docker/openai/launch_agent_service_openai.sh b/AgentQnA/docker_compose/intel/cpu/xeon/launch_agent_service_openai.sh similarity index 87% rename from AgentQnA/docker/openai/launch_agent_service_openai.sh rename to AgentQnA/docker_compose/intel/cpu/xeon/launch_agent_service_openai.sh index 7cc197ccc..4ae02de8c 100644 --- a/AgentQnA/docker/openai/launch_agent_service_openai.sh +++ b/AgentQnA/docker_compose/intel/cpu/xeon/launch_agent_service_openai.sh @@ -10,4 +10,4 @@ export OPENAI_API_KEY=${OPENAI_API_KEY} export WORKER_AGENT_URL="http://${ip_address}:9095/v1/chat/completions" export CRAG_SERVER=http://${ip_address}:8080 -docker compose -f docker-compose-agent-openai.yaml up -d +docker compose -f compose_openai.yaml up -d diff --git a/ChatQnA/docker/ui/react/src/styles/components/_context.scss b/AgentQnA/docker_image_build/.README similarity index 100% rename from ChatQnA/docker/ui/react/src/styles/components/_context.scss rename to AgentQnA/docker_image_build/.README diff --git a/AgentQnA/tests/_test_agentqna_on_xeon.sh b/AgentQnA/tests/_test_compose_openai_on_xeon.sh similarity index 92% rename from AgentQnA/tests/_test_agentqna_on_xeon.sh rename to AgentQnA/tests/_test_compose_openai_on_xeon.sh index 489a827b3..ddb64c706 100644 --- a/AgentQnA/tests/_test_agentqna_on_xeon.sh +++ b/AgentQnA/tests/_test_compose_openai_on_xeon.sh @@ -15,18 +15,18 @@ export TOOLSET_PATH=$WORKDIR/GenAIExamples/AgentQnA/tools/ function build_agent_docker_image() { cd $WORKDIR if [ ! -d "GenAIComps" ] ; then - git clone https://github.com/opea-project/GenAIComps.git + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ fi cd GenAIComps echo PWD: $(pwd) - docker build -t opea/comps-agent-langchain:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/agent/langchain/docker/Dockerfile . + docker build -t opea/comps-agent-langchain:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/agent/langchain/Dockerfile . } function start_services() { echo "Starting CRAG server" docker run -d -p=8080:8000 docker.io/aicrowd/kdd-cup-24-crag-mock-api:v0 echo "Starting Agent services" - cd $WORKDIR/GenAIExamples/AgentQnA/docker/openai + cd $WORKDIR/GenAIExamples/AgentQnA/docker_compose/intel/cpu/xeon/ bash launch_agent_service_openai.sh } diff --git a/AudioQnA/docker/Dockerfile b/AudioQnA/Dockerfile similarity index 100% rename from AudioQnA/docker/Dockerfile rename to AudioQnA/Dockerfile diff --git a/AudioQnA/README.md b/AudioQnA/README.md index 8433e4d4d..0f05d0f02 100644 --- a/AudioQnA/README.md +++ b/AudioQnA/README.md @@ -8,11 +8,11 @@ The AudioQnA service can be deployed on either Intel Gaudi2 or Intel XEON Scalab ### Deploy AudioQnA on Gaudi -Refer to the [Gaudi Guide](./docker/gaudi/README.md) for instructions on deploying AudioQnA on Gaudi. +Refer to the [Gaudi Guide](./docker_compose/intel/hpu/gaudi/README.md) for instructions on deploying AudioQnA on Gaudi. ### Deploy AudioQnA on Xeon -Refer to the [Xeon Guide](./docker/xeon/README.md) for instructions on deploying AudioQnA on Xeon. +Refer to the [Xeon Guide](./docker_compose/intel/cpu/xeon/README.md) for instructions on deploying AudioQnA on Xeon. ## Supported Models diff --git a/AudioQnA/docker/audioqna.py b/AudioQnA/audioqna.py similarity index 100% rename from AudioQnA/docker/audioqna.py rename to AudioQnA/audioqna.py diff --git a/AudioQnA/docker/xeon/README.md b/AudioQnA/docker_compose/intel/cpu/xeon/README.md similarity index 93% rename from AudioQnA/docker/xeon/README.md rename to AudioQnA/docker_compose/intel/cpu/xeon/README.md index 3537906e1..338771dd0 100644 --- a/AudioQnA/docker/xeon/README.md +++ b/AudioQnA/docker_compose/intel/cpu/xeon/README.md @@ -14,10 +14,10 @@ cd GenAIComps ### 2. Build ASR Image ```bash -docker build -t opea/whisper:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/asr/whisper/Dockerfile . +docker build -t opea/whisper:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/asr/whisper/dependency/Dockerfile . -docker build -t opea/asr:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/asr/Dockerfile . +docker build -t opea/asr:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/asr/whisper/Dockerfile . ``` ### 3. Build LLM Image @@ -29,9 +29,9 @@ docker build --no-cache -t opea/llm-tgi:latest --build-arg https_proxy=$https_pr ### 4. Build TTS Image ```bash -docker build -t opea/speecht5:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/tts/speecht5/Dockerfile . +docker build -t opea/speecht5:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/tts/speecht5/dependency/Dockerfile . -docker build -t opea/tts:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/tts/Dockerfile . +docker build -t opea/tts:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/tts/speecht5/Dockerfile . ``` ### 6. Build MegaService Docker Image @@ -40,7 +40,7 @@ To construct the Mega Service, we utilize the [GenAIComps](https://github.com/op ```bash git clone https://github.com/opea-project/GenAIExamples.git -cd GenAIExamples/AudioQnA/docker +cd GenAIExamples/AudioQnA/ docker build --no-cache -t opea/audioqna:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile . ``` @@ -80,7 +80,7 @@ export LLM_SERVICE_PORT=3007 ## 🚀 Start the MegaService ```bash -cd GenAIExamples/AudioQnA/docker/xeon/ +cd GenAIExamples/AudioQnA/docker_compose/intel/cpu/xeon/ docker compose up -d ``` diff --git a/AudioQnA/docker/xeon/compose.yaml b/AudioQnA/docker_compose/intel/cpu/xeon/compose.yaml similarity index 100% rename from AudioQnA/docker/xeon/compose.yaml rename to AudioQnA/docker_compose/intel/cpu/xeon/compose.yaml diff --git a/AudioQnA/docker/gaudi/README.md b/AudioQnA/docker_compose/intel/hpu/gaudi/README.md similarity index 92% rename from AudioQnA/docker/gaudi/README.md rename to AudioQnA/docker_compose/intel/hpu/gaudi/README.md index 999a1ac4e..28ec3f402 100644 --- a/AudioQnA/docker/gaudi/README.md +++ b/AudioQnA/docker_compose/intel/hpu/gaudi/README.md @@ -14,10 +14,10 @@ cd GenAIComps ### 2. Build ASR Image ```bash -docker build -t opea/whisper-gaudi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/asr/whisper/Dockerfile_hpu . +docker build -t opea/whisper-gaudi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/asr/whisper/dependency/Dockerfile.intel_hpu . -docker build -t opea/asr:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/asr/Dockerfile . +docker build -t opea/asr:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/asr/whisper/Dockerfile . ``` ### 3. Build LLM Image @@ -29,9 +29,9 @@ docker build --no-cache -t opea/llm-tgi:latest --build-arg https_proxy=$https_pr ### 4. Build TTS Image ```bash -docker build -t opea/speecht5-gaudi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/tts/speecht5/Dockerfile_hpu . +docker build -t opea/speecht5-gaudi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/tts/speecht5/dependency/Dockerfile.intel_hpu . -docker build -t opea/tts:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/tts/Dockerfile . +docker build -t opea/tts:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/tts/speecht5/Dockerfile . ``` ### 6. Build MegaService Docker Image @@ -40,7 +40,7 @@ To construct the Mega Service, we utilize the [GenAIComps](https://github.com/op ```bash git clone https://github.com/opea-project/GenAIExamples.git -cd GenAIExamples/AudioQnA/docker +cd GenAIExamples/AudioQnA/ docker build --no-cache -t opea/audioqna:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile . ``` @@ -80,7 +80,7 @@ export LLM_SERVICE_PORT=3007 ## 🚀 Start the MegaService ```bash -cd GenAIExamples/AudioQnA/docker/gaudi/ +cd GenAIExamples/AudioQnA/docker_compose/intel/hpu/gaudi/ docker compose up -d ``` diff --git a/AudioQnA/docker/gaudi/compose.yaml b/AudioQnA/docker_compose/intel/hpu/gaudi/compose.yaml similarity index 100% rename from AudioQnA/docker/gaudi/compose.yaml rename to AudioQnA/docker_compose/intel/hpu/gaudi/compose.yaml diff --git a/AudioQnA/docker/docker_build_compose.yaml b/AudioQnA/docker_image_build/build.yaml similarity index 82% rename from AudioQnA/docker/docker_build_compose.yaml rename to AudioQnA/docker_image_build/build.yaml index e78d44af7..50c514073 100644 --- a/AudioQnA/docker/docker_build_compose.yaml +++ b/AudioQnA/docker_image_build/build.yaml @@ -8,24 +8,25 @@ services: http_proxy: ${http_proxy} https_proxy: ${https_proxy} no_proxy: ${no_proxy} + context: ../ dockerfile: ./Dockerfile image: ${REGISTRY:-opea}/audioqna:${TAG:-latest} whisper-gaudi: build: context: GenAIComps - dockerfile: comps/asr/whisper/Dockerfile_hpu + dockerfile: comps/asr/whisper/dependency/Dockerfile.intel_hpu extends: audioqna image: ${REGISTRY:-opea}/whisper-gaudi:${TAG:-latest} whisper: build: context: GenAIComps - dockerfile: comps/asr/whisper/Dockerfile + dockerfile: comps/asr/whisper/dependency/Dockerfile extends: audioqna image: ${REGISTRY:-opea}/whisper:${TAG:-latest} asr: build: context: GenAIComps - dockerfile: comps/asr/Dockerfile + dockerfile: comps/asr/whisper/Dockerfile extends: audioqna image: ${REGISTRY:-opea}/asr:${TAG:-latest} llm-tgi: @@ -37,18 +38,18 @@ services: speecht5-gaudi: build: context: GenAIComps - dockerfile: comps/tts/speecht5/Dockerfile_hpu + dockerfile: comps/tts/speecht5/dependency/Dockerfile.intel_hpu extends: audioqna image: ${REGISTRY:-opea}/speecht5-gaudi:${TAG:-latest} speecht5: build: context: GenAIComps - dockerfile: comps/tts/speecht5/Dockerfile + dockerfile: comps/tts/speecht5/dependency/Dockerfile extends: audioqna image: ${REGISTRY:-opea}/speecht5:${TAG:-latest} tts: build: context: GenAIComps - dockerfile: comps/tts/Dockerfile + dockerfile: comps/tts/speecht5/Dockerfile extends: audioqna image: ${REGISTRY:-opea}/tts:${TAG:-latest} diff --git a/AudioQnA/kubernetes/manifests/README.md b/AudioQnA/kubernetes/intel/README.md similarity index 100% rename from AudioQnA/kubernetes/manifests/README.md rename to AudioQnA/kubernetes/intel/README.md diff --git a/AudioQnA/kubernetes/README.md b/AudioQnA/kubernetes/intel/README_gmc.md similarity index 93% rename from AudioQnA/kubernetes/README.md rename to AudioQnA/kubernetes/intel/README_gmc.md index 9cbb9473a..615d9d2e6 100644 --- a/AudioQnA/kubernetes/README.md +++ b/AudioQnA/kubernetes/intel/README_gmc.md @@ -30,7 +30,7 @@ For Gaudi: - speecht5-gaudi: opea/speecht5-gaudi:latest > [NOTE] -> Please refer to [Xeon README](https://github.com/opea-project/GenAIExamples/blob/main/AudioQnA/docker/xeon/README.md) or [Gaudi README](https://github.com/opea-project/GenAIExamples/blob/main/AudioQnA/docker/gaudi/README.md) to build the OPEA images. These too will be available on Docker Hub soon to simplify use. +> Please refer to [Xeon README](https://github.com/opea-project/GenAIExamples/blob/main/AudioQnA/docker_compose/intel/cpu/xeon/README.md) or [Gaudi README](https://github.com/opea-project/GenAIExamples/blob/main/AudioQnA/docker_compose/intel/hpu/gaudi/README.md) to build the OPEA images. These too will be available on Docker Hub soon to simplify use. ## Deploy AudioQnA pipeline This involves deploying the AudioQnA custom resource. You can use audioQnA_xeon.yaml or if you have a Gaudi cluster, you could use audioQnA_gaudi.yaml. diff --git a/AudioQnA/kubernetes/audioQnA_xeon.yaml b/AudioQnA/kubernetes/intel/cpu/xeon/gmc/audioQnA_xeon.yaml similarity index 100% rename from AudioQnA/kubernetes/audioQnA_xeon.yaml rename to AudioQnA/kubernetes/intel/cpu/xeon/gmc/audioQnA_xeon.yaml diff --git a/AudioQnA/kubernetes/manifests/xeon/audioqna.yaml b/AudioQnA/kubernetes/intel/cpu/xeon/manifest/audioqna.yaml similarity index 100% rename from AudioQnA/kubernetes/manifests/xeon/audioqna.yaml rename to AudioQnA/kubernetes/intel/cpu/xeon/manifest/audioqna.yaml diff --git a/AudioQnA/kubernetes/audioQnA_gaudi.yaml b/AudioQnA/kubernetes/intel/hpu/gaudi/gmc/audioQnA_gaudi.yaml similarity index 100% rename from AudioQnA/kubernetes/audioQnA_gaudi.yaml rename to AudioQnA/kubernetes/intel/hpu/gaudi/gmc/audioQnA_gaudi.yaml diff --git a/AudioQnA/kubernetes/manifests/gaudi/audioqna.yaml b/AudioQnA/kubernetes/intel/hpu/gaudi/manifest/audioqna.yaml similarity index 100% rename from AudioQnA/kubernetes/manifests/gaudi/audioqna.yaml rename to AudioQnA/kubernetes/intel/hpu/gaudi/manifest/audioqna.yaml diff --git a/AudioQnA/tests/test_audioqna_on_gaudi.sh b/AudioQnA/tests/test_compose_on_gaudi.sh similarity index 91% rename from AudioQnA/tests/test_audioqna_on_gaudi.sh rename to AudioQnA/tests/test_compose_on_gaudi.sh index a44142b2c..c8fde79b2 100644 --- a/AudioQnA/tests/test_audioqna_on_gaudi.sh +++ b/AudioQnA/tests/test_compose_on_gaudi.sh @@ -15,19 +15,19 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="audioqna whisper-gaudi asr llm-tgi speecht5-gaudi tts" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/tgi-gaudi:2.0.1 docker images && sleep 1s } function start_services() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi export HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN} export TGI_LLM_ENDPOINT=http://$ip_address:3006 @@ -116,7 +116,7 @@ function validate_megaservice() { #} function stop_docker() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi docker compose stop && docker compose rm -f } diff --git a/AudioQnA/tests/test_audioqna_on_xeon.sh b/AudioQnA/tests/test_compose_on_xeon.sh similarity index 90% rename from AudioQnA/tests/test_audioqna_on_xeon.sh rename to AudioQnA/tests/test_compose_on_xeon.sh index 4600dbc65..b37440b1b 100644 --- a/AudioQnA/tests/test_audioqna_on_xeon.sh +++ b/AudioQnA/tests/test_compose_on_xeon.sh @@ -15,19 +15,19 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="audioqna whisper asr llm-tgi speecht5 tts" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/tgi-gaudi:2.0.1 docker images && sleep 1s } function start_services() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon/ export HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN} export TGI_LLM_ENDPOINT=http://$ip_address:3006 export LLM_MODEL_ID=Intel/neural-chat-7b-v3-3 @@ -106,7 +106,7 @@ function validate_megaservice() { #} function stop_docker() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon/ docker compose stop && docker compose rm -f } diff --git a/AudioQnA/tests/test_gmc_on_gaudi.sh b/AudioQnA/tests/test_gmc_on_gaudi.sh index d9f790289..898a91524 100755 --- a/AudioQnA/tests/test_gmc_on_gaudi.sh +++ b/AudioQnA/tests/test_gmc_on_gaudi.sh @@ -96,12 +96,12 @@ fi case "$1" in install_AudioQnA) - pushd AudioQnA/kubernetes + pushd AudioQnA/kubernetes/intel/hpu/gaudi/gmc install_audioqa popd ;; validate_AudioQnA) - pushd AudioQnA/kubernetes + pushd AudioQnA/kubernetes/intel/hpu/gaudi/gmc validate_audioqa popd ;; diff --git a/AudioQnA/tests/test_gmc_on_xeon.sh b/AudioQnA/tests/test_gmc_on_xeon.sh index 5ef645075..ed6adddd2 100755 --- a/AudioQnA/tests/test_gmc_on_xeon.sh +++ b/AudioQnA/tests/test_gmc_on_xeon.sh @@ -96,12 +96,12 @@ fi case "$1" in install_AudioQnA) - pushd AudioQnA/kubernetes + pushd AudioQnA/kubernetes/intel/cpu/xeon/gmc install_audioqa popd ;; validate_AudioQnA) - pushd AudioQnA/kubernetes + pushd AudioQnA/kubernetes/intel/cpu/xeon/gmc validate_audioqa popd ;; diff --git a/AudioQnA/docker/ui/docker/Dockerfile b/AudioQnA/ui/docker/Dockerfile similarity index 100% rename from AudioQnA/docker/ui/docker/Dockerfile rename to AudioQnA/ui/docker/Dockerfile diff --git a/AudioQnA/docker/ui/svelte/.editorconfig b/AudioQnA/ui/svelte/.editorconfig similarity index 100% rename from AudioQnA/docker/ui/svelte/.editorconfig rename to AudioQnA/ui/svelte/.editorconfig diff --git a/AudioQnA/docker/ui/svelte/.env b/AudioQnA/ui/svelte/.env similarity index 100% rename from AudioQnA/docker/ui/svelte/.env rename to AudioQnA/ui/svelte/.env diff --git a/AudioQnA/docker/ui/svelte/.eslintignore b/AudioQnA/ui/svelte/.eslintignore similarity index 100% rename from AudioQnA/docker/ui/svelte/.eslintignore rename to AudioQnA/ui/svelte/.eslintignore diff --git a/AudioQnA/docker/ui/svelte/.eslintrc.cjs b/AudioQnA/ui/svelte/.eslintrc.cjs similarity index 100% rename from AudioQnA/docker/ui/svelte/.eslintrc.cjs rename to AudioQnA/ui/svelte/.eslintrc.cjs diff --git a/AudioQnA/docker/ui/svelte/.prettierignore b/AudioQnA/ui/svelte/.prettierignore similarity index 100% rename from AudioQnA/docker/ui/svelte/.prettierignore rename to AudioQnA/ui/svelte/.prettierignore diff --git a/AudioQnA/docker/ui/svelte/.prettierrc b/AudioQnA/ui/svelte/.prettierrc similarity index 100% rename from AudioQnA/docker/ui/svelte/.prettierrc rename to AudioQnA/ui/svelte/.prettierrc diff --git a/AudioQnA/docker/ui/svelte/README.md b/AudioQnA/ui/svelte/README.md similarity index 82% rename from AudioQnA/docker/ui/svelte/README.md rename to AudioQnA/ui/svelte/README.md index 43d68cc54..cbad57244 100644 --- a/AudioQnA/docker/ui/svelte/README.md +++ b/AudioQnA/ui/svelte/README.md @@ -2,8 +2,8 @@ ## 📸 Project Screenshots -![project-screenshot](../../../assets/img/audio_ui.png) -![project-screenshot](../../../assets/img/audio_ui_record.png) +![project-screenshot](../../assets/img/audio_ui.png) +![project-screenshot](../../assets/img/audio_ui_record.png) ## 🧐 Features diff --git a/AudioQnA/docker/ui/svelte/package.json b/AudioQnA/ui/svelte/package.json similarity index 100% rename from AudioQnA/docker/ui/svelte/package.json rename to AudioQnA/ui/svelte/package.json diff --git a/AudioQnA/docker/ui/svelte/postcss.config.cjs b/AudioQnA/ui/svelte/postcss.config.cjs similarity index 100% rename from AudioQnA/docker/ui/svelte/postcss.config.cjs rename to AudioQnA/ui/svelte/postcss.config.cjs diff --git a/AudioQnA/docker/ui/svelte/src/app.d.ts b/AudioQnA/ui/svelte/src/app.d.ts similarity index 100% rename from AudioQnA/docker/ui/svelte/src/app.d.ts rename to AudioQnA/ui/svelte/src/app.d.ts diff --git a/AudioQnA/docker/ui/svelte/src/app.html b/AudioQnA/ui/svelte/src/app.html similarity index 100% rename from AudioQnA/docker/ui/svelte/src/app.html rename to AudioQnA/ui/svelte/src/app.html diff --git a/AudioQnA/docker/ui/svelte/src/app.postcss b/AudioQnA/ui/svelte/src/app.postcss similarity index 100% rename from AudioQnA/docker/ui/svelte/src/app.postcss rename to AudioQnA/ui/svelte/src/app.postcss diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/png/audio1.png b/AudioQnA/ui/svelte/src/lib/assets/icons/png/audio1.png similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/png/audio1.png rename to AudioQnA/ui/svelte/src/lib/assets/icons/png/audio1.png diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/png/audio2.png b/AudioQnA/ui/svelte/src/lib/assets/icons/png/audio2.png similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/png/audio2.png rename to AudioQnA/ui/svelte/src/lib/assets/icons/png/audio2.png diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/arrow-path-icon.svelte b/AudioQnA/ui/svelte/src/lib/assets/icons/svelte/arrow-path-icon.svelte similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/arrow-path-icon.svelte rename to AudioQnA/ui/svelte/src/lib/assets/icons/svelte/arrow-path-icon.svelte diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/assistant.svelte b/AudioQnA/ui/svelte/src/lib/assets/icons/svelte/assistant.svelte similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/assistant.svelte rename to AudioQnA/ui/svelte/src/lib/assets/icons/svelte/assistant.svelte diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/chat-bubble-left-icon.svelte b/AudioQnA/ui/svelte/src/lib/assets/icons/svelte/chat-bubble-left-icon.svelte similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/chat-bubble-left-icon.svelte rename to AudioQnA/ui/svelte/src/lib/assets/icons/svelte/chat-bubble-left-icon.svelte diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/chat.svelte b/AudioQnA/ui/svelte/src/lib/assets/icons/svelte/chat.svelte similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/chat.svelte rename to AudioQnA/ui/svelte/src/lib/assets/icons/svelte/chat.svelte diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/check-icon.svelte b/AudioQnA/ui/svelte/src/lib/assets/icons/svelte/check-icon.svelte similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/check-icon.svelte rename to AudioQnA/ui/svelte/src/lib/assets/icons/svelte/check-icon.svelte diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/intel.svelte b/AudioQnA/ui/svelte/src/lib/assets/icons/svelte/intel.svelte similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/intel.svelte rename to AudioQnA/ui/svelte/src/lib/assets/icons/svelte/intel.svelte diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/loading-button-spinner-icon.svelte b/AudioQnA/ui/svelte/src/lib/assets/icons/svelte/loading-button-spinner-icon.svelte similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/loading-button-spinner-icon.svelte rename to AudioQnA/ui/svelte/src/lib/assets/icons/svelte/loading-button-spinner-icon.svelte diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/message-avatar.svelte b/AudioQnA/ui/svelte/src/lib/assets/icons/svelte/message-avatar.svelte similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/message-avatar.svelte rename to AudioQnA/ui/svelte/src/lib/assets/icons/svelte/message-avatar.svelte diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/plus-icon.svelte b/AudioQnA/ui/svelte/src/lib/assets/icons/svelte/plus-icon.svelte similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/plus-icon.svelte rename to AudioQnA/ui/svelte/src/lib/assets/icons/svelte/plus-icon.svelte diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/portrait.svelte b/AudioQnA/ui/svelte/src/lib/assets/icons/svelte/portrait.svelte similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/portrait.svelte rename to AudioQnA/ui/svelte/src/lib/assets/icons/svelte/portrait.svelte diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/voice-button.svelte b/AudioQnA/ui/svelte/src/lib/assets/icons/svelte/voice-button.svelte similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/voice-button.svelte rename to AudioQnA/ui/svelte/src/lib/assets/icons/svelte/voice-button.svelte diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/x-mark-icon.svelte b/AudioQnA/ui/svelte/src/lib/assets/icons/svelte/x-mark-icon.svelte similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svelte/x-mark-icon.svelte rename to AudioQnA/ui/svelte/src/lib/assets/icons/svelte/x-mark-icon.svelte diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/1.svg b/AudioQnA/ui/svelte/src/lib/assets/icons/svg/1.svg similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/1.svg rename to AudioQnA/ui/svelte/src/lib/assets/icons/svg/1.svg diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/2.svg b/AudioQnA/ui/svelte/src/lib/assets/icons/svg/2.svg similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/2.svg rename to AudioQnA/ui/svelte/src/lib/assets/icons/svg/2.svg diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/3.svg b/AudioQnA/ui/svelte/src/lib/assets/icons/svg/3.svg similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/3.svg rename to AudioQnA/ui/svelte/src/lib/assets/icons/svg/3.svg diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/4.svg b/AudioQnA/ui/svelte/src/lib/assets/icons/svg/4.svg similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/4.svg rename to AudioQnA/ui/svelte/src/lib/assets/icons/svg/4.svg diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/5.svg b/AudioQnA/ui/svelte/src/lib/assets/icons/svg/5.svg similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/5.svg rename to AudioQnA/ui/svelte/src/lib/assets/icons/svg/5.svg diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/Voice-Wave-Dark.svg b/AudioQnA/ui/svelte/src/lib/assets/icons/svg/Voice-Wave-Dark.svg similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/Voice-Wave-Dark.svg rename to AudioQnA/ui/svelte/src/lib/assets/icons/svg/Voice-Wave-Dark.svg diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/stop-recording.svg b/AudioQnA/ui/svelte/src/lib/assets/icons/svg/stop-recording.svg similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/stop-recording.svg rename to AudioQnA/ui/svelte/src/lib/assets/icons/svg/stop-recording.svg diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/upload.svg b/AudioQnA/ui/svelte/src/lib/assets/icons/svg/upload.svg similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/upload.svg rename to AudioQnA/ui/svelte/src/lib/assets/icons/svg/upload.svg diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/voice.svg b/AudioQnA/ui/svelte/src/lib/assets/icons/svg/voice.svg similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/voice.svg rename to AudioQnA/ui/svelte/src/lib/assets/icons/svg/voice.svg diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/voiceOff.svg b/AudioQnA/ui/svelte/src/lib/assets/icons/svg/voiceOff.svg similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/voiceOff.svg rename to AudioQnA/ui/svelte/src/lib/assets/icons/svg/voiceOff.svg diff --git a/AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/voiceOn.svg b/AudioQnA/ui/svelte/src/lib/assets/icons/svg/voiceOn.svg similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/assets/icons/svg/voiceOn.svg rename to AudioQnA/ui/svelte/src/lib/assets/icons/svg/voiceOn.svg diff --git a/AudioQnA/docker/ui/svelte/src/lib/common/sse.d.ts b/AudioQnA/ui/svelte/src/lib/common/sse.d.ts similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/common/sse.d.ts rename to AudioQnA/ui/svelte/src/lib/common/sse.d.ts diff --git a/AudioQnA/docker/ui/svelte/src/lib/common/timediff.ts b/AudioQnA/ui/svelte/src/lib/common/timediff.ts similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/common/timediff.ts rename to AudioQnA/ui/svelte/src/lib/common/timediff.ts diff --git a/AudioQnA/docker/ui/svelte/src/lib/components/layout.svelte b/AudioQnA/ui/svelte/src/lib/components/layout.svelte similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/components/layout.svelte rename to AudioQnA/ui/svelte/src/lib/components/layout.svelte diff --git a/AudioQnA/docker/ui/svelte/src/lib/components/shared/shared-utils.ts b/AudioQnA/ui/svelte/src/lib/components/shared/shared-utils.ts similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/components/shared/shared-utils.ts rename to AudioQnA/ui/svelte/src/lib/components/shared/shared-utils.ts diff --git a/AudioQnA/docker/ui/svelte/src/lib/components/shared/shared.store.ts b/AudioQnA/ui/svelte/src/lib/components/shared/shared.store.ts similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/components/shared/shared.store.ts rename to AudioQnA/ui/svelte/src/lib/components/shared/shared.store.ts diff --git a/AudioQnA/docker/ui/svelte/src/lib/components/shared/shared.type.ts b/AudioQnA/ui/svelte/src/lib/components/shared/shared.type.ts similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/components/shared/shared.type.ts rename to AudioQnA/ui/svelte/src/lib/components/shared/shared.type.ts diff --git a/AudioQnA/docker/ui/svelte/src/lib/components/talkbot/store.ts b/AudioQnA/ui/svelte/src/lib/components/talkbot/store.ts similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/components/talkbot/store.ts rename to AudioQnA/ui/svelte/src/lib/components/talkbot/store.ts diff --git a/AudioQnA/docker/ui/svelte/src/lib/components/talkbot/voice-button.svelte b/AudioQnA/ui/svelte/src/lib/components/talkbot/voice-button.svelte similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/components/talkbot/voice-button.svelte rename to AudioQnA/ui/svelte/src/lib/components/talkbot/voice-button.svelte diff --git a/AudioQnA/docker/ui/svelte/src/lib/components/talkbot/voice-wave.svelte b/AudioQnA/ui/svelte/src/lib/components/talkbot/voice-wave.svelte similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/components/talkbot/voice-wave.svelte rename to AudioQnA/ui/svelte/src/lib/components/talkbot/voice-wave.svelte diff --git a/AudioQnA/docker/ui/svelte/src/lib/components/topnavigation/Index.svelte b/AudioQnA/ui/svelte/src/lib/components/topnavigation/Index.svelte similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/components/topnavigation/Index.svelte rename to AudioQnA/ui/svelte/src/lib/components/topnavigation/Index.svelte diff --git a/AudioQnA/docker/ui/svelte/src/lib/modules/chat/chat-audio.svelte b/AudioQnA/ui/svelte/src/lib/modules/chat/chat-audio.svelte similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/modules/chat/chat-audio.svelte rename to AudioQnA/ui/svelte/src/lib/modules/chat/chat-audio.svelte diff --git a/AudioQnA/docker/ui/svelte/src/lib/modules/chat/chat-message.svelte b/AudioQnA/ui/svelte/src/lib/modules/chat/chat-message.svelte similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/modules/chat/chat-message.svelte rename to AudioQnA/ui/svelte/src/lib/modules/chat/chat-message.svelte diff --git a/AudioQnA/docker/ui/svelte/src/lib/modules/chat/message-timer.svelte b/AudioQnA/ui/svelte/src/lib/modules/chat/message-timer.svelte similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/modules/chat/message-timer.svelte rename to AudioQnA/ui/svelte/src/lib/modules/chat/message-timer.svelte diff --git a/AudioQnA/docker/ui/svelte/src/lib/modules/chat/network.ts b/AudioQnA/ui/svelte/src/lib/modules/chat/network.ts similarity index 100% rename from AudioQnA/docker/ui/svelte/src/lib/modules/chat/network.ts rename to AudioQnA/ui/svelte/src/lib/modules/chat/network.ts diff --git a/AudioQnA/docker/ui/svelte/src/routes/+layout.svelte b/AudioQnA/ui/svelte/src/routes/+layout.svelte similarity index 100% rename from AudioQnA/docker/ui/svelte/src/routes/+layout.svelte rename to AudioQnA/ui/svelte/src/routes/+layout.svelte diff --git a/AudioQnA/docker/ui/svelte/src/routes/+page.svelte b/AudioQnA/ui/svelte/src/routes/+page.svelte similarity index 100% rename from AudioQnA/docker/ui/svelte/src/routes/+page.svelte rename to AudioQnA/ui/svelte/src/routes/+page.svelte diff --git a/AudioQnA/docker/ui/svelte/static/favicon.png b/AudioQnA/ui/svelte/static/favicon.png similarity index 100% rename from AudioQnA/docker/ui/svelte/static/favicon.png rename to AudioQnA/ui/svelte/static/favicon.png diff --git a/AudioQnA/docker/ui/svelte/svelte.config.js b/AudioQnA/ui/svelte/svelte.config.js similarity index 100% rename from AudioQnA/docker/ui/svelte/svelte.config.js rename to AudioQnA/ui/svelte/svelte.config.js diff --git a/AudioQnA/docker/ui/svelte/tailwind.config.cjs b/AudioQnA/ui/svelte/tailwind.config.cjs similarity index 100% rename from AudioQnA/docker/ui/svelte/tailwind.config.cjs rename to AudioQnA/ui/svelte/tailwind.config.cjs diff --git a/AudioQnA/docker/ui/svelte/tsconfig.json b/AudioQnA/ui/svelte/tsconfig.json similarity index 100% rename from AudioQnA/docker/ui/svelte/tsconfig.json rename to AudioQnA/ui/svelte/tsconfig.json diff --git a/AudioQnA/docker/ui/svelte/vite.config.ts b/AudioQnA/ui/svelte/vite.config.ts similarity index 100% rename from AudioQnA/docker/ui/svelte/vite.config.ts rename to AudioQnA/ui/svelte/vite.config.ts diff --git a/ChatQnA/docker/Dockerfile b/ChatQnA/Dockerfile similarity index 100% rename from ChatQnA/docker/Dockerfile rename to ChatQnA/Dockerfile diff --git a/ChatQnA/docker/Dockerfile_guardrails b/ChatQnA/Dockerfile.guardrails similarity index 100% rename from ChatQnA/docker/Dockerfile_guardrails rename to ChatQnA/Dockerfile.guardrails diff --git a/ChatQnA/docker/Dockerfile_no_wrapper b/ChatQnA/Dockerfile.no_wrapper similarity index 100% rename from ChatQnA/docker/Dockerfile_no_wrapper rename to ChatQnA/Dockerfile.no_wrapper diff --git a/ChatQnA/docker/Dockerfile_without_rerank b/ChatQnA/Dockerfile.without_rerank similarity index 100% rename from ChatQnA/docker/Dockerfile_without_rerank rename to ChatQnA/Dockerfile.without_rerank diff --git a/ChatQnA/README.md b/ChatQnA/README.md index 4a02ff9fb..5f6f2bd22 100644 --- a/ChatQnA/README.md +++ b/ChatQnA/README.md @@ -115,7 +115,7 @@ Currently we support two ways of deploying ChatQnA services with docker compose: Two type of UI are supported now, choose one you like and pull the referred docker image. - If you choose conversational UI, follow the [instruction](https://github.com/opea-project/GenAIExamples/tree/main/ChatQnA/docker/gaudi#-launch-the-conversational-ui-optional) and modify the [compose.yaml](./docker/xeon/compose.yaml). + If you choose conversational UI, follow the [instruction](https://github.com/opea-project/GenAIExamples/tree/main/ChatQnA/docker_compose/intel/hpu/gaudi#-launch-the-conversational-ui-optional) and modify the [compose.yaml](./docker_compose/intel/cpu/xeon/compose.yaml). ```bash docker pull opea/chatqna-ui:latest @@ -168,36 +168,36 @@ To set up environment variables for deploying ChatQnA services, follow these ste ```bash # on Gaudi - source ./docker/gaudi/set_env.sh + source ./docker_compose/intel/hpu/gaudi/set_env.sh # on Xeon - source ./docker/xeon/set_env.sh + source ./docker_compose/intel/cpu/xeon/set_env.sh # on Nvidia GPU - source ./docker/gpu/set_env.sh + source ./docker_compose/nvidia/gpu/set_env.sh ``` ### Deploy ChatQnA on Gaudi -Find the corresponding [compose.yaml](./docker/gaudi/compose.yaml). +Find the corresponding [compose.yaml](./docker_compose/intel/hpu/gaudi/compose.yaml). ```bash -cd GenAIExamples/ChatQnA/docker/gaudi/ +cd GenAIExamples/ChatQnA/docker_compose/intel/hpu/gaudi/ docker compose up -d ``` > Notice: Currently only the **Habana Driver 1.16.x** is supported for Gaudi. -Refer to the [Gaudi Guide](./docker/gaudi/README.md) to build docker images from source. +Refer to the [Gaudi Guide](./docker_compose/intel/hpu/gaudi/README.md) to build docker images from source. ### Deploy ChatQnA on Xeon -Find the corresponding [compose.yaml](./docker/xeon/compose.yaml). +Find the corresponding [compose.yaml](./docker_compose/intel/cpu/xeon/compose.yaml). ```bash -cd GenAIExamples/ChatQnA/docker/xeon/ +cd GenAIExamples/ChatQnA/docker_compose/intel/cpu/xeon/ docker compose up -d ``` -Refer to the [Xeon Guide](./docker/xeon/README.md) for more instructions on building docker images from source. +Refer to the [Xeon Guide](./docker_compose/intel/cpu/xeon/README.md) for more instructions on building docker images from source. ### Deploy ChatQnA on NVIDIA GPU @@ -267,7 +267,7 @@ Two ways of consuming ChatQnA Service: ## Troubleshooting -1. If you get errors like "Access Denied", [validate micro service](https://github.com/opea-project/GenAIExamples/tree/main/ChatQnA/docker/xeon#validate-microservices) first. A simple example: +1. If you get errors like "Access Denied", [validate micro service](https://github.com/opea-project/GenAIExamples/tree/main/ChatQnA/docker_compose/intel/cpu/xeon#validate-microservices) first. A simple example: ```bash http_proxy="" curl ${host_ip}:6006/embed -X POST -d '{"inputs":"What is Deep Learning?"}' -H 'Content-Type: application/json' diff --git a/ChatQnA/docker/chatqna.py b/ChatQnA/chatqna.py similarity index 100% rename from ChatQnA/docker/chatqna.py rename to ChatQnA/chatqna.py diff --git a/ChatQnA/docker/chatqna_guardrails.py b/ChatQnA/chatqna_guardrails.py similarity index 100% rename from ChatQnA/docker/chatqna_guardrails.py rename to ChatQnA/chatqna_guardrails.py diff --git a/ChatQnA/docker/chatqna_no_wrapper.py b/ChatQnA/chatqna_no_wrapper.py similarity index 100% rename from ChatQnA/docker/chatqna_no_wrapper.py rename to ChatQnA/chatqna_no_wrapper.py diff --git a/ChatQnA/docker/chatqna_without_rerank.py b/ChatQnA/chatqna_without_rerank.py similarity index 100% rename from ChatQnA/docker/chatqna_without_rerank.py rename to ChatQnA/chatqna_without_rerank.py diff --git a/ChatQnA/docker/aipc/README.md b/ChatQnA/docker_compose/intel/cpu/aipc/README.md similarity index 96% rename from ChatQnA/docker/aipc/README.md rename to ChatQnA/docker_compose/intel/cpu/aipc/README.md index 3d4bfebb8..e8fd2b0b3 100644 --- a/ChatQnA/docker/aipc/README.md +++ b/ChatQnA/docker_compose/intel/cpu/aipc/README.md @@ -14,19 +14,19 @@ cd GenAIComps ### 1. Build Embedding Image ```bash -docker build --no-cache -t opea/embedding-tei:latest -f comps/embeddings/langchain/docker/Dockerfile . +docker build --no-cache -t opea/embedding-tei:latest -f comps/embeddings/tei/langchain/Dockerfile . ``` ### 2. Build Retriever Image ```bash -docker build --no-cache -t opea/retriever-redis:latest -f comps/retrievers/langchain/redis/docker/Dockerfile . +docker build --no-cache -t opea/retriever-redis:latest -f comps/retrievers/redis/langchain/Dockerfile . ``` ### 3. Build Rerank Image ```bash -docker build --no-cache -t opea/reranking-tei:latest -f comps/reranks/tei/docker/Dockerfile . +docker build --no-cache -t opea/reranking-tei:latest -f comps/reranks/tei/Dockerfile . ``` ### 4. Build LLM Image @@ -34,13 +34,13 @@ docker build --no-cache -t opea/reranking-tei:latest -f comps/reranks/tei/docker We use [Ollama](https://ollama.com/) as our LLM service for AIPC. Please pre-download Ollama on your PC. ```bash -docker build --no-cache -t opea/llm-ollama:latest -f comps/llms/text-generation/ollama/Dockerfile . +docker build --no-cache -t opea/llm-ollama:latest -f comps/llms/text-generation/ollama/langchain/Dockerfile . ``` ### 5. Build Dataprep Image ```bash -docker build --no-cache -t opea/dataprep-redis:latest -f comps/dataprep/redis/langchain/docker/Dockerfile . +docker build --no-cache -t opea/dataprep-redis:latest -f comps/dataprep/redis/langchain/Dockerfile . cd .. ``` @@ -50,7 +50,7 @@ To construct the Mega Service, we utilize the [GenAIComps](https://github.com/op ```bash git clone https://github.com/opea-project/GenAIExamples.git -cd GenAIExamples/ChatQnA/docker +cd GenAIExamples/ChatQnA docker build --no-cache -t opea/chatqna:latest -f Dockerfile . cd ../../.. ``` @@ -60,7 +60,7 @@ cd ../../.. Build frontend Docker image via below command: ```bash -cd GenAIExamples/ChatQnA/docker/ui/ +cd GenAIExamples/ChatQnA/ui docker build --no-cache -t opea/chatqna-ui:latest -f ./docker/Dockerfile . cd ../../../.. ``` diff --git a/ChatQnA/docker/aipc/compose.yaml b/ChatQnA/docker_compose/intel/cpu/aipc/compose.yaml similarity index 100% rename from ChatQnA/docker/aipc/compose.yaml rename to ChatQnA/docker_compose/intel/cpu/aipc/compose.yaml diff --git a/ChatQnA/docker/xeon/README.md b/ChatQnA/docker_compose/intel/cpu/xeon/README.md similarity index 96% rename from ChatQnA/docker/xeon/README.md rename to ChatQnA/docker_compose/intel/cpu/xeon/README.md index 44de4b3a0..ee60f7143 100644 --- a/ChatQnA/docker/xeon/README.md +++ b/ChatQnA/docker_compose/intel/cpu/xeon/README.md @@ -69,13 +69,13 @@ cd GenAIComps ### 1. Build Embedding Image ```bash -docker build --no-cache -t opea/embedding-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/langchain/docker/Dockerfile . +docker build --no-cache -t opea/embedding-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/tei/langchain/Dockerfile . ``` ### 2. Build Retriever Image ```bash -docker build --no-cache -t opea/retriever-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/langchain/redis/docker/Dockerfile . +docker build --no-cache -t opea/retriever-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/redis/langchain/Dockerfile . ``` ### 3. Build Rerank Image @@ -83,7 +83,7 @@ docker build --no-cache -t opea/retriever-redis:latest --build-arg https_proxy=$ > Skip for ChatQnA without Rerank pipeline ```bash -docker build --no-cache -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/tei/docker/Dockerfile . +docker build --no-cache -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/tei/Dockerfile . ``` ### 4. Build LLM Image @@ -108,13 +108,13 @@ cd .. Build microservice. ```bash -docker build --no-cache -t opea/llm-vllm:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/text-generation/vllm/docker/Dockerfile.microservice . +docker build --no-cache -t opea/llm-vllm:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/text-generation/vllm/langchain/Dockerfile . ``` ### 5. Build Dataprep Image ```bash -docker build --no-cache -t opea/dataprep-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/redis/langchain/docker/Dockerfile . +docker build --no-cache -t opea/dataprep-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/redis/langchain/Dockerfile . cd .. ``` @@ -138,7 +138,7 @@ cd .. ```bash git clone https://github.com/opea-project/GenAIExamples.git cd GenAIExamples/ChatQnA/docker - docker build --no-cache -t opea/chatqna-without-rerank:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile_without_rerank . + docker build --no-cache -t opea/chatqna-without-rerank:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile.without_rerank . cd ../../.. ``` @@ -147,7 +147,7 @@ cd .. Build frontend Docker image via below command: ```bash -cd GenAIExamples/ChatQnA/docker/ui/ +cd GenAIExamples/ChatQnA/ docker build --no-cache -t opea/chatqna-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker/Dockerfile . cd ../../../.. ``` @@ -159,7 +159,7 @@ Build frontend Docker image that enables Conversational experience with ChatQnA **Export the value of the public IP address of your Xeon server to the `host_ip` environment variable** ```bash -cd GenAIExamples/ChatQnA/docker/ui/ +cd GenAIExamples/ChatQnA/ui docker build --no-cache -t opea/chatqna-conversation-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker/Dockerfile.react . cd ../../../.. ``` @@ -272,7 +272,7 @@ Note: Please replace with `host_ip` with you external IP address, do not use loc > Before running the docker compose command, you need to be in the folder that has the docker compose yaml file ```bash -cd GenAIExamples/ChatQnA/docker/xeon/ +cd GenAIExamples/ChatQnA/docker_compose/intel/cpu/xeon/ ``` If use TGI backend. @@ -520,12 +520,12 @@ Once the services are up, open the following URL in your browser: http://{host_i - "80:80" ``` -![project-screenshot](../../assets/img/chat_ui_init.png) +![project-screenshot](../../../../assets/img/chat_ui_init.png) Here is an example of running ChatQnA: -![project-screenshot](../../assets/img/chat_ui_response.png) +![project-screenshot](../../../../assets/img/chat_ui_response.png) Here is an example of running ChatQnA with Conversational UI (React): -![project-screenshot](../../assets/img/conversation_ui_response.png) +![project-screenshot](../../../../assets/img/conversation_ui_response.png) diff --git a/ChatQnA/docker/xeon/README_qdrant.md b/ChatQnA/docker_compose/intel/cpu/xeon/README_qdrant.md similarity index 96% rename from ChatQnA/docker/xeon/README_qdrant.md rename to ChatQnA/docker_compose/intel/cpu/xeon/README_qdrant.md index d8f0c9de6..496792a6e 100644 --- a/ChatQnA/docker/xeon/README_qdrant.md +++ b/ChatQnA/docker_compose/intel/cpu/xeon/README_qdrant.md @@ -73,19 +73,19 @@ cd GenAIComps ### 1. Build Embedding Image ```bash -docker build --no-cache -t opea/embedding-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/langchain/docker/Dockerfile . +docker build --no-cache -t opea/embedding-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/tei/langchain/Dockerfile . ``` ### 2. Build Retriever Image ```bash -docker build --no-cache -t opea/retriever-qdrant:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/haystack/qdrant/docker/Dockerfile . +docker build --no-cache -t opea/retriever-qdrant:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/qdrant/haystack/Dockerfile . ``` ### 3. Build Rerank Image ```bash -docker build --no-cache -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/tei/docker/Dockerfile . +docker build --no-cache -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/tei/Dockerfile . ``` ### 4. Build LLM Image @@ -97,7 +97,7 @@ docker build --no-cache -t opea/llm-tgi:latest --build-arg https_proxy=$https_pr ### 5. Build Dataprep Image ```bash -docker build --no-cache -t opea/dataprep-qdrant:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/qdrant/docker/Dockerfile . +docker build --no-cache -t opea/dataprep-qdrant:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/qdrant/langchain/Dockerfile . cd .. ``` @@ -117,7 +117,7 @@ cd ../../.. Build frontend Docker image via below command: ```bash -cd GenAIExamples/ChatQnA/docker/ui/ +cd GenAIExamples/ChatQnA/ docker build --no-cache -t opea/chatqna-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker/Dockerfile . cd ../../../.. ``` @@ -129,7 +129,7 @@ Build frontend Docker image that enables Conversational experience with ChatQnA **Export the value of the public IP address of your Xeon server to the `host_ip` environment variable** ```bash -cd GenAIExamples/ChatQnA/docker/ui/ +cd GenAIExamples/ChatQnA//ui export BACKEND_SERVICE_ENDPOINT="http://${host_ip}:8912/v1/chatqna" export DATAPREP_SERVICE_ENDPOINT="http://${host_ip}:6043/v1/dataprep" docker build --no-cache -t opea/chatqna-conversation-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy --build-arg BACKEND_SERVICE_ENDPOINT=$BACKEND_SERVICE_ENDPOINT --build-arg DATAPREP_SERVICE_ENDPOINT=$DATAPREP_SERVICE_ENDPOINT -f ./docker/Dockerfile.react . @@ -216,7 +216,7 @@ Note: Please replace with `host_ip` with you external IP address, do not use loc > Before running the docker compose command, you need to be in the folder that has the docker compose yaml file ```bash -cd GenAIExamples/ChatQnA/docker/xeon/ +cd GenAIExamples/ChatQnA/docker_compose/intel/cpu/xeon/ docker compose -f compose_qdrant.yaml up -d ``` @@ -362,12 +362,12 @@ To access the Conversational UI frontend, open the following URL in your browser - "80:80" ``` -![project-screenshot](../../assets/img/chat_ui_init.png) +![project-screenshot](../../../assets/img/chat_ui_init.png) Here is an example of running ChatQnA: -![project-screenshot](../../assets/img/chat_ui_response.png) +![project-screenshot](../../../assets/img/chat_ui_response.png) Here is an example of running ChatQnA with Conversational UI (React): -![project-screenshot](../../assets/img/conversation_ui_response.png) +![project-screenshot](../../../assets/img/conversation_ui_response.png) diff --git a/ChatQnA/docker/xeon/compose.yaml b/ChatQnA/docker_compose/intel/cpu/xeon/compose.yaml similarity index 100% rename from ChatQnA/docker/xeon/compose.yaml rename to ChatQnA/docker_compose/intel/cpu/xeon/compose.yaml diff --git a/ChatQnA/docker/xeon/compose_no_wrapper.yaml b/ChatQnA/docker_compose/intel/cpu/xeon/compose_no_wrapper.yaml similarity index 100% rename from ChatQnA/docker/xeon/compose_no_wrapper.yaml rename to ChatQnA/docker_compose/intel/cpu/xeon/compose_no_wrapper.yaml diff --git a/ChatQnA/docker/xeon/compose_qdrant.yaml b/ChatQnA/docker_compose/intel/cpu/xeon/compose_qdrant.yaml similarity index 100% rename from ChatQnA/docker/xeon/compose_qdrant.yaml rename to ChatQnA/docker_compose/intel/cpu/xeon/compose_qdrant.yaml diff --git a/ChatQnA/docker/xeon/compose_vllm.yaml b/ChatQnA/docker_compose/intel/cpu/xeon/compose_vllm.yaml similarity index 100% rename from ChatQnA/docker/xeon/compose_vllm.yaml rename to ChatQnA/docker_compose/intel/cpu/xeon/compose_vllm.yaml diff --git a/ChatQnA/docker/xeon/compose_without_rerank.yaml b/ChatQnA/docker_compose/intel/cpu/xeon/compose_without_rerank.yaml similarity index 100% rename from ChatQnA/docker/xeon/compose_without_rerank.yaml rename to ChatQnA/docker_compose/intel/cpu/xeon/compose_without_rerank.yaml diff --git a/ChatQnA/docker/xeon/set_env.sh b/ChatQnA/docker_compose/intel/cpu/xeon/set_env.sh similarity index 100% rename from ChatQnA/docker/xeon/set_env.sh rename to ChatQnA/docker_compose/intel/cpu/xeon/set_env.sh diff --git a/ChatQnA/docker/gaudi/README.md b/ChatQnA/docker_compose/intel/hpu/gaudi/README.md similarity index 95% rename from ChatQnA/docker/gaudi/README.md rename to ChatQnA/docker_compose/intel/hpu/gaudi/README.md index a0953f768..25336952c 100644 --- a/ChatQnA/docker/gaudi/README.md +++ b/ChatQnA/docker_compose/intel/hpu/gaudi/README.md @@ -16,13 +16,13 @@ cd GenAIComps ### 2. Build Embedding Image ```bash -docker build --no-cache -t opea/embedding-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/langchain/docker/Dockerfile . +docker build --no-cache -t opea/embedding-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/tei/langchain/Dockerfile . ``` ### 3. Build Retriever Image ```bash -docker build --no-cache -t opea/retriever-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/langchain/redis/docker/Dockerfile . +docker build --no-cache -t opea/retriever-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/redis/langchain/Dockerfile . ``` ### 4. Build Rerank Image @@ -30,7 +30,7 @@ docker build --no-cache -t opea/retriever-redis:latest --build-arg https_proxy=$ > Skip for ChatQnA without Rerank pipeline ```bash -docker build --no-cache -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/tei/docker/Dockerfile . +docker build --no-cache -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/tei/Dockerfile . ``` ### 5. Build LLM Image @@ -48,13 +48,13 @@ docker build --no-cache -t opea/llm-tgi:latest --build-arg https_proxy=$https_pr Build vllm docker. ```bash -docker build --no-cache -t opea/llm-vllm-hpu:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/text-generation/vllm/docker/Dockerfile.hpu . +docker build --no-cache -t opea/llm-vllm-hpu:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/text-generation/vllm/langchain/dependency/Dockerfile.intel_hpu . ``` Build microservice docker. ```bash -docker build --no-cache -t opea/llm-vllm:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/text-generation/vllm/docker/Dockerfile.microservice . +docker build --no-cache -t opea/llm-vllm:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/text-generation/vllm/langchain/Dockerfile . ``` #### 5.3 Use VLLM-on-Ray @@ -62,19 +62,19 @@ docker build --no-cache -t opea/llm-vllm:latest --build-arg https_proxy=$https_p Build vllm-on-ray docker. ```bash -docker build --no-cache -t opea/llm-vllm-ray-hpu:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/text-generation/vllm-ray/docker/Dockerfile.vllmray . +docker build --no-cache -t opea/llm-vllm-ray-hpu:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/text-generation/vllm/ray/dependency/Dockerfile . ``` Build microservice docker. ```bash -docker build --no-cache -t opea/llm-vllm-ray:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/text-generation/vllm-ray/docker/Dockerfile.microservice . +docker build --no-cache -t opea/llm-vllm-ray:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/text-generation/vllm/ray/Dockerfile . ``` ### 6. Build Dataprep Image ```bash -docker build --no-cache -t opea/dataprep-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/redis/langchain/docker/Dockerfile . +docker build --no-cache -t opea/dataprep-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/redis/langchain/Dockerfile . ``` ### 7. Build TEI Gaudi Image @@ -107,8 +107,8 @@ cd ../.. ```bash git clone https://github.com/opea-project/GenAIExamples.git - cd GenAIExamples/ChatQnA/docker - docker build --no-cache -t opea/chatqna-guardrails:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile_guardrails . + cd GenAIExamples/ChatQnA/ + docker build --no-cache -t opea/chatqna-guardrails:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile.guardrails . cd ../../.. ``` @@ -119,7 +119,7 @@ cd ../.. ```bash git clone https://github.com/opea-project/GenAIExamples.git cd GenAIExamples/ChatQnA/docker - docker build --no-cache -t opea/chatqna-without-rerank:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile_without_rerank . + docker build --no-cache -t opea/chatqna-without-rerank:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile.without_rerank . cd ../../.. ``` @@ -128,7 +128,7 @@ cd ../.. Construct the frontend Docker image using the command below: ```bash -cd GenAIExamples/ChatQnA/docker/ui/ +cd GenAIExamples/ChatQnA/ docker build --no-cache -t opea/chatqna-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker/Dockerfile . cd ../../../.. ``` @@ -140,7 +140,7 @@ Build frontend Docker image that enables Conversational experience with ChatQnA **Export the value of the public IP address of your Gaudi node to the `host_ip` environment variable** ```bash -cd GenAIExamples/ChatQnA/docker/ui/ +cd GenAIExamples/ChatQnA/ui docker build --no-cache -t opea/chatqna-conversation-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker/Dockerfile.react . cd ../../../.. ``` @@ -151,7 +151,7 @@ To fortify AI initiatives in production, Guardrails microservice can secure mode ```bash cd GenAIExamples/ChatQnA/docker -docker build -t opea/guardrails-tgi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/guardrails/llama_guard/docker/Dockerfile . +docker build -t opea/guardrails-tgi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/guardrails/llama_guard/langchain/Dockerfile . cd ../../.. ``` @@ -259,7 +259,7 @@ Note: Please replace with `host_ip` with you external IP address, do **NOT** use ### Start all the services Docker Containers ```bash -cd GenAIExamples/ChatQnA/docker/gaudi/ +cd GenAIExamples/ChatQnA/docker_compose/intel/hpu/gaudi/ ``` If use tgi for llm backend. @@ -286,7 +286,7 @@ docker compose -f compose_vllm_ray.yaml up -d If you want to enable guardrails microservice in the pipeline, please follow the below command instead: ```bash -cd GenAIExamples/ChatQnA/docker/gaudi/ +cd GenAIExamples/ChatQnA/docker_compose/intel/hpu/gaudi/ docker compose -f compose_guardrails.yaml up -d ``` @@ -505,11 +505,11 @@ To access the frontend, open the following URL in your browser: http://{host_ip} - "80:5173" ``` -![project-screenshot](../../assets/img/chat_ui_init.png) +![project-screenshot](../../../../assets/img/chat_ui_init.png) Here is an example of running ChatQnA: -![project-screenshot](../../assets/img/chat_ui_response.png) +![project-screenshot](../../../../assets/img/chat_ui_response.png) ## 🚀 Launch the Conversational UI (Optional) @@ -542,4 +542,4 @@ Once the services are up, open the following URL in your browser: http://{host_i Here is an example of running ChatQnA with Conversational UI (React): -![project-screenshot](../../assets/img/conversation_ui_response.png) +![project-screenshot](../../../../assets/img/conversation_ui_response.png) diff --git a/ChatQnA/docker/gaudi/compose.yaml b/ChatQnA/docker_compose/intel/hpu/gaudi/compose.yaml similarity index 100% rename from ChatQnA/docker/gaudi/compose.yaml rename to ChatQnA/docker_compose/intel/hpu/gaudi/compose.yaml diff --git a/ChatQnA/docker/gaudi/compose_guardrails.yaml b/ChatQnA/docker_compose/intel/hpu/gaudi/compose_guardrails.yaml similarity index 100% rename from ChatQnA/docker/gaudi/compose_guardrails.yaml rename to ChatQnA/docker_compose/intel/hpu/gaudi/compose_guardrails.yaml diff --git a/ChatQnA/docker/gaudi/compose_no_wrapper.yaml b/ChatQnA/docker_compose/intel/hpu/gaudi/compose_no_wrapper.yaml similarity index 100% rename from ChatQnA/docker/gaudi/compose_no_wrapper.yaml rename to ChatQnA/docker_compose/intel/hpu/gaudi/compose_no_wrapper.yaml diff --git a/ChatQnA/docker/gaudi/compose_vllm.yaml b/ChatQnA/docker_compose/intel/hpu/gaudi/compose_vllm.yaml similarity index 100% rename from ChatQnA/docker/gaudi/compose_vllm.yaml rename to ChatQnA/docker_compose/intel/hpu/gaudi/compose_vllm.yaml diff --git a/ChatQnA/docker/gaudi/compose_vllm_ray.yaml b/ChatQnA/docker_compose/intel/hpu/gaudi/compose_vllm_ray.yaml similarity index 100% rename from ChatQnA/docker/gaudi/compose_vllm_ray.yaml rename to ChatQnA/docker_compose/intel/hpu/gaudi/compose_vllm_ray.yaml diff --git a/ChatQnA/docker/gaudi/compose_without_rerank.yaml b/ChatQnA/docker_compose/intel/hpu/gaudi/compose_without_rerank.yaml similarity index 100% rename from ChatQnA/docker/gaudi/compose_without_rerank.yaml rename to ChatQnA/docker_compose/intel/hpu/gaudi/compose_without_rerank.yaml diff --git a/ChatQnA/docker/gaudi/how_to_validate_service.md b/ChatQnA/docker_compose/intel/hpu/gaudi/how_to_validate_service.md similarity index 97% rename from ChatQnA/docker/gaudi/how_to_validate_service.md rename to ChatQnA/docker_compose/intel/hpu/gaudi/how_to_validate_service.md index fb039fad9..2e2d3d023 100644 --- a/ChatQnA/docker/gaudi/how_to_validate_service.md +++ b/ChatQnA/docker_compose/intel/hpu/gaudi/how_to_validate_service.md @@ -16,16 +16,16 @@ Make sure environment variables are set start the docker containers ``` -cd ./GenAIExamples/ChatQnA/docker/gaudi +cd ./GenAIExamples/ChatQnA/docker_compose/intel/hpu/gaudi docker compose up -d ``` -Check the start up log by `docker compose -f ./docker/gaudi/compose.yaml logs`. +Check the start up log by `docker compose -f ./docker_compose/intel/hpu/gaudi/compose.yaml logs`. Where the compose.yaml file is the mega service docker-compose configuration. The warning messages point out the veriabls are **NOT** set. ``` -ubuntu@gaudi-vm:~/GenAIExamples/ChatQnA/docker/gaudi$ docker compose -f ./compose.yaml up -d +ubuntu@gaudi-vm:~/GenAIExamples/ChatQnA/docker_compose/intel/hpu/gaudi$ docker compose -f ./compose.yaml up -d WARN[0000] The "LANGCHAIN_API_KEY" variable is not set. Defaulting to a blank string. WARN[0000] The "LANGCHAIN_TRACING_V2" variable is not set. Defaulting to a blank string. WARN[0000] The "LANGCHAIN_API_KEY" variable is not set. Defaulting to a blank string. @@ -34,7 +34,7 @@ WARN[0000] The "LANGCHAIN_API_KEY" variable is not set. Defaulting to a blank st WARN[0000] The "LANGCHAIN_TRACING_V2" variable is not set. Defaulting to a blank string. WARN[0000] The "LANGCHAIN_API_KEY" variable is not set. Defaulting to a blank string. WARN[0000] The "LANGCHAIN_TRACING_V2" variable is not set. Defaulting to a blank string. -WARN[0000] /home/ubuntu/GenAIExamples/ChatQnA/docker/gaudi/compose.yaml: `version` is obsolete +WARN[0000] /home/ubuntu/GenAIExamples/ChatQnA/docker_compose/intel/hpu/gaudi/compose.yaml: `version` is obsolete ``` ## 2. Check the docker container status @@ -118,7 +118,7 @@ Check the log by `docker logs f7a08f9867f9 -t`. The log indicates the MODLE_ID is not set. -View the docker input parameters in `./ChatQnA/docker/gaudi/compose.yaml` +View the docker input parameters in `./ChatQnA/docker_compose/intel/hpu/gaudi/compose.yaml` ``` tgi-service: diff --git a/ChatQnA/docker/gaudi/set_env.sh b/ChatQnA/docker_compose/intel/hpu/gaudi/set_env.sh similarity index 100% rename from ChatQnA/docker/gaudi/set_env.sh rename to ChatQnA/docker_compose/intel/hpu/gaudi/set_env.sh diff --git a/ChatQnA/docker/gpu/README.md b/ChatQnA/docker_compose/nvidia/gpu/README.md similarity index 97% rename from ChatQnA/docker/gpu/README.md rename to ChatQnA/docker_compose/nvidia/gpu/README.md index eee076bf8..f5285869e 100644 --- a/ChatQnA/docker/gpu/README.md +++ b/ChatQnA/docker_compose/nvidia/gpu/README.md @@ -16,19 +16,19 @@ cd GenAIComps ### 2. Build Embedding Image ```bash -docker build --no-cache -t opea/embedding-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/langchain/docker/Dockerfile . +docker build --no-cache -t opea/embedding-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/tei/langchain/Dockerfile . ``` ### 3. Build Retriever Image ```bash -docker build --no-cache -t opea/retriever-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/langchain/redis/docker/Dockerfile . +docker build --no-cache -t opea/retriever-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/redis/langchain/Dockerfile . ``` ### 4. Build Rerank Image ```bash -docker build --no-cache -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/tei/docker/Dockerfile . +docker build --no-cache -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/tei/Dockerfile . ``` ### 5. Build LLM Image @@ -40,7 +40,7 @@ docker build --no-cache -t opea/llm-tgi:latest --build-arg https_proxy=$https_pr ### 6. Build Dataprep Image ```bash -docker build --no-cache -t opea/dataprep-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/redis/langchain/docker/Dockerfile . +docker build --no-cache -t opea/dataprep-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/redis/langchain/Dockerfile . ``` ### 7. Build MegaService Docker Image @@ -59,7 +59,7 @@ cd ../../.. Construct the frontend Docker image using the command below: ```bash -cd GenAIExamples/ChatQnA/docker/ui/ +cd GenAIExamples/ChatQnA/ docker build --no-cache -t opea/chatqna-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker/Dockerfile . cd ../../../.. ``` @@ -69,7 +69,7 @@ cd ../../../.. Construct the frontend Docker image using the command below: ```bash -cd GenAIExamples/ChatQnA/docker/ui/ +cd GenAIExamples/ChatQnA/ui docker build --no-cache -t opea/chatqna-react-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker/Dockerfile.react . cd ../../../.. ``` @@ -323,4 +323,4 @@ Once the services are up, open the following URL in your browser: http://{host_i - "80:80" ``` -![project-screenshot](../../assets/img/chat_ui_init.png) +![project-screenshot](../../../assets/img/chat_ui_init.png) diff --git a/ChatQnA/docker/gpu/compose.yaml b/ChatQnA/docker_compose/nvidia/gpu/compose.yaml similarity index 100% rename from ChatQnA/docker/gpu/compose.yaml rename to ChatQnA/docker_compose/nvidia/gpu/compose.yaml diff --git a/ChatQnA/docker/gpu/set_env.sh b/ChatQnA/docker_compose/nvidia/gpu/set_env.sh similarity index 100% rename from ChatQnA/docker/gpu/set_env.sh rename to ChatQnA/docker_compose/nvidia/gpu/set_env.sh diff --git a/ChatQnA/docker/docker_build_compose.yaml b/ChatQnA/docker_image_build/build.yaml similarity index 74% rename from ChatQnA/docker/docker_build_compose.yaml rename to ChatQnA/docker_image_build/build.yaml index 0d9200653..bbde37d41 100644 --- a/ChatQnA/docker/docker_build_compose.yaml +++ b/ChatQnA/docker_image_build/build.yaml @@ -8,57 +8,61 @@ services: http_proxy: ${http_proxy} https_proxy: ${https_proxy} no_proxy: ${no_proxy} + context: ../ dockerfile: ./Dockerfile image: ${REGISTRY:-opea}/chatqna:${TAG:-latest} chatqna-guardrails: build: - dockerfile: ./Dockerfile_guardrails + context: ../ + dockerfile: ./Dockerfile.guardrails extends: chatqna image: ${REGISTRY:-opea}/chatqna-guardrails:${TAG:-latest} chatqna-without-rerank: build: - dockerfile: ./Dockerfile_without_rerank + context: ../ + dockerfile: ./Dockerfile.without_rerank extends: chatqna image: ${REGISTRY:-opea}/chatqna-without-rerank:${TAG:-latest} chatqna-no-wrapper: build: - dockerfile: ./Dockerfile_no_wrapper + context: ../ + dockerfile: ./Dockerfile.no_wrapper extends: chatqna image: ${REGISTRY:-opea}/chatqna-no-wrapper:${TAG:-latest} chatqna-ui: build: - context: ui + context: ../ui dockerfile: ./docker/Dockerfile extends: chatqna image: ${REGISTRY:-opea}/chatqna-ui:${TAG:-latest} chatqna-conversation-ui: build: - context: ui + context: ../ui dockerfile: ./docker/Dockerfile.react extends: chatqna image: ${REGISTRY:-opea}/chatqna-conversation-ui:${TAG:-latest} embedding-tei: build: context: GenAIComps - dockerfile: comps/embeddings/langchain/docker/Dockerfile + dockerfile: comps/embeddings/tei/langchain/Dockerfile extends: chatqna image: ${REGISTRY:-opea}/embedding-tei:${TAG:-latest} retriever-redis: build: context: GenAIComps - dockerfile: comps/retrievers/langchain/redis/docker/Dockerfile + dockerfile: comps/retrievers/redis/langchain/Dockerfile extends: chatqna image: ${REGISTRY:-opea}/retriever-redis:${TAG:-latest} retriever-qdrant: build: context: GenAIComps - dockerfile: comps/retrievers/haystack/qdrant/docker/Dockerfile + dockerfile: comps/retrievers/qdrant/haystack/Dockerfile extends: chatqna image: ${REGISTRY:-opea}/retriever-qdrant:${TAG:-latest} reranking-tei: build: context: GenAIComps - dockerfile: comps/reranks/tei/docker/Dockerfile + dockerfile: comps/reranks/tei/Dockerfile extends: chatqna image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest} llm-tgi: @@ -70,49 +74,49 @@ services: llm-ollama: build: context: GenAIComps - dockerfile: comps/llms/text-generation/ollama/Dockerfile + dockerfile: comps/llms/text-generation/ollama/langchain/Dockerfile extends: chatqna image: ${REGISTRY:-opea}/llm-ollama:${TAG:-latest} llm-vllm: build: context: GenAIComps - dockerfile: comps/llms/text-generation/vllm/docker/Dockerfile.microservice + dockerfile: comps/llms/text-generation/vllm/langchain/Dockerfile extends: chatqna image: ${REGISTRY:-opea}/llm-vllm:${TAG:-latest} llm-vllm-hpu: build: context: GenAIComps - dockerfile: comps/llms/text-generation/vllm/docker/Dockerfile.hpu + dockerfile: comps/llms/text-generation/vllm/langchain/dependency/Dockerfile.intel_hpu extends: chatqna image: ${REGISTRY:-opea}/llm-vllm-hpu:${TAG:-latest} llm-vllm-ray: build: context: GenAIComps - dockerfile: comps/llms/text-generation/vllm-ray/docker/Dockerfile.microservice + dockerfile: comps/llms/text-generation/vllm/ray/Dockerfile extends: chatqna image: ${REGISTRY:-opea}/llm-vllm-ray:${TAG:-latest} llm-vllm-ray-hpu: build: context: GenAIComps - dockerfile: comps/llms/text-generation/vllm-ray/docker/Dockerfile.vllmray + dockerfile: comps/llms/text-generation/vllm/ray/dependency/Dockerfile extends: chatqna image: ${REGISTRY:-opea}/llm-vllm-ray-hpu:${TAG:-latest} dataprep-redis: build: context: GenAIComps - dockerfile: comps/dataprep/redis/langchain/docker/Dockerfile + dockerfile: comps/dataprep/redis/langchain/Dockerfile extends: chatqna image: ${REGISTRY:-opea}/dataprep-redis:${TAG:-latest} dataprep-qdrant: build: context: GenAIComps - dockerfile: comps/dataprep/qdrant/docker/Dockerfile + dockerfile: comps/dataprep/qdrant/langchain/Dockerfile extends: chatqna image: ${REGISTRY:-opea}/dataprep-qdrant:${TAG:-latest} guardrails-tgi: build: context: GenAIComps - dockerfile: comps/guardrails/llama_guard/docker/Dockerfile + dockerfile: comps/guardrails/llama_guard/langchain/Dockerfile extends: chatqna image: ${REGISTRY:-opea}/guardrails-tgi:${TAG:-latest} tei-gaudi: diff --git a/ChatQnA/kubernetes/manifests/README.md b/ChatQnA/kubernetes/intel/README.md similarity index 100% rename from ChatQnA/kubernetes/manifests/README.md rename to ChatQnA/kubernetes/intel/README.md diff --git a/ChatQnA/kubernetes/README.md b/ChatQnA/kubernetes/intel/README_gmc.md similarity index 94% rename from ChatQnA/kubernetes/README.md rename to ChatQnA/kubernetes/intel/README_gmc.md index 6eedba54f..c56354cfc 100644 --- a/ChatQnA/kubernetes/README.md +++ b/ChatQnA/kubernetes/intel/README_gmc.md @@ -31,7 +31,7 @@ For Gaudi: - tgi-service: ghcr.io/huggingface/tgi-gaudi:1.2.1 > [NOTE] -> Please refer to [Xeon README](https://github.com/opea-project/GenAIExamples/blob/main/ChatQnA/docker/xeon/README.md) or [Gaudi README](https://github.com/opea-project/GenAIExamples/blob/main/ChatQnA/docker/gaudi/README.md) to build the OPEA images. These too will be available on Docker Hub soon to simplify use. +> Please refer to [Xeon README](https://github.com/opea-project/GenAIExamples/blob/main/ChatQnA/docker_compose/intel/cpu/xeon/README.md) or [Gaudi README](https://github.com/opea-project/GenAIExamples/blob/main/ChatQnA/docker_compose/intel/hpu/gaudi/README.md) to build the OPEA images. These too will be available on Docker Hub soon to simplify use. ## Deploy ChatQnA pipeline This involves deploying the ChatQnA custom resource. You can use chatQnA_xeon.yaml or if you have a Gaudi cluster, you could use chatQnA_gaudi.yaml. diff --git a/ChatQnA/kubernetes/chatQnA_dataprep_xeon.yaml b/ChatQnA/kubernetes/intel/cpu/xeon/gmc/chatQnA_dataprep_xeon.yaml similarity index 100% rename from ChatQnA/kubernetes/chatQnA_dataprep_xeon.yaml rename to ChatQnA/kubernetes/intel/cpu/xeon/gmc/chatQnA_dataprep_xeon.yaml diff --git a/ChatQnA/kubernetes/chatQnA_switch_xeon.yaml b/ChatQnA/kubernetes/intel/cpu/xeon/gmc/chatQnA_switch_xeon.yaml similarity index 100% rename from ChatQnA/kubernetes/chatQnA_switch_xeon.yaml rename to ChatQnA/kubernetes/intel/cpu/xeon/gmc/chatQnA_switch_xeon.yaml diff --git a/ChatQnA/kubernetes/chatQnA_xeon.yaml b/ChatQnA/kubernetes/intel/cpu/xeon/gmc/chatQnA_xeon.yaml similarity index 100% rename from ChatQnA/kubernetes/chatQnA_xeon.yaml rename to ChatQnA/kubernetes/intel/cpu/xeon/gmc/chatQnA_xeon.yaml diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna-guardrails.yaml b/ChatQnA/kubernetes/intel/cpu/xeon/manifest/chatqna-guardrails.yaml similarity index 100% rename from ChatQnA/kubernetes/manifests/xeon/chatqna-guardrails.yaml rename to ChatQnA/kubernetes/intel/cpu/xeon/manifest/chatqna-guardrails.yaml diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/intel/cpu/xeon/manifest/chatqna.yaml similarity index 100% rename from ChatQnA/kubernetes/manifests/xeon/chatqna.yaml rename to ChatQnA/kubernetes/intel/cpu/xeon/manifest/chatqna.yaml diff --git a/ChatQnA/kubernetes/chatQnA_dataprep_gaudi.yaml b/ChatQnA/kubernetes/intel/hpu/gaudi/gmc/chatQnA_dataprep_gaudi.yaml similarity index 100% rename from ChatQnA/kubernetes/chatQnA_dataprep_gaudi.yaml rename to ChatQnA/kubernetes/intel/hpu/gaudi/gmc/chatQnA_dataprep_gaudi.yaml diff --git a/ChatQnA/kubernetes/chatQnA_gaudi.yaml b/ChatQnA/kubernetes/intel/hpu/gaudi/gmc/chatQnA_gaudi.yaml similarity index 100% rename from ChatQnA/kubernetes/chatQnA_gaudi.yaml rename to ChatQnA/kubernetes/intel/hpu/gaudi/gmc/chatQnA_gaudi.yaml diff --git a/ChatQnA/kubernetes/chatQnA_switch_gaudi.yaml b/ChatQnA/kubernetes/intel/hpu/gaudi/gmc/chatQnA_switch_gaudi.yaml similarity index 100% rename from ChatQnA/kubernetes/chatQnA_switch_gaudi.yaml rename to ChatQnA/kubernetes/intel/hpu/gaudi/gmc/chatQnA_switch_gaudi.yaml diff --git a/ChatQnA/kubernetes/manifests/gaudi/chatqna-guardrails.yaml b/ChatQnA/kubernetes/intel/hpu/gaudi/manifest/chatqna-guardrails.yaml similarity index 100% rename from ChatQnA/kubernetes/manifests/gaudi/chatqna-guardrails.yaml rename to ChatQnA/kubernetes/intel/hpu/gaudi/manifest/chatqna-guardrails.yaml diff --git a/ChatQnA/kubernetes/manifests/gaudi/chatqna.yaml b/ChatQnA/kubernetes/intel/hpu/gaudi/manifest/chatqna.yaml similarity index 100% rename from ChatQnA/kubernetes/manifests/gaudi/chatqna.yaml rename to ChatQnA/kubernetes/intel/hpu/gaudi/manifest/chatqna.yaml diff --git a/ChatQnA/tests/test_chatqna_guardrails_on_gaudi.sh b/ChatQnA/tests/test_compose_guardrails_on_gaudi.sh similarity index 94% rename from ChatQnA/tests/test_chatqna_guardrails_on_gaudi.sh rename to ChatQnA/tests/test_compose_guardrails_on_gaudi.sh index 038a42c77..bcbea8c0d 100644 --- a/ChatQnA/tests/test_chatqna_guardrails_on_gaudi.sh +++ b/ChatQnA/tests/test_compose_guardrails_on_gaudi.sh @@ -15,13 +15,13 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ git clone https://github.com/huggingface/tei-gaudi echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="chatqna-guardrails chatqna-ui dataprep-redis embedding-tei retriever-redis reranking-tei llm-tgi tei-gaudi guardrails-tgi" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/tgi-gaudi:2.0.1 docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.5 @@ -30,7 +30,7 @@ function build_docker_images() { } function start_services() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi export EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5" export RERANK_MODEL_ID="BAAI/bge-reranker-base" export LLM_MODEL_ID="Intel/neural-chat-7b-v3-3" @@ -52,7 +52,7 @@ function start_services() { export SAFETY_GUARD_MODEL_ID="meta-llama/Meta-Llama-Guard-2-8B" export SAFETY_GUARD_ENDPOINT="http://${ip_address}:8088" - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose -f compose_guardrails.yaml up -d > ${LOG_PATH}/start_services_with_compose.log @@ -201,7 +201,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -229,7 +229,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi docker compose -f compose_guardrails.yaml down } diff --git a/ChatQnA/tests/test_chatqna_no_wrapper_on_gaudi.sh b/ChatQnA/tests/test_compose_no_wrapper_on_gaudi.sh similarity index 94% rename from ChatQnA/tests/test_chatqna_no_wrapper_on_gaudi.sh rename to ChatQnA/tests/test_compose_no_wrapper_on_gaudi.sh index 2bc2e7d89..f4250d435 100644 --- a/ChatQnA/tests/test_chatqna_no_wrapper_on_gaudi.sh +++ b/ChatQnA/tests/test_compose_no_wrapper_on_gaudi.sh @@ -15,13 +15,13 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ git clone https://github.com/huggingface/tei-gaudi echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="chatqna-no-wrapper chatqna-ui dataprep-redis retriever-redis tei-gaudi" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/tgi-gaudi:2.0.1 docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.5 @@ -30,7 +30,7 @@ function build_docker_images() { } function start_services() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi export EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5" export RERANK_MODEL_ID="BAAI/bge-reranker-base" export LLM_MODEL_ID="meta-llama/Meta-Llama-3-8B-Instruct" @@ -54,7 +54,7 @@ function start_services() { export DATAPREP_GET_FILE_ENDPOINT="http://${ip_address}:6008/v1/dataprep/get_file" export DATAPREP_DELETE_FILE_ENDPOINT="http://${ip_address}:6009/v1/dataprep/delete_file" - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose -f compose_no_wrapper.yaml up -d > ${LOG_PATH}/start_services_with_compose.log @@ -193,7 +193,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -221,7 +221,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi docker compose stop && docker compose rm -f } diff --git a/ChatQnA/tests/test_chatqna_no_wrapper_on_xeon.sh b/ChatQnA/tests/test_compose_no_wrapper_on_xeon.sh similarity index 95% rename from ChatQnA/tests/test_chatqna_no_wrapper_on_xeon.sh rename to ChatQnA/tests/test_compose_no_wrapper_on_xeon.sh index e0d669f9b..dc2ac315a 100644 --- a/ChatQnA/tests/test_chatqna_no_wrapper_on_xeon.sh +++ b/ChatQnA/tests/test_compose_no_wrapper_on_xeon.sh @@ -15,12 +15,12 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="chatqna-no-wrapper chatqna-ui chatqna-conversation-ui dataprep-redis retriever-redis" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/tgi-gaudi:2.0.1 docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.5 @@ -29,7 +29,7 @@ function build_docker_images() { } function start_services() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon export EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5" export RERANK_MODEL_ID="BAAI/bge-reranker-base" @@ -54,7 +54,7 @@ function start_services() { export DATAPREP_GET_FILE_ENDPOINT="http://${ip_address}:6007/v1/dataprep/get_file" export DATAPREP_DELETE_FILE_ENDPOINT="http://${ip_address}:6007/v1/dataprep/delete_file" - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose -f compose_no_wrapper.yaml up -d > ${LOG_PATH}/start_services_with_compose.log @@ -194,7 +194,7 @@ function validate_megaservice() { function validate_frontend() { echo "[ TEST INFO ]: --------- frontend test started ---------" - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -223,7 +223,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon docker compose stop && docker compose rm -f } diff --git a/ChatQnA/tests/test_chatqna_on_gaudi.sh b/ChatQnA/tests/test_compose_on_gaudi.sh similarity index 93% rename from ChatQnA/tests/test_chatqna_on_gaudi.sh rename to ChatQnA/tests/test_compose_on_gaudi.sh index bfefc9291..13ecdc113 100644 --- a/ChatQnA/tests/test_chatqna_on_gaudi.sh +++ b/ChatQnA/tests/test_compose_on_gaudi.sh @@ -15,13 +15,13 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ git clone https://github.com/huggingface/tei-gaudi echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="chatqna chatqna-ui dataprep-redis embedding-tei retriever-redis reranking-tei llm-tgi tei-gaudi" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/tgi-gaudi:2.0.1 docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.5 @@ -30,7 +30,7 @@ function build_docker_images() { } function start_services() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi export EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5" export RERANK_MODEL_ID="BAAI/bge-reranker-base" export LLM_MODEL_ID="Intel/neural-chat-7b-v3-3" @@ -51,7 +51,7 @@ function start_services() { export DATAPREP_GET_FILE_ENDPOINT="http://${ip_address}:6008/v1/dataprep/get_file" export DATAPREP_DELETE_FILE_ENDPOINT="http://${ip_address}:6009/v1/dataprep/delete_file" - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose up -d > ${LOG_PATH}/start_services_with_compose.log @@ -214,7 +214,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -242,7 +242,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi docker compose stop && docker compose rm -f } @@ -256,13 +256,9 @@ function main() { duration=$((end_time-start_time)) echo "Mega service start duration is $duration s" - if [ "${mode}" == "perf" ]; then - python3 $WORKPATH/tests/chatqna_benchmark.py - elif [ "${mode}" == "" ]; then - validate_microservices - validate_megaservice - validate_frontend - fi + validate_microservices + validate_megaservice + validate_frontend stop_docker echo y | docker system prune diff --git a/ChatQnA/tests/test_chatqna_on_xeon.sh b/ChatQnA/tests/test_compose_on_xeon.sh similarity index 95% rename from ChatQnA/tests/test_chatqna_on_xeon.sh rename to ChatQnA/tests/test_compose_on_xeon.sh index 36674e503..feba1039f 100644 --- a/ChatQnA/tests/test_chatqna_on_xeon.sh +++ b/ChatQnA/tests/test_compose_on_xeon.sh @@ -15,12 +15,12 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="chatqna chatqna-ui chatqna-conversation-ui dataprep-redis embedding-tei retriever-redis reranking-tei llm-tgi" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/tgi-gaudi:2.0.1 docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.5 @@ -29,7 +29,7 @@ function build_docker_images() { } function start_services() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon/ export EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5" export RERANK_MODEL_ID="BAAI/bge-reranker-base" @@ -51,7 +51,7 @@ function start_services() { export DATAPREP_GET_FILE_ENDPOINT="http://${ip_address}:6007/v1/dataprep/get_file" export DATAPREP_DELETE_FILE_ENDPOINT="http://${ip_address}:6007/v1/dataprep/delete_file" - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose up -d > ${LOG_PATH}/start_services_with_compose.log @@ -214,7 +214,7 @@ function validate_megaservice() { function validate_frontend() { echo "[ TEST INFO ]: --------- frontend test started ---------" - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -243,7 +243,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon/ docker compose stop && docker compose rm -f } diff --git a/ChatQnA/tests/test_chatqna_qdrant_on_xeon.sh b/ChatQnA/tests/test_compose_qdrant_on_xeon.sh similarity index 94% rename from ChatQnA/tests/test_chatqna_qdrant_on_xeon.sh rename to ChatQnA/tests/test_compose_qdrant_on_xeon.sh index 85cd2504b..ddb2ebba0 100644 --- a/ChatQnA/tests/test_chatqna_qdrant_on_xeon.sh +++ b/ChatQnA/tests/test_compose_qdrant_on_xeon.sh @@ -15,18 +15,18 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="chatqna chatqna-ui dataprep-qdrant embedding-tei retriever-qdrant reranking-tei llm-tgi" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker images && sleep 1s } function start_services() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon export EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5" export RERANK_MODEL_ID="BAAI/bge-reranker-base" @@ -50,7 +50,7 @@ function start_services() { export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:8912/v1/chatqna" export DATAPREP_SERVICE_ENDPOINT="http://${ip_address}:6043/v1/dataprep" - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose -f compose_qdrant.yaml up -d > ${LOG_PATH}/start_services_with_compose.log @@ -192,7 +192,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH source activate ${conda_env_name} @@ -214,7 +214,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon docker compose -f compose_qdrant.yaml stop && docker compose -f compose_qdrant.yaml rm -f } diff --git a/ChatQnA/tests/test_chatqna_vllm_on_gaudi.sh b/ChatQnA/tests/test_compose_vllm_on_gaudi.sh similarity index 93% rename from ChatQnA/tests/test_chatqna_vllm_on_gaudi.sh rename to ChatQnA/tests/test_compose_vllm_on_gaudi.sh index a7af9fec5..30e803e7e 100644 --- a/ChatQnA/tests/test_chatqna_vllm_on_gaudi.sh +++ b/ChatQnA/tests/test_compose_vllm_on_gaudi.sh @@ -15,20 +15,20 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ git clone https://github.com/huggingface/tei-gaudi echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="chatqna chatqna-ui dataprep-redis embedding-tei retriever-redis reranking-tei tei-gaudi llm-vllm-hpu llm-vllm" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.2 docker images && sleep 1s } function start_services() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi export EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5" export RERANK_MODEL_ID="BAAI/bge-reranker-base" export LLM_MODEL_ID="Intel/neural-chat-7b-v3-3" @@ -47,7 +47,7 @@ function start_services() { export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:8888/v1/chatqna" export DATAPREP_SERVICE_ENDPOINT="http://${ip_address}:6007/v1/dataprep" - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose -f compose_vllm.yaml up -d > ${LOG_PATH}/start_services_with_compose.log @@ -167,7 +167,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -195,7 +195,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi docker compose -f compose_vllm.yaml down } diff --git a/ChatQnA/tests/test_chatqna_vllm_on_xeon.sh b/ChatQnA/tests/test_compose_vllm_on_xeon.sh similarity index 93% rename from ChatQnA/tests/test_chatqna_vllm_on_xeon.sh rename to ChatQnA/tests/test_compose_vllm_on_xeon.sh index 20ce28430..a069df297 100644 --- a/ChatQnA/tests/test_chatqna_vllm_on_xeon.sh +++ b/ChatQnA/tests/test_compose_vllm_on_xeon.sh @@ -15,13 +15,13 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ git clone https://github.com/vllm-project/vllm.git echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="chatqna chatqna-ui dataprep-redis embedding-tei retriever-redis reranking-tei llm-vllm vllm" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/tgi-gaudi:2.0.1 docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.5 @@ -30,7 +30,7 @@ function build_docker_images() { } function start_services() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon export EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5" export RERANK_MODEL_ID="BAAI/bge-reranker-base" @@ -50,7 +50,7 @@ function start_services() { export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:8888/v1/chatqna" export DATAPREP_SERVICE_ENDPOINT="http://${ip_address}:6007/v1/dataprep" - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose -f compose_vllm.yaml up -d > ${LOG_PATH}/start_services_with_compose.log @@ -169,7 +169,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -198,7 +198,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon docker compose -f compose_vllm.yaml down } diff --git a/ChatQnA/tests/test_chatqna_vllm_ray_on_gaudi.sh b/ChatQnA/tests/test_compose_vllm_ray_on_gaudi.sh similarity index 93% rename from ChatQnA/tests/test_chatqna_vllm_ray_on_gaudi.sh rename to ChatQnA/tests/test_compose_vllm_ray_on_gaudi.sh index cf25f318a..607ed93f6 100644 --- a/ChatQnA/tests/test_chatqna_vllm_ray_on_gaudi.sh +++ b/ChatQnA/tests/test_compose_vllm_ray_on_gaudi.sh @@ -15,13 +15,13 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ git clone https://github.com/huggingface/tei-gaudi echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="chatqna chatqna-ui dataprep-redis embedding-tei retriever-redis reranking-tei tei-gaudi llm-vllm-ray-hpu llm-vllm-ray" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.2 docker images && sleep 1s @@ -29,7 +29,7 @@ function build_docker_images() { function start_services() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi export EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5" export RERANK_MODEL_ID="BAAI/bge-reranker-base" export LLM_MODEL_ID="Intel/neural-chat-7b-v3-3" @@ -48,7 +48,7 @@ function start_services() { export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:8888/v1/chatqna" export DATAPREP_SERVICE_ENDPOINT="http://${ip_address}:6007/v1/dataprep" - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose -f compose_vllm_ray.yaml up -d > ${LOG_PATH}/start_services_with_compose.log @@ -168,7 +168,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -196,7 +196,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi docker compose -f compose_vllm_ray.yaml down } diff --git a/ChatQnA/tests/test_chatqna_without_rerank_on_gaudi.sh b/ChatQnA/tests/test_compose_without_rerank_on_gaudi.sh similarity index 94% rename from ChatQnA/tests/test_chatqna_without_rerank_on_gaudi.sh rename to ChatQnA/tests/test_compose_without_rerank_on_gaudi.sh index a729842b5..d8b0bf681 100644 --- a/ChatQnA/tests/test_chatqna_without_rerank_on_gaudi.sh +++ b/ChatQnA/tests/test_compose_without_rerank_on_gaudi.sh @@ -15,13 +15,13 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ git clone https://github.com/huggingface/tei-gaudi echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="chatqna-without-rerank chatqna-ui dataprep-redis embedding-tei retriever-redis llm-tgi tei-gaudi" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/tgi-gaudi:2.0.1 docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.5 @@ -30,7 +30,7 @@ function build_docker_images() { } function start_services() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi export EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5" export LLM_MODEL_ID="Intel/neural-chat-7b-v3-3" export TEI_EMBEDDING_ENDPOINT="http://${ip_address}:8090" @@ -48,7 +48,7 @@ function start_services() { export DATAPREP_GET_FILE_ENDPOINT="http://${ip_address}:6008/v1/dataprep/get_file" export DATAPREP_DELETE_FILE_ENDPOINT="http://${ip_address}:6009/v1/dataprep/delete_file" - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose -f compose_without_rerank.yaml up -d > ${LOG_PATH}/start_services_with_compose.log @@ -195,7 +195,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -223,7 +223,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi docker compose -f compose_without_rerank.yaml stop && docker compose -f compose_without_rerank.yaml rm -f } diff --git a/ChatQnA/tests/test_chatqna_without_rerank_on_xeon.sh b/ChatQnA/tests/test_compose_without_rerank_on_xeon.sh similarity index 95% rename from ChatQnA/tests/test_chatqna_without_rerank_on_xeon.sh rename to ChatQnA/tests/test_compose_without_rerank_on_xeon.sh index bac6b9934..9176a8339 100644 --- a/ChatQnA/tests/test_chatqna_without_rerank_on_xeon.sh +++ b/ChatQnA/tests/test_compose_without_rerank_on_xeon.sh @@ -15,12 +15,12 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="chatqna-without-rerank chatqna-ui chatqna-conversation-ui dataprep-redis embedding-tei retriever-redis llm-tgi" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/tgi-gaudi:2.0.1 docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.5 @@ -29,7 +29,7 @@ function build_docker_images() { } function start_services() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon export EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5" export LLM_MODEL_ID="Intel/neural-chat-7b-v3-3" @@ -48,7 +48,7 @@ function start_services() { export DATAPREP_GET_FILE_ENDPOINT="http://${ip_address}:6007/v1/dataprep/get_file" export DATAPREP_DELETE_FILE_ENDPOINT="http://${ip_address}:6007/v1/dataprep/delete_file" - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose -f compose_without_rerank.yaml up -d > ${LOG_PATH}/start_services_with_compose.log @@ -195,7 +195,7 @@ function validate_megaservice() { function validate_frontend() { echo "[ TEST INFO ]: --------- frontend test started ---------" - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -224,7 +224,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon/ docker compose -f compose_without_rerank.yaml stop && docker compose -f compose_without_rerank.yaml rm -f } diff --git a/ChatQnA/tests/test_gmc_on_gaudi.sh b/ChatQnA/tests/test_gmc_on_gaudi.sh index 3b926c01c..5daf46ee2 100755 --- a/ChatQnA/tests/test_gmc_on_gaudi.sh +++ b/ChatQnA/tests/test_gmc_on_gaudi.sh @@ -197,12 +197,12 @@ fi case "$1" in install_ChatQnA) - pushd ChatQnA/kubernetes + pushd ChatQnA/kubernetes/intel/hpu/gaudi/gmc install_chatqna popd ;; validate_ChatQnA) - pushd ChatQnA/kubernetes + pushd ChatQnA/kubernetes/intel/hpu/gaudi/gmc validate_chatqna validate_chatqna_dataprep popd diff --git a/ChatQnA/tests/test_gmc_on_xeon.sh b/ChatQnA/tests/test_gmc_on_xeon.sh index 69409308f..e829fbda5 100755 --- a/ChatQnA/tests/test_gmc_on_xeon.sh +++ b/ChatQnA/tests/test_gmc_on_xeon.sh @@ -199,12 +199,12 @@ fi case "$1" in install_ChatQnA) - pushd ChatQnA/kubernetes + pushd ChatQnA/kubernetes/intel/cpu/xeon/gmc install_chatqna popd ;; validate_ChatQnA) - pushd ChatQnA/kubernetes + pushd ChatQnA/kubernetes/intel/cpu/xeon/gmc validate_chatqna validate_chatqna_dataprep popd diff --git a/ChatQnA/tests/test_manifest_on_gaudi.sh b/ChatQnA/tests/test_manifest_on_gaudi.sh index ae30465b9..6eb6f9b9c 100755 --- a/ChatQnA/tests/test_manifest_on_gaudi.sh +++ b/ChatQnA/tests/test_manifest_on_gaudi.sh @@ -148,12 +148,12 @@ fi case "$1" in init_ChatQnA) - pushd ChatQnA/kubernetes/manifests/gaudi + pushd ChatQnA/kubernetes/intel/hpu/gaudi/manifest init_chatqna popd ;; install_ChatQnA) - pushd ChatQnA/kubernetes/manifests/gaudi + pushd ChatQnA/kubernetes/intel/hpu/gaudi/manifest NAMESPACE=$2 install_chatqna popd diff --git a/ChatQnA/tests/test_manifest_on_xeon.sh b/ChatQnA/tests/test_manifest_on_xeon.sh index 6b82019d0..e51addad2 100755 --- a/ChatQnA/tests/test_manifest_on_xeon.sh +++ b/ChatQnA/tests/test_manifest_on_xeon.sh @@ -148,12 +148,12 @@ fi case "$1" in init_ChatQnA) - pushd ChatQnA/kubernetes/manifests/xeon + pushd ChatQnA/kubernetes/intel/cpu/xeon/manifest init_chatqna popd ;; install_ChatQnA) - pushd ChatQnA/kubernetes/manifests/xeon + pushd ChatQnA/kubernetes/intel/cpu/xeon/manifest NAMESPACE=$2 install_chatqna popd diff --git a/ChatQnA/docker/ui/docker/Dockerfile b/ChatQnA/ui/docker/Dockerfile similarity index 100% rename from ChatQnA/docker/ui/docker/Dockerfile rename to ChatQnA/ui/docker/Dockerfile diff --git a/ProductivitySuite/docker/ui/docker/Dockerfile.react b/ChatQnA/ui/docker/Dockerfile.react similarity index 94% rename from ProductivitySuite/docker/ui/docker/Dockerfile.react rename to ChatQnA/ui/docker/Dockerfile.react index f023b7afb..49bc13124 100644 --- a/ProductivitySuite/docker/ui/docker/Dockerfile.react +++ b/ChatQnA/ui/docker/Dockerfile.react @@ -4,7 +4,7 @@ # Use node 20.11.1 as the base image FROM node:20.11.1 as vite-app -COPY ./react /usr/app/react +COPY react /usr/app/react WORKDIR /usr/app/react diff --git a/ChatQnA/docker/ui/react/.env b/ChatQnA/ui/react/.env similarity index 100% rename from ChatQnA/docker/ui/react/.env rename to ChatQnA/ui/react/.env diff --git a/ChatQnA/docker/ui/react/.env.production b/ChatQnA/ui/react/.env.production similarity index 100% rename from ChatQnA/docker/ui/react/.env.production rename to ChatQnA/ui/react/.env.production diff --git a/ChatQnA/docker/ui/react/.eslintrc.cjs b/ChatQnA/ui/react/.eslintrc.cjs similarity index 100% rename from ChatQnA/docker/ui/react/.eslintrc.cjs rename to ChatQnA/ui/react/.eslintrc.cjs diff --git a/ChatQnA/docker/ui/react/.gitignore b/ChatQnA/ui/react/.gitignore similarity index 100% rename from ChatQnA/docker/ui/react/.gitignore rename to ChatQnA/ui/react/.gitignore diff --git a/ChatQnA/docker/ui/react/README.md b/ChatQnA/ui/react/README.md similarity index 86% rename from ChatQnA/docker/ui/react/README.md rename to ChatQnA/ui/react/README.md index 806cc01e2..3477828ea 100644 --- a/ChatQnA/docker/ui/react/README.md +++ b/ChatQnA/ui/react/README.md @@ -2,9 +2,9 @@ ## 📸 Project Screenshots -![project-screenshot](../../../assets/img/conversation_ui_init.png) -![project-screenshot](../../../assets/img/conversation_ui_response.png) -![project-screenshot](../../../assets/img/conversation_ui_upload.png) +![project-screenshot](../../assets/img/conversation_ui_init.png) +![project-screenshot](../../assets/img/conversation_ui_response.png) +![project-screenshot](../../assets/img/conversation_ui_upload.png) ## 🧐 Features diff --git a/ChatQnA/docker/ui/react/env.sh b/ChatQnA/ui/react/env.sh similarity index 100% rename from ChatQnA/docker/ui/react/env.sh rename to ChatQnA/ui/react/env.sh diff --git a/ChatQnA/docker/ui/react/index.html b/ChatQnA/ui/react/index.html similarity index 100% rename from ChatQnA/docker/ui/react/index.html rename to ChatQnA/ui/react/index.html diff --git a/ChatQnA/docker/ui/react/nginx.conf b/ChatQnA/ui/react/nginx.conf similarity index 100% rename from ChatQnA/docker/ui/react/nginx.conf rename to ChatQnA/ui/react/nginx.conf diff --git a/ChatQnA/docker/ui/react/package.json b/ChatQnA/ui/react/package.json similarity index 100% rename from ChatQnA/docker/ui/react/package.json rename to ChatQnA/ui/react/package.json diff --git a/ChatQnA/docker/ui/react/postcss.config.cjs b/ChatQnA/ui/react/postcss.config.cjs similarity index 100% rename from ChatQnA/docker/ui/react/postcss.config.cjs rename to ChatQnA/ui/react/postcss.config.cjs diff --git a/ChatQnA/docker/ui/react/public/vite.svg b/ChatQnA/ui/react/public/vite.svg similarity index 100% rename from ChatQnA/docker/ui/react/public/vite.svg rename to ChatQnA/ui/react/public/vite.svg diff --git a/ChatQnA/docker/ui/react/src/App.scss b/ChatQnA/ui/react/src/App.scss similarity index 100% rename from ChatQnA/docker/ui/react/src/App.scss rename to ChatQnA/ui/react/src/App.scss diff --git a/ChatQnA/docker/ui/react/src/App.tsx b/ChatQnA/ui/react/src/App.tsx similarity index 100% rename from ChatQnA/docker/ui/react/src/App.tsx rename to ChatQnA/ui/react/src/App.tsx diff --git a/ChatQnA/docker/ui/react/src/__tests__/util.test.ts b/ChatQnA/ui/react/src/__tests__/util.test.ts similarity index 100% rename from ChatQnA/docker/ui/react/src/__tests__/util.test.ts rename to ChatQnA/ui/react/src/__tests__/util.test.ts diff --git a/ChatQnA/docker/ui/react/src/assets/opea-icon-black.svg b/ChatQnA/ui/react/src/assets/opea-icon-black.svg similarity index 100% rename from ChatQnA/docker/ui/react/src/assets/opea-icon-black.svg rename to ChatQnA/ui/react/src/assets/opea-icon-black.svg diff --git a/ChatQnA/docker/ui/react/src/assets/opea-icon-color.svg b/ChatQnA/ui/react/src/assets/opea-icon-color.svg similarity index 100% rename from ChatQnA/docker/ui/react/src/assets/opea-icon-color.svg rename to ChatQnA/ui/react/src/assets/opea-icon-color.svg diff --git a/ChatQnA/docker/ui/react/src/assets/react.svg b/ChatQnA/ui/react/src/assets/react.svg similarity index 100% rename from ChatQnA/docker/ui/react/src/assets/react.svg rename to ChatQnA/ui/react/src/assets/react.svg diff --git a/ChatQnA/docker/ui/react/src/common/client.ts b/ChatQnA/ui/react/src/common/client.ts similarity index 100% rename from ChatQnA/docker/ui/react/src/common/client.ts rename to ChatQnA/ui/react/src/common/client.ts diff --git a/ChatQnA/docker/ui/react/src/common/util.ts b/ChatQnA/ui/react/src/common/util.ts similarity index 100% rename from ChatQnA/docker/ui/react/src/common/util.ts rename to ChatQnA/ui/react/src/common/util.ts diff --git a/ChatQnA/docker/ui/react/src/components/Conversation/Conversation.tsx b/ChatQnA/ui/react/src/components/Conversation/Conversation.tsx similarity index 100% rename from ChatQnA/docker/ui/react/src/components/Conversation/Conversation.tsx rename to ChatQnA/ui/react/src/components/Conversation/Conversation.tsx diff --git a/ChatQnA/docker/ui/react/src/components/Conversation/ConversationSideBar.tsx b/ChatQnA/ui/react/src/components/Conversation/ConversationSideBar.tsx similarity index 100% rename from ChatQnA/docker/ui/react/src/components/Conversation/ConversationSideBar.tsx rename to ChatQnA/ui/react/src/components/Conversation/ConversationSideBar.tsx diff --git a/ChatQnA/docker/ui/react/src/components/Conversation/DataSource.tsx b/ChatQnA/ui/react/src/components/Conversation/DataSource.tsx similarity index 100% rename from ChatQnA/docker/ui/react/src/components/Conversation/DataSource.tsx rename to ChatQnA/ui/react/src/components/Conversation/DataSource.tsx diff --git a/ChatQnA/docker/ui/react/src/components/Conversation/conversation.module.scss b/ChatQnA/ui/react/src/components/Conversation/conversation.module.scss similarity index 100% rename from ChatQnA/docker/ui/react/src/components/Conversation/conversation.module.scss rename to ChatQnA/ui/react/src/components/Conversation/conversation.module.scss diff --git a/ChatQnA/docker/ui/react/src/components/Message/conversationMessage.module.scss b/ChatQnA/ui/react/src/components/Message/conversationMessage.module.scss similarity index 100% rename from ChatQnA/docker/ui/react/src/components/Message/conversationMessage.module.scss rename to ChatQnA/ui/react/src/components/Message/conversationMessage.module.scss diff --git a/ChatQnA/docker/ui/react/src/components/Message/conversationMessage.tsx b/ChatQnA/ui/react/src/components/Message/conversationMessage.tsx similarity index 100% rename from ChatQnA/docker/ui/react/src/components/Message/conversationMessage.tsx rename to ChatQnA/ui/react/src/components/Message/conversationMessage.tsx diff --git a/ChatQnA/docker/ui/react/src/components/UserInfoModal/UserInfoModal.tsx b/ChatQnA/ui/react/src/components/UserInfoModal/UserInfoModal.tsx similarity index 100% rename from ChatQnA/docker/ui/react/src/components/UserInfoModal/UserInfoModal.tsx rename to ChatQnA/ui/react/src/components/UserInfoModal/UserInfoModal.tsx diff --git a/ChatQnA/docker/ui/react/src/components/sidebar/sidebar.module.scss b/ChatQnA/ui/react/src/components/sidebar/sidebar.module.scss similarity index 100% rename from ChatQnA/docker/ui/react/src/components/sidebar/sidebar.module.scss rename to ChatQnA/ui/react/src/components/sidebar/sidebar.module.scss diff --git a/ChatQnA/docker/ui/react/src/components/sidebar/sidebar.tsx b/ChatQnA/ui/react/src/components/sidebar/sidebar.tsx similarity index 100% rename from ChatQnA/docker/ui/react/src/components/sidebar/sidebar.tsx rename to ChatQnA/ui/react/src/components/sidebar/sidebar.tsx diff --git a/ChatQnA/docker/ui/react/src/config.ts b/ChatQnA/ui/react/src/config.ts similarity index 100% rename from ChatQnA/docker/ui/react/src/config.ts rename to ChatQnA/ui/react/src/config.ts diff --git a/ChatQnA/docker/ui/react/src/index.scss b/ChatQnA/ui/react/src/index.scss similarity index 100% rename from ChatQnA/docker/ui/react/src/index.scss rename to ChatQnA/ui/react/src/index.scss diff --git a/ChatQnA/docker/ui/react/src/main.tsx b/ChatQnA/ui/react/src/main.tsx similarity index 100% rename from ChatQnA/docker/ui/react/src/main.tsx rename to ChatQnA/ui/react/src/main.tsx diff --git a/ChatQnA/docker/ui/react/src/redux/Conversation/Conversation.ts b/ChatQnA/ui/react/src/redux/Conversation/Conversation.ts similarity index 100% rename from ChatQnA/docker/ui/react/src/redux/Conversation/Conversation.ts rename to ChatQnA/ui/react/src/redux/Conversation/Conversation.ts diff --git a/ChatQnA/docker/ui/react/src/redux/Conversation/ConversationSlice.ts b/ChatQnA/ui/react/src/redux/Conversation/ConversationSlice.ts similarity index 100% rename from ChatQnA/docker/ui/react/src/redux/Conversation/ConversationSlice.ts rename to ChatQnA/ui/react/src/redux/Conversation/ConversationSlice.ts diff --git a/ChatQnA/docker/ui/react/src/redux/User/user.d.ts b/ChatQnA/ui/react/src/redux/User/user.d.ts similarity index 100% rename from ChatQnA/docker/ui/react/src/redux/User/user.d.ts rename to ChatQnA/ui/react/src/redux/User/user.d.ts diff --git a/ChatQnA/docker/ui/react/src/redux/User/userSlice.ts b/ChatQnA/ui/react/src/redux/User/userSlice.ts similarity index 100% rename from ChatQnA/docker/ui/react/src/redux/User/userSlice.ts rename to ChatQnA/ui/react/src/redux/User/userSlice.ts diff --git a/ChatQnA/docker/ui/react/src/redux/store.ts b/ChatQnA/ui/react/src/redux/store.ts similarity index 100% rename from ChatQnA/docker/ui/react/src/redux/store.ts rename to ChatQnA/ui/react/src/redux/store.ts diff --git a/ChatQnA/docker/ui/react/src/redux/thunkUtil.ts b/ChatQnA/ui/react/src/redux/thunkUtil.ts similarity index 100% rename from ChatQnA/docker/ui/react/src/redux/thunkUtil.ts rename to ChatQnA/ui/react/src/redux/thunkUtil.ts diff --git a/CodeGen/docker/ui/react/src/styles/components/_context.scss b/ChatQnA/ui/react/src/styles/components/_context.scss similarity index 100% rename from CodeGen/docker/ui/react/src/styles/components/_context.scss rename to ChatQnA/ui/react/src/styles/components/_context.scss diff --git a/ChatQnA/docker/ui/react/src/styles/components/_sidebar.scss b/ChatQnA/ui/react/src/styles/components/_sidebar.scss similarity index 100% rename from ChatQnA/docker/ui/react/src/styles/components/_sidebar.scss rename to ChatQnA/ui/react/src/styles/components/_sidebar.scss diff --git a/ChatQnA/docker/ui/react/src/styles/components/content.scss b/ChatQnA/ui/react/src/styles/components/content.scss similarity index 100% rename from ChatQnA/docker/ui/react/src/styles/components/content.scss rename to ChatQnA/ui/react/src/styles/components/content.scss diff --git a/ChatQnA/docker/ui/react/src/styles/components/context.module.scss b/ChatQnA/ui/react/src/styles/components/context.module.scss similarity index 100% rename from ChatQnA/docker/ui/react/src/styles/components/context.module.scss rename to ChatQnA/ui/react/src/styles/components/context.module.scss diff --git a/ChatQnA/docker/ui/react/src/styles/layout/_basics.scss b/ChatQnA/ui/react/src/styles/layout/_basics.scss similarity index 100% rename from ChatQnA/docker/ui/react/src/styles/layout/_basics.scss rename to ChatQnA/ui/react/src/styles/layout/_basics.scss diff --git a/ChatQnA/docker/ui/react/src/styles/layout/_flex.scss b/ChatQnA/ui/react/src/styles/layout/_flex.scss similarity index 100% rename from ChatQnA/docker/ui/react/src/styles/layout/_flex.scss rename to ChatQnA/ui/react/src/styles/layout/_flex.scss diff --git a/ChatQnA/docker/ui/react/src/styles/styles.scss b/ChatQnA/ui/react/src/styles/styles.scss similarity index 100% rename from ChatQnA/docker/ui/react/src/styles/styles.scss rename to ChatQnA/ui/react/src/styles/styles.scss diff --git a/ChatQnA/docker/ui/react/src/vite-env.d.ts b/ChatQnA/ui/react/src/vite-env.d.ts similarity index 100% rename from ChatQnA/docker/ui/react/src/vite-env.d.ts rename to ChatQnA/ui/react/src/vite-env.d.ts diff --git a/ChatQnA/docker/ui/react/tsconfig.json b/ChatQnA/ui/react/tsconfig.json similarity index 100% rename from ChatQnA/docker/ui/react/tsconfig.json rename to ChatQnA/ui/react/tsconfig.json diff --git a/ChatQnA/docker/ui/react/tsconfig.node.json b/ChatQnA/ui/react/tsconfig.node.json similarity index 100% rename from ChatQnA/docker/ui/react/tsconfig.node.json rename to ChatQnA/ui/react/tsconfig.node.json diff --git a/ChatQnA/docker/ui/react/vite.config.ts b/ChatQnA/ui/react/vite.config.ts similarity index 100% rename from ChatQnA/docker/ui/react/vite.config.ts rename to ChatQnA/ui/react/vite.config.ts diff --git a/ChatQnA/docker/ui/svelte/.editorconfig b/ChatQnA/ui/svelte/.editorconfig similarity index 100% rename from ChatQnA/docker/ui/svelte/.editorconfig rename to ChatQnA/ui/svelte/.editorconfig diff --git a/ChatQnA/docker/ui/svelte/.env b/ChatQnA/ui/svelte/.env similarity index 100% rename from ChatQnA/docker/ui/svelte/.env rename to ChatQnA/ui/svelte/.env diff --git a/ChatQnA/docker/ui/svelte/.eslintignore b/ChatQnA/ui/svelte/.eslintignore similarity index 100% rename from ChatQnA/docker/ui/svelte/.eslintignore rename to ChatQnA/ui/svelte/.eslintignore diff --git a/ChatQnA/docker/ui/svelte/.eslintrc.cjs b/ChatQnA/ui/svelte/.eslintrc.cjs similarity index 100% rename from ChatQnA/docker/ui/svelte/.eslintrc.cjs rename to ChatQnA/ui/svelte/.eslintrc.cjs diff --git a/ChatQnA/docker/ui/svelte/.prettierignore b/ChatQnA/ui/svelte/.prettierignore similarity index 100% rename from ChatQnA/docker/ui/svelte/.prettierignore rename to ChatQnA/ui/svelte/.prettierignore diff --git a/ChatQnA/docker/ui/svelte/.prettierrc b/ChatQnA/ui/svelte/.prettierrc similarity index 100% rename from ChatQnA/docker/ui/svelte/.prettierrc rename to ChatQnA/ui/svelte/.prettierrc diff --git a/ChatQnA/docker/ui/svelte/README.md b/ChatQnA/ui/svelte/README.md similarity index 86% rename from ChatQnA/docker/ui/svelte/README.md rename to ChatQnA/ui/svelte/README.md index ec6a31432..d3c26b8f0 100644 --- a/ChatQnA/docker/ui/svelte/README.md +++ b/ChatQnA/ui/svelte/README.md @@ -2,9 +2,9 @@ ## 📸 Project Screenshots -![project-screenshot](../../../assets/img/chat_ui_init.png) -![project-screenshot](../../../assets/img/chat_ui_response.png) -![project-screenshot](../../../assets/img/chat_ui_upload.png) +![project-screenshot](../../assets/img/chat_ui_init.png) +![project-screenshot](../../assets/img/chat_ui_response.png) +![project-screenshot](../../assets/img/chat_ui_upload.png) ## 🧐 Features diff --git a/ChatQnA/docker/ui/svelte/package.json b/ChatQnA/ui/svelte/package.json similarity index 100% rename from ChatQnA/docker/ui/svelte/package.json rename to ChatQnA/ui/svelte/package.json diff --git a/ChatQnA/docker/ui/svelte/playwright.config.ts b/ChatQnA/ui/svelte/playwright.config.ts similarity index 100% rename from ChatQnA/docker/ui/svelte/playwright.config.ts rename to ChatQnA/ui/svelte/playwright.config.ts diff --git a/ChatQnA/docker/ui/svelte/postcss.config.cjs b/ChatQnA/ui/svelte/postcss.config.cjs similarity index 100% rename from ChatQnA/docker/ui/svelte/postcss.config.cjs rename to ChatQnA/ui/svelte/postcss.config.cjs diff --git a/ChatQnA/docker/ui/svelte/src/app.d.ts b/ChatQnA/ui/svelte/src/app.d.ts similarity index 100% rename from ChatQnA/docker/ui/svelte/src/app.d.ts rename to ChatQnA/ui/svelte/src/app.d.ts diff --git a/ChatQnA/docker/ui/svelte/src/app.html b/ChatQnA/ui/svelte/src/app.html similarity index 100% rename from ChatQnA/docker/ui/svelte/src/app.html rename to ChatQnA/ui/svelte/src/app.html diff --git a/ChatQnA/docker/ui/svelte/src/app.postcss b/ChatQnA/ui/svelte/src/app.postcss similarity index 100% rename from ChatQnA/docker/ui/svelte/src/app.postcss rename to ChatQnA/ui/svelte/src/app.postcss diff --git a/ChatQnA/docker/ui/svelte/src/lib/assets/DocManagement/LinkfolderIcon.svelte b/ChatQnA/ui/svelte/src/lib/assets/DocManagement/LinkfolderIcon.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/assets/DocManagement/LinkfolderIcon.svelte rename to ChatQnA/ui/svelte/src/lib/assets/DocManagement/LinkfolderIcon.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/assets/DocManagement/fileIcon.svelte b/ChatQnA/ui/svelte/src/lib/assets/DocManagement/fileIcon.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/assets/DocManagement/fileIcon.svelte rename to ChatQnA/ui/svelte/src/lib/assets/DocManagement/fileIcon.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/assets/DocManagement/folderIcon.svelte b/ChatQnA/ui/svelte/src/lib/assets/DocManagement/folderIcon.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/assets/DocManagement/folderIcon.svelte rename to ChatQnA/ui/svelte/src/lib/assets/DocManagement/folderIcon.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/assets/avatar/svelte/Delete.svelte b/ChatQnA/ui/svelte/src/lib/assets/avatar/svelte/Delete.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/assets/avatar/svelte/Delete.svelte rename to ChatQnA/ui/svelte/src/lib/assets/avatar/svelte/Delete.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/assets/chat/svelte/Assistant.svelte b/ChatQnA/ui/svelte/src/lib/assets/chat/svelte/Assistant.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/assets/chat/svelte/Assistant.svelte rename to ChatQnA/ui/svelte/src/lib/assets/chat/svelte/Assistant.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte b/ChatQnA/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte rename to ChatQnA/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/assets/chat/svelte/PersonOutlined.svelte b/ChatQnA/ui/svelte/src/lib/assets/chat/svelte/PersonOutlined.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/assets/chat/svelte/PersonOutlined.svelte rename to ChatQnA/ui/svelte/src/lib/assets/chat/svelte/PersonOutlined.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/assets/layout/css/driver.css b/ChatQnA/ui/svelte/src/lib/assets/layout/css/driver.css similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/assets/layout/css/driver.css rename to ChatQnA/ui/svelte/src/lib/assets/layout/css/driver.css diff --git a/ChatQnA/docker/ui/svelte/src/lib/assets/upload/deleteIcon.svelte b/ChatQnA/ui/svelte/src/lib/assets/upload/deleteIcon.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/assets/upload/deleteIcon.svelte rename to ChatQnA/ui/svelte/src/lib/assets/upload/deleteIcon.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/assets/upload/loading-button.svelte b/ChatQnA/ui/svelte/src/lib/assets/upload/loading-button.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/assets/upload/loading-button.svelte rename to ChatQnA/ui/svelte/src/lib/assets/upload/loading-button.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/assets/upload/next.svelte b/ChatQnA/ui/svelte/src/lib/assets/upload/next.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/assets/upload/next.svelte rename to ChatQnA/ui/svelte/src/lib/assets/upload/next.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/assets/upload/no-file.svelte b/ChatQnA/ui/svelte/src/lib/assets/upload/no-file.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/assets/upload/no-file.svelte rename to ChatQnA/ui/svelte/src/lib/assets/upload/no-file.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/assets/upload/previous.svelte b/ChatQnA/ui/svelte/src/lib/assets/upload/previous.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/assets/upload/previous.svelte rename to ChatQnA/ui/svelte/src/lib/assets/upload/previous.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/assets/voice/svg/paste.svg b/ChatQnA/ui/svelte/src/lib/assets/voice/svg/paste.svg similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/assets/voice/svg/paste.svg rename to ChatQnA/ui/svelte/src/lib/assets/voice/svg/paste.svg diff --git a/ChatQnA/docker/ui/svelte/src/lib/assets/voice/svg/uploadFile.svg b/ChatQnA/ui/svelte/src/lib/assets/voice/svg/uploadFile.svg similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/assets/voice/svg/uploadFile.svg rename to ChatQnA/ui/svelte/src/lib/assets/voice/svg/uploadFile.svg diff --git a/ChatQnA/docker/ui/svelte/src/lib/modules/chat/ChatMessage.svelte b/ChatQnA/ui/svelte/src/lib/modules/chat/ChatMessage.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/modules/chat/ChatMessage.svelte rename to ChatQnA/ui/svelte/src/lib/modules/chat/ChatMessage.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/modules/chat/MessageAvatar.svelte b/ChatQnA/ui/svelte/src/lib/modules/chat/MessageAvatar.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/modules/chat/MessageAvatar.svelte rename to ChatQnA/ui/svelte/src/lib/modules/chat/MessageAvatar.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/modules/chat/MessageTimer.svelte b/ChatQnA/ui/svelte/src/lib/modules/chat/MessageTimer.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/modules/chat/MessageTimer.svelte rename to ChatQnA/ui/svelte/src/lib/modules/chat/MessageTimer.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/modules/frame/Layout.svelte b/ChatQnA/ui/svelte/src/lib/modules/frame/Layout.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/modules/frame/Layout.svelte rename to ChatQnA/ui/svelte/src/lib/modules/frame/Layout.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/network/chat/Network.ts b/ChatQnA/ui/svelte/src/lib/network/chat/Network.ts similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/network/chat/Network.ts rename to ChatQnA/ui/svelte/src/lib/network/chat/Network.ts diff --git a/ChatQnA/docker/ui/svelte/src/lib/network/upload/Network.ts b/ChatQnA/ui/svelte/src/lib/network/upload/Network.ts similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/network/upload/Network.ts rename to ChatQnA/ui/svelte/src/lib/network/upload/Network.ts diff --git a/ChatQnA/docker/ui/svelte/src/lib/shared/Utils.ts b/ChatQnA/ui/svelte/src/lib/shared/Utils.ts similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/shared/Utils.ts rename to ChatQnA/ui/svelte/src/lib/shared/Utils.ts diff --git a/ChatQnA/docker/ui/svelte/src/lib/shared/components/chat/gallery.svelte b/ChatQnA/ui/svelte/src/lib/shared/components/chat/gallery.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/shared/components/chat/gallery.svelte rename to ChatQnA/ui/svelte/src/lib/shared/components/chat/gallery.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/shared/components/doc_management/docCard.svelte b/ChatQnA/ui/svelte/src/lib/shared/components/doc_management/docCard.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/shared/components/doc_management/docCard.svelte rename to ChatQnA/ui/svelte/src/lib/shared/components/doc_management/docCard.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/shared/components/doc_management/treeView/svelte-tree.svelte b/ChatQnA/ui/svelte/src/lib/shared/components/doc_management/treeView/svelte-tree.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/shared/components/doc_management/treeView/svelte-tree.svelte rename to ChatQnA/ui/svelte/src/lib/shared/components/doc_management/treeView/svelte-tree.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/shared/components/doc_management/treeView/tree-branch.svelte b/ChatQnA/ui/svelte/src/lib/shared/components/doc_management/treeView/tree-branch.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/shared/components/doc_management/treeView/tree-branch.svelte rename to ChatQnA/ui/svelte/src/lib/shared/components/doc_management/treeView/tree-branch.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/shared/components/doc_management/treeView/tree-node.svelte b/ChatQnA/ui/svelte/src/lib/shared/components/doc_management/treeView/tree-node.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/shared/components/doc_management/treeView/tree-node.svelte rename to ChatQnA/ui/svelte/src/lib/shared/components/doc_management/treeView/tree-node.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/shared/components/loading/Loading.svelte b/ChatQnA/ui/svelte/src/lib/shared/components/loading/Loading.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/shared/components/loading/Loading.svelte rename to ChatQnA/ui/svelte/src/lib/shared/components/loading/Loading.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte b/ChatQnA/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte rename to ChatQnA/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/shared/components/upload/PasteKnowledge.svelte b/ChatQnA/ui/svelte/src/lib/shared/components/upload/PasteKnowledge.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/shared/components/upload/PasteKnowledge.svelte rename to ChatQnA/ui/svelte/src/lib/shared/components/upload/PasteKnowledge.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/shared/components/upload/upload-knowledge.svelte b/ChatQnA/ui/svelte/src/lib/shared/components/upload/upload-knowledge.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/shared/components/upload/upload-knowledge.svelte rename to ChatQnA/ui/svelte/src/lib/shared/components/upload/upload-knowledge.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/shared/components/upload/uploadFile.svelte b/ChatQnA/ui/svelte/src/lib/shared/components/upload/uploadFile.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/shared/components/upload/uploadFile.svelte rename to ChatQnA/ui/svelte/src/lib/shared/components/upload/uploadFile.svelte diff --git a/ChatQnA/docker/ui/svelte/src/lib/shared/constant/Interface.ts b/ChatQnA/ui/svelte/src/lib/shared/constant/Interface.ts similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/shared/constant/Interface.ts rename to ChatQnA/ui/svelte/src/lib/shared/constant/Interface.ts diff --git a/ChatQnA/docker/ui/svelte/src/lib/shared/stores/common/Store.ts b/ChatQnA/ui/svelte/src/lib/shared/stores/common/Store.ts similarity index 100% rename from ChatQnA/docker/ui/svelte/src/lib/shared/stores/common/Store.ts rename to ChatQnA/ui/svelte/src/lib/shared/stores/common/Store.ts diff --git a/ChatQnA/docker/ui/svelte/src/routes/+layout.svelte b/ChatQnA/ui/svelte/src/routes/+layout.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/routes/+layout.svelte rename to ChatQnA/ui/svelte/src/routes/+layout.svelte diff --git a/ChatQnA/docker/ui/svelte/src/routes/+page.svelte b/ChatQnA/ui/svelte/src/routes/+page.svelte similarity index 100% rename from ChatQnA/docker/ui/svelte/src/routes/+page.svelte rename to ChatQnA/ui/svelte/src/routes/+page.svelte diff --git a/ChatQnA/docker/ui/svelte/src/routes/+page.ts b/ChatQnA/ui/svelte/src/routes/+page.ts similarity index 100% rename from ChatQnA/docker/ui/svelte/src/routes/+page.ts rename to ChatQnA/ui/svelte/src/routes/+page.ts diff --git a/ChatQnA/docker/ui/svelte/static/favicon.png b/ChatQnA/ui/svelte/static/favicon.png similarity index 100% rename from ChatQnA/docker/ui/svelte/static/favicon.png rename to ChatQnA/ui/svelte/static/favicon.png diff --git a/ChatQnA/docker/ui/svelte/svelte.config.js b/ChatQnA/ui/svelte/svelte.config.js similarity index 100% rename from ChatQnA/docker/ui/svelte/svelte.config.js rename to ChatQnA/ui/svelte/svelte.config.js diff --git a/ChatQnA/docker/ui/svelte/tailwind.config.cjs b/ChatQnA/ui/svelte/tailwind.config.cjs similarity index 100% rename from ChatQnA/docker/ui/svelte/tailwind.config.cjs rename to ChatQnA/ui/svelte/tailwind.config.cjs diff --git a/ChatQnA/docker/ui/svelte/tests/chatQnA.spec.ts b/ChatQnA/ui/svelte/tests/chatQnA.spec.ts similarity index 100% rename from ChatQnA/docker/ui/svelte/tests/chatQnA.spec.ts rename to ChatQnA/ui/svelte/tests/chatQnA.spec.ts diff --git a/ChatQnA/docker/ui/svelte/tests/test_file.txt b/ChatQnA/ui/svelte/tests/test_file.txt similarity index 100% rename from ChatQnA/docker/ui/svelte/tests/test_file.txt rename to ChatQnA/ui/svelte/tests/test_file.txt diff --git a/ChatQnA/docker/ui/svelte/tsconfig.json b/ChatQnA/ui/svelte/tsconfig.json similarity index 100% rename from ChatQnA/docker/ui/svelte/tsconfig.json rename to ChatQnA/ui/svelte/tsconfig.json diff --git a/ChatQnA/docker/ui/svelte/vite.config.ts b/ChatQnA/ui/svelte/vite.config.ts similarity index 100% rename from ChatQnA/docker/ui/svelte/vite.config.ts rename to ChatQnA/ui/svelte/vite.config.ts diff --git a/CodeGen/docker/Dockerfile b/CodeGen/Dockerfile similarity index 100% rename from CodeGen/docker/Dockerfile rename to CodeGen/Dockerfile diff --git a/CodeGen/README.md b/CodeGen/README.md index 9917b6ad1..c91dcdfa4 100644 --- a/CodeGen/README.md +++ b/CodeGen/README.md @@ -30,7 +30,7 @@ Currently we support two ways of deploying ChatQnA services with docker compose: docker pull opea/codegen:latest ``` -2. Start services using the docker images built from source. See the [Gaudi Guide](./docker/gaudi/README.md) or [Xeon Guide](./docker/xeon/README.md) for more information. +2. Start services using the docker images built from source. See the [Gaudi Guide](./docker_compose/intel/hpu/gaudi/README.md) or [Xeon Guide](./docker_compose/intel/cpu/xeon/README.md) for more information. ### Required Models @@ -74,27 +74,27 @@ To set up environment variables for deploying ChatQnA services, follow these ste #### Deploy CodeGen on Gaudi -Find the corresponding [compose.yaml](./docker/gaudi/compose.yaml). +Find the corresponding [compose.yaml](./docker_compose/intel/hpu/gaudi/compose.yaml). ```bash -cd GenAIExamples/CodeGen/docker/gaudi +cd GenAIExamples/CodeGen/docker_compose/intel/hpu/gaudi docker compose up -d ``` > Notice: Currently only the **Habana Driver 1.16.x** is supported for Gaudi. -Refer to the [Gaudi Guide](./docker/gaudi/README.md) to build docker images from source. +Refer to the [Gaudi Guide](./docker_compose/intel/hpu/gaudi/README.md) to build docker images from source. #### Deploy CodeGen on Xeon -Find the corresponding [compose.yaml](./docker/xeon/compose.yaml). +Find the corresponding [compose.yaml](./docker_compose/intel/cpu/xeon/compose.yaml). ```bash -cd GenAIExamples/CodeGen/docker/xeon +cd GenAIExamples/CodeGen/docker_compose/intel/cpu/xeon docker compose up -d ``` -Refer to the [Xeon Guide](./docker/xeon/README.md) for more instructions on building docker images from source. +Refer to the [Xeon Guide](./docker_compose/intel/cpu/xeon/README.md) for more instructions on building docker images from source. ### Deploy CodeGen using Kubernetes @@ -126,7 +126,7 @@ Two ways of consuming CodeGen Service: ## Troubleshooting -1. If you get errors like "Access Denied", [validate micro service](https://github.com/opea-project/GenAIExamples/tree/main/CodeGen/docker/xeon#validate-microservices) first. A simple example: +1. If you get errors like "Access Denied", [validate micro service](https://github.com/opea-project/GenAIExamples/tree/main/CodeGen/docker_compose/intel/cpu/xeon#validate-microservices) first. A simple example: ```bash http_proxy="" diff --git a/CodeGen/docker/codegen.py b/CodeGen/codegen.py similarity index 100% rename from CodeGen/docker/codegen.py rename to CodeGen/codegen.py diff --git a/CodeGen/docker/xeon/README.md b/CodeGen/docker_compose/intel/cpu/xeon/README.md similarity index 89% rename from CodeGen/docker/xeon/README.md rename to CodeGen/docker_compose/intel/cpu/xeon/README.md index d5b988064..048b7fc70 100644 --- a/CodeGen/docker/xeon/README.md +++ b/CodeGen/docker_compose/intel/cpu/xeon/README.md @@ -33,7 +33,7 @@ To construct the Mega Service, we utilize the [GenAIComps](https://github.com/op ```bash git clone https://github.com/opea-project/GenAIExamples -cd GenAIExamples/CodeGen/docker +cd GenAIExamples/CodeGen docker build -t opea/codegen:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile . ``` @@ -42,7 +42,7 @@ docker build -t opea/codegen:latest --build-arg https_proxy=$https_proxy --build Build the frontend Docker image via the command below: ```bash -cd GenAIExamples/CodeGen/docker/ui/ +cd GenAIExamples/CodeGen/ui docker build -t opea/codegen-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker/Dockerfile . ``` @@ -105,7 +105,7 @@ Note: Please replace the `host_ip` with you external IP address, do not use `loc ### Start the Docker Containers for All Services ```bash -cd GenAIExamples/CodeGen/docker/xeon +cd GenAIExamples/CodeGen/docker_compose/intel/cpu/xeon docker compose up -d ``` @@ -149,11 +149,11 @@ To access the frontend, open the following URL in your browser: `http://{host_ip - "80:5173" ``` -![project-screenshot](../../assets/img/codeGen_ui_init.jpg) +![project-screenshot](../../../../assets/img/codeGen_ui_init.jpg) Here is an example of running CodeGen in the UI: -![project-screenshot](../../assets/img/codeGen_ui_response.png) +![project-screenshot](../../../../assets/img/codeGen_ui_response.png) ## 🚀 Launch the React Based UI (Optional) @@ -175,7 +175,7 @@ codegen-xeon-react-ui-server: restart: always ``` -![project-screenshot](../../assets/img/codegen_react.png) +![project-screenshot](../../../../assets/img/codegen_react.png) ## Install Copilot VSCode extension from Plugin Marketplace as the frontend @@ -183,7 +183,7 @@ In addition to the Svelte UI, users can also install the Copilot VSCode extensio Install `Neural Copilot` in VSCode as below. -![Install-screenshot](../../assets/img/codegen_copilot.png) +![Install-screenshot](../../../../assets/img/codegen_copilot.png) ### How to Use @@ -191,46 +191,46 @@ Install `Neural Copilot` in VSCode as below. Please adjust the service URL in the extension settings based on the endpoint of the code generation backend service. -![Setting-screenshot](../../assets/img/codegen_settings.png) -![Setting-screenshot](../../assets/img/codegen_endpoint.png) +![Setting-screenshot](../../../../assets/img/codegen_settings.png) +![Setting-screenshot](../../../../assets/img/codegen_endpoint.png) #### Customize The Copilot enables users to input their corresponding sensitive information and tokens in the user settings according to their own needs. This customization enhances the accuracy and output content to better meet individual requirements. -![Customize](../../assets/img/codegen_customize.png) +![Customize](../../../../assets/img/codegen_customize.png) #### Code Suggestion To trigger inline completion, you'll need to type `# {your keyword} (start with your programming language's comment keyword, like // in C++ and # in python)`. Make sure the `Inline Suggest` is enabled from the VS Code Settings. For example: -![code suggestion](../../assets/img/codegen_suggestion.png) +![code suggestion](../../../../assets/img/codegen_suggestion.png) To provide programmers with a smooth experience, the Copilot supports multiple ways to trigger inline code suggestions. If you are interested in the details, they are summarized as follows: - Generate code from single-line comments: The simplest way introduced before. - Generate code from consecutive single-line comments: -![codegen from single-line comments](../../assets/img/codegen_single_line.png) +![codegen from single-line comments](../../../../assets/img/codegen_single_line.png) - Generate code from multi-line comments, which will not be triggered until there is at least one `space` outside the multi-line comment): -![codegen from multi-line comments](../../assets/img/codegen_multi_line.png) +![codegen from multi-line comments](../../../../assets/img/codegen_multi_line.png) - Automatically complete multi-line comments: -![auto complete](../../assets/img/codegen_auto_complete.jpg) +![auto complete](../../../../assets/img/codegen_auto_complete.jpg) ### Chat with AI assistant You can start a conversation with the AI programming assistant by clicking on the robot icon in the plugin bar on the left: -![icon](../../assets/img/codegen_icon.png) +![icon](../../../../assets/img/codegen_icon.png) Then you can see the conversation window on the left, where you can chat with AI assistant: -![dialog](../../assets/img/codegen_dialog.png) +![dialog](../../../../assets/img/codegen_dialog.png) There are 4 areas worth noting as shown in the screenshot above: @@ -244,8 +244,8 @@ For example: - Select code -![select code](../../assets/img/codegen_select_code.png) +![select code](../../../../assets/img/codegen_select_code.png) - Ask question and get answer -![qna](../../assets/img/codegen_qna.png) +![qna](../../../../assets/img/codegen_qna.png) diff --git a/CodeGen/docker/xeon/compose.yaml b/CodeGen/docker_compose/intel/cpu/xeon/compose.yaml similarity index 100% rename from CodeGen/docker/xeon/compose.yaml rename to CodeGen/docker_compose/intel/cpu/xeon/compose.yaml diff --git a/CodeGen/docker/gaudi/README.md b/CodeGen/docker_compose/intel/hpu/gaudi/README.md similarity index 89% rename from CodeGen/docker/gaudi/README.md rename to CodeGen/docker_compose/intel/hpu/gaudi/README.md index 5c440cade..b67144525 100644 --- a/CodeGen/docker/gaudi/README.md +++ b/CodeGen/docker_compose/intel/hpu/gaudi/README.md @@ -25,7 +25,7 @@ To construct the Mega Service, we utilize the [GenAIComps](https://github.com/op ```bash git clone https://github.com/opea-project/GenAIExamples -cd GenAIExamples/CodeGen/docker +cd GenAIExamples/CodeGen docker build -t opea/codegen:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile . ``` @@ -34,7 +34,7 @@ docker build -t opea/codegen:latest --build-arg https_proxy=$https_proxy --build Construct the frontend Docker image via the command below: ```bash -cd GenAIExamples/CodeGen/docker/ui/ +cd GenAIExamples/CodeGen/ui docker build -t opea/codegen-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker/Dockerfile . ``` @@ -43,7 +43,7 @@ docker build -t opea/codegen-ui:latest --build-arg https_proxy=$https_proxy --bu Construct the React frontend Docker image via the command below: ```bash -cd GenAIExamples/CodeGen/docker/ui/ +cd GenAIExamples/CodeGen/ui docker build -t opea/codegen-react-ui:latest --build-arg BACKEND_SERVICE_ENDPOINT=$BACKEND_SERVICE_ENDPOINT -f ./docker/Dockerfile.react . ``` @@ -102,7 +102,7 @@ export BACKEND_SERVICE_ENDPOINT="http://${host_ip}:7778/v1/codegen" ### Start the Docker Containers for All Services ```bash -cd GenAIExamples/CodeGen/docker/gaudi +cd GenAIExamples/CodeGen/docker_compose/intel/hpu/gaudi docker compose up -d ``` @@ -146,7 +146,7 @@ To access the frontend, open the following URL in your browser: `http://{host_ip - "80:5173" ``` -![project-screenshot](../../assets/img/codeGen_ui_init.jpg) +![project-screenshot](../../../../assets/img/codeGen_ui_init.jpg) ## 🚀 Launch the React Based UI (Optional) @@ -168,7 +168,7 @@ codegen-gaudi-react-ui-server: restart: always ``` -![project-screenshot](../../assets/img/codegen_react.png) +![project-screenshot](../../../../assets/img/codegen_react.png) ## Install Copilot VSCode extension from Plugin Marketplace as the frontend @@ -176,7 +176,7 @@ In addition to the Svelte UI, users can also install the Copilot VSCode extensio Install `Neural Copilot` in VSCode as below. -![Install-screenshot](../../assets/img/codegen_copilot.png) +![Install-screenshot](../../../../assets/img/codegen_copilot.png) ### How to Use @@ -184,46 +184,46 @@ Install `Neural Copilot` in VSCode as below. Please adjust the service URL in the extension settings based on the endpoint of the CodeGen backend service. -![Setting-screenshot](../../assets/img/codegen_settings.png) -![Setting-screenshot](../../assets/img/codegen_endpoint.png) +![Setting-screenshot](../../../../assets/img/codegen_settings.png) +![Setting-screenshot](../../../../assets/img/codegen_endpoint.png) #### Customize The Copilot enables users to input their corresponding sensitive information and tokens in the user settings according to their own needs. This customization enhances the accuracy and output content to better meet individual requirements. -![Customize](../../assets/img/codegen_customize.png) +![Customize](../../../../assets/img/codegen_customize.png) #### Code Suggestion To trigger inline completion, you'll need to type `# {your keyword} (start with your programming language's comment keyword, like // in C++ and # in python)`. Make sure the `Inline Suggest` is enabled from the VS Code Settings. For example: -![code suggestion](../../assets/img/codegen_suggestion.png) +![code suggestion](../../../../assets/img/codegen_suggestion.png) To provide programmers with a smooth experience, the Copilot supports multiple ways to trigger inline code suggestions. If you are interested in the details, they are summarized as follows: - Generate code from single-line comments: The simplest way introduced before. - Generate code from consecutive single-line comments: -![codegen from single-line comments](../../assets/img/codegen_single_line.png) +![codegen from single-line comments](../../../../assets/img/codegen_single_line.png) - Generate code from multi-line comments, which will not be triggered until there is at least one `space` outside the multi-line comment): -![codegen from multi-line comments](../../assets/img/codegen_multi_line.png) +![codegen from multi-line comments](../../../../assets/img/codegen_multi_line.png) - Automatically complete multi-line comments: -![auto complete](../../assets/img/codegen_auto_complete.jpg) +![auto complete](../../../../assets/img/codegen_auto_complete.jpg) ### Chat with AI assistant You can start a conversation with the AI programming assistant by clicking on the robot icon in the plugin bar on the left: -![icon](../../assets/img/codegen_icon.png) +![icon](../../../../assets/img/codegen_icon.png) Then you can see the conversation window on the left, where you can chat with the AI assistant: -![dialog](../../assets/img/codegen_dialog.png) +![dialog](../../../../assets/img/codegen_dialog.png) There are 4 areas worth noting as shown in the screenshot above: @@ -237,8 +237,8 @@ For example: - Select code -![select code](../../assets/img/codegen_select_code.png) +![select code](../../../../assets/img/codegen_select_code.png) - Ask question and get answer -![qna](../../assets/img/codegen_qna.png) +![qna](../../../../assets/img/codegen_qna.png) diff --git a/CodeGen/docker/gaudi/compose.yaml b/CodeGen/docker_compose/intel/hpu/gaudi/compose.yaml similarity index 100% rename from CodeGen/docker/gaudi/compose.yaml rename to CodeGen/docker_compose/intel/hpu/gaudi/compose.yaml diff --git a/CodeGen/docker/docker_build_compose.yaml b/CodeGen/docker_image_build/build.yaml similarity index 92% rename from CodeGen/docker/docker_build_compose.yaml rename to CodeGen/docker_image_build/build.yaml index 7a7065fdd..1f8a7f949 100644 --- a/CodeGen/docker/docker_build_compose.yaml +++ b/CodeGen/docker_image_build/build.yaml @@ -8,17 +8,18 @@ services: http_proxy: ${http_proxy} https_proxy: ${https_proxy} no_proxy: ${no_proxy} + context: ../ dockerfile: ./Dockerfile image: ${REGISTRY:-opea}/codegen:${TAG:-latest} codegen-ui: build: - context: ui + context: ../ui dockerfile: ./docker/Dockerfile extends: codegen image: ${REGISTRY:-opea}/codegen-ui:${TAG:-latest} codegen-react-ui: build: - context: ui + context: ../ui dockerfile: ./docker/Dockerfile.react extends: codegen image: ${REGISTRY:-opea}/codegen-react-ui:${TAG:-latest} diff --git a/CodeGen/kubernetes/manifests/README.md b/CodeGen/kubernetes/intel/README.md similarity index 100% rename from CodeGen/kubernetes/manifests/README.md rename to CodeGen/kubernetes/intel/README.md diff --git a/CodeGen/kubernetes/README.md b/CodeGen/kubernetes/intel/README_gmc.md similarity index 100% rename from CodeGen/kubernetes/README.md rename to CodeGen/kubernetes/intel/README_gmc.md diff --git a/CodeGen/kubernetes/codegen_xeon.yaml b/CodeGen/kubernetes/intel/cpu/xeon/gmc/codegen_xeon.yaml similarity index 100% rename from CodeGen/kubernetes/codegen_xeon.yaml rename to CodeGen/kubernetes/intel/cpu/xeon/gmc/codegen_xeon.yaml diff --git a/CodeGen/kubernetes/manifests/xeon/ui/README.md b/CodeGen/kubernetes/intel/cpu/xeon/manifest/README_react_ui.md similarity index 100% rename from CodeGen/kubernetes/manifests/xeon/ui/README.md rename to CodeGen/kubernetes/intel/cpu/xeon/manifest/README_react_ui.md diff --git a/CodeGen/kubernetes/manifests/xeon/codegen.yaml b/CodeGen/kubernetes/intel/cpu/xeon/manifest/codegen.yaml similarity index 100% rename from CodeGen/kubernetes/manifests/xeon/codegen.yaml rename to CodeGen/kubernetes/intel/cpu/xeon/manifest/codegen.yaml diff --git a/CodeGen/kubernetes/manifests/xeon/ui/react-codegen.yaml b/CodeGen/kubernetes/intel/cpu/xeon/manifest/codegen_react_ui.yaml similarity index 100% rename from CodeGen/kubernetes/manifests/xeon/ui/react-codegen.yaml rename to CodeGen/kubernetes/intel/cpu/xeon/manifest/codegen_react_ui.yaml diff --git a/CodeGen/kubernetes/codegen_gaudi.yaml b/CodeGen/kubernetes/intel/hpu/gaudi/gmc/codegen_gaudi.yaml similarity index 100% rename from CodeGen/kubernetes/codegen_gaudi.yaml rename to CodeGen/kubernetes/intel/hpu/gaudi/gmc/codegen_gaudi.yaml diff --git a/CodeGen/kubernetes/manifests/gaudi/codegen.yaml b/CodeGen/kubernetes/intel/hpu/gaudi/manifest/codegen.yaml similarity index 100% rename from CodeGen/kubernetes/manifests/gaudi/codegen.yaml rename to CodeGen/kubernetes/intel/hpu/gaudi/manifest/codegen.yaml diff --git a/CodeGen/docker/set_env.sh b/CodeGen/set_env.sh similarity index 100% rename from CodeGen/docker/set_env.sh rename to CodeGen/set_env.sh diff --git a/CodeGen/tests/test_codegen_on_gaudi.sh b/CodeGen/tests/test_compose_on_gaudi.sh similarity index 90% rename from CodeGen/tests/test_codegen_on_gaudi.sh rename to CodeGen/tests/test_compose_on_gaudi.sh index 37a93dd70..46c937d0b 100644 --- a/CodeGen/tests/test_codegen_on_gaudi.sh +++ b/CodeGen/tests/test_compose_on_gaudi.sh @@ -15,19 +15,19 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="codegen codegen-ui llm-tgi" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/tgi-gaudi:2.0.1 docker images && sleep 1s } function start_services() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi export LLM_MODEL_ID="Intel/neural-chat-7b-v3-3" export TGI_LLM_ENDPOINT="http://${ip_address}:8028" export HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN} @@ -35,7 +35,7 @@ function start_services() { export LLM_SERVICE_HOST_IP=${ip_address} export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:7778/v1/codegen" - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose up -d > ${LOG_PATH}/start_services_with_compose.log @@ -110,7 +110,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -138,7 +138,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi docker compose stop && docker compose rm -f } diff --git a/CodeGen/tests/test_codegen_on_xeon.sh b/CodeGen/tests/test_compose_on_xeon.sh similarity index 90% rename from CodeGen/tests/test_codegen_on_xeon.sh rename to CodeGen/tests/test_compose_on_xeon.sh index 69387bc6d..0821cd3cb 100644 --- a/CodeGen/tests/test_codegen_on_xeon.sh +++ b/CodeGen/tests/test_compose_on_xeon.sh @@ -15,19 +15,19 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="codegen codegen-ui llm-tgi" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/text-generation-inference:sha-e4201f4-intel-cpu docker images && sleep 1s } function start_services() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon/ export LLM_MODEL_ID="Intel/neural-chat-7b-v3-3" export TGI_LLM_ENDPOINT="http://${ip_address}:8028" @@ -36,7 +36,7 @@ function start_services() { export LLM_SERVICE_HOST_IP=${ip_address} export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:7778/v1/codegen" - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose up -d > ${LOG_PATH}/start_services_with_compose.log @@ -111,7 +111,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -140,7 +140,7 @@ function validate_frontend() { function stop_docker() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon/ docker compose stop && docker compose rm -f } diff --git a/CodeGen/tests/test_gmc_on_gaudi.sh b/CodeGen/tests/test_gmc_on_gaudi.sh index a63ef201f..ad16e2108 100755 --- a/CodeGen/tests/test_gmc_on_gaudi.sh +++ b/CodeGen/tests/test_gmc_on_gaudi.sh @@ -112,12 +112,12 @@ fi case "$1" in install_CodeGen) - pushd CodeGen/kubernetes + pushd CodeGen/kubernetes/intel/hpu/gaudi/gmc install_codegen popd ;; validate_CodeGen) - pushd CodeGen/kubernetes + pushd CodeGen/kubernetes/intel/hpu/gaudi/gmc validate_codegen popd ;; diff --git a/CodeGen/tests/test_gmc_on_xeon.sh b/CodeGen/tests/test_gmc_on_xeon.sh index 97cb14d78..92f620365 100755 --- a/CodeGen/tests/test_gmc_on_xeon.sh +++ b/CodeGen/tests/test_gmc_on_xeon.sh @@ -112,12 +112,12 @@ fi case "$1" in install_CodeGen) - pushd CodeGen/kubernetes + pushd CodeGen/kubernetes/intel/cpu/xeon/gmc install_codegen popd ;; validate_CodeGen) - pushd CodeGen/kubernetes + pushd CodeGen/kubernetes/intel/cpu/xeon/gmc validate_codegen popd ;; diff --git a/CodeGen/tests/test_manifest_on_gaudi.sh b/CodeGen/tests/test_manifest_on_gaudi.sh index 80464069e..5aa2b558c 100755 --- a/CodeGen/tests/test_manifest_on_gaudi.sh +++ b/CodeGen/tests/test_manifest_on_gaudi.sh @@ -68,12 +68,12 @@ fi case "$1" in init_CodeGen) - pushd CodeGen/kubernetes/manifests/gaudi + pushd CodeGen/kubernetes/intel/hpu/gaudi/manifest init_codegen popd ;; install_CodeGen) - pushd CodeGen/kubernetes/manifests/gaudi + pushd CodeGen/kubernetes/intel/hpu/gaudi/manifest NAMESPACE=$2 install_codegen popd diff --git a/CodeGen/tests/test_manifest_on_xeon.sh b/CodeGen/tests/test_manifest_on_xeon.sh index c18c108fd..c6eea80ac 100755 --- a/CodeGen/tests/test_manifest_on_xeon.sh +++ b/CodeGen/tests/test_manifest_on_xeon.sh @@ -68,12 +68,12 @@ fi case "$1" in init_CodeGen) - pushd CodeGen/kubernetes/manifests/xeon + pushd CodeGen/kubernetes/intel/cpu/xeon/manifest init_codegen popd ;; install_CodeGen) - pushd CodeGen/kubernetes/manifests/xeon + pushd CodeGen/kubernetes/intel/cpu/xeon/manifest NAMESPACE=$2 install_codegen popd diff --git a/CodeGen/docker/ui/docker/Dockerfile b/CodeGen/ui/docker/Dockerfile similarity index 100% rename from CodeGen/docker/ui/docker/Dockerfile rename to CodeGen/ui/docker/Dockerfile diff --git a/CodeGen/docker/ui/docker/Dockerfile.react b/CodeGen/ui/docker/Dockerfile.react similarity index 100% rename from CodeGen/docker/ui/docker/Dockerfile.react rename to CodeGen/ui/docker/Dockerfile.react diff --git a/CodeGen/docker/ui/react/.env b/CodeGen/ui/react/.env similarity index 100% rename from CodeGen/docker/ui/react/.env rename to CodeGen/ui/react/.env diff --git a/CodeGen/docker/ui/react/.eslintrc.cjs b/CodeGen/ui/react/.eslintrc.cjs similarity index 100% rename from CodeGen/docker/ui/react/.eslintrc.cjs rename to CodeGen/ui/react/.eslintrc.cjs diff --git a/CodeGen/docker/ui/react/.gitignore b/CodeGen/ui/react/.gitignore similarity index 100% rename from CodeGen/docker/ui/react/.gitignore rename to CodeGen/ui/react/.gitignore diff --git a/CodeGen/docker/ui/react/README.md b/CodeGen/ui/react/README.md similarity index 88% rename from CodeGen/docker/ui/react/README.md rename to CodeGen/ui/react/README.md index 7a8373075..ade4fee0d 100644 --- a/CodeGen/docker/ui/react/README.md +++ b/CodeGen/ui/react/README.md @@ -2,7 +2,7 @@ ## 📸 Project Screenshots -![project-screenshot](../../../assets/img/codegen_react.png) +![project-screenshot](../../assets/img/codegen_react.png) ## 🧐 Features diff --git a/CodeGen/docker/ui/react/index.html b/CodeGen/ui/react/index.html similarity index 100% rename from CodeGen/docker/ui/react/index.html rename to CodeGen/ui/react/index.html diff --git a/CodeGen/docker/ui/react/nginx.conf b/CodeGen/ui/react/nginx.conf similarity index 100% rename from CodeGen/docker/ui/react/nginx.conf rename to CodeGen/ui/react/nginx.conf diff --git a/CodeGen/docker/ui/react/package.json b/CodeGen/ui/react/package.json similarity index 100% rename from CodeGen/docker/ui/react/package.json rename to CodeGen/ui/react/package.json diff --git a/CodeGen/docker/ui/react/postcss.config.cjs b/CodeGen/ui/react/postcss.config.cjs similarity index 100% rename from CodeGen/docker/ui/react/postcss.config.cjs rename to CodeGen/ui/react/postcss.config.cjs diff --git a/CodeGen/docker/ui/react/src/App.scss b/CodeGen/ui/react/src/App.scss similarity index 100% rename from CodeGen/docker/ui/react/src/App.scss rename to CodeGen/ui/react/src/App.scss diff --git a/CodeGen/docker/ui/react/src/App.tsx b/CodeGen/ui/react/src/App.tsx similarity index 100% rename from CodeGen/docker/ui/react/src/App.tsx rename to CodeGen/ui/react/src/App.tsx diff --git a/CodeGen/docker/ui/react/src/__tests__/util.test.ts b/CodeGen/ui/react/src/__tests__/util.test.ts similarity index 100% rename from CodeGen/docker/ui/react/src/__tests__/util.test.ts rename to CodeGen/ui/react/src/__tests__/util.test.ts diff --git a/CodeGen/docker/ui/react/src/assets/opea-icon-black.svg b/CodeGen/ui/react/src/assets/opea-icon-black.svg similarity index 100% rename from CodeGen/docker/ui/react/src/assets/opea-icon-black.svg rename to CodeGen/ui/react/src/assets/opea-icon-black.svg diff --git a/CodeGen/docker/ui/react/src/assets/opea-icon-color.svg b/CodeGen/ui/react/src/assets/opea-icon-color.svg similarity index 100% rename from CodeGen/docker/ui/react/src/assets/opea-icon-color.svg rename to CodeGen/ui/react/src/assets/opea-icon-color.svg diff --git a/CodeGen/docker/ui/react/src/common/client.ts b/CodeGen/ui/react/src/common/client.ts similarity index 100% rename from CodeGen/docker/ui/react/src/common/client.ts rename to CodeGen/ui/react/src/common/client.ts diff --git a/CodeGen/docker/ui/react/src/common/util.ts b/CodeGen/ui/react/src/common/util.ts similarity index 100% rename from CodeGen/docker/ui/react/src/common/util.ts rename to CodeGen/ui/react/src/common/util.ts diff --git a/CodeGen/docker/ui/react/src/components/CodeGen/CodeGen.tsx b/CodeGen/ui/react/src/components/CodeGen/CodeGen.tsx similarity index 100% rename from CodeGen/docker/ui/react/src/components/CodeGen/CodeGen.tsx rename to CodeGen/ui/react/src/components/CodeGen/CodeGen.tsx diff --git a/CodeGen/docker/ui/react/src/components/CodeGen/codeGen.module.scss b/CodeGen/ui/react/src/components/CodeGen/codeGen.module.scss similarity index 100% rename from CodeGen/docker/ui/react/src/components/CodeGen/codeGen.module.scss rename to CodeGen/ui/react/src/components/CodeGen/codeGen.module.scss diff --git a/CodeGen/docker/ui/react/src/components/Message/conversationMessage.module.scss b/CodeGen/ui/react/src/components/Message/conversationMessage.module.scss similarity index 100% rename from CodeGen/docker/ui/react/src/components/Message/conversationMessage.module.scss rename to CodeGen/ui/react/src/components/Message/conversationMessage.module.scss diff --git a/CodeGen/docker/ui/react/src/components/Message/conversationMessage.tsx b/CodeGen/ui/react/src/components/Message/conversationMessage.tsx similarity index 100% rename from CodeGen/docker/ui/react/src/components/Message/conversationMessage.tsx rename to CodeGen/ui/react/src/components/Message/conversationMessage.tsx diff --git a/CodeGen/docker/ui/react/src/components/Shared/CodeRender/CodeRender.tsx b/CodeGen/ui/react/src/components/Shared/CodeRender/CodeRender.tsx similarity index 100% rename from CodeGen/docker/ui/react/src/components/Shared/CodeRender/CodeRender.tsx rename to CodeGen/ui/react/src/components/Shared/CodeRender/CodeRender.tsx diff --git a/CodeGen/docker/ui/react/src/components/Shared/CodeRender/codeRender.module.scss b/CodeGen/ui/react/src/components/Shared/CodeRender/codeRender.module.scss similarity index 100% rename from CodeGen/docker/ui/react/src/components/Shared/CodeRender/codeRender.module.scss rename to CodeGen/ui/react/src/components/Shared/CodeRender/codeRender.module.scss diff --git a/CodeGen/docker/ui/react/src/components/Shared/Markdown/Markdown.tsx b/CodeGen/ui/react/src/components/Shared/Markdown/Markdown.tsx similarity index 100% rename from CodeGen/docker/ui/react/src/components/Shared/Markdown/Markdown.tsx rename to CodeGen/ui/react/src/components/Shared/Markdown/Markdown.tsx diff --git a/CodeGen/docker/ui/react/src/components/Shared/Markdown/markdown.module.scss b/CodeGen/ui/react/src/components/Shared/Markdown/markdown.module.scss similarity index 100% rename from CodeGen/docker/ui/react/src/components/Shared/Markdown/markdown.module.scss rename to CodeGen/ui/react/src/components/Shared/Markdown/markdown.module.scss diff --git a/CodeGen/docker/ui/react/src/components/sidebar/sidebar.module.scss b/CodeGen/ui/react/src/components/sidebar/sidebar.module.scss similarity index 100% rename from CodeGen/docker/ui/react/src/components/sidebar/sidebar.module.scss rename to CodeGen/ui/react/src/components/sidebar/sidebar.module.scss diff --git a/CodeGen/docker/ui/react/src/components/sidebar/sidebar.tsx b/CodeGen/ui/react/src/components/sidebar/sidebar.tsx similarity index 100% rename from CodeGen/docker/ui/react/src/components/sidebar/sidebar.tsx rename to CodeGen/ui/react/src/components/sidebar/sidebar.tsx diff --git a/CodeGen/docker/ui/react/src/config.ts b/CodeGen/ui/react/src/config.ts similarity index 100% rename from CodeGen/docker/ui/react/src/config.ts rename to CodeGen/ui/react/src/config.ts diff --git a/CodeGen/docker/ui/react/src/index.scss b/CodeGen/ui/react/src/index.scss similarity index 100% rename from CodeGen/docker/ui/react/src/index.scss rename to CodeGen/ui/react/src/index.scss diff --git a/CodeGen/docker/ui/react/src/main.tsx b/CodeGen/ui/react/src/main.tsx similarity index 100% rename from CodeGen/docker/ui/react/src/main.tsx rename to CodeGen/ui/react/src/main.tsx diff --git a/FaqGen/docker/ui/react/src/styles/components/_context.scss b/CodeGen/ui/react/src/styles/components/_context.scss similarity index 100% rename from FaqGen/docker/ui/react/src/styles/components/_context.scss rename to CodeGen/ui/react/src/styles/components/_context.scss diff --git a/CodeGen/docker/ui/react/src/styles/components/_sidebar.scss b/CodeGen/ui/react/src/styles/components/_sidebar.scss similarity index 100% rename from CodeGen/docker/ui/react/src/styles/components/_sidebar.scss rename to CodeGen/ui/react/src/styles/components/_sidebar.scss diff --git a/CodeGen/docker/ui/react/src/styles/components/content.scss b/CodeGen/ui/react/src/styles/components/content.scss similarity index 100% rename from CodeGen/docker/ui/react/src/styles/components/content.scss rename to CodeGen/ui/react/src/styles/components/content.scss diff --git a/CodeGen/docker/ui/react/src/styles/components/context.module.scss b/CodeGen/ui/react/src/styles/components/context.module.scss similarity index 100% rename from CodeGen/docker/ui/react/src/styles/components/context.module.scss rename to CodeGen/ui/react/src/styles/components/context.module.scss diff --git a/CodeGen/docker/ui/react/src/styles/layout/_basics.scss b/CodeGen/ui/react/src/styles/layout/_basics.scss similarity index 100% rename from CodeGen/docker/ui/react/src/styles/layout/_basics.scss rename to CodeGen/ui/react/src/styles/layout/_basics.scss diff --git a/CodeGen/docker/ui/react/src/styles/layout/_flex.scss b/CodeGen/ui/react/src/styles/layout/_flex.scss similarity index 100% rename from CodeGen/docker/ui/react/src/styles/layout/_flex.scss rename to CodeGen/ui/react/src/styles/layout/_flex.scss diff --git a/CodeGen/docker/ui/react/src/styles/styles.scss b/CodeGen/ui/react/src/styles/styles.scss similarity index 100% rename from CodeGen/docker/ui/react/src/styles/styles.scss rename to CodeGen/ui/react/src/styles/styles.scss diff --git a/CodeGen/docker/ui/react/src/vite-env.d.ts b/CodeGen/ui/react/src/vite-env.d.ts similarity index 100% rename from CodeGen/docker/ui/react/src/vite-env.d.ts rename to CodeGen/ui/react/src/vite-env.d.ts diff --git a/CodeGen/docker/ui/react/tsconfig.json b/CodeGen/ui/react/tsconfig.json similarity index 100% rename from CodeGen/docker/ui/react/tsconfig.json rename to CodeGen/ui/react/tsconfig.json diff --git a/CodeGen/docker/ui/react/tsconfig.node.json b/CodeGen/ui/react/tsconfig.node.json similarity index 100% rename from CodeGen/docker/ui/react/tsconfig.node.json rename to CodeGen/ui/react/tsconfig.node.json diff --git a/CodeGen/docker/ui/react/vite.config.ts b/CodeGen/ui/react/vite.config.ts similarity index 100% rename from CodeGen/docker/ui/react/vite.config.ts rename to CodeGen/ui/react/vite.config.ts diff --git a/CodeGen/docker/ui/svelte/.editorconfig b/CodeGen/ui/svelte/.editorconfig similarity index 100% rename from CodeGen/docker/ui/svelte/.editorconfig rename to CodeGen/ui/svelte/.editorconfig diff --git a/CodeGen/docker/ui/svelte/.env b/CodeGen/ui/svelte/.env similarity index 100% rename from CodeGen/docker/ui/svelte/.env rename to CodeGen/ui/svelte/.env diff --git a/CodeGen/docker/ui/svelte/.eslintignore b/CodeGen/ui/svelte/.eslintignore similarity index 100% rename from CodeGen/docker/ui/svelte/.eslintignore rename to CodeGen/ui/svelte/.eslintignore diff --git a/CodeGen/docker/ui/svelte/.eslintrc.cjs b/CodeGen/ui/svelte/.eslintrc.cjs similarity index 100% rename from CodeGen/docker/ui/svelte/.eslintrc.cjs rename to CodeGen/ui/svelte/.eslintrc.cjs diff --git a/CodeGen/docker/ui/svelte/.npmrc b/CodeGen/ui/svelte/.npmrc similarity index 100% rename from CodeGen/docker/ui/svelte/.npmrc rename to CodeGen/ui/svelte/.npmrc diff --git a/CodeGen/docker/ui/svelte/.prettierignore b/CodeGen/ui/svelte/.prettierignore similarity index 100% rename from CodeGen/docker/ui/svelte/.prettierignore rename to CodeGen/ui/svelte/.prettierignore diff --git a/CodeGen/docker/ui/svelte/.prettierrc b/CodeGen/ui/svelte/.prettierrc similarity index 100% rename from CodeGen/docker/ui/svelte/.prettierrc rename to CodeGen/ui/svelte/.prettierrc diff --git a/CodeGen/docker/ui/svelte/README.md b/CodeGen/ui/svelte/README.md similarity index 87% rename from CodeGen/docker/ui/svelte/README.md rename to CodeGen/ui/svelte/README.md index 3ef4d6f6a..a1135ba76 100644 --- a/CodeGen/docker/ui/svelte/README.md +++ b/CodeGen/ui/svelte/README.md @@ -2,7 +2,7 @@ ## 📸 Project Screenshots -![project-screenshot](../../../assets/img/codeGen_ui_init.jpg) +![project-screenshot](../../assets/img/codeGen_ui_init.jpg) ## 🧐 Features diff --git a/CodeGen/docker/ui/svelte/package.json b/CodeGen/ui/svelte/package.json similarity index 100% rename from CodeGen/docker/ui/svelte/package.json rename to CodeGen/ui/svelte/package.json diff --git a/CodeGen/docker/ui/svelte/playwright.config.ts b/CodeGen/ui/svelte/playwright.config.ts similarity index 100% rename from CodeGen/docker/ui/svelte/playwright.config.ts rename to CodeGen/ui/svelte/playwright.config.ts diff --git a/CodeGen/docker/ui/svelte/postcss.config.cjs b/CodeGen/ui/svelte/postcss.config.cjs similarity index 100% rename from CodeGen/docker/ui/svelte/postcss.config.cjs rename to CodeGen/ui/svelte/postcss.config.cjs diff --git a/CodeGen/docker/ui/svelte/src/app.d.ts b/CodeGen/ui/svelte/src/app.d.ts similarity index 100% rename from CodeGen/docker/ui/svelte/src/app.d.ts rename to CodeGen/ui/svelte/src/app.d.ts diff --git a/CodeGen/docker/ui/svelte/src/app.html b/CodeGen/ui/svelte/src/app.html similarity index 100% rename from CodeGen/docker/ui/svelte/src/app.html rename to CodeGen/ui/svelte/src/app.html diff --git a/CodeGen/docker/ui/svelte/src/app.pcss b/CodeGen/ui/svelte/src/app.pcss similarity index 100% rename from CodeGen/docker/ui/svelte/src/app.pcss rename to CodeGen/ui/svelte/src/app.pcss diff --git a/CodeGen/docker/ui/svelte/src/app.postcss b/CodeGen/ui/svelte/src/app.postcss similarity index 100% rename from CodeGen/docker/ui/svelte/src/app.postcss rename to CodeGen/ui/svelte/src/app.postcss diff --git a/CodeGen/docker/ui/svelte/src/lib/InputAirPlane.svelte b/CodeGen/ui/svelte/src/lib/InputAirPlane.svelte similarity index 100% rename from CodeGen/docker/ui/svelte/src/lib/InputAirPlane.svelte rename to CodeGen/ui/svelte/src/lib/InputAirPlane.svelte diff --git a/CodeGen/docker/ui/svelte/src/lib/assets/PaperAirplane.svelte b/CodeGen/ui/svelte/src/lib/assets/PaperAirplane.svelte similarity index 100% rename from CodeGen/docker/ui/svelte/src/lib/assets/PaperAirplane.svelte rename to CodeGen/ui/svelte/src/lib/assets/PaperAirplane.svelte diff --git a/CodeGen/docker/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte b/CodeGen/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte similarity index 100% rename from CodeGen/docker/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte rename to CodeGen/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte diff --git a/CodeGen/docker/ui/svelte/src/lib/assets/imgLogo.svelte b/CodeGen/ui/svelte/src/lib/assets/imgLogo.svelte similarity index 100% rename from CodeGen/docker/ui/svelte/src/lib/assets/imgLogo.svelte rename to CodeGen/ui/svelte/src/lib/assets/imgLogo.svelte diff --git a/CodeGen/docker/ui/svelte/src/lib/assets/layout/css/driver.css b/CodeGen/ui/svelte/src/lib/assets/layout/css/driver.css similarity index 100% rename from CodeGen/docker/ui/svelte/src/lib/assets/layout/css/driver.css rename to CodeGen/ui/svelte/src/lib/assets/layout/css/driver.css diff --git a/CodeGen/docker/ui/svelte/src/lib/assets/loadingAnimation.svelte b/CodeGen/ui/svelte/src/lib/assets/loadingAnimation.svelte similarity index 100% rename from CodeGen/docker/ui/svelte/src/lib/assets/loadingAnimation.svelte rename to CodeGen/ui/svelte/src/lib/assets/loadingAnimation.svelte diff --git a/CodeGen/docker/ui/svelte/src/lib/assets/spinLoading.svelte b/CodeGen/ui/svelte/src/lib/assets/spinLoading.svelte similarity index 100% rename from CodeGen/docker/ui/svelte/src/lib/assets/spinLoading.svelte rename to CodeGen/ui/svelte/src/lib/assets/spinLoading.svelte diff --git a/CodeGen/docker/ui/svelte/src/lib/assets/summaryLogo.svelte b/CodeGen/ui/svelte/src/lib/assets/summaryLogo.svelte similarity index 100% rename from CodeGen/docker/ui/svelte/src/lib/assets/summaryLogo.svelte rename to CodeGen/ui/svelte/src/lib/assets/summaryLogo.svelte diff --git a/CodeGen/docker/ui/svelte/src/lib/doc.svelte b/CodeGen/ui/svelte/src/lib/doc.svelte similarity index 100% rename from CodeGen/docker/ui/svelte/src/lib/doc.svelte rename to CodeGen/ui/svelte/src/lib/doc.svelte diff --git a/CodeGen/docker/ui/svelte/src/lib/dropFile.svelte b/CodeGen/ui/svelte/src/lib/dropFile.svelte similarity index 100% rename from CodeGen/docker/ui/svelte/src/lib/dropFile.svelte rename to CodeGen/ui/svelte/src/lib/dropFile.svelte diff --git a/CodeGen/docker/ui/svelte/src/lib/header.svelte b/CodeGen/ui/svelte/src/lib/header.svelte similarity index 100% rename from CodeGen/docker/ui/svelte/src/lib/header.svelte rename to CodeGen/ui/svelte/src/lib/header.svelte diff --git a/CodeGen/docker/ui/svelte/src/lib/index.ts b/CodeGen/ui/svelte/src/lib/index.ts similarity index 100% rename from CodeGen/docker/ui/svelte/src/lib/index.ts rename to CodeGen/ui/svelte/src/lib/index.ts diff --git a/CodeGen/docker/ui/svelte/src/lib/modules/chat/Output.svelte b/CodeGen/ui/svelte/src/lib/modules/chat/Output.svelte similarity index 100% rename from CodeGen/docker/ui/svelte/src/lib/modules/chat/Output.svelte rename to CodeGen/ui/svelte/src/lib/modules/chat/Output.svelte diff --git a/CodeGen/docker/ui/svelte/src/lib/modules/frame/header.svelte b/CodeGen/ui/svelte/src/lib/modules/frame/header.svelte similarity index 100% rename from CodeGen/docker/ui/svelte/src/lib/modules/frame/header.svelte rename to CodeGen/ui/svelte/src/lib/modules/frame/header.svelte diff --git a/CodeGen/docker/ui/svelte/src/lib/network/chat/Network.ts b/CodeGen/ui/svelte/src/lib/network/chat/Network.ts similarity index 100% rename from CodeGen/docker/ui/svelte/src/lib/network/chat/Network.ts rename to CodeGen/ui/svelte/src/lib/network/chat/Network.ts diff --git a/CodeGen/docker/ui/svelte/src/lib/shared/Network.ts b/CodeGen/ui/svelte/src/lib/shared/Network.ts similarity index 100% rename from CodeGen/docker/ui/svelte/src/lib/shared/Network.ts rename to CodeGen/ui/svelte/src/lib/shared/Network.ts diff --git a/CodeGen/docker/ui/svelte/src/lib/shared/Store.ts b/CodeGen/ui/svelte/src/lib/shared/Store.ts similarity index 100% rename from CodeGen/docker/ui/svelte/src/lib/shared/Store.ts rename to CodeGen/ui/svelte/src/lib/shared/Store.ts diff --git a/CodeGen/docker/ui/svelte/src/lib/shared/Utils.ts b/CodeGen/ui/svelte/src/lib/shared/Utils.ts similarity index 100% rename from CodeGen/docker/ui/svelte/src/lib/shared/Utils.ts rename to CodeGen/ui/svelte/src/lib/shared/Utils.ts diff --git a/CodeGen/docker/ui/svelte/src/lib/shared/components/loading/Loading.svelte b/CodeGen/ui/svelte/src/lib/shared/components/loading/Loading.svelte similarity index 100% rename from CodeGen/docker/ui/svelte/src/lib/shared/components/loading/Loading.svelte rename to CodeGen/ui/svelte/src/lib/shared/components/loading/Loading.svelte diff --git a/CodeGen/docker/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte b/CodeGen/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte similarity index 100% rename from CodeGen/docker/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte rename to CodeGen/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte diff --git a/CodeGen/docker/ui/svelte/src/lib/summary.svelte b/CodeGen/ui/svelte/src/lib/summary.svelte similarity index 100% rename from CodeGen/docker/ui/svelte/src/lib/summary.svelte rename to CodeGen/ui/svelte/src/lib/summary.svelte diff --git a/CodeGen/docker/ui/svelte/src/routes/+layout.svelte b/CodeGen/ui/svelte/src/routes/+layout.svelte similarity index 100% rename from CodeGen/docker/ui/svelte/src/routes/+layout.svelte rename to CodeGen/ui/svelte/src/routes/+layout.svelte diff --git a/CodeGen/docker/ui/svelte/src/routes/+page.svelte b/CodeGen/ui/svelte/src/routes/+page.svelte similarity index 100% rename from CodeGen/docker/ui/svelte/src/routes/+page.svelte rename to CodeGen/ui/svelte/src/routes/+page.svelte diff --git a/CodeGen/docker/ui/svelte/src/routes/+page.ts b/CodeGen/ui/svelte/src/routes/+page.ts similarity index 100% rename from CodeGen/docker/ui/svelte/src/routes/+page.ts rename to CodeGen/ui/svelte/src/routes/+page.ts diff --git a/CodeGen/docker/ui/svelte/static/favicon.png b/CodeGen/ui/svelte/static/favicon.png similarity index 100% rename from CodeGen/docker/ui/svelte/static/favicon.png rename to CodeGen/ui/svelte/static/favicon.png diff --git a/CodeGen/docker/ui/svelte/svelte.config.js b/CodeGen/ui/svelte/svelte.config.js similarity index 100% rename from CodeGen/docker/ui/svelte/svelte.config.js rename to CodeGen/ui/svelte/svelte.config.js diff --git a/CodeGen/docker/ui/svelte/tailwind.config.cjs b/CodeGen/ui/svelte/tailwind.config.cjs similarity index 100% rename from CodeGen/docker/ui/svelte/tailwind.config.cjs rename to CodeGen/ui/svelte/tailwind.config.cjs diff --git a/CodeGen/docker/ui/svelte/tests/codeGen.spec.ts b/CodeGen/ui/svelte/tests/codeGen.spec.ts similarity index 100% rename from CodeGen/docker/ui/svelte/tests/codeGen.spec.ts rename to CodeGen/ui/svelte/tests/codeGen.spec.ts diff --git a/CodeGen/docker/ui/svelte/tsconfig.json b/CodeGen/ui/svelte/tsconfig.json similarity index 100% rename from CodeGen/docker/ui/svelte/tsconfig.json rename to CodeGen/ui/svelte/tsconfig.json diff --git a/CodeGen/docker/ui/svelte/vite.config.ts b/CodeGen/ui/svelte/vite.config.ts similarity index 100% rename from CodeGen/docker/ui/svelte/vite.config.ts rename to CodeGen/ui/svelte/vite.config.ts diff --git a/CodeTrans/docker/Dockerfile b/CodeTrans/Dockerfile similarity index 100% rename from CodeTrans/docker/Dockerfile rename to CodeTrans/Dockerfile diff --git a/CodeTrans/README.md b/CodeTrans/README.md index 240a97f08..e6e687a09 100644 --- a/CodeTrans/README.md +++ b/CodeTrans/README.md @@ -20,7 +20,7 @@ Currently we support two ways of deploying Code Translation services on docker: docker pull opea/codetrans:latest ``` -2. Start services using the docker images `built from source`: [Guide](./docker/xeon/README.md) +2. Start services using the docker images `built from source`: [Guide](./docker_compose/intel/cpu/xeon/README.md) ### Required Models @@ -65,27 +65,27 @@ To set up environment variables for deploying Code Translation services, follow #### Deploy Code Translation on Gaudi -Find the corresponding [compose.yaml](./docker/gaudi/compose.yaml). +Find the corresponding [compose.yaml](./docker_compose/intel/hpu/gaudi/compose.yaml). ```bash -cd GenAIExamples/CodeTrans/docker/gaudi +cd GenAIExamples/CodeTrans/docker_compose/intel/hpu/gaudi docker compose up -d ``` > Notice: Currently only the **Habana Driver 1.16.x** is supported for Gaudi. -Refer to the [Gaudi Guide](./docker/gaudi/README.md) to build docker images from source. +Refer to the [Gaudi Guide](./docker_compose/intel/hpu/gaudi/README.md) to build docker images from source. #### Deploy Code Translation on Xeon -Find the corresponding [compose.yaml](./docker/xeon/compose.yaml). +Find the corresponding [compose.yaml](./docker_compose/intel/cpu/xeon/compose.yaml). ```bash -cd GenAIExamples/CodeTrans/docker/xeon +cd GenAIExamples/CodeTrans/docker_compose/intel/cpu/xeon docker compose up -d ``` -Refer to the [Xeon Guide](./docker/xeon/README.md) for more instructions on building docker images from source. +Refer to the [Xeon Guide](./docker_compose/intel/cpu/xeon/README.md) for more instructions on building docker images from source. ### Deploy using Kubernetes with GMC @@ -121,7 +121,7 @@ By default, the UI runs on port 5173 internally. ## Troubleshooting -1. If you get errors like "Access Denied", [validate micro service](https://github.com/opea-project/GenAIExamples/tree/main/CodeTrans/docker/xeon#validate-microservices) first. A simple example: +1. If you get errors like "Access Denied", [validate micro service](https://github.com/opea-project/GenAIExamples/tree/main/CodeTrans/docker_compose/intel/cpu/xeon#validate-microservices) first. A simple example: ```bash http_proxy="" diff --git a/CodeTrans/docker/code_translation.py b/CodeTrans/code_translation.py similarity index 100% rename from CodeTrans/docker/code_translation.py rename to CodeTrans/code_translation.py diff --git a/CodeTrans/docker/xeon/README.md b/CodeTrans/docker_compose/intel/cpu/xeon/README.md similarity index 96% rename from CodeTrans/docker/xeon/README.md rename to CodeTrans/docker_compose/intel/cpu/xeon/README.md index b4c0830fd..6293566db 100755 --- a/CodeTrans/docker/xeon/README.md +++ b/CodeTrans/docker_compose/intel/cpu/xeon/README.md @@ -31,14 +31,14 @@ docker build -t opea/llm-tgi:latest --build-arg https_proxy=$https_proxy --build ```bash git clone https://github.com/opea-project/GenAIExamples.git -cd GenAIExamples/CodeTrans/docker +cd GenAIExamples/CodeTrans docker build -t opea/codetrans:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile . ``` ### 4. Build UI Docker Image ```bash -cd GenAIExamples/CodeTrans/docker/ui +cd GenAIExamples/CodeTrans/ui docker build -t opea/codetrans-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker/Dockerfile . ``` @@ -46,7 +46,7 @@ docker build -t opea/codetrans-ui:latest --build-arg https_proxy=$https_proxy -- ```bash cd GenAIComps -docker build -t opea/nginx:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/nginx/docker/Dockerfile . +docker build -t opea/nginx:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/nginx/Dockerfile . ``` Then run the command `docker images`, you will have the following Docker Images: @@ -98,7 +98,7 @@ Change the `LLM_MODEL_ID` below for your needs. ### Start Microservice Docker Containers ```bash -cd GenAIExamples/CodeTrans/docker/xeon +cd GenAIExamples/CodeTrans/docker_compose/intel/cpu/xeon docker compose up -d ``` diff --git a/CodeTrans/docker/xeon/compose.yaml b/CodeTrans/docker_compose/intel/cpu/xeon/compose.yaml similarity index 100% rename from CodeTrans/docker/xeon/compose.yaml rename to CodeTrans/docker_compose/intel/cpu/xeon/compose.yaml diff --git a/CodeTrans/docker/gaudi/README.md b/CodeTrans/docker_compose/intel/hpu/gaudi/README.md similarity index 94% rename from CodeTrans/docker/gaudi/README.md rename to CodeTrans/docker_compose/intel/hpu/gaudi/README.md index 5b8c00b07..11fbd22ad 100755 --- a/CodeTrans/docker/gaudi/README.md +++ b/CodeTrans/docker_compose/intel/hpu/gaudi/README.md @@ -23,22 +23,22 @@ docker build -t opea/llm-tgi:latest --no-cache --build-arg https_proxy=$https_pr ```bash git clone https://github.com/opea-project/GenAIExamples.git -cd GenAIExamples/CodeTrans/docker +cd GenAIExamples/CodeTrans docker build -t opea/codetrans:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile . ``` ### 4. Build UI Docker Image ```bash -cd GenAIExamples/CodeTrans/docker/ui -docker build -t opea/codetrans-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker/Dockerfile . +cd GenAIExamples/CodeTrans/ui +docker build -t opea/codetrans-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f docker/Dockerfile . ``` ### 5. Build Nginx Docker Image ```bash cd GenAIComps -docker build -t opea/nginx:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/nginx/docker/Dockerfile . +docker build -t opea/nginx:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/nginx/Dockerfile . ``` Then run the command `docker images`, you will have the following Docker Images: @@ -90,7 +90,7 @@ Change the `LLM_MODEL_ID` below for your needs. ### Start Microservice Docker Containers ```bash -cd GenAIExamples/CodeTrans/docker/gaudi +cd GenAIExamples/CodeTrans/docker_compose/intel/hpu/gaudi docker compose up -d ``` diff --git a/CodeTrans/docker/gaudi/compose.yaml b/CodeTrans/docker_compose/intel/hpu/gaudi/compose.yaml similarity index 100% rename from CodeTrans/docker/gaudi/compose.yaml rename to CodeTrans/docker_compose/intel/hpu/gaudi/compose.yaml diff --git a/CodeTrans/docker/docker_build_compose.yaml b/CodeTrans/docker_image_build/build.yaml similarity index 90% rename from CodeTrans/docker/docker_build_compose.yaml rename to CodeTrans/docker_image_build/build.yaml index e0c81b656..b8421e024 100644 --- a/CodeTrans/docker/docker_build_compose.yaml +++ b/CodeTrans/docker_image_build/build.yaml @@ -8,11 +8,12 @@ services: http_proxy: ${http_proxy} https_proxy: ${https_proxy} no_proxy: ${no_proxy} + context: ../ dockerfile: ./Dockerfile image: ${REGISTRY:-opea}/codetrans:${TAG:-latest} codetrans-ui: build: - context: ui + context: ../ui dockerfile: ./docker/Dockerfile extends: codetrans image: ${REGISTRY:-opea}/codetrans-ui:${TAG:-latest} @@ -25,6 +26,6 @@ services: nginx: build: context: GenAIComps - dockerfile: comps/nginx/docker/Dockerfile + dockerfile: comps/nginx/Dockerfile extends: codetrans image: ${REGISTRY:-opea}/nginx:${TAG:-latest} diff --git a/CodeTrans/kubernetes/manifests/README.md b/CodeTrans/kubernetes/intel/README.md similarity index 100% rename from CodeTrans/kubernetes/manifests/README.md rename to CodeTrans/kubernetes/intel/README.md diff --git a/CodeTrans/kubernetes/README.md b/CodeTrans/kubernetes/intel/README_gmc.md similarity index 100% rename from CodeTrans/kubernetes/README.md rename to CodeTrans/kubernetes/intel/README_gmc.md diff --git a/CodeTrans/kubernetes/codetrans_xeon.yaml b/CodeTrans/kubernetes/intel/cpu/xeon/gmc/codetrans_xeon.yaml similarity index 100% rename from CodeTrans/kubernetes/codetrans_xeon.yaml rename to CodeTrans/kubernetes/intel/cpu/xeon/gmc/codetrans_xeon.yaml diff --git a/CodeTrans/kubernetes/manifests/xeon/codetrans.yaml b/CodeTrans/kubernetes/intel/cpu/xeon/manifest/codetrans.yaml similarity index 100% rename from CodeTrans/kubernetes/manifests/xeon/codetrans.yaml rename to CodeTrans/kubernetes/intel/cpu/xeon/manifest/codetrans.yaml diff --git a/CodeTrans/kubernetes/codetrans_gaudi.yaml b/CodeTrans/kubernetes/intel/hpu/gaudi/gmc/codetrans_gaudi.yaml similarity index 100% rename from CodeTrans/kubernetes/codetrans_gaudi.yaml rename to CodeTrans/kubernetes/intel/hpu/gaudi/gmc/codetrans_gaudi.yaml diff --git a/CodeTrans/kubernetes/manifests/gaudi/codetrans.yaml b/CodeTrans/kubernetes/intel/hpu/gaudi/manifest/codetrans.yaml similarity index 100% rename from CodeTrans/kubernetes/manifests/gaudi/codetrans.yaml rename to CodeTrans/kubernetes/intel/hpu/gaudi/manifest/codetrans.yaml diff --git a/CodeTrans/docker/set_env.sh b/CodeTrans/set_env.sh similarity index 100% rename from CodeTrans/docker/set_env.sh rename to CodeTrans/set_env.sh diff --git a/CodeTrans/tests/test_codetrans_on_gaudi.sh b/CodeTrans/tests/test_compose_on_gaudi.sh similarity index 92% rename from CodeTrans/tests/test_codetrans_on_gaudi.sh rename to CodeTrans/tests/test_compose_on_gaudi.sh index e86b8d007..9416f09c7 100644 --- a/CodeTrans/tests/test_codetrans_on_gaudi.sh +++ b/CodeTrans/tests/test_compose_on_gaudi.sh @@ -15,19 +15,19 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="codetrans codetrans-ui llm-tgi nginx" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/tgi-gaudi:2.0.1 docker images && sleep 1s } function start_services() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi export http_proxy=${http_proxy} export https_proxy=${http_proxy} @@ -44,7 +44,7 @@ function start_services() { export BACKEND_SERVICE_PORT=7777 export NGINX_PORT=80 - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose up -d > ${LOG_PATH}/start_services_with_compose.log @@ -126,7 +126,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -155,7 +155,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi docker compose stop && docker compose rm -f } diff --git a/CodeTrans/tests/test_codetrans_on_xeon.sh b/CodeTrans/tests/test_compose_on_xeon.sh similarity index 92% rename from CodeTrans/tests/test_codetrans_on_xeon.sh rename to CodeTrans/tests/test_compose_on_xeon.sh index beca7dd53..8cbcb2320 100644 --- a/CodeTrans/tests/test_codetrans_on_xeon.sh +++ b/CodeTrans/tests/test_compose_on_xeon.sh @@ -15,19 +15,19 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="codetrans codetrans-ui llm-tgi nginx" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/text-generation-inference:sha-e4201f4-intel-cpu docker images && sleep 1s } function start_services() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon/ export http_proxy=${http_proxy} export https_proxy=${http_proxy} export LLM_MODEL_ID="HuggingFaceH4/mistral-7b-grok" @@ -43,7 +43,7 @@ function start_services() { export BACKEND_SERVICE_PORT=7777 export NGINX_PORT=80 - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose up -d > ${LOG_PATH}/start_services_with_compose.log @@ -126,7 +126,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -154,7 +154,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon/ docker compose stop && docker compose rm -f } diff --git a/CodeTrans/tests/test_gmc_on_gaudi.sh b/CodeTrans/tests/test_gmc_on_gaudi.sh index b16b96ac9..411c222b9 100755 --- a/CodeTrans/tests/test_gmc_on_gaudi.sh +++ b/CodeTrans/tests/test_gmc_on_gaudi.sh @@ -111,12 +111,12 @@ fi case "$1" in install_CodeTrans) - pushd CodeTrans/kubernetes + pushd CodeTrans/kubernetes/intel/hpu/gaudi/gmc install_codetrans popd ;; validate_CodeTrans) - pushd CodeTrans/kubernetes + pushd CodeTrans/kubernetes/intel/hpu/gaudi/gmc validate_codetrans popd ;; diff --git a/CodeTrans/tests/test_gmc_on_xeon.sh b/CodeTrans/tests/test_gmc_on_xeon.sh index 1f15b869f..193e26a48 100755 --- a/CodeTrans/tests/test_gmc_on_xeon.sh +++ b/CodeTrans/tests/test_gmc_on_xeon.sh @@ -111,12 +111,12 @@ fi case "$1" in install_CodeTrans) - pushd CodeTrans/kubernetes + pushd CodeTrans/kubernetes/intel/cpu/xeon/gmc install_codetrans popd ;; validate_CodeTrans) - pushd CodeTrans/kubernetes + pushd CodeTrans/kubernetes/intel/cpu/xeon/gmc validate_codetrans popd ;; diff --git a/CodeTrans/tests/test_manifest_on_gaudi.sh b/CodeTrans/tests/test_manifest_on_gaudi.sh index 418e2bf94..1c1b02e96 100755 --- a/CodeTrans/tests/test_manifest_on_gaudi.sh +++ b/CodeTrans/tests/test_manifest_on_gaudi.sh @@ -69,12 +69,12 @@ fi case "$1" in init_CodeTrans) - pushd CodeTrans/kubernetes/manifests/gaudi + pushd CodeTrans/kubernetes/intel/hpu/gaudi/manifest init_codetrans popd ;; install_CodeTrans) - pushd CodeTrans/kubernetes/manifests/gaudi + pushd CodeTrans/kubernetes/intel/hpu/gaudi/manifest NAMESPACE=$2 install_codetrans popd diff --git a/CodeTrans/tests/test_manifest_on_xeon.sh b/CodeTrans/tests/test_manifest_on_xeon.sh index 7e5b0a891..6a8290ef0 100755 --- a/CodeTrans/tests/test_manifest_on_xeon.sh +++ b/CodeTrans/tests/test_manifest_on_xeon.sh @@ -69,12 +69,12 @@ fi case "$1" in init_CodeTrans) - pushd CodeTrans/kubernetes/manifests/xeon + pushd CodeTrans/kubernetes/intel/cpu/xeon/manifest init_codetrans popd ;; install_CodeTrans) - pushd CodeTrans/kubernetes/manifests/xeon + pushd CodeTrans/kubernetes/intel/cpu/xeon/manifest NAMESPACE=$2 install_codetrans popd diff --git a/CodeTrans/docker/ui/docker/Dockerfile b/CodeTrans/ui/docker/Dockerfile similarity index 100% rename from CodeTrans/docker/ui/docker/Dockerfile rename to CodeTrans/ui/docker/Dockerfile diff --git a/CodeTrans/docker/ui/svelte/.env b/CodeTrans/ui/svelte/.env similarity index 100% rename from CodeTrans/docker/ui/svelte/.env rename to CodeTrans/ui/svelte/.env diff --git a/CodeTrans/docker/ui/svelte/.gitignore b/CodeTrans/ui/svelte/.gitignore similarity index 100% rename from CodeTrans/docker/ui/svelte/.gitignore rename to CodeTrans/ui/svelte/.gitignore diff --git a/CodeTrans/docker/ui/svelte/.npmrc b/CodeTrans/ui/svelte/.npmrc similarity index 100% rename from CodeTrans/docker/ui/svelte/.npmrc rename to CodeTrans/ui/svelte/.npmrc diff --git a/CodeTrans/docker/ui/svelte/README.md b/CodeTrans/ui/svelte/README.md similarity index 76% rename from CodeTrans/docker/ui/svelte/README.md rename to CodeTrans/ui/svelte/README.md index 095dacf9c..a224f0880 100644 --- a/CodeTrans/docker/ui/svelte/README.md +++ b/CodeTrans/ui/svelte/README.md @@ -2,9 +2,9 @@ ## 📸 Project Screenshots -![project-screenshot](../../../assets/img/codeTrans_ui_init.png) -![project-screenshot](../../../assets/img/codeTrans_ui_select.png) -![project-screenshot](../../../assets/img/codeTrans_ui_response.png) +![project-screenshot](../../assets/img/codeTrans_ui_init.png) +![project-screenshot](../../assets/img/codeTrans_ui_select.png) +![project-screenshot](../../assets/img/codeTrans_ui_response.png) ## 🧐 Features diff --git a/CodeTrans/docker/ui/svelte/package.json b/CodeTrans/ui/svelte/package.json similarity index 100% rename from CodeTrans/docker/ui/svelte/package.json rename to CodeTrans/ui/svelte/package.json diff --git a/CodeTrans/docker/ui/svelte/playwright.config.ts b/CodeTrans/ui/svelte/playwright.config.ts similarity index 100% rename from CodeTrans/docker/ui/svelte/playwright.config.ts rename to CodeTrans/ui/svelte/playwright.config.ts diff --git a/CodeTrans/docker/ui/svelte/postcss.config.cjs b/CodeTrans/ui/svelte/postcss.config.cjs similarity index 100% rename from CodeTrans/docker/ui/svelte/postcss.config.cjs rename to CodeTrans/ui/svelte/postcss.config.cjs diff --git a/CodeTrans/docker/ui/svelte/src/app.d.ts b/CodeTrans/ui/svelte/src/app.d.ts similarity index 100% rename from CodeTrans/docker/ui/svelte/src/app.d.ts rename to CodeTrans/ui/svelte/src/app.d.ts diff --git a/CodeTrans/docker/ui/svelte/src/app.html b/CodeTrans/ui/svelte/src/app.html similarity index 100% rename from CodeTrans/docker/ui/svelte/src/app.html rename to CodeTrans/ui/svelte/src/app.html diff --git a/CodeTrans/docker/ui/svelte/src/app.pcss b/CodeTrans/ui/svelte/src/app.pcss similarity index 100% rename from CodeTrans/docker/ui/svelte/src/app.pcss rename to CodeTrans/ui/svelte/src/app.pcss diff --git a/CodeTrans/docker/ui/svelte/src/lib/assets/loadingAnimation.svelte b/CodeTrans/ui/svelte/src/lib/assets/loadingAnimation.svelte similarity index 100% rename from CodeTrans/docker/ui/svelte/src/lib/assets/loadingAnimation.svelte rename to CodeTrans/ui/svelte/src/lib/assets/loadingAnimation.svelte diff --git a/CodeTrans/docker/ui/svelte/src/lib/assets/translateIcon.svelte b/CodeTrans/ui/svelte/src/lib/assets/translateIcon.svelte similarity index 100% rename from CodeTrans/docker/ui/svelte/src/lib/assets/translateIcon.svelte rename to CodeTrans/ui/svelte/src/lib/assets/translateIcon.svelte diff --git a/CodeTrans/docker/ui/svelte/src/lib/header.svelte b/CodeTrans/ui/svelte/src/lib/header.svelte similarity index 100% rename from CodeTrans/docker/ui/svelte/src/lib/header.svelte rename to CodeTrans/ui/svelte/src/lib/header.svelte diff --git a/CodeTrans/docker/ui/svelte/src/lib/shared/Network.ts b/CodeTrans/ui/svelte/src/lib/shared/Network.ts similarity index 100% rename from CodeTrans/docker/ui/svelte/src/lib/shared/Network.ts rename to CodeTrans/ui/svelte/src/lib/shared/Network.ts diff --git a/CodeTrans/docker/ui/svelte/src/lib/shared/constant.ts b/CodeTrans/ui/svelte/src/lib/shared/constant.ts similarity index 100% rename from CodeTrans/docker/ui/svelte/src/lib/shared/constant.ts rename to CodeTrans/ui/svelte/src/lib/shared/constant.ts diff --git a/CodeTrans/docker/ui/svelte/src/routes/+layout.svelte b/CodeTrans/ui/svelte/src/routes/+layout.svelte similarity index 100% rename from CodeTrans/docker/ui/svelte/src/routes/+layout.svelte rename to CodeTrans/ui/svelte/src/routes/+layout.svelte diff --git a/CodeTrans/docker/ui/svelte/src/routes/+page.svelte b/CodeTrans/ui/svelte/src/routes/+page.svelte similarity index 100% rename from CodeTrans/docker/ui/svelte/src/routes/+page.svelte rename to CodeTrans/ui/svelte/src/routes/+page.svelte diff --git a/CodeTrans/docker/ui/svelte/src/routes/types.d.ts b/CodeTrans/ui/svelte/src/routes/types.d.ts similarity index 100% rename from CodeTrans/docker/ui/svelte/src/routes/types.d.ts rename to CodeTrans/ui/svelte/src/routes/types.d.ts diff --git a/CodeTrans/docker/ui/svelte/static/favicon.png b/CodeTrans/ui/svelte/static/favicon.png similarity index 100% rename from CodeTrans/docker/ui/svelte/static/favicon.png rename to CodeTrans/ui/svelte/static/favicon.png diff --git a/CodeTrans/docker/ui/svelte/svelte.config.js b/CodeTrans/ui/svelte/svelte.config.js similarity index 100% rename from CodeTrans/docker/ui/svelte/svelte.config.js rename to CodeTrans/ui/svelte/svelte.config.js diff --git a/CodeTrans/docker/ui/svelte/tailwind.config.cjs b/CodeTrans/ui/svelte/tailwind.config.cjs similarity index 100% rename from CodeTrans/docker/ui/svelte/tailwind.config.cjs rename to CodeTrans/ui/svelte/tailwind.config.cjs diff --git a/CodeTrans/docker/ui/svelte/tests/codeTrans.spec.ts b/CodeTrans/ui/svelte/tests/codeTrans.spec.ts similarity index 100% rename from CodeTrans/docker/ui/svelte/tests/codeTrans.spec.ts rename to CodeTrans/ui/svelte/tests/codeTrans.spec.ts diff --git a/CodeTrans/docker/ui/svelte/tsconfig.json b/CodeTrans/ui/svelte/tsconfig.json similarity index 100% rename from CodeTrans/docker/ui/svelte/tsconfig.json rename to CodeTrans/ui/svelte/tsconfig.json diff --git a/CodeTrans/docker/ui/svelte/vite.config.ts b/CodeTrans/ui/svelte/vite.config.ts similarity index 100% rename from CodeTrans/docker/ui/svelte/vite.config.ts rename to CodeTrans/ui/svelte/vite.config.ts diff --git a/DocIndexRetriever/docker/Dockerfile b/DocIndexRetriever/Dockerfile similarity index 88% rename from DocIndexRetriever/docker/Dockerfile rename to DocIndexRetriever/Dockerfile index 7c9b49e30..aa772f523 100644 --- a/DocIndexRetriever/docker/Dockerfile +++ b/DocIndexRetriever/Dockerfile @@ -18,7 +18,7 @@ WORKDIR /home/user/GenAIComps RUN pip install --no-cache-dir --upgrade pip && \ pip install --no-cache-dir -r /home/user/GenAIComps/requirements.txt -COPY ./retrieval_tool.py /home/user/retrieval_tool.py +COPY GenAIExamples/DocIndexRetriever/retrieval_tool.py /home/user/retrieval_tool.py ENV PYTHONPATH=$PYTHONPATH:/home/user/GenAIComps diff --git a/DocIndexRetriever/README.md b/DocIndexRetriever/README.md index 620e3a210..d14b52de5 100644 --- a/DocIndexRetriever/README.md +++ b/DocIndexRetriever/README.md @@ -4,5 +4,5 @@ DocRetriever are the most widely adopted use case for leveraging the different m ## We provided DocRetriever with different deployment infra -- [docker xeon version](docker/xeon/) => minimum endpoints, easy to setup -- [docker gaudi version](docker/gaudi/) => with extra tei_gaudi endpoint, faster +- [docker xeon version](docker_compose/intel/cpu/xeon/) => minimum endpoints, easy to setup +- [docker gaudi version](docker_compose/intel/hpu/gaudi/) => with extra tei_gaudi endpoint, faster diff --git a/DocIndexRetriever/docker/README.md b/DocIndexRetriever/docker_compose/intel/README.md similarity index 89% rename from DocIndexRetriever/docker/README.md rename to DocIndexRetriever/docker_compose/intel/README.md index aaa29208b..d2531001e 100644 --- a/DocIndexRetriever/docker/README.md +++ b/DocIndexRetriever/docker_compose/intel/README.md @@ -2,32 +2,32 @@ DocRetriever are the most widely adopted use case for leveraging the different methodologies to match user query against a set of free-text records. DocRetriever is essential to RAG system, which bridges the knowledge gap by dynamically fetching relevant information from external sources, ensuring that responses generated remain factual and current. The core of this architecture are vector databases, which are instrumental in enabling efficient and semantic retrieval of information. These databases store data as vectors, allowing RAG to swiftly access the most pertinent documents or data points based on semantic similarity. -## 1. Build Images for necessary microservices. (This step will not needed after docker image released) +## 1. Build Images for necessary microservices. (Optional after docker image release) - Embedding TEI Image ```bash git clone https://github.com/opea-project/GenAIComps.git cd GenAIComps - docker build -t opea/embedding-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/langchain/docker/Dockerfile . + docker build -t opea/embedding-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/tei/langchain/Dockerfile . ``` - Retriever Vector store Image ```bash - docker build -t opea/retriever-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/langchain/redis/docker/Dockerfile . + docker build -t opea/retriever-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/redis/langchain/Dockerfile . ``` - Rerank TEI Image ```bash - docker build -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/tei/docker/Dockerfile . + docker build -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/tei/Dockerfile . ``` - Dataprep Image ```bash - docker build -t opea/dataprep-on-ray-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/redis/langchain_ray/docker/Dockerfile . + docker build -t opea/dataprep-on-ray-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/redis/langchain_ray/Dockerfile . ``` ## 2. Build Images for MegaService @@ -35,7 +35,7 @@ DocRetriever are the most widely adopted use case for leveraging the different m ```bash cd .. git clone https://github.com/opea-project/GenAIExamples.git -cd GenAIExamples/DocIndexRetriever/docker +cd GenAIExamples/DocIndexRetriever docker build --no-cache -t opea/doc-index-retriever:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./Dockerfile . ``` @@ -58,12 +58,12 @@ export RERANK_SERVICE_HOST_IP=${host_ip} export LLM_SERVICE_HOST_IP=${host_ip} export BACKEND_SERVICE_ENDPOINT="http://${host_ip}:8000/v1/retrievaltool" export DATAPREP_SERVICE_ENDPOINT="http://${host_ip}:6007/v1/dataprep" -export llm_hardware='xeon' #xeon, xpu, gaudi -cd GenAIExamples/DocIndexRetriever/docker/${llm_hardware}/ -docker compose -f docker-compose.yaml up -d +export llm_hardware='cpu/xeon' #cpu/xeon, xpu, hpu/gaudi +cd GenAIExamples/DocIndexRetriever/intel/${llm_hardware}/ +docker compose -f compose.yaml up -d ``` -## 3. Validation +## 4. Validation Add Knowledge Base via HTTP Links: @@ -87,7 +87,7 @@ curl http://${host_ip}:8889/v1/retrievaltool -X POST -H "Content-Type: applicati {"id":"354e62c703caac8c547b3061433ec5e8","reranked_docs":[{"id":"06d5a5cefc06cf9a9e0b5fa74a9f233c","text":"Close SearchsearchMenu WikiNewsCommunity Daysx-twitter linkedin github searchStreamlining implementation of enterprise-grade Generative AIEfficiently integrate secure, performant, and cost-effective Generative AI workflows into business value.TODAYOPEA..."}],"initial_query":"Explain the OPEA project?"} ``` -## 4. Trouble shooting +## 5. Trouble shooting 1. check all containers are alive diff --git a/DocIndexRetriever/docker/xeon/docker_compose.yaml b/DocIndexRetriever/docker_compose/intel/cpu/xeon/compose.yaml similarity index 100% rename from DocIndexRetriever/docker/xeon/docker_compose.yaml rename to DocIndexRetriever/docker_compose/intel/cpu/xeon/compose.yaml diff --git a/DocIndexRetriever/docker/gaudi/docker_compose.yaml b/DocIndexRetriever/docker_compose/intel/hpu/gaudi/compose.yaml similarity index 100% rename from DocIndexRetriever/docker/gaudi/docker_compose.yaml rename to DocIndexRetriever/docker_compose/intel/hpu/gaudi/compose.yaml diff --git a/DocIndexRetriever/docker/docker_build_compose.yaml b/DocIndexRetriever/docker_image_build/build.yaml similarity index 78% rename from DocIndexRetriever/docker/docker_build_compose.yaml rename to DocIndexRetriever/docker_image_build/build.yaml index 6f603f61c..a28af33ed 100644 --- a/DocIndexRetriever/docker/docker_build_compose.yaml +++ b/DocIndexRetriever/docker_image_build/build.yaml @@ -13,24 +13,24 @@ services: embedding-tei: build: context: GenAIComps - dockerfile: comps/embeddings/langchain/docker/Dockerfile + dockerfile: comps/embeddings/tei/langchain/Dockerfile extends: doc-index-retriever image: ${REGISTRY:-opea}/embedding-tei:${TAG:-latest} retriever-redis: build: context: GenAIComps - dockerfile: comps/retrievers/langchain/redis/docker/Dockerfile + dockerfile: comps/retrievers/redis/langchain/Dockerfile extends: chatqna image: ${REGISTRY:-opea}/retriever-redis:${TAG:-latest} reranking-tei: build: context: GenAIComps - dockerfile: comps/reranks/tei/docker/Dockerfile + dockerfile: comps/reranks/tei/Dockerfile extends: doc-index-retriever image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest} dataprep-on-ray-redis: build: context: GenAIComps - dockerfile: comps/dataprep/redis/langchain_ray/docker/Dockerfile + dockerfile: comps/dataprep/redis/langchain_ray/Dockerfile extends: doc-index-retriever image: ${REGISTRY:-opea}/dataprep-on-ray-redis:${TAG:-latest} diff --git a/DocIndexRetriever/docker/retrieval_tool.py b/DocIndexRetriever/retrieval_tool.py similarity index 100% rename from DocIndexRetriever/docker/retrieval_tool.py rename to DocIndexRetriever/retrieval_tool.py diff --git a/DocIndexRetriever/tests/test_docindexretriever_on_gaudi.sh b/DocIndexRetriever/tests/test_compose_on_gaudi.sh similarity index 90% rename from DocIndexRetriever/tests/test_docindexretriever_on_gaudi.sh rename to DocIndexRetriever/tests/test_compose_on_gaudi.sh index fe71a0bab..710070c72 100644 --- a/DocIndexRetriever/tests/test_docindexretriever_on_gaudi.sh +++ b/DocIndexRetriever/tests/test_compose_on_gaudi.sh @@ -10,27 +10,27 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker + cd $WORKPATH/docker_image_build if [ ! -d "GenAIComps" ] ; then - git clone https://github.com/opea-project/GenAIComps.git + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ fi cd GenAIComps - docker build -t opea/embedding-tei:latest -f comps/embeddings/langchain/docker/Dockerfile . - docker build -t opea/retriever-redis:latest -f comps/retrievers/langchain/redis/docker/Dockerfile . - docker build -t opea/reranking-tei:latest -f comps/reranks/tei/docker/Dockerfile . - docker build -t opea/dataprep-on-ray-redis:latest -f comps/dataprep/redis/langchain_ray/docker/Dockerfile . + docker build -t opea/embedding-tei:latest -f comps/embeddings/tei/langchain/Dockerfile . + docker build -t opea/retriever-redis:latest -f comps/retrievers/redis/langchain/Dockerfile . + docker build -t opea/reranking-tei:latest -f comps/reranks/tei/Dockerfile . + docker build -t opea/dataprep-on-ray-redis:latest -f comps/dataprep/redis/langchain_ray/Dockerfile . docker pull ghcr.io/huggingface/tgi-gaudi:latest docker pull redis/redis-stack:7.2.0-v9 - cd $WORKPATH/docker - docker build -t opea/doc-index-retriever:latest -f ./Dockerfile . + cd $WORKPATH/../../ + docker build -t opea/doc-index-retriever:latest -f GenAIExamples/DocIndexRetriever/Dockerfile . } function start_services() { # build tei-gaudi for each test instead of pull from local registry - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi export EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5" export RERANK_MODEL_ID="BAAI/bge-reranker-base" export TEI_EMBEDDING_ENDPOINT="http://${ip_address}:8090" @@ -98,7 +98,7 @@ function validate_megaservice() { } function stop_docker() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi container_list=$(cat docker_compose.yaml | grep container_name | cut -d':' -f2) for container_name in $container_list; do cid=$(docker ps -aq --filter "name=$container_name") diff --git a/DocSum/docker/Dockerfile b/DocSum/Dockerfile similarity index 100% rename from DocSum/docker/Dockerfile rename to DocSum/Dockerfile diff --git a/DocSum/README.md b/DocSum/README.md index 23519da21..c754aca8f 100644 --- a/DocSum/README.md +++ b/DocSum/README.md @@ -64,27 +64,27 @@ To set up environment variables for deploying Document Summarization services, f #### Deploy on Gaudi -Find the corresponding [compose.yaml](./docker/gaudi/compose.yaml). +Find the corresponding [compose.yaml](./docker_compose/intel/hpu/gaudi/compose.yaml). ```bash -cd GenAIExamples/DocSum/docker/gaudi/ +cd GenAIExamples/DocSum/docker_compose/intel/hpu/gaudi/ docker compose -f compose.yaml up -d ``` > Notice: Currently only the **Habana Driver 1.16.x** is supported for Gaudi. -Refer to the [Gaudi Guide](./docker/gaudi/README.md) to build docker images from source. +Refer to the [Gaudi Guide](./docker_compose/intel/hpu/gaudi/README.md) to build docker images from source. #### Deploy on Xeon -Find the corresponding [compose.yaml](./docker/xeon/compose.yaml). +Find the corresponding [compose.yaml](./docker_compose/intel/cpu/xeon/compose.yaml). ```bash -cd GenAIExamples/DocSum/docker/xeon/ +cd GenAIExamples/DocSum/docker_compose/intel/cpu/xeon/ docker compose up -d ``` -Refer to the [Xeon Guide](./docker/xeon/README.md) for more instructions on building docker images from source. +Refer to the [Xeon Guide](./docker_compose/intel/cpu/xeon/README.md) for more instructions on building docker images from source. ### Deploy using Kubernetes with GMC @@ -143,7 +143,7 @@ Two ways of consuming Document Summarization Service: ## Troubleshooting -1. If you get errors like "Access Denied", [validate micro service](https://github.com/opea-project/GenAIExamples/tree/main/DocSum/docker/xeon#validate-microservices) first. A simple example: +1. If you get errors like "Access Denied", [validate micro service](https://github.com/opea-project/GenAIExamples/tree/main/DocSum/docker_compose/intel/cpu/xeon#validate-microservices) first. A simple example: ```bash http_proxy="" diff --git a/DocSum/docker/xeon/README.md b/DocSum/docker_compose/intel/cpu/xeon/README.md similarity index 94% rename from DocSum/docker/xeon/README.md rename to DocSum/docker_compose/intel/cpu/xeon/README.md index 751837495..f962c119a 100644 --- a/DocSum/docker/xeon/README.md +++ b/DocSum/docker_compose/intel/cpu/xeon/README.md @@ -22,7 +22,7 @@ cd GenAIComps ### 1. Build LLM Image ```bash -docker build -t opea/llm-docsum-tgi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/summarization/tgi/Dockerfile . +docker build -t opea/llm-docsum-tgi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/summarization/tgi/langchain/Dockerfile . ``` Then run the command `docker images`, you will have the following four Docker Images: @@ -33,7 +33,7 @@ To construct the Mega Service, we utilize the [GenAIComps](https://github.com/op ```bash git clone https://github.com/opea-project/GenAIExamples -cd GenAIExamples/DocSum/docker +cd GenAIExamples/DocSum/ docker build -t opea/docsum:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile . ``` @@ -42,8 +42,8 @@ docker build -t opea/docsum:latest --build-arg https_proxy=$https_proxy --build- Build the frontend Docker image via below command: ```bash -cd GenAIExamples/DocSum/docker/ui/ -docker build -t opea/docsum-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker/Dockerfile . +cd GenAIExamples/DocSum/ui +docker build -t opea/docsum-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f docker/Dockerfile . ``` Then run the command `docker images`, you will have the following Docker Images: @@ -57,7 +57,7 @@ Then run the command `docker images`, you will have the following Docker Images: Build the frontend Docker image via below command: ```bash -cd GenAIExamples/DocSum/docker/ui/ +cd GenAIExamples/DocSum/ui export BACKEND_SERVICE_ENDPOINT="http://${host_ip}:8888/v1/docsum" docker build -t opea/docsum-react-ui:latest --build-arg BACKEND_SERVICE_ENDPOINT=$BACKEND_SERVICE_ENDPOINT -f ./docker/Dockerfile.react . @@ -99,7 +99,7 @@ Note: Please replace with `host_ip` with your external IP address, do not use lo ### Start Microservice Docker Containers ```bash -cd GenAIExamples/DocSum/docker/xeon +cd GenAIExamples/DocSum/docker_compose/intel/cpu/xeon docker compose up -d ``` @@ -141,7 +141,7 @@ Open this URL `http://{host_ip}:5174` in your browser to access the React based ### Svelte UI -![project-screenshot](../../assets/img/docSum_ui_text.png) +![project-screenshot](../../../../assets/img/docSum_ui_text.png) ### React UI (Optional) @@ -163,4 +163,4 @@ docsum-xeon-react-ui-server: restart: always ``` -![preject-react-screenshot](../../assets/img/docsum-ui-react.png) +![preject-react-screenshot](../../../../assets/img/docsum-ui-react.png) diff --git a/DocSum/docker/xeon/compose.yaml b/DocSum/docker_compose/intel/cpu/xeon/compose.yaml similarity index 100% rename from DocSum/docker/xeon/compose.yaml rename to DocSum/docker_compose/intel/cpu/xeon/compose.yaml diff --git a/DocSum/docker/gaudi/README.md b/DocSum/docker_compose/intel/hpu/gaudi/README.md similarity index 96% rename from DocSum/docker/gaudi/README.md rename to DocSum/docker_compose/intel/hpu/gaudi/README.md index fe765ecb0..8bea9ffb3 100644 --- a/DocSum/docker/gaudi/README.md +++ b/DocSum/docker_compose/intel/hpu/gaudi/README.md @@ -22,7 +22,7 @@ docker pull ghcr.io/huggingface/tgi-gaudi:2.0.1 ### 2. Build LLM Image ```bash -docker build -t opea/llm-docsum-tgi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/summarization/tgi/Dockerfile . +docker build -t opea/llm-docsum-tgi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/summarization/tgi/langchain/Dockerfile . ``` ### 3. Build MegaService Docker Image @@ -40,7 +40,7 @@ docker build -t opea/docsum:latest --build-arg https_proxy=$https_proxy --build- Construct the frontend Docker image using the command below: ```bash -cd GenAIExamples/DocSum/docker/ui/ +cd GenAIExamples/DocSum/ docker build -t opea/docsum-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker/Dockerfile . ``` @@ -49,7 +49,7 @@ docker build -t opea/docsum-ui:latest --build-arg https_proxy=$https_proxy --bui Build the frontend Docker image via below command: ```bash -cd GenAIExamples/DocSum/docker/ui/ +cd GenAIExamples/DocSum/ui export BACKEND_SERVICE_ENDPOINT="http://${host_ip}:8888/v1/docsum" docker build -t opea/docsum-react-ui:latest --build-arg BACKEND_SERVICE_ENDPOINT=$BACKEND_SERVICE_ENDPOINT -f ./docker/Dockerfile.react . ``` @@ -90,7 +90,7 @@ Note: Please replace with `host_ip` with your external IP address, do not use lo ### Start Microservice Docker Containers ```bash -cd GenAIExamples/DocSum/docker/gaudi +cd GenAIExamples/DocSum/docker_compose/intel/hpu/gaudi docker compose up -d ``` @@ -153,4 +153,4 @@ docsum-gaudi-react-ui-server: Open this URL `http://{host_ip}:5175` in your browser to access the frontend. -![project-screenshot](../../assets/img/docsum-ui-react.png) +![project-screenshot](../../../../assets/img/docsum-ui-react.png) diff --git a/DocSum/docker/gaudi/compose.yaml b/DocSum/docker_compose/intel/hpu/gaudi/compose.yaml similarity index 100% rename from DocSum/docker/gaudi/compose.yaml rename to DocSum/docker_compose/intel/hpu/gaudi/compose.yaml diff --git a/DocSum/docker/docker_build_compose.yaml b/DocSum/docker_image_build/build.yaml similarity index 84% rename from DocSum/docker/docker_build_compose.yaml rename to DocSum/docker_image_build/build.yaml index a7e4a565d..13e0af59d 100644 --- a/DocSum/docker/docker_build_compose.yaml +++ b/DocSum/docker_image_build/build.yaml @@ -8,23 +8,24 @@ services: http_proxy: ${http_proxy} https_proxy: ${https_proxy} no_proxy: ${no_proxy} + context: ../ dockerfile: ./Dockerfile image: ${REGISTRY:-opea}/docsum:${TAG:-latest} docsum-ui: build: - context: ui + context: ../ui dockerfile: ./docker/Dockerfile extends: docsum image: ${REGISTRY:-opea}/docsum-ui:${TAG:-latest} docsum-react-ui: build: - context: ui + context: ../ui dockerfile: ./docker/Dockerfile.react extends: docsum image: ${REGISTRY:-opea}/docsum-react-ui:${TAG:-latest} llm-docsum-tgi: build: context: GenAIComps - dockerfile: comps/llms/summarization/tgi/Dockerfile + dockerfile: comps/llms/summarization/tgi/langchain/Dockerfile extends: docsum image: ${REGISTRY:-opea}/llm-docsum-tgi:${TAG:-latest} diff --git a/DocSum/docker/docsum.py b/DocSum/docsum.py similarity index 100% rename from DocSum/docker/docsum.py rename to DocSum/docsum.py diff --git a/DocSum/kubernetes/manifests/README.md b/DocSum/kubernetes/intel/README.md similarity index 100% rename from DocSum/kubernetes/manifests/README.md rename to DocSum/kubernetes/intel/README.md diff --git a/DocSum/kubernetes/README.md b/DocSum/kubernetes/intel/README_gmc.md similarity index 96% rename from DocSum/kubernetes/README.md rename to DocSum/kubernetes/intel/README_gmc.md index bd39ee919..99d096279 100644 --- a/DocSum/kubernetes/README.md +++ b/DocSum/kubernetes/intel/README_gmc.md @@ -12,8 +12,8 @@ the image ghcr.io/huggingface/text-generation-inference:sha-e4201f4-intel-cpu. T service tgi-gaudi-svc, which uses the image ghcr.io/huggingface/tgi-gaudi:1.2.1. Both TGI model services serve the model specified in the LLM_MODEL_ID variable that is exported by you. In the below example we use Intel/neural-chat-7b-v3-3. [NOTE] -Refer to [Docker Xeon README](https://github.com/opea-project/GenAIExamples/blob/main/DocSum/docker/xeon/README.md) or -[Docker Gaudi README](https://github.com/opea-project/GenAIExamples/blob/main/DocSum/docker/gaudi/README.md) to build the OPEA images. +Refer to [Docker Xeon README](https://github.com/opea-project/GenAIExamples/blob/main/DocSum/docker_compose/intel/cpu/xeon/README.md) or +[Docker Gaudi README](https://github.com/opea-project/GenAIExamples/blob/main/DocSum/docker_compose/intel/hpu/gaudi/README.md) to build the OPEA images. These will be available on Docker Hub soon, simplifying installation. ## Deploy the RAG pipeline diff --git a/DocSum/kubernetes/docsum_xeon.yaml b/DocSum/kubernetes/intel/cpu/xeon/gmc/docsum_xeon.yaml similarity index 100% rename from DocSum/kubernetes/docsum_xeon.yaml rename to DocSum/kubernetes/intel/cpu/xeon/gmc/docsum_xeon.yaml diff --git a/DocSum/kubernetes/manifests/xeon/docsum.yaml b/DocSum/kubernetes/intel/cpu/xeon/manifest/docsum.yaml similarity index 100% rename from DocSum/kubernetes/manifests/xeon/docsum.yaml rename to DocSum/kubernetes/intel/cpu/xeon/manifest/docsum.yaml diff --git a/DocSum/kubernetes/manifests/xeon/ui/README.md b/DocSum/kubernetes/intel/cpu/xeon/manifest/ui/README.md similarity index 100% rename from DocSum/kubernetes/manifests/xeon/ui/README.md rename to DocSum/kubernetes/intel/cpu/xeon/manifest/ui/README.md diff --git a/DocSum/kubernetes/manifests/xeon/ui/react-docsum.yaml b/DocSum/kubernetes/intel/cpu/xeon/manifest/ui/react-docsum.yaml similarity index 100% rename from DocSum/kubernetes/manifests/xeon/ui/react-docsum.yaml rename to DocSum/kubernetes/intel/cpu/xeon/manifest/ui/react-docsum.yaml diff --git a/DocSum/kubernetes/docsum_gaudi.yaml b/DocSum/kubernetes/intel/hpu/gaudi/gmc/docsum_gaudi.yaml similarity index 100% rename from DocSum/kubernetes/docsum_gaudi.yaml rename to DocSum/kubernetes/intel/hpu/gaudi/gmc/docsum_gaudi.yaml diff --git a/DocSum/kubernetes/manifests/gaudi/docsum.yaml b/DocSum/kubernetes/intel/hpu/gaudi/manifest/docsum.yaml similarity index 100% rename from DocSum/kubernetes/manifests/gaudi/docsum.yaml rename to DocSum/kubernetes/intel/hpu/gaudi/manifest/docsum.yaml diff --git a/DocSum/docker/set_env.sh b/DocSum/set_env.sh similarity index 100% rename from DocSum/docker/set_env.sh rename to DocSum/set_env.sh diff --git a/DocSum/tests/test_docsum_on_gaudi.sh b/DocSum/tests/test_compose_on_gaudi.sh similarity index 91% rename from DocSum/tests/test_docsum_on_gaudi.sh rename to DocSum/tests/test_compose_on_gaudi.sh index 84b3a4bfa..abfd158f2 100644 --- a/DocSum/tests/test_docsum_on_gaudi.sh +++ b/DocSum/tests/test_compose_on_gaudi.sh @@ -15,19 +15,19 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="docsum docsum-ui llm-docsum-tgi" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/tgi-gaudi:2.0.1 docker images && sleep 1s } function start_services() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi export LLM_MODEL_ID="Intel/neural-chat-7b-v3-3" export TGI_LLM_ENDPOINT="http://${ip_address}:8008" @@ -36,7 +36,7 @@ function start_services() { export LLM_SERVICE_HOST_IP=${ip_address} export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:8888/v1/docsum" - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose up -d > ${LOG_PATH}/start_services_with_compose.log @@ -111,7 +111,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -139,7 +139,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi docker compose stop && docker compose rm -f } diff --git a/DocSum/tests/test_docsum_on_xeon.sh b/DocSum/tests/test_compose_on_xeon.sh similarity index 91% rename from DocSum/tests/test_docsum_on_xeon.sh rename to DocSum/tests/test_compose_on_xeon.sh index 9f40ab135..d18d5e342 100644 --- a/DocSum/tests/test_docsum_on_xeon.sh +++ b/DocSum/tests/test_compose_on_xeon.sh @@ -15,19 +15,19 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="docsum docsum-ui llm-docsum-tgi" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/text-generation-inference:1.4 docker images && sleep 1s } function start_services() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon/ export LLM_MODEL_ID="Intel/neural-chat-7b-v3-3" export TGI_LLM_ENDPOINT="http://${ip_address}:8008" @@ -36,7 +36,7 @@ function start_services() { export LLM_SERVICE_HOST_IP=${ip_address} export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:8888/v1/docsum" - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose up -d > ${LOG_PATH}/start_services_with_compose.log @@ -110,7 +110,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -138,7 +138,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon/ docker compose stop && docker compose rm -f } diff --git a/DocSum/tests/test_gmc_on_gaudi.sh b/DocSum/tests/test_gmc_on_gaudi.sh index 77945f37e..7f524a621 100755 --- a/DocSum/tests/test_gmc_on_gaudi.sh +++ b/DocSum/tests/test_gmc_on_gaudi.sh @@ -112,12 +112,12 @@ fi case "$1" in install_DocSum) - pushd DocSum/kubernetes + pushd DocSum/kubernetes/intel/hpu/gaudi/gmc install_docsum popd ;; validate_DocSum) - pushd DocSum/kubernetes + pushd DocSum/kubernetes/intel/hpu/gaudi/gmc validate_docsum popd ;; diff --git a/DocSum/tests/test_gmc_on_xeon.sh b/DocSum/tests/test_gmc_on_xeon.sh index b952d90e8..72c05502a 100755 --- a/DocSum/tests/test_gmc_on_xeon.sh +++ b/DocSum/tests/test_gmc_on_xeon.sh @@ -112,12 +112,12 @@ fi case "$1" in install_DocSum) - pushd DocSum/kubernetes + pushd DocSum/kubernetes/intel/cpu/xeon/gmc install_docsum popd ;; validate_DocSum) - pushd DocSum/kubernetes + pushd DocSum/kubernetes/intel/cpu/xeon/gmc validate_docsum popd ;; diff --git a/DocSum/tests/test_manifest_on_gaudi.sh b/DocSum/tests/test_manifest_on_gaudi.sh index 95e158bbf..fd3d38a50 100755 --- a/DocSum/tests/test_manifest_on_gaudi.sh +++ b/DocSum/tests/test_manifest_on_gaudi.sh @@ -69,12 +69,12 @@ fi case "$1" in init_DocSum) - pushd DocSum/kubernetes/manifests/gaudi + pushd DocSum/kubernetes/intel/hpu/gaudi/manifest init_docsum popd ;; install_DocSum) - pushd DocSum/kubernetes/manifests/gaudi + pushd DocSum/kubernetes/intel/hpu/gaudi/manifest NAMESPACE=$2 install_docsum popd diff --git a/DocSum/tests/test_manifest_on_xeon.sh b/DocSum/tests/test_manifest_on_xeon.sh index 4aa720aef..8f218469c 100755 --- a/DocSum/tests/test_manifest_on_xeon.sh +++ b/DocSum/tests/test_manifest_on_xeon.sh @@ -69,12 +69,12 @@ fi case "$1" in init_DocSum) - pushd DocSum/kubernetes/manifests/xeon + pushd DocSum/kubernetes/intel/cpu/xeon/manifest init_docsum popd ;; install_DocSum) - pushd DocSum/kubernetes/manifests/xeon + pushd DocSum/kubernetes/intel/cpu/xeon/manifest NAMESPACE=$2 install_docsum popd diff --git a/DocSum/docker/ui/docker/Dockerfile b/DocSum/ui/docker/Dockerfile similarity index 100% rename from DocSum/docker/ui/docker/Dockerfile rename to DocSum/ui/docker/Dockerfile diff --git a/DocSum/docker/ui/docker/Dockerfile.react b/DocSum/ui/docker/Dockerfile.react similarity index 100% rename from DocSum/docker/ui/docker/Dockerfile.react rename to DocSum/ui/docker/Dockerfile.react diff --git a/DocSum/docker/ui/react/.env b/DocSum/ui/react/.env similarity index 100% rename from DocSum/docker/ui/react/.env rename to DocSum/ui/react/.env diff --git a/DocSum/docker/ui/react/.eslintrc.cjs b/DocSum/ui/react/.eslintrc.cjs similarity index 100% rename from DocSum/docker/ui/react/.eslintrc.cjs rename to DocSum/ui/react/.eslintrc.cjs diff --git a/DocSum/docker/ui/react/.gitignore b/DocSum/ui/react/.gitignore similarity index 100% rename from DocSum/docker/ui/react/.gitignore rename to DocSum/ui/react/.gitignore diff --git a/DocSum/docker/ui/react/README.md b/DocSum/ui/react/README.md similarity index 81% rename from DocSum/docker/ui/react/README.md rename to DocSum/ui/react/README.md index 2d6037e1f..934a9d7de 100644 --- a/DocSum/docker/ui/react/README.md +++ b/DocSum/ui/react/README.md @@ -2,9 +2,9 @@ ## 📸 Project Screenshots -![project-screenshot](../../../assets/img/docsum-ui-react.png) -![project-screenshot](../../../assets/img/docsum-ui-react-file.png) -![project-screenshot](../../../assets/img/docsum-ui-react-error.png) +![project-screenshot](../../assets/img/docsum-ui-react.png) +![project-screenshot](../../assets/img/docsum-ui-react-file.png) +![project-screenshot](../../assets/img/docsum-ui-react-error.png) ## 🧐 Features diff --git a/DocSum/docker/ui/react/index.html b/DocSum/ui/react/index.html similarity index 100% rename from DocSum/docker/ui/react/index.html rename to DocSum/ui/react/index.html diff --git a/DocSum/docker/ui/react/nginx.conf b/DocSum/ui/react/nginx.conf similarity index 100% rename from DocSum/docker/ui/react/nginx.conf rename to DocSum/ui/react/nginx.conf diff --git a/DocSum/docker/ui/react/package.json b/DocSum/ui/react/package.json similarity index 100% rename from DocSum/docker/ui/react/package.json rename to DocSum/ui/react/package.json diff --git a/DocSum/docker/ui/react/postcss.config.cjs b/DocSum/ui/react/postcss.config.cjs similarity index 100% rename from DocSum/docker/ui/react/postcss.config.cjs rename to DocSum/ui/react/postcss.config.cjs diff --git a/DocSum/docker/ui/react/src/App.scss b/DocSum/ui/react/src/App.scss similarity index 100% rename from DocSum/docker/ui/react/src/App.scss rename to DocSum/ui/react/src/App.scss diff --git a/DocSum/docker/ui/react/src/App.tsx b/DocSum/ui/react/src/App.tsx similarity index 100% rename from DocSum/docker/ui/react/src/App.tsx rename to DocSum/ui/react/src/App.tsx diff --git a/DocSum/docker/ui/react/src/__tests__/util.test.ts b/DocSum/ui/react/src/__tests__/util.test.ts similarity index 100% rename from DocSum/docker/ui/react/src/__tests__/util.test.ts rename to DocSum/ui/react/src/__tests__/util.test.ts diff --git a/DocSum/docker/ui/react/src/assets/opea-icon-black.svg b/DocSum/ui/react/src/assets/opea-icon-black.svg similarity index 100% rename from DocSum/docker/ui/react/src/assets/opea-icon-black.svg rename to DocSum/ui/react/src/assets/opea-icon-black.svg diff --git a/DocSum/docker/ui/react/src/assets/opea-icon-color.svg b/DocSum/ui/react/src/assets/opea-icon-color.svg similarity index 100% rename from DocSum/docker/ui/react/src/assets/opea-icon-color.svg rename to DocSum/ui/react/src/assets/opea-icon-color.svg diff --git a/DocSum/docker/ui/react/src/common/client.ts b/DocSum/ui/react/src/common/client.ts similarity index 100% rename from DocSum/docker/ui/react/src/common/client.ts rename to DocSum/ui/react/src/common/client.ts diff --git a/DocSum/docker/ui/react/src/common/util.ts b/DocSum/ui/react/src/common/util.ts similarity index 100% rename from DocSum/docker/ui/react/src/common/util.ts rename to DocSum/ui/react/src/common/util.ts diff --git a/DocSum/docker/ui/react/src/components/DocSum/DocSum.tsx b/DocSum/ui/react/src/components/DocSum/DocSum.tsx similarity index 100% rename from DocSum/docker/ui/react/src/components/DocSum/DocSum.tsx rename to DocSum/ui/react/src/components/DocSum/DocSum.tsx diff --git a/DocSum/docker/ui/react/src/components/DocSum/FileUpload.tsx b/DocSum/ui/react/src/components/DocSum/FileUpload.tsx similarity index 100% rename from DocSum/docker/ui/react/src/components/DocSum/FileUpload.tsx rename to DocSum/ui/react/src/components/DocSum/FileUpload.tsx diff --git a/DocSum/docker/ui/react/src/components/DocSum/docSum.module.scss b/DocSum/ui/react/src/components/DocSum/docSum.module.scss similarity index 100% rename from DocSum/docker/ui/react/src/components/DocSum/docSum.module.scss rename to DocSum/ui/react/src/components/DocSum/docSum.module.scss diff --git a/DocSum/docker/ui/react/src/components/Shared/CodeRender/CodeRender.tsx b/DocSum/ui/react/src/components/Shared/CodeRender/CodeRender.tsx similarity index 100% rename from DocSum/docker/ui/react/src/components/Shared/CodeRender/CodeRender.tsx rename to DocSum/ui/react/src/components/Shared/CodeRender/CodeRender.tsx diff --git a/DocSum/docker/ui/react/src/components/Shared/CodeRender/codeRender.module.scss b/DocSum/ui/react/src/components/Shared/CodeRender/codeRender.module.scss similarity index 100% rename from DocSum/docker/ui/react/src/components/Shared/CodeRender/codeRender.module.scss rename to DocSum/ui/react/src/components/Shared/CodeRender/codeRender.module.scss diff --git a/DocSum/docker/ui/react/src/components/Shared/Markdown/Markdown.tsx b/DocSum/ui/react/src/components/Shared/Markdown/Markdown.tsx similarity index 100% rename from DocSum/docker/ui/react/src/components/Shared/Markdown/Markdown.tsx rename to DocSum/ui/react/src/components/Shared/Markdown/Markdown.tsx diff --git a/DocSum/docker/ui/react/src/components/Shared/Markdown/markdown.module.scss b/DocSum/ui/react/src/components/Shared/Markdown/markdown.module.scss similarity index 100% rename from DocSum/docker/ui/react/src/components/Shared/Markdown/markdown.module.scss rename to DocSum/ui/react/src/components/Shared/Markdown/markdown.module.scss diff --git a/DocSum/docker/ui/react/src/components/sidebar/sidebar.module.scss b/DocSum/ui/react/src/components/sidebar/sidebar.module.scss similarity index 100% rename from DocSum/docker/ui/react/src/components/sidebar/sidebar.module.scss rename to DocSum/ui/react/src/components/sidebar/sidebar.module.scss diff --git a/DocSum/docker/ui/react/src/components/sidebar/sidebar.tsx b/DocSum/ui/react/src/components/sidebar/sidebar.tsx similarity index 100% rename from DocSum/docker/ui/react/src/components/sidebar/sidebar.tsx rename to DocSum/ui/react/src/components/sidebar/sidebar.tsx diff --git a/DocSum/docker/ui/react/src/config.ts b/DocSum/ui/react/src/config.ts similarity index 100% rename from DocSum/docker/ui/react/src/config.ts rename to DocSum/ui/react/src/config.ts diff --git a/DocSum/docker/ui/react/src/index.scss b/DocSum/ui/react/src/index.scss similarity index 100% rename from DocSum/docker/ui/react/src/index.scss rename to DocSum/ui/react/src/index.scss diff --git a/DocSum/docker/ui/react/src/main.tsx b/DocSum/ui/react/src/main.tsx similarity index 100% rename from DocSum/docker/ui/react/src/main.tsx rename to DocSum/ui/react/src/main.tsx diff --git a/DocSum/docker/ui/react/src/styles/components/_sidebar.scss b/DocSum/ui/react/src/styles/components/_sidebar.scss similarity index 100% rename from DocSum/docker/ui/react/src/styles/components/_sidebar.scss rename to DocSum/ui/react/src/styles/components/_sidebar.scss diff --git a/DocSum/docker/ui/react/src/styles/components/content.scss b/DocSum/ui/react/src/styles/components/content.scss similarity index 100% rename from DocSum/docker/ui/react/src/styles/components/content.scss rename to DocSum/ui/react/src/styles/components/content.scss diff --git a/DocSum/docker/ui/react/src/styles/components/context.module.scss b/DocSum/ui/react/src/styles/components/context.module.scss similarity index 100% rename from DocSum/docker/ui/react/src/styles/components/context.module.scss rename to DocSum/ui/react/src/styles/components/context.module.scss diff --git a/DocSum/docker/ui/react/src/styles/layout/_basics.scss b/DocSum/ui/react/src/styles/layout/_basics.scss similarity index 100% rename from DocSum/docker/ui/react/src/styles/layout/_basics.scss rename to DocSum/ui/react/src/styles/layout/_basics.scss diff --git a/DocSum/docker/ui/react/src/styles/layout/_flex.scss b/DocSum/ui/react/src/styles/layout/_flex.scss similarity index 100% rename from DocSum/docker/ui/react/src/styles/layout/_flex.scss rename to DocSum/ui/react/src/styles/layout/_flex.scss diff --git a/DocSum/docker/ui/react/src/styles/styles.scss b/DocSum/ui/react/src/styles/styles.scss similarity index 100% rename from DocSum/docker/ui/react/src/styles/styles.scss rename to DocSum/ui/react/src/styles/styles.scss diff --git a/DocSum/docker/ui/react/src/vite-env.d.ts b/DocSum/ui/react/src/vite-env.d.ts similarity index 100% rename from DocSum/docker/ui/react/src/vite-env.d.ts rename to DocSum/ui/react/src/vite-env.d.ts diff --git a/DocSum/docker/ui/react/tsconfig.json b/DocSum/ui/react/tsconfig.json similarity index 100% rename from DocSum/docker/ui/react/tsconfig.json rename to DocSum/ui/react/tsconfig.json diff --git a/DocSum/docker/ui/react/tsconfig.node.json b/DocSum/ui/react/tsconfig.node.json similarity index 100% rename from DocSum/docker/ui/react/tsconfig.node.json rename to DocSum/ui/react/tsconfig.node.json diff --git a/DocSum/docker/ui/react/vite.config.ts b/DocSum/ui/react/vite.config.ts similarity index 100% rename from DocSum/docker/ui/react/vite.config.ts rename to DocSum/ui/react/vite.config.ts diff --git a/DocSum/docker/ui/svelte/.env b/DocSum/ui/svelte/.env similarity index 100% rename from DocSum/docker/ui/svelte/.env rename to DocSum/ui/svelte/.env diff --git a/DocSum/docker/ui/svelte/.gitignore b/DocSum/ui/svelte/.gitignore similarity index 100% rename from DocSum/docker/ui/svelte/.gitignore rename to DocSum/ui/svelte/.gitignore diff --git a/DocSum/docker/ui/svelte/.npmrc b/DocSum/ui/svelte/.npmrc similarity index 100% rename from DocSum/docker/ui/svelte/.npmrc rename to DocSum/ui/svelte/.npmrc diff --git a/DocSum/docker/ui/svelte/README.md b/DocSum/ui/svelte/README.md similarity index 77% rename from DocSum/docker/ui/svelte/README.md rename to DocSum/ui/svelte/README.md index e95c9347f..05db36a53 100644 --- a/DocSum/docker/ui/svelte/README.md +++ b/DocSum/ui/svelte/README.md @@ -2,10 +2,10 @@ ## 📸 Project Screenshots -![project-screenshot](../../../assets/img/docSum_ui_upload.png) -![project-screenshot](../../../assets/img/docSum_ui_exchange.png) -![project-screenshot](../../../assets/img/docSum_ui_response.png) -![project-screenshot](../../../assets/img/docSum_ui_text.png) +![project-screenshot](../../assets/img/docSum_ui_upload.png) +![project-screenshot](../../assets/img/docSum_ui_exchange.png) +![project-screenshot](../../assets/img/docSum_ui_response.png) +![project-screenshot](../../assets/img/docSum_ui_text.png) ## 🧐 Features diff --git a/DocSum/docker/ui/svelte/package.json b/DocSum/ui/svelte/package.json similarity index 100% rename from DocSum/docker/ui/svelte/package.json rename to DocSum/ui/svelte/package.json diff --git a/DocSum/docker/ui/svelte/playwright.config.ts b/DocSum/ui/svelte/playwright.config.ts similarity index 100% rename from DocSum/docker/ui/svelte/playwright.config.ts rename to DocSum/ui/svelte/playwright.config.ts diff --git a/DocSum/docker/ui/svelte/postcss.config.cjs b/DocSum/ui/svelte/postcss.config.cjs similarity index 100% rename from DocSum/docker/ui/svelte/postcss.config.cjs rename to DocSum/ui/svelte/postcss.config.cjs diff --git a/DocSum/docker/ui/svelte/src/app.d.ts b/DocSum/ui/svelte/src/app.d.ts similarity index 100% rename from DocSum/docker/ui/svelte/src/app.d.ts rename to DocSum/ui/svelte/src/app.d.ts diff --git a/DocSum/docker/ui/svelte/src/app.html b/DocSum/ui/svelte/src/app.html similarity index 100% rename from DocSum/docker/ui/svelte/src/app.html rename to DocSum/ui/svelte/src/app.html diff --git a/DocSum/docker/ui/svelte/src/app.pcss b/DocSum/ui/svelte/src/app.pcss similarity index 100% rename from DocSum/docker/ui/svelte/src/app.pcss rename to DocSum/ui/svelte/src/app.pcss diff --git a/DocSum/docker/ui/svelte/src/lib/assets/imgLogo.svelte b/DocSum/ui/svelte/src/lib/assets/imgLogo.svelte similarity index 100% rename from DocSum/docker/ui/svelte/src/lib/assets/imgLogo.svelte rename to DocSum/ui/svelte/src/lib/assets/imgLogo.svelte diff --git a/DocSum/docker/ui/svelte/src/lib/assets/intelLogo.svelte b/DocSum/ui/svelte/src/lib/assets/intelLogo.svelte similarity index 100% rename from DocSum/docker/ui/svelte/src/lib/assets/intelLogo.svelte rename to DocSum/ui/svelte/src/lib/assets/intelLogo.svelte diff --git a/DocSum/docker/ui/svelte/src/lib/assets/loadingAnimation.svelte b/DocSum/ui/svelte/src/lib/assets/loadingAnimation.svelte similarity index 100% rename from DocSum/docker/ui/svelte/src/lib/assets/loadingAnimation.svelte rename to DocSum/ui/svelte/src/lib/assets/loadingAnimation.svelte diff --git a/DocSum/docker/ui/svelte/src/lib/assets/spinLoading.svelte b/DocSum/ui/svelte/src/lib/assets/spinLoading.svelte similarity index 100% rename from DocSum/docker/ui/svelte/src/lib/assets/spinLoading.svelte rename to DocSum/ui/svelte/src/lib/assets/spinLoading.svelte diff --git a/DocSum/docker/ui/svelte/src/lib/assets/summaryLogo.svelte b/DocSum/ui/svelte/src/lib/assets/summaryLogo.svelte similarity index 100% rename from DocSum/docker/ui/svelte/src/lib/assets/summaryLogo.svelte rename to DocSum/ui/svelte/src/lib/assets/summaryLogo.svelte diff --git a/DocSum/docker/ui/svelte/src/lib/doc.svelte b/DocSum/ui/svelte/src/lib/doc.svelte similarity index 100% rename from DocSum/docker/ui/svelte/src/lib/doc.svelte rename to DocSum/ui/svelte/src/lib/doc.svelte diff --git a/DocSum/docker/ui/svelte/src/lib/dropFile.svelte b/DocSum/ui/svelte/src/lib/dropFile.svelte similarity index 100% rename from DocSum/docker/ui/svelte/src/lib/dropFile.svelte rename to DocSum/ui/svelte/src/lib/dropFile.svelte diff --git a/DocSum/docker/ui/svelte/src/lib/header.svelte b/DocSum/ui/svelte/src/lib/header.svelte similarity index 100% rename from DocSum/docker/ui/svelte/src/lib/header.svelte rename to DocSum/ui/svelte/src/lib/header.svelte diff --git a/DocSum/docker/ui/svelte/src/lib/index.ts b/DocSum/ui/svelte/src/lib/index.ts similarity index 100% rename from DocSum/docker/ui/svelte/src/lib/index.ts rename to DocSum/ui/svelte/src/lib/index.ts diff --git a/DocSum/docker/ui/svelte/src/lib/shared/Network.ts b/DocSum/ui/svelte/src/lib/shared/Network.ts similarity index 100% rename from DocSum/docker/ui/svelte/src/lib/shared/Network.ts rename to DocSum/ui/svelte/src/lib/shared/Network.ts diff --git a/DocSum/docker/ui/svelte/src/lib/shared/Store.ts b/DocSum/ui/svelte/src/lib/shared/Store.ts similarity index 100% rename from DocSum/docker/ui/svelte/src/lib/shared/Store.ts rename to DocSum/ui/svelte/src/lib/shared/Store.ts diff --git a/DocSum/docker/ui/svelte/src/lib/shared/Utils.ts b/DocSum/ui/svelte/src/lib/shared/Utils.ts similarity index 100% rename from DocSum/docker/ui/svelte/src/lib/shared/Utils.ts rename to DocSum/ui/svelte/src/lib/shared/Utils.ts diff --git a/DocSum/docker/ui/svelte/src/lib/summary.svelte b/DocSum/ui/svelte/src/lib/summary.svelte similarity index 100% rename from DocSum/docker/ui/svelte/src/lib/summary.svelte rename to DocSum/ui/svelte/src/lib/summary.svelte diff --git a/DocSum/docker/ui/svelte/src/routes/+layout.svelte b/DocSum/ui/svelte/src/routes/+layout.svelte similarity index 100% rename from DocSum/docker/ui/svelte/src/routes/+layout.svelte rename to DocSum/ui/svelte/src/routes/+layout.svelte diff --git a/DocSum/docker/ui/svelte/src/routes/+page.svelte b/DocSum/ui/svelte/src/routes/+page.svelte similarity index 100% rename from DocSum/docker/ui/svelte/src/routes/+page.svelte rename to DocSum/ui/svelte/src/routes/+page.svelte diff --git a/DocSum/docker/ui/svelte/static/favicon.png b/DocSum/ui/svelte/static/favicon.png similarity index 100% rename from DocSum/docker/ui/svelte/static/favicon.png rename to DocSum/ui/svelte/static/favicon.png diff --git a/DocSum/docker/ui/svelte/svelte.config.js b/DocSum/ui/svelte/svelte.config.js similarity index 100% rename from DocSum/docker/ui/svelte/svelte.config.js rename to DocSum/ui/svelte/svelte.config.js diff --git a/DocSum/docker/ui/svelte/tailwind.config.cjs b/DocSum/ui/svelte/tailwind.config.cjs similarity index 100% rename from DocSum/docker/ui/svelte/tailwind.config.cjs rename to DocSum/ui/svelte/tailwind.config.cjs diff --git a/DocSum/docker/ui/svelte/tests/docSum.spec.ts b/DocSum/ui/svelte/tests/docSum.spec.ts similarity index 100% rename from DocSum/docker/ui/svelte/tests/docSum.spec.ts rename to DocSum/ui/svelte/tests/docSum.spec.ts diff --git a/DocSum/docker/ui/svelte/tsconfig.json b/DocSum/ui/svelte/tsconfig.json similarity index 100% rename from DocSum/docker/ui/svelte/tsconfig.json rename to DocSum/ui/svelte/tsconfig.json diff --git a/DocSum/docker/ui/svelte/vite.config.ts b/DocSum/ui/svelte/vite.config.ts similarity index 100% rename from DocSum/docker/ui/svelte/vite.config.ts rename to DocSum/ui/svelte/vite.config.ts diff --git a/FaqGen/docker/Dockerfile b/FaqGen/Dockerfile similarity index 100% rename from FaqGen/docker/Dockerfile rename to FaqGen/Dockerfile diff --git a/FaqGen/README.md b/FaqGen/README.md index 3446ad64b..338c59788 100644 --- a/FaqGen/README.md +++ b/FaqGen/README.md @@ -10,8 +10,8 @@ The FAQ Generation service can be deployed on either Intel Gaudi2 or Intel XEON ### Deploy FAQ Generation on Gaudi -Refer to the [Gaudi Guide](./docker/gaudi/README.md) for instructions on deploying FAQ Generation on Gaudi. +Refer to the [Gaudi Guide](./docker_compose/intel/hpu/gaudi/README.md) for instructions on deploying FAQ Generation on Gaudi. ### Deploy FAQ Generation on Xeon -Refer to the [Xeon Guide](./docker/xeon/README.md) for instructions on deploying FAQ Generation on Xeon. +Refer to the [Xeon Guide](./docker_compose/intel/cpu/xeon/README.md) for instructions on deploying FAQ Generation on Xeon. diff --git a/FaqGen/docker/xeon/README.md b/FaqGen/docker_compose/intel/cpu/xeon/README.md similarity index 91% rename from FaqGen/docker/xeon/README.md rename to FaqGen/docker_compose/intel/cpu/xeon/README.md index 8265ff02e..40ce213ba 100644 --- a/FaqGen/docker/xeon/README.md +++ b/FaqGen/docker_compose/intel/cpu/xeon/README.md @@ -22,7 +22,7 @@ cd GenAIComps ### 1. Build LLM Image ```bash -docker build -t opea/llm-faqgen-tgi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/faq-generation/tgi/Dockerfile . +docker build -t opea/llm-faqgen-tgi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/faq-generation/tgi/langchain/Dockerfile . ``` ### 2. Build MegaService Docker Image @@ -31,8 +31,8 @@ To construct the Mega Service, we utilize the [GenAIComps](https://github.com/op ```bash git clone https://github.com/opea-project/GenAIExamples -cd GenAIExamples/FaqGen/docker/ -docker build --no-cache -t opea/faqgen:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f GenAIExamples/FaqGen/docker/Dockerfile . +cd GenAIExamples/FaqGen/ +docker build --no-cache -t opea/faqgen:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f GenAIExamples/FaqGen/Dockerfile . ``` ### 3. Build UI Docker Image @@ -40,8 +40,8 @@ docker build --no-cache -t opea/faqgen:latest --build-arg https_proxy=$https_pro Build the frontend Docker image via below command: ```bash -cd GenAIExamples/FaqGen/docker/ui/ -docker build -t opea/faqgen-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker/Dockerfile . +cd GenAIExamples/FaqGen/ui +docker build -t opea/faqgen-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f docker/Dockerfile . ``` ### 4. Build react UI Docker Image (Optional) @@ -49,9 +49,9 @@ docker build -t opea/faqgen-ui:latest --build-arg https_proxy=$https_proxy --bui Build the frontend Docker image based on react framework via below command: ```bash -cd GenAIExamples/FaqGen/docker/ui +cd GenAIExamples/FaqGen/ui export BACKEND_SERVICE_ENDPOINT="http://${host_ip}:8888/v1/faqgen" -docker build -t opea/faqgen-react-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy --build-arg BACKEND_SERVICE_ENDPOINT=$BACKEND_SERVICE_ENDPOINT -f ./docker/Dockerfile.react . +docker build -t opea/faqgen-react-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy --build-arg BACKEND_SERVICE_ENDPOINT=$BACKEND_SERVICE_ENDPOINT -f docker/Dockerfile.react . ``` Then run the command `docker images`, you will have the following Docker Images: @@ -90,7 +90,7 @@ Note: Please replace with `host_ip` with your external IP address, do not use lo ### Start Microservice Docker Containers ```bash -cd GenAIExamples/FaqGen/docker/xeon +cd GenAIExamples/FaqGen/docker_compose/intel/cpu/xeon docker compose up -d ``` @@ -128,7 +128,7 @@ docker compose up -d Open this URL `http://{host_ip}:5173` in your browser to access the frontend. -![project-screenshot](../../assets/img/faqgen_ui_text.png) +![project-screenshot](../../../../assets/img/faqgen_ui_text.png) ## 🚀 Launch the React UI (Optional) @@ -153,7 +153,7 @@ To access the FAQGen (react based) frontend, modify the UI service in the `compo Open this URL `http://{host_ip}:5174` in your browser to access the react based frontend. - Create FAQs from Text input - ![project-screenshot](../../assets/img/faqgen_react_ui_text.png) + ![project-screenshot](../../../../assets/img/faqgen_react_ui_text.png) - Create FAQs from Text Files - ![project-screenshot](../../assets/img/faqgen_react_ui_text_file.png) + ![project-screenshot](../../../../assets/img/faqgen_react_ui_text_file.png) diff --git a/FaqGen/docker/xeon/compose.yaml b/FaqGen/docker_compose/intel/cpu/xeon/compose.yaml similarity index 100% rename from FaqGen/docker/xeon/compose.yaml rename to FaqGen/docker_compose/intel/cpu/xeon/compose.yaml diff --git a/FaqGen/docker/gaudi/README.md b/FaqGen/docker_compose/intel/hpu/gaudi/README.md similarity index 92% rename from FaqGen/docker/gaudi/README.md rename to FaqGen/docker_compose/intel/hpu/gaudi/README.md index f07fbed11..533478d15 100644 --- a/FaqGen/docker/gaudi/README.md +++ b/FaqGen/docker_compose/intel/hpu/gaudi/README.md @@ -22,7 +22,7 @@ docker pull ghcr.io/huggingface/tgi-gaudi:2.0.1 ### 2. Build LLM Image ```bash -docker build -t opea/llm-faqgen-tgi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/faq-generation/tgi/Dockerfile . +docker build -t opea/llm-faqgen-tgi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/llms/faq-generation/tgi/langchain/Dockerfile . ``` ### 3. Build MegaService Docker Image @@ -40,7 +40,7 @@ docker build --no-cache -t opea/faqgen:latest --build-arg https_proxy=$https_pro Construct the frontend Docker image using the command below: ```bash -cd GenAIExamples/FaqGen/docker/ui/ +cd GenAIExamples/FaqGen/ docker build -t opea/faqgen-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker/Dockerfile . ``` @@ -49,9 +49,9 @@ docker build -t opea/faqgen-ui:latest --build-arg https_proxy=$https_proxy --bui Build the frontend Docker image based on react framework via below command: ```bash -cd GenAIExamples/FaqGen/docker/ui +cd GenAIExamples/FaqGen/ui export BACKEND_SERVICE_ENDPOINT="http://${host_ip}:8888/v1/faqgen" -docker build -t opea/faqgen-react-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy --build-arg BACKEND_SERVICE_ENDPOINT=$BACKEND_SERVICE_ENDPOINT -f ./docker/Dockerfile.react . +docker build -t opea/faqgen-react-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy --build-arg BACKEND_SERVICE_ENDPOINT=$BACKEND_SERVICE_ENDPOINT -f docker/Dockerfile.react . ``` Then run the command `docker images`, you will have the following Docker Images: @@ -91,7 +91,7 @@ Note: Please replace with `host_ip` with your external IP address, do not use lo ### Start Microservice Docker Containers ```bash -cd GenAIExamples/FaqGen/docker/gaudi +cd GenAIExamples/FaqGen/docker_compose/intel/hpu/gaudi docker compose up -d ``` @@ -127,7 +127,7 @@ docker compose up -d Open this URL `http://{host_ip}:5173` in your browser to access the frontend. -![project-screenshot](../../assets/img/faqgen_ui_text.png) +![project-screenshot](../../../../assets/img/faqgen_ui_text.png) ## 🚀 Launch the React UI (Optional) @@ -152,7 +152,7 @@ To access the FAQGen (react based) frontend, modify the UI service in the `compo Open this URL `http://{host_ip}:5174` in your browser to access the react based frontend. - Create FAQs from Text input - ![project-screenshot](../../assets/img/faqgen_react_ui_text.png) + ![project-screenshot](../../../../assets/img/faqgen_react_ui_text.png) - Create FAQs from Text Files - ![project-screenshot](../../assets/img/faqgen_react_ui_text_file.png) + ![project-screenshot](../../../../assets/img/faqgen_react_ui_text_file.png) diff --git a/FaqGen/docker/gaudi/compose.yaml b/FaqGen/docker_compose/intel/hpu/gaudi/compose.yaml similarity index 100% rename from FaqGen/docker/gaudi/compose.yaml rename to FaqGen/docker_compose/intel/hpu/gaudi/compose.yaml diff --git a/FaqGen/docker/docker_build_compose.yaml b/FaqGen/docker_image_build/build.yaml similarity index 84% rename from FaqGen/docker/docker_build_compose.yaml rename to FaqGen/docker_image_build/build.yaml index a80257fc4..da4ad93a6 100644 --- a/FaqGen/docker/docker_build_compose.yaml +++ b/FaqGen/docker_image_build/build.yaml @@ -8,23 +8,24 @@ services: http_proxy: ${http_proxy} https_proxy: ${https_proxy} no_proxy: ${no_proxy} + context: ../ dockerfile: ./Dockerfile image: ${REGISTRY:-opea}/faqgen:${TAG:-latest} faqgen-ui: build: - context: ui + context: ../ui dockerfile: ./docker/Dockerfile extends: faqgen image: ${REGISTRY:-opea}/faqgen-ui:${TAG:-latest} faqgen-react-ui: build: - context: ui + context: ../ui dockerfile: ./docker/Dockerfile.react extends: faqgen image: ${REGISTRY:-opea}/faqgen-react-ui:${TAG:-latest} llm-faqgen-tgi: build: context: GenAIComps - dockerfile: comps/llms/faq-generation/tgi/Dockerfile + dockerfile: comps/llms/faq-generation/tgi/langchain/Dockerfile extends: faqgen image: ${REGISTRY:-opea}/llm-faqgen-tgi:${TAG:-latest} diff --git a/FaqGen/docker/faqgen.py b/FaqGen/faqgen.py similarity index 100% rename from FaqGen/docker/faqgen.py rename to FaqGen/faqgen.py diff --git a/FaqGen/kubernetes/README.md b/FaqGen/kubernetes/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/FaqGen/kubernetes/helm-charts/README.md b/FaqGen/kubernetes/helm-charts/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/FaqGen/kubernetes/manifests/README.md b/FaqGen/kubernetes/intel/README.md similarity index 100% rename from FaqGen/kubernetes/manifests/README.md rename to FaqGen/kubernetes/intel/README.md diff --git a/DocSum/kubernetes/helm-charts/README.md b/FaqGen/kubernetes/intel/README_gmc.md similarity index 100% rename from DocSum/kubernetes/helm-charts/README.md rename to FaqGen/kubernetes/intel/README_gmc.md diff --git a/FaqGen/kubernetes/faqgen_xeon.yaml b/FaqGen/kubernetes/intel/cpu/xeon/gmc/faqgen_xeon.yaml similarity index 100% rename from FaqGen/kubernetes/faqgen_xeon.yaml rename to FaqGen/kubernetes/intel/cpu/xeon/gmc/faqgen_xeon.yaml diff --git a/FaqGen/kubernetes/manifests/xeon/ui/README.md b/FaqGen/kubernetes/intel/cpu/xeon/manifest/README_react_ui.md similarity index 100% rename from FaqGen/kubernetes/manifests/xeon/ui/README.md rename to FaqGen/kubernetes/intel/cpu/xeon/manifest/README_react_ui.md diff --git a/FaqGen/kubernetes/manifests/xeon/faqgen.yaml b/FaqGen/kubernetes/intel/cpu/xeon/manifest/faqgen.yaml similarity index 100% rename from FaqGen/kubernetes/manifests/xeon/faqgen.yaml rename to FaqGen/kubernetes/intel/cpu/xeon/manifest/faqgen.yaml diff --git a/FaqGen/kubernetes/manifests/xeon/ui/react-faqgen.yaml b/FaqGen/kubernetes/intel/cpu/xeon/manifest/faqgen_react_ui.yaml similarity index 100% rename from FaqGen/kubernetes/manifests/xeon/ui/react-faqgen.yaml rename to FaqGen/kubernetes/intel/cpu/xeon/manifest/faqgen_react_ui.yaml diff --git a/FaqGen/kubernetes/manifests/ui.yaml b/FaqGen/kubernetes/intel/cpu/xeon/manifest/faqgen_ui.yaml similarity index 100% rename from FaqGen/kubernetes/manifests/ui.yaml rename to FaqGen/kubernetes/intel/cpu/xeon/manifest/faqgen_ui.yaml diff --git a/FaqGen/kubernetes/faqgen_gaudi.yaml b/FaqGen/kubernetes/intel/hpu/gaudi/gmc/faqgen_gaudi.yaml similarity index 100% rename from FaqGen/kubernetes/faqgen_gaudi.yaml rename to FaqGen/kubernetes/intel/hpu/gaudi/gmc/faqgen_gaudi.yaml diff --git a/FaqGen/kubernetes/manifests/gaudi/faqgen.yaml b/FaqGen/kubernetes/intel/hpu/gaudi/manifest/faqgen.yaml similarity index 100% rename from FaqGen/kubernetes/manifests/gaudi/faqgen.yaml rename to FaqGen/kubernetes/intel/hpu/gaudi/manifest/faqgen.yaml diff --git a/FaqGen/kubernetes/intel/hpu/gaudi/manifest/faqgen_ui.yaml b/FaqGen/kubernetes/intel/hpu/gaudi/manifest/faqgen_ui.yaml new file mode 100644 index 000000000..f74299a09 --- /dev/null +++ b/FaqGen/kubernetes/intel/hpu/gaudi/manifest/faqgen_ui.yaml @@ -0,0 +1,46 @@ +--- +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 +apiVersion: apps/v1 +kind: Deployment +metadata: + name: faq-mega-ui-deploy + namespace: default +spec: + replicas: 1 + selector: + matchLabels: + app: faq-mega-ui-deploy + template: + metadata: + annotations: + sidecar.istio.io/rewriteAppHTTPProbers: 'true' + labels: + app: faq-mega-ui-deploy + spec: + hostIPC: true + containers: + - name: faq-mega-ui-deploy + env: + - name: DOC_BASE_URL + value: http://{insert_your_ip_here}:7779/v1/faqgen + image: opea/faqgen-ui:latest + imagePullPolicy: IfNotPresent + args: null + ports: + - containerPort: 5173 + serviceAccountName: default +--- +kind: Service +apiVersion: v1 +metadata: + name: faq-mega-ui-svc +spec: + type: NodePort + selector: + app: faq-mega-ui-deploy + ports: + - name: service + port: 5175 + targetPort: 5173 + nodePort: 30175 diff --git a/FaqGen/kubernetes/service-mesh/README.md b/FaqGen/kubernetes/service-mesh/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/FaqGen/tests/test_faqgen_on_gaudi.sh b/FaqGen/tests/test_compose_on_gaudi.sh similarity index 91% rename from FaqGen/tests/test_faqgen_on_gaudi.sh rename to FaqGen/tests/test_compose_on_gaudi.sh index 027ee4ca1..5fd9ae34a 100644 --- a/FaqGen/tests/test_faqgen_on_gaudi.sh +++ b/FaqGen/tests/test_compose_on_gaudi.sh @@ -2,7 +2,7 @@ # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -set -x +set -xe IMAGE_REPO=${IMAGE_REPO:-"opea"} IMAGE_TAG=${IMAGE_TAG:-"latest"} echo "REGISTRY=IMAGE_REPO=${IMAGE_REPO}" @@ -15,19 +15,19 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="faqgen faqgen-ui llm-faqgen-tgi" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/tgi-gaudi:1.2.1 docker images && sleep 1s } function start_services() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi export LLM_MODEL_ID="Intel/neural-chat-7b-v3-3" export TGI_LLM_ENDPOINT="http://${ip_address}:8008" @@ -36,7 +36,7 @@ function start_services() { export LLM_SERVICE_HOST_IP=${ip_address} export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:8888/v1/faqgen" - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose up -d > ${LOG_PATH}/start_services_with_compose.log @@ -111,7 +111,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -139,7 +139,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi docker compose stop && docker compose rm -f } diff --git a/FaqGen/tests/test_faqgen_on_xeon.sh b/FaqGen/tests/test_compose_on_xeon.sh similarity index 91% rename from FaqGen/tests/test_faqgen_on_xeon.sh rename to FaqGen/tests/test_compose_on_xeon.sh index d4604977b..c6265e02d 100755 --- a/FaqGen/tests/test_faqgen_on_xeon.sh +++ b/FaqGen/tests/test_compose_on_xeon.sh @@ -2,7 +2,7 @@ # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -set -x +set -xe IMAGE_REPO=${IMAGE_REPO:-"opea"} IMAGE_TAG=${IMAGE_TAG:-"latest"} echo "REGISTRY=IMAGE_REPO=${IMAGE_REPO}" @@ -15,19 +15,19 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="faqgen faqgen-ui llm-faqgen-tgi" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/text-generation-inference:1.4 docker images && sleep 1s } function start_services() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon/ export LLM_MODEL_ID="Intel/neural-chat-7b-v3-3" export TGI_LLM_ENDPOINT="http://${ip_address}:8008" @@ -36,7 +36,7 @@ function start_services() { export LLM_SERVICE_HOST_IP=${ip_address} export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:8888/v1/faqgen" - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose up -d > ${LOG_PATH}/start_services_with_compose.log @@ -111,7 +111,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -139,7 +139,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon/ docker compose stop && docker compose rm -f } diff --git a/FaqGen/docker/ui/docker/Dockerfile b/FaqGen/ui/docker/Dockerfile similarity index 100% rename from FaqGen/docker/ui/docker/Dockerfile rename to FaqGen/ui/docker/Dockerfile diff --git a/FaqGen/docker/ui/docker/Dockerfile.react b/FaqGen/ui/docker/Dockerfile.react similarity index 100% rename from FaqGen/docker/ui/docker/Dockerfile.react rename to FaqGen/ui/docker/Dockerfile.react diff --git a/FaqGen/docker/ui/react/.eslintrc.cjs b/FaqGen/ui/react/.eslintrc.cjs similarity index 100% rename from FaqGen/docker/ui/react/.eslintrc.cjs rename to FaqGen/ui/react/.eslintrc.cjs diff --git a/FaqGen/docker/ui/react/.gitignore b/FaqGen/ui/react/.gitignore similarity index 100% rename from FaqGen/docker/ui/react/.gitignore rename to FaqGen/ui/react/.gitignore diff --git a/FaqGen/docker/ui/react/README.md b/FaqGen/ui/react/README.md similarity index 84% rename from FaqGen/docker/ui/react/README.md rename to FaqGen/ui/react/README.md index 50bcf285c..80851cd4f 100644 --- a/FaqGen/docker/ui/react/README.md +++ b/FaqGen/ui/react/README.md @@ -2,8 +2,8 @@ ## 📸 Project Screenshots -![project-screenshot](../../../assets/img/faqgen_react_ui_text.png) -![project-screenshot](../../../assets/img/faqgen_react_ui_text_file.png) +![project-screenshot](../../assets/img/faqgen_react_ui_text.png) +![project-screenshot](../../assets/img/faqgen_react_ui_text_file.png) ## 🧐 Features diff --git a/FaqGen/docker/ui/react/index.html b/FaqGen/ui/react/index.html similarity index 100% rename from FaqGen/docker/ui/react/index.html rename to FaqGen/ui/react/index.html diff --git a/FaqGen/docker/ui/react/nginx.conf b/FaqGen/ui/react/nginx.conf similarity index 100% rename from FaqGen/docker/ui/react/nginx.conf rename to FaqGen/ui/react/nginx.conf diff --git a/FaqGen/docker/ui/react/package.json b/FaqGen/ui/react/package.json similarity index 100% rename from FaqGen/docker/ui/react/package.json rename to FaqGen/ui/react/package.json diff --git a/FaqGen/docker/ui/react/postcss.config.cjs b/FaqGen/ui/react/postcss.config.cjs similarity index 100% rename from FaqGen/docker/ui/react/postcss.config.cjs rename to FaqGen/ui/react/postcss.config.cjs diff --git a/FaqGen/docker/ui/react/public/vite.svg b/FaqGen/ui/react/public/vite.svg similarity index 100% rename from FaqGen/docker/ui/react/public/vite.svg rename to FaqGen/ui/react/public/vite.svg diff --git a/FaqGen/docker/ui/react/src/App.scss b/FaqGen/ui/react/src/App.scss similarity index 100% rename from FaqGen/docker/ui/react/src/App.scss rename to FaqGen/ui/react/src/App.scss diff --git a/FaqGen/docker/ui/react/src/App.tsx b/FaqGen/ui/react/src/App.tsx similarity index 100% rename from FaqGen/docker/ui/react/src/App.tsx rename to FaqGen/ui/react/src/App.tsx diff --git a/FaqGen/docker/ui/react/src/__tests__/util.test.ts b/FaqGen/ui/react/src/__tests__/util.test.ts similarity index 100% rename from FaqGen/docker/ui/react/src/__tests__/util.test.ts rename to FaqGen/ui/react/src/__tests__/util.test.ts diff --git a/FaqGen/docker/ui/react/src/assets/opea-icon-black.svg b/FaqGen/ui/react/src/assets/opea-icon-black.svg similarity index 100% rename from FaqGen/docker/ui/react/src/assets/opea-icon-black.svg rename to FaqGen/ui/react/src/assets/opea-icon-black.svg diff --git a/FaqGen/docker/ui/react/src/assets/opea-icon-color.svg b/FaqGen/ui/react/src/assets/opea-icon-color.svg similarity index 100% rename from FaqGen/docker/ui/react/src/assets/opea-icon-color.svg rename to FaqGen/ui/react/src/assets/opea-icon-color.svg diff --git a/FaqGen/docker/ui/react/src/assets/react.svg b/FaqGen/ui/react/src/assets/react.svg similarity index 100% rename from FaqGen/docker/ui/react/src/assets/react.svg rename to FaqGen/ui/react/src/assets/react.svg diff --git a/FaqGen/docker/ui/react/src/common/client.ts b/FaqGen/ui/react/src/common/client.ts similarity index 100% rename from FaqGen/docker/ui/react/src/common/client.ts rename to FaqGen/ui/react/src/common/client.ts diff --git a/FaqGen/docker/ui/react/src/common/util.ts b/FaqGen/ui/react/src/common/util.ts similarity index 100% rename from FaqGen/docker/ui/react/src/common/util.ts rename to FaqGen/ui/react/src/common/util.ts diff --git a/FaqGen/docker/ui/react/src/components/FaqGen/FaqGen.tsx b/FaqGen/ui/react/src/components/FaqGen/FaqGen.tsx similarity index 100% rename from FaqGen/docker/ui/react/src/components/FaqGen/FaqGen.tsx rename to FaqGen/ui/react/src/components/FaqGen/FaqGen.tsx diff --git a/FaqGen/docker/ui/react/src/components/FaqGen/FileUpload.tsx b/FaqGen/ui/react/src/components/FaqGen/FileUpload.tsx similarity index 100% rename from FaqGen/docker/ui/react/src/components/FaqGen/FileUpload.tsx rename to FaqGen/ui/react/src/components/FaqGen/FileUpload.tsx diff --git a/FaqGen/docker/ui/react/src/components/FaqGen/faqGen.module.scss b/FaqGen/ui/react/src/components/FaqGen/faqGen.module.scss similarity index 100% rename from FaqGen/docker/ui/react/src/components/FaqGen/faqGen.module.scss rename to FaqGen/ui/react/src/components/FaqGen/faqGen.module.scss diff --git a/FaqGen/docker/ui/react/src/components/Shared/CodeRender/CodeRender.tsx b/FaqGen/ui/react/src/components/Shared/CodeRender/CodeRender.tsx similarity index 100% rename from FaqGen/docker/ui/react/src/components/Shared/CodeRender/CodeRender.tsx rename to FaqGen/ui/react/src/components/Shared/CodeRender/CodeRender.tsx diff --git a/FaqGen/docker/ui/react/src/components/Shared/CodeRender/codeRender.module.scss b/FaqGen/ui/react/src/components/Shared/CodeRender/codeRender.module.scss similarity index 100% rename from FaqGen/docker/ui/react/src/components/Shared/CodeRender/codeRender.module.scss rename to FaqGen/ui/react/src/components/Shared/CodeRender/codeRender.module.scss diff --git a/FaqGen/docker/ui/react/src/components/Shared/Markdown/Markdown.tsx b/FaqGen/ui/react/src/components/Shared/Markdown/Markdown.tsx similarity index 100% rename from FaqGen/docker/ui/react/src/components/Shared/Markdown/Markdown.tsx rename to FaqGen/ui/react/src/components/Shared/Markdown/Markdown.tsx diff --git a/FaqGen/docker/ui/react/src/components/Shared/Markdown/markdown.module.scss b/FaqGen/ui/react/src/components/Shared/Markdown/markdown.module.scss similarity index 100% rename from FaqGen/docker/ui/react/src/components/Shared/Markdown/markdown.module.scss rename to FaqGen/ui/react/src/components/Shared/Markdown/markdown.module.scss diff --git a/FaqGen/docker/ui/react/src/components/sidebar/sidebar.module.scss b/FaqGen/ui/react/src/components/sidebar/sidebar.module.scss similarity index 100% rename from FaqGen/docker/ui/react/src/components/sidebar/sidebar.module.scss rename to FaqGen/ui/react/src/components/sidebar/sidebar.module.scss diff --git a/FaqGen/docker/ui/react/src/components/sidebar/sidebar.tsx b/FaqGen/ui/react/src/components/sidebar/sidebar.tsx similarity index 100% rename from FaqGen/docker/ui/react/src/components/sidebar/sidebar.tsx rename to FaqGen/ui/react/src/components/sidebar/sidebar.tsx diff --git a/FaqGen/docker/ui/react/src/config.ts b/FaqGen/ui/react/src/config.ts similarity index 100% rename from FaqGen/docker/ui/react/src/config.ts rename to FaqGen/ui/react/src/config.ts diff --git a/FaqGen/docker/ui/react/src/index.scss b/FaqGen/ui/react/src/index.scss similarity index 100% rename from FaqGen/docker/ui/react/src/index.scss rename to FaqGen/ui/react/src/index.scss diff --git a/FaqGen/docker/ui/react/src/main.tsx b/FaqGen/ui/react/src/main.tsx similarity index 100% rename from FaqGen/docker/ui/react/src/main.tsx rename to FaqGen/ui/react/src/main.tsx diff --git a/DocSum/kubernetes/service-mesh/README.md b/FaqGen/ui/react/src/styles/components/_context.scss similarity index 100% rename from DocSum/kubernetes/service-mesh/README.md rename to FaqGen/ui/react/src/styles/components/_context.scss diff --git a/FaqGen/docker/ui/react/src/styles/components/_sidebar.scss b/FaqGen/ui/react/src/styles/components/_sidebar.scss similarity index 100% rename from FaqGen/docker/ui/react/src/styles/components/_sidebar.scss rename to FaqGen/ui/react/src/styles/components/_sidebar.scss diff --git a/FaqGen/docker/ui/react/src/styles/components/content.scss b/FaqGen/ui/react/src/styles/components/content.scss similarity index 100% rename from FaqGen/docker/ui/react/src/styles/components/content.scss rename to FaqGen/ui/react/src/styles/components/content.scss diff --git a/FaqGen/docker/ui/react/src/styles/components/context.module.scss b/FaqGen/ui/react/src/styles/components/context.module.scss similarity index 100% rename from FaqGen/docker/ui/react/src/styles/components/context.module.scss rename to FaqGen/ui/react/src/styles/components/context.module.scss diff --git a/FaqGen/docker/ui/react/src/styles/layout/_basics.scss b/FaqGen/ui/react/src/styles/layout/_basics.scss similarity index 100% rename from FaqGen/docker/ui/react/src/styles/layout/_basics.scss rename to FaqGen/ui/react/src/styles/layout/_basics.scss diff --git a/FaqGen/docker/ui/react/src/styles/layout/_flex.scss b/FaqGen/ui/react/src/styles/layout/_flex.scss similarity index 100% rename from FaqGen/docker/ui/react/src/styles/layout/_flex.scss rename to FaqGen/ui/react/src/styles/layout/_flex.scss diff --git a/FaqGen/docker/ui/react/src/styles/styles.scss b/FaqGen/ui/react/src/styles/styles.scss similarity index 100% rename from FaqGen/docker/ui/react/src/styles/styles.scss rename to FaqGen/ui/react/src/styles/styles.scss diff --git a/FaqGen/docker/ui/react/src/vite-env.d.ts b/FaqGen/ui/react/src/vite-env.d.ts similarity index 100% rename from FaqGen/docker/ui/react/src/vite-env.d.ts rename to FaqGen/ui/react/src/vite-env.d.ts diff --git a/FaqGen/docker/ui/react/tsconfig.json b/FaqGen/ui/react/tsconfig.json similarity index 100% rename from FaqGen/docker/ui/react/tsconfig.json rename to FaqGen/ui/react/tsconfig.json diff --git a/FaqGen/docker/ui/react/tsconfig.node.json b/FaqGen/ui/react/tsconfig.node.json similarity index 100% rename from FaqGen/docker/ui/react/tsconfig.node.json rename to FaqGen/ui/react/tsconfig.node.json diff --git a/FaqGen/docker/ui/react/vite.config.ts b/FaqGen/ui/react/vite.config.ts similarity index 100% rename from FaqGen/docker/ui/react/vite.config.ts rename to FaqGen/ui/react/vite.config.ts diff --git a/FaqGen/docker/ui/svelte/.env b/FaqGen/ui/svelte/.env similarity index 100% rename from FaqGen/docker/ui/svelte/.env rename to FaqGen/ui/svelte/.env diff --git a/FaqGen/docker/ui/svelte/.gitignore b/FaqGen/ui/svelte/.gitignore similarity index 100% rename from FaqGen/docker/ui/svelte/.gitignore rename to FaqGen/ui/svelte/.gitignore diff --git a/FaqGen/docker/ui/svelte/.npmrc b/FaqGen/ui/svelte/.npmrc similarity index 100% rename from FaqGen/docker/ui/svelte/.npmrc rename to FaqGen/ui/svelte/.npmrc diff --git a/FaqGen/docker/ui/svelte/README.md b/FaqGen/ui/svelte/README.md similarity index 91% rename from FaqGen/docker/ui/svelte/README.md rename to FaqGen/ui/svelte/README.md index 12acb0e1a..be438ebd8 100644 --- a/FaqGen/docker/ui/svelte/README.md +++ b/FaqGen/ui/svelte/README.md @@ -2,7 +2,7 @@ ## 📸 Project Screenshots -![project-screenshot](../../../assets/img/faqgen_ui_text.png) +![project-screenshot](../../assets/img/faqgen_ui_text.png) ## 🧐 Features diff --git a/FaqGen/docker/ui/svelte/package.json b/FaqGen/ui/svelte/package.json similarity index 100% rename from FaqGen/docker/ui/svelte/package.json rename to FaqGen/ui/svelte/package.json diff --git a/FaqGen/docker/ui/svelte/playwright.config.ts b/FaqGen/ui/svelte/playwright.config.ts similarity index 100% rename from FaqGen/docker/ui/svelte/playwright.config.ts rename to FaqGen/ui/svelte/playwright.config.ts diff --git a/FaqGen/docker/ui/svelte/postcss.config.cjs b/FaqGen/ui/svelte/postcss.config.cjs similarity index 100% rename from FaqGen/docker/ui/svelte/postcss.config.cjs rename to FaqGen/ui/svelte/postcss.config.cjs diff --git a/FaqGen/docker/ui/svelte/src/app.d.ts b/FaqGen/ui/svelte/src/app.d.ts similarity index 100% rename from FaqGen/docker/ui/svelte/src/app.d.ts rename to FaqGen/ui/svelte/src/app.d.ts diff --git a/FaqGen/docker/ui/svelte/src/app.html b/FaqGen/ui/svelte/src/app.html similarity index 100% rename from FaqGen/docker/ui/svelte/src/app.html rename to FaqGen/ui/svelte/src/app.html diff --git a/FaqGen/docker/ui/svelte/src/app.pcss b/FaqGen/ui/svelte/src/app.pcss similarity index 100% rename from FaqGen/docker/ui/svelte/src/app.pcss rename to FaqGen/ui/svelte/src/app.pcss diff --git a/FaqGen/docker/ui/svelte/src/lib/assets/faqLogo.svelte b/FaqGen/ui/svelte/src/lib/assets/faqLogo.svelte similarity index 100% rename from FaqGen/docker/ui/svelte/src/lib/assets/faqLogo.svelte rename to FaqGen/ui/svelte/src/lib/assets/faqLogo.svelte diff --git a/FaqGen/docker/ui/svelte/src/lib/assets/imgLogo.svelte b/FaqGen/ui/svelte/src/lib/assets/imgLogo.svelte similarity index 100% rename from FaqGen/docker/ui/svelte/src/lib/assets/imgLogo.svelte rename to FaqGen/ui/svelte/src/lib/assets/imgLogo.svelte diff --git a/FaqGen/docker/ui/svelte/src/lib/assets/intelLogo.svelte b/FaqGen/ui/svelte/src/lib/assets/intelLogo.svelte similarity index 100% rename from FaqGen/docker/ui/svelte/src/lib/assets/intelLogo.svelte rename to FaqGen/ui/svelte/src/lib/assets/intelLogo.svelte diff --git a/FaqGen/docker/ui/svelte/src/lib/assets/loadingAnimation.svelte b/FaqGen/ui/svelte/src/lib/assets/loadingAnimation.svelte similarity index 100% rename from FaqGen/docker/ui/svelte/src/lib/assets/loadingAnimation.svelte rename to FaqGen/ui/svelte/src/lib/assets/loadingAnimation.svelte diff --git a/FaqGen/docker/ui/svelte/src/lib/assets/spinLoading.svelte b/FaqGen/ui/svelte/src/lib/assets/spinLoading.svelte similarity index 100% rename from FaqGen/docker/ui/svelte/src/lib/assets/spinLoading.svelte rename to FaqGen/ui/svelte/src/lib/assets/spinLoading.svelte diff --git a/FaqGen/docker/ui/svelte/src/lib/doc.svelte b/FaqGen/ui/svelte/src/lib/doc.svelte similarity index 100% rename from FaqGen/docker/ui/svelte/src/lib/doc.svelte rename to FaqGen/ui/svelte/src/lib/doc.svelte diff --git a/FaqGen/docker/ui/svelte/src/lib/dropFile.svelte b/FaqGen/ui/svelte/src/lib/dropFile.svelte similarity index 100% rename from FaqGen/docker/ui/svelte/src/lib/dropFile.svelte rename to FaqGen/ui/svelte/src/lib/dropFile.svelte diff --git a/FaqGen/docker/ui/svelte/src/lib/faq.svelte b/FaqGen/ui/svelte/src/lib/faq.svelte similarity index 100% rename from FaqGen/docker/ui/svelte/src/lib/faq.svelte rename to FaqGen/ui/svelte/src/lib/faq.svelte diff --git a/FaqGen/docker/ui/svelte/src/lib/header.svelte b/FaqGen/ui/svelte/src/lib/header.svelte similarity index 100% rename from FaqGen/docker/ui/svelte/src/lib/header.svelte rename to FaqGen/ui/svelte/src/lib/header.svelte diff --git a/FaqGen/docker/ui/svelte/src/lib/index.ts b/FaqGen/ui/svelte/src/lib/index.ts similarity index 100% rename from FaqGen/docker/ui/svelte/src/lib/index.ts rename to FaqGen/ui/svelte/src/lib/index.ts diff --git a/FaqGen/docker/ui/svelte/src/lib/shared/Network.ts b/FaqGen/ui/svelte/src/lib/shared/Network.ts similarity index 100% rename from FaqGen/docker/ui/svelte/src/lib/shared/Network.ts rename to FaqGen/ui/svelte/src/lib/shared/Network.ts diff --git a/FaqGen/docker/ui/svelte/src/lib/shared/Store.ts b/FaqGen/ui/svelte/src/lib/shared/Store.ts similarity index 100% rename from FaqGen/docker/ui/svelte/src/lib/shared/Store.ts rename to FaqGen/ui/svelte/src/lib/shared/Store.ts diff --git a/FaqGen/docker/ui/svelte/src/lib/shared/Utils.ts b/FaqGen/ui/svelte/src/lib/shared/Utils.ts similarity index 100% rename from FaqGen/docker/ui/svelte/src/lib/shared/Utils.ts rename to FaqGen/ui/svelte/src/lib/shared/Utils.ts diff --git a/FaqGen/docker/ui/svelte/src/routes/+layout.svelte b/FaqGen/ui/svelte/src/routes/+layout.svelte similarity index 100% rename from FaqGen/docker/ui/svelte/src/routes/+layout.svelte rename to FaqGen/ui/svelte/src/routes/+layout.svelte diff --git a/FaqGen/docker/ui/svelte/src/routes/+page.svelte b/FaqGen/ui/svelte/src/routes/+page.svelte similarity index 100% rename from FaqGen/docker/ui/svelte/src/routes/+page.svelte rename to FaqGen/ui/svelte/src/routes/+page.svelte diff --git a/FaqGen/docker/ui/svelte/static/favicon.png b/FaqGen/ui/svelte/static/favicon.png similarity index 100% rename from FaqGen/docker/ui/svelte/static/favicon.png rename to FaqGen/ui/svelte/static/favicon.png diff --git a/FaqGen/docker/ui/svelte/svelte.config.js b/FaqGen/ui/svelte/svelte.config.js similarity index 100% rename from FaqGen/docker/ui/svelte/svelte.config.js rename to FaqGen/ui/svelte/svelte.config.js diff --git a/FaqGen/docker/ui/svelte/tailwind.config.cjs b/FaqGen/ui/svelte/tailwind.config.cjs similarity index 100% rename from FaqGen/docker/ui/svelte/tailwind.config.cjs rename to FaqGen/ui/svelte/tailwind.config.cjs diff --git a/FaqGen/docker/ui/svelte/tests/faqGen.spec.ts b/FaqGen/ui/svelte/tests/faqGen.spec.ts similarity index 100% rename from FaqGen/docker/ui/svelte/tests/faqGen.spec.ts rename to FaqGen/ui/svelte/tests/faqGen.spec.ts diff --git a/FaqGen/docker/ui/svelte/tsconfig.json b/FaqGen/ui/svelte/tsconfig.json similarity index 100% rename from FaqGen/docker/ui/svelte/tsconfig.json rename to FaqGen/ui/svelte/tsconfig.json diff --git a/FaqGen/docker/ui/svelte/vite.config.ts b/FaqGen/ui/svelte/vite.config.ts similarity index 100% rename from FaqGen/docker/ui/svelte/vite.config.ts rename to FaqGen/ui/svelte/vite.config.ts diff --git a/InstructionTuning/README.md b/InstructionTuning/README.md index ae677dc65..a81ec2f98 100644 --- a/InstructionTuning/README.md +++ b/InstructionTuning/README.md @@ -6,11 +6,11 @@ Instruction tuning is the process of further training LLMs on a dataset consisti ### Deploy Instruction Tuning Service on Xeon -Refer to the [Xeon Guide](./docker/xeon/README.md) for detail. +Refer to the [Xeon Guide](./docker_compose/intel/cpu/xeon/README.md) for detail. ### Deploy Instruction Tuning Service on Gaudi -Refer to the [Gaudi Guide](./docker/gaudi/README.md) for detail. +Refer to the [Gaudi Guide](./docker_compose/intel/hpu/gaudi/README.md) for detail. ## Consume Instruction Tuning Service diff --git a/InstructionTuning/docker/xeon/README.md b/InstructionTuning/docker_compose/intel/cpu/xeon/README.md similarity index 95% rename from InstructionTuning/docker/xeon/README.md rename to InstructionTuning/docker_compose/intel/cpu/xeon/README.md index 9f07c5be1..48a1ff2cf 100644 --- a/InstructionTuning/docker/xeon/README.md +++ b/InstructionTuning/docker_compose/intel/cpu/xeon/README.md @@ -19,7 +19,7 @@ Build docker image with below command: ```bash export HF_TOKEN=${your_huggingface_token} -docker build -t opea/finetuning:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy --build-arg HF_TOKEN=$HF_TOKEN -f comps/finetuning/docker/Dockerfile_cpu . +docker build -t opea/finetuning:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy --build-arg HF_TOKEN=$HF_TOKEN -f comps/finetuning/Dockerfile . ``` ### 3. Run Docker with CLI diff --git a/InstructionTuning/docker/gaudi/README.md b/InstructionTuning/docker_compose/intel/hpu/gaudi/README.md similarity index 97% rename from InstructionTuning/docker/gaudi/README.md rename to InstructionTuning/docker_compose/intel/hpu/gaudi/README.md index 56b03a324..302a54219 100644 --- a/InstructionTuning/docker/gaudi/README.md +++ b/InstructionTuning/docker_compose/intel/hpu/gaudi/README.md @@ -18,7 +18,7 @@ cd GenAIComps Build docker image with below command: ```bash -docker build -t opea/finetuning-gaudi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/finetuning/docker/Dockerfile_hpu . +docker build -t opea/finetuning-gaudi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/finetuning/Dockerfile.intel_hpu . ``` ### 3. Run Docker with CLI diff --git a/InstructionTuning/tests/test_instruction_tuning_on_xeon.sh b/InstructionTuning/tests/test_compose_on_xeon.sh similarity index 98% rename from InstructionTuning/tests/test_instruction_tuning_on_xeon.sh rename to InstructionTuning/tests/test_compose_on_xeon.sh index 3ddbdfcf0..4d27aa58f 100644 --- a/InstructionTuning/tests/test_instruction_tuning_on_xeon.sh +++ b/InstructionTuning/tests/test_compose_on_xeon.sh @@ -2,7 +2,7 @@ # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -set -x +set -ex WORKPATH=$(dirname "$PWD") LOG_PATH="$WORKPATH/tests" @@ -13,7 +13,8 @@ ray_port=8265 function build_docker_images() { cd $WORKPATH echo $(pwd) - docker build -t opea/finetuning:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy --build-arg HF_TOKEN=$HF_TOKEN -f comps/finetuning/docker/Dockerfile_cpu . + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" + docker build -t opea/finetuning:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy --build-arg HF_TOKEN=$HF_TOKEN -f comps/finetuning/Dockerfile . if [ $? -ne 0 ]; then echo "opea/finetuning built fail" exit 1 diff --git a/ProductivitySuite/README.md b/ProductivitySuite/README.md index 448a62dbf..2d3eccea4 100644 --- a/ProductivitySuite/README.md +++ b/ProductivitySuite/README.md @@ -16,8 +16,8 @@ OPEA Productivity Suite, is a powerful tool designed to streamline your workflow - Identity and access management: uses OpenSource platform (Keycloak) for single sign-on identity and access management. -Refer to the [Keycloak Configuration Guide](./docker/xeon/keycloak_setup_guide.md) for more instruction on setup Keycloak. +Refer to the [Keycloak Configuration Guide](./docker_compose/intel/cpu/xeon/keycloak_setup_guide.md) for more instruction on setup Keycloak. -Refer to the [Xeon Guide](./docker/xeon/README.md) for more instructions on building docker images from source and running the application via docker compose. +Refer to the [Xeon Guide](./docker_compose/intel/cpu/xeon/README.md) for more instructions on building docker images from source and running the application via docker compose. Refer to the [Xeon Kubernetes Guide](./kubernetes/manifests/README.md) for more instruction on deploying the application via kubernetes. diff --git a/ProductivitySuite/docker/xeon/README.md b/ProductivitySuite/docker_compose/intel/cpu/xeon/README.md similarity index 94% rename from ProductivitySuite/docker/xeon/README.md rename to ProductivitySuite/docker_compose/intel/cpu/xeon/README.md index 0c1da5490..673941fc3 100644 --- a/ProductivitySuite/docker/xeon/README.md +++ b/ProductivitySuite/docker_compose/intel/cpu/xeon/README.md @@ -14,19 +14,19 @@ cd GenAIComps ### 1. Build Embedding Image ```bash -docker build --no-cache -t opea/embedding-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/langchain/docker/Dockerfile . +docker build --no-cache -t opea/embedding-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/tei/langchain/Dockerfile . ``` ### 2. Build Retriever Image ```bash -docker build --no-cache -t opea/retriever-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/langchain/redis/docker/Dockerfile . +docker build --no-cache -t opea/retriever-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/redis/langchain/Dockerfile . ``` ### 3. Build Rerank Image ```bash -docker build --no-cache -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/tei/docker/Dockerfile . +docker build --no-cache -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/tei/Dockerfile . ``` ### 4. Build LLM Image @@ -40,14 +40,14 @@ docker build --no-cache -t opea/llm-tgi:latest --build-arg https_proxy=$https_pr ### 5. Build Dataprep Image ```bash -docker build --no-cache -t opea/dataprep-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/redis/langchain/docker/Dockerfile . +docker build --no-cache -t opea/dataprep-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/redis/langchain/Dockerfile . ``` ### 6. Build Prompt Registry Image ```bash -docker build -t opea/promptregistry-mongo-server:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/prompt_registry/mongo/docker/Dockerfile . +docker build -t opea/promptregistry-mongo-server:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/prompt_registry/mongo/Dockerfile . ``` @@ -55,7 +55,7 @@ docker build -t opea/promptregistry-mongo-server:latest --build-arg https_proxy= ### 7. Build Chat History Image ```bash -docker build -t opea/chathistory-mongo-server:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/chathistory/mongo/docker/Dockerfile . +docker build -t opea/chathistory-mongo-server:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/chathistory/mongo/Dockerfile . cd .. ``` @@ -67,7 +67,7 @@ The Productivity Suite is composed of multiple GenAIExample reference solutions ```bash git clone https://github.com/opea-project/GenAIExamples.git -cd GenAIExamples/ChatQnA/docker +cd GenAIExamples/ChatQnA/ docker build --no-cache -t opea/chatqna:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile . cd ../../.. ``` @@ -75,7 +75,7 @@ cd ../../.. #### 8.2 Build DocSum Megaservice Docker Images ```bash -cd GenAIExamples/DocSum/docker +cd GenAIExamples/DocSum docker build --no-cache -t opea/docsum:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile . cd ../../.. ``` @@ -83,7 +83,7 @@ cd ../../.. #### 8.3 Build CodeGen Megaservice Docker Images ```bash -cd GenAIExamples/CodeGen/docker +cd GenAIExamples/CodeGen docker build --no-cache -t opea/codegen:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile . cd ../../.. ``` @@ -91,7 +91,7 @@ cd ../../.. #### 8.4 Build FAQGen Megaservice Docker Images ```bash -cd GenAIExamples/FaqGen/docker +cd GenAIExamples/FaqGen docker build --no-cache -t opea/faqgen:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile . cd ../../.. ``` @@ -103,8 +103,8 @@ Build frontend Docker image that enables via below command: **Export the value of the public IP address of your Xeon server to the `host_ip` environment variable** ```bash -cd GenAIExamples/ProductivitySuite/docker/ui/ -docker build --no-cache -t ProductivitySuite/docker/xeon/compose.yaml ./docker/Dockerfile.react . +cd GenAIExamples/ProductivitySuite/ui +docker build --no-cache -t ProductivitySuite/docker_compose/intel/cpu/xeon/compose.yaml docker/Dockerfile.react . cd ../../../.. ``` @@ -191,7 +191,7 @@ Note: Please replace with `host_ip` with you external IP address, do not use loc > Before running the docker compose command, you need to be in the folder that has the docker compose yaml file ```bash -cd GenAIExamples/ProductivitySuite/docker/xeon/ +cd GenAIExamples/ProductivitySuite/docker_compose/intel/cpu/xeon ``` ```bash @@ -495,8 +495,8 @@ To access the frontend, open the following URL in your browser: http://{host_ip} ``` Here is an example of running Productivity Suite -![project-screenshot](../../assets/img/chat_qna_init.png) -![project-screenshot](../../assets/img/Login_page.png) +![project-screenshot](../../../../assets/img/chat_qna_init.png) +![project-screenshot](../../../../assets/img/Login_page.png) ## 🧐 Features @@ -514,7 +514,7 @@ Here're some of the project's features: #### Screen Shot -![project-screenshot](../../assets/img/data_source.png) +![project-screenshot](../../../../assets/img/data_source.png) - Clear: Clear the record of the current dialog box without retaining the contents of the dialog box. - Chat history: Historical chat records can still be retained after refreshing, making it easier for users to view the context. @@ -522,8 +522,8 @@ Here're some of the project's features: #### Screen Shots -![project-screenshot](../../assets/img/chat_qna_init.png) -![project-screenshot](../../assets/img/chatqna_with_conversation.png) +![project-screenshot](../../../../assets/img/chat_qna_init.png) +![project-screenshot](../../../../assets/img/chatqna_with_conversation.png) ### CODEGEN @@ -540,8 +540,8 @@ Here're some of the project's features: #### Screen Shot -![project-screenshot](../../assets/img/doc_summary_paste.png) -![project-screenshot](../../assets/img/doc_summary_file.png) +![project-screenshot](../../../../assets/img/doc_summary_paste.png) +![project-screenshot](../../../../assets/img/doc_summary_file.png) ### FAQ Generator @@ -551,4 +551,4 @@ Here're some of the project's features: #### Screen Shot -![project-screenshot](../../assets/img/faq_generator.png) +![project-screenshot](../../../../assets/img/faq_generator.png) diff --git a/ProductivitySuite/docker/xeon/compose.yaml b/ProductivitySuite/docker_compose/intel/cpu/xeon/compose.yaml similarity index 100% rename from ProductivitySuite/docker/xeon/compose.yaml rename to ProductivitySuite/docker_compose/intel/cpu/xeon/compose.yaml diff --git a/ProductivitySuite/docker/xeon/keycloak_setup_guide.md b/ProductivitySuite/docker_compose/intel/cpu/xeon/keycloak_setup_guide.md similarity index 100% rename from ProductivitySuite/docker/xeon/keycloak_setup_guide.md rename to ProductivitySuite/docker_compose/intel/cpu/xeon/keycloak_setup_guide.md diff --git a/ProductivitySuite/docker/xeon/set_env.sh b/ProductivitySuite/docker_compose/intel/cpu/xeon/set_env.sh similarity index 100% rename from ProductivitySuite/docker/xeon/set_env.sh rename to ProductivitySuite/docker_compose/intel/cpu/xeon/set_env.sh diff --git a/ProductivitySuite/docker/docker_build_compose.yaml b/ProductivitySuite/docker_image_build/build.yaml similarity index 78% rename from ProductivitySuite/docker/docker_build_compose.yaml rename to ProductivitySuite/docker_image_build/build.yaml index 87519188b..2f75b848f 100644 --- a/ProductivitySuite/docker/docker_build_compose.yaml +++ b/ProductivitySuite/docker_image_build/build.yaml @@ -8,25 +8,25 @@ services: http_proxy: ${http_proxy} https_proxy: ${https_proxy} no_proxy: ${no_proxy} - context: ../../ChatQnA/docker/ + context: ../../ChatQnA/ dockerfile: ./Dockerfile image: ${REGISTRY:-opea}/chatqna:${TAG:-latest} embedding-tei: build: context: GenAIComps - dockerfile: comps/embeddings/langchain/docker/Dockerfile + dockerfile: comps/embeddings/tei/langchain/Dockerfile extends: chatqna image: ${REGISTRY:-opea}/embedding-tei:${TAG:-latest} retriever-redis: build: context: GenAIComps - dockerfile: comps/retrievers/langchain/redis/docker/Dockerfile + dockerfile: comps/retrievers/redis/langchain/Dockerfile extends: chatqna image: ${REGISTRY:-opea}/retriever-redis:${TAG:-latest} reranking-tei: build: context: GenAIComps - dockerfile: comps/reranks/tei/docker/Dockerfile + dockerfile: comps/reranks/tei/Dockerfile extends: chatqna image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest} llm-tgi: @@ -38,24 +38,24 @@ services: dataprep-redis: build: context: GenAIComps - dockerfile: comps/dataprep/redis/langchain/docker/Dockerfile + dockerfile: comps/dataprep/redis/langchain/Dockerfile extends: chatqna image: ${REGISTRY:-opea}/dataprep-redis:${TAG:-latest} promptregistry-mongo-server: build: context: GenAIComps - dockerfile: comps/prompt_registry/mongo/docker/Dockerfile + dockerfile: comps/prompt_registry/mongo/Dockerfile extends: chatqna image: ${REGISTRY:-opea}/promptregistry-mongo-server:${TAG:-latest} chathistory-mongo-server: build: context: GenAIComps - dockerfile: comps/chathistory/mongo/docker/Dockerfile + dockerfile: comps/chathistory/mongo/Dockerfile extends: chatqna image: ${REGISTRY:-opea}/chathistory-mongo-server:${TAG:-latest} productivity-suite-react-ui-server: build: - context: ui + context: ../ui dockerfile: ./docker/Dockerfile.react extends: chatqna image: ${REGISTRY:-opea}/productivity-suite-react-ui-server:${TAG:-latest} @@ -65,7 +65,7 @@ services: http_proxy: ${http_proxy} https_proxy: ${https_proxy} no_proxy: ${no_proxy} - context: ../../CodeGen/docker/ + context: ../../CodeGen/ dockerfile: ./Dockerfile image: ${REGISTRY:-opea}/codegen:${TAG:-latest} docsum: @@ -74,7 +74,7 @@ services: http_proxy: ${http_proxy} https_proxy: ${https_proxy} no_proxy: ${no_proxy} - context: ../../DocSum/docker/ + context: ../../DocSum/ dockerfile: ./Dockerfile image: ${REGISTRY:-opea}/docsum:${TAG:-latest} faqgen: @@ -83,18 +83,18 @@ services: http_proxy: ${http_proxy} https_proxy: ${https_proxy} no_proxy: ${no_proxy} - context: ../../FaqGen/docker/ + context: ../../FaqGen/ dockerfile: ./Dockerfile image: ${REGISTRY:-opea}/faqgen:${TAG:-latest} llm-faqgen-tgi: build: context: GenAIComps - dockerfile: comps/llms/faq-generation/tgi/Dockerfile + dockerfile: comps/llms/faq-generation/tgi/langchain/Dockerfile extends: faqgen image: ${REGISTRY:-opea}/llm-faqgen-tgi:${TAG:-latest} llm-docsum-tgi: build: context: GenAIComps - dockerfile: comps/llms/summarization/tgi/Dockerfile + dockerfile: comps/llms/summarization/tgi/langchain/Dockerfile extends: docsum image: ${REGISTRY:-opea}/llm-docsum-tgi:${TAG:-latest} diff --git a/ProductivitySuite/kubernetes/manifests/README.md b/ProductivitySuite/kubernetes/intel/README.md similarity index 93% rename from ProductivitySuite/kubernetes/manifests/README.md rename to ProductivitySuite/kubernetes/intel/README.md index 11dd0acd9..b0ef3ef14 100644 --- a/ProductivitySuite/kubernetes/manifests/README.md +++ b/ProductivitySuite/kubernetes/intel/README.md @@ -20,7 +20,7 @@ In ProductivitySuite, it consists of following pipelines/examples and components To begin with, ensure that you have following prerequisites in place: 1. Kubernetes installation: Make sure that you have Kubernetes installed. -2. Images: Make sure you have all the images ready for the examples and components stated above. You may refer to [README](../../docker/xeon/README.md) for steps to build the images. +2. Images: Make sure you have all the images ready for the examples and components stated above. You may refer to [README](../../docker_compose/intel/cpu/xeon/README.md) for steps to build the images. 3. Configuration Values: Set the following values in all the yaml files before proceeding with the deployment: a. HUGGINGFACEHUB_API_TOKEN (Your HuggingFace token to download your desired model from HuggingFace): @@ -53,7 +53,7 @@ kubectl apply -f *.yaml ``` ## User Management via Keycloak Configuration -Please refer to [keycloak_setup_guide](../../docker/xeon/keycloak_setup_guide.md) for more detail related to Keycloak configuration setup. +Please refer to [keycloak_setup_guide](../../docker_compose/intel/cpu/xeon/keycloak_setup_guide.md) for more detail related to Keycloak configuration setup. ## Verify Services To verify the installation, run command 'kubectl get pod' to make sure all pods are running. diff --git a/ProductivitySuite/kubernetes/manifests/xeon/chat_history.yaml b/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/chat_history.yaml similarity index 100% rename from ProductivitySuite/kubernetes/manifests/xeon/chat_history.yaml rename to ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/chat_history.yaml diff --git a/ProductivitySuite/kubernetes/manifests/xeon/chatqna.yaml b/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/chatqna.yaml similarity index 100% rename from ProductivitySuite/kubernetes/manifests/xeon/chatqna.yaml rename to ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/chatqna.yaml diff --git a/ProductivitySuite/kubernetes/manifests/xeon/codegen.yaml b/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/codegen.yaml similarity index 100% rename from ProductivitySuite/kubernetes/manifests/xeon/codegen.yaml rename to ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/codegen.yaml diff --git a/ProductivitySuite/kubernetes/manifests/xeon/docsum.yaml b/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/docsum.yaml similarity index 100% rename from ProductivitySuite/kubernetes/manifests/xeon/docsum.yaml rename to ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/docsum.yaml diff --git a/ProductivitySuite/kubernetes/manifests/xeon/faqgen.yaml b/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/faqgen.yaml similarity index 100% rename from ProductivitySuite/kubernetes/manifests/xeon/faqgen.yaml rename to ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/faqgen.yaml diff --git a/ProductivitySuite/kubernetes/manifests/xeon/keycloak_install.yaml b/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/keycloak_install.yaml similarity index 100% rename from ProductivitySuite/kubernetes/manifests/xeon/keycloak_install.yaml rename to ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/keycloak_install.yaml diff --git a/ProductivitySuite/kubernetes/manifests/xeon/mongo.yaml b/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/mongo.yaml similarity index 100% rename from ProductivitySuite/kubernetes/manifests/xeon/mongo.yaml rename to ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/mongo.yaml diff --git a/ProductivitySuite/kubernetes/manifests/xeon/productivity_suite_reactui.yaml b/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/productivity_suite_reactui.yaml similarity index 100% rename from ProductivitySuite/kubernetes/manifests/xeon/productivity_suite_reactui.yaml rename to ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/productivity_suite_reactui.yaml diff --git a/ProductivitySuite/kubernetes/manifests/xeon/prompt_registry.yaml b/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/prompt_registry.yaml similarity index 100% rename from ProductivitySuite/kubernetes/manifests/xeon/prompt_registry.yaml rename to ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/prompt_registry.yaml diff --git a/ProductivitySuite/tests/test_productivitysuite_on_xeon.sh b/ProductivitySuite/tests/test_compose_on_xeon.sh similarity index 97% rename from ProductivitySuite/tests/test_productivitysuite_on_xeon.sh rename to ProductivitySuite/tests/test_compose_on_xeon.sh index ecfa7659c..024ff7a39 100755 --- a/ProductivitySuite/tests/test_productivitysuite_on_xeon.sh +++ b/ProductivitySuite/tests/test_compose_on_xeon.sh @@ -15,11 +15,11 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." - docker compose -f docker_build_compose.yaml build --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.5 docker pull ghcr.io/huggingface/text-generation-inference:2.1.0 @@ -27,7 +27,7 @@ function build_docker_images() { } function start_services() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon/ export EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5" export RERANK_MODEL_ID="BAAI/bge-reranker-base" @@ -332,7 +332,7 @@ function validate_megaservice() { function validate_frontend() { echo "[ TEST INFO ]: --------- frontend test started ---------" - cd $WORKPATH/docker/ui/react + cd $WORKPATH/ui/react local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH # conda remove -n ${conda_env_name} --all -y @@ -356,7 +356,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon/ docker compose stop && docker compose rm -f } diff --git a/ChatQnA/docker/ui/docker/Dockerfile.react b/ProductivitySuite/ui/docker/Dockerfile.react similarity index 100% rename from ChatQnA/docker/ui/docker/Dockerfile.react rename to ProductivitySuite/ui/docker/Dockerfile.react diff --git a/ProductivitySuite/docker/ui/react/.env.production b/ProductivitySuite/ui/react/.env.production similarity index 100% rename from ProductivitySuite/docker/ui/react/.env.production rename to ProductivitySuite/ui/react/.env.production diff --git a/ProductivitySuite/docker/ui/react/.eslintrc.cjs b/ProductivitySuite/ui/react/.eslintrc.cjs similarity index 100% rename from ProductivitySuite/docker/ui/react/.eslintrc.cjs rename to ProductivitySuite/ui/react/.eslintrc.cjs diff --git a/ProductivitySuite/docker/ui/react/.gitignore b/ProductivitySuite/ui/react/.gitignore similarity index 100% rename from ProductivitySuite/docker/ui/react/.gitignore rename to ProductivitySuite/ui/react/.gitignore diff --git a/ProductivitySuite/docker/ui/react/README.md b/ProductivitySuite/ui/react/README.md similarity index 84% rename from ProductivitySuite/docker/ui/react/README.md rename to ProductivitySuite/ui/react/README.md index 97fae9be1..c7b6d0b93 100644 --- a/ProductivitySuite/docker/ui/react/README.md +++ b/ProductivitySuite/ui/react/README.md @@ -2,8 +2,8 @@ ## 📸 Project Screenshots -![project-screenshot](../../../assets/img/chat_qna_init.png) -![project-screenshot](../../../assets/img/Login_page.png) +![project-screenshot](../../assets/img/chat_qna_init.png) +![project-screenshot](../../assets/img/Login_page.png) ## 🧐 Features @@ -21,7 +21,7 @@ Here're some of the project's features: ##### Screen Shot -![project-screenshot](../../../assets/img/data_source.png) +![project-screenshot](../../assets/img/data_source.png) - Clear: Clear the record of the current dialog box without retaining the contents of the dialog box. - Chat history: Historical chat records can still be retained after refreshing, making it easier for users to view the context. @@ -29,15 +29,15 @@ Here're some of the project's features: ##### Screen Shots -![project-screenshot](../../../assets/img/chat_qna_init.png) -![project-screenshot](../../../assets/img/chatqna_with_conversation.png) +![project-screenshot](../../assets/img/chat_qna_init.png) +![project-screenshot](../../assets/img/chatqna_with_conversation.png) ### CODEGEN - Generate code: generate the corresponding code based on the current user's input. Screen Shot - ![project-screenshot](../../../assets/img/codegen.png) + ![project-screenshot](../../assets/img/codegen.png) ### DOC SUMMARY @@ -47,8 +47,8 @@ Here're some of the project's features: #### Screen Shot -![project-screenshot](../../../assets/img/doc_summary_paste.png) -![project-screenshot](../../../assets/img/doc_summary_file.png) +![project-screenshot](../../assets/img/doc_summary_paste.png) +![project-screenshot](../../assets/img/doc_summary_file.png) ### FAQ Generator @@ -58,7 +58,7 @@ Here're some of the project's features: #### Screen Shot -![project-screenshot](../../../assets/img/faq_generator.png) +![project-screenshot](../../assets/img/faq_generator.png) ## 🛠️ Get it Running diff --git a/ProductivitySuite/docker/ui/react/env.sh b/ProductivitySuite/ui/react/env.sh similarity index 100% rename from ProductivitySuite/docker/ui/react/env.sh rename to ProductivitySuite/ui/react/env.sh diff --git a/ProductivitySuite/docker/ui/react/index.html b/ProductivitySuite/ui/react/index.html similarity index 100% rename from ProductivitySuite/docker/ui/react/index.html rename to ProductivitySuite/ui/react/index.html diff --git a/ProductivitySuite/docker/ui/react/nginx.conf b/ProductivitySuite/ui/react/nginx.conf similarity index 100% rename from ProductivitySuite/docker/ui/react/nginx.conf rename to ProductivitySuite/ui/react/nginx.conf diff --git a/ProductivitySuite/docker/ui/react/package.json b/ProductivitySuite/ui/react/package.json similarity index 100% rename from ProductivitySuite/docker/ui/react/package.json rename to ProductivitySuite/ui/react/package.json diff --git a/ProductivitySuite/docker/ui/react/postcss.config.cjs b/ProductivitySuite/ui/react/postcss.config.cjs similarity index 100% rename from ProductivitySuite/docker/ui/react/postcss.config.cjs rename to ProductivitySuite/ui/react/postcss.config.cjs diff --git a/ProductivitySuite/docker/ui/react/src/App.scss b/ProductivitySuite/ui/react/src/App.scss similarity index 100% rename from ProductivitySuite/docker/ui/react/src/App.scss rename to ProductivitySuite/ui/react/src/App.scss diff --git a/ProductivitySuite/docker/ui/react/src/App.tsx b/ProductivitySuite/ui/react/src/App.tsx similarity index 100% rename from ProductivitySuite/docker/ui/react/src/App.tsx rename to ProductivitySuite/ui/react/src/App.tsx diff --git a/ProductivitySuite/docker/ui/react/src/__tests__/util.test.ts b/ProductivitySuite/ui/react/src/__tests__/util.test.ts similarity index 100% rename from ProductivitySuite/docker/ui/react/src/__tests__/util.test.ts rename to ProductivitySuite/ui/react/src/__tests__/util.test.ts diff --git a/ProductivitySuite/docker/ui/react/src/assets/opea-icon-black.svg b/ProductivitySuite/ui/react/src/assets/opea-icon-black.svg similarity index 100% rename from ProductivitySuite/docker/ui/react/src/assets/opea-icon-black.svg rename to ProductivitySuite/ui/react/src/assets/opea-icon-black.svg diff --git a/ProductivitySuite/docker/ui/react/src/assets/opea-icon-color.svg b/ProductivitySuite/ui/react/src/assets/opea-icon-color.svg similarity index 100% rename from ProductivitySuite/docker/ui/react/src/assets/opea-icon-color.svg rename to ProductivitySuite/ui/react/src/assets/opea-icon-color.svg diff --git a/ProductivitySuite/docker/ui/react/src/assets/react.svg b/ProductivitySuite/ui/react/src/assets/react.svg similarity index 100% rename from ProductivitySuite/docker/ui/react/src/assets/react.svg rename to ProductivitySuite/ui/react/src/assets/react.svg diff --git a/ProductivitySuite/docker/ui/react/src/common/client.ts b/ProductivitySuite/ui/react/src/common/client.ts similarity index 100% rename from ProductivitySuite/docker/ui/react/src/common/client.ts rename to ProductivitySuite/ui/react/src/common/client.ts diff --git a/ProductivitySuite/docker/ui/react/src/common/util.ts b/ProductivitySuite/ui/react/src/common/util.ts similarity index 100% rename from ProductivitySuite/docker/ui/react/src/common/util.ts rename to ProductivitySuite/ui/react/src/common/util.ts diff --git a/ProductivitySuite/docker/ui/react/src/components/CodeGen/CodeGen.tsx b/ProductivitySuite/ui/react/src/components/CodeGen/CodeGen.tsx similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/CodeGen/CodeGen.tsx rename to ProductivitySuite/ui/react/src/components/CodeGen/CodeGen.tsx diff --git a/ProductivitySuite/docker/ui/react/src/components/CodeGen/codeGen.module.scss b/ProductivitySuite/ui/react/src/components/CodeGen/codeGen.module.scss similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/CodeGen/codeGen.module.scss rename to ProductivitySuite/ui/react/src/components/CodeGen/codeGen.module.scss diff --git a/ProductivitySuite/docker/ui/react/src/components/Conversation/Conversation.tsx b/ProductivitySuite/ui/react/src/components/Conversation/Conversation.tsx similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/Conversation/Conversation.tsx rename to ProductivitySuite/ui/react/src/components/Conversation/Conversation.tsx diff --git a/ProductivitySuite/docker/ui/react/src/components/Conversation/ConversationSideBar.tsx b/ProductivitySuite/ui/react/src/components/Conversation/ConversationSideBar.tsx similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/Conversation/ConversationSideBar.tsx rename to ProductivitySuite/ui/react/src/components/Conversation/ConversationSideBar.tsx diff --git a/ProductivitySuite/docker/ui/react/src/components/Conversation/DataSource.tsx b/ProductivitySuite/ui/react/src/components/Conversation/DataSource.tsx similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/Conversation/DataSource.tsx rename to ProductivitySuite/ui/react/src/components/Conversation/DataSource.tsx diff --git a/ProductivitySuite/docker/ui/react/src/components/Conversation/PromptTemplate.tsx b/ProductivitySuite/ui/react/src/components/Conversation/PromptTemplate.tsx similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/Conversation/PromptTemplate.tsx rename to ProductivitySuite/ui/react/src/components/Conversation/PromptTemplate.tsx diff --git a/ProductivitySuite/docker/ui/react/src/components/Conversation/conversation.module.scss b/ProductivitySuite/ui/react/src/components/Conversation/conversation.module.scss similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/Conversation/conversation.module.scss rename to ProductivitySuite/ui/react/src/components/Conversation/conversation.module.scss diff --git a/ProductivitySuite/docker/ui/react/src/components/Conversation/dataSource.module.scss b/ProductivitySuite/ui/react/src/components/Conversation/dataSource.module.scss similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/Conversation/dataSource.module.scss rename to ProductivitySuite/ui/react/src/components/Conversation/dataSource.module.scss diff --git a/ProductivitySuite/docker/ui/react/src/components/Conversation/promptTemplate.module.scss b/ProductivitySuite/ui/react/src/components/Conversation/promptTemplate.module.scss similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/Conversation/promptTemplate.module.scss rename to ProductivitySuite/ui/react/src/components/Conversation/promptTemplate.module.scss diff --git a/ProductivitySuite/docker/ui/react/src/components/Conversation/settings.tsx b/ProductivitySuite/ui/react/src/components/Conversation/settings.tsx similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/Conversation/settings.tsx rename to ProductivitySuite/ui/react/src/components/Conversation/settings.tsx diff --git a/ProductivitySuite/docker/ui/react/src/components/DocSum/DocSum.tsx b/ProductivitySuite/ui/react/src/components/DocSum/DocSum.tsx similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/DocSum/DocSum.tsx rename to ProductivitySuite/ui/react/src/components/DocSum/DocSum.tsx diff --git a/ProductivitySuite/docker/ui/react/src/components/DocSum/FileUpload.tsx b/ProductivitySuite/ui/react/src/components/DocSum/FileUpload.tsx similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/DocSum/FileUpload.tsx rename to ProductivitySuite/ui/react/src/components/DocSum/FileUpload.tsx diff --git a/ProductivitySuite/docker/ui/react/src/components/DocSum/docSum.module.scss b/ProductivitySuite/ui/react/src/components/DocSum/docSum.module.scss similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/DocSum/docSum.module.scss rename to ProductivitySuite/ui/react/src/components/DocSum/docSum.module.scss diff --git a/ProductivitySuite/docker/ui/react/src/components/FaqGen/FaqGen.tsx b/ProductivitySuite/ui/react/src/components/FaqGen/FaqGen.tsx similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/FaqGen/FaqGen.tsx rename to ProductivitySuite/ui/react/src/components/FaqGen/FaqGen.tsx diff --git a/ProductivitySuite/docker/ui/react/src/components/FaqGen/FileUpload.tsx b/ProductivitySuite/ui/react/src/components/FaqGen/FileUpload.tsx similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/FaqGen/FileUpload.tsx rename to ProductivitySuite/ui/react/src/components/FaqGen/FileUpload.tsx diff --git a/ProductivitySuite/docker/ui/react/src/components/FaqGen/faqGen.module.scss b/ProductivitySuite/ui/react/src/components/FaqGen/faqGen.module.scss similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/FaqGen/faqGen.module.scss rename to ProductivitySuite/ui/react/src/components/FaqGen/faqGen.module.scss diff --git a/ProductivitySuite/docker/ui/react/src/components/Message/conversationMessage.module.scss b/ProductivitySuite/ui/react/src/components/Message/conversationMessage.module.scss similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/Message/conversationMessage.module.scss rename to ProductivitySuite/ui/react/src/components/Message/conversationMessage.module.scss diff --git a/ProductivitySuite/docker/ui/react/src/components/Message/conversationMessage.tsx b/ProductivitySuite/ui/react/src/components/Message/conversationMessage.tsx similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/Message/conversationMessage.tsx rename to ProductivitySuite/ui/react/src/components/Message/conversationMessage.tsx diff --git a/ProductivitySuite/docker/ui/react/src/components/Shared/CodeRender/CodeRender.tsx b/ProductivitySuite/ui/react/src/components/Shared/CodeRender/CodeRender.tsx similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/Shared/CodeRender/CodeRender.tsx rename to ProductivitySuite/ui/react/src/components/Shared/CodeRender/CodeRender.tsx diff --git a/ProductivitySuite/docker/ui/react/src/components/Shared/CodeRender/codeRender.module.scss b/ProductivitySuite/ui/react/src/components/Shared/CodeRender/codeRender.module.scss similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/Shared/CodeRender/codeRender.module.scss rename to ProductivitySuite/ui/react/src/components/Shared/CodeRender/codeRender.module.scss diff --git a/ProductivitySuite/docker/ui/react/src/components/Shared/Markdown/Markdown.tsx b/ProductivitySuite/ui/react/src/components/Shared/Markdown/Markdown.tsx similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/Shared/Markdown/Markdown.tsx rename to ProductivitySuite/ui/react/src/components/Shared/Markdown/Markdown.tsx diff --git a/ProductivitySuite/docker/ui/react/src/components/Shared/Markdown/markdown.module.scss b/ProductivitySuite/ui/react/src/components/Shared/Markdown/markdown.module.scss similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/Shared/Markdown/markdown.module.scss rename to ProductivitySuite/ui/react/src/components/Shared/Markdown/markdown.module.scss diff --git a/ProductivitySuite/docker/ui/react/src/components/sidebar/sidebar.module.scss b/ProductivitySuite/ui/react/src/components/sidebar/sidebar.module.scss similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/sidebar/sidebar.module.scss rename to ProductivitySuite/ui/react/src/components/sidebar/sidebar.module.scss diff --git a/ProductivitySuite/docker/ui/react/src/components/sidebar/sidebar.tsx b/ProductivitySuite/ui/react/src/components/sidebar/sidebar.tsx similarity index 100% rename from ProductivitySuite/docker/ui/react/src/components/sidebar/sidebar.tsx rename to ProductivitySuite/ui/react/src/components/sidebar/sidebar.tsx diff --git a/ProductivitySuite/docker/ui/react/src/config.ts b/ProductivitySuite/ui/react/src/config.ts similarity index 100% rename from ProductivitySuite/docker/ui/react/src/config.ts rename to ProductivitySuite/ui/react/src/config.ts diff --git a/ProductivitySuite/docker/ui/react/src/index.scss b/ProductivitySuite/ui/react/src/index.scss similarity index 100% rename from ProductivitySuite/docker/ui/react/src/index.scss rename to ProductivitySuite/ui/react/src/index.scss diff --git a/ProductivitySuite/docker/ui/react/src/keycloack.ts b/ProductivitySuite/ui/react/src/keycloack.ts similarity index 100% rename from ProductivitySuite/docker/ui/react/src/keycloack.ts rename to ProductivitySuite/ui/react/src/keycloack.ts diff --git a/ProductivitySuite/docker/ui/react/src/main.tsx b/ProductivitySuite/ui/react/src/main.tsx similarity index 100% rename from ProductivitySuite/docker/ui/react/src/main.tsx rename to ProductivitySuite/ui/react/src/main.tsx diff --git a/ProductivitySuite/docker/ui/react/src/redux/Conversation/Conversation.ts b/ProductivitySuite/ui/react/src/redux/Conversation/Conversation.ts similarity index 100% rename from ProductivitySuite/docker/ui/react/src/redux/Conversation/Conversation.ts rename to ProductivitySuite/ui/react/src/redux/Conversation/Conversation.ts diff --git a/ProductivitySuite/docker/ui/react/src/redux/Conversation/ConversationSlice.ts b/ProductivitySuite/ui/react/src/redux/Conversation/ConversationSlice.ts similarity index 100% rename from ProductivitySuite/docker/ui/react/src/redux/Conversation/ConversationSlice.ts rename to ProductivitySuite/ui/react/src/redux/Conversation/ConversationSlice.ts diff --git a/ProductivitySuite/docker/ui/react/src/redux/Prompt/PromptSlice.ts b/ProductivitySuite/ui/react/src/redux/Prompt/PromptSlice.ts similarity index 100% rename from ProductivitySuite/docker/ui/react/src/redux/Prompt/PromptSlice.ts rename to ProductivitySuite/ui/react/src/redux/Prompt/PromptSlice.ts diff --git a/ProductivitySuite/docker/ui/react/src/redux/User/user.d.ts b/ProductivitySuite/ui/react/src/redux/User/user.d.ts similarity index 100% rename from ProductivitySuite/docker/ui/react/src/redux/User/user.d.ts rename to ProductivitySuite/ui/react/src/redux/User/user.d.ts diff --git a/ProductivitySuite/docker/ui/react/src/redux/User/userSlice.ts b/ProductivitySuite/ui/react/src/redux/User/userSlice.ts similarity index 100% rename from ProductivitySuite/docker/ui/react/src/redux/User/userSlice.ts rename to ProductivitySuite/ui/react/src/redux/User/userSlice.ts diff --git a/ProductivitySuite/docker/ui/react/src/redux/store.ts b/ProductivitySuite/ui/react/src/redux/store.ts similarity index 100% rename from ProductivitySuite/docker/ui/react/src/redux/store.ts rename to ProductivitySuite/ui/react/src/redux/store.ts diff --git a/ProductivitySuite/docker/ui/react/src/redux/thunkUtil.ts b/ProductivitySuite/ui/react/src/redux/thunkUtil.ts similarity index 100% rename from ProductivitySuite/docker/ui/react/src/redux/thunkUtil.ts rename to ProductivitySuite/ui/react/src/redux/thunkUtil.ts diff --git a/ProductivitySuite/docker/ui/react/src/styles/components/_sidebar.scss b/ProductivitySuite/ui/react/src/styles/components/_sidebar.scss similarity index 100% rename from ProductivitySuite/docker/ui/react/src/styles/components/_sidebar.scss rename to ProductivitySuite/ui/react/src/styles/components/_sidebar.scss diff --git a/ProductivitySuite/docker/ui/react/src/styles/components/content.scss b/ProductivitySuite/ui/react/src/styles/components/content.scss similarity index 100% rename from ProductivitySuite/docker/ui/react/src/styles/components/content.scss rename to ProductivitySuite/ui/react/src/styles/components/content.scss diff --git a/ProductivitySuite/docker/ui/react/src/styles/components/context.module.scss b/ProductivitySuite/ui/react/src/styles/components/context.module.scss similarity index 100% rename from ProductivitySuite/docker/ui/react/src/styles/components/context.module.scss rename to ProductivitySuite/ui/react/src/styles/components/context.module.scss diff --git a/ProductivitySuite/docker/ui/react/src/styles/layout/_basics.scss b/ProductivitySuite/ui/react/src/styles/layout/_basics.scss similarity index 100% rename from ProductivitySuite/docker/ui/react/src/styles/layout/_basics.scss rename to ProductivitySuite/ui/react/src/styles/layout/_basics.scss diff --git a/ProductivitySuite/docker/ui/react/src/styles/layout/_flex.scss b/ProductivitySuite/ui/react/src/styles/layout/_flex.scss similarity index 100% rename from ProductivitySuite/docker/ui/react/src/styles/layout/_flex.scss rename to ProductivitySuite/ui/react/src/styles/layout/_flex.scss diff --git a/ProductivitySuite/docker/ui/react/src/styles/styles.scss b/ProductivitySuite/ui/react/src/styles/styles.scss similarity index 100% rename from ProductivitySuite/docker/ui/react/src/styles/styles.scss rename to ProductivitySuite/ui/react/src/styles/styles.scss diff --git a/ProductivitySuite/docker/ui/react/src/vite-env.d.ts b/ProductivitySuite/ui/react/src/vite-env.d.ts similarity index 100% rename from ProductivitySuite/docker/ui/react/src/vite-env.d.ts rename to ProductivitySuite/ui/react/src/vite-env.d.ts diff --git a/ProductivitySuite/docker/ui/react/tsconfig.json b/ProductivitySuite/ui/react/tsconfig.json similarity index 100% rename from ProductivitySuite/docker/ui/react/tsconfig.json rename to ProductivitySuite/ui/react/tsconfig.json diff --git a/ProductivitySuite/docker/ui/react/tsconfig.node.json b/ProductivitySuite/ui/react/tsconfig.node.json similarity index 100% rename from ProductivitySuite/docker/ui/react/tsconfig.node.json rename to ProductivitySuite/ui/react/tsconfig.node.json diff --git a/ProductivitySuite/docker/ui/react/vite.config.ts b/ProductivitySuite/ui/react/vite.config.ts similarity index 100% rename from ProductivitySuite/docker/ui/react/vite.config.ts rename to ProductivitySuite/ui/react/vite.config.ts diff --git a/README.md b/README.md index 419e60584..971ac85a9 100644 --- a/README.md +++ b/README.md @@ -37,17 +37,17 @@ Deployment are based on released docker images by default, check [docker image l #### Deploy Examples -| Use Case | Docker Compose
Deployment on Xeon | Docker Compose
Deployment on Gaudi | Kubernetes with Manifests | Kubernetes with Helm Charts | Kubernetes with GMC | -| ----------- | ------------------------------------------------------ | -------------------------------------------------------- | -------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------- | -| ChatQnA | [Xeon Instructions](ChatQnA/docker/xeon/README.md) | [Gaudi Instructions](ChatQnA/docker/gaudi/README.md) | [ChatQnA with Manifests](ChatQnA/kubernetes/manifests/README.md) | [ChatQnA with Helm Charts](https://github.com/opea-project/GenAIInfra/tree/main/helm-charts/chatqna/README.md) | [ChatQnA with GMC](ChatQnA/kubernetes/README.md) | -| CodeGen | [Xeon Instructions](CodeGen/docker/xeon/README.md) | [Gaudi Instructions](CodeGen/docker/gaudi/README.md) | [CodeGen with Manifests](CodeGen/kubernetes/manifests/README.md) | [CodeGen with Helm Charts](https://github.com/opea-project/GenAIInfra/tree/main/helm-charts/codegen/README.md) | [CodeGen with GMC](CodeGen/kubernetes/README.md) | -| CodeTrans | [Xeon Instructions](CodeTrans/docker/xeon/README.md) | [Gaudi Instructions](CodeTrans/docker/gaudi/README.md) | [CodeTrans with Manifests](CodeTrans/kubernetes/manifests/README.md) | [CodeTrans with Helm Charts](https://github.com/opea-project/GenAIInfra/tree/main/helm-charts/codetrans/README.md) | [CodeTrans with GMC](CodeTrans/kubernetes/README.md) | -| DocSum | [Xeon Instructions](DocSum/docker/xeon/README.md) | [Gaudi Instructions](DocSum/docker/gaudi/README.md) | [DocSum with Manifests](DocSum/kubernetes/manifests/README.md) | [DocSum with Helm Charts](https://github.com/opea-project/GenAIInfra/tree/main/helm-charts/docsum/README.md) | [DocSum with GMC](DocSum/kubernetes/README.md) | -| SearchQnA | [Xeon Instructions](SearchQnA/docker/xeon/README.md) | [Gaudi Instructions](SearchQnA/docker/gaudi/README.md) | Not Supported | Not Supported | [SearchQnA with GMC](SearchQnA/kubernetes/README.md) | -| FaqGen | [Xeon Instructions](FaqGen/docker/xeon/README.md) | [Gaudi Instructions](FaqGen/docker/gaudi/README.md) | [FaqGen with Manifests](FaqGen/kubernetes/manifests/README.md) | Not Supported | [FaqGen with GMC](FaqGen/kubernetes/README.md) | -| Translation | [Xeon Instructions](Translation/docker/xeon/README.md) | [Gaudi Instructions](Translation/docker/gaudi/README.md) | Not Supported | Not Supported | [Translation with GMC](Translation/kubernetes/README.md) | -| AudioQnA | [Xeon Instructions](AudioQnA/docker/xeon/README.md) | [Gaudi Instructions](AudioQnA/docker/gaudi/README.md) | [AudioQnA with Manifests](AudioQnA/kubernetes/manifests/README.md) | Not Supported | [AudioQnA with GMC](AudioQnA/kubernetes/README.md) | -| VisualQnA | [Xeon Instructions](VisualQnA/docker/xeon/README.md) | [Gaudi Instructions](VisualQnA/docker/gaudi/README.md) | [VisualQnA with Manifests](VisualQnA/kubernetes/manifests/README.md) | Not Supported | [VisualQnA with GMC](VisualQnA/kubernetes/README.md) | +| Use Case | Docker Compose
Deployment on Xeon | Docker Compose
Deployment on Gaudi | Kubernetes with GMC | Kubernetes with Manifests | Kubernetes with Helm Charts | +| ----------- | ------------------------------------------------------------------------ | -------------------------------------------------------------------------- | -------------------------------------------------------- | -------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ | +| ChatQnA | [Xeon Instructions](ChatQnA/docker_compose/intel/cpu/xeon/README.md) | [Gaudi Instructions](ChatQnA/docker_compose/intel/hpu/gaudi/README.md) | [ChatQnA with GMC](ChatQnA/kubernetes/README.md) | [ChatQnA with Manifests](ChatQnA/kubernetes/manifests/README.md) | [ChatQnA with Helm Charts](https://github.com/opea-project/GenAIInfra/tree/main/helm-charts/chatqna/README.md) | +| CodeGen | [Xeon Instructions](CodeGen/docker_compose/intel/cpu/xeon/README.md) | [Gaudi Instructions](CodeGen/docker_compose/intel/hpu/gaudi/README.md) | [CodeGen with GMC](CodeGen/kubernetes/README.md) | [CodeGen with Manifests](CodeGen/kubernetes/manifests/README.md) | [CodeGen with Helm Charts](https://github.com/opea-project/GenAIInfra/tree/main/helm-charts/codegen/README.md) | +| CodeTrans | [Xeon Instructions](CodeTrans/docker_compose/intel/cpu/xeon/README.md) | [Gaudi Instructions](CodeTrans/docker_compose/intel/hpu/gaudi/README.md) | [CodeTrans with GMC](CodeTrans/kubernetes/README.md) | [CodeTrans with Manifests](CodeTrans/kubernetes/manifests/README.md) | [CodeTrans with Helm Charts](https://github.com/opea-project/GenAIInfra/tree/main/helm-charts/codetrans/README.md) | +| DocSum | [Xeon Instructions](DocSum/docker_compose/intel/cpu/xeon/README.md) | [Gaudi Instructions](DocSum/docker_compose/intel/hpu/gaudi/README.md) | [DocSum with GMC](DocSum/kubernetes/README.md) | [DocSum with Manifests](DocSum/kubernetes/manifests/README.md) | [DocSum with Helm Charts](https://github.com/opea-project/GenAIInfra/tree/main/helm-charts/docsum/README.md) | +| SearchQnA | [Xeon Instructions](SearchQnA/docker_compose/intel/cpu/xeon/README.md) | [Gaudi Instructions](SearchQnA/docker_compose/intel/hpu/gaudi/README.md) | [SearchQnA with GMC](SearchQnA/kubernetes/README.md) | Not Supported | Not Supported | +| FaqGen | [Xeon Instructions](FaqGen/docker_compose/intel/cpu/xeon/README.md) | [Gaudi Instructions](FaqGen/docker_compose/intel/hpu/gaudi/README.md) | [FaqGen with GMC](FaqGen/kubernetes/README.md) | [FaqGen with Manifests](FaqGen/kubernetes/manifests/README.md) | Not Supported | +| Translation | [Xeon Instructions](Translation/docker_compose/intel/cpu/xeon/README.md) | [Gaudi Instructions](Translation/docker_compose/intel/hpu/gaudi/README.md) | [Translation with GMC](Translation/kubernetes/README.md) | Not Supported | Not Supported | +| AudioQnA | [Xeon Instructions](AudioQnA/docker_compose/intel/cpu/xeon/README.md) | [Gaudi Instructions](AudioQnA/docker_compose/intel/hpu/gaudi/README.md) | [AudioQnA with GMC](AudioQnA/kubernetes/README.md) | [AudioQnA with Manifests](AudioQnA/kubernetes/manifests/README.md) | Not Supported | +| VisualQnA | [Xeon Instructions](VisualQnA/docker_compose/intel/cpu/xeon/README.md) | [Gaudi Instructions](VisualQnA/docker_compose/intel/hpu/gaudi/README.md) | [VisualQnA with GMC](VisualQnA/kubernetes/README.md) | [VisualQnA with Manifests](VisualQnA/kubernetes/manifests/README.md) | Not Supported | ## Supported Examples diff --git a/RerankFinetuning/docker/xeon/README.md b/RerankFinetuning/docker_compose/intel/cpu/xeon/README.md similarity index 95% rename from RerankFinetuning/docker/xeon/README.md rename to RerankFinetuning/docker_compose/intel/cpu/xeon/README.md index 99d3a643b..ffd5947c4 100644 --- a/RerankFinetuning/docker/xeon/README.md +++ b/RerankFinetuning/docker_compose/intel/cpu/xeon/README.md @@ -19,7 +19,7 @@ Build docker image with below command: ```bash export HF_TOKEN=${your_huggingface_token} -docker build -t opea/finetuning:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy --build-arg HF_TOKEN=$HF_TOKEN -f comps/finetuning/docker/Dockerfile_cpu . +docker build -t opea/finetuning:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy --build-arg HF_TOKEN=$HF_TOKEN -f comps/finetuning/Dockerfile . ``` ### 3. Run Docker with CLI diff --git a/RerankFinetuning/tests/test_rerank_finetuning_on_xeon.sh b/RerankFinetuning/tests/test_compose_on_xeon.sh similarity index 96% rename from RerankFinetuning/tests/test_rerank_finetuning_on_xeon.sh rename to RerankFinetuning/tests/test_compose_on_xeon.sh index 0339b8b5b..1824771a1 100644 --- a/RerankFinetuning/tests/test_rerank_finetuning_on_xeon.sh +++ b/RerankFinetuning/tests/test_compose_on_xeon.sh @@ -2,7 +2,7 @@ # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -set -x +set -ex WORKPATH=$(dirname "$PWD") LOG_PATH="$WORKPATH/tests" @@ -13,13 +13,8 @@ ray_port=8265 function build_docker_images() { cd $WORKPATH echo $(pwd) - docker build -t opea/finetuning:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy --build-arg HF_TOKEN=$HF_TOKEN -f comps/finetuning/docker/Dockerfile_cpu . - if [ $? -ne 0 ]; then - echo "opea/finetuning built fail" - exit 1 - else - echo "opea/finetuning built successful" - fi + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" + docker build -t opea/finetuning:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy --build-arg HF_TOKEN=$HF_TOKEN -f comps/finetuning/Dockerfile . } function start_service() { diff --git a/SearchQnA/docker/Dockerfile b/SearchQnA/Dockerfile similarity index 100% rename from SearchQnA/docker/Dockerfile rename to SearchQnA/Dockerfile diff --git a/SearchQnA/README.md b/SearchQnA/README.md index 1b83f664d..18b7ea689 100644 --- a/SearchQnA/README.md +++ b/SearchQnA/README.md @@ -65,27 +65,27 @@ To set up environment variables for deploying SearchQnA services, follow these s ### Deploy SearchQnA on Gaudi -If your version of `Habana Driver` < 1.16.0 (check with `hl-smi`), run the following command directly to start SearchQnA services. Find the corresponding [compose.yaml](./docker/gaudi/compose.yaml). +If your version of `Habana Driver` < 1.16.0 (check with `hl-smi`), run the following command directly to start SearchQnA services. Find the corresponding [compose.yaml](./docker_compose/intel/hpu/gaudi/compose.yaml). ```bash -cd GenAIExamples/SearchQnA/docker/gaudi/ +cd GenAIExamples/SearchQnA/docker_compose/intel/hpu/gaudi/ docker compose up -d ``` > Notice: Currently only the **Habana Driver 1.16.x** is supported for Gaudi. -Refer to the [Gaudi Guide](./docker/gaudi/README.md) to build docker images from source. +Refer to the [Gaudi Guide](./docker_compose/intel/hpu/gaudi/README.md) to build docker images from source. ### Deploy SearchQnA on Xeon -Find the corresponding [compose.yaml](./docker/xeon/compose.yaml). +Find the corresponding [compose.yaml](./docker_compose/intel/cpu/xeon/compose.yaml). ```bash -cd GenAIExamples/SearchQnA/docker/xeon/ +cd GenAIExamples/SearchQnA/docker_compose/intel/cpu/xeon/ docker compose up -d ``` -Refer to the [Xeon Guide](./docker/xeon/README.md) for more instructions on building docker images from source. +Refer to the [Xeon Guide](./docker_compose/intel/cpu/xeon/README.md) for more instructions on building docker images from source. ## Consume SearchQnA Service @@ -110,7 +110,7 @@ Two ways of consuming SearchQnA Service: ## Troubleshooting -1. If you get errors like "Access Denied", [validate micro service](https://github.com/opea-project/GenAIExamples/tree/main/ChatQnA/docker/xeon#validate-microservices) first. A simple example: +1. If you get errors like "Access Denied", [validate micro service](https://github.com/opea-project/GenAIExamples/tree/main/ChatQnA/docker_compose/intel/cpu/xeon#validate-microservices) first. A simple example: ```bash http_proxy="" diff --git a/SearchQnA/docker/xeon/README.md b/SearchQnA/docker_compose/intel/cpu/xeon/README.md similarity index 95% rename from SearchQnA/docker/xeon/README.md rename to SearchQnA/docker_compose/intel/cpu/xeon/README.md index 54068905d..8b45cf589 100644 --- a/SearchQnA/docker/xeon/README.md +++ b/SearchQnA/docker_compose/intel/cpu/xeon/README.md @@ -14,19 +14,19 @@ cd GenAIComps ### 2. Build Embedding Image ```bash -docker build --no-cache -t opea/embedding-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/langchain/docker/Dockerfile . +docker build --no-cache -t opea/embedding-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/tei/langchain/Dockerfile . ``` ### 3. Build Retriever Image ```bash -docker build --no-cache -t opea/web-retriever-chroma:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/web_retrievers/langchain/chroma/docker/Dockerfile . +docker build --no-cache -t opea/web-retriever-chroma:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/web_retrievers/chroma/langchain/Dockerfile . ``` ### 4. Build Rerank Image ```bash -docker build --no-cache -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/tei/docker/Dockerfile . +docker build --no-cache -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/tei/Dockerfile . ``` ### 5. Build LLM Image @@ -41,7 +41,7 @@ To construct the Mega Service, we utilize the [GenAIComps](https://github.com/op ```bash git clone https://github.com/opea-project/GenAIExamples.git -cd GenAIExamples/SearchQnA/docker +cd GenAIExamples/SearchQnA docker build --no-cache -t opea/searchqna:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile . cd ../../.. ``` @@ -87,7 +87,7 @@ export LLM_SERVICE_PORT=3007 ## 🚀 Start the MegaService ```bash -cd GenAIExamples/SearchQnA/docker/xeon/ +cd GenAIExamples/SearchQnA/docker_compose/intel/cpu/xeon docker compose up -d ``` diff --git a/SearchQnA/docker/xeon/compose.yaml b/SearchQnA/docker_compose/intel/cpu/xeon/compose.yaml similarity index 100% rename from SearchQnA/docker/xeon/compose.yaml rename to SearchQnA/docker_compose/intel/cpu/xeon/compose.yaml diff --git a/SearchQnA/docker/gaudi/README.md b/SearchQnA/docker_compose/intel/hpu/gaudi/README.md similarity index 96% rename from SearchQnA/docker/gaudi/README.md rename to SearchQnA/docker_compose/intel/hpu/gaudi/README.md index 765ec1618..9a7ce6a2e 100644 --- a/SearchQnA/docker/gaudi/README.md +++ b/SearchQnA/docker_compose/intel/hpu/gaudi/README.md @@ -16,19 +16,19 @@ cd GenAIComps ### 2. Build Embedding Image ```bash -docker build --no-cache -t opea/embedding-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/langchain/docker/Dockerfile . +docker build --no-cache -t opea/embedding-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/embeddings/tei/langchain/Dockerfile . ``` ### 3. Build Retriever Image ```bash -docker build --no-cache -t opea/web-retriever-chroma:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/web_retrievers/langchain/chroma/docker/Dockerfile . +docker build --no-cache -t opea/web-retriever-chroma:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/web_retrievers/chroma/langchain/Dockerfile . ``` ### 4. Build Rerank Image ```bash -docker build --no-cache -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/tei/docker/Dockerfile . +docker build --no-cache -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/tei/Dockerfile . ``` ### 5. Build LLM Image @@ -108,7 +108,7 @@ export LLM_SERVICE_PORT=3007 ## 🚀 Start the MegaService ```bash -cd GenAIExamples/SearchQnA/docker/gaudi/ +cd GenAIExamples/SearchQnA/docker_compose/intel/hpu/gaudi/ docker compose up -d ``` diff --git a/SearchQnA/docker/gaudi/compose.yaml b/SearchQnA/docker_compose/intel/hpu/gaudi/compose.yaml similarity index 100% rename from SearchQnA/docker/gaudi/compose.yaml rename to SearchQnA/docker_compose/intel/hpu/gaudi/compose.yaml diff --git a/SearchQnA/docker/docker_build_compose.yaml b/SearchQnA/docker_image_build/build.yaml similarity index 85% rename from SearchQnA/docker/docker_build_compose.yaml rename to SearchQnA/docker_image_build/build.yaml index a31edd343..e94e9cf4b 100644 --- a/SearchQnA/docker/docker_build_compose.yaml +++ b/SearchQnA/docker_image_build/build.yaml @@ -8,30 +8,31 @@ services: http_proxy: ${http_proxy} https_proxy: ${https_proxy} no_proxy: ${no_proxy} + context: ../ dockerfile: ./Dockerfile image: ${REGISTRY:-opea}/searchqna:${TAG:-latest} searchqna-ui: build: - context: ui + context: ../ui dockerfile: ./docker/Dockerfile extends: searchqna image: ${REGISTRY:-opea}/searchqna-ui:${TAG:-latest} embedding-tei: build: context: GenAIComps - dockerfile: comps/embeddings/langchain/docker/Dockerfile + dockerfile: comps/embeddings/tei/langchain/Dockerfile extends: searchqna image: ${REGISTRY:-opea}/embedding-tei:${TAG:-latest} web-retriever-chroma: build: context: GenAIComps - dockerfile: comps/web_retrievers/langchain/chroma/docker/Dockerfile + dockerfile: comps/web_retrievers/chroma/langchain/Dockerfile extends: searchqna image: ${REGISTRY:-opea}/web-retriever-chroma:${TAG:-latest} reranking-tei: build: context: GenAIComps - dockerfile: comps/reranks/tei/docker/Dockerfile + dockerfile: comps/reranks/tei/Dockerfile extends: searchqna image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest} llm-tgi: diff --git a/SearchQnA/kubernetes/README.md b/SearchQnA/kubernetes/intel/README_gmc.md similarity index 100% rename from SearchQnA/kubernetes/README.md rename to SearchQnA/kubernetes/intel/README_gmc.md diff --git a/SearchQnA/kubernetes/searchQnA_xeon.yaml b/SearchQnA/kubernetes/intel/cpu/xeon/gmc/searchQnA_xeon.yaml similarity index 100% rename from SearchQnA/kubernetes/searchQnA_xeon.yaml rename to SearchQnA/kubernetes/intel/cpu/xeon/gmc/searchQnA_xeon.yaml diff --git a/SearchQnA/kubernetes/searchQnA_gaudi.yaml b/SearchQnA/kubernetes/intel/hpu/gaudi/gmc/searchQnA_gaudi.yaml similarity index 100% rename from SearchQnA/kubernetes/searchQnA_gaudi.yaml rename to SearchQnA/kubernetes/intel/hpu/gaudi/gmc/searchQnA_gaudi.yaml diff --git a/SearchQnA/docker/searchqna.py b/SearchQnA/searchqna.py similarity index 100% rename from SearchQnA/docker/searchqna.py rename to SearchQnA/searchqna.py diff --git a/SearchQnA/docker/set_env.sh b/SearchQnA/set_env.sh similarity index 100% rename from SearchQnA/docker/set_env.sh rename to SearchQnA/set_env.sh diff --git a/SearchQnA/tests/test_searchqna_on_gaudi.sh b/SearchQnA/tests/test_compose_on_gaudi.sh similarity index 90% rename from SearchQnA/tests/test_searchqna_on_gaudi.sh rename to SearchQnA/tests/test_compose_on_gaudi.sh index 0f105876f..dcdc1cd68 100644 --- a/SearchQnA/tests/test_searchqna_on_gaudi.sh +++ b/SearchQnA/tests/test_compose_on_gaudi.sh @@ -15,13 +15,13 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ git clone https://github.com/huggingface/tei-gaudi echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="searchqna searchqna-ui embedding-tei web-retriever-chroma reranking-tei llm-tgi tei-gaudi" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.5 docker pull ghcr.io/huggingface/tgi-gaudi:2.0.1 @@ -30,7 +30,7 @@ function build_docker_images() { function start_services() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi export GOOGLE_CSE_ID=$GOOGLE_CSE_ID export GOOGLE_API_KEY=$GOOGLE_API_KEY export HUGGINGFACEHUB_API_TOKEN=$HUGGINGFACEHUB_API_TOKEN @@ -56,7 +56,7 @@ function start_services() { export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:3008/v1/searchqna" - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose up -d > ${LOG_PATH}/start_services_with_compose.log @@ -94,7 +94,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH @@ -123,7 +123,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi docker compose stop && docker compose rm -f } diff --git a/SearchQnA/tests/test_searchqna_on_xeon.sh b/SearchQnA/tests/test_compose_on_xeon.sh similarity index 89% rename from SearchQnA/tests/test_searchqna_on_xeon.sh rename to SearchQnA/tests/test_compose_on_xeon.sh index bea9cb957..574a836ba 100644 --- a/SearchQnA/tests/test_searchqna_on_xeon.sh +++ b/SearchQnA/tests/test_compose_on_xeon.sh @@ -15,12 +15,12 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="searchqna searchqna-ui embedding-tei web-retriever-chroma reranking-tei llm-tgi" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.5 docker pull ghcr.io/huggingface/text-generation-inference:sha-e4201f4-intel-cpu @@ -28,7 +28,7 @@ function build_docker_images() { } function start_services() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon/ export GOOGLE_CSE_ID=$GOOGLE_CSE_ID export GOOGLE_API_KEY=$GOOGLE_API_KEY export HUGGINGFACEHUB_API_TOKEN=$HUGGINGFACEHUB_API_TOKEN @@ -54,7 +54,7 @@ function start_services() { export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:3008/v1/searchqna" - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose up -d > ${LOG_PATH}/start_services_with_compose.log @@ -88,7 +88,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -116,7 +116,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon/ docker compose stop && docker compose rm -f } diff --git a/SearchQnA/tests/test_gmc_on_gaudi.sh b/SearchQnA/tests/test_gmc_on_gaudi.sh index 65f3c8835..e6460ab4f 100755 --- a/SearchQnA/tests/test_gmc_on_gaudi.sh +++ b/SearchQnA/tests/test_gmc_on_gaudi.sh @@ -114,12 +114,12 @@ fi case "$1" in install_SearchQnA) - pushd SearchQnA/kubernetes + pushd SearchQnA/kubernetes/intel/hpu/gaudi/gmc install_searchqa popd ;; validate_SearchQnA) - pushd SearchQnA/kubernetes + pushd SearchQnA/kubernetes/intel/hpu/gaudi/gmc validate_searchqa popd ;; diff --git a/SearchQnA/tests/test_gmc_on_xeon.sh b/SearchQnA/tests/test_gmc_on_xeon.sh index d049d60c7..b1f80de72 100755 --- a/SearchQnA/tests/test_gmc_on_xeon.sh +++ b/SearchQnA/tests/test_gmc_on_xeon.sh @@ -114,12 +114,12 @@ fi case "$1" in install_SearchQnA) - pushd SearchQnA/kubernetes + pushd SearchQnA/kubernetes/intel/cpu/xeon/gmc install_searchqa popd ;; validate_SearchQnA) - pushd SearchQnA/kubernetes + pushd SearchQnA/kubernetes/intel/cpu/xeon/gmc validate_searchqa popd ;; diff --git a/SearchQnA/docker/ui/docker/Dockerfile b/SearchQnA/ui/docker/Dockerfile similarity index 100% rename from SearchQnA/docker/ui/docker/Dockerfile rename to SearchQnA/ui/docker/Dockerfile diff --git a/SearchQnA/docker/ui/svelte/.editorconfig b/SearchQnA/ui/svelte/.editorconfig similarity index 100% rename from SearchQnA/docker/ui/svelte/.editorconfig rename to SearchQnA/ui/svelte/.editorconfig diff --git a/SearchQnA/docker/ui/svelte/.env b/SearchQnA/ui/svelte/.env similarity index 100% rename from SearchQnA/docker/ui/svelte/.env rename to SearchQnA/ui/svelte/.env diff --git a/SearchQnA/docker/ui/svelte/.eslintignore b/SearchQnA/ui/svelte/.eslintignore similarity index 100% rename from SearchQnA/docker/ui/svelte/.eslintignore rename to SearchQnA/ui/svelte/.eslintignore diff --git a/SearchQnA/docker/ui/svelte/.eslintrc.cjs b/SearchQnA/ui/svelte/.eslintrc.cjs similarity index 100% rename from SearchQnA/docker/ui/svelte/.eslintrc.cjs rename to SearchQnA/ui/svelte/.eslintrc.cjs diff --git a/SearchQnA/docker/ui/svelte/.prettierignore b/SearchQnA/ui/svelte/.prettierignore similarity index 100% rename from SearchQnA/docker/ui/svelte/.prettierignore rename to SearchQnA/ui/svelte/.prettierignore diff --git a/SearchQnA/docker/ui/svelte/.prettierrc b/SearchQnA/ui/svelte/.prettierrc similarity index 100% rename from SearchQnA/docker/ui/svelte/.prettierrc rename to SearchQnA/ui/svelte/.prettierrc diff --git a/SearchQnA/docker/ui/svelte/README.md b/SearchQnA/ui/svelte/README.md similarity index 94% rename from SearchQnA/docker/ui/svelte/README.md rename to SearchQnA/ui/svelte/README.md index e9f1a0a8c..4104adc3e 100644 --- a/SearchQnA/docker/ui/svelte/README.md +++ b/SearchQnA/ui/svelte/README.md @@ -2,7 +2,7 @@ ## 📸 Project Screenshots -![project-screenshot](../../../assets/img/search_ui_init.png) +![project-screenshot](../../assets/img/search_ui_init.png) ## 🧐 Features diff --git a/SearchQnA/docker/ui/svelte/package.json b/SearchQnA/ui/svelte/package.json similarity index 100% rename from SearchQnA/docker/ui/svelte/package.json rename to SearchQnA/ui/svelte/package.json diff --git a/SearchQnA/docker/ui/svelte/playwright.config.ts b/SearchQnA/ui/svelte/playwright.config.ts similarity index 100% rename from SearchQnA/docker/ui/svelte/playwright.config.ts rename to SearchQnA/ui/svelte/playwright.config.ts diff --git a/SearchQnA/docker/ui/svelte/postcss.config.cjs b/SearchQnA/ui/svelte/postcss.config.cjs similarity index 100% rename from SearchQnA/docker/ui/svelte/postcss.config.cjs rename to SearchQnA/ui/svelte/postcss.config.cjs diff --git a/SearchQnA/docker/ui/svelte/src/app.d.ts b/SearchQnA/ui/svelte/src/app.d.ts similarity index 100% rename from SearchQnA/docker/ui/svelte/src/app.d.ts rename to SearchQnA/ui/svelte/src/app.d.ts diff --git a/SearchQnA/docker/ui/svelte/src/app.html b/SearchQnA/ui/svelte/src/app.html similarity index 100% rename from SearchQnA/docker/ui/svelte/src/app.html rename to SearchQnA/ui/svelte/src/app.html diff --git a/SearchQnA/docker/ui/svelte/src/app.postcss b/SearchQnA/ui/svelte/src/app.postcss similarity index 100% rename from SearchQnA/docker/ui/svelte/src/app.postcss rename to SearchQnA/ui/svelte/src/app.postcss diff --git a/SearchQnA/docker/ui/svelte/src/lib/assets/avatar/svelte/Delete.svelte b/SearchQnA/ui/svelte/src/lib/assets/avatar/svelte/Delete.svelte similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/assets/avatar/svelte/Delete.svelte rename to SearchQnA/ui/svelte/src/lib/assets/avatar/svelte/Delete.svelte diff --git a/SearchQnA/docker/ui/svelte/src/lib/assets/chat/svelte/Assistant.svelte b/SearchQnA/ui/svelte/src/lib/assets/chat/svelte/Assistant.svelte similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/assets/chat/svelte/Assistant.svelte rename to SearchQnA/ui/svelte/src/lib/assets/chat/svelte/Assistant.svelte diff --git a/SearchQnA/docker/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte b/SearchQnA/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte rename to SearchQnA/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte diff --git a/SearchQnA/docker/ui/svelte/src/lib/assets/chat/svelte/PersonOutlined.svelte b/SearchQnA/ui/svelte/src/lib/assets/chat/svelte/PersonOutlined.svelte similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/assets/chat/svelte/PersonOutlined.svelte rename to SearchQnA/ui/svelte/src/lib/assets/chat/svelte/PersonOutlined.svelte diff --git a/SearchQnA/docker/ui/svelte/src/lib/assets/header/intelLogo.svelte b/SearchQnA/ui/svelte/src/lib/assets/header/intelLogo.svelte similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/assets/header/intelLogo.svelte rename to SearchQnA/ui/svelte/src/lib/assets/header/intelLogo.svelte diff --git a/SearchQnA/docker/ui/svelte/src/lib/assets/layout/css/driver.css b/SearchQnA/ui/svelte/src/lib/assets/layout/css/driver.css similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/assets/layout/css/driver.css rename to SearchQnA/ui/svelte/src/lib/assets/layout/css/driver.css diff --git a/SearchQnA/docker/ui/svelte/src/lib/assets/upload/next.svelte b/SearchQnA/ui/svelte/src/lib/assets/upload/next.svelte similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/assets/upload/next.svelte rename to SearchQnA/ui/svelte/src/lib/assets/upload/next.svelte diff --git a/SearchQnA/docker/ui/svelte/src/lib/assets/upload/previous.svelte b/SearchQnA/ui/svelte/src/lib/assets/upload/previous.svelte similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/assets/upload/previous.svelte rename to SearchQnA/ui/svelte/src/lib/assets/upload/previous.svelte diff --git a/SearchQnA/docker/ui/svelte/src/lib/assets/voice/svg/paste.svg b/SearchQnA/ui/svelte/src/lib/assets/voice/svg/paste.svg similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/assets/voice/svg/paste.svg rename to SearchQnA/ui/svelte/src/lib/assets/voice/svg/paste.svg diff --git a/SearchQnA/docker/ui/svelte/src/lib/assets/voice/svg/uploadFile.svg b/SearchQnA/ui/svelte/src/lib/assets/voice/svg/uploadFile.svg similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/assets/voice/svg/uploadFile.svg rename to SearchQnA/ui/svelte/src/lib/assets/voice/svg/uploadFile.svg diff --git a/SearchQnA/docker/ui/svelte/src/lib/modules/chat/ChatMessage.svelte b/SearchQnA/ui/svelte/src/lib/modules/chat/ChatMessage.svelte similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/modules/chat/ChatMessage.svelte rename to SearchQnA/ui/svelte/src/lib/modules/chat/ChatMessage.svelte diff --git a/SearchQnA/docker/ui/svelte/src/lib/modules/chat/MessageAvatar.svelte b/SearchQnA/ui/svelte/src/lib/modules/chat/MessageAvatar.svelte similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/modules/chat/MessageAvatar.svelte rename to SearchQnA/ui/svelte/src/lib/modules/chat/MessageAvatar.svelte diff --git a/SearchQnA/docker/ui/svelte/src/lib/modules/chat/MessageTimer.svelte b/SearchQnA/ui/svelte/src/lib/modules/chat/MessageTimer.svelte similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/modules/chat/MessageTimer.svelte rename to SearchQnA/ui/svelte/src/lib/modules/chat/MessageTimer.svelte diff --git a/SearchQnA/docker/ui/svelte/src/lib/modules/frame/Layout.svelte b/SearchQnA/ui/svelte/src/lib/modules/frame/Layout.svelte similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/modules/frame/Layout.svelte rename to SearchQnA/ui/svelte/src/lib/modules/frame/Layout.svelte diff --git a/SearchQnA/docker/ui/svelte/src/lib/network/chat/Network.ts b/SearchQnA/ui/svelte/src/lib/network/chat/Network.ts similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/network/chat/Network.ts rename to SearchQnA/ui/svelte/src/lib/network/chat/Network.ts diff --git a/SearchQnA/docker/ui/svelte/src/lib/network/upload/Network.ts b/SearchQnA/ui/svelte/src/lib/network/upload/Network.ts similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/network/upload/Network.ts rename to SearchQnA/ui/svelte/src/lib/network/upload/Network.ts diff --git a/SearchQnA/docker/ui/svelte/src/lib/shared/Utils.ts b/SearchQnA/ui/svelte/src/lib/shared/Utils.ts similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/shared/Utils.ts rename to SearchQnA/ui/svelte/src/lib/shared/Utils.ts diff --git a/SearchQnA/docker/ui/svelte/src/lib/shared/components/header/header.svelte b/SearchQnA/ui/svelte/src/lib/shared/components/header/header.svelte similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/shared/components/header/header.svelte rename to SearchQnA/ui/svelte/src/lib/shared/components/header/header.svelte diff --git a/SearchQnA/docker/ui/svelte/src/lib/shared/components/loading/Loading.svelte b/SearchQnA/ui/svelte/src/lib/shared/components/loading/Loading.svelte similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/shared/components/loading/Loading.svelte rename to SearchQnA/ui/svelte/src/lib/shared/components/loading/Loading.svelte diff --git a/SearchQnA/docker/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte b/SearchQnA/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte rename to SearchQnA/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte diff --git a/SearchQnA/docker/ui/svelte/src/lib/shared/constant/Interface.ts b/SearchQnA/ui/svelte/src/lib/shared/constant/Interface.ts similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/shared/constant/Interface.ts rename to SearchQnA/ui/svelte/src/lib/shared/constant/Interface.ts diff --git a/SearchQnA/docker/ui/svelte/src/lib/shared/stores/common/Store.ts b/SearchQnA/ui/svelte/src/lib/shared/stores/common/Store.ts similarity index 100% rename from SearchQnA/docker/ui/svelte/src/lib/shared/stores/common/Store.ts rename to SearchQnA/ui/svelte/src/lib/shared/stores/common/Store.ts diff --git a/SearchQnA/docker/ui/svelte/src/routes/+layout.svelte b/SearchQnA/ui/svelte/src/routes/+layout.svelte similarity index 100% rename from SearchQnA/docker/ui/svelte/src/routes/+layout.svelte rename to SearchQnA/ui/svelte/src/routes/+layout.svelte diff --git a/SearchQnA/docker/ui/svelte/src/routes/+page.svelte b/SearchQnA/ui/svelte/src/routes/+page.svelte similarity index 100% rename from SearchQnA/docker/ui/svelte/src/routes/+page.svelte rename to SearchQnA/ui/svelte/src/routes/+page.svelte diff --git a/SearchQnA/docker/ui/svelte/src/routes/+page.ts b/SearchQnA/ui/svelte/src/routes/+page.ts similarity index 100% rename from SearchQnA/docker/ui/svelte/src/routes/+page.ts rename to SearchQnA/ui/svelte/src/routes/+page.ts diff --git a/SearchQnA/docker/ui/svelte/static/favicon.png b/SearchQnA/ui/svelte/static/favicon.png similarity index 100% rename from SearchQnA/docker/ui/svelte/static/favicon.png rename to SearchQnA/ui/svelte/static/favicon.png diff --git a/SearchQnA/docker/ui/svelte/svelte.config.js b/SearchQnA/ui/svelte/svelte.config.js similarity index 100% rename from SearchQnA/docker/ui/svelte/svelte.config.js rename to SearchQnA/ui/svelte/svelte.config.js diff --git a/SearchQnA/docker/ui/svelte/tailwind.config.cjs b/SearchQnA/ui/svelte/tailwind.config.cjs similarity index 100% rename from SearchQnA/docker/ui/svelte/tailwind.config.cjs rename to SearchQnA/ui/svelte/tailwind.config.cjs diff --git a/SearchQnA/docker/ui/svelte/tests/searchQnA.spec.ts b/SearchQnA/ui/svelte/tests/searchQnA.spec.ts similarity index 100% rename from SearchQnA/docker/ui/svelte/tests/searchQnA.spec.ts rename to SearchQnA/ui/svelte/tests/searchQnA.spec.ts diff --git a/SearchQnA/docker/ui/svelte/tsconfig.json b/SearchQnA/ui/svelte/tsconfig.json similarity index 100% rename from SearchQnA/docker/ui/svelte/tsconfig.json rename to SearchQnA/ui/svelte/tsconfig.json diff --git a/SearchQnA/docker/ui/svelte/vite.config.ts b/SearchQnA/ui/svelte/vite.config.ts similarity index 100% rename from SearchQnA/docker/ui/svelte/vite.config.ts rename to SearchQnA/ui/svelte/vite.config.ts diff --git a/Translation/docker/Dockerfile b/Translation/Dockerfile similarity index 100% rename from Translation/docker/Dockerfile rename to Translation/Dockerfile diff --git a/Translation/README.md b/Translation/README.md index fd0392489..53b982265 100644 --- a/Translation/README.md +++ b/Translation/README.md @@ -14,8 +14,8 @@ The Translation service can be effortlessly deployed on either Intel Gaudi2 or I ### Deploy Translation on Gaudi -Refer to the [Gaudi Guide](./docker/gaudi/README.md) for instructions on deploying Translation on Gaudi. +Refer to the [Gaudi Guide](./docker_compose/intel/hpu/gaudi/README.md) for instructions on deploying Translation on Gaudi. ### Deploy Translation on Xeon -Refer to the [Xeon Guide](./docker/xeon/README.md) for instructions on deploying Translation on Xeon. +Refer to the [Xeon Guide](./docker_compose/intel/cpu/xeon/README.md) for instructions on deploying Translation on Xeon. diff --git a/Translation/docker/xeon/README.md b/Translation/docker_compose/intel/cpu/xeon/README.md similarity index 94% rename from Translation/docker/xeon/README.md rename to Translation/docker_compose/intel/cpu/xeon/README.md index 25204094d..3b98a0467 100644 --- a/Translation/docker/xeon/README.md +++ b/Translation/docker_compose/intel/cpu/xeon/README.md @@ -31,7 +31,7 @@ To construct the Mega Service, we utilize the [GenAIComps](https://github.com/op ```bash git clone https://github.com/opea-project/GenAIExamples -cd GenAIExamples/Translation/docker +cd GenAIExamples/Translation/ docker build -t opea/translation:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile . ``` @@ -40,8 +40,8 @@ docker build -t opea/translation:latest --build-arg https_proxy=$https_proxy --b Build frontend Docker image via below command: ```bash -cd GenAIExamples/Translation/docker/ui -docker build -t opea/translation-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker/Dockerfile . +cd GenAIExamples/Translation/ui +docker build -t opea/translation-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f docker/Dockerfile . ``` Then run the command `docker images`, you will have the following Docker Images: @@ -107,5 +107,5 @@ Following the validation of all aforementioned microservices, we are now prepare ## 🚀 Launch the UI Open this URL `http://{host_ip}:5173` in your browser to access the frontend. -![project-screenshot](../../assets/img/trans_ui_init.png) -![project-screenshot](../../assets/img/trans_ui_select.png) +![project-screenshot](../../../../assets/img/trans_ui_init.png) +![project-screenshot](../../../../assets/img/trans_ui_select.png) diff --git a/Translation/docker/xeon/compose.yaml b/Translation/docker_compose/intel/cpu/xeon/compose.yaml similarity index 100% rename from Translation/docker/xeon/compose.yaml rename to Translation/docker_compose/intel/cpu/xeon/compose.yaml diff --git a/Translation/docker/gaudi/README.md b/Translation/docker_compose/intel/hpu/gaudi/README.md similarity index 95% rename from Translation/docker/gaudi/README.md rename to Translation/docker_compose/intel/hpu/gaudi/README.md index 16a22e976..7fa067c7d 100644 --- a/Translation/docker/gaudi/README.md +++ b/Translation/docker_compose/intel/hpu/gaudi/README.md @@ -32,7 +32,7 @@ docker build -t opea/translation:latest --build-arg https_proxy=$https_proxy --b Construct the frontend Docker image using the command below: ```bash -cd GenAIExamples/Translation/docker/ui/ +cd GenAIExamples/Translation// docker build -t opea/translation-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker/Dockerfile . ``` @@ -99,5 +99,5 @@ Following the validation of all aforementioned microservices, we are now prepare ## 🚀 Launch the UI Open this URL `http://{host_ip}:5173` in your browser to access the frontend. -![project-screenshot](../../assets/img/trans_ui_init.png) -![project-screenshot](../../assets/img/trans_ui_select.png) +![project-screenshot](../../../../assets/img/trans_ui_init.png) +![project-screenshot](../../../../assets/img/trans_ui_select.png) diff --git a/Translation/docker/gaudi/compose.yaml b/Translation/docker_compose/intel/hpu/gaudi/compose.yaml similarity index 100% rename from Translation/docker/gaudi/compose.yaml rename to Translation/docker_compose/intel/hpu/gaudi/compose.yaml diff --git a/Translation/docker/docker_build_compose.yaml b/Translation/docker_image_build/build.yaml similarity index 94% rename from Translation/docker/docker_build_compose.yaml rename to Translation/docker_image_build/build.yaml index 05da61877..b326b125b 100644 --- a/Translation/docker/docker_build_compose.yaml +++ b/Translation/docker_image_build/build.yaml @@ -8,11 +8,12 @@ services: http_proxy: ${http_proxy} https_proxy: ${https_proxy} no_proxy: ${no_proxy} + context: ../ dockerfile: ./Dockerfile image: ${REGISTRY:-opea}/translation:${TAG:-latest} translation-ui: build: - context: ui + context: ../ui dockerfile: ./docker/Dockerfile extends: translation image: ${REGISTRY:-opea}/translation-ui:${TAG:-latest} diff --git a/Translation/kubernetes/helm-charts/README.md b/Translation/kubernetes/helm-charts/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/Translation/kubernetes/README.md b/Translation/kubernetes/intel/README_gmc.md similarity index 100% rename from Translation/kubernetes/README.md rename to Translation/kubernetes/intel/README_gmc.md diff --git a/Translation/kubernetes/translation_xeon.yaml b/Translation/kubernetes/intel/cpu/xeon/gmc/translation_xeon.yaml similarity index 100% rename from Translation/kubernetes/translation_xeon.yaml rename to Translation/kubernetes/intel/cpu/xeon/gmc/translation_xeon.yaml diff --git a/Translation/kubernetes/translation_gaudi.yaml b/Translation/kubernetes/intel/hpu/gaudi/gmc/translation_gaudi.yaml similarity index 100% rename from Translation/kubernetes/translation_gaudi.yaml rename to Translation/kubernetes/intel/hpu/gaudi/gmc/translation_gaudi.yaml diff --git a/Translation/kubernetes/manifests/README.md b/Translation/kubernetes/manifests/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/Translation/kubernetes/service-mesh/README.md b/Translation/kubernetes/service-mesh/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/Translation/tests/test_translation_on_gaudi.sh b/Translation/tests/test_compose_on_gaudi.sh similarity index 90% rename from Translation/tests/test_translation_on_gaudi.sh rename to Translation/tests/test_compose_on_gaudi.sh index facc0e020..f66af96cb 100644 --- a/Translation/tests/test_translation_on_gaudi.sh +++ b/Translation/tests/test_compose_on_gaudi.sh @@ -15,19 +15,19 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="translation translation-ui llm-tgi" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/tgi-gaudi:2.0.1 docker images && sleep 1s } function start_services() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi export LLM_MODEL_ID="haoranxu/ALMA-13B" export TGI_LLM_ENDPOINT="http://${ip_address}:8008" @@ -36,7 +36,7 @@ function start_services() { export LLM_SERVICE_HOST_IP=${ip_address} export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:8888/v1/translation" - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose up -d > ${LOG_PATH}/start_services_with_compose.log @@ -113,7 +113,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -141,7 +141,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi docker compose stop && docker compose rm -f } diff --git a/Translation/tests/test_translation_on_xeon.sh b/Translation/tests/test_compose_on_xeon.sh similarity index 90% rename from Translation/tests/test_translation_on_xeon.sh rename to Translation/tests/test_compose_on_xeon.sh index a061e8543..a648ba832 100644 --- a/Translation/tests/test_translation_on_xeon.sh +++ b/Translation/tests/test_compose_on_xeon.sh @@ -15,19 +15,19 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="translation translation-ui llm-tgi" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/text-generation-inference:1.4 docker images && sleep 1s } function start_services() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon/ export LLM_MODEL_ID="haoranxu/ALMA-13B" export TGI_LLM_ENDPOINT="http://${ip_address}:8008" @@ -36,7 +36,7 @@ function start_services() { export LLM_SERVICE_HOST_IP=${ip_address} export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:8888/v1/translation" - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose up -d > ${LOG_PATH}/start_services_with_compose.log @@ -111,7 +111,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -139,7 +139,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon/ docker compose stop && docker compose rm -f } diff --git a/Translation/tests/test_gmc_on_gaudi.sh b/Translation/tests/test_gmc_on_gaudi.sh index 2ddbd9f69..b09f8a2a6 100755 --- a/Translation/tests/test_gmc_on_gaudi.sh +++ b/Translation/tests/test_gmc_on_gaudi.sh @@ -112,12 +112,12 @@ fi case "$1" in install_Translation) - pushd Translation/kubernetes + pushd Translation/kubernetes/intel/hpu/gaudi/gmc install_translation popd ;; validate_Translation) - pushd Translation/kubernetes + pushd Translation/kubernetes/intel/hpu/gaudi/gmc validate_translation popd ;; diff --git a/Translation/tests/test_gmc_on_xeon.sh b/Translation/tests/test_gmc_on_xeon.sh index a7292cc5f..56caa54f4 100755 --- a/Translation/tests/test_gmc_on_xeon.sh +++ b/Translation/tests/test_gmc_on_xeon.sh @@ -112,12 +112,12 @@ fi case "$1" in install_Translation) - pushd Translation/kubernetes + pushd Translation/kubernetes/intel/cpu/xeon/gmc install_translation popd ;; validate_Translation) - pushd Translation/kubernetes + pushd Translation/kubernetes/intel/cpu/xeon/gmc validate_translation popd ;; diff --git a/Translation/docker/translation.py b/Translation/translation.py similarity index 100% rename from Translation/docker/translation.py rename to Translation/translation.py diff --git a/Translation/docker/ui/docker/Dockerfile b/Translation/ui/docker/Dockerfile similarity index 100% rename from Translation/docker/ui/docker/Dockerfile rename to Translation/ui/docker/Dockerfile diff --git a/Translation/docker/ui/svelte/.env b/Translation/ui/svelte/.env similarity index 100% rename from Translation/docker/ui/svelte/.env rename to Translation/ui/svelte/.env diff --git a/Translation/docker/ui/svelte/.gitignore b/Translation/ui/svelte/.gitignore similarity index 100% rename from Translation/docker/ui/svelte/.gitignore rename to Translation/ui/svelte/.gitignore diff --git a/Translation/docker/ui/svelte/.npmrc b/Translation/ui/svelte/.npmrc similarity index 100% rename from Translation/docker/ui/svelte/.npmrc rename to Translation/ui/svelte/.npmrc diff --git a/Translation/docker/ui/svelte/README.md b/Translation/ui/svelte/README.md similarity index 100% rename from Translation/docker/ui/svelte/README.md rename to Translation/ui/svelte/README.md diff --git a/Translation/docker/ui/svelte/package.json b/Translation/ui/svelte/package.json similarity index 100% rename from Translation/docker/ui/svelte/package.json rename to Translation/ui/svelte/package.json diff --git a/Translation/docker/ui/svelte/playwright.config.ts b/Translation/ui/svelte/playwright.config.ts similarity index 100% rename from Translation/docker/ui/svelte/playwright.config.ts rename to Translation/ui/svelte/playwright.config.ts diff --git a/Translation/docker/ui/svelte/postcss.config.cjs b/Translation/ui/svelte/postcss.config.cjs similarity index 100% rename from Translation/docker/ui/svelte/postcss.config.cjs rename to Translation/ui/svelte/postcss.config.cjs diff --git a/Translation/docker/ui/svelte/src/app.d.ts b/Translation/ui/svelte/src/app.d.ts similarity index 100% rename from Translation/docker/ui/svelte/src/app.d.ts rename to Translation/ui/svelte/src/app.d.ts diff --git a/Translation/docker/ui/svelte/src/app.html b/Translation/ui/svelte/src/app.html similarity index 100% rename from Translation/docker/ui/svelte/src/app.html rename to Translation/ui/svelte/src/app.html diff --git a/Translation/docker/ui/svelte/src/app.pcss b/Translation/ui/svelte/src/app.pcss similarity index 100% rename from Translation/docker/ui/svelte/src/app.pcss rename to Translation/ui/svelte/src/app.pcss diff --git a/Translation/docker/ui/svelte/src/lib/assets/loadingAnimation.svelte b/Translation/ui/svelte/src/lib/assets/loadingAnimation.svelte similarity index 100% rename from Translation/docker/ui/svelte/src/lib/assets/loadingAnimation.svelte rename to Translation/ui/svelte/src/lib/assets/loadingAnimation.svelte diff --git a/Translation/docker/ui/svelte/src/lib/assets/summaryLogo.svelte b/Translation/ui/svelte/src/lib/assets/summaryLogo.svelte similarity index 100% rename from Translation/docker/ui/svelte/src/lib/assets/summaryLogo.svelte rename to Translation/ui/svelte/src/lib/assets/summaryLogo.svelte diff --git a/Translation/docker/ui/svelte/src/lib/header.svelte b/Translation/ui/svelte/src/lib/header.svelte similarity index 100% rename from Translation/docker/ui/svelte/src/lib/header.svelte rename to Translation/ui/svelte/src/lib/header.svelte diff --git a/Translation/docker/ui/svelte/src/lib/shared/Network.ts b/Translation/ui/svelte/src/lib/shared/Network.ts similarity index 100% rename from Translation/docker/ui/svelte/src/lib/shared/Network.ts rename to Translation/ui/svelte/src/lib/shared/Network.ts diff --git a/Translation/docker/ui/svelte/src/lib/shared/constant.ts b/Translation/ui/svelte/src/lib/shared/constant.ts similarity index 100% rename from Translation/docker/ui/svelte/src/lib/shared/constant.ts rename to Translation/ui/svelte/src/lib/shared/constant.ts diff --git a/Translation/docker/ui/svelte/src/routes/+layout.svelte b/Translation/ui/svelte/src/routes/+layout.svelte similarity index 100% rename from Translation/docker/ui/svelte/src/routes/+layout.svelte rename to Translation/ui/svelte/src/routes/+layout.svelte diff --git a/Translation/docker/ui/svelte/src/routes/+page.svelte b/Translation/ui/svelte/src/routes/+page.svelte similarity index 100% rename from Translation/docker/ui/svelte/src/routes/+page.svelte rename to Translation/ui/svelte/src/routes/+page.svelte diff --git a/Translation/docker/ui/svelte/src/routes/types.d.ts b/Translation/ui/svelte/src/routes/types.d.ts similarity index 100% rename from Translation/docker/ui/svelte/src/routes/types.d.ts rename to Translation/ui/svelte/src/routes/types.d.ts diff --git a/Translation/docker/ui/svelte/static/favicon.png b/Translation/ui/svelte/static/favicon.png similarity index 100% rename from Translation/docker/ui/svelte/static/favicon.png rename to Translation/ui/svelte/static/favicon.png diff --git a/Translation/docker/ui/svelte/svelte.config.js b/Translation/ui/svelte/svelte.config.js similarity index 100% rename from Translation/docker/ui/svelte/svelte.config.js rename to Translation/ui/svelte/svelte.config.js diff --git a/Translation/docker/ui/svelte/tailwind.config.cjs b/Translation/ui/svelte/tailwind.config.cjs similarity index 100% rename from Translation/docker/ui/svelte/tailwind.config.cjs rename to Translation/ui/svelte/tailwind.config.cjs diff --git a/Translation/docker/ui/svelte/tests/Translation.spec.ts b/Translation/ui/svelte/tests/Translation.spec.ts similarity index 100% rename from Translation/docker/ui/svelte/tests/Translation.spec.ts rename to Translation/ui/svelte/tests/Translation.spec.ts diff --git a/Translation/docker/ui/svelte/tsconfig.json b/Translation/ui/svelte/tsconfig.json similarity index 100% rename from Translation/docker/ui/svelte/tsconfig.json rename to Translation/ui/svelte/tsconfig.json diff --git a/Translation/docker/ui/svelte/vite.config.ts b/Translation/ui/svelte/vite.config.ts similarity index 100% rename from Translation/docker/ui/svelte/vite.config.ts rename to Translation/ui/svelte/vite.config.ts diff --git a/VisualQnA/docker/Dockerfile b/VisualQnA/Dockerfile similarity index 100% rename from VisualQnA/docker/Dockerfile rename to VisualQnA/Dockerfile diff --git a/VisualQnA/README.md b/VisualQnA/README.md index a00c0602e..5520538a1 100644 --- a/VisualQnA/README.md +++ b/VisualQnA/README.md @@ -20,7 +20,7 @@ This example guides you through how to deploy a [LLaVA-NeXT](https://github.com/ ## Required Models -By default, the model is set to `llava-hf/llava-v1.6-mistral-7b-hf`. To use a different model, update the `LVM_MODEL_ID` variable in the [`set_env.sh`](./docker/gaudi/set_env.sh) file. +By default, the model is set to `llava-hf/llava-v1.6-mistral-7b-hf`. To use a different model, update the `LVM_MODEL_ID` variable in the [`set_env.sh`](./docker_compose/intel/hpu/gaudi/set_env.sh) file. ``` export LVM_MODEL_ID="llava-hf/llava-v1.6-mistral-7b-hf" @@ -60,19 +60,19 @@ To set up environment variables for deploying VisualQnA services, follow these s ```bash # on Gaudi - source ./docker/gaudi/set_env.sh + source ./docker_compose/intel/hpu/gaudi/set_env.sh # on Xeon - source ./docker/xeon/set_env.sh + source ./docker_compose/intel/cpu/xeon/set_env.sh ``` ### Deploy VisualQnA on Gaudi -Refer to the [Gaudi Guide](./docker/gaudi/README.md) to build docker images from source. +Refer to the [Gaudi Guide](./docker_compose/intel/hpu/gaudi/README.md) to build docker images from source. -Find the corresponding [compose.yaml](./docker/gaudi/compose.yaml). +Find the corresponding [compose.yaml](./docker_compose/intel/hpu/gaudi/compose.yaml). ```bash -cd GenAIExamples/VisualQnA/docker/gaudi/ +cd GenAIExamples/VisualQnA/docker_compose/intel/hpu/gaudi/ docker compose up -d ``` @@ -80,11 +80,11 @@ docker compose up -d ### Deploy VisualQnA on Xeon -Refer to the [Xeon Guide](./docker/xeon/README.md) for more instructions on building docker images from source. +Refer to the [Xeon Guide](./docker_compose/intel/cpu/xeon/README.md) for more instructions on building docker images from source. -Find the corresponding [compose.yaml](./docker/xeon/compose.yaml). +Find the corresponding [compose.yaml](./docker_compose/intel/cpu/xeon/compose.yaml). ```bash -cd GenAIExamples/VisualQnA/docker/xeon/ +cd GenAIExamples/VisualQnA/docker_compose/intel/cpu/xeon/ docker compose up -d ``` diff --git a/VisualQnA/docker/ui/svelte/src/lib/assets/imageData/images.json b/VisualQnA/docker/ui/svelte/src/lib/assets/imageData/images.json index c3f383e7a..b3097c38d 100644 --- a/VisualQnA/docker/ui/svelte/src/lib/assets/imageData/images.json +++ b/VisualQnA/docker/ui/svelte/src/lib/assets/imageData/images.json @@ -1,10 +1,10 @@ [ - { - "src": "/extreme_ironing.jpg", - "prompt": "what is unusual about this image?" - }, - { - "src": "/waterview.jpg", - "prompt": "what are the things I should be cautious about when I visit here?" - } + { + "src": "/extreme_ironing.jpg", + "prompt": "what is unusual about this image?" + }, + { + "src": "/waterview.jpg", + "prompt": "what are the things I should be cautious about when I visit here?" + } ] diff --git a/VisualQnA/docker/xeon/README.md b/VisualQnA/docker_compose/intel/cpu/xeon/README.md similarity index 96% rename from VisualQnA/docker/xeon/README.md rename to VisualQnA/docker_compose/intel/cpu/xeon/README.md index d5afda219..f9146430a 100644 --- a/VisualQnA/docker/xeon/README.md +++ b/VisualQnA/docker_compose/intel/cpu/xeon/README.md @@ -44,7 +44,7 @@ cd GenAIComps ### 1. Build LVM Image ```bash -docker build --no-cache -t opea/lvm-tgi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/lvms/Dockerfile_tgi . +docker build --no-cache -t opea/lvm-tgi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/lvms/tgi-llava/Dockerfile . ``` ### 2. Build MegaService Docker Image @@ -53,7 +53,7 @@ To construct the Mega Service, we utilize the [GenAIComps](https://github.com/op ```bash git clone https://github.com/opea-project/GenAIExamples.git -cd GenAIExamples/VisualQnA/docker +cd GenAIExamples/VisualQnA docker build --no-cache -t opea/visualqna:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile . cd ../../.. ``` @@ -63,8 +63,8 @@ cd ../../.. Build frontend Docker image via below command: ```bash -cd GenAIExamples/VisualQnA/docker/ui/ -docker build --no-cache -t opea/visualqna-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker/Dockerfile . +cd GenAIExamples/VisualQnA/ui +docker build --no-cache -t opea/visualqna-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f docker/Dockerfile . cd ../../../.. ``` @@ -120,7 +120,7 @@ Note: Please replace with `host_ip` with you external IP address, do not use loc > Before running the docker compose command, you need to be in the folder that has the docker compose yaml file ```bash -cd GenAIExamples/VisualQnA/docker/xeon/ +cd GenAIExamples/VisualQnA/docker_compose/intel/cpu/xeon ``` ```bash diff --git a/VisualQnA/docker/xeon/compose.yaml b/VisualQnA/docker_compose/intel/cpu/xeon/compose.yaml similarity index 100% rename from VisualQnA/docker/xeon/compose.yaml rename to VisualQnA/docker_compose/intel/cpu/xeon/compose.yaml diff --git a/VisualQnA/docker/xeon/set_env.sh b/VisualQnA/docker_compose/intel/cpu/xeon/set_env.sh similarity index 100% rename from VisualQnA/docker/xeon/set_env.sh rename to VisualQnA/docker_compose/intel/cpu/xeon/set_env.sh diff --git a/VisualQnA/docker/gaudi/README.md b/VisualQnA/docker_compose/intel/hpu/gaudi/README.md similarity index 97% rename from VisualQnA/docker/gaudi/README.md rename to VisualQnA/docker_compose/intel/hpu/gaudi/README.md index 5e0571121..c45367c70 100644 --- a/VisualQnA/docker/gaudi/README.md +++ b/VisualQnA/docker_compose/intel/hpu/gaudi/README.md @@ -16,7 +16,7 @@ cd GenAIComps ### 2. Build LLM Image ```bash -docker build --no-cache -t opea/lvm-tgi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/lvms/Dockerfile_tgi . +docker build --no-cache -t opea/lvm-tgi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/lvms/tgi-llava/Dockerfile . ``` ### 3. Pull TGI Gaudi Image @@ -41,7 +41,7 @@ cd ../../.. Build frontend Docker image via below command: ```bash -cd GenAIExamples/VisualQnA/docker/ui/ +cd GenAIExamples/VisualQnA// docker build --no-cache -t opea/visualqna-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker/Dockerfile . cd ../../../.. ``` @@ -76,7 +76,7 @@ Note: Please replace with `host_ip` with you external IP address, do **NOT** use ### Start all the services Docker Containers ```bash -cd GenAIExamples/VisualQnA/docker/gaudi/ +cd GenAIExamples/VisualQnA/docker_compose/intel/hpu/gaudi/ ``` ```bash diff --git a/VisualQnA/docker/gaudi/compose.yaml b/VisualQnA/docker_compose/intel/hpu/gaudi/compose.yaml similarity index 100% rename from VisualQnA/docker/gaudi/compose.yaml rename to VisualQnA/docker_compose/intel/hpu/gaudi/compose.yaml diff --git a/VisualQnA/docker/gaudi/set_env.sh b/VisualQnA/docker_compose/intel/hpu/gaudi/set_env.sh similarity index 100% rename from VisualQnA/docker/gaudi/set_env.sh rename to VisualQnA/docker_compose/intel/hpu/gaudi/set_env.sh diff --git a/VisualQnA/docker/docker_build_compose.yaml b/VisualQnA/docker_image_build/build.yaml similarity index 84% rename from VisualQnA/docker/docker_build_compose.yaml rename to VisualQnA/docker_image_build/build.yaml index c0b1fd967..037cf4c5a 100644 --- a/VisualQnA/docker/docker_build_compose.yaml +++ b/VisualQnA/docker_image_build/build.yaml @@ -8,23 +8,24 @@ services: http_proxy: ${http_proxy} https_proxy: ${https_proxy} no_proxy: ${no_proxy} + context: ../ dockerfile: ./Dockerfile image: ${REGISTRY:-opea}/visualqna:${TAG:-latest} visualqna-ui: build: - context: ui + context: ../ui dockerfile: ./docker/Dockerfile extends: visualqna image: ${REGISTRY:-opea}/visualqna-ui:${TAG:-latest} llm-visualqna-tgi: build: context: GenAIComps - dockerfile: comps/lvms/Dockerfile_tgi + dockerfile: comps/lvms/tgi-llava/Dockerfile extends: visualqna image: ${REGISTRY:-opea}/lvm-tgi:${TAG:-latest} nginx: build: context: GenAIComps - dockerfile: comps/nginx/docker/Dockerfile + dockerfile: comps/nginx/Dockerfile extends: visualqna image: ${REGISTRY:-opea}/nginx:${TAG:-latest} diff --git a/VisualQnA/kubernetes/manifests/README.md b/VisualQnA/kubernetes/intel/README.md similarity index 100% rename from VisualQnA/kubernetes/manifests/README.md rename to VisualQnA/kubernetes/intel/README.md diff --git a/VisualQnA/kubernetes/README.md b/VisualQnA/kubernetes/intel/README_gmc.md similarity index 100% rename from VisualQnA/kubernetes/README.md rename to VisualQnA/kubernetes/intel/README_gmc.md diff --git a/VisualQnA/kubernetes/visualqna_xeon.yaml b/VisualQnA/kubernetes/intel/cpu/xeon/gmc/visualqna_xeon.yaml similarity index 100% rename from VisualQnA/kubernetes/visualqna_xeon.yaml rename to VisualQnA/kubernetes/intel/cpu/xeon/gmc/visualqna_xeon.yaml diff --git a/VisualQnA/kubernetes/manifests/xeon/visualqna.yaml b/VisualQnA/kubernetes/intel/cpu/xeon/manifest/visualqna.yaml similarity index 100% rename from VisualQnA/kubernetes/manifests/xeon/visualqna.yaml rename to VisualQnA/kubernetes/intel/cpu/xeon/manifest/visualqna.yaml diff --git a/VisualQnA/kubernetes/visualqna_gaudi.yaml b/VisualQnA/kubernetes/intel/hpu/gaudi/gmc/visualqna_gaudi.yaml similarity index 100% rename from VisualQnA/kubernetes/visualqna_gaudi.yaml rename to VisualQnA/kubernetes/intel/hpu/gaudi/gmc/visualqna_gaudi.yaml diff --git a/VisualQnA/kubernetes/manifests/gaudi/visualqna.yaml b/VisualQnA/kubernetes/intel/hpu/gaudi/manifest/visualqna.yaml similarity index 100% rename from VisualQnA/kubernetes/manifests/gaudi/visualqna.yaml rename to VisualQnA/kubernetes/intel/hpu/gaudi/manifest/visualqna.yaml diff --git a/VisualQnA/tests/test_visualqna_on_gaudi.sh b/VisualQnA/tests/test_compose_on_gaudi.sh similarity index 92% rename from VisualQnA/tests/test_visualqna_on_gaudi.sh rename to VisualQnA/tests/test_compose_on_gaudi.sh index eec7e6f59..f28f245ab 100644 --- a/VisualQnA/tests/test_visualqna_on_gaudi.sh +++ b/VisualQnA/tests/test_compose_on_gaudi.sh @@ -15,19 +15,18 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." - service_list="visualqna visualqna-ui llm-visualqna-tgi nginx" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/tgi-gaudi:2.0.4 docker images && sleep 1s } function start_services() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi export LVM_MODEL_ID="llava-hf/llava-v1.6-mistral-7b-hf" export LVM_ENDPOINT="http://${ip_address}:8399" @@ -43,7 +42,7 @@ function start_services() { export BACKEND_SERVICE_PORT=8888 export NGINX_PORT=80 - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose up -d > ${LOG_PATH}/start_services_with_compose.log @@ -156,7 +155,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -184,7 +183,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/gaudi + cd $WORKPATH/docker_compose/intel/hpu/gaudi docker compose stop && docker compose rm -f } diff --git a/VisualQnA/tests/test_visualqna_on_xeon.sh b/VisualQnA/tests/test_compose_on_xeon.sh similarity index 92% rename from VisualQnA/tests/test_visualqna_on_xeon.sh rename to VisualQnA/tests/test_compose_on_xeon.sh index 7df5da8c9..595561336 100644 --- a/VisualQnA/tests/test_visualqna_on_xeon.sh +++ b/VisualQnA/tests/test_compose_on_xeon.sh @@ -15,19 +15,18 @@ LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { - cd $WORKPATH/docker - git clone https://github.com/opea-project/GenAIComps.git + cd $WORKPATH/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." - service_list="visualqna visualqna-ui llm-visualqna-tgi nginx" - docker compose -f docker_build_compose.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log + docker compose -f build.yaml build --no-cache > ${LOG_PATH}/docker_image_build.log docker pull ghcr.io/huggingface/text-generation-inference:2.2.0 docker images && sleep 1s } function start_services() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon/ export LVM_MODEL_ID="llava-hf/llava-v1.6-mistral-7b-hf" export LVM_ENDPOINT="http://${ip_address}:8399" @@ -43,7 +42,7 @@ function start_services() { export BACKEND_SERVICE_PORT=8888 export NGINX_PORT=80 - sed -i "s/backend_address/$ip_address/g" $WORKPATH/docker/ui/svelte/.env + sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env # Start Docker Containers docker compose up -d > ${LOG_PATH}/start_services_with_compose.log @@ -156,7 +155,7 @@ function validate_megaservice() { } function validate_frontend() { - cd $WORKPATH/docker/ui/svelte + cd $WORKPATH/ui/svelte local conda_env_name="OPEA_e2e" export PATH=${HOME}/miniforge3/bin/:$PATH if conda info --envs | grep -q "$conda_env_name"; then @@ -184,7 +183,7 @@ function validate_frontend() { } function stop_docker() { - cd $WORKPATH/docker/xeon + cd $WORKPATH/docker_compose/intel/cpu/xeon/ docker compose stop && docker compose rm -f } diff --git a/VisualQnA/docker/ui/docker/Dockerfile b/VisualQnA/ui/docker/Dockerfile similarity index 100% rename from VisualQnA/docker/ui/docker/Dockerfile rename to VisualQnA/ui/docker/Dockerfile diff --git a/VisualQnA/docker/ui/svelte/.editorconfig b/VisualQnA/ui/svelte/.editorconfig similarity index 100% rename from VisualQnA/docker/ui/svelte/.editorconfig rename to VisualQnA/ui/svelte/.editorconfig diff --git a/VisualQnA/docker/ui/svelte/.env b/VisualQnA/ui/svelte/.env similarity index 100% rename from VisualQnA/docker/ui/svelte/.env rename to VisualQnA/ui/svelte/.env diff --git a/VisualQnA/docker/ui/svelte/.eslintignore b/VisualQnA/ui/svelte/.eslintignore similarity index 100% rename from VisualQnA/docker/ui/svelte/.eslintignore rename to VisualQnA/ui/svelte/.eslintignore diff --git a/VisualQnA/docker/ui/svelte/.eslintrc.cjs b/VisualQnA/ui/svelte/.eslintrc.cjs similarity index 100% rename from VisualQnA/docker/ui/svelte/.eslintrc.cjs rename to VisualQnA/ui/svelte/.eslintrc.cjs diff --git a/VisualQnA/docker/ui/svelte/.prettierignore b/VisualQnA/ui/svelte/.prettierignore similarity index 100% rename from VisualQnA/docker/ui/svelte/.prettierignore rename to VisualQnA/ui/svelte/.prettierignore diff --git a/VisualQnA/docker/ui/svelte/.prettierrc b/VisualQnA/ui/svelte/.prettierrc similarity index 100% rename from VisualQnA/docker/ui/svelte/.prettierrc rename to VisualQnA/ui/svelte/.prettierrc diff --git a/VisualQnA/docker/ui/svelte/package.json b/VisualQnA/ui/svelte/package.json similarity index 100% rename from VisualQnA/docker/ui/svelte/package.json rename to VisualQnA/ui/svelte/package.json diff --git a/VisualQnA/docker/ui/svelte/playwright.config.ts b/VisualQnA/ui/svelte/playwright.config.ts similarity index 100% rename from VisualQnA/docker/ui/svelte/playwright.config.ts rename to VisualQnA/ui/svelte/playwright.config.ts diff --git a/VisualQnA/docker/ui/svelte/postcss.config.cjs b/VisualQnA/ui/svelte/postcss.config.cjs similarity index 100% rename from VisualQnA/docker/ui/svelte/postcss.config.cjs rename to VisualQnA/ui/svelte/postcss.config.cjs diff --git a/VisualQnA/docker/ui/svelte/src/app.d.ts b/VisualQnA/ui/svelte/src/app.d.ts similarity index 100% rename from VisualQnA/docker/ui/svelte/src/app.d.ts rename to VisualQnA/ui/svelte/src/app.d.ts diff --git a/VisualQnA/docker/ui/svelte/src/app.html b/VisualQnA/ui/svelte/src/app.html similarity index 100% rename from VisualQnA/docker/ui/svelte/src/app.html rename to VisualQnA/ui/svelte/src/app.html diff --git a/VisualQnA/docker/ui/svelte/src/app.postcss b/VisualQnA/ui/svelte/src/app.postcss similarity index 100% rename from VisualQnA/docker/ui/svelte/src/app.postcss rename to VisualQnA/ui/svelte/src/app.postcss diff --git a/VisualQnA/docker/ui/svelte/src/lib/assets/avatar/svelte/Delete.svelte b/VisualQnA/ui/svelte/src/lib/assets/avatar/svelte/Delete.svelte similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/assets/avatar/svelte/Delete.svelte rename to VisualQnA/ui/svelte/src/lib/assets/avatar/svelte/Delete.svelte diff --git a/VisualQnA/docker/ui/svelte/src/lib/assets/chat/svelte/Assistant.svelte b/VisualQnA/ui/svelte/src/lib/assets/chat/svelte/Assistant.svelte similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/assets/chat/svelte/Assistant.svelte rename to VisualQnA/ui/svelte/src/lib/assets/chat/svelte/Assistant.svelte diff --git a/VisualQnA/docker/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte b/VisualQnA/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte rename to VisualQnA/ui/svelte/src/lib/assets/chat/svelte/PaperAirplane.svelte diff --git a/VisualQnA/docker/ui/svelte/src/lib/assets/chat/svelte/PersonOutlined.svelte b/VisualQnA/ui/svelte/src/lib/assets/chat/svelte/PersonOutlined.svelte similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/assets/chat/svelte/PersonOutlined.svelte rename to VisualQnA/ui/svelte/src/lib/assets/chat/svelte/PersonOutlined.svelte diff --git a/VisualQnA/docker/ui/svelte/src/lib/assets/header/intelLogo.svelte b/VisualQnA/ui/svelte/src/lib/assets/header/intelLogo.svelte similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/assets/header/intelLogo.svelte rename to VisualQnA/ui/svelte/src/lib/assets/header/intelLogo.svelte diff --git a/VisualQnA/docker/ui/svelte/src/lib/assets/layout/css/driver.css b/VisualQnA/ui/svelte/src/lib/assets/layout/css/driver.css similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/assets/layout/css/driver.css rename to VisualQnA/ui/svelte/src/lib/assets/layout/css/driver.css diff --git a/VisualQnA/docker/ui/svelte/src/lib/assets/upload/help.svelte b/VisualQnA/ui/svelte/src/lib/assets/upload/help.svelte similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/assets/upload/help.svelte rename to VisualQnA/ui/svelte/src/lib/assets/upload/help.svelte diff --git a/VisualQnA/docker/ui/svelte/src/lib/assets/upload/next.svelte b/VisualQnA/ui/svelte/src/lib/assets/upload/next.svelte similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/assets/upload/next.svelte rename to VisualQnA/ui/svelte/src/lib/assets/upload/next.svelte diff --git a/VisualQnA/docker/ui/svelte/src/lib/assets/upload/previous.svelte b/VisualQnA/ui/svelte/src/lib/assets/upload/previous.svelte similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/assets/upload/previous.svelte rename to VisualQnA/ui/svelte/src/lib/assets/upload/previous.svelte diff --git a/VisualQnA/docker/ui/svelte/src/lib/assets/voice/svg/paste.svg b/VisualQnA/ui/svelte/src/lib/assets/voice/svg/paste.svg similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/assets/voice/svg/paste.svg rename to VisualQnA/ui/svelte/src/lib/assets/voice/svg/paste.svg diff --git a/VisualQnA/docker/ui/svelte/src/lib/assets/voice/svg/uploadFile.svg b/VisualQnA/ui/svelte/src/lib/assets/voice/svg/uploadFile.svg similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/assets/voice/svg/uploadFile.svg rename to VisualQnA/ui/svelte/src/lib/assets/voice/svg/uploadFile.svg diff --git a/VisualQnA/docker/ui/svelte/src/lib/modules/chat/ChatMessage.svelte b/VisualQnA/ui/svelte/src/lib/modules/chat/ChatMessage.svelte similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/modules/chat/ChatMessage.svelte rename to VisualQnA/ui/svelte/src/lib/modules/chat/ChatMessage.svelte diff --git a/VisualQnA/docker/ui/svelte/src/lib/modules/chat/MessageAvatar.svelte b/VisualQnA/ui/svelte/src/lib/modules/chat/MessageAvatar.svelte similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/modules/chat/MessageAvatar.svelte rename to VisualQnA/ui/svelte/src/lib/modules/chat/MessageAvatar.svelte diff --git a/VisualQnA/docker/ui/svelte/src/lib/modules/chat/MessageTimer.svelte b/VisualQnA/ui/svelte/src/lib/modules/chat/MessageTimer.svelte similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/modules/chat/MessageTimer.svelte rename to VisualQnA/ui/svelte/src/lib/modules/chat/MessageTimer.svelte diff --git a/VisualQnA/docker/ui/svelte/src/lib/modules/frame/Layout.svelte b/VisualQnA/ui/svelte/src/lib/modules/frame/Layout.svelte similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/modules/frame/Layout.svelte rename to VisualQnA/ui/svelte/src/lib/modules/frame/Layout.svelte diff --git a/VisualQnA/docker/ui/svelte/src/lib/modules/upload/upload.svelte b/VisualQnA/ui/svelte/src/lib/modules/upload/upload.svelte similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/modules/upload/upload.svelte rename to VisualQnA/ui/svelte/src/lib/modules/upload/upload.svelte diff --git a/VisualQnA/docker/ui/svelte/src/lib/modules/upload/uploadImg.svelte b/VisualQnA/ui/svelte/src/lib/modules/upload/uploadImg.svelte similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/modules/upload/uploadImg.svelte rename to VisualQnA/ui/svelte/src/lib/modules/upload/uploadImg.svelte diff --git a/VisualQnA/docker/ui/svelte/src/lib/network/chat/Network.ts b/VisualQnA/ui/svelte/src/lib/network/chat/Network.ts similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/network/chat/Network.ts rename to VisualQnA/ui/svelte/src/lib/network/chat/Network.ts diff --git a/VisualQnA/docker/ui/svelte/src/lib/network/upload/Network.ts b/VisualQnA/ui/svelte/src/lib/network/upload/Network.ts similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/network/upload/Network.ts rename to VisualQnA/ui/svelte/src/lib/network/upload/Network.ts diff --git a/VisualQnA/docker/ui/svelte/src/lib/shared/Utils.ts b/VisualQnA/ui/svelte/src/lib/shared/Utils.ts similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/shared/Utils.ts rename to VisualQnA/ui/svelte/src/lib/shared/Utils.ts diff --git a/VisualQnA/docker/ui/svelte/src/lib/shared/components/header/header.svelte b/VisualQnA/ui/svelte/src/lib/shared/components/header/header.svelte similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/shared/components/header/header.svelte rename to VisualQnA/ui/svelte/src/lib/shared/components/header/header.svelte diff --git a/VisualQnA/docker/ui/svelte/src/lib/shared/components/loading/Loading.svelte b/VisualQnA/ui/svelte/src/lib/shared/components/loading/Loading.svelte similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/shared/components/loading/Loading.svelte rename to VisualQnA/ui/svelte/src/lib/shared/components/loading/Loading.svelte diff --git a/VisualQnA/docker/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte b/VisualQnA/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte rename to VisualQnA/ui/svelte/src/lib/shared/components/scrollbar/Scrollbar.svelte diff --git a/VisualQnA/docker/ui/svelte/src/lib/shared/constant/Interface.ts b/VisualQnA/ui/svelte/src/lib/shared/constant/Interface.ts similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/shared/constant/Interface.ts rename to VisualQnA/ui/svelte/src/lib/shared/constant/Interface.ts diff --git a/VisualQnA/docker/ui/svelte/src/lib/shared/stores/common/Store.ts b/VisualQnA/ui/svelte/src/lib/shared/stores/common/Store.ts similarity index 100% rename from VisualQnA/docker/ui/svelte/src/lib/shared/stores/common/Store.ts rename to VisualQnA/ui/svelte/src/lib/shared/stores/common/Store.ts diff --git a/VisualQnA/docker/ui/svelte/src/routes/+layout.svelte b/VisualQnA/ui/svelte/src/routes/+layout.svelte similarity index 100% rename from VisualQnA/docker/ui/svelte/src/routes/+layout.svelte rename to VisualQnA/ui/svelte/src/routes/+layout.svelte diff --git a/VisualQnA/docker/ui/svelte/src/routes/+page.svelte b/VisualQnA/ui/svelte/src/routes/+page.svelte similarity index 100% rename from VisualQnA/docker/ui/svelte/src/routes/+page.svelte rename to VisualQnA/ui/svelte/src/routes/+page.svelte diff --git a/VisualQnA/docker/ui/svelte/src/routes/+page.ts b/VisualQnA/ui/svelte/src/routes/+page.ts similarity index 100% rename from VisualQnA/docker/ui/svelte/src/routes/+page.ts rename to VisualQnA/ui/svelte/src/routes/+page.ts diff --git a/VisualQnA/docker/ui/svelte/static/favicon.png b/VisualQnA/ui/svelte/static/favicon.png similarity index 100% rename from VisualQnA/docker/ui/svelte/static/favicon.png rename to VisualQnA/ui/svelte/static/favicon.png diff --git a/VisualQnA/docker/ui/svelte/svelte.config.js b/VisualQnA/ui/svelte/svelte.config.js similarity index 100% rename from VisualQnA/docker/ui/svelte/svelte.config.js rename to VisualQnA/ui/svelte/svelte.config.js diff --git a/VisualQnA/docker/ui/svelte/tailwind.config.cjs b/VisualQnA/ui/svelte/tailwind.config.cjs similarity index 100% rename from VisualQnA/docker/ui/svelte/tailwind.config.cjs rename to VisualQnA/ui/svelte/tailwind.config.cjs diff --git a/VisualQnA/docker/ui/svelte/tsconfig.json b/VisualQnA/ui/svelte/tsconfig.json similarity index 100% rename from VisualQnA/docker/ui/svelte/tsconfig.json rename to VisualQnA/ui/svelte/tsconfig.json diff --git a/VisualQnA/docker/ui/svelte/vite.config.ts b/VisualQnA/ui/svelte/vite.config.ts similarity index 100% rename from VisualQnA/docker/ui/svelte/vite.config.ts rename to VisualQnA/ui/svelte/vite.config.ts diff --git a/VisualQnA/docker/visualqna.py b/VisualQnA/visualqna.py similarity index 100% rename from VisualQnA/docker/visualqna.py rename to VisualQnA/visualqna.py diff --git a/docker_images_list.md b/docker_images_list.md index cead6ee73..092ce1f79 100644 --- a/docker_images_list.md +++ b/docker_images_list.md @@ -6,67 +6,67 @@ Take ChatQnA for example. ChatQnA is a chatbot application service based on the ## Example images -| Example Images | Dockerfile | Description | -| ----------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| [opea/audioqna](https://hub.docker.com/r/opea/audioqna) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/AudioQnA/docker/Dockerfile) | The docker image served as a chatqna gateway and using language modeling to generate answers to user queries by converting audio input to text, and then using text-to-speech (TTS) to convert those answers back to speech for interaction. | -| [opea/chatqna](https://hub.docker.com/r/opea/chatqna) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/ChatQnA/docker/Dockerfile) | The docker image served as a chatqna gateway and interacted with users by understanding their questions and providing relevant answers. | -| [opea/chatqna-ui](https://hub.docker.com/r/opea/chatqna-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/ChatQnA/docker/ui/docker/Dockerfile) | The docker image acted as the chatqna UI entry for facilitating interaction with users for question answering | -| [opea/chatqna-conversation-ui](https://hub.docker.com/r/opea/chatqna-conversation-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/ChatQnA/docker/ui/docker/Dockerfile.react) | The purpose of the docker image is to provide a user interface for chat-based Q&A using React. It allows for interaction with users and supports continuing conversations with a history that is stored in the browser's local storage. | -| [opea/chatqna-guardrails](https://hub.docker.com/r/opea/chatqna-guardrails) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/ChatQnA/docker/Dockerfile_guardrails) | This docker image is used to encapsulate chatqna's LLM service to secure model inputs and outputs. Guardrails proactively prevents models from interacting with insecure content and signals in time to stop insecure behavior. | -| [opea/chatqna-without-rerank](https://hub.docker.com/r/opea/chatqna-without-rerank) | | | -| [opea/chat-conversation-service](https://hub.docker.com/r/opea/chat-conversation-service) | | | -| [opea/chat-conversation-ui-service](https://hub.docker.com/r/opea/chat-conversation-ui-service) | | | -| [opea/chat-history-service](https://hub.docker.com/r/opea/chat-history-service) | | | -| [opea/codegen](https://hub.docker.com/r/opea/codegen) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/CodeGen/docker/Dockerfile) | The docker image served as the codegen gateway to provide service of the automatic creation of source code from a higher-level representation | -| [opea/codegen-ui](https://hub.docker.com/r/opea/codegen-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/CodeGen/docker/ui/docker/Dockerfile) | The docker image acted as the codegen UI entry for facilitating interaction with users for automatically generating code from user's description | -| [opea/codegen-react-ui](https://hub.docker.com/r/opea/codegen-react-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/CodeGen/docker/ui/docker/Dockerfile.react) | The purpose of the docker image is to provide a user interface for Codegen using React. It allows generating the appropriate code based on the current user input. | -| [opea/codetrans](https://hub.docker.com/r/opea/codetrans) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/CodeTrans/docker/Dockerfile) | The docker image served as a codetrans gateway to provide service of converting source code written in one programming language into an equivalent version in another programming language | -| [opea/codetrans-ui](https://hub.docker.com/r/opea/codetrans-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/CodeTrans/docker/ui/docker/Dockerfile) | The docker image acted as the codetrans UI entry for facilitating interaction with users for translating one programming language to another one | -| [opea/docsum](https://hub.docker.com/r/opea/docsum) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/DocSum/docker/Dockerfile) | The docker image served as a docsum gateway to provide service of capturing the main points and essential details of the original text | -| [opea/docsum-ui](https://hub.docker.com/r/opea/docsum-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/DocSum/docker/ui/docker/Dockerfile) | The docker image acted as the docsum UI entry for facilitating interaction with users for document summarization | -| [opea/docsum-react-ui](https://hub.docker.com/r/opea/docsum-react-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/DocSum/docker/ui/docker/Dockerfile.react) | The purpose of the docker image is to provide a user interface for document summary using React. It allows upload a file or paste text and then click on “Generate Summary” to get a condensed summary of the generated content and automatically scroll to the bottom of the summary. | -| [opea/faqgen](https://hub.docker.com/r/opea/faqgen) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/FaqGen/docker/Dockerfile) | The docker image served as a faqgen gateway and automatically generating comprehensive, natural sounding Frequently Asked Questions (FAQs) from documents, legal texts, customer inquiries and other sources. | -| [opea/faqgen-ui](https://hub.docker.com/r/opea/faqgen-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/FaqGen/docker/ui/docker/Dockerfile) | The docker image serves as the docsum UI entry point for easy interaction with users, generating FAQs by pasting in question text. | -| [opea/faqgen-react-ui](https://hub.docker.com/r/opea/faqgen-react-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/FaqGen/docker/ui/docker/Dockerfile.react) | The purpose of the docker image is to provide a user interface for Generate FAQs using React. It allows generating FAQs by uploading files or pasting text. | -| [opea/searchqna](https://hub.docker.com/r/opea/searchqna/tags) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/SearchQnA/docker/Dockerfile) | The docker image served as the searchqna gateway to provide service of retrieving accurate and relevant answers to user queries from a knowledge base or dataset | -| [opea/searchqna-ui](https://hub.docker.com/r/opea/searchqna-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/SearchQnA/docker/ui/docker/Dockerfile) | The docker image acted as the searchqna UI entry for facilitating interaction with users for question answering | -| [opea/translation](https://hub.docker.com/r/opea/translation) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/Translation/docker/Dockerfile) | The docker image served as the translation gateway to provide service of language translation | -| [opea/translation-ui](https://hub.docker.com/r/opea/translation-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/Translation/docker/ui/docker/Dockerfile) | The docker image acted as the translation UI entry for facilitating interaction with users for language translation | +| Example Images | Dockerfile | Description | +| ----------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| [opea/audioqna](https://hub.docker.com/r/opea/audioqna) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/AudioQnA/docker/Dockerfile) | The docker image served as a chatqna gateway and using language modeling to generate answers to user queries by converting audio input to text, and then using text-to-speech (TTS) to convert those answers back to speech for interaction. | +| [opea/chatqna](https://hub.docker.com/r/opea/chatqna) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/ChatQnA/docker/Dockerfile) | The docker image served as a chatqna gateway and interacted with users by understanding their questions and providing relevant answers. | +| [opea/chatqna-ui](https://hub.docker.com/r/opea/chatqna-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/ChatQnA/ui/docker/Dockerfile) | The docker image acted as the chatqna UI entry for facilitating interaction with users for question answering | +| [opea/chatqna-conversation-ui](https://hub.docker.com/r/opea/chatqna-conversation-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/ChatQnA/ui/docker/Dockerfile.react) | The purpose of the docker image is to provide a user interface for chat-based Q&A using React. It allows for interaction with users and supports continuing conversations with a history that is stored in the browser's local storage. | +| [opea/chatqna-guardrails](https://hub.docker.com/r/opea/chatqna-guardrails) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/ChatQnA/Dockerfile.guardrails) | This docker image is used to encapsulate chatqna's LLM service to secure model inputs and outputs. Guardrails proactively prevents models from interacting with insecure content and signals in time to stop insecure behavior. | +| [opea/chatqna-without-rerank](https://hub.docker.com/r/opea/chatqna-without-rerank) | | | +| [opea/chat-conversation-service](https://hub.docker.com/r/opea/chat-conversation-service) | | | +| [opea/chat-conversation-ui-service](https://hub.docker.com/r/opea/chat-conversation-ui-service) | | | +| [opea/chat-history-service](https://hub.docker.com/r/opea/chat-history-service) | | | +| [opea/codegen](https://hub.docker.com/r/opea/codegen) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/CodeGen/docker/Dockerfile) | The docker image served as the codegen gateway to provide service of the automatic creation of source code from a higher-level representation | +| [opea/codegen-ui](https://hub.docker.com/r/opea/codegen-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/CodeGen/ui/docker/Dockerfile) | The docker image acted as the codegen UI entry for facilitating interaction with users for automatically generating code from user's description | +| [opea/codegen-react-ui](https://hub.docker.com/r/opea/codegen-react-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/CodeGen/ui/docker/Dockerfile.react) | The purpose of the docker image is to provide a user interface for Codegen using React. It allows generating the appropriate code based on the current user input. | +| [opea/codetrans](https://hub.docker.com/r/opea/codetrans) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/CodeTrans/docker/Dockerfile) | The docker image served as a codetrans gateway to provide service of converting source code written in one programming language into an equivalent version in another programming language | +| [opea/codetrans-ui](https://hub.docker.com/r/opea/codetrans-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/CodeTrans/ui/docker/Dockerfile) | The docker image acted as the codetrans UI entry for facilitating interaction with users for translating one programming language to another one | +| [opea/docsum](https://hub.docker.com/r/opea/docsum) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/DocSum/docker/Dockerfile) | The docker image served as a docsum gateway to provide service of capturing the main points and essential details of the original text | +| [opea/docsum-ui](https://hub.docker.com/r/opea/docsum-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/DocSum/ui/docker/Dockerfile) | The docker image acted as the docsum UI entry for facilitating interaction with users for document summarization | +| [opea/docsum-react-ui](https://hub.docker.com/r/opea/docsum-react-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/DocSum/ui/docker/Dockerfile.react) | The purpose of the docker image is to provide a user interface for document summary using React. It allows upload a file or paste text and then click on “Generate Summary” to get a condensed summary of the generated content and automatically scroll to the bottom of the summary. | +| [opea/faqgen](https://hub.docker.com/r/opea/faqgen) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/FaqGen/docker/Dockerfile) | The docker image served as a faqgen gateway and automatically generating comprehensive, natural sounding Frequently Asked Questions (FAQs) from documents, legal texts, customer inquiries and other sources. | +| [opea/faqgen-ui](https://hub.docker.com/r/opea/faqgen-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/FaqGen/ui/docker/Dockerfile) | The docker image serves as the docsum UI entry point for easy interaction with users, generating FAQs by pasting in question text. | +| [opea/faqgen-react-ui](https://hub.docker.com/r/opea/faqgen-react-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/FaqGen/ui/docker/Dockerfile.react) | The purpose of the docker image is to provide a user interface for Generate FAQs using React. It allows generating FAQs by uploading files or pasting text. | +| [opea/searchqna](https://hub.docker.com/r/opea/searchqna/tags) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/SearchQnA/docker/Dockerfile) | The docker image served as the searchqna gateway to provide service of retrieving accurate and relevant answers to user queries from a knowledge base or dataset | +| [opea/searchqna-ui](https://hub.docker.com/r/opea/searchqna-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/SearchQnA/ui/docker/Dockerfile) | The docker image acted as the searchqna UI entry for facilitating interaction with users for question answering | +| [opea/translation](https://hub.docker.com/r/opea/translation) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/Translation/docker/Dockerfile) | The docker image served as the translation gateway to provide service of language translation | +| [opea/translation-ui](https://hub.docker.com/r/opea/translation-ui) | [Link](https://github.com/opea-project/GenAIExamples/blob/main/Translation/ui/docker/Dockerfile) | The docker image acted as the translation UI entry for facilitating interaction with users for language translation | ## Microservice images -| Microservice Images | Dockerfile | Description | -| --------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| [opea/asr](https://hub.docker.com/r/opea/asr) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/asr/Dockerfile) | The docker image exposed the OPEA Audio-Speech-Recognition microservice for GenAI application use | -| [opea/comps-agent-langchain](https://hub.docker.com/r/opea/comps-agent-langchain) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/agent/langchain/docker/Dockerfile) | The docker image exposed the OPEA agent microservice for GenAI application use | -| [opea/dataprep-on-ray-redis](https://hub.docker.com/r/opea/dataprep-on-ray-redis) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/dataprep/redis/langchain_ray/docker/Dockerfile) | The docker image exposed the OPEA dataprep microservice based on redis vectordb and optimized ray for GenAI application use | -| [opea/dataprep-qdrant](https://hub.docker.com/r/opea/dataprep-qdrant) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/dataprep/qdrant/docker/Dockerfile) | The docker image exposed the OPEA dataprep microservice based on qdrant vectordb for GenAI application use | -| [opea/dataprep-redis](https://hub.docker.com/r/opea/dataprep-redis) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/dataprep/redis/langchain/docker/Dockerfile) | The docker image exposed the OPEA dataprep microservice based on redis vectordb for GenAI application use | -| [opea/embedding-tei](https://hub.docker.com/r/opea/embedding-tei) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/embeddings/langchain/docker/Dockerfile) | The docker image exposed the OPEA embedding microservice upon tei docker image for GenAI application use | -| [opea/gmcrouter](https://hub.docker.com/r/opea/gmcrouter) | [Link](https://github.com/opea-project/GenAIInfra/blob/main/microservices-connector/Dockerfile.manager) | The docker image served as one of key parts of the OPEA GenAI Microservice Connector(GMC) to route the traffic among the microservices defined in GMC | -| [opea/gmcmanager](https://hub.docker.com/r/opea/gmcmanager) | [Link](https://github.com/opea-project/GenAIInfra/blob/main/microservices-connector/Dockerfile.router) | The docker image served as one of key parts of the OPEA GenAI Microservice Connector(GMC) to be controller manager to handle GMC CRD | -| [opea/guardrails-tgi](https://hub.docker.com/r/opea/guardrails-tgi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/guardrails/llama_guard/docker/Dockerfile) | The docker image exposed the OPEA guardrail microservice to provide content review for GenAI application use | -| [opea/guardrails-pii-detection](https://hub.docker.com/r/opea/guardrails-pii-detection) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/guardrails/pii_detection/docker/Dockerfile) | The docker image exposed the OPEA guardrail microservice to provide PII detection for GenAI application use | -| [opea/habanalabs](https://hub.docker.com/r/opea/habanalabs) | | | -| [opea/knowledge_graphs](https://hub.docker.com/r/opea/knowledge_graphs) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/knowledgegraphs/langchain/docker/Dockerfile) | The docker image served as knowledge graph gateway to enhance question answering with graph knowledge searching. | -| [opea/llm-docsum-tgi](https://hub.docker.com/r/opea/llm-docsum-tgi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/llms/summarization/tgi/Dockerfile) | This docker image is designed to build a document summarization microservice using the HuggingFace Text Generation Inference(TGI) framework. The microservice accepts document input and generates a document summary. | -| [opea/llm-faqgen-tgi](https://hub.docker.com/r/opea/llm-faqgen-tgi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/llms/faq-generation/tgi/Dockerfile) | This docker image is designed to build a frequently asked questions microservice using the HuggingFace Text Generation Inference(TGI) framework. The microservice accepts document input and generates a FAQ. | -| [opea/llm-ollama](https://hub.docker.com/r/opea/llm-ollama) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/llms/text-generation/ollama/Dockerfile) | The docker image exposed the OPEA LLM microservice based on ollama for GenAI application use | -| [opea/llm-ray](https://hub.docker.com/r/opea/llm-ray) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/llms/text-generation/ray_serve/docker/Dockerfile.microservice) | The docker image exposed the OPEA LLM microservice based on Ray for GenAI application use | -| [opea/llm-tgi](https://hub.docker.com/r/opea/llm-tgi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/llms/text-generation/tgi/Dockerfile) | The docker image exposed the OPEA LLM microservice upon TGI docker image for GenAI application use | -| [opea/llm-vllm](https://hub.docker.com/r/opea/llm-vllm) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/llms/text-generation/vllm/docker/Dockerfile.microservice) | The docker image exposed the OPEA LLM microservice upon vLLM docker image for GenAI application use | -| [opea/llm-vllm-hpu](https://hub.docker.com/r/opea/llm-vllm-hpu) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/llms/text-generation/vllm/docker/Dockerfile.hpu) | The docker image exposed the OPEA LLM microservice upon vLLM docker image for use by GenAI apps on the Gaudi | -| [opea/llm-vllm-ray](https://hub.docker.com/r/opea/llm-vllm-ray) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/llms/text-generation/vllm-ray/docker/Dockerfile.microservice) | The docker image exposes the OPEA LLM microservices Ray-based upon the vLLM Docker image for GenAI application use | -| [opea/llm-vllm-ray-hpu](https://hub.docker.com/r/opea/llm-vllm-ray-hpu) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/llms/text-generation/vllm-ray/docker/Dockerfile.vllmray) | The docker image exposes Ray-based OPEA LLM microservices upon the vLLM Docker image for use by GenAI applications on the Gaudi | -| [opea/prompt-registry-service](https://hub.docker.com/r/opea/prompt-registry-service) | | | -| [opea/reranking-tei](https://hub.docker.com/r/opea/reranking-tei) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/reranks/tei/docker/Dockerfile) | The docker image exposed the OPEA reranking microservice based on tei docker image for GenAI application use | -| [opea/retriever-qdrant](https://hub.docker.com/r/opea/retriever-qdrant) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/retrievers/haystack/qdrant/docker/Dockerfile) | The docker image exposed the OPEA retrieval microservice based on qdrant vectordb for GenAI application use | -| [opea/retriever-redis](https://hub.docker.com/r/opea/retriever-redis) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/retrievers/langchain/redis/docker/Dockerfile) | The docker image exposed the OPEA retrieval microservice based on redis vectordb for GenAI application use | -| [opea/speecht5](https://hub.docker.com/r/opea/speecht5) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/tts/speecht5/Dockerfile) | The docker image exposed the OPEA SpeechT5 service for GenAI application use | -| [opea/speecht5-gaudi](https://hub.docker.com/r/opea/speecht5-gaudi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/tts/speecht5/Dockerfile_hpu) | The docker image exposed the OPEA SpeechT5 service on Gaudi2 for GenAI application use | -| [opea/tei-gaudi](https://hub.docker.com/r/opea/tei-gaudi/tags) | [Link](https://github.com/huggingface/tei-gaudi/blob/habana-main/Dockerfile-hpu) | The docker image powered by HuggingFace Text Embedding Inference (TEI) on Gaudi2 for deploying and serving Embedding Models | -| [opea/tts](https://hub.docker.com/r/opea/tts) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/tts/Dockerfile) | The docker image exposed the OPEA Text-To-Speech microservice for GenAI application use | -| [opea/vllm](https://hub.docker.com/r/opea/vllm) | [Link](https://github.com/vllm-project/vllm/blob/main/Dockerfile.cpu) | The docker image powered by vllm-project for deploying and serving vllm Models | -| [opea/web-retriever-chroma](https://hub.docker.com/r/opea/web-retriever-chroma) | [Link](https://github.com/opea-project/GenAIComps/tree/main/comps/web_retrievers/langchain/chroma/docker) | The docker image exposed the OPEA retrieval microservice based on chroma vectordb for GenAI application use | -| [opea/whisper](https://hub.docker.com/r/opea/whisper) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/asr/whisper/Dockerfile) | The docker image exposed the OPEA Whisper service for GenAI application use | -| [opea/whisper-gaudi](https://hub.docker.com/r/opea/whisper-gaudi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/asr/whisper/Dockerfile_hpu) | The docker image exposed the OPEA Whisper service on Gaudi2 for GenAI application use | +| Microservice Images | Dockerfile | Description | +| --------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| [opea/asr](https://hub.docker.com/r/opea/asr) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/asr/whisper/Dockerfile) | The docker image exposed the OPEA Audio-Speech-Recognition microservice for GenAI application use | +| [opea/comps-agent-langchain](https://hub.docker.com/r/opea/comps-agent-langchain) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/agent/langchain/Dockerfile) | The docker image exposed the OPEA agent microservice for GenAI application use | +| [opea/dataprep-on-ray-redis](https://hub.docker.com/r/opea/dataprep-on-ray-redis) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/dataprep/redis/langchain_ray/Dockerfile) | The docker image exposed the OPEA dataprep microservice based on redis vectordb and optimized ray for GenAI application use | +| [opea/dataprep-qdrant](https://hub.docker.com/r/opea/dataprep-qdrant) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/dataprep/qdrant/langchain/Dockerfile) | The docker image exposed the OPEA dataprep microservice based on qdrant vectordb for GenAI application use | +| [opea/dataprep-redis](https://hub.docker.com/r/opea/dataprep-redis) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/dataprep/redis/langchain/Dockerfile) | The docker image exposed the OPEA dataprep microservice based on redis vectordb for GenAI application use | +| [opea/embedding-tei](https://hub.docker.com/r/opea/embedding-tei) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/embeddings/tei/langchain/Dockerfile) | The docker image exposed the OPEA embedding microservice upon tei docker image for GenAI application use | +| [opea/gmcrouter](https://hub.docker.com/r/opea/gmcrouter) | [Link](https://github.com/opea-project/GenAIInfra/blob/main/microservices-connector/Dockerfile.manager) | The docker image served as one of key parts of the OPEA GenAI Microservice Connector(GMC) to route the traffic among the microservices defined in GMC | +| [opea/gmcmanager](https://hub.docker.com/r/opea/gmcmanager) | [Link](https://github.com/opea-project/GenAIInfra/blob/main/microservices-connector/Dockerfile.router) | The docker image served as one of key parts of the OPEA GenAI Microservice Connector(GMC) to be controller manager to handle GMC CRD | +| [opea/guardrails-tgi](https://hub.docker.com/r/opea/guardrails-tgi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/guardrails/llama_guard/langchain/Dockerfile) | The docker image exposed the OPEA guardrail microservice to provide content review for GenAI application use | +| [opea/guardrails-pii-detection](https://hub.docker.com/r/opea/guardrails-pii-detection) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/guardrails/pii_detection/docker/Dockerfile) | The docker image exposed the OPEA guardrail microservice to provide PII detection for GenAI application use | +| [opea/habanalabs](https://hub.docker.com/r/opea/habanalabs) | | | +| [opea/knowledge_graphs](https://hub.docker.com/r/opea/knowledge_graphs) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/knowledgegraphs/langchain/docker/Dockerfile) | The docker image served as knowledge graph gateway to enhance question answering with graph knowledge searching. | +| [opea/llm-docsum-tgi](https://hub.docker.com/r/opea/llm-docsum-tgi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/llms/summarization/tgi/langchain/Dockerfile) | This docker image is designed to build a document summarization microservice using the HuggingFace Text Generation Inference(TGI) framework. The microservice accepts document input and generates a document summary. | +| [opea/llm-faqgen-tgi](https://hub.docker.com/r/opea/llm-faqgen-tgi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/llms/faq-generation/tgi/langchain/Dockerfile) | This docker image is designed to build a frequently asked questions microservice using the HuggingFace Text Generation Inference(TGI) framework. The microservice accepts document input and generates a FAQ. | +| [opea/llm-ollama](https://hub.docker.com/r/opea/llm-ollama) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/llms/text-generation/ollama/langchain/Dockerfile) | The docker image exposed the OPEA LLM microservice based on ollama for GenAI application use | +| [opea/llm-ray](https://hub.docker.com/r/opea/llm-ray) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/llms/text-generation/ray_serve/docker/Dockerfile.microservice) | The docker image exposed the OPEA LLM microservice based on Ray for GenAI application use | +| [opea/llm-tgi](https://hub.docker.com/r/opea/llm-tgi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/llms/text-generation/tgi/Dockerfile) | The docker image exposed the OPEA LLM microservice upon TGI docker image for GenAI application use | +| [opea/llm-vllm](https://hub.docker.com/r/opea/llm-vllm) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/llms/text-generation/vllm/langchain/Dockerfile) | The docker image exposed the OPEA LLM microservice upon vLLM docker image for GenAI application use | +| [opea/llm-vllm-hpu](https://hub.docker.com/r/opea/llm-vllm-hpu) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/llms/text-generation/vllm/langchain/dependency/Dockerfile.intel_hpu) | The docker image exposed the OPEA LLM microservice upon vLLM docker image for use by GenAI apps on the Gaudi | +| [opea/llm-vllm-ray](https://hub.docker.com/r/opea/llm-vllm-ray) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/llms/text-generation/vllm/ray/Dockerfile) | The docker image exposes the OPEA LLM microservices Ray-based upon the vLLM Docker image for GenAI application use | +| [opea/llm-vllm-ray-hpu](https://hub.docker.com/r/opea/llm-vllm-ray-hpu) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/llms/text-generation/vllm/ray/dependency/Dockerfile) | The docker image exposes Ray-based OPEA LLM microservices upon the vLLM Docker image for use by GenAI applications on the Gaudi | +| [opea/prompt-registry-service](https://hub.docker.com/r/opea/prompt-registry-service) | | | +| [opea/reranking-tei](https://hub.docker.com/r/opea/reranking-tei) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/reranks/tei/Dockerfile) | The docker image exposed the OPEA reranking microservice based on tei docker image for GenAI application use | +| [opea/retriever-qdrant](https://hub.docker.com/r/opea/retriever-qdrant) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/retrievers/qdrant/haystack/Dockerfile) | The docker image exposed the OPEA retrieval microservice based on qdrant vectordb for GenAI application use | +| [opea/retriever-redis](https://hub.docker.com/r/opea/retriever-redis) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/retrievers/redis/langchain/Dockerfile) | The docker image exposed the OPEA retrieval microservice based on redis vectordb for GenAI application use | +| [opea/speecht5](https://hub.docker.com/r/opea/speecht5) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/tts/speecht5/dependency/Dockerfile) | The docker image exposed the OPEA SpeechT5 service for GenAI application use | +| [opea/speecht5-gaudi](https://hub.docker.com/r/opea/speecht5-gaudi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/tts/speecht5/dependency/Dockerfile.intel_hpu) | The docker image exposed the OPEA SpeechT5 service on Gaudi2 for GenAI application use | +| [opea/tei-gaudi](https://hub.docker.com/r/opea/tei-gaudi/tags) | [Link](https://github.com/huggingface/tei-gaudi/blob/habana-main/Dockerfile-hpu) | The docker image powered by HuggingFace Text Embedding Inference (TEI) on Gaudi2 for deploying and serving Embedding Models | +| [opea/tts](https://hub.docker.com/r/opea/tts) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/tts/speecht5/Dockerfile) | The docker image exposed the OPEA Text-To-Speech microservice for GenAI application use | +| [opea/vllm](https://hub.docker.com/r/opea/vllm) | [Link](https://github.com/vllm-project/vllm/blob/main/Dockerfile.cpu) | The docker image powered by vllm-project for deploying and serving vllm Models | +| [opea/web-retriever-chroma](https://hub.docker.com/r/opea/web-retriever-chroma) | [Link](https://github.com/opea-project/GenAIComps/tree/main/comps/web_retrievers/langchain/chroma/docker) | The docker image exposed the OPEA retrieval microservice based on chroma vectordb for GenAI application use | +| [opea/whisper](https://hub.docker.com/r/opea/whisper) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/asr/whisper/dependency/Dockerfile) | The docker image exposed the OPEA Whisper service for GenAI application use | +| [opea/whisper-gaudi](https://hub.docker.com/r/opea/whisper-gaudi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/asr/whisper/dependency/Dockerfile.intel_hpu) | The docker image exposed the OPEA Whisper service on Gaudi2 for GenAI application use |