Merge pull request #397 from 0xff-dev/prompt-output

chore: support for selecting llm with different namespace
kubebb · Jan 17, 2024 · 2426d25 · 2426d25
2 parents 1ea3af8 + 5743cb9
commit 2426d25
Show file tree

Hide file tree

Showing 18 changed files with 117 additions and 27 deletions.
diff --git a/.github/workflows/example_test.yaml b/.github/workflows/example_test.yaml
@@ -9,6 +9,7 @@ on:
 
 env:
   LOG_DIR: "/tmp/kubebb-core-example-test/logs"
+  GO_VER: "1.21.6"
 
 concurrency:
   group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
@@ -34,6 +35,7 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
           make docker-build
+
       - name: Save operator image to /tmp
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
@@ -77,6 +79,10 @@ jobs:
         run: |
           mkdir -p ${GITHUB_WORKSPACE}/bin 
           cp /usr/local/bin/kustomize ${GITHUB_WORKSPACE}/bin/kustomize
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version-file: "go.mod"
       - name: Rating test
         run: config/samples/rating_test.sh
         env:
@@ -113,6 +119,9 @@ jobs:
         run: |
           mkdir -p ${GITHUB_WORKSPACE}/bin 
           cp /usr/local/bin/kustomize ${GITHUB_WORKSPACE}/bin/kustomize
+      - uses: actions/setup-go@v4
+        with:
+          go-version-file: "go.mod"
       - name: Example test
         run: config/samples/example-test.sh
       - name: Upload logs if test fail

diff --git a/.github/workflows/image_build.yml b/.github/workflows/image_build.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [main]
 env:
-  GO_VER: 1.20
+  GO_VER: "1.21.6"
   GO_TAGS: ""
 
 jobs:
@@ -60,4 +60,4 @@ jobs:
             GO_VER=${{ env.GO_VER }}
             GO_TAGS=${{ env.GO_TAGS }}
             BUILD_ID=${{ env.SEMREV_LABEL }}
-            BUILD_DATE=${{ env.BUILD_DATE }}
+            BUILD_DATE=${{ env.BUILD_DATE }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -6,7 +6,7 @@ on:
     tags:
       - 'v*'
 env:
-  GO_VER: 1.20
+  GO_VER: 1.21
   GO_TAGS: ""
 permissions:
   contents: write

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -9,5 +9,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version-file: "go.mod"
       - name: verify test
-        run: hack/verify-all.sh
+        run: hack/verify-all.sh
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,5 @@
-FROM golang:1.20 as builder
+ARG GO_VER=1.21.6
+FROM golang:${GO_VER} as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

diff --git a/Makefile b/Makefile
@@ -272,4 +272,4 @@ deploy-lowcode: kustomize
 	$(KUSTOMIZE) build pipeline/lowcode | kubectl apply -f -	
 rerun: 
 	kubectl delete -f pipeline/lowcode/sample/publish.yaml
-	kubectl apply -f pipeline/lowcode/sample/publish.yaml
+	kubectl apply -f pipeline/lowcode/sample/publish.yaml
diff --git a/api/v1alpha1/rating_types.go b/api/v1alpha1/rating_types.go
@@ -18,7 +18,6 @@ package v1alpha1
 
 import (
 	arcadiav1 "github.com/kubeagi/arcadia/api/base/v1alpha1"
-	arcadiallms "github.com/kubeagi/arcadia/pkg/llms"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -87,7 +86,7 @@ type RatingSpec struct {
 
 type Evaluator struct {
 	// LLM defines the LLM to be used when evaluating the component
-	LLM arcadiallms.LLMType `json:"llm,omitempty"`
+	LLM *arcadiav1.TypedObjectReference `json:"llm,omitempty"`
 }
 
 type RatingStatus struct {

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/core.kubebb.k8s.com.cn_ratings.yaml b/config/crd/bases/core.kubebb.k8s.com.cn_ratings.yaml
@@ -43,7 +43,27 @@ spec:
                   llm:
                     description: LLM defines the LLM to be used when evaluating the
                       component
-                    type: string
+                    properties:
+                      apiGroup:
+                        description: APIGroup is the group for the resource being
+                          referenced. If APIGroup is not specified, the specified
+                          Kind must be in the core API group. For any other third-party
+                          types, APIGroup is required.
+                        type: string
+                      kind:
+                        description: Kind is the type of resource being referenced
+                        type: string
+                      name:
+                        description: Name is the name of resource being referenced
+                        type: string
+                      namespace:
+                        description: Namespace is the namespace of resource being
+                          referenced
+                        type: string
+                    required:
+                    - kind
+                    - name
+                    type: object
                 type: object
               pipelineParams:
                 description: PipelineParams List of parameters defined in the pipeline

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -70,7 +70,7 @@ spec:
         resources:
           limits:
             cpu: 5000m
-            memory: 1536Mi
+            memory: 2048Mi
           requests:
             cpu: 10m
             memory: 64Mi

diff --git a/config/samples/core_v1alpha1_rating_1.yaml b/config/samples/core_v1alpha1_rating_1.yaml
@@ -5,7 +5,10 @@ metadata:
   namespace: kubebb-system
 spec:
   evaluator:
-    llm: zhipuai
+    llm:
+      kind: LLM
+      name: zhipuai
+      namespace: kubebb-system
   componentName: repository-kubebb.kubebb-core
   pipelineParams:
     - pipelineName: component-reliability

diff --git a/config/samples/core_v1alpha1_rating_2.yaml b/config/samples/core_v1alpha1_rating_2.yaml
@@ -5,7 +5,10 @@ metadata:
   namespace: kubebb-system
 spec:
   evaluator:
-    llm: zhipuai
+    llm:
+      kind: LLM
+      name: zhipuai
+      namespace: kubebb-system
   componentName: repository-kubebb.kubebb-core
   pipelineParams:
     - pipelineName: component-reliability

diff --git a/config/samples/core_v1alpha1_rating_3.yaml b/config/samples/core_v1alpha1_rating_3.yaml
@@ -5,7 +5,10 @@ metadata:
   namespace: kubebb-system
 spec:
   evaluator:
-    llm: zhipuai
+    llm:
+      kind: LLM
+      name: zhipuai
+      namespace: kubebb-system
   componentName: repository-kubebb-disablerating.kubebb-core
   pipelineParams:
     - pipelineName: component-reliability

diff --git a/controllers/rating_controller.go b/controllers/rating_controller.go
@@ -339,8 +339,10 @@ func (r *RatingReconciler) PipelineRunUpdate(logger logr.Logger) func(event.Upda
 		}
 
 		// When pipelinerun succeeded and llm is set,evaluate this Rating status
-		if curCond.Reason == string(corev1alpha1.RatingSucceeded) && rating.Spec.LLM != "" {
-			arcEval, err := evaluator.NewEvaluator(logger, context.TODO(), r.Client, r.Scheme, types.NamespacedName{Namespace: rating.Namespace, Name: string(rating.Spec.Evaluator.LLM)})
+		if curCond.Reason == string(corev1alpha1.RatingSucceeded) && rating.Spec.LLM != nil {
+			llmNamespace := rating.Spec.LLM.GetNamespace(rating.Namespace)
+			arcEval, err := evaluator.NewEvaluator(logger, context.TODO(), r.Client, r.Scheme,
+				types.NamespacedName{Namespace: llmNamespace, Name: rating.Spec.LLM.Name})
 			if err != nil {
 				logger.Error(err, "failed to create arcadia evaluator")
 			} else {

diff --git a/go.mod b/go.mod
@@ -1,6 +1,8 @@
 module github.com/kubebb/core
 
-go 1.20
+go 1.21
+
+toolchain go1.21.5
 
 require (
 	github.com/Masterminds/semver/v3 v3.2.0
@@ -32,7 +34,7 @@ require (
 require (
 	github.com/goharbor/go-client v0.26.2
 	github.com/google/go-github/v54 v54.0.1-0.20230830144129-e3cda7864bce
-	github.com/kubeagi/arcadia v0.1.0
+	github.com/kubeagi/arcadia v0.1.1-0.20240109075426-459dcdee8128
 	github.com/spf13/cobra v1.6.1
 	github.com/tektoncd/pipeline v0.40.2
 	golang.org/x/oauth2 v0.13.0
@@ -62,7 +64,7 @@ require (
 	github.com/Masterminds/squirrel v1.5.3 // indirect
 	github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
 	github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
-	github.com/amikos-tech/chroma-go v0.0.0-20230901221218-d0087270239e // indirect
+	github.com/amikos-tech/chroma-go v0.0.0-20231228181736-e8f5e927093e // indirect
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blendle/zapdriver v1.3.1 // indirect
@@ -193,7 +195,7 @@ require (
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/tmc/langchaingo v0.0.0-20231209214832-00f364f27fe2 // indirect
+	github.com/tmc/langchaingo v0.1.3 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect