fix: address review comments

dbasunag · dbasunag · commit 4dab986a5a19 · 2026-03-24T12:57:38.000-04:00
Signed-off-by: Debarati Basu-Nag &lt;dbasunag@redhat.com&gt;
diff --git a/.github/workflows/scripts/pr_workflow.py b/.github/workflows/scripts/pr_workflow.py
@@ -1,3 +1,4 @@
+import logging
 import os
 import re
 import sys
@@ -24,9 +25,7 @@
 from github.Repository import Repository
 from github.Team import Team
 
-from utilities.opendatahub_logger import get_logger
-
-LOGGER = get_logger(name="pr_labeler")
+LOGGER = logging.getLogger("pr_labeler")
 
 
 class PrBaseClass:
diff --git a/tests/model_registry/mcp_servers/config/test_source_label.py b/tests/model_registry/mcp_servers/config/test_source_label.py
@@ -1,13 +1,13 @@
 from typing import Self
 
 import pytest
-from simple_logger.logger import get_logger
 
 from tests.model_registry.mcp_servers.constants import (
     MCP_CATALOG_SOURCE2_NAME,
     MCP_CATALOG_SOURCE_NAME,
 )
 from tests.model_registry.utils import execute_get_command
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 
diff --git a/tests/model_registry/model_catalog/catalog_config/test_catalog_source_merge.py b/tests/model_registry/model_catalog/catalog_config/test_catalog_source_merge.py
@@ -1,7 +1,7 @@
 import pytest
 
 from tests.model_registry.model_catalog.constants import REDHAT_AI_CATALOG_ID
-from tests.model_registry.model_catalog.utils import execute_get_command
+from tests.model_registry.utils import execute_get_command
 from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
diff --git a/tests/model_registry/model_catalog/catalog_config/test_custom_model_catalog.py b/tests/model_registry/model_catalog/catalog_config/test_custom_model_catalog.py
@@ -16,11 +16,11 @@
     SAMPLE_MODEL_NAME3,
 )
 from tests.model_registry.model_catalog.utils import (
-    execute_get_command,
     get_catalog_str,
     get_hf_catalog_str,
     get_sample_yaml_str,
 )
+from tests.model_registry.utils import execute_get_command
 from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
diff --git a/tests/model_registry/model_catalog/catalog_config/test_default_model_catalog.py b/tests/model_registry/model_catalog/catalog_config/test_default_model_catalog.py
@@ -22,8 +22,7 @@
     validate_model_catalog_resource,
 )
 from tests.model_registry.model_catalog.constants import CATALOG_CONTAINER, DEFAULT_CATALOGS, REDHAT_AI_CATALOG_ID
-from tests.model_registry.model_catalog.utils import execute_get_command
-from tests.model_registry.utils import get_model_catalog_pod, get_rest_headers
+from tests.model_registry.utils import execute_get_command, get_model_catalog_pod, get_rest_headers
 from utilities.opendatahub_logger import get_logger
 from utilities.user_utils import UserTestSession
 
diff --git a/tests/model_registry/model_catalog/huggingface/test_huggingface_source_error_validation.py b/tests/model_registry/model_catalog/huggingface/test_huggingface_source_error_validation.py
@@ -6,7 +6,7 @@
 from ocp_resources.config_map import ConfigMap
 
 from tests.model_registry.model_catalog.huggingface.utils import assert_accessible_models_via_catalog_api
-from tests.model_registry.model_catalog.utils import execute_get_command
+from tests.model_registry.utils import execute_get_command
 from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
diff --git a/tests/model_registry/model_catalog/huggingface/utils.py b/tests/model_registry/model_catalog/huggingface/utils.py
@@ -6,8 +6,8 @@
 from timeout_sampler import retry
 
 from tests.model_registry.model_catalog.constants import HF_SOURCE_ID
-from tests.model_registry.model_catalog.utils import execute_get_command, get_models_from_catalog_api
-from tests.model_registry.utils import get_model_catalog_pod
+from tests.model_registry.model_catalog.utils import get_models_from_catalog_api
+from tests.model_registry.utils import execute_get_command, get_model_catalog_pod
 from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
diff --git a/tests/model_registry/model_catalog/metadata/test_custom_properties.py b/tests/model_registry/model_catalog/metadata/test_custom_properties.py
@@ -9,8 +9,7 @@
     get_metadata_from_catalog_pod,
     validate_custom_properties_match_metadata,
 )
-from tests.model_registry.model_catalog.utils import execute_get_command
-from tests.model_registry.utils import get_model_catalog_pod
+from tests.model_registry.utils import execute_get_command, get_model_catalog_pod
 from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
diff --git a/tests/model_registry/model_catalog/metadata/test_sources_endpoint.py b/tests/model_registry/model_catalog/metadata/test_sources_endpoint.py
@@ -8,7 +8,7 @@
     REDHAT_AI_CATALOG_ID,
     VALIDATED_CATALOG_ID,
 )
-from tests.model_registry.model_catalog.utils import execute_get_command
+from tests.model_registry.utils import execute_get_command
 from utilities.opendatahub_logger import get_logger
 
 pytestmark = [pytest.mark.usefixtures("updated_dsc_component_state_scope_session", "model_registry_namespace")]
diff --git a/tests/model_registry/model_catalog/metadata/utils.py b/tests/model_registry/model_catalog/metadata/utils.py
@@ -9,8 +9,7 @@
 from ocp_resources.pod import Pod
 
 from tests.model_registry.constants import DEFAULT_CUSTOM_MODEL_CATALOG, DEFAULT_MODEL_CATALOG_CM
-from tests.model_registry.model_catalog.utils import execute_get_command
-from tests.model_registry.utils import get_rest_headers
+from tests.model_registry.utils import execute_get_command, get_rest_headers
 from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
diff --git a/tests/model_registry/model_catalog/search/utils.py b/tests/model_registry/model_catalog/search/utils.py
@@ -19,7 +19,8 @@
     SEARCH_MODELS_DB_QUERY,
     SEARCH_MODELS_WITH_SOURCE_ID_DB_QUERY,
 )
-from tests.model_registry.model_catalog.utils import execute_database_query, execute_get_command, parse_psql_output
+from tests.model_registry.model_catalog.utils import execute_database_query, parse_psql_output
+from tests.model_registry.utils import execute_get_command
 from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
diff --git a/tests/model_serving/maas_billing/maas_subscription/test_api_key_bulk_operations.py b/tests/model_serving/maas_billing/maas_subscription/test_api_key_bulk_operations.py
@@ -2,14 +2,14 @@
 
 import pytest
 import requests
-from simple_logger.logger import get_logger
 
 from tests.model_serving.maas_billing.maas_subscription.utils import (
     assert_bulk_revoke_success,
     bulk_revoke_api_keys,
     get_api_key,
     resolve_api_key_username,
 )
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,11 @@`
`16`	`16`	`SAMPLE_MODEL_NAME3,`
`17`	`17`	`)`
`18`	`18`	`from tests.model_registry.model_catalog.utils import (`
`19`		`- execute_get_command,`
`20`	`19`	`get_catalog_str,`
`21`	`20`	`get_hf_catalog_str,`
`22`	`21`	`get_sample_yaml_str,`
`23`	`22`	`)`
	`23`	`+from tests.model_registry.utils import execute_get_command`
`24`	`24`	`from utilities.opendatahub_logger import get_logger`
`25`	`25`
`26`	`26`	`LOGGER = get_logger(name=__name__)`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,7 @@`
`22`	`22`	`validate_model_catalog_resource,`
`23`	`23`	`)`
`24`	`24`	`from tests.model_registry.model_catalog.constants import CATALOG_CONTAINER, DEFAULT_CATALOGS, REDHAT_AI_CATALOG_ID`
`25`		`-from tests.model_registry.model_catalog.utils import execute_get_command`
`26`		`-from tests.model_registry.utils import get_model_catalog_pod, get_rest_headers`
	`25`	`+from tests.model_registry.utils import execute_get_command, get_model_catalog_pod, get_rest_headers`
`27`	`26`	`from utilities.opendatahub_logger import get_logger`
`28`	`27`	`from utilities.user_utils import UserTestSession`
`29`	`28`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,7 @@`
`9`	`9`	`get_metadata_from_catalog_pod,`
`10`	`10`	`validate_custom_properties_match_metadata,`
`11`	`11`	`)`
`12`		`-from tests.model_registry.model_catalog.utils import execute_get_command`
`13`		`-from tests.model_registry.utils import get_model_catalog_pod`
	`12`	`+from tests.model_registry.utils import execute_get_command, get_model_catalog_pod`
`14`	`13`	`from utilities.opendatahub_logger import get_logger`
`15`	`14`
`16`	`15`	`LOGGER = get_logger(name=__name__)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`REDHAT_AI_CATALOG_ID,`
`9`	`9`	`VALIDATED_CATALOG_ID,`
`10`	`10`	`)`
`11`		`-from tests.model_registry.model_catalog.utils import execute_get_command`
	`11`	`+from tests.model_registry.utils import execute_get_command`
`12`	`12`	`from utilities.opendatahub_logger import get_logger`
`13`	`13`
`14`	`14`	`pytestmark = [pytest.mark.usefixtures("updated_dsc_component_state_scope_session", "model_registry_namespace")]`