Add a list of models for pytest.param

Author: dbasunag

tests/model_registry/model_catalog/conftest.py

@@ -203,9 +203,8 @@ def randomly_picked_model_from_catalog_api_by_source(
         headers = model_registry_rest_headers
     else:
         headers = get_rest_headers(token=user_token_for_api_calls)
-
-    LOGGER.info(f"Picking random model from catalog: {catalog_id} with header_type: {header_type}")
     if not model_name:
+        LOGGER.info(f"Picking random model from catalog: {catalog_id} with header_type: {header_type}")
         models_response = execute_get_command(
             url=f"{model_catalog_rest_url[0]}models?source={catalog_id}&pageSize=100",
             headers=headers,
@@ -219,6 +218,7 @@ def randomly_picked_model_from_catalog_api_by_source(
         assert random_model.get("source_id") == catalog_id, f"Catalog ID (source_id) mismatch for model {model_name}"
         LOGGER.info(f"Testing model '{model_name}' from catalog '{catalog_id}'")
     else:
+        LOGGER.info(f"Looking for pre-selected model: {model_name} from catalog: {catalog_id}")
         # check if the model exists:
         random_model = execute_get_command(
             url=f"{model_catalog_rest_url[0]}sources/{catalog_id}/models/{model_name}",

tests/model_registry/model_catalog/test_model_artifact_search.py

@@ -1,6 +1,6 @@
 import pytest
 from typing import Self, Any
-
+import random
 from ocp_resources.config_map import ConfigMap
 from tests.model_registry.model_catalog.utils import (
     fetch_all_artifacts_with_dynamic_paging,
@@ -15,7 +15,13 @@
 
 LOGGER = get_logger(name=__name__)
 pytestmark = [pytest.mark.usefixtures("updated_dsc_component_state_scope_session", "model_registry_namespace")]
-MODEL_NAME_ARTIFACT_SEARCH = "RedHatAI/Llama-3.1-8B-Instruct"
+MODEL_NAMEs_ARTIFACT_SEARCH: list[str] = [
+    "RedHatAI/Llama-3.1-8B-Instruct",
+    "RedHatAI/Mistral-Small-3.1-24B-Instruct-2503-FP8-dynamic",
+    "RedHatAI/Mistral-Small-3.1-24B-Instruct-2503-quantized.w4a16",
+    "RedHatAI/Mistral-Small-3.1-24B-Instruct-2503-quantized.w8a8",
+    "RedHatAI/Mixtral-8x7B-Instruct-v0.1",
+]
 
 
 class TestSearchArtifactsByFilterQuery:
@@ -76,7 +82,7 @@ def test_search_artifacts_by_invalid_filter_query(
                 {
                     "catalog_id": VALIDATED_CATALOG_ID,
                     "header_type": "registry",
-                    "model_name": MODEL_NAME_ARTIFACT_SEARCH,
+                    "model_name": random.choice(MODEL_NAMEs_ARTIFACT_SEARCH),
                 },
                 "hardware_type.string_value = 'ABC-1234'",
                 None,
@@ -87,7 +93,7 @@ def test_search_artifacts_by_invalid_filter_query(
                 {
                     "catalog_id": VALIDATED_CATALOG_ID,
                     "header_type": "registry",
-                    "model_name": MODEL_NAME_ARTIFACT_SEARCH,
+                    "model_name": random.choice(MODEL_NAMEs_ARTIFACT_SEARCH),
                 },
                 "requests_per_second.double_value > 15.0",
                 [{"key_name": "requests_per_second", "key_type": "double_value", "comparison": "min", "value": 15.0}],
@@ -98,7 +104,7 @@ def test_search_artifacts_by_invalid_filter_query(
                 {
                     "catalog_id": VALIDATED_CATALOG_ID,
                     "header_type": "registry",
-                    "model_name": MODEL_NAME_ARTIFACT_SEARCH,
+                    "model_name": random.choice(MODEL_NAMEs_ARTIFACT_SEARCH),
                 },
                 "hardware_count.int_value = 8",
                 [{"key_name": "hardware_count", "key_type": "int_value", "comparison": "exact", "value": 8}],
@@ -109,7 +115,7 @@ def test_search_artifacts_by_invalid_filter_query(
                 {
                     "catalog_id": VALIDATED_CATALOG_ID,
                     "header_type": "registry",
-                    "model_name": MODEL_NAME_ARTIFACT_SEARCH,
+                    "model_name": random.choice(MODEL_NAMEs_ARTIFACT_SEARCH),
                 },
                 "(hardware_type.string_value = 'H100') AND (ttft_p99.double_value < 200)",
                 [
@@ -123,7 +129,7 @@ def test_search_artifacts_by_invalid_filter_query(
                 {
                     "catalog_id": VALIDATED_CATALOG_ID,
                     "header_type": "registry",
-                    "model_name": MODEL_NAME_ARTIFACT_SEARCH,
+                    "model_name": random.choice(MODEL_NAMEs_ARTIFACT_SEARCH),
                 },
                 "(tps_mean.double_value <260) OR (hardware_type.string_value = 'A100-80')",
                 [
@@ -169,7 +175,7 @@ def test_filter_query_advanced_artifact_search(
 
         if expected_value is None:
             # Simple validation of length and size for basic filter queries
-            assert len(result["items"]) == [], f"Filter query '{filter_query}' should return valid results"
+            assert result["items"] == [], f"Filter query '{filter_query}' should return valid results"
             assert result["size"] == 0, f"Size should be 0 for filter query '{filter_query}'"
             LOGGER.info(
                 f"Successfully validated that filter query '{filter_query}' returns {len(result['items'])} artifacts"