add model artifact to catalog model version

Signed-off-by: Dhiraj Bokde <[email protected]>
kubeflow · Jan 22, 2025 · f09990a · f09990a
1 parent c282096
commit f09990a
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 133 deletions.
diff --git a/api/openapi/model-registry.yaml b/api/openapi/model-registry.yaml
@@ -1235,9 +1235,23 @@ components:
         - $ref: "#/components/schemas/RegisteredModelCreate"
     CatalogModelVersion:
       description: Represents a CatalogModelVersion belonging to a CatalogModel.
+      required:
+        - name
+        - artifact
       allOf:
-        - $ref: "#/components/schemas/ModelVersionCreate"
-        - $ref: "#/components/schemas/BaseResource"
+        - $ref: "#/components/schemas/BaseResourceCreate"
+        - $ref: "#/components/schemas/ModelVersionUpdate"
+        - type: object
+          properties:
+            name:
+              description: |-
+                The client provided name of the model's version. It must be unique among all the ModelVersions of the same
+                type within a Model Registry instance and cannot be changed once set.
+              type: string
+            artifact:
+              description: |-
+                The catalog model artifact.
+              $ref: "#/components/schemas/ModelArtifact"
     ArtifactState:
       description: |2-
          - PENDING: A state indicating that the artifact may exist.

diff --git a/internal/server/openapi/api_model_catalog_service_service.go b/internal/server/openapi/api_model_catalog_service_service.go
@@ -91,7 +91,7 @@ func (m ModelCatalogServiceAPIService) GetCatalogSource(ctx context.Context, id
 	return Response(http.StatusOK, response), nil
 }
 
-func (m ModelCatalogServiceAPIService) GetCatalogSources(ctx context.Context, name string, pageSize string, orderBy string, sortOrder string, offset string) (ImplResponse, error) {
+func (m ModelCatalogServiceAPIService) GetCatalogSources(ctx context.Context, name string, pageSize string, orderBy openapi.OrderByField, sortOrder openapi.SortOrder, offset string) (ImplResponse, error) {
 	response := openapi.CatalogSourceList{
 		Items: make([]openapi.CatalogSource, 0),
 	}

diff --git a/internal/server/openapi/type_asserts.go b/internal/server/openapi/type_asserts.go
@@ -272,15 +272,18 @@ func AssertCatalogModelVersionListRequired(obj model.CatalogModelVersionList) er
 // AssertCatalogModelVersionRequired checks if the required fields are not zero-ed
 func AssertCatalogModelVersionRequired(obj model.CatalogModelVersion) error {
 	elements := map[string]interface{}{
-		"name":              obj.Name,
-		"registeredModelId": obj.RegisteredModelId,
+		"name":     obj.Name,
+		"artifact": obj.Artifact,
 	}
 	for name, el := range elements {
 		if isZero := IsZeroValue(el); isZero {
 			return &RequiredError{Field: name}
 		}
 	}
 
+	if err := AssertModelArtifactRequired(obj.Artifact); err != nil {
+		return err
+	}
 	return nil
 }
 

diff --git a/pkg/openapi/model_catalog_model_version.go b/pkg/openapi/model_catalog_model_version.go