Merge pull request #203 from zqq454224016/main

feat: develop model management API
kubeagi · Nov 16, 2023 · a38c689 · a38c689
2 parents a6ccea3 + 009ac72
commit a38c689
Show file tree

Hide file tree

Showing 13 changed files with 2,616 additions and 288 deletions.
diff --git a/api/v1alpha1/dataset.go b/api/v1alpha1/dataset.go
@@ -28,7 +28,7 @@ const (
 var (
 	// LabelDatasetScene defines the content type of this dataset
 	LabelDatasetContentType = Group + "/content-type"
-	// LabelDatasetBestCase defines the best case to use this dataset
-	LabelDatasetBestCase  = Group + "/best-case"
+	// LabelDatasetField defines the best field to use this dataset
+	LabelDatasetField     = Group + "/field"
 	LabelDatasetFinalizer = Group + "/finalizers"
 )
diff --git a/api/v1alpha1/dataset_types.go b/api/v1alpha1/dataset_types.go
@@ -30,8 +30,8 @@ type DatasetSpec struct {
 	// ContentType defines dataset
 	ContentType string `json:"contentType"`
 
-	// bestCase defines the best case to use this dataset
-	BestCase string `json:"bestCase,omitempty"`
+	// Model application fields
+	Field string `json:"field,omitempty"`
 }
 
 // DatasetStatus defines the observed state of Dataset

diff --git a/api/v1alpha1/model_types.go b/api/v1alpha1/model_types.go
@@ -34,6 +34,9 @@ type ModelSpec struct {
 	// Description defines datasource description
 	Description string `json:"description,omitempty"`
 
+	// Model application fields
+	Field string `json:"field,omitempty"`
+
 	// Type defines what kind of model this is
 	Type ModelType `json:"type,omitempty"`
 

diff --git a/charts/arcadia/crds/arcadia.kubeagi.k8s.com.cn_datasets.yaml b/charts/arcadia/crds/arcadia.kubeagi.k8s.com.cn_datasets.yaml
@@ -42,9 +42,6 @@ spec:
           spec:
             description: DatasetSpec defines the desired state of Dataset
             properties:
-              bestCase:
-                description: bestCase defines the best case to use this dataset
-                type: string
               contentType:
                 description: ContentType defines dataset
                 type: string
@@ -57,6 +54,9 @@ spec:
               displayName:
                 description: DisplayName defines datasource display name
                 type: string
+              field:
+                description: Model application fields
+                type: string
             required:
             - contentType
             type: object

diff --git a/charts/arcadia/crds/arcadia.kubeagi.k8s.com.cn_models.yaml b/charts/arcadia/crds/arcadia.kubeagi.k8s.com.cn_models.yaml
@@ -44,6 +44,9 @@ spec:
               displayName:
                 description: DisplayName defines dataset display name
                 type: string
+              field:
+                description: Model application fields
+                type: string
               type:
                 description: Type defines what kind of model this is
                 type: string

diff --git a/config/crd/bases/arcadia.kubeagi.k8s.com.cn_datasets.yaml b/config/crd/bases/arcadia.kubeagi.k8s.com.cn_datasets.yaml
@@ -42,9 +42,6 @@ spec:
           spec:
             description: DatasetSpec defines the desired state of Dataset
             properties:
-              bestCase:
-                description: bestCase defines the best case to use this dataset
-                type: string
               contentType:
                 description: ContentType defines dataset
                 type: string
@@ -57,6 +54,9 @@ spec:
               displayName:
                 description: DisplayName defines datasource display name
                 type: string
+              field:
+                description: Model application fields
+                type: string
             required:
             - contentType
             type: object

diff --git a/config/crd/bases/arcadia.kubeagi.k8s.com.cn_models.yaml b/config/crd/bases/arcadia.kubeagi.k8s.com.cn_models.yaml
@@ -44,6 +44,9 @@ spec:
               displayName:
                 description: DisplayName defines dataset display name
                 type: string
+              field:
+                description: Model application fields
+                type: string
               type:
                 description: Type defines what kind of model this is
                 type: string

diff --git a/controllers/dataset_controller.go b/controllers/dataset_controller.go
@@ -80,8 +80,8 @@ func (r *DatasetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		instance.Labels[arcadiav1alpha1.LabelDatasetContentType] = instance.Spec.ContentType
 		update = true
 	}
-	if v, ok := instance.Labels[arcadiav1alpha1.LabelDatasetBestCase]; !ok || v != instance.Spec.BestCase {
-		instance.Labels[arcadiav1alpha1.LabelDatasetBestCase] = instance.Spec.BestCase
+	if v, ok := instance.Labels[arcadiav1alpha1.LabelDatasetField]; !ok || v != instance.Spec.Field {
+		instance.Labels[arcadiav1alpha1.LabelDatasetField] = instance.Spec.Field
 		update = true
 	}
 	if !utils.ContainString(instance.Finalizers, arcadiav1alpha1.Finalizer) {