Merge pull request #422 from 0xff-dev/main

feat: list llms and embedders
kubeagi · Dec 22, 2023 · d34d697 · d34d697
2 parents 09de386 + 3aeb625
commit d34d697
Show file tree

Hide file tree

Showing 10 changed files with 886 additions and 103 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
@@ -40,4 +40,119 @@ mutation deleteModelServices($input: DeleteCommonInput) {
     ModelService {
         deleteModelService(input: $input)
     }
+}
+
+query getModelService($name: String!, $namespace: String!, $apiType: String!) {
+    ModelService {
+        getModelService(name: $name, namespace: $namespace, apiType: $apiType) {
+            id
+            name
+            namespace
+            labels
+            annotations
+            creator
+            displayName
+            description
+            types
+            apiType
+            creationTimestamp
+            updateTimestamp 
+            llmResource {
+                name
+                namespace
+                labels
+                annotations
+                displayName
+                description
+                baseUrl
+                models
+                provider
+                type
+                updateTimestamp
+                status
+                message
+            }
+            embedderResource{
+                name
+                namespace
+                labels
+                annotations
+                displayName
+                description
+                baseUrl
+                models
+                provider
+                type
+                updateTimestamp
+                status
+                message
+            }
+            resource {
+                cpu
+                memory
+                nvidiaGPU
+            }
+        }
+    }
+}
+
+query listModelServices($input: ListModelService) {
+    ModelService {
+        listModelServices(input: $input) {
+            totalCount
+            hasNextPage
+            nodes {
+                __typename
+                ... on ModelService {
+                    id
+                    name
+                    namespace
+                    labels
+                    annotations
+                    creator
+                    displayName
+                    description
+                    types
+                    apiType
+                    creationTimestamp
+                    updateTimestamp 
+                    llmResource {
+                        name
+                        namespace
+                        labels
+                        annotations
+                        displayName
+                        description
+                        baseUrl
+                        models
+                        provider
+                        type
+                        updateTimestamp
+                        status
+                        message
+                    }
+                    embedderResource{
+                        name
+                        namespace
+                        labels
+                        annotations
+                        displayName
+                        description
+                        baseUrl
+                        models
+                        provider
+                        type
+                        updateTimestamp
+                        status
+                        message
+                    }
+                    resource {
+                        cpu
+                        memory
+                        nvidiaGPU
+                    }
+                }
+            }
+        }
+    }
 }
diff --git a/apiserver/graph/schema/modelservice.graphqls b/apiserver/graph/schema/modelservice.graphqls
@@ -27,6 +27,11 @@ type ModelService {
     """
     llmResource: LLM
     embedderResource: Embedder
+
+    """
+    第三方的服务不会有这个字段, 只有内部的Worker创建的才会有这个字段。
+    """
+    resource: Resources
 }
 input CreateModelServiceInput {
     """模型服务资源名称（不可同名）"""
@@ -101,6 +106,7 @@ input ListModelService {
     keyword: String
     namespace: String!
     page: Int
+    pageSize: Int
 
     """
     all, llm, embedding
@@ -110,12 +116,12 @@ input ListModelService {
     """
     worker, 3rd
     """
-    providerType: String!
+    providerType: String
 
     """
     openai, zhipuai
     """
-    apiType: String!
+    apiType: String
 }
 
 type ModelServiceMutation {
@@ -129,10 +135,10 @@ extend type Mutation {
 }
 
 type ModelServiceQuery {
-    getModelService(name: String!, apiType: String!): ModelService
-    listModelServices(input: ListModelService): [ModelService]
+    getModelService(name: String!, namespace: String!, apiType: String!): ModelService
+    listModelServices(input: ListModelService): PaginatedResult!
 }
 
 extend type Query {
     ModelService: ModelServiceQuery
-}
+}
diff --git a/apiserver/pkg/embedder/embedder.go b/apiserver/pkg/embedder/embedder.go
@@ -211,6 +211,7 @@ func DeleteEmbedders(ctx context.Context, c dynamic.Interface, input *generated.
 	}
 	return nil, nil
 }
+
 func ListEmbedders(ctx context.Context, c dynamic.Interface, input generated.ListCommonInput) (*generated.PaginatedResult, error) {
 	keyword, labelSelector, fieldSelector := "", "", ""
 	page, pageSize := 1, 10