Merge branch 'main' into cluster_h

Author: dbasunag

tests/model_registry/model_catalog/conftest.py

@@ -1,5 +1,7 @@
 import random
 from typing import Generator, Any
+
+import yaml
 from simple_logger.logger import get_logger
 
 import pytest
@@ -17,6 +19,7 @@
     wait_for_model_catalog_api,
     get_model_str,
     execute_get_command,
+    get_default_model_catalog_yaml,
 )
 from tests.model_registry.utils import get_rest_headers
 from utilities.infra import get_openshift_token, login_with_user_password, create_inference_token
@@ -59,7 +62,15 @@ def updated_catalog_config_map(
     model_catalog_rest_url: list[str],
     model_registry_rest_headers: dict[str, str],
 ) -> Generator[ConfigMap, None, None]:
-    patches = {"data": {"sources.yaml": request.param["sources_yaml"]}}
+    defaults = yaml.dump(
+        get_default_model_catalog_yaml(config_map=catalog_config_map),
+        default_flow_style=False,
+    )
+    catalog_str = f"""catalogs:
+{defaults}
+{request.param["sources_yaml"]}
+    """
+    patches = {"data": {"sources.yaml": catalog_str}}
     if "sample_yaml" in request.param:
         for key in request.param["sample_yaml"]:
             patches["data"][key] = request.param["sample_yaml"][key]

tests/model_registry/model_catalog/test_custom_model_catalog.py

@@ -6,6 +6,7 @@
     SAMPLE_MODEL_NAME2,
     MULTIPLE_CUSTOM_CATALOG_VALUES,
     SAMPLE_MODEL_NAME3,
+    DEFAULT_CATALOG_ID,
 )
 from ocp_resources.config_map import ConfigMap
 import pytest
@@ -67,10 +68,11 @@ def test_model_custom_catalog_list_sources(
             url=url,
             headers=model_registry_rest_headers,
         )["items"]
-
-        assert len(results) == len(expected_catalog_values)
+        # since we expect one default catalog
+        assert len(results) == len(expected_catalog_values) + 1
         ids_from_query = [result_entry["id"] for result_entry in results]
         ids_expected = [expected_entry["id"] for expected_entry in expected_catalog_values]
+        ids_expected.append(DEFAULT_CATALOG_ID)
         assert sorted(ids_from_query) == sorted(ids_expected), f"Expected: {expected_catalog_values}. Actual: {results}"
 
     def test_model_custom_catalog_get_models_by_source(

tests/model_registry/model_catalog/utils.py

@@ -1,12 +1,15 @@
 import json
 from typing import Any
+import time
+import yaml
 
 from kubernetes.dynamic import DynamicClient
 from simple_logger.logger import get_logger
 
 import requests
 from timeout_sampler import retry
 
+from ocp_resources.config_map import ConfigMap
 from ocp_resources.pod import Pod
 from tests.model_registry.model_catalog.constants import (
     DEFAULT_CATALOG_NAME,
@@ -96,18 +99,16 @@ def validate_default_catalog(default_catalog) -> None:
 
 def get_catalog_str(ids: list[str]) -> str:
     catalog_str: str = ""
-    for id in ids:
+    for index, id in enumerate(ids):
         catalog_str += f"""
-- name: Sample Catalog
+- name: Sample Catalog {index}
   id: {id}
   type: yaml
   enabled: true
   properties:
     yamlCatalogPath: {id.replace("_", "-")}.yaml
 """
-    return f"""catalogs:
-{catalog_str}
-    """
+    return catalog_str
 
 
 def get_sample_yaml_str(models: list[str]) -> str:
@@ -123,6 +124,7 @@ def get_sample_yaml_str(models: list[str]) -> str:
 
 
 def get_model_str(model: str) -> str:
+    current_time = int(time.time() * 1000)
     return f"""
 - name: {model}
   description: test description.
@@ -135,6 +137,8 @@ def get_model_str(model: str) -> str:
   libraryName: transformers
   artifacts:
     - uri: https://huggingface.co/{model}/resolve/main/consolidated.safetensors
+  createTimeSinceEpoch: \"{str(current_time - 10000)}\"
+  lastUpdateTimeSinceEpoch: \"{str(current_time)}\"
 """
 
 
@@ -149,3 +153,7 @@ def get_validate_default_model_catalog_source(token: str, model_catalog_url: str
     assert result[0]["id"] == DEFAULT_CATALOG_ID
     assert result[0]["name"] == DEFAULT_CATALOG_NAME
     assert str(result[0]["enabled"]) == "True", result[0]["enabled"]
+
+
+def get_default_model_catalog_yaml(config_map: ConfigMap) -> str:
+    return yaml.safe_load(config_map.instance.data["sources.yaml"])["catalogs"]