Finetuning + fixes

.github/workflows/_build-image-to-registry.yml

@@ -39,5 +39,5 @@ jobs:
       - name: Build Image and Push Image
         run: |
           sudo apt install ansible -y
-          ansible-playbook buildpush-genaistudio-images.yml -e "container_registry=${OPEA_IMAGE_REPO}opea" -e "container_tag=${{ inputs.tag }}"
+          ansible-playbook buildpush-genaistudio-images.yml -e "container_registry=${OPEA_IMAGE_REPO}opea" -e "container_tag=${{ inputs.tag }}" -e "http_proxy=${http_proxy}"
         working-directory: ${{ github.workspace }}/setup-scripts/build-image-to-registry/

.github/workflows/_e2e-test.yml

@@ -39,10 +39,19 @@ jobs:
       - name: Deploy GenAI Studio
         run: |
           sudo apt install ansible -y
-          ansible-playbook genai-studio.yml -e "container_registry=${OPEA_IMAGE_REPO}opea" -e "container_tag=${{ inputs.tag }}" -e "mysql_host=mysql.mysql.svc.cluster.local"
+          ansible-playbook genai-studio.yml -e "container_registry=${OPEA_IMAGE_REPO}opea" -e "container_tag=${{ inputs.tag }}" -e "mysql_host=mysql.mysql.svc.cluster.local" -e "http_proxy=${http_proxy}" || {
+            echo "Ansible playbook failed. Checking pod status..."
+            echo "=== Pods in studio namespace ==="
+            kubectl get pods -n studio
+            echo "=== Logs and events for non-Ready pods in studio namespace ==="
+            for pod in $(kubectl get pods -n studio --field-selector=status.phase!=Running,status.phase!=Succeeded -o jsonpath='{.items[*].metadata.name}'); do
+              echo "--- Pod: $pod ---"
+              kubectl describe pod $pod -n studio
+              kubectl logs $pod -n studio --all-containers=true --tail=100 || echo "Could not fetch logs for $pod"
+            done
+            exit 1
+          }
           sleep 5
-          kubectl wait --for=condition=ready pod --all --namespace=studio --timeout=300s --field-selector=status.phase!=Succeeded
-          kubectl wait --for=condition=ready pod --all --namespace=monitoring --timeout=300s --field-selector=status.phase!=Succeeded
         working-directory: ${{ github.workspace }}/setup-scripts/setup-genai-studio/
 
       - name: Set up Node.js
@@ -74,25 +83,10 @@ jobs:
           name: playwright-test-results
           path: ${{ github.workspace }}/tests/playwright/playwright-report
 
-      - name: Cleanup sandbox namespaces
+      - name: Cleanup GenAI Studio
         if: always()
         run: |
-          if kubectl get namespace mysql; then
-            kubectl delete ns mysql || true
-          fi
-          if kubectl get namespace tracing; then
-            kubectl delete ns tracing || true
-          fi
-          for ns in $(kubectl get namespaces -o jsonpath='{.items[*].metadata.name}' | tr ' ' '\n' | grep '^sandbox-'); do
-            kubectl delete namespace $ns || true
-          done
-          if kubectl get namespace studio; then
-            kubectl delete -f manifests/studio-manifest.yaml || true
-            kubectl wait --for=delete pod --all --namespace=studio --timeout=300s
-          fi
-          if kubectl get namespace monitoring; then
-            kubectl delete -f manifests/monitoring-manifest.yaml || true
-            kubectl wait --for=delete pod --all --namespace=monitoring --timeout=300s
-          fi
+          echo "Running GenAI Studio cleanup script..."
+          ./cleanup-genai-studio.sh || echo "Cleanup script completed with warnings"
         working-directory: ${{ github.workspace }}/setup-scripts/setup-genai-studio/
 

app-backend/Dockerfile

@@ -1,5 +1,15 @@
 FROM python:3.11-slim
 
+# Accept proxy build arguments
+ARG http_proxy
+ARG https_proxy
+ARG no_proxy
+
+# Set proxy environment variables for package managers
+ENV http_proxy=${http_proxy}
+ENV https_proxy=${https_proxy}
+ENV no_proxy=${no_proxy}
+
 RUN apt-get update -y && apt-get install -y --no-install-recommends --fix-missing \
     libsqlite3-0 \
     libjemalloc-dev \

app-backend/megaservice.py

@@ -170,7 +170,7 @@ def add_remote_service(self):
                 microservice_name = node['name'].split('@')[1]
                 if "docsum" in microservice_name:
                     self.is_docsum = True
-                service_node_ip = node_id.split('@')[1].replace('_','-') if USE_NODE_ID_AS_IP else HOST_IP
+                service_node_ip = f"opea-{node_id.split('@')[1].replace('_','-')}" if USE_NODE_ID_AS_IP else HOST_IP
                 microservice = templates[microservice_name].get_service(host_ip=service_node_ip, node_id_as_ip=USE_NODE_ID_AS_IP, port=os.getenv(f"{node_id.split('@')[1]}_port", None))
                 microservice.name = node_id
                 self.services[node_id] = microservice

app-backend/orchestrator.py

@@ -272,7 +272,6 @@ async def execute(
                         url=endpoint,
                         data=json.dumps(inputs),
                         headers={"Content-type": "application/json", "Authorization": f"Bearer {access_token}"},
-                        proxies={"http": None},
                         stream=True,
                         timeout=2000,
                     )
@@ -283,7 +282,6 @@ async def execute(
                         headers={
                             "Content-type": "application/json",
                         },
-                        proxies={"http": None},
                         stream=True,
                         timeout=2000,
                     )
@@ -316,7 +314,6 @@ def generate():
                                                 "Content-type": "application/json",
                                                 "Authorization": f"Bearer {access_token}",
                                             },
-                                            proxies={"http": None},
                                             timeout=2000,
                                         )
                                     else:
@@ -326,7 +323,6 @@ def generate():
                                             headers={
                                                 "Content-type": "application/json",
                                             },
-                                            proxies={"http": None},
                                             timeout=2000,
                                         )
                                     res_json = res.json()

app-frontend/Dockerfile

@@ -2,13 +2,23 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Use node 20.11.1 as the base image
-FROM node:20.11.1 as vite-app
+FROM node:20.11.1 AS vite-app
+
+# Accept proxy build arguments
+ARG http_proxy
+ARG https_proxy
+ARG no_proxy
+
+# Set proxy environment variables for package managers
+ENV http_proxy=${http_proxy}
+ENV https_proxy=${https_proxy}
+ENV no_proxy=${no_proxy}
 
 COPY ./react /usr/app/react
 WORKDIR /usr/app/react
 
 
-RUN ["npm", "install"]
+RUN ["npm", "install", "--legacy-peer-deps"]
 RUN ["npm", "run", "build"]
 
 

app-frontend/react/src/components/SideBar/SideBar.tsx

@@ -79,7 +79,6 @@ export const LinkedMenuItem: React.FC<LinkedMenuItemProps> = ({
         to={toWithQuery(to)}
         onClick={onClick}
         tabIndex={open ? 0 : -1}
-        aria-hidden={!open}
       >
         {children}
       </Link>

setup-scripts/build-image-to-registry/buildpush-genaicomps-images.yml

@@ -15,13 +15,21 @@
         dest: /tmp/GenAIComps
         clone: yes
         update: no
+      environment:
+        http_proxy: "{{ http_proxy }}"
+        https_proxy: "{{ http_proxy }}"
+        no_proxy: "{{ no_proxy }}"
       when: not genaicomp_dir.stat.exists
 
-    - name: Pull latest changes in GenAIComps repo
+    - name: Checkout specific GenAIComps tag
       git:
         repo: https://github.com/opea-project/GenAIComps.git
         dest: /tmp/GenAIComps
-        update: yes
+        version: "{{ genaicomps_tag }}"
+      environment:
+        http_proxy: "{{ http_proxy }}"
+        https_proxy: "{{ http_proxy }}"
+        no_proxy: "{{ no_proxy }}"
       when: genaicomp_dir.stat.exists
 
     - name: Build and push GenAIComps images
@@ -38,11 +46,25 @@
           - { name: 'asr', dockerfile: 'comps/asr/src/Dockerfile' }
       block:
         - name: Build image
-          command: docker build -t {{ container_registry }}/{{ item.name }}:{{ container_tag }} -f {{ item.dockerfile }} .
+          command: >
+            docker build 
+            --build-arg http_proxy="{{ http_proxy }}"
+            --build-arg https_proxy="{{ http_proxy }}"
+            --build-arg no_proxy="{{ no_proxy }}"
+            -t {{ container_registry }}/{{ item.name }}:{{ container_tag }} 
+            -f {{ item.dockerfile }} .
           args:
             chdir: /tmp/GenAIComps
+          environment:
+            http_proxy: "{{ http_proxy }}"
+            https_proxy: "{{ http_proxy }}"
+            no_proxy: "{{ no_proxy }}"
           loop: "{{ genaicomp_images }}"
 
         - name: Push image
           command: docker push {{ container_registry }}/{{ item.name }}:{{ container_tag }}
+          environment:
+            http_proxy: "{{ http_proxy }}"
+            https_proxy: "{{ http_proxy }}"
+            no_proxy: "{{ no_proxy }}"
           loop: "{{ genaicomp_images }}"

setup-scripts/build-image-to-registry/buildpush-genaistudio-images.yml

@@ -5,9 +5,18 @@
     - vars.yml
   tasks:
     - name: Build Docker image
-      command: docker build -t "{{ container_registry }}/{{ item.image_name }}:{{ container_tag }}" .
+      command: >
+        docker build 
+        --build-arg http_proxy="{{ http_proxy }}"
+        --build-arg https_proxy="{{ http_proxy }}"
+        --build-arg no_proxy="{{ no_proxy }}"
+        -t "{{ container_registry }}/{{ item.image_name }}:{{ container_tag }}" .
       args:
         chdir: "{{ item.directory }}"
+      environment:
+        http_proxy: "{{ http_proxy }}"
+        https_proxy: "{{ http_proxy }}"
+        no_proxy: "{{ no_proxy }}"
       loop:
         - { directory: '../../studio-frontend/', image_name: 'studio-frontend' }
         - { directory: '../../studio-backend/', image_name: 'studio-backend' }
@@ -17,6 +26,10 @@
 
     - name: Push Docker image
       command: docker push "{{ container_registry }}/{{ item.image_name }}:{{ container_tag }}"
+      environment:
+        http_proxy: "{{ http_proxy }}"
+        https_proxy: "{{ http_proxy }}"
+        no_proxy: "{{ no_proxy }}"
       loop:
         - { image_name: 'studio-frontend' }
         - { image_name: 'studio-backend' }

setup-scripts/build-image-to-registry/vars.yml

@@ -1,2 +1,7 @@
-container_registry: 'opea'
-container_tag: 'latest'
+# Container registry configuration
+# Replace {{ ansible_default_ipv4.address }} with your Kubernetes master/API endpoint IP if needed
+container_registry: '{{ ansible_default_ipv4.address }}:5000/opea'
+container_tag: 'latest'
+genaicomps_tag: 'main'
+http_proxy: ''
+no_proxy: 'localhost,127.0.0.1,.local,.svc.cluster.local,{{ ansible_default_ipv4.address }}'