ChatQnA demo yaml files integration between GMC and Oneclick (#72)

* demo yaml files integration between gmc and oneclick. Signed-off-by: zhlsunshine <huailong.zhang@intel.com> remove bin files * change code based on comments. Signed-off-by: zhlsunshine <huailong.zhang@intel.com> * update redis service name. Signed-off-by: zhlsunshine <huailong.zhang@intel.com> * change yaml files based on comments. Signed-off-by: zhlsunshine <huailong.zhang@intel.com> * change redis vectorDB svc name. Signed-off-by: zhlsunshine <huailong.zhang@intel.com> * integrate with oneclick and complete the test on stag-opea-07. Signed-off-by: zhlsunshine <huailong.zhang@intel.com> --------- Signed-off-by: zhlsunshine <huailong.zhang@intel.com>
opea-project · Jun 5, 2024 · 0208998 · 0208998
1 parent 6f687ef
commit 0208998
Show file tree

Hide file tree

Showing 21 changed files with 151 additions and 1,135 deletions.
diff --git a/...or/templates/MicroChatQnA/gmc-router.yaml → ...onnector/config/gmcrouter/gmc-router.yaml b/...or/templates/MicroChatQnA/gmc-router.yaml → ...onnector/config/gmcrouter/gmc-router.yaml
@@ -1,6 +1,8 @@
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
+
+---
 apiVersion: v1
 kind: Service
 metadata:
@@ -27,7 +29,7 @@ spec:
       labels:
         app: router-service
     spec:
-      serviceAccountName: gmc-service-sa
+      serviceAccountName: default
       containers:
       - name: router-server
         image: zhlsunshine/gmcrouter:latest

diff --git a/...r/templates/MicroChatQnA/gmc-manager.yaml → ...connector/config/manager/gmc-manager.yaml b/...r/templates/MicroChatQnA/gmc-manager.yaml → ...connector/config/manager/gmc-manager.yaml
diff --git a/...plates/MicroChatQnA/gmc-manager-rbac.yaml → ...nnector/config/rbac/gmc-manager-rbac.yaml b/...plates/MicroChatQnA/gmc-manager-rbac.yaml → ...nnector/config/rbac/gmc-manager-rbac.yaml
@@ -29,6 +29,7 @@ rules:
   resources:
   - services
   - secrets
+  - configmaps
   verbs:
   - create
   - delete

diff --git a/microservices-connector/config/samples/chatQnA.yaml b/microservices-connector/config/samples/chatQnA.yaml
diff --git a/microservices-connector/config/samples/chatQnA_xeon.yaml b/microservices-connector/config/samples/chatQnA_xeon.yaml
@@ -0,0 +1,62 @@
+# Copyright (C) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: gmc.opea.io/v1alpha3
+kind: GMConnector
+metadata:
+  labels:
+    app.kubernetes.io/name: gmconnector
+    app.kubernetes.io/managed-by: kustomize
+  name: chatqa
+  namespace: chatqa
+spec:
+  routerConfig:
+    name: router
+    serviceName: router-service
+  nodes:
+    root:
+      routerType: Sequence
+      steps:
+      - name: Embedding
+        internalService:
+          serviceName: embedding-svc
+          config:
+            endpoint: /v1/embeddings
+      - name: TeiEmbedding
+        internalService:
+          serviceName: tei-embedding-svc
+          isDownstreamService: true
+      - name: Retriever
+        data: $response
+        internalService:
+          serviceName: retriever-svc
+          config:
+            endpoint: /v1/retrieval
+      - name: VectorDB
+        internalService:
+          serviceName: redis-vector-db
+          isDownstreamService: true
+      - name: Reranking
+        data: $response
+        internalService:
+          serviceName: reranking-svc
+          config:
+            endpoint: /v1/reranking
+      - name: TeiReranking
+        internalService:
+          serviceName: tei-reranking-svc
+          config:
+            endpoint: /rerank
+          isDownstreamService: true
+      - name: Llm
+        data: $response
+        internalService:
+          serviceName: llm-svc
+          config:
+            endpoint: /v1/chat/completions
+      - name: Tgi
+        internalService:
+          serviceName: tgi-svc
+          config:
+            endpoint: /generate
+          isDownstreamService: true
diff --git a/microservices-connector/config/samples/gmc_v1alpha3_gmconnector.yaml b/microservices-connector/config/samples/gmc_v1alpha3_gmconnector.yaml