Merge branch 'main' into dlsps/aditya/destination_fix

Author: ajagadi1

sample-applications/chat-question-and-answer-core/chart/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: chat-question-and-answer-core
 description: A Helm chart for deploying chatqna-core and its UI
-version: 1.1.2
+version: 1.2.0
 appVersion: "1.0"
 dependencies:
   - name: chatqna-ui

sample-applications/chat-question-and-answer-core/docker/compose.yaml

@@ -1,4 +1,13 @@
 services:
+  nginx:
+    image: nginx:latest
+    ports:
+      - "8102:80"
+    volumes:
+      - ../nginx.conf:/etc/nginx/nginx.conf:ro
+    depends_on:
+      - chatqna-core 
+      - chatqna-core-ui 
   chatqna-core:
     image: ${REGISTRY:-}chatqna:${BACKEND_TAG:-latest}
     profiles:

sample-applications/chat-question-and-answer-core/docs/user-guide/deploy-with-helm.md

@@ -115,7 +115,7 @@ kubectl get pods -n <your-namespace>
 kubectl get services -n <your-namespace>
 ```
 
-### Step 7: Retrieving the Service Endpoint (NodePort and NodeIP)
+### Step 7: Access the Application 
 
 Open the UI in a browser at http://\<node-ip\>:\<ui-node-port\>
 

sample-applications/chat-question-and-answer-core/docs/user-guide/get-started.md

@@ -101,7 +101,7 @@ By following this guide, you will learn how to:
       ```
 
 7. **Access the Application**:
-    Open a browser and go to `http://<host-ip>:5173` to access the application dashboard. The application dashboard allows the user to,
+    Open a browser and go to `http://<host-ip>:8102` to access the application dashboard. The application dashboard allows the user to,
     - Create and manage context by adding documents (pdf, docx, etc. Note: Web links are not supported for the Core version of the sample application. Note: There are restrictions on the max size of the document allowed.
     - Start Q&A session with the created context.
 

sample-applications/chat-question-and-answer-core/nginx.conf

@@ -0,0 +1,38 @@
+events {}
+
+http {
+    server {
+        listen       80;
+        listen  [::]:80;
+
+        client_max_body_size 500M;
+        proxy_read_timeout 300;
+        proxy_connect_timeout 300;
+        proxy_send_timeout 300; 
+
+        location / {
+            proxy_pass http://chatqna-core-ui:80;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "Upgrade";
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_cache_bypass $http_upgrade;
+        }
+
+        location /v1/chatqna {
+            proxy_pass http://chatqna-core:8888;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "Upgrade";
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_cache_bypass $http_upgrade;
+        }
+
+    }
+}

sample-applications/chat-question-and-answer-core/scripts/setup_env.sh

@@ -68,6 +68,8 @@ else
     mkdir "$MODEL_CACHE_PATH"
 fi
 
+
+# Export environment variables
 # Set COMPOSE_PROFILES based on device argument
 # If device is GPU, check if render device exists
 # If it exists, set to GPU-DEVICE
@@ -86,8 +88,6 @@ if [ "$DEVICE" == "GPU" ]; then
     fi
 fi
 
-# Export other environment variables
-export HOST_IP=$(hostname -I | awk '{print $1}')
 export GID=$(id -g ${USER})
 export HF_ACCESS_TOKEN="${HUGGINGFACEHUB_API_TOKEN}"
 export EMBEDDING_MODEL_ID="BAAI/bge-small-en-v1.5"
@@ -97,5 +97,6 @@ export EMBEDDING_DEVICE="${DEVICE}"
 export RERANKER_DEVICE="${DEVICE}"
 export LLM_DEVICE="${DEVICE}"
 export MODEL_CACHE_PATH="$MODEL_CACHE_PATH"
-export APP_BACKEND_URL="http://$HOST_IP:8888"
+
+export APP_BACKEND_URL="/v1/chatqna"
 export COMPOSE_PROFILES=$PROFILES

sample-applications/chat-question-and-answer-core/ui/.npmrc

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: chat-question-and-answer
 description: A helm chart for deploying Intel ChatQnA sample application
-version: 1.1.2
+version: 1.2.0
 dependencies:
   - name: vllmService
     version: 0.1.0
@@ -40,4 +40,4 @@ dependencies:
     repository: "file://subchart/reranker"
   - name: chatqna-ui
     version: 0.1.0
-    repository: "file://subchart/chatqna-ui"
+    repository: "file://subchart/chatqna-ui"

sample-applications/chat-question-and-answer/chart/Chart.yaml

@@ -1,4 +1,16 @@
 services:
+  nginx:
+    image: nginx:latest
+    ports:
+      - "8101:80"
+    volumes:
+      - ./nginx.conf:/etc/nginx/nginx.conf:ro
+    depends_on:
+      - chatqna 
+      - chatqna-ui
+      - dataprep_pgvector 
+    networks:
+      - my_network
   chatqna:
     image: ${BE_IMAGE_NAME}
     build:
@@ -96,7 +108,7 @@ services:
 
   chatqna-ui:
     image: ${FE_IMAGE_NAME}
-    container_name: chatqna-ui_server
+    container_name: chatqna-ui
     build:
       context: ./ui/react/
     ports:

sample-applications/chat-question-and-answer/docker-compose.yaml

@@ -139,7 +139,7 @@ kubectl get pods -n <your-namespace>
 kubectl get services -n <your-namespace>
 ```
 
-### Step 7: Retrieving the Service Endpoint (NodePort and NodeIP)
+### Step 7: Access the Application 
 
 Open the UI in a browser at http://\<node-ip\>:\<ui-node-port\>