Merge pull request #440 from Lanture1064/dev

feat: add checkModelService API & fix bug
kubeagi · Dec 27, 2023 · 9c2752f · 9c2752f
2 parents 75f167c + 9e90dea
commit 9c2752f
Show file tree

Hide file tree

Showing 10 changed files with 278 additions and 11 deletions.
diff --git a/apiserver/graph/generated/generated.go b/apiserver/graph/generated/generated.go
diff --git a/apiserver/graph/generated/models_gen.go b/apiserver/graph/generated/models_gen.go
diff --git a/apiserver/graph/impl/modelservice.resolvers.go b/apiserver/graph/impl/modelservice.resolvers.go
diff --git a/apiserver/graph/schema/modelservice.gql b/apiserver/graph/schema/modelservice.gql
@@ -43,6 +43,11 @@ mutation createModelService($input: CreateModelServiceInput!) {
                 status
                 message
             }
+            resource {
+                cpu
+                nvidiaGPU
+                memory
+            }
         }
     }
 }
@@ -92,6 +97,11 @@ mutation updateModelService($input: UpdateModelServiceInput) {
                 status
                 message
             }
+            resource {
+                cpu
+                nvidiaGPU
+                memory
+            }
         }
     }
 }
@@ -215,4 +225,15 @@ query listModelServices($input: ListModelService) {
             }
         }
     }
+}
+
+query checkModelService($input: CreateModelServiceInput!) {
+    ModelService {
+        checkModelService(input: $input) {
+            name
+            namespace
+            apiType
+            description
+        }
+    }
 }
diff --git a/apiserver/graph/schema/modelservice.graphqls b/apiserver/graph/schema/modelservice.graphqls
@@ -137,6 +137,7 @@ extend type Mutation {
 type ModelServiceQuery {
     getModelService(name: String!, namespace: String!, apiType: String!): ModelService
     listModelServices(input: ListModelService): PaginatedResult!
+    checkModelService(input: CreateModelServiceInput!): ModelService!
 }
 
 extend type Query {

diff --git a/apiserver/pkg/embedder/embedder.go b/apiserver/pkg/embedder/embedder.go
@@ -125,6 +125,7 @@ func CreateEmbedder(ctx context.Context, c dynamic.Interface, input generated.Cr
 		// create auth secret
 		secret := common.MakeAuthSecretName(embedder.Name, "embedder")
 		err := common.MakeAuthSecret(ctx, c, generated.TypedObjectReferenceInput{
+			Kind:      "Secret",
 			Name:      secret,
 			Namespace: &input.Namespace,
 		}, input.Endpointinput.Auth, nil)
@@ -153,6 +154,7 @@ func CreateEmbedder(ctx context.Context, c dynamic.Interface, input generated.Cr
 		// user obj as the owner
 		secret := common.MakeAuthSecretName(embedder.Name, "embedder")
 		err := common.MakeAuthSecret(ctx, c, generated.TypedObjectReferenceInput{
+			Kind:      "Secret",
 			Name:      secret,
 			Namespace: &input.Namespace,
 		}, input.Endpointinput.Auth, obj)

diff --git a/apiserver/pkg/llm/llm.go b/apiserver/pkg/llm/llm.go
@@ -200,6 +200,7 @@ func CreateLLM(ctx context.Context, c dynamic.Interface, input generated.CreateL
 	if input.Endpointinput.Auth != nil {
 		secret := common.MakeAuthSecretName(llm.Name, "llm")
 		err := common.MakeAuthSecret(ctx, c, generated.TypedObjectReferenceInput{
+			Kind:      "Secret",
 			Name:      secret,
 			Namespace: &input.Namespace,
 		}, input.Endpointinput.Auth, nil)
@@ -218,7 +219,7 @@ func CreateLLM(ctx context.Context, c dynamic.Interface, input generated.CreateL
 		return nil, err
 	}
 
-	obj, err := c.Resource(schema.GroupVersionResource{Group: v1alpha1.GroupVersion.Group, Version: v1alpha1.GroupVersion.Version, Resource: "LLM"}).
+	obj, err := c.Resource(schema.GroupVersionResource{Group: v1alpha1.GroupVersion.Group, Version: v1alpha1.GroupVersion.Version, Resource: "llms"}).
 		Namespace(input.Namespace).Create(ctx, &unstructured.Unstructured{Object: unstructuredLLM}, metav1.CreateOptions{})
 	if err != nil {
 		return nil, err
@@ -229,6 +230,7 @@ func CreateLLM(ctx context.Context, c dynamic.Interface, input generated.CreateL
 		// user obj as the owner
 		secret := common.MakeAuthSecretName(llm.Name, "LLM")
 		err := common.MakeAuthSecret(ctx, c, generated.TypedObjectReferenceInput{
+			Kind:      "Secret",
 			Name:      secret,
 			Namespace: &input.Namespace,
 		}, input.Endpointinput.Auth, obj)
@@ -271,7 +273,7 @@ func DeleteLLMs(ctx context.Context, c dynamic.Interface, input *generated.Delet
 		labelSelector = *input.LabelSelector
 	}
 
-	resource := c.Resource(schema.GroupVersionResource{Group: v1alpha1.GroupVersion.Group, Version: v1alpha1.GroupVersion.Version, Resource: "LLMs"})
+	resource := c.Resource(schema.GroupVersionResource{Group: v1alpha1.GroupVersion.Group, Version: v1alpha1.GroupVersion.Version, Resource: "llms"})
 	if name != "" {
 		err := resource.Namespace(input.Namespace).Delete(ctx, name, metav1.DeleteOptions{})
 		if err != nil {