Skip to content

Commit a0e1cd5

Browse files
committed
Revert "Merge branch 'main' into agentqna_ui_fix"
This reverts commit fe0d83c, reversing changes made to 27f8d63.
1 parent fe0d83c commit a0e1cd5

File tree

6 files changed

+37
-6
lines changed

6 files changed

+37
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"{{endpoint}}":
2-
image: opea/agent:1.3
2+
image: ${REGISTRY}/agent:${TAG}
33
container_name: "{{endpoint}}"
44
volumes:
55
- ./agent-tools/:/home/user/tools/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"{{endpoint}}":
2-
image: opea/agent:1.3
2+
image: ${REGISTRY}/agent:${TAG}
33
container_name: "{{endpoint}}"
44
ports:
55
- "{{port_key}}:9096"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"{{endpoint}}":
2-
image: opea/agent:1.3
2+
image: ${REGISTRY}/agent:${TAG}
33
container_name: "{{endpoint}}"
44
depends_on:
55
__AGENT_ENDPOINTS__

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ spec:
8282
runAsGroup: 0
8383
containers:
8484
- name: rag-agent-container
85-
image: opea/agent:1.3
85+
image: ${REGISTRY}/agent:${TAG}
8686
command: ["/bin/sh", "-c"]
8787
args:
8888
- |

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

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,40 @@ spec:
4747
labels:
4848
app: "{endpoint}"
4949
spec:
50+
# initContainers:
51+
# - name: agentqna-tools
52+
# image: curlimages/curl:latest
53+
# command: ["/bin/sh", "-c"]
54+
# args:
55+
# - |
56+
# TOOLS_GIT_URL="https://github.com/opea-project/GenAIStudio/tree/main/studio-backend/app/templates/tools"
57+
# OWNER=$(echo ${TOOLS_GIT_URL} | sed -E 's|https://github.com/([^/]+)/([^/]+)/tree/([^/]+)/.*|\1|')
58+
# REPO=$(echo ${TOOLS_GIT_URL} | sed -E 's|https://github.com/([^/]+)/([^/]+)/tree/([^/]+)/.*|\2|')
59+
# BRANCH=$(echo ${TOOLS_GIT_URL} | sed -E 's|https://github.com/[^/]+/[^/]+/tree/([^/]+)/.*|\1|')
60+
# TOOLS_DIR=$(echo ${TOOLS_GIT_URL} | sed -E 's|https://github.com/[^/]+/[^/]+/tree/[^/]+/(.*?)/?$|\1|')
61+
# if [[ "${TOOLS_DIR: -1}" == "/" ]]; then TOOLS_DIR="${TOOLS_DIR%/}"; fi
62+
# DOWNLOAD_URL="https://codeload.github.com/${OWNER}/${REPO}/tar.gz/${BRANCH}"
63+
# curl "${DOWNLOAD_URL}" | tar -xz --strip-components=5 -C /home/user/tools/ "${REPO}-${BRANCH}/${TOOLS_DIR}"
64+
65+
# # Conditional wait for remote service based on llm_engine
66+
# if [ "$llm_engine" = "tgi" ]; then
67+
# until nc -z -v -w30 ${llm_endpoint_url#http://} 80; do
68+
# echo "Waiting for remote service...";
69+
# sleep 5;
70+
# done
71+
# fi
72+
# envFrom:
73+
# - configMapRef:
74+
# name: config-{endpoint}
75+
# volumeMounts:
76+
# - name: agent-tools
77+
# mountPath: /home/user/tools/
78+
# securityContext:
79+
# runAsUser: 0
80+
# runAsGroup: 0
5081
containers:
5182
- name: sql-agent-container
52-
image: opea/agent:1.3
83+
image: ${REGISTRY}/agent:${TAG}
5384
command: ["/bin/sh", "-c"]
5485
args:
5586
- |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ spec:
8282
runAsGroup: 0
8383
containers:
8484
- name: supervisor-agent-container
85-
image: opea/agent:1.3
85+
image: ${REGISTRY}/agent:${TAG}
8686
command: ["/bin/sh", "-c"]
8787
args:
8888
- |

0 commit comments

Comments
 (0)