update for sql agent

Signed-off-by: wwanrif <wan.abdul.hakim.b.wan.arif@intel.com>

Author: wanhakim

.gitignore

@@ -1,3 +1,4 @@
 test-results/
 **.log
-**/report.html
+**/report.html
+docker-compose

setup-scripts/setup-genai-studio/playbooks/deploy-studio.yml

@@ -62,7 +62,7 @@
         MYSQL_HOST: "{{ mysql_host }}"
 
     - name: Wait for all pods to be ready in studio namespace
-      shell: kubectl wait --for=condition=ready pod --all --namespace=studio --timeout=300s
+      shell: kubectl wait --for=condition=ready pod --all --namespace=studio --timeout=420s
       register: pod_ready_check
       failed_when: pod_ready_check.rc != 0
       changed_when: false

studio-backend/app/templates/app/app.compose.yaml

@@ -48,6 +48,6 @@ app-nginx:
     - BACKEND_SERVICE_IP=${public_host_ip}
     - BACKEND_SERVICE_PORT=8888
     - DATAPREP_SERVICE_IP=${public_host_ip}
-    - DATAPREP_SERVICE_PORT=6007
+    - DATAPREP_SERVICE_PORT=${prepare_doc_redis_prep_0_port}
   ipc: host
   restart: always

studio-backend/app/templates/microsvc-composes/sql-agent.yaml

@@ -3,8 +3,8 @@
   container_name: "{{endpoint}}"
   ports:
     - "{{port_key}}:9096"
-  volumes:
-    - ./agent-tools/:/home/user/tools/
+  # volumes:
+  #   - ./agent-tools/:/home/user/tools/
   ipc: host
   environment:
     ip_address: ${public_host_ip}

studio-backend/app/templates/microsvc-manifests/sql-agent.yaml

@@ -47,37 +47,37 @@ spec:
       labels:
         app: "{endpoint}"
     spec:
-      initContainers:
-        - name: agentqna-tools
-          image: curlimages/curl:latest
-          command: ["/bin/sh", "-c"]
-          args:
-            - |
-              TOOLS_GIT_URL="https://github.com/opea-project/GenAIStudio/tree/main/studio-backend/app/templates/tools"
-              OWNER=$(echo ${TOOLS_GIT_URL} | sed -E 's|https://github.com/([^/]+)/([^/]+)/tree/([^/]+)/.*|\1|')
-              REPO=$(echo ${TOOLS_GIT_URL} | sed -E 's|https://github.com/([^/]+)/([^/]+)/tree/([^/]+)/.*|\2|')
-              BRANCH=$(echo ${TOOLS_GIT_URL} | sed -E 's|https://github.com/[^/]+/[^/]+/tree/([^/]+)/.*|\1|')
-              TOOLS_DIR=$(echo ${TOOLS_GIT_URL} | sed -E 's|https://github.com/[^/]+/[^/]+/tree/[^/]+/(.*?)/?$|\1|')
-              if [[ "${TOOLS_DIR: -1}" == "/" ]]; then TOOLS_DIR="${TOOLS_DIR%/}"; fi
-              DOWNLOAD_URL="https://codeload.github.com/${OWNER}/${REPO}/tar.gz/${BRANCH}"
-              curl "${DOWNLOAD_URL}" | tar -xz --strip-components=5 -C /home/user/tools/ "${REPO}-${BRANCH}/${TOOLS_DIR}"
+      # initContainers:
+      #   - name: agentqna-tools
+      #     image: curlimages/curl:latest
+      #     command: ["/bin/sh", "-c"]
+      #     args:
+      #       - |
+      #         TOOLS_GIT_URL="https://github.com/opea-project/GenAIStudio/tree/main/studio-backend/app/templates/tools"
+      #         OWNER=$(echo ${TOOLS_GIT_URL} | sed -E 's|https://github.com/([^/]+)/([^/]+)/tree/([^/]+)/.*|\1|')
+      #         REPO=$(echo ${TOOLS_GIT_URL} | sed -E 's|https://github.com/([^/]+)/([^/]+)/tree/([^/]+)/.*|\2|')
+      #         BRANCH=$(echo ${TOOLS_GIT_URL} | sed -E 's|https://github.com/[^/]+/[^/]+/tree/([^/]+)/.*|\1|')
+      #         TOOLS_DIR=$(echo ${TOOLS_GIT_URL} | sed -E 's|https://github.com/[^/]+/[^/]+/tree/[^/]+/(.*?)/?$|\1|')
+      #         if [[ "${TOOLS_DIR: -1}" == "/" ]]; then TOOLS_DIR="${TOOLS_DIR%/}"; fi
+      #         DOWNLOAD_URL="https://codeload.github.com/${OWNER}/${REPO}/tar.gz/${BRANCH}"
+      #         curl "${DOWNLOAD_URL}" | tar -xz --strip-components=5 -C /home/user/tools/ "${REPO}-${BRANCH}/${TOOLS_DIR}"
 
-              # Conditional wait for remote service based on llm_engine
-              if [ "$llm_engine" = "tgi" ]; then
-                until nc -z -v -w30 ${llm_endpoint_url#http://} 80; do
-                  echo "Waiting for remote service...";
-                  sleep 5;
-                done
-              fi
-          envFrom:
-            - configMapRef:
-                name: config-{endpoint}
-          # volumeMounts:
-          #   - name: agent-tools
-          #     mountPath: /home/user/tools/
-          securityContext:
-            runAsUser: 0
-            runAsGroup: 0
+      #         # Conditional wait for remote service based on llm_engine
+      #         if [ "$llm_engine" = "tgi" ]; then
+      #           until nc -z -v -w30 ${llm_endpoint_url#http://} 80; do
+      #             echo "Waiting for remote service...";
+      #             sleep 5;
+      #           done
+      #         fi
+      #     envFrom:
+      #       - configMapRef:
+      #           name: config-{endpoint}
+      #     volumeMounts:
+      #       - name: agent-tools
+      #         mountPath: /home/user/tools/
+      #     securityContext:
+      #       runAsUser: 0
+      #       runAsGroup: 0
       containers:
         - name: sql-agent-container
           image: ${REGISTRY}/agent:${TAG}
@@ -93,8 +93,8 @@ spec:
           ports:
             - containerPort: 9096
           # volumeMounts:
-            # - name: agent-tools
-            #   mountPath: /home/user/tools/
+          #   - name: agent-tools
+          #     mountPath: /home/user/tools/
           envFrom:
             - configMapRef:
                 name: config-{endpoint}