Merge pull request #752 from kubeflow/main

[pull] main from kubeflow:main

Author: openshift-merge-bot[bot]

catalog/pkg/openapi/go.mod

@@ -1,3 +1,3 @@
 module github.com/kubeflow/model-registry/catalog/pkg/openapi
 
-go 1.25
+go 1.24.6

clients/python/poetry.lock

@@ -51,7 +51,7 @@ coverage = { extras = ["toml"], version = "^7.3.2" }
 pytest-cov = ">=4.1,<8.0"
 pytest-mock = ">=3.7.0"
 pytest-xdist = "^3.5.0"
-ruff = ">=0.5.2,<0.14.0"
+ruff = ">=0.5.2,<0.15.0"
 mypy = "^1.7.0"
 # atm Ray is only available <3.13, so we will E2E test using Ray in compatible py environments.
 ray = [

clients/python/pyproject.toml

@@ -318,6 +318,9 @@ def get_mock_custom_oci_backend():
     def pull_mock_imple(base_image, dest_dir, **kwargs):
         pathlib.Path(dest_dir).joinpath("oci-layout").write_text(oci_layout_contents)
         pathlib.Path(dest_dir).joinpath("index.json").write_text(index_json_contents)
+        blobs_sha256_dir = pathlib.Path(dest_dir).joinpath("blobs").joinpath("sha256")
+        blobs_sha256_dir.mkdir(parents=True, exist_ok=True)
+        blobs_sha256_dir.joinpath("unused-blob").write_text("{}")
 
     pull_mock.side_effect = pull_mock_imple
     return BackendDefinition(

clients/python/tests/conftest.py

@@ -2101,6 +2101,21 @@ components:
           type: array
           items:
             type: string
+        status:
+          description: |-
+            Operational status of a catalog source.
+            - `available`: The source is functioning correctly and models can be retrieved
+            - `error`: The source is experiencing issues and cannot provide models
+            - `disabled`: The source has been intentionally disabled
+          type: string
+          enum:
+            - available
+            - error
+            - disabled
+        error:
+          description: |-
+            Error message when status is Failed. Contains details about what went wrong.
+          type: string
     CatalogSourceList:
       description: List of CatalogSource entities.
       allOf:

clients/ui/api/openapi/mod-arch.yaml

@@ -802,41 +802,59 @@ func GetCatalogModelListMock() models.CatalogModelList {
 
 func GetCatalogSourceMocks() []models.CatalogSource {
 	enabled := true
-	disabled := false
+	disabledBool := false
+
+	// Status examples (matching OpenAPI spec)
+	availableStatus := "available"
+	errorStatus := "error"
+	disabledStatus := "disabled"
+
+	invalidCredentialError := "The provided API key is invalid or has expired. Please update your credentials."
+	invalidOrgError := "The specified organization 'invalid-org' does not exist or you don't have access to it."
+
 	return []models.CatalogSource{
 		{
 			Id:      "sample-source",
 			Name:    "Sample mocked source",
 			Enabled: &enabled,
 			Labels:  []string{"Sample category 1", "Sample category 2", "Sample category"},
+			Status:  &availableStatus,
 		},
 		{
 			Id:     "huggingface",
 			Name:   "Hugging Face",
 			Labels: []string{"Sample category 2", "Sample category"},
+			// Status is nil - represents "Starting" state (no status yet)
+			Status: nil,
 		},
 		{
 			Id:      "adminModel1",
 			Name:    "Admin model 1",
 			Enabled: &enabled,
 			Labels:  []string{},
+			Status:  &errorStatus,
+			Error:   &invalidCredentialError,
 		},
 		{
 			Id:      "adminModel2",
 			Name:    "Admin model 2",
 			Enabled: &enabled,
 			Labels:  []string{"Sample category 1"},
+			Status:  &errorStatus,
+			Error:   &invalidOrgError,
 		},
 		{
 			Id:     "dora",
 			Name:   "Dora source",
 			Labels: []string{},
+			Status: &availableStatus,
 		},
 		{
 			Id:      "adminModel3",
 			Name:    "Admin model 3",
-			Enabled: &disabled,
+			Enabled: &disabledBool,
 			Labels:  []string{},
+			Status:  &disabledStatus,
 		},
 	}
 }

clients/ui/bff/internal/mocks/static_data_mock.go

@@ -5,6 +5,8 @@ type CatalogSource struct {
 	Name    string   `json:"name"`
 	Enabled *bool    `json:"enabled,omitempty"`
 	Labels  []string `json:"labels"`
+	Status  *string  `json:"status,omitempty"`
+	Error   *string  `json:"error,omitempty"`
 }
 
 type CatalogSourceList struct {

clients/ui/bff/internal/models/catalog_source_list.go

@@ -5,11 +5,65 @@ export const mockCatalogSource = (partial?: Partial<CatalogSource>): CatalogSour
   name: 'sample source',
   enabled: true,
   labels: ['Sample category 1', 'Sample category 2', 'Community'],
+  status: 'available',
   ...partial,
 });
 
+// Mock source with no status (Starting state - no status field)
+export const mockCatalogSourceStarting = (): CatalogSource => ({
+  id: 'starting-source',
+  name: 'Starting Source',
+  enabled: true,
+  labels: ['Community'],
+  // No status field - represents "Starting" state
+});
+
+// Mock source with error status and error message (invalid credential)
+export const mockCatalogSourceFailedCredential = (): CatalogSource => ({
+  id: 'failed-credential-source',
+  name: 'Failed Credential Source',
+  enabled: true,
+  labels: ['Enterprise'],
+  status: 'error',
+  error: 'The provided API key is invalid or has expired. Please update your credentials.',
+});
+
+// Mock source with error status and error message (invalid organization)
+export const mockCatalogSourceFailedOrg = (): CatalogSource => ({
+  id: 'failed-org-source',
+  name: 'Failed Organization Source',
+  enabled: true,
+  labels: ['Enterprise'],
+  status: 'error',
+  error: "The specified organization 'invalid-org' does not exist or you don't have access to it.",
+});
+
+// Mock source with disabled status
+export const mockCatalogSourceDisabled = (): CatalogSource => ({
+  id: 'disabled-source',
+  name: 'Disabled Source',
+  enabled: false,
+  labels: ['Community'],
+  status: 'disabled',
+});
+
+// Mock source with available status
+export const mockCatalogSourceActive = (): CatalogSource => ({
+  id: 'active-source',
+  name: 'Active Source',
+  enabled: true,
+  labels: ['Community', 'Enterprise'],
+  status: 'available',
+});
+
 export const mockCatalogSourceList = (partial?: Partial<CatalogSourceList>): CatalogSourceList => ({
-  items: [mockCatalogSource({})],
+  items: [
+    mockCatalogSourceActive(),
+    mockCatalogSourceStarting(),
+    mockCatalogSourceFailedCredential(),
+    mockCatalogSourceFailedOrg(),
+    mockCatalogSourceDisabled(),
+  ],
   pageSize: 10,
   size: 25,
   nextPageToken: '',