Merge branch 'main' into docsum

opea-project · Nov 14, 2024 · 90b23bf · 90b23bf
2 parents cc8ced9 + 73879d3
commit 90b23bf
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 5 deletions.
diff --git a/FaqGen/docker_compose/intel/cpu/xeon/README.md b/FaqGen/docker_compose/intel/cpu/xeon/README.md
@@ -79,6 +79,7 @@ export TGI_LLM_ENDPOINT="http://${your_ip}:8008"
 export HUGGINGFACEHUB_API_TOKEN=${your_hf_api_token}
 export MEGA_SERVICE_HOST_IP=${host_ip}
 export LLM_SERVICE_HOST_IP=${host_ip}
+export LLM_SERVICE_PORT=9000
 export BACKEND_SERVICE_ENDPOINT="http://${host_ip}:8888/v1/faqgen"
 ```
 

diff --git a/FaqGen/docker_compose/intel/cpu/xeon/compose.yaml b/FaqGen/docker_compose/intel/cpu/xeon/compose.yaml
@@ -46,6 +46,7 @@ services:
       - http_proxy=${http_proxy}
       - MEGA_SERVICE_HOST_IP=${MEGA_SERVICE_HOST_IP}
       - LLM_SERVICE_HOST_IP=${LLM_SERVICE_HOST_IP}
+      - LLM_SERVICE_PORT=${LLM_SERVICE_PORT}
     ipc: host
     restart: always
   faqgen-xeon-ui-server:
@@ -59,7 +60,7 @@ services:
       - no_proxy=${no_proxy}
       - https_proxy=${https_proxy}
       - http_proxy=${http_proxy}
-      - DOC_BASE_URL=${BACKEND_SERVICE_ENDPOINT}
+      - FAQ_BASE_URL=${BACKEND_SERVICE_ENDPOINT}
     ipc: host
     restart: always
 networks:

diff --git a/FaqGen/docker_compose/intel/hpu/gaudi/README.md b/FaqGen/docker_compose/intel/hpu/gaudi/README.md
@@ -80,6 +80,7 @@ export TGI_LLM_ENDPOINT="http://${your_ip}:8008"
 export HUGGINGFACEHUB_API_TOKEN=${your_hf_api_token}
 export MEGA_SERVICE_HOST_IP=${host_ip}
 export LLM_SERVICE_HOST_IP=${host_ip}
+export LLM_SERVICE_PORT=9000
 export BACKEND_SERVICE_ENDPOINT="http://${host_ip}:8888/v1/faqgen"
 ```
 

diff --git a/FaqGen/docker_compose/intel/hpu/gaudi/compose.yaml b/FaqGen/docker_compose/intel/hpu/gaudi/compose.yaml
@@ -56,6 +56,7 @@ services:
       - http_proxy=${http_proxy}
       - MEGA_SERVICE_HOST_IP=${MEGA_SERVICE_HOST_IP}
       - LLM_SERVICE_HOST_IP=${LLM_SERVICE_HOST_IP}
+      - LLM_SERVICE_PORT=${LLM_SERVICE_PORT}
     ipc: host
     restart: always
   faqgen-gaudi-ui-server:
@@ -69,7 +70,7 @@ services:
       - no_proxy=${no_proxy}
       - https_proxy=${https_proxy}
       - http_proxy=${http_proxy}
-      - DOC_BASE_URL=${BACKEND_SERVICE_ENDPOINT}
+      - FAQ_BASE_URL=${BACKEND_SERVICE_ENDPOINT}
     ipc: host
     restart: always
 

diff --git a/FaqGen/kubernetes/intel/cpu/xeon/manifest/faqgen_react_ui.yaml b/FaqGen/kubernetes/intel/cpu/xeon/manifest/faqgen_react_ui.yaml
@@ -264,7 +264,7 @@ spec:
       containers:
         - name: faqgen-react-ui
           env:
-            - name: DOC_BASE_URL
+            - name: FAQ_BASE_URL
               value: "http://faqgen:8888/v1/faqgen"
             - name: http_proxy
               value:

diff --git a/FaqGen/kubernetes/intel/cpu/xeon/manifest/faqgen_ui.yaml b/FaqGen/kubernetes/intel/cpu/xeon/manifest/faqgen_ui.yaml
@@ -22,7 +22,7 @@ spec:
       containers:
         - name: faq-mega-ui-deploy
           env:
-            - name: DOC_BASE_URL
+            - name: FAQ_BASE_URL
               value: http://{insert_your_ip_here}:7779/v1/faqgen
           image: opea/faqgen-ui:latest
           imagePullPolicy: IfNotPresent

diff --git a/FaqGen/kubernetes/intel/hpu/gaudi/manifest/faqgen_ui.yaml b/FaqGen/kubernetes/intel/hpu/gaudi/manifest/faqgen_ui.yaml
@@ -22,7 +22,7 @@ spec:
       containers:
         - name: faq-mega-ui-deploy
           env:
-            - name: DOC_BASE_URL
+            - name: FAQ_BASE_URL
               value: http://{insert_your_ip_here}:7779/v1/faqgen
           image: opea/faqgen-ui:latest
           imagePullPolicy: IfNotPresent

diff --git a/FaqGen/tests/test_compose_on_gaudi.sh b/FaqGen/tests/test_compose_on_gaudi.sh
@@ -34,6 +34,7 @@ function start_services() {
     export HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN}
     export MEGA_SERVICE_HOST_IP=${ip_address}
     export LLM_SERVICE_HOST_IP=${ip_address}
+    export LLM_SERVICE_PORT=9000
     export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:8888/v1/faqgen"
 
     sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env

diff --git a/FaqGen/tests/test_compose_on_xeon.sh b/FaqGen/tests/test_compose_on_xeon.sh
@@ -34,6 +34,7 @@ function start_services() {
     export HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN}
     export MEGA_SERVICE_HOST_IP=${ip_address}
     export LLM_SERVICE_HOST_IP=${ip_address}
+    export LLM_SERVICE_PORT=9000
     export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:8888/v1/faqgen"
 
     sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env