From c377fb0c4ceacc46aa34ff48a0e79027b50abe39 Mon Sep 17 00:00:00 2001
From: Dolpher Du <dolpher.du@intel.com>
Date: Fri, 17 Jan 2025 14:14:20 +0000
Subject: [PATCH] Add AgentQnA UI

Add AgentQnA UI support, and fix 2 issues.

Signed-off-by: Dolpher Du <dolpher.du@intel.com>
---
 helm-charts/agentqna/Chart.yaml                   |  7 +++++++
 helm-charts/agentqna/templates/nginx.yaml         | 15 +++++++++++++++
 helm-charts/agentqna/values.yaml                  | 11 +++++++++++
 helm-charts/common/agent/templates/configmap.yaml |  4 ++--
 .../common/agent/templates/tests/test-pod.yaml    |  2 +-
 helm-charts/common/ui/templates/configmap.yaml    |  2 ++
 .../common/ui/variant_agentqna_svelte-values.yaml | 10 ++++++++++
 7 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 helm-charts/agentqna/templates/nginx.yaml
 create mode 100644 helm-charts/common/ui/variant_agentqna_svelte-values.yaml

diff --git a/helm-charts/agentqna/Chart.yaml b/helm-charts/agentqna/Chart.yaml
index 81aa6b5a..48ebffb2 100644
--- a/helm-charts/agentqna/Chart.yaml
+++ b/helm-charts/agentqna/Chart.yaml
@@ -47,5 +47,12 @@ dependencies:
   - name: data-prep
     version: 0-latest
     repository: "file://../common/data-prep"
+  - name: ui
+    alias: agentqna-ui
+    version: 0-latest
+    repository: "file://../common/ui"
+  - name: nginx
+    version: 0-latest
+    repository: "file://../common/nginx"
 version: 0-latest
 appVersion: "v1.0"
diff --git a/helm-charts/agentqna/templates/nginx.yaml b/helm-charts/agentqna/templates/nginx.yaml
new file mode 100644
index 00000000..bd5aeb4c
--- /dev/null
+++ b/helm-charts/agentqna/templates/nginx.yaml
@@ -0,0 +1,15 @@
+# Copyright (C) 2025 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-nginx-config
+  labels:
+    {{- include "agentqna.labels" . | nindent 4 }}
+data:
+  FRONTEND_SERVICE_IP: {{ include "ui.fullname" (index .Subcharts "agentqna-ui") | quote }}
+  FRONTEND_SERVICE_PORT: {{ index .Values "agentqna-ui" "service" "port" | quote }}
+  BACKEND_SERVICE_NAME: chat/completions
+  BACKEND_SERVICE_IP: {{ include "agentqna.fullname" (index .Subcharts "supervisor") | quote }}
+  BACKEND_SERVICE_PORT: {{ .Values.supervisor.service.port | quote }}
diff --git a/helm-charts/agentqna/values.yaml b/helm-charts/agentqna/values.yaml
index d9e63d06..e2568f90 100644
--- a/helm-charts/agentqna/values.yaml
+++ b/helm-charts/agentqna/values.yaml
@@ -153,6 +153,17 @@ vllm:
   VLLM_SKIP_WARMUP: true
   extraCmdArgs: ["--tensor-parallel-size", "4", "--max-seq_len-to-capture", "16384"]
 
+nginx:
+  service:
+    type: NodePort
+
+agentqna-ui:
+  image:
+    repository: opea/agent-ui
+    tag: "latest"
+  BACKEND_SERVICE_ENDPOINT: "/v1/chat/completions"
+  containerPort: 5173
+
 global:
   http_proxy: ""
   https_proxy: ""
diff --git a/helm-charts/common/agent/templates/configmap.yaml b/helm-charts/common/agent/templates/configmap.yaml
index 6d41750d..aa3d872d 100644
--- a/helm-charts/common/agent/templates/configmap.yaml
+++ b/helm-charts/common/agent/templates/configmap.yaml
@@ -47,12 +47,12 @@ data:
   {{- if .Values.WORKER_AGENT_URL }}
   WORKER_AGENT_URL: {{ .Values.WORKER_AGENT_URL | quote }}
   {{- else }}
-  WORKER_AGENT_URL: "http://{{ .Release.Name }}-rag-agent:9095/v1/chat/completions"
+  WORKER_AGENT_URL: "http://{{ .Release.Name }}-ragagent:9095/v1/chat/completions"
   {{- end }}
   {{- if .Values.SQL_AGENT_URL }}
   SQL_AGENT_URL: {{ .Values.SQL_AGENT_URL | quote }}
   {{- else }}
-  SQL_AGENT_URL: "http://{{ .Release.Name }}-sql-agent:9096/v1/chat/completions"
+  SQL_AGENT_URL: "http://{{ .Release.Name }}-sqlagent:9096/v1/chat/completions"
   {{- end }}
   require_human_feedback: {{ .Values.require_human_feedback | quote }}
   recursion_limit: {{ .Values.recursion_limit | quote }}
diff --git a/helm-charts/common/agent/templates/tests/test-pod.yaml b/helm-charts/common/agent/templates/tests/test-pod.yaml
index 9c65831b..5719da2e 100644
--- a/helm-charts/common/agent/templates/tests/test-pod.yaml
+++ b/helm-charts/common/agent/templates/tests/test-pod.yaml
@@ -17,7 +17,7 @@ spec:
       command: ['bash', '-c']
       args:
         - |
-          if [ {{ include "agent.fullname" . }} != "agent" ]; then
+          if [[ {{ include "agent.fullname" . }} != "agent"* ]]; then
             echo "Skip test."
             exit 0
           fi
diff --git a/helm-charts/common/ui/templates/configmap.yaml b/helm-charts/common/ui/templates/configmap.yaml
index 61f6272a..a8ecdc57 100644
--- a/helm-charts/common/ui/templates/configmap.yaml
+++ b/helm-charts/common/ui/templates/configmap.yaml
@@ -37,4 +37,6 @@ data:
   VITE_FAQ_GEN_URL: {{ .Values.BACKEND_SERVICE_ENDPOINT | quote }}
   {{- else if contains "faqgen-ui" .Values.image.repository }}
   FAQ_BASE_URL: {{ .Values.BACKEND_SERVICE_ENDPOINT | quote }}
+  {{- else if contains "agent-ui" .Values.image.repository }}
+  AGENT_URL: {{ .Values.BACKEND_SERVICE_ENDPOINT | quote }}
   {{- end }}
diff --git a/helm-charts/common/ui/variant_agentqna_svelte-values.yaml b/helm-charts/common/ui/variant_agentqna_svelte-values.yaml
new file mode 100644
index 00000000..c0611be4
--- /dev/null
+++ b/helm-charts/common/ui/variant_agentqna_svelte-values.yaml
@@ -0,0 +1,10 @@
+# Copyright (C) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+image:
+  repository: opea/agent-ui
+  tag: "latest"
+
+containerPort: 5173
+
+BACKEND_SERVICE_ENDPOINT: "/v1/chat/completions"