fix: Use structlog as the logging package, since simple_logger is not agent friendly

.github/workflows/scripts/pr_workflow.py

@@ -23,7 +23,8 @@
 from github.PullRequest import PullRequest
 from github.Repository import Repository
 from github.Team import Team
-from simple_logger.logger import get_logger
+
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name="pr_labeler")
 

pyproject.toml

@@ -50,7 +50,7 @@ dependencies = [
     "openshift-python-utilities>=5.0.71",
     "pytest-dependency>=0.6.0",
     "pytest-progress",
-    "python-simple-logger",
+    "structlog>=24.1.0",
     "pyyaml",
     "tenacity",
     "types-requests>=2.32.0.20241016",

tests/cluster_health/test_cluster_health.py

@@ -1,7 +1,8 @@
 import pytest
 from ocp_resources.node import Node
 from ocp_utilities.infra import assert_nodes_in_healthy_condition, assert_nodes_schedulable
-from simple_logger.logger import get_logger
+
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 

tests/cluster_health/test_operator_health.py

@@ -3,10 +3,10 @@
 from ocp_resources.data_science_cluster import DataScienceCluster
 from ocp_resources.dsc_initialization import DSCInitialization
 from pytest_testconfig import config as py_config
-from simple_logger.logger import get_logger
 
 from utilities.general import wait_for_pods_running
 from utilities.infra import wait_for_dsc_status_ready, wait_for_dsci_status_ready
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 

tests/conftest.py

@@ -37,7 +37,6 @@
 from pytest import Config, FixtureRequest
 from pytest_testconfig import config as py_config
 from semver import Version
-from simple_logger.logger import get_logger
 
 from utilities.certificates_utils import create_ca_bundle_file
 from utilities.constants import (
@@ -65,6 +64,7 @@
 from utilities.logger import RedactedString
 from utilities.mariadb_utils import wait_for_mariadb_operator_deployments
 from utilities.minio import create_minio_data_connection_secret
+from utilities.opendatahub_logger import get_logger
 from utilities.operator_utils import get_cluster_service_version, get_csv_related_images
 from utilities.serving_runtime import get_runtime_image_from_template
 from utilities.user_utils import get_byoidc_issuer_url, get_oidc_tokens

tests/fixtures/inference.py

@@ -13,7 +13,6 @@
 from ocp_resources.service import Service
 from ocp_resources.serving_runtime import ServingRuntime
 from pytest_testconfig import py_config
-from simple_logger.logger import get_logger
 from timeout_sampler import retry
 
 from utilities.constants import (
@@ -24,6 +23,7 @@
 )
 from utilities.inference_utils import create_isvc
 from utilities.infra import get_data_science_cluster, wait_for_dsc_status_ready
+from utilities.opendatahub_logger import get_logger
 from utilities.serving_runtime import ServingRuntimeFromTemplate
 
 LOGGER = get_logger(name=__name__)

tests/llama_stack/conftest.py

@@ -17,7 +17,6 @@
 from ocp_resources.secret import Secret
 from ocp_resources.service import Service
 from semver import Version
-from simple_logger.logger import get_logger
 
 from tests.llama_stack.constants import (
     LLAMA_STACK_DISTRIBUTION_SECRET_DATA,
@@ -44,6 +43,7 @@
 from utilities.constants import Annotations, DscComponents
 from utilities.data_science_cluster_utils import update_components_in_dsc
 from utilities.general import generate_random_name
+from utilities.opendatahub_logger import get_logger
 from utilities.resources.llama_stack_distribution import LlamaStackDistribution
 
 LOGGER = get_logger(name=__name__)

tests/llama_stack/inference/test_completions.py

@@ -1,8 +1,8 @@
 import pytest
 from llama_stack_client import LlamaStackClient
-from simple_logger.logger import get_logger
 
 from tests.llama_stack.constants import ModelInfo
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 

tests/llama_stack/safety/test_trustyai_fms_provider.py

@@ -1,9 +1,9 @@
 import pytest
 import yaml
-from simple_logger.logger import get_logger
 
 from tests.llama_stack.constants import LlamaStackProviders
 from utilities.constants import BUILTIN_DETECTOR_CONFIG, CHAT_GENERATION_CONFIG, QWEN_MODEL_NAME, MinIo
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 SECURE_SHIELD_ID: str = "secure_shield"

tests/llama_stack/utils.py

@@ -13,13 +13,13 @@
 from llama_stack_client.types.file import File
 from llama_stack_client.types.vector_stores.vector_store_file import VectorStoreFile
 from ocp_resources.pod import Pod
-from simple_logger.logger import get_logger
 from timeout_sampler import retry
 
 from tests.llama_stack.constants import (
     LLS_CORE_POD_FILTER,
 )
 from utilities.exceptions import UnexpectedResourceCountError
+from utilities.opendatahub_logger import get_logger
 from utilities.resources.llama_stack_distribution import LlamaStackDistribution
 
 LOGGER = get_logger(name=__name__)

tests/llama_stack/vector_io/test_vector_stores.py

@@ -1,14 +1,14 @@
 import pytest
 from llama_stack_client import LlamaStackClient
 from llama_stack_client.types.vector_store import VectorStore
-from simple_logger.logger import get_logger
 
 from tests.llama_stack.constants import (
     IBM_2025_Q4_EARNINGS_DOC_ENCRYPTED,
     IBM_2025_Q4_EARNINGS_DOC_UNENCRYPTED,
     IBM_EARNINGS_SEARCH_QUERIES_BY_MODE,
     ModelInfo,
 )
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 

tests/model_explainability/evalhub/conftest.py

@@ -6,10 +6,10 @@
 from ocp_resources.deployment import Deployment
 from ocp_resources.namespace import Namespace
 from ocp_resources.route import Route
-from simple_logger.logger import get_logger
 
 from utilities.certificates_utils import create_ca_bundle_file
 from utilities.constants import Timeout
+from utilities.opendatahub_logger import get_logger
 from utilities.resources.evalhub import EvalHub
 
 LOGGER = get_logger(name=__name__)

tests/model_explainability/evalhub/utils.py

@@ -1,11 +1,11 @@
 import requests
-from simple_logger.logger import get_logger
 
 from tests.model_explainability.evalhub.constants import (
     EVALHUB_HEALTH_PATH,
     EVALHUB_HEALTH_STATUS_HEALTHY,
 )
 from utilities.guardrails import get_auth_headers
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 

tests/model_explainability/guardrails/test_guardrails.py

@@ -1,7 +1,6 @@
 import pytest
 import requests
 import yaml
-from simple_logger.logger import get_logger
 from timeout_sampler import retry
 
 from tests.model_explainability.guardrails.constants import (
@@ -33,6 +32,7 @@
     LLMdInferenceSimConfig,
     Timeout,
 )
+from utilities.opendatahub_logger import get_logger
 from utilities.plugins.constant import OpenAIEnpoints
 
 LOGGER = get_logger(name=__name__)

tests/model_explainability/guardrails/utils.py

@@ -4,12 +4,12 @@
 
 import requests
 from requests import Response
-from simple_logger.logger import get_logger
 from timeout_sampler import retry
 
 from tests.model_explainability.guardrails.constants import GuardrailsDetectionPrompt
 from utilities.exceptions import UnexpectedValueError
 from utilities.guardrails import get_auth_headers
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 

tests/model_explainability/lm_eval/test_lm_eval.py

@@ -2,7 +2,6 @@
 from kubernetes.dynamic import DynamicClient
 from ocp_resources.namespace import Namespace
 from ocp_resources.pod import Pod
-from simple_logger.logger import get_logger
 
 from tests.model_explainability.lm_eval.constants import (
     ARC_EASY_DATASET_IMAGE,
@@ -14,6 +13,7 @@
 from tests.model_explainability.lm_eval.utils import get_lmeval_tasks, validate_lmeval_job_pod_and_logs
 from tests.model_explainability.utils import validate_tai_component_images
 from utilities.constants import OCIRegistry
+from utilities.opendatahub_logger import get_logger
 from utilities.registry_utils import pull_manifest_from_oci_registry
 
 LMEVALJOB_COMPLETE_STATE: str = "Complete"

tests/model_explainability/lm_eval/utils.py

@@ -5,11 +5,11 @@
 from ocp_resources.lm_eval_job import LMEvalJob
 from ocp_resources.pod import Pod
 from pyhelper_utils.general import tts
-from simple_logger.logger import get_logger
 from timeout_sampler import TimeoutExpiredError
 
 from utilities.constants import Timeout
 from utilities.exceptions import PodLogMissMatchError, UnexpectedFailureError
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 

tests/model_explainability/trustyai_service/trustyai_service_utils.py

@@ -10,14 +10,14 @@
 from ocp_resources.pod import Pod
 from ocp_resources.route import Route
 from ocp_resources.trustyai_service import TrustyAIService
-from simple_logger.logger import get_logger
 from timeout_sampler import TimeoutSampler
 
 from utilities.certificates_utils import create_ca_bundle_file
 from utilities.constants import TRUSTYAI_SERVICE_NAME, Protocols, Timeout
 from utilities.exceptions import MetricValidationError
 from utilities.general import create_isvc_label_selector_str
 from utilities.inference_utils import Inference, UserInference
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 

tests/model_explainability/trustyai_service/utils.py

@@ -15,12 +15,12 @@
 from ocp_resources.secret import Secret
 from ocp_resources.service_account import ServiceAccount
 from ocp_resources.trustyai_service import TrustyAIService
-from simple_logger.logger import get_logger
 from timeout_sampler import TimeoutSampler, retry
 
 from utilities.constants import TRUSTYAI_SERVICE_NAME, Timeout
 from utilities.exceptions import TooManyPodsError, UnexpectedFailureError
 from utilities.general import validate_container_images, wait_for_pods_by_labels
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 

tests/model_registry/component_health/test_mr_health_check.py

@@ -3,10 +3,10 @@
 from ocp_resources.data_science_cluster import DataScienceCluster
 from ocp_resources.namespace import Namespace
 from pytest_testconfig import config as py_config
-from simple_logger.logger import get_logger
 
 from utilities.constants import DscComponents
 from utilities.general import wait_for_pods_running
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 

tests/model_registry/component_health/test_mr_operator_health.py

@@ -1,6 +1,7 @@
 import pytest
 from ocp_utilities.monitoring import Prometheus
-from simple_logger.logger import get_logger
+
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 

tests/model_registry/conftest.py

@@ -21,7 +21,6 @@
 from ocp_resources.service_account import ServiceAccount
 from pytest import Config, FixtureRequest
 from pytest_testconfig import config as py_config
-from simple_logger.logger import get_logger
 
 from tests.model_registry.constants import (
     DB_BASE_RESOURCES_NAME,
@@ -56,6 +55,7 @@
     wait_for_pods_running,
 )
 from utilities.infra import get_data_science_cluster, login_with_user_password, wait_for_dsc_status_ready
+from utilities.opendatahub_logger import get_logger
 from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from utilities.user_utils import UserTestSession, create_htpasswd_file, wait_for_user_creation
 

tests/model_registry/image_validation/test_verify_rhoai_images.py

@@ -12,11 +12,11 @@
 from kubernetes.dynamic import DynamicClient
 from ocp_resources.pod import Pod
 from pytest_testconfig import config as py_config
-from simple_logger.logger import get_logger
 
 from tests.model_registry.constants import MR_INSTANCE_NAME, MR_OPERATOR_NAME, MR_POSTGRES_DEPLOYMENT_NAME_STR
 from tests.model_registry.image_validation.utils import validate_images
 from utilities.constants import Labels
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 pytestmark = [pytest.mark.downstream_only, pytest.mark.skip_must_gather]

tests/model_registry/image_validation/utils.py

@@ -1,8 +1,8 @@
 import pytest
 from ocp_resources.pod import Pod
-from simple_logger.logger import get_logger
 
 from utilities.general import validate_container_images
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 

tests/model_registry/mcp_servers/config/conftest.py

@@ -4,7 +4,6 @@
 import yaml
 from kubernetes.dynamic import DynamicClient
 from ocp_resources.resource import ResourceEditor
-from simple_logger.logger import get_logger
 
 from tests.model_registry.mcp_servers.config.utils import get_mcp_catalog_sources
 from tests.model_registry.mcp_servers.constants import (
@@ -21,6 +20,7 @@
     wait_for_mcp_catalog_api,
     wait_for_model_catalog_pod_ready_after_deletion,
 )
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 

tests/model_registry/mcp_servers/config/test_included_excluded_servers.py

@@ -1,9 +1,9 @@
 from typing import Self
 
 import pytest
-from simple_logger.logger import get_logger
 
 from tests.model_registry.utils import execute_get_command
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 

tests/model_registry/mcp_servers/config/test_invalid_yaml.py

@@ -2,7 +2,6 @@
 
 import pytest
 from kubernetes.dynamic import DynamicClient
-from simple_logger.logger import get_logger
 
 from tests.model_registry.mcp_servers.constants import (
     EXPECTED_MCP_SERVER_NAMES,
@@ -13,6 +12,7 @@
     MCP_SERVERS_YAML_MISSING_NAME,
 )
 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__)
 

tests/model_registry/mcp_servers/config/test_multi_source.py

@@ -4,7 +4,6 @@
 import yaml
 from kubernetes.dynamic import DynamicClient
 from ocp_resources.resource import ResourceEditor
-from simple_logger.logger import get_logger
 
 from tests.model_registry.mcp_servers.config.utils import get_mcp_catalog_sources
 from tests.model_registry.mcp_servers.constants import (
@@ -18,6 +17,7 @@
     wait_for_mcp_catalog_api,
     wait_for_model_catalog_pod_ready_after_deletion,
 )
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 

tests/model_registry/mcp_servers/config/test_named_queries.py

@@ -1,10 +1,10 @@
 from typing import Self
 
 import pytest
-from simple_logger.logger import get_logger
 
 from tests.model_registry.mcp_servers.constants import CALCULATOR_PROVIDER, CALCULATOR_SERVER_NAME
 from tests.model_registry.utils import execute_get_command
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 

tests/model_registry/mcp_servers/conftest.py

@@ -1,7 +1,7 @@
 import pytest
-from simple_logger.logger import get_logger
 
 from tests.model_registry.utils import execute_get_command
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)