fix: normalize model names in sorting tests

Strip source prefixes from database queries and exclude unsortable
model-artifact items from sorting validation to match API response format.

Signed-off-by: fege <fmosca@redhat.com>

Author: fege

tests/model_registry/model_catalog/db_constants.py

@@ -195,7 +195,7 @@
 # Models are ordered by their overall_average (accuracy) value from artifact properties.
 # Only returns the model name column for easy comparison with API results.
 GET_MODELS_BY_ACCURACY_DB_QUERY = """
-SELECT c.name
+SELECT SPLIT_PART(c.name, ':', 2) AS name
 FROM "ArtifactProperty" ap
 JOIN "Artifact" a ON a.id = ap.artifact_id
 JOIN "Attribution" attr ON attr.artifact_id = a.id
@@ -210,7 +210,7 @@
 # Models are ordered by their overall_average (accuracy) value from artifact properties.
 # The tasks field is stored as a JSON array, so we use LIKE pattern matching
 GET_MODELS_BY_ACCURACY_WITH_TASK_FILTER_DB_QUERY = """
-SELECT c.name
+SELECT SPLIT_PART(c.name, ':', 2) AS name
 FROM "ArtifactProperty" ap
 JOIN "Artifact" a ON a.id = ap.artifact_id
 JOIN "Attribution" attr ON attr.artifact_id = a.id

tests/model_registry/model_catalog/huggingface/test_huggingface_model_sorting.py

@@ -49,4 +49,5 @@ def test_huggingface_models_sorting_works_correctly(
             sort_order=sort_order,
             model_catalog_rest_url=model_catalog_rest_url,
             model_registry_rest_headers=model_registry_rest_headers,
+            source_label="HuggingFace Source mixed",
         )

tests/model_registry/model_catalog/sorting/test_model_artifacts_sorting.py

@@ -94,7 +94,9 @@ def test_artifacts_sorting_works_correctly(
             sort_order=sort_order,
         )
 
-        assert validate_items_sorted_correctly(response["items"], order_by, sort_order)
+        # Exclude model-artifact items as they lack sortable fields like "name"
+        items = [item for item in response["items"] if item.get("artifactType") != "model-artifact"]
+        assert validate_items_sorted_correctly(items, order_by, sort_order)
 
 
 @pytest.mark.downstream_only

tests/model_registry/model_catalog/sorting/utils.py

@@ -517,6 +517,7 @@ def assert_model_sorting(
     sort_order: str | None,
     model_catalog_rest_url: list[str],
     model_registry_rest_headers: dict[str, str],
+    source_label: str | None = None,
 ) -> None:
     LOGGER.info(f"Testing models sorting: orderBy={order_by}, sortOrder={sort_order}")
 
@@ -525,6 +526,7 @@ def assert_model_sorting(
         model_registry_rest_headers=model_registry_rest_headers,
         order_by=order_by,
         sort_order=sort_order,
+        source_label=source_label,
     )
 
     assert validate_items_sorted_correctly(items=response["items"], field=order_by, order=sort_order)