diff --git a/.github/workflows/scripts/pr_workflow.py b/.github/workflows/scripts/pr_workflow.py index f064ca6fb..9f08eec79 100644 --- 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 @@ -23,9 +24,8 @@ from github.PullRequest import PullRequest from github.Repository import Repository from github.Team import Team -from simple_logger.logger import get_logger -LOGGER = get_logger(name="pr_labeler") +LOGGER = logging.getLogger("pr_labeler") class PrBaseClass: diff --git a/pyproject.toml b/pyproject.toml index 64be1c22a..bad07e610 100644 --- a/pyproject.toml +++ b/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", diff --git a/tests/cluster_health/test_cluster_health.py b/tests/cluster_health/test_cluster_health.py index 9b8ea09ec..187f1cffd 100644 --- a/tests/cluster_health/test_cluster_health.py +++ b/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__) diff --git a/tests/cluster_health/test_operator_health.py b/tests/cluster_health/test_operator_health.py index a34dd2c68..bb360a6b1 100644 --- a/tests/cluster_health/test_operator_health.py +++ b/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__) diff --git a/tests/conftest.py b/tests/conftest.py index 63ff3cac6..76c07ff22 100644 --- a/tests/conftest.py +++ b/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 diff --git a/tests/fixtures/inference.py b/tests/fixtures/inference.py index eac5b29ff..bbe14f5d7 100644 --- a/tests/fixtures/inference.py +++ b/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__) diff --git a/tests/llama_stack/conftest.py b/tests/llama_stack/conftest.py index 1d242e547..3b3cf380a 100644 --- a/tests/llama_stack/conftest.py +++ b/tests/llama_stack/conftest.py @@ -16,7 +16,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, @@ -43,6 +42,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__) diff --git a/tests/llama_stack/inference/test_completions.py b/tests/llama_stack/inference/test_completions.py index 24991c72a..c0ebc74c3 100644 --- a/tests/llama_stack/inference/test_completions.py +++ b/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__) diff --git a/tests/llama_stack/safety/test_trustyai_fms_provider.py b/tests/llama_stack/safety/test_trustyai_fms_provider.py index 99868394f..2e729864e 100644 --- a/tests/llama_stack/safety/test_trustyai_fms_provider.py +++ b/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" diff --git a/tests/llama_stack/utils.py b/tests/llama_stack/utils.py index ce74ea31c..a6b1e2ecd 100644 --- a/tests/llama_stack/utils.py +++ b/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.path_utils import resolve_repo_path from utilities.resources.llama_stack_distribution import LlamaStackDistribution diff --git a/tests/llama_stack/vector_io/test_vector_stores.py b/tests/llama_stack/vector_io/test_vector_stores.py index b9625d0ad..1e2085b85 100644 --- a/tests/llama_stack/vector_io/test_vector_stores.py +++ b/tests/llama_stack/vector_io/test_vector_stores.py @@ -1,7 +1,6 @@ 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, @@ -9,6 +8,7 @@ IBM_EARNINGS_SEARCH_QUERIES_BY_MODE, ModelInfo, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_explainability/evalhub/conftest.py b/tests/model_explainability/evalhub/conftest.py index 708ec8950..0aa9ebcf7 100644 --- a/tests/model_explainability/evalhub/conftest.py +++ b/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__) diff --git a/tests/model_explainability/evalhub/utils.py b/tests/model_explainability/evalhub/utils.py index 85454d756..6984b2340 100644 --- a/tests/model_explainability/evalhub/utils.py +++ b/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__) diff --git a/tests/model_explainability/guardrails/test_guardrails.py b/tests/model_explainability/guardrails/test_guardrails.py index b55aa874d..404474b70 100644 --- a/tests/model_explainability/guardrails/test_guardrails.py +++ b/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__) diff --git a/tests/model_explainability/guardrails/utils.py b/tests/model_explainability/guardrails/utils.py index 64c16c2ff..f26e35948 100644 --- a/tests/model_explainability/guardrails/utils.py +++ b/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__) diff --git a/tests/model_explainability/lm_eval/test_lm_eval.py b/tests/model_explainability/lm_eval/test_lm_eval.py index 4a03ea416..a690470ae 100644 --- a/tests/model_explainability/lm_eval/test_lm_eval.py +++ b/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" diff --git a/tests/model_explainability/lm_eval/utils.py b/tests/model_explainability/lm_eval/utils.py index 33c587734..56617704f 100644 --- a/tests/model_explainability/lm_eval/utils.py +++ b/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__) diff --git a/tests/model_explainability/trustyai_service/trustyai_service_utils.py b/tests/model_explainability/trustyai_service/trustyai_service_utils.py index b9fe8eb78..1021a64f4 100644 --- a/tests/model_explainability/trustyai_service/trustyai_service_utils.py +++ b/tests/model_explainability/trustyai_service/trustyai_service_utils.py @@ -10,7 +10,6 @@ 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 @@ -18,6 +17,7 @@ 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__) diff --git a/tests/model_explainability/trustyai_service/utils.py b/tests/model_explainability/trustyai_service/utils.py index 7bbb2eae5..f4e5f9af1 100644 --- a/tests/model_explainability/trustyai_service/utils.py +++ b/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__) diff --git a/tests/model_registry/component_health/test_mr_health_check.py b/tests/model_registry/component_health/test_mr_health_check.py index 2424d3225..e383be5e2 100644 --- a/tests/model_registry/component_health/test_mr_health_check.py +++ b/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__) diff --git a/tests/model_registry/component_health/test_mr_operator_health.py b/tests/model_registry/component_health/test_mr_operator_health.py index d0748d8a3..ee00967b9 100644 --- a/tests/model_registry/component_health/test_mr_operator_health.py +++ b/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__) diff --git a/tests/model_registry/conftest.py b/tests/model_registry/conftest.py index b1dc62215..ad54e2fde 100644 --- a/tests/model_registry/conftest.py +++ b/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 diff --git a/tests/model_registry/image_validation/test_verify_rhoai_images.py b/tests/model_registry/image_validation/test_verify_rhoai_images.py index f791ab6a0..8f367728b 100644 --- a/tests/model_registry/image_validation/test_verify_rhoai_images.py +++ b/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] diff --git a/tests/model_registry/image_validation/utils.py b/tests/model_registry/image_validation/utils.py index d3192e0a3..a8466ecbb 100644 --- a/tests/model_registry/image_validation/utils.py +++ b/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__) diff --git a/tests/model_registry/mcp_servers/config/conftest.py b/tests/model_registry/mcp_servers/config/conftest.py index e27aaa7c0..b95c1b978 100644 --- a/tests/model_registry/mcp_servers/config/conftest.py +++ b/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 ( @@ -23,6 +22,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__) diff --git a/tests/model_registry/mcp_servers/config/test_included_excluded_servers.py b/tests/model_registry/mcp_servers/config/test_included_excluded_servers.py index 46c5530e3..fd82d7bee 100644 --- a/tests/model_registry/mcp_servers/config/test_included_excluded_servers.py +++ b/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__) diff --git a/tests/model_registry/mcp_servers/config/test_invalid_yaml.py b/tests/model_registry/mcp_servers/config/test_invalid_yaml.py index fcfe4c4d5..ea5a230bf 100644 --- a/tests/model_registry/mcp_servers/config/test_invalid_yaml.py +++ b/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__) diff --git a/tests/model_registry/mcp_servers/config/test_multi_source.py b/tests/model_registry/mcp_servers/config/test_multi_source.py index 2156087e6..82527fdca 100644 --- a/tests/model_registry/mcp_servers/config/test_multi_source.py +++ b/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__) diff --git a/tests/model_registry/mcp_servers/config/test_named_queries.py b/tests/model_registry/mcp_servers/config/test_named_queries.py index a9a636a32..70cd04879 100644 --- a/tests/model_registry/mcp_servers/config/test_named_queries.py +++ b/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__) diff --git a/tests/model_registry/mcp_servers/config/test_source_label.py b/tests/model_registry/mcp_servers/config/test_source_label.py index 728e04cca..4bbd10a44 100644 --- 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/mcp_servers/conftest.py b/tests/model_registry/mcp_servers/conftest.py index 9659cbf2f..89aac218e 100644 --- a/tests/model_registry/mcp_servers/conftest.py +++ b/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__) diff --git a/tests/model_registry/mcp_servers/search/test_filtering.py b/tests/model_registry/mcp_servers/search/test_filtering.py index e06191b5d..e8c2a5318 100644 --- a/tests/model_registry/mcp_servers/search/test_filtering.py +++ b/tests/model_registry/mcp_servers/search/test_filtering.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__) diff --git a/tests/model_registry/mcp_servers/search/test_keyword_search.py b/tests/model_registry/mcp_servers/search/test_keyword_search.py index d95af76cb..8acaaadc2 100644 --- a/tests/model_registry/mcp_servers/search/test_keyword_search.py +++ b/tests/model_registry/mcp_servers/search/test_keyword_search.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_SERVER_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/mcp_servers/search/test_ordering.py b/tests/model_registry/mcp_servers/search/test_ordering.py index b2b59c44f..5464bf3b5 100644 --- a/tests/model_registry/mcp_servers/search/test_ordering.py +++ b/tests/model_registry/mcp_servers/search/test_ordering.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__) diff --git a/tests/model_registry/mcp_servers/test_data_integrity.py b/tests/model_registry/mcp_servers/test_data_integrity.py index 341269e17..ff254d40e 100644 --- a/tests/model_registry/mcp_servers/test_data_integrity.py +++ b/tests/model_registry/mcp_servers/test_data_integrity.py @@ -1,7 +1,6 @@ from typing import Any, Self import pytest -from simple_logger.logger import get_logger from tests.model_registry.mcp_servers.constants import ( EXPECTED_MCP_SERVER_NAMES, @@ -9,6 +8,7 @@ EXPECTED_MCP_SERVER_TOOLS, ) 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/conftest.py b/tests/model_registry/model_catalog/catalog_config/conftest.py index 7ff56da70..8d008cd7f 100644 --- a/tests/model_registry/model_catalog/catalog_config/conftest.py +++ b/tests/model_registry/model_catalog/catalog_config/conftest.py @@ -7,7 +7,6 @@ from ocp_resources.config_map import ConfigMap from ocp_resources.resource import ResourceEditor from pytest_testconfig import config as py_config -from simple_logger.logger import get_logger from timeout_sampler import TimeoutSampler from tests.model_registry.constants import DEFAULT_CUSTOM_MODEL_CATALOG @@ -19,6 +18,7 @@ from tests.model_registry.model_catalog.constants import REDHAT_AI_CATALOG_ID, REDHAT_AI_CATALOG_NAME from tests.model_registry.model_catalog.utils import wait_for_model_catalog_api from tests.model_registry.utils import get_model_catalog_pod, wait_for_model_catalog_pod_ready_after_deletion +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 index 5bad86543..065e20642 100644 --- 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,8 +1,8 @@ import pytest -from simple_logger.logger import get_logger from tests.model_registry.model_catalog.constants import REDHAT_AI_CATALOG_ID 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 index ee983ca03..0f3210273 100644 --- 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 @@ -3,7 +3,6 @@ import pytest from kubernetes.dynamic.exceptions import ResourceNotFoundError from ocp_resources.config_map import ConfigMap -from simple_logger.logger import get_logger from tests.model_registry.constants import CUSTOM_CATALOG_ID1, SAMPLE_MODEL_NAME1 from tests.model_registry.model_catalog.catalog_config.utils import validate_model_catalog_sources @@ -16,8 +15,13 @@ SAMPLE_MODEL_NAME2, SAMPLE_MODEL_NAME3, ) -from tests.model_registry.model_catalog.utils import get_catalog_str, get_hf_catalog_str, get_sample_yaml_str +from tests.model_registry.model_catalog.utils import ( + 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 index 126197afb..e01edea9e 100644 --- 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 @@ -11,7 +11,6 @@ from ocp_resources.pod import Pod from ocp_resources.route import Route from ocp_resources.service import Service -from simple_logger.logger import get_logger from timeout_sampler import TimeoutSampler from tests.model_registry.constants import DEFAULT_CUSTOM_MODEL_CATALOG, DEFAULT_MODEL_CATALOG_CM @@ -24,6 +23,7 @@ ) from tests.model_registry.model_catalog.constants import CATALOG_CONTAINER, DEFAULT_CATALOGS, REDHAT_AI_CATALOG_ID 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 LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_catalog/catalog_config/test_default_source_inclusion_exclusion_cleanup.py b/tests/model_registry/model_catalog/catalog_config/test_default_source_inclusion_exclusion_cleanup.py index febf154b6..d3745bb70 100644 --- a/tests/model_registry/model_catalog/catalog_config/test_default_source_inclusion_exclusion_cleanup.py +++ b/tests/model_registry/model_catalog/catalog_config/test_default_source_inclusion_exclusion_cleanup.py @@ -1,7 +1,6 @@ import pytest from kubernetes.dynamic.client import DynamicClient from ocp_resources.resource import ResourceEditor -from simple_logger.logger import get_logger from timeout_sampler import TimeoutExpiredError from tests.model_registry.model_catalog.catalog_config.utils import ( @@ -19,6 +18,7 @@ REDHAT_AI_CATALOG_NAME, ) from tests.model_registry.model_catalog.utils import wait_for_model_catalog_api +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_catalog/catalog_config/test_model_catalog_negative.py b/tests/model_registry/model_catalog/catalog_config/test_model_catalog_negative.py index c3d05f5cd..fd8bf2b5e 100644 --- a/tests/model_registry/model_catalog/catalog_config/test_model_catalog_negative.py +++ b/tests/model_registry/model_catalog/catalog_config/test_model_catalog_negative.py @@ -3,12 +3,12 @@ import pytest from ocp_resources.config_map import ConfigMap from ocp_resources.resource import ResourceEditor -from simple_logger.logger import get_logger from tests.model_registry.constants import DEFAULT_MODEL_CATALOG_CM from tests.model_registry.model_catalog.catalog_config.utils import validate_model_catalog_configmap_data from tests.model_registry.model_catalog.constants import DEFAULT_CATALOGS from tests.model_registry.model_catalog.utils import assert_source_error_state_message +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_catalog/catalog_config/utils.py b/tests/model_registry/model_catalog/catalog_config/utils.py index 4a816aeeb..1275f97cd 100644 --- a/tests/model_registry/model_catalog/catalog_config/utils.py +++ b/tests/model_registry/model_catalog/catalog_config/utils.py @@ -7,7 +7,6 @@ from kubernetes.dynamic import DynamicClient from ocp_resources.config_map import ConfigMap from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from timeout_sampler import TimeoutExpiredError, retry from tests.model_registry.constants import DEFAULT_CUSTOM_MODEL_CATALOG @@ -24,6 +23,7 @@ ) from tests.model_registry.utils import execute_get_command, get_model_catalog_pod from utilities.constants import Timeout +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_catalog/conftest.py b/tests/model_registry/model_catalog/conftest.py index a48383485..44d961d8e 100644 --- a/tests/model_registry/model_catalog/conftest.py +++ b/tests/model_registry/model_catalog/conftest.py @@ -10,7 +10,6 @@ from ocp_resources.resource import ResourceEditor from ocp_resources.route import Route from ocp_resources.service_account import ServiceAccount -from simple_logger.logger import get_logger from tests.model_registry.constants import ( CUSTOM_CATALOG_ID1, @@ -37,6 +36,7 @@ wait_for_model_catalog_pod_ready_after_deletion, ) from utilities.infra import create_inference_token, get_openshift_token, login_with_user_password +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_catalog/db_check/conftest.py b/tests/model_registry/model_catalog/db_check/conftest.py index fdb5c764c..ba6fa7f0d 100644 --- a/tests/model_registry/model_catalog/db_check/conftest.py +++ b/tests/model_registry/model_catalog/db_check/conftest.py @@ -3,9 +3,10 @@ from ocp_resources.network_policy import NetworkPolicy from ocp_resources.secret import Secret from pytest_testconfig import config as py_config -from simple_logger.logger import get_logger from timeout_sampler import TimeoutSampler +from utilities.opendatahub_logger import get_logger + from .utils import extract_secret_values LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_catalog/db_check/test_model_catalog_db_validation.py b/tests/model_registry/model_catalog/db_check/test_model_catalog_db_validation.py index 7a968a589..9ed5cdedf 100644 --- a/tests/model_registry/model_catalog/db_check/test_model_catalog_db_validation.py +++ b/tests/model_registry/model_catalog/db_check/test_model_catalog_db_validation.py @@ -1,13 +1,13 @@ import pytest from kubernetes.dynamic import DynamicClient from ocp_resources.network_policy import NetworkPolicy -from simple_logger.logger import get_logger from timeout_sampler import TimeoutSampler from tests.model_registry.model_catalog.utils import get_postgres_pod_in_namespace from tests.model_registry.utils import ( wait_for_model_catalog_pod_ready_after_deletion, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_catalog/db_check/utils.py b/tests/model_registry/model_catalog/db_check/utils.py index a6fea9e0e..7bfc823f9 100644 --- a/tests/model_registry/model_catalog/db_check/utils.py +++ b/tests/model_registry/model_catalog/db_check/utils.py @@ -2,7 +2,8 @@ import binascii from ocp_resources.secret import Secret -from simple_logger.logger import get_logger + +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_catalog/huggingface/conftest.py b/tests/model_registry/model_catalog/huggingface/conftest.py index bac3c8ec3..c354ad181 100644 --- a/tests/model_registry/model_catalog/huggingface/conftest.py +++ b/tests/model_registry/model_catalog/huggingface/conftest.py @@ -14,12 +14,12 @@ from ocp_resources.secret import Secret from ocp_resources.serving_runtime import ServingRuntime from pytest_testconfig import py_config -from simple_logger.logger import get_logger from tests.model_registry.model_catalog.constants import HF_CUSTOM_MODE from tests.model_registry.model_catalog.huggingface.utils import get_huggingface_model_from_api from tests.model_registry.model_catalog.utils import get_models_from_catalog_api from utilities.infra import create_ns +from utilities.opendatahub_logger import get_logger from utilities.operator_utils import get_cluster_service_version LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_catalog/huggingface/test_huggingface_exclude_models.py b/tests/model_registry/model_catalog/huggingface/test_huggingface_exclude_models.py index 31abe7273..56ad7d419 100644 --- a/tests/model_registry/model_catalog/huggingface/test_huggingface_exclude_models.py +++ b/tests/model_registry/model_catalog/huggingface/test_huggingface_exclude_models.py @@ -2,9 +2,9 @@ import pytest from ocp_resources.config_map import ConfigMap -from simple_logger.logger import get_logger from tests.model_registry.model_catalog.utils import get_hf_catalog_str, get_models_from_catalog_api +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_catalog/huggingface/test_huggingface_model_deployment.py b/tests/model_registry/model_catalog/huggingface/test_huggingface_model_deployment.py index abd2b430a..67210ab98 100644 --- a/tests/model_registry/model_catalog/huggingface/test_huggingface_model_deployment.py +++ b/tests/model_registry/model_catalog/huggingface/test_huggingface_model_deployment.py @@ -4,9 +4,9 @@ from ocp_resources.inference_service import InferenceService from ocp_resources.namespace import Namespace from ocp_resources.serving_runtime import ServingRuntime -from simple_logger.logger import get_logger from tests.model_registry.model_catalog.utils import get_hf_catalog_str +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_catalog/huggingface/test_huggingface_model_search.py b/tests/model_registry/model_catalog/huggingface/test_huggingface_model_search.py index 058bd7cdf..b3c4fcc39 100644 --- a/tests/model_registry/model_catalog/huggingface/test_huggingface_model_search.py +++ b/tests/model_registry/model_catalog/huggingface/test_huggingface_model_search.py @@ -2,9 +2,9 @@ import pytest from ocp_resources.config_map import ConfigMap -from simple_logger.logger import get_logger from tests.model_registry.model_catalog.utils import get_hf_catalog_str, get_models_from_catalog_api +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_catalog/huggingface/test_huggingface_model_type_classification.py b/tests/model_registry/model_catalog/huggingface/test_huggingface_model_type_classification.py index 613b915d3..11aa27b65 100644 --- a/tests/model_registry/model_catalog/huggingface/test_huggingface_model_type_classification.py +++ b/tests/model_registry/model_catalog/huggingface/test_huggingface_model_type_classification.py @@ -5,9 +5,9 @@ from typing import Self import pytest -from simple_logger.logger import get_logger from tests.model_registry.model_catalog.utils import get_hf_catalog_str, get_models_from_catalog_api +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_catalog/huggingface/test_huggingface_model_validation.py b/tests/model_registry/model_catalog/huggingface/test_huggingface_model_validation.py index f123f4ca8..fb378f400 100644 --- a/tests/model_registry/model_catalog/huggingface/test_huggingface_model_validation.py +++ b/tests/model_registry/model_catalog/huggingface/test_huggingface_model_validation.py @@ -5,7 +5,6 @@ from huggingface_hub import HfApi from kubernetes.dynamic import DynamicClient from ocp_resources.config_map import ConfigMap -from simple_logger.logger import get_logger from tests.model_registry.model_catalog.constants import HF_MODELS, HF_SOURCE_ID from tests.model_registry.model_catalog.huggingface.utils import ( @@ -18,6 +17,7 @@ from tests.model_registry.model_catalog.utils import ( get_hf_catalog_str, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_catalog/huggingface/test_huggingface_models_multiple_sources.py b/tests/model_registry/model_catalog/huggingface/test_huggingface_models_multiple_sources.py index c27c7bf52..634d91cd2 100644 --- a/tests/model_registry/model_catalog/huggingface/test_huggingface_models_multiple_sources.py +++ b/tests/model_registry/model_catalog/huggingface/test_huggingface_models_multiple_sources.py @@ -2,10 +2,10 @@ import pytest from ocp_resources.config_map import ConfigMap -from simple_logger.logger import get_logger from tests.model_registry.model_catalog.utils import get_hf_catalog_str, get_models_from_catalog_api 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/test_huggingface_negative.py b/tests/model_registry/model_catalog/huggingface/test_huggingface_negative.py index 497b89922..85bc95348 100644 --- a/tests/model_registry/model_catalog/huggingface/test_huggingface_negative.py +++ b/tests/model_registry/model_catalog/huggingface/test_huggingface_negative.py @@ -2,9 +2,9 @@ import pytest from ocp_resources.config_map import ConfigMap -from simple_logger.logger import get_logger from tests.model_registry.model_catalog.utils import assert_source_error_state_message +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) 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 index c45af1ee1..2a8f2eccc 100644 --- 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 @@ -4,10 +4,10 @@ import pytest from kubernetes.dynamic.exceptions import ResourceNotFoundError from ocp_resources.config_map import ConfigMap -from simple_logger.logger import get_logger from tests.model_registry.model_catalog.huggingface.utils import assert_accessible_models_via_catalog_api from tests.model_registry.utils import execute_get_command +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) INACCESSIBLE_MODELS: list[str] = [ diff --git a/tests/model_registry/model_catalog/huggingface/utils.py b/tests/model_registry/model_catalog/huggingface/utils.py index fc27865c6..46cc6406b 100644 --- a/tests/model_registry/model_catalog/huggingface/utils.py +++ b/tests/model_registry/model_catalog/huggingface/utils.py @@ -3,12 +3,12 @@ from huggingface_hub import HfApi from kubernetes.dynamic import DynamicClient -from simple_logger.logger import get_logger from timeout_sampler import retry from tests.model_registry.model_catalog.constants import HF_SOURCE_ID 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_catalog_preview.py b/tests/model_registry/model_catalog/metadata/test_catalog_preview.py index 5fc74854d..c67915213 100644 --- a/tests/model_registry/model_catalog/metadata/test_catalog_preview.py +++ b/tests/model_registry/model_catalog/metadata/test_catalog_preview.py @@ -3,7 +3,6 @@ import pytest import requests import yaml -from simple_logger.logger import get_logger from tests.model_registry.model_catalog.constants import VALIDATED_CATALOG_FILE, VALIDATED_CATALOG_ID from tests.model_registry.model_catalog.metadata.utils import ( @@ -12,6 +11,7 @@ validate_catalog_preview_counts, validate_catalog_preview_items, ) +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 index 8be35be7d..ecc408701 100644 --- a/tests/model_registry/model_catalog/metadata/test_custom_properties.py +++ b/tests/model_registry/model_catalog/metadata/test_custom_properties.py @@ -2,7 +2,6 @@ import pytest from kubernetes.dynamic import DynamicClient -from simple_logger.logger import get_logger from tests.model_registry.model_catalog.constants import REDHAT_AI_CATALOG_ID, VALIDATED_CATALOG_ID from tests.model_registry.model_catalog.metadata.utils import ( @@ -11,6 +10,7 @@ validate_custom_properties_match_metadata, ) 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_filter_options_endpoint.py b/tests/model_registry/model_catalog/metadata/test_filter_options_endpoint.py index 2688b90b9..84467754d 100644 --- a/tests/model_registry/model_catalog/metadata/test_filter_options_endpoint.py +++ b/tests/model_registry/model_catalog/metadata/test_filter_options_endpoint.py @@ -2,7 +2,6 @@ import pytest from kubernetes.dynamic import DynamicClient -from simple_logger.logger import get_logger from tests.model_registry.model_catalog.db_constants import ( API_COMPUTED_FILTER_FIELDS, @@ -12,8 +11,13 @@ from tests.model_registry.model_catalog.metadata.utils import ( compare_filter_options_with_database, ) -from tests.model_registry.model_catalog.utils import execute_database_query, parse_psql_output -from tests.model_registry.utils import execute_get_command, get_rest_headers +from tests.model_registry.model_catalog.utils import ( + execute_database_query, + execute_get_command, + parse_psql_output, +) +from tests.model_registry.utils import get_rest_headers +from utilities.opendatahub_logger import get_logger from utilities.user_utils import UserTestSession LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_catalog/metadata/test_labels_endpoint.py b/tests/model_registry/model_catalog/metadata/test_labels_endpoint.py index 995a8d094..3a50b1ab4 100644 --- a/tests/model_registry/model_catalog/metadata/test_labels_endpoint.py +++ b/tests/model_registry/model_catalog/metadata/test_labels_endpoint.py @@ -2,7 +2,6 @@ import pytest from kubernetes.dynamic import DynamicClient -from simple_logger.logger import get_logger from timeout_sampler import TimeoutSampler from tests.model_registry.model_catalog.metadata.utils import ( @@ -11,6 +10,7 @@ verify_labels_match, ) from utilities.infra import get_openshift_token +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 index 7c9646308..d6ae6fede 100644 --- a/tests/model_registry/model_catalog/metadata/test_sources_endpoint.py +++ b/tests/model_registry/model_catalog/metadata/test_sources_endpoint.py @@ -1,7 +1,6 @@ from typing import Any, Self import pytest -from simple_logger.logger import get_logger from tests.model_registry.mcp_servers.constants import MCP_CATALOG_SOURCE_ID from tests.model_registry.model_catalog.constants import ( @@ -10,6 +9,7 @@ VALIDATED_CATALOG_ID, ) 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 index 8f3a04d02..6e8c2ffe2 100644 --- a/tests/model_registry/model_catalog/metadata/utils.py +++ b/tests/model_registry/model_catalog/metadata/utils.py @@ -7,10 +7,10 @@ from kubernetes.dynamic import DynamicClient from ocp_resources.config_map import ConfigMap from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_registry.constants import DEFAULT_CUSTOM_MODEL_CATALOG, DEFAULT_MODEL_CATALOG_CM from tests.model_registry.utils import execute_get_command, get_rest_headers +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) CATALOG_CONTAINER = "catalog" diff --git a/tests/model_registry/model_catalog/rbac/test_catalog_rbac.py b/tests/model_registry/model_catalog/rbac/test_catalog_rbac.py index c735a0cc8..af5125b97 100644 --- a/tests/model_registry/model_catalog/rbac/test_catalog_rbac.py +++ b/tests/model_registry/model_catalog/rbac/test_catalog_rbac.py @@ -7,9 +7,9 @@ from kubernetes.dynamic import DynamicClient from ocp_resources.config_map import ConfigMap from ocp_resources.resource import get_client -from simple_logger.logger import get_logger from tests.model_registry.constants import DEFAULT_CUSTOM_MODEL_CATALOG, DEFAULT_MODEL_CATALOG_CM +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_catalog/search/test_model_artifact_search.py b/tests/model_registry/model_catalog/search/test_model_artifact_search.py index cbdd19c5b..65e0dba99 100644 --- a/tests/model_registry/model_catalog/search/test_model_artifact_search.py +++ b/tests/model_registry/model_catalog/search/test_model_artifact_search.py @@ -3,7 +3,6 @@ import pytest from dictdiffer import diff -from simple_logger.logger import get_logger from tests.model_registry.model_catalog.constants import ( METRICS_ARTIFACT_TYPE, @@ -16,6 +15,7 @@ validate_model_artifacts_match_criteria_or, validate_recommendations_subset, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) pytestmark = [pytest.mark.usefixtures("updated_dsc_component_state_scope_session", "model_registry_namespace")] diff --git a/tests/model_registry/model_catalog/search/test_model_search.py b/tests/model_registry/model_catalog/search/test_model_search.py index edef5ffe4..debe9581c 100644 --- a/tests/model_registry/model_catalog/search/test_model_search.py +++ b/tests/model_registry/model_catalog/search/test_model_search.py @@ -4,7 +4,6 @@ from dictdiffer import diff from kubernetes.dynamic import DynamicClient from kubernetes.dynamic.exceptions import ResourceNotFoundError -from simple_logger.logger import get_logger from tests.model_registry.model_catalog.constants import ( OTHER_MODELS_CATALOG_ID, @@ -24,6 +23,7 @@ ) from tests.model_registry.model_catalog.utils import get_models_from_catalog_api from tests.model_registry.utils import get_model_catalog_pod +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) pytestmark = [pytest.mark.usefixtures("updated_dsc_component_state_scope_session", "model_registry_namespace")] diff --git a/tests/model_registry/model_catalog/search/utils.py b/tests/model_registry/model_catalog/search/utils.py index 1405af017..2bb44dc95 100644 --- a/tests/model_registry/model_catalog/search/utils.py +++ b/tests/model_registry/model_catalog/search/utils.py @@ -4,7 +4,6 @@ from kubernetes.dynamic import DynamicClient from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_registry.model_catalog.constants import ( CATALOG_CONTAINER, @@ -22,6 +21,7 @@ ) 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_registry/model_catalog/sorting/test_model_artifacts_sorting.py b/tests/model_registry/model_catalog/sorting/test_model_artifacts_sorting.py index 65296a66f..a4df50509 100644 --- a/tests/model_registry/model_catalog/sorting/test_model_artifacts_sorting.py +++ b/tests/model_registry/model_catalog/sorting/test_model_artifacts_sorting.py @@ -2,7 +2,6 @@ from typing import Self import pytest -from simple_logger.logger import get_logger from tests.model_registry.model_catalog.constants import VALIDATED_CATALOG_ID from tests.model_registry.model_catalog.sorting.utils import ( @@ -10,6 +9,7 @@ validate_items_sorted_correctly, verify_custom_properties_sorted, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_catalog/sorting/test_model_sorting.py b/tests/model_registry/model_catalog/sorting/test_model_sorting.py index 0b5075e23..4f6559610 100644 --- a/tests/model_registry/model_catalog/sorting/test_model_sorting.py +++ b/tests/model_registry/model_catalog/sorting/test_model_sorting.py @@ -2,7 +2,6 @@ import pytest from kubernetes.dynamic import DynamicClient -from simple_logger.logger import get_logger from tests.model_registry.model_catalog.constants import ( REDHAT_AI_VALIDATED_UNESCAPED_CATALOG_NAME, @@ -13,6 +12,7 @@ validate_accuracy_sorting_against_database, ) from tests.model_registry.model_catalog.utils import get_models_from_catalog_api +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_catalog/sorting/test_sorting_functionality.py b/tests/model_registry/model_catalog/sorting/test_sorting_functionality.py index 0b1f19a91..1bab3a097 100644 --- a/tests/model_registry/model_catalog/sorting/test_sorting_functionality.py +++ b/tests/model_registry/model_catalog/sorting/test_sorting_functionality.py @@ -1,12 +1,12 @@ from typing import Self import pytest -from simple_logger.logger import get_logger from tests.model_registry.model_catalog.sorting.utils import ( get_sources_with_sorting, validate_items_sorted_correctly, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_catalog/sorting/utils.py b/tests/model_registry/model_catalog/sorting/utils.py index a240ec53b..0c2851313 100644 --- a/tests/model_registry/model_catalog/sorting/utils.py +++ b/tests/model_registry/model_catalog/sorting/utils.py @@ -1,7 +1,6 @@ from typing import Any from kubernetes.dynamic import DynamicClient -from simple_logger.logger import get_logger from tests.model_registry.model_catalog.db_constants import ( GET_MODELS_BY_ACCURACY_DB_QUERY, @@ -9,10 +8,11 @@ ) from tests.model_registry.model_catalog.utils import ( execute_database_query, + execute_get_command, get_models_from_catalog_api, 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_registry/model_catalog/upgrade/test_model_catalog_upgrade.py b/tests/model_registry/model_catalog/upgrade/test_model_catalog_upgrade.py index cdfd094fa..28f9db38a 100644 --- a/tests/model_registry/model_catalog/upgrade/test_model_catalog_upgrade.py +++ b/tests/model_registry/model_catalog/upgrade/test_model_catalog_upgrade.py @@ -6,11 +6,15 @@ from kubernetes.dynamic import DynamicClient from ocp_resources.config_map import ConfigMap from ocp_resources.resource import ResourceEditor -from simple_logger.logger import get_logger from tests.model_registry.constants import CUSTOM_CATALOG_ID1, SAMPLE_MODEL_NAME1 -from tests.model_registry.model_catalog.utils import get_catalog_str, get_sample_yaml_str, wait_for_model_catalog_api +from tests.model_registry.model_catalog.utils import ( + get_catalog_str, + get_sample_yaml_str, + wait_for_model_catalog_api, +) from tests.model_registry.utils import wait_for_model_catalog_pod_ready_after_deletion +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_catalog/utils.py b/tests/model_registry/model_catalog/utils.py index 622b7bd2f..9e915ee1e 100644 --- a/tests/model_registry/model_catalog/utils.py +++ b/tests/model_registry/model_catalog/utils.py @@ -5,7 +5,6 @@ from kubernetes.dynamic import DynamicClient from kubernetes.dynamic.exceptions import ResourceNotFoundError from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from timeout_sampler import retry from tests.model_registry.model_catalog.constants import HF_MODELS @@ -14,6 +13,7 @@ execute_get_call, execute_get_command, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_registry/async_job/test_async_upload_e2e.py b/tests/model_registry/model_registry/async_job/test_async_upload_e2e.py index 7f48f50e2..a479b999e 100644 --- a/tests/model_registry/model_registry/async_job/test_async_upload_e2e.py +++ b/tests/model_registry/model_registry/async_job/test_async_upload_e2e.py @@ -7,7 +7,6 @@ from model_registry import ModelRegistry as ModelRegistryClient from model_registry.types import ArtifactState, RegisteredModelState from ocp_resources.job import Job -from simple_logger.logger import get_logger from tests.model_registry.constants import MODEL_DICT from tests.model_registry.model_registry.async_job.constants import ( @@ -20,6 +19,7 @@ get_latest_job_pod, ) from utilities.constants import MinIo, OCIRegistry +from utilities.opendatahub_logger import get_logger from utilities.registry_utils import pull_manifest_from_oci_registry LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_registry/async_job/utils.py b/tests/model_registry/model_registry/async_job/utils.py index 392e07c97..d83381ccc 100644 --- a/tests/model_registry/model_registry/async_job/utils.py +++ b/tests/model_registry/model_registry/async_job/utils.py @@ -2,11 +2,11 @@ from ocp_resources.job import Job from ocp_resources.pod import Pod from ocp_resources.service import Service -from simple_logger.logger import get_logger from timeout_sampler import TimeoutExpiredError from utilities.constants import MinIo from utilities.general import collect_pod_information +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_registry/conftest.py b/tests/model_registry/model_registry/conftest.py index b976a5144..a1d20b7aa 100644 --- a/tests/model_registry/model_registry/conftest.py +++ b/tests/model_registry/model_registry/conftest.py @@ -16,7 +16,6 @@ from ocp_resources.service_account import ServiceAccount from pyhelper_utils.shell import run_command from pytest import FixtureRequest -from simple_logger.logger import get_logger from tests.model_registry.constants import ( MODEL_REGISTRY_POD_FILTER, @@ -28,6 +27,7 @@ ) from utilities.constants import Protocols from utilities.general import wait_for_pods_by_labels +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) DEFAULT_TOKEN_DURATION = "10m" diff --git a/tests/model_registry/model_registry/negative_tests/test_db_migration.py b/tests/model_registry/model_registry/negative_tests/test_db_migration.py index c81bece98..5d4afcddf 100644 --- a/tests/model_registry/model_registry/negative_tests/test_db_migration.py +++ b/tests/model_registry/model_registry/negative_tests/test_db_migration.py @@ -4,11 +4,11 @@ from kubernetes.dynamic.client 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 from tests.model_registry.utils import wait_for_new_running_mr_pod from utilities.general import wait_for_container_status +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_registry/negative_tests/test_model_registry_creation_negative.py b/tests/model_registry/model_registry/negative_tests/test_model_registry_creation_negative.py index 6edd1746b..2ed496d78 100644 --- a/tests/model_registry/model_registry/negative_tests/test_model_registry_creation_negative.py +++ b/tests/model_registry/model_registry/negative_tests/test_model_registry_creation_negative.py @@ -8,7 +8,6 @@ from ocp_resources.namespace import Namespace from ocp_resources.secret import Secret from pytest_testconfig import config as py_config -from simple_logger.logger import get_logger from tests.model_registry.constants import ( DB_RESOURCE_NAME, @@ -16,6 +15,7 @@ MR_OPERATOR_NAME, ) from utilities.constants import Annotations +from utilities.opendatahub_logger import get_logger from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_registry/python_client/signing/conftest.py b/tests/model_registry/model_registry/python_client/signing/conftest.py index e0a0ed2b2..b2633cd63 100644 --- a/tests/model_registry/model_registry/python_client/signing/conftest.py +++ b/tests/model_registry/model_registry/python_client/signing/conftest.py @@ -21,7 +21,6 @@ from ocp_utilities.operators import install_operator, uninstall_operator from pyhelper_utils.shell import run_command from pytest_testconfig import config as py_config -from simple_logger.logger import get_logger from timeout_sampler import TimeoutSampler from tests.model_registry.model_registry.python_client.signing.constants import ( @@ -41,6 +40,7 @@ ) from utilities.constants import OPENSHIFT_OPERATORS, Labels, ModelCarImage, OCIRegistry, Timeout from utilities.infra import get_openshift_token, is_managed_cluster +from utilities.opendatahub_logger import get_logger from utilities.resources.route import Route from utilities.resources.securesign import Securesign diff --git a/tests/model_registry/model_registry/python_client/signing/test_signing_infrastructure.py b/tests/model_registry/model_registry/python_client/signing/test_signing_infrastructure.py index ff1a4d653..59aa7f112 100644 --- a/tests/model_registry/model_registry/python_client/signing/test_signing_infrastructure.py +++ b/tests/model_registry/model_registry/python_client/signing/test_signing_infrastructure.py @@ -6,12 +6,12 @@ import pytest import requests from ocp_resources.config_map import ConfigMap -from simple_logger.logger import get_logger from tests.model_registry.model_registry.python_client.signing.constants import ( SIGNING_OCI_REPO_NAME, ) from tests.model_registry.model_registry.python_client.signing.utils import check_model_signature_file +from utilities.opendatahub_logger import get_logger from utilities.resources.securesign import Securesign LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_registry/python_client/signing/test_signing_negative.py b/tests/model_registry/model_registry/python_client/signing/test_signing_negative.py index da9c71c99..59cdc7e6c 100644 --- a/tests/model_registry/model_registry/python_client/signing/test_signing_negative.py +++ b/tests/model_registry/model_registry/python_client/signing/test_signing_negative.py @@ -4,7 +4,8 @@ import pytest from model_registry.signing.exceptions import SigningError -from simple_logger.logger import get_logger + +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_registry/python_client/signing/utils.py b/tests/model_registry/model_registry/python_client/signing/utils.py index f4d9004d9..38bc17840 100644 --- a/tests/model_registry/model_registry/python_client/signing/utils.py +++ b/tests/model_registry/model_registry/python_client/signing/utils.py @@ -5,13 +5,13 @@ import requests from pyhelper_utils.shell import run_command -from simple_logger.logger import get_logger from tests.model_registry.model_registry.python_client.signing.constants import ( SECURESIGN_NAMESPACE, SECURESIGN_ORGANIZATION_EMAIL, SECURESIGN_ORGANIZATION_NAME, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_registry/python_client/test_model_registry_creation.py b/tests/model_registry/model_registry/python_client/test_model_registry_creation.py index 9b930b2cb..e90356b9a 100644 --- a/tests/model_registry/model_registry/python_client/test_model_registry_creation.py +++ b/tests/model_registry/model_registry/python_client/test_model_registry_creation.py @@ -6,7 +6,6 @@ # ocp_resources imports from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_registry.constants import MODEL_DICT, MODEL_NAME from tests.model_registry.utils import ( @@ -14,6 +13,7 @@ validate_mlmd_removal_in_model_registry_pod_log, validate_no_grpc_container, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_registry/rbac/conftest.py b/tests/model_registry/model_registry/rbac/conftest.py index a170ee2de..4b32eea7e 100644 --- a/tests/model_registry/model_registry/rbac/conftest.py +++ b/tests/model_registry/model_registry/rbac/conftest.py @@ -13,7 +13,6 @@ from ocp_resources.role_binding import RoleBinding from ocp_resources.secret import Secret from ocp_resources.service import Service -from simple_logger.logger import get_logger from tests.model_registry.constants import ( KUBERBACPROXY_STR, @@ -21,6 +20,7 @@ ) from tests.model_registry.model_registry.rbac.group_utils import create_group from tests.model_registry.model_registry.rbac.utils import create_role_binding +from utilities.opendatahub_logger import get_logger from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry from utilities.user_utils import UserTestSession diff --git a/tests/model_registry/model_registry/rbac/group_utils.py b/tests/model_registry/model_registry/rbac/group_utils.py index 4987fe0ae..4f95faf17 100644 --- a/tests/model_registry/model_registry/rbac/group_utils.py +++ b/tests/model_registry/model_registry/rbac/group_utils.py @@ -3,7 +3,8 @@ from kubernetes.dynamic import DynamicClient from ocp_resources.group import Group -from simple_logger.logger import get_logger + +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_registry/rbac/test_mr_rbac.py b/tests/model_registry/model_registry/rbac/test_mr_rbac.py index 1ca29f4fd..8e6a43f70 100644 --- a/tests/model_registry/model_registry/rbac/test_mr_rbac.py +++ b/tests/model_registry/model_registry/rbac/test_mr_rbac.py @@ -22,7 +22,6 @@ from ocp_resources.role_binding import RoleBinding from ocp_resources.secret import Secret from ocp_resources.service import Service -from simple_logger.logger import get_logger from timeout_sampler import TimeoutSampler from tests.model_registry.constants import NUM_MR_INSTANCES @@ -37,6 +36,7 @@ from tests.model_registry.utils import get_endpoint_from_mr_service, get_mr_service_by_label, get_mr_user_token from utilities.constants import Protocols from utilities.infra import get_openshift_token +from utilities.opendatahub_logger import get_logger from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry from utilities.user_utils import UserTestSession diff --git a/tests/model_registry/model_registry/rbac/test_mr_rbac_sa.py b/tests/model_registry/model_registry/rbac/test_mr_rbac_sa.py index 808a6eff4..0fbc71e28 100644 --- a/tests/model_registry/model_registry/rbac/test_mr_rbac_sa.py +++ b/tests/model_registry/model_registry/rbac/test_mr_rbac_sa.py @@ -5,11 +5,11 @@ from model_registry import ModelRegistry as ModelRegistryClient from mr_openapi.exceptions import ForbiddenException, UnauthorizedException from ocp_resources.service_account import ServiceAccount -from simple_logger.logger import get_logger from timeout_sampler import TimeoutSampler, retry from tests.model_registry.model_registry.rbac.utils import build_mr_client_args from utilities.infra import create_inference_token +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_registry/rest_api/conftest.py b/tests/model_registry/model_registry/rest_api/conftest.py index eef354392..cb06c9cac 100644 --- a/tests/model_registry/model_registry/rest_api/conftest.py +++ b/tests/model_registry/model_registry/rest_api/conftest.py @@ -17,7 +17,6 @@ from ocp_resources.secret import Secret from ocp_resources.serving_runtime import ServingRuntime from pytest_testconfig import config as py_config -from simple_logger.logger import get_logger from tests.model_registry.constants import ( CA_CONFIGMAP_NAME, @@ -45,6 +44,7 @@ from utilities.exceptions import MissingParameter from utilities.general import generate_random_name, wait_for_pods_running from utilities.infra import create_ns +from utilities.opendatahub_logger import get_logger from utilities.operator_utils import get_cluster_service_version from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry diff --git a/tests/model_registry/model_registry/rest_api/test_model_registry_rest_api.py b/tests/model_registry/model_registry/rest_api/test_model_registry_rest_api.py index 61fd9c6cf..472a499e4 100644 --- a/tests/model_registry/model_registry/rest_api/test_model_registry_rest_api.py +++ b/tests/model_registry/model_registry/rest_api/test_model_registry_rest_api.py @@ -11,7 +11,6 @@ from ocp_resources.secret import Secret from ocp_resources.service import Service from ocp_resources.serving_runtime import ServingRuntime -from simple_logger.logger import get_logger from tests.model_registry.constants import MR_POSTGRES_DB_OBJECT from tests.model_registry.model_registry.rest_api.constants import ( @@ -29,6 +28,7 @@ STATE_LIVE, ) from tests.model_registry.model_registry.rest_api.utils import validate_resource_attributes +from utilities.opendatahub_logger import get_logger from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_registry/rest_api/test_model_registry_secure_db.py b/tests/model_registry/model_registry/rest_api/test_model_registry_secure_db.py index e50282949..052c73bc6 100644 --- a/tests/model_registry/model_registry/rest_api/test_model_registry_secure_db.py +++ b/tests/model_registry/model_registry/rest_api/test_model_registry_secure_db.py @@ -3,11 +3,11 @@ import pytest import requests from kubernetes.dynamic import DynamicClient -from simple_logger.logger import get_logger from tests.model_registry.model_registry.rest_api.utils import register_model_rest_api, validate_resource_attributes from tests.model_registry.utils import get_endpoint_from_mr_service, get_mr_service_by_label from utilities.constants import Protocols +from utilities.opendatahub_logger import get_logger from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_registry/rest_api/test_multiple_mr.py b/tests/model_registry/model_registry/rest_api/test_multiple_mr.py index e8458a54f..fcfbb8b24 100644 --- a/tests/model_registry/model_registry/rest_api/test_multiple_mr.py +++ b/tests/model_registry/model_registry/rest_api/test_multiple_mr.py @@ -4,7 +4,6 @@ from kubernetes.dynamic import DynamicClient from ocp_resources.config_map import ConfigMap from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_registry.constants import ( DEFAULT_CUSTOM_MODEL_CATALOG, @@ -18,6 +17,7 @@ validate_resource_attributes, ) from tests.model_registry.utils import get_model_catalog_pod +from utilities.opendatahub_logger import get_logger from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_registry/rest_api/utils.py b/tests/model_registry/model_registry/rest_api/utils.py index b1193fc7f..a3b75ea6f 100644 --- a/tests/model_registry/model_registry/rest_api/utils.py +++ b/tests/model_registry/model_registry/rest_api/utils.py @@ -7,7 +7,6 @@ from kubernetes.dynamic import DynamicClient from ocp_resources.deployment import Deployment from pyhelper_utils.shell import run_command -from simple_logger.logger import get_logger from tests.model_registry.exceptions import ( ModelRegistryResourceNotCreated, @@ -15,6 +14,7 @@ ) from tests.model_registry.model_registry.rest_api.constants import MODEL_REGISTER_DATA, MODEL_REGISTRY_BASE_URI from utilities.exceptions import ResourceValueMismatch +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_registry/upgrade/conftest.py b/tests/model_registry/model_registry/upgrade/conftest.py index 69ff5bb2a..6b8644445 100644 --- a/tests/model_registry/model_registry/upgrade/conftest.py +++ b/tests/model_registry/model_registry/upgrade/conftest.py @@ -7,7 +7,6 @@ from model_registry import ModelRegistry as ModelRegistryClient from model_registry.types import RegisteredModel from pytest import Config, FixtureRequest -from simple_logger.logger import get_logger from tests.model_registry.constants import KUBERBACPROXY_STR, MR_INSTANCE_BASE_NAME from tests.model_registry.utils import ( @@ -18,6 +17,7 @@ ) from utilities.constants import Protocols from utilities.general import wait_for_pods_running +from utilities.opendatahub_logger import get_logger from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/model_registry/upgrade/test_model_registry_upgrade.py b/tests/model_registry/model_registry/upgrade/test_model_registry_upgrade.py index a2c228fec..ba64584a0 100644 --- a/tests/model_registry/model_registry/upgrade/test_model_registry_upgrade.py +++ b/tests/model_registry/model_registry/upgrade/test_model_registry_upgrade.py @@ -3,11 +3,11 @@ import pytest from model_registry import ModelRegistry as ModelRegistryClient from model_registry.types import RegisteredModel -from simple_logger.logger import get_logger from tests.model_registry.constants import MODEL_DICT, MODEL_NAME from tests.model_registry.model_registry.upgrade.utils import validate_upgrade_model_registration from utilities.constants import ModelFormat +from utilities.opendatahub_logger import get_logger from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/scc/conftest.py b/tests/model_registry/scc/conftest.py index 1d8e9ea8c..621d11155 100644 --- a/tests/model_registry/scc/conftest.py +++ b/tests/model_registry/scc/conftest.py @@ -4,10 +4,10 @@ from ocp_resources.deployment import Deployment from ocp_resources.namespace import Namespace from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_registry.constants import MR_INSTANCE_NAME, MR_POSTGRES_DEPLOYMENT_NAME_STR from tests.model_registry.scc.utils import get_pod_by_deployment_name +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/scc/test_model_catalog_scc.py b/tests/model_registry/scc/test_model_catalog_scc.py index 4507d3aa3..8cdc5f081 100644 --- a/tests/model_registry/scc/test_model_catalog_scc.py +++ b/tests/model_registry/scc/test_model_catalog_scc.py @@ -3,12 +3,12 @@ import pytest from ocp_resources.deployment import Deployment from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_registry.scc.utils import ( validate_deployment_scc, validate_pod_scc, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) MODEL_CATALOG_STR = "model-catalog" diff --git a/tests/model_registry/scc/test_model_registry_scc.py b/tests/model_registry/scc/test_model_registry_scc.py index 7316cdb25..cfc4faa1a 100644 --- a/tests/model_registry/scc/test_model_registry_scc.py +++ b/tests/model_registry/scc/test_model_registry_scc.py @@ -3,13 +3,13 @@ import pytest from ocp_resources.deployment import Deployment from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_registry.constants import MR_INSTANCE_NAME, MR_POSTGRES_DEPLOYMENT_NAME_STR from tests.model_registry.scc.utils import ( validate_deployment_scc, validate_pod_scc, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/scc/utils.py b/tests/model_registry/scc/utils.py index 0e9da312d..4ce874794 100644 --- a/tests/model_registry/scc/utils.py +++ b/tests/model_registry/scc/utils.py @@ -4,7 +4,8 @@ from ocp_resources.deployment import Deployment from ocp_resources.pod import Pod from ocp_resources.resource import NamespacedResource -from simple_logger.logger import get_logger + +from utilities.opendatahub_logger import get_logger KEYS_TO_VALIDATE = ["runAsGroup", "runAsUser", "allowPrivilegeEscalation", "capabilities"] diff --git a/tests/model_registry/test_security.py b/tests/model_registry/test_security.py index a218c298c..fc3569916 100644 --- a/tests/model_registry/test_security.py +++ b/tests/model_registry/test_security.py @@ -3,7 +3,8 @@ import pytest import requests from ocp_resources.route import Route -from simple_logger.logger import get_logger + +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_registry/utils.py b/tests/model_registry/utils.py index 059ae2ddb..e0c2e3260 100644 --- a/tests/model_registry/utils.py +++ b/tests/model_registry/utils.py @@ -13,7 +13,6 @@ from ocp_resources.pod import Pod from ocp_resources.secret import Secret from ocp_resources.service import Service -from simple_logger.logger import get_logger from timeout_sampler import retry from tests.model_registry.constants import ( @@ -30,6 +29,7 @@ from utilities.constants import Annotations, PodNotFound, Protocols, Timeout from utilities.exceptions import ProtocolNotSupportedError, TooManyServicesError from utilities.general import wait_for_pods_running +from utilities.opendatahub_logger import get_logger from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry from utilities.user_utils import get_byoidc_issuer_url diff --git a/tests/model_serving/maas_billing/conftest.py b/tests/model_serving/maas_billing/conftest.py index c1ec8d1d9..e1b7ea340 100644 --- a/tests/model_serving/maas_billing/conftest.py +++ b/tests/model_serving/maas_billing/conftest.py @@ -18,7 +18,6 @@ from ocp_resources.service_account import ServiceAccount from pytest import FixtureRequest from pytest_testconfig import config as py_config -from simple_logger.logger import get_logger from timeout_sampler import TimeoutSampler from tests.model_serving.maas_billing.utils import ( @@ -48,6 +47,7 @@ from utilities.infra import create_ns, get_openshift_token, login_with_user_password, s3_endpoint_secret from utilities.llmd_constants import ContainerImages, ModelStorage from utilities.llmd_utils import create_llmisvc +from utilities.opendatahub_logger import get_logger from utilities.plugins.constant import OpenAIEnpoints from utilities.resources.rate_limit_policy import RateLimitPolicy from utilities.resources.token_rate_limit_policy import TokenRateLimitPolicy diff --git a/tests/model_serving/maas_billing/maas_subscription/component_health/test_maas_api_health.py b/tests/model_serving/maas_billing/maas_subscription/component_health/test_maas_api_health.py index 8bb4ce20e..1e19a49df 100644 --- a/tests/model_serving/maas_billing/maas_subscription/component_health/test_maas_api_health.py +++ b/tests/model_serving/maas_billing/maas_subscription/component_health/test_maas_api_health.py @@ -3,10 +3,10 @@ from ocp_resources.data_science_cluster import DataScienceCluster from ocp_resources.deployment import Deployment 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__) diff --git a/tests/model_serving/maas_billing/maas_subscription/component_health/test_maas_controller_health.py b/tests/model_serving/maas_billing/maas_subscription/component_health/test_maas_controller_health.py index c2b1e505d..a60fa73fb 100644 --- a/tests/model_serving/maas_billing/maas_subscription/component_health/test_maas_controller_health.py +++ b/tests/model_serving/maas_billing/maas_subscription/component_health/test_maas_controller_health.py @@ -4,10 +4,10 @@ from ocp_resources.data_science_cluster import DataScienceCluster from ocp_resources.deployment import Deployment from pytest_testconfig import config as py_config -from simple_logger.logger import get_logger from utilities.constants import ApiGroups from utilities.general import wait_for_pods_running +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/maas_billing/maas_subscription/conftest.py b/tests/model_serving/maas_billing/maas_subscription/conftest.py index 0d37ae993..2746de2ed 100644 --- a/tests/model_serving/maas_billing/maas_subscription/conftest.py +++ b/tests/model_serving/maas_billing/maas_subscription/conftest.py @@ -19,7 +19,6 @@ from ocp_resources.service import Service from ocp_resources.service_account import ServiceAccount from pytest_testconfig import config as py_config -from simple_logger.logger import get_logger from tests.model_serving.maas_billing.maas_subscription.utils import ( MAAS_DB_NAMESPACE, @@ -41,6 +40,7 @@ from utilities.infra import create_inference_token, create_ns, get_openshift_token, login_with_user_password from utilities.llmd_constants import ContainerImages, ModelStorage from utilities.llmd_utils import create_llmisvc +from utilities.opendatahub_logger import get_logger from utilities.plugins.constant import OpenAIEnpoints from utilities.resources.auth import Auth diff --git a/tests/model_serving/maas_billing/maas_subscription/test_api_key_authorization.py b/tests/model_serving/maas_billing/maas_subscription/test_api_key_authorization.py index 673716264..de14d3ed7 100644 --- a/tests/model_serving/maas_billing/maas_subscription/test_api_key_authorization.py +++ b/tests/model_serving/maas_billing/maas_subscription/test_api_key_authorization.py @@ -2,13 +2,13 @@ import pytest import requests -from simple_logger.logger import get_logger from tests.model_serving.maas_billing.maas_subscription.utils import ( get_api_key, list_api_keys, revoke_api_key, ) +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 index 0558ad696..4e69327c3 100644 --- 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,7 +2,6 @@ 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, @@ -10,6 +9,7 @@ get_api_key, resolve_api_key_username, ) +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_crud.py b/tests/model_serving/maas_billing/maas_subscription/test_api_key_crud.py index e9cdbfe16..e791c9f46 100644 --- a/tests/model_serving/maas_billing/maas_subscription/test_api_key_crud.py +++ b/tests/model_serving/maas_billing/maas_subscription/test_api_key_crud.py @@ -2,7 +2,6 @@ import pytest import requests -from simple_logger.logger import get_logger from tests.model_serving.maas_billing.maas_subscription.utils import ( create_api_key, @@ -10,6 +9,7 @@ list_api_keys, ) from utilities.general import generate_random_name +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/maas_billing/maas_subscription/test_cascade_deletion.py b/tests/model_serving/maas_billing/maas_subscription/test_cascade_deletion.py index 5038c11a5..828509fa9 100644 --- a/tests/model_serving/maas_billing/maas_subscription/test_cascade_deletion.py +++ b/tests/model_serving/maas_billing/maas_subscription/test_cascade_deletion.py @@ -3,12 +3,12 @@ import pytest import requests from kubernetes.dynamic import DynamicClient -from simple_logger.logger import get_logger from tests.model_serving.maas_billing.maas_subscription.utils import ( chat_payload_for_url, poll_expected_status, ) +from utilities.opendatahub_logger import get_logger from utilities.resources.maa_s_subscription import MaaSSubscription LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/maas_billing/maas_subscription/test_maas_auth_enforcement.py b/tests/model_serving/maas_billing/maas_subscription/test_maas_auth_enforcement.py index fdb67649d..72ef3197b 100644 --- a/tests/model_serving/maas_billing/maas_subscription/test_maas_auth_enforcement.py +++ b/tests/model_serving/maas_billing/maas_subscription/test_maas_auth_enforcement.py @@ -2,13 +2,13 @@ import pytest import requests -from simple_logger.logger import get_logger from tests.model_serving.maas_billing.maas_subscription.utils import ( chat_payload_for_url, poll_expected_status, ) from tests.model_serving.maas_billing.utils import build_maas_headers +from utilities.opendatahub_logger import get_logger from utilities.plugins.constant import RestHeader LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/maas_billing/maas_subscription/test_maas_sub_enforcement.py b/tests/model_serving/maas_billing/maas_subscription/test_maas_sub_enforcement.py index 025c4a4c0..fc0609656 100644 --- a/tests/model_serving/maas_billing/maas_subscription/test_maas_sub_enforcement.py +++ b/tests/model_serving/maas_billing/maas_subscription/test_maas_sub_enforcement.py @@ -2,9 +2,9 @@ import pytest import requests -from simple_logger.logger import get_logger from tests.model_serving.maas_billing.maas_subscription.utils import chat_payload_for_url +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/maas_billing/maas_subscription/test_multiple_auth_policies_per_model.py b/tests/model_serving/maas_billing/maas_subscription/test_multiple_auth_policies_per_model.py index 99e99dd6b..260b505b7 100644 --- a/tests/model_serving/maas_billing/maas_subscription/test_multiple_auth_policies_per_model.py +++ b/tests/model_serving/maas_billing/maas_subscription/test_multiple_auth_policies_per_model.py @@ -2,12 +2,12 @@ import pytest import requests -from simple_logger.logger import get_logger from tests.model_serving.maas_billing.maas_subscription.utils import ( chat_payload_for_url, poll_expected_status, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/maas_billing/maas_subscription/test_multiple_subscriptions_no_header.py b/tests/model_serving/maas_billing/maas_subscription/test_multiple_subscriptions_no_header.py index 7d11e6b95..202ec1936 100644 --- a/tests/model_serving/maas_billing/maas_subscription/test_multiple_subscriptions_no_header.py +++ b/tests/model_serving/maas_billing/maas_subscription/test_multiple_subscriptions_no_header.py @@ -3,12 +3,12 @@ import pytest import requests from ocp_resources.maas_subscription import MaaSSubscription -from simple_logger.logger import get_logger from tests.model_serving.maas_billing.maas_subscription.utils import ( chat_payload_for_url, poll_expected_status, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/maas_billing/maas_subscription/test_multiple_subscriptions_per_model.py b/tests/model_serving/maas_billing/maas_subscription/test_multiple_subscriptions_per_model.py index 53f177a89..477e58a83 100644 --- a/tests/model_serving/maas_billing/maas_subscription/test_multiple_subscriptions_per_model.py +++ b/tests/model_serving/maas_billing/maas_subscription/test_multiple_subscriptions_per_model.py @@ -3,11 +3,7 @@ import pytest import requests from kubernetes.dynamic import DynamicClient - -# from utilities.resources.maa_s_auth_policy import MaaSAuthPolicy -from ocp_resources.maas_auth_policy import MaaSAuthPolicy from ocp_resources.service_account import ServiceAccount -from simple_logger.logger import get_logger from tests.model_serving.maas_billing.maas_subscription.utils import ( chat_payload_for_url, @@ -16,6 +12,8 @@ ) from tests.model_serving.maas_billing.utils import build_maas_headers from utilities.infra import create_inference_token, login_with_user_password +from utilities.opendatahub_logger import get_logger +from utilities.resources.maa_s_auth_policy import MaaSAuthPolicy LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/maas_billing/maas_subscription/test_subscription_without_auth_policy.py b/tests/model_serving/maas_billing/maas_subscription/test_subscription_without_auth_policy.py index 2ebf708e9..6380acca5 100644 --- a/tests/model_serving/maas_billing/maas_subscription/test_subscription_without_auth_policy.py +++ b/tests/model_serving/maas_billing/maas_subscription/test_subscription_without_auth_policy.py @@ -3,12 +3,12 @@ import pytest import requests from ocp_resources.maas_subscription import MaaSSubscription -from simple_logger.logger import get_logger from tests.model_serving.maas_billing.maas_subscription.utils import ( chat_payload_for_url, poll_expected_status, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/maas_billing/maas_subscription/utils.py b/tests/model_serving/maas_billing/maas_subscription/utils.py index 33bcab56d..a3647b8a1 100644 --- a/tests/model_serving/maas_billing/maas_subscription/utils.py +++ b/tests/model_serving/maas_billing/maas_subscription/utils.py @@ -17,7 +17,6 @@ from ocp_resources.secret import Secret from ocp_resources.service import Service from requests import Response -from simple_logger.logger import get_logger from timeout_sampler import TimeoutSampler from utilities.constants import ( @@ -26,6 +25,7 @@ ApiGroups, ) from utilities.general import generate_random_name +from utilities.opendatahub_logger import get_logger from utilities.resources.auth import Auth LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/maas_billing/test_maas_endpoints.py b/tests/model_serving/maas_billing/test_maas_endpoints.py index a30d4408e..490c98fc0 100644 --- a/tests/model_serving/maas_billing/test_maas_endpoints.py +++ b/tests/model_serving/maas_billing/test_maas_endpoints.py @@ -1,8 +1,8 @@ import pytest import requests -from simple_logger.logger import get_logger from tests.model_serving.maas_billing.utils import verify_chat_completions +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/maas_billing/test_maas_rbac_e2e.py b/tests/model_serving/maas_billing/test_maas_rbac_e2e.py index ef6f8c381..e62ca6703 100644 --- a/tests/model_serving/maas_billing/test_maas_rbac_e2e.py +++ b/tests/model_serving/maas_billing/test_maas_rbac_e2e.py @@ -1,9 +1,9 @@ import pytest -from simple_logger.logger import get_logger from tests.model_serving.maas_billing.utils import ( verify_chat_completions, ) +from utilities.opendatahub_logger import get_logger from utilities.plugins.constant import OpenAIEnpoints LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/maas_billing/test_maas_request_rate_limits.py b/tests/model_serving/maas_billing/test_maas_request_rate_limits.py index bd0944229..bedb44e68 100644 --- a/tests/model_serving/maas_billing/test_maas_request_rate_limits.py +++ b/tests/model_serving/maas_billing/test_maas_request_rate_limits.py @@ -1,9 +1,9 @@ import pytest -from simple_logger.logger import get_logger from tests.model_serving.maas_billing.utils import ( assert_mixed_200_and_429, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/maas_billing/test_maas_token_rate_limits.py b/tests/model_serving/maas_billing/test_maas_token_rate_limits.py index 708e2c2fd..13feb7205 100644 --- a/tests/model_serving/maas_billing/test_maas_token_rate_limits.py +++ b/tests/model_serving/maas_billing/test_maas_token_rate_limits.py @@ -1,9 +1,9 @@ import pytest -from simple_logger.logger import get_logger from tests.model_serving.maas_billing.utils import ( assert_mixed_200_and_429, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/maas_billing/test_maas_token_revoke.py b/tests/model_serving/maas_billing/test_maas_token_revoke.py index 423ec6269..881c344fa 100644 --- a/tests/model_serving/maas_billing/test_maas_token_revoke.py +++ b/tests/model_serving/maas_billing/test_maas_token_revoke.py @@ -1,10 +1,10 @@ import pytest -from simple_logger.logger import get_logger from timeout_sampler import TimeoutSampler from tests.model_serving.maas_billing.utils import ( verify_chat_completions, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/maas_billing/utils.py b/tests/model_serving/maas_billing/utils.py index 9f986e621..dae5fe140 100644 --- a/tests/model_serving/maas_billing/utils.py +++ b/tests/model_serving/maas_billing/utils.py @@ -15,13 +15,13 @@ from ocp_resources.llm_inference_service import LLMInferenceService from ocp_resources.resource import ResourceEditor from requests import Response -from simple_logger.logger import get_logger from utilities.constants import ( MAAS_GATEWAY_NAME, MAAS_GATEWAY_NAMESPACE, ) from utilities.llmd_utils import get_llm_inference_url +from utilities.opendatahub_logger import get_logger from utilities.plugins.constant import OpenAIEnpoints, RestHeader from utilities.resources.rate_limit_policy import RateLimitPolicy from utilities.resources.token_rate_limit_policy import TokenRateLimitPolicy diff --git a/tests/model_serving/model_runtime/image_validation/test_verify_serving_runtime_images.py b/tests/model_serving/model_runtime/image_validation/test_verify_serving_runtime_images.py index 6f4aefd81..aaa138cf3 100644 --- a/tests/model_serving/model_runtime/image_validation/test_verify_serving_runtime_images.py +++ b/tests/model_serving/model_runtime/image_validation/test_verify_serving_runtime_images.py @@ -13,10 +13,10 @@ import pytest from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.image_validation.constant import RUNTIME_CONFIGS from utilities.general import validate_container_images +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/model_validation/conftest.py b/tests/model_serving/model_runtime/model_validation/conftest.py index 36b269db7..b6c032a3f 100644 --- a/tests/model_serving/model_runtime/model_validation/conftest.py +++ b/tests/model_serving/model_runtime/model_validation/conftest.py @@ -11,7 +11,6 @@ from ocp_resources.secret import Secret from ocp_resources.serving_runtime import ServingRuntime from pytest import FixtureRequest -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.model_validation.constant import ( ACCELERATOR_IDENTIFIER, @@ -27,6 +26,7 @@ from utilities.constants import KServeDeploymentType, Labels, RuntimeTemplates from utilities.inference_utils import create_isvc from utilities.infra import get_pods_by_isvc_label +from utilities.opendatahub_logger import get_logger from utilities.serving_runtime import ServingRuntimeFromTemplate LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/model_validation/test_modelvalidation.py b/tests/model_serving/model_runtime/model_validation/test_modelvalidation.py index b13365070..34eb8e8cf 100644 --- a/tests/model_serving/model_runtime/model_validation/test_modelvalidation.py +++ b/tests/model_serving/model_runtime/model_validation/test_modelvalidation.py @@ -3,12 +3,12 @@ import pytest from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.model_validation.constant import COMPLETION_QUERY from tests.model_serving.model_runtime.utils import ( validate_raw_openai_inference_request, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/openvino/conftest.py b/tests/model_serving/model_runtime/openvino/conftest.py index 720c3bb6d..6822bbe24 100644 --- a/tests/model_serving/model_runtime/openvino/conftest.py +++ b/tests/model_serving/model_runtime/openvino/conftest.py @@ -24,7 +24,6 @@ from ocp_resources.secret import Secret from ocp_resources.service_account import ServiceAccount from ocp_resources.serving_runtime import ServingRuntime -from simple_logger.logger import get_logger from syrupy.extensions.json import JSONSnapshotExtension from tests.model_serving.model_runtime.openvino.constant import PREDICT_RESOURCES @@ -35,6 +34,7 @@ ) from utilities.inference_utils import create_isvc from utilities.infra import get_pods_by_isvc_label +from utilities.opendatahub_logger import get_logger from utilities.serving_runtime import ServingRuntimeFromTemplate LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/openvino/test_ovms_model_deployment.py b/tests/model_serving/model_runtime/openvino/test_ovms_model_deployment.py index 755bab56f..c36b3f96a 100644 --- a/tests/model_serving/model_runtime/openvino/test_ovms_model_deployment.py +++ b/tests/model_serving/model_runtime/openvino/test_ovms_model_deployment.py @@ -10,7 +10,6 @@ import pytest from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.openvino.constant import ( MODEL_CONFIGS, @@ -26,6 +25,7 @@ validate_inference_request, ) from utilities.constants import ModelFormat, Protocols +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/rhoai_upgrade/test_upgrade.py b/tests/model_serving/model_runtime/rhoai_upgrade/test_upgrade.py index dd0d0819e..9623f1da3 100644 --- a/tests/model_serving/model_runtime/rhoai_upgrade/test_upgrade.py +++ b/tests/model_serving/model_runtime/rhoai_upgrade/test_upgrade.py @@ -2,12 +2,12 @@ from typing import Any import pytest -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.rhoai_upgrade.constant import ( SERVING_RUNTIME_INSTANCE_NAME, SERVING_RUNTIME_TEMPLATE_NAME, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/triton/basic_model_deployment/conftest.py b/tests/model_serving/model_runtime/triton/basic_model_deployment/conftest.py index b8b3ddeab..63950a427 100644 --- a/tests/model_serving/model_runtime/triton/basic_model_deployment/conftest.py +++ b/tests/model_serving/model_runtime/triton/basic_model_deployment/conftest.py @@ -14,7 +14,6 @@ from ocp_resources.serving_runtime import ServingRuntime from ocp_resources.template import Template from pytest_testconfig import config as py_config -from simple_logger.logger import get_logger from syrupy.extensions.json import JSONSnapshotExtension from tests.model_serving.model_runtime.triton.basic_model_deployment.utils import ( @@ -31,6 +30,7 @@ ) from utilities.inference_utils import create_isvc from utilities.infra import get_pods_by_isvc_label +from utilities.opendatahub_logger import get_logger from utilities.serving_runtime import ServingRuntimeFromTemplate LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/triton/basic_model_deployment/test_dali_model.py b/tests/model_serving/model_runtime/triton/basic_model_deployment/test_dali_model.py index 4f5bc492a..dcfce46af 100644 --- a/tests/model_serving/model_runtime/triton/basic_model_deployment/test_dali_model.py +++ b/tests/model_serving/model_runtime/triton/basic_model_deployment/test_dali_model.py @@ -9,7 +9,6 @@ import pytest from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.triton.basic_model_deployment.utils import load_json, validate_inference_request from tests.model_serving.model_runtime.triton.constant import ( @@ -19,6 +18,7 @@ TRITON_REST_DALI_INPUT_PATH, ) from utilities.constants import Protocols +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/triton/basic_model_deployment/test_fil_model.py b/tests/model_serving/model_runtime/triton/basic_model_deployment/test_fil_model.py index 563b97267..08b8ba6a6 100644 --- a/tests/model_serving/model_runtime/triton/basic_model_deployment/test_fil_model.py +++ b/tests/model_serving/model_runtime/triton/basic_model_deployment/test_fil_model.py @@ -9,7 +9,6 @@ import pytest from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.triton.basic_model_deployment.utils import load_json, validate_inference_request from tests.model_serving.model_runtime.triton.constant import ( @@ -19,6 +18,7 @@ TRITON_REST_FIL_INPUT_PATH, ) from utilities.constants import Protocols +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/triton/basic_model_deployment/test_keras_model.py b/tests/model_serving/model_runtime/triton/basic_model_deployment/test_keras_model.py index 3b1c7621d..ea10307e8 100644 --- a/tests/model_serving/model_runtime/triton/basic_model_deployment/test_keras_model.py +++ b/tests/model_serving/model_runtime/triton/basic_model_deployment/test_keras_model.py @@ -9,7 +9,6 @@ import pytest from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.triton.basic_model_deployment.utils import load_json, validate_inference_request from tests.model_serving.model_runtime.triton.constant import ( @@ -19,6 +18,7 @@ TRITON_REST_KERAS_INPUT_PATH, ) from utilities.constants import Protocols +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/triton/basic_model_deployment/test_onnx_model.py b/tests/model_serving/model_runtime/triton/basic_model_deployment/test_onnx_model.py index c83feaedd..c455e397d 100644 --- a/tests/model_serving/model_runtime/triton/basic_model_deployment/test_onnx_model.py +++ b/tests/model_serving/model_runtime/triton/basic_model_deployment/test_onnx_model.py @@ -9,7 +9,6 @@ import pytest from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.triton.basic_model_deployment.utils import load_json, validate_inference_request from tests.model_serving.model_runtime.triton.constant import ( @@ -19,6 +18,7 @@ TRITON_REST_ONNX_INPUT_PATH, ) from utilities.constants import Protocols +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/triton/basic_model_deployment/test_python_model.py b/tests/model_serving/model_runtime/triton/basic_model_deployment/test_python_model.py index 77f2e7744..510f0daad 100644 --- a/tests/model_serving/model_runtime/triton/basic_model_deployment/test_python_model.py +++ b/tests/model_serving/model_runtime/triton/basic_model_deployment/test_python_model.py @@ -9,7 +9,6 @@ import pytest from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.triton.basic_model_deployment.utils import load_json, validate_inference_request from tests.model_serving.model_runtime.triton.constant import ( @@ -19,6 +18,7 @@ TRITON_REST_PYTHON_INPUT_PATH, ) from utilities.constants import Protocols +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/triton/basic_model_deployment/test_pytorch_model.py b/tests/model_serving/model_runtime/triton/basic_model_deployment/test_pytorch_model.py index efd29144d..3766b68cd 100644 --- a/tests/model_serving/model_runtime/triton/basic_model_deployment/test_pytorch_model.py +++ b/tests/model_serving/model_runtime/triton/basic_model_deployment/test_pytorch_model.py @@ -9,7 +9,6 @@ import pytest from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.triton.basic_model_deployment.utils import load_json, validate_inference_request from tests.model_serving.model_runtime.triton.constant import ( @@ -19,6 +18,7 @@ TRITON_REST_PYTORCH_INPUT_PATH, ) from utilities.constants import Protocols +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/triton/basic_model_deployment/test_tensorflow_model.py b/tests/model_serving/model_runtime/triton/basic_model_deployment/test_tensorflow_model.py index 85fd7ed8d..b8bd1fa66 100644 --- a/tests/model_serving/model_runtime/triton/basic_model_deployment/test_tensorflow_model.py +++ b/tests/model_serving/model_runtime/triton/basic_model_deployment/test_tensorflow_model.py @@ -11,7 +11,6 @@ import pytest from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.triton.basic_model_deployment.utils import load_json, validate_inference_request from tests.model_serving.model_runtime.triton.constant import ( @@ -21,6 +20,7 @@ TRITON_REST_TF_INPUT_PATH, ) from utilities.constants import Protocols +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/utils.py b/tests/model_serving/model_runtime/utils.py index e74d6b269..4b86c3369 100644 --- a/tests/model_serving/model_runtime/utils.py +++ b/tests/model_serving/model_runtime/utils.py @@ -5,7 +5,6 @@ import portforward from ocp_resources.inference_service import InferenceService -from simple_logger.logger import get_logger from tenacity import retry, stop_after_attempt, wait_exponential from tests.model_serving.model_runtime.model_validation.constant import ( @@ -18,6 +17,7 @@ ) from utilities.constants import Ports from utilities.exceptions import NotSupportedError +from utilities.opendatahub_logger import get_logger from utilities.plugins.constant import OpenAIEnpoints from utilities.plugins.openai_plugin import OpenAIClient from utilities.plugins.tgis_grpc_plugin import TGISGRPCPlugin diff --git a/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_elyza_japanese_llama_2_7b_instruct.py b/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_elyza_japanese_llama_2_7b_instruct.py index dcf49bb55..7314e73d7 100644 --- a/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_elyza_japanese_llama_2_7b_instruct.py +++ b/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_elyza_japanese_llama_2_7b_instruct.py @@ -4,7 +4,6 @@ import pytest from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.vllm.constant import ( BASE_RAW_DEPLOYMENT_CONFIG, @@ -16,6 +15,7 @@ validate_raw_tgis_inference_request, ) from utilities.constants import KServeDeploymentType +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_granite_2b_instruct_preview_4k_r240917a.py b/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_granite_2b_instruct_preview_4k_r240917a.py index 0e0300e50..fbb2e3bce 100644 --- a/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_granite_2b_instruct_preview_4k_r240917a.py +++ b/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_granite_2b_instruct_preview_4k_r240917a.py @@ -1,8 +1,8 @@ import pytest -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.vllm.utils import run_raw_inference from utilities.constants import KServeDeploymentType, Ports +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_granite_7b_redhat_lab.py b/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_granite_7b_redhat_lab.py index 57b3a6bc3..e46d90d0a 100644 --- a/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_granite_7b_redhat_lab.py +++ b/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_granite_7b_redhat_lab.py @@ -4,7 +4,6 @@ import pytest from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.vllm.constant import ( BASE_RAW_DEPLOYMENT_CONFIG, @@ -16,6 +15,7 @@ validate_raw_tgis_inference_request, ) from utilities.constants import KServeDeploymentType +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_granite_7b_starter.py b/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_granite_7b_starter.py index 9bec1ecbb..06c9e5182 100644 --- a/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_granite_7b_starter.py +++ b/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_granite_7b_starter.py @@ -4,7 +4,6 @@ import pytest from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.vllm.constant import ( BASE_RAW_DEPLOYMENT_CONFIG, @@ -16,6 +15,7 @@ validate_raw_tgis_inference_request, ) from utilities.constants import KServeDeploymentType +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_llama31_8B_instruct.py b/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_llama31_8B_instruct.py index be60e6481..d93e0c383 100644 --- a/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_llama31_8B_instruct.py +++ b/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_llama31_8B_instruct.py @@ -5,7 +5,6 @@ import pytest from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.vllm.constant import ( BASE_RAW_DEPLOYMENT_CONFIG, @@ -17,6 +16,7 @@ validate_raw_tgis_inference_request, ) from utilities.constants import KServeDeploymentType +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_llama3_8B_instruct.py b/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_llama3_8B_instruct.py index 2071ea424..499b170a3 100644 --- a/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_llama3_8B_instruct.py +++ b/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_llama3_8B_instruct.py @@ -5,7 +5,6 @@ import pytest from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.vllm.constant import ( BASE_RAW_DEPLOYMENT_CONFIG, @@ -17,6 +16,7 @@ validate_raw_tgis_inference_request, ) from utilities.constants import KServeDeploymentType +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_llama_2_13b_chat.py b/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_llama_2_13b_chat.py index 3f2ed716f..ddcc5f9a1 100644 --- a/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_llama_2_13b_chat.py +++ b/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_llama_2_13b_chat.py @@ -4,7 +4,6 @@ import pytest from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.vllm.constant import ( BASE_RAW_DEPLOYMENT_CONFIG, @@ -16,6 +15,7 @@ validate_raw_tgis_inference_request, ) from utilities.constants import KServeDeploymentType +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_merlinite_7b_lab.py b/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_merlinite_7b_lab.py index 1a351aebe..0058c961f 100644 --- a/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_merlinite_7b_lab.py +++ b/tests/model_serving/model_runtime/vllm/basic_model_deployment/test_merlinite_7b_lab.py @@ -4,7 +4,6 @@ import pytest from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.vllm.constant import ( BASE_RAW_DEPLOYMENT_CONFIG, @@ -16,6 +15,7 @@ validate_raw_tgis_inference_request, ) from utilities.constants import KServeDeploymentType +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/vllm/conftest.py b/tests/model_serving/model_runtime/vllm/conftest.py index 8e92366c6..ce431b1cb 100644 --- a/tests/model_serving/model_runtime/vllm/conftest.py +++ b/tests/model_serving/model_runtime/vllm/conftest.py @@ -10,7 +10,6 @@ from ocp_resources.service_account import ServiceAccount from ocp_resources.serving_runtime import ServingRuntime from pytest import FixtureRequest -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.vllm.constant import ACCELERATOR_IDENTIFIER, PREDICT_RESOURCES, TEMPLATE_MAP from tests.model_serving.model_runtime.vllm.utils import ( @@ -21,6 +20,7 @@ from utilities.constants import KServeDeploymentType, Labels, RuntimeTemplates from utilities.inference_utils import create_isvc from utilities.infra import get_pods_by_isvc_label +from utilities.opendatahub_logger import get_logger from utilities.serving_runtime import ServingRuntimeFromTemplate LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/vllm/multimodal/test_granite_31_2b_vision.py b/tests/model_serving/model_runtime/vllm/multimodal/test_granite_31_2b_vision.py index 704dbe48b..4eedfa418 100644 --- a/tests/model_serving/model_runtime/vllm/multimodal/test_granite_31_2b_vision.py +++ b/tests/model_serving/model_runtime/vllm/multimodal/test_granite_31_2b_vision.py @@ -4,7 +4,6 @@ import pytest from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.vllm.constant import MULTI_IMAGE_QUERIES, OPENAI_ENDPOINT_NAME, THREE_IMAGE_QUERY from tests.model_serving.model_runtime.vllm.utils import ( @@ -12,6 +11,7 @@ validate_inference_output, ) from utilities.constants import KServeDeploymentType, Ports +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/vllm/quantization/test_openhermes-2_5_mistral-7b_awq.py b/tests/model_serving/model_runtime/vllm/quantization/test_openhermes-2_5_mistral-7b_awq.py index 9262bef19..72a9c8221 100644 --- a/tests/model_serving/model_runtime/vllm/quantization/test_openhermes-2_5_mistral-7b_awq.py +++ b/tests/model_serving/model_runtime/vllm/quantization/test_openhermes-2_5_mistral-7b_awq.py @@ -1,6 +1,5 @@ # noqa: N999 import pytest -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.vllm.constant import VLLM_SUPPORTED_QUANTIZATION from tests.model_serving.model_runtime.vllm.utils import ( @@ -8,6 +7,7 @@ validate_inference_output, ) from utilities.constants import KServeDeploymentType, Ports +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/vllm/speculative_decoding/test_granite_7b_lab_draft.py b/tests/model_serving/model_runtime/vllm/speculative_decoding/test_granite_7b_lab_draft.py index 65c7c33dc..5fdd921d1 100644 --- a/tests/model_serving/model_runtime/vllm/speculative_decoding/test_granite_7b_lab_draft.py +++ b/tests/model_serving/model_runtime/vllm/speculative_decoding/test_granite_7b_lab_draft.py @@ -4,7 +4,6 @@ import pytest from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.vllm.constant import OPENAI_ENDPOINT_NAME, TGIS_ENDPOINT_NAME from tests.model_serving.model_runtime.vllm.utils import ( @@ -12,6 +11,7 @@ validate_inference_output, ) from utilities.constants import KServeDeploymentType, Ports +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/vllm/speculative_decoding/test_granite_7b_lab_ngram.py b/tests/model_serving/model_runtime/vllm/speculative_decoding/test_granite_7b_lab_ngram.py index ecdc90aef..43c94e45b 100644 --- a/tests/model_serving/model_runtime/vllm/speculative_decoding/test_granite_7b_lab_ngram.py +++ b/tests/model_serving/model_runtime/vllm/speculative_decoding/test_granite_7b_lab_ngram.py @@ -4,7 +4,6 @@ import pytest from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.vllm.constant import OPENAI_ENDPOINT_NAME, TGIS_ENDPOINT_NAME from tests.model_serving.model_runtime.vllm.utils import ( @@ -12,6 +11,7 @@ validate_inference_output, ) from utilities.constants import KServeDeploymentType, Ports +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/vllm/toolcalling/test_granite_3_2_8b_instruct_preview.py b/tests/model_serving/model_runtime/vllm/toolcalling/test_granite_3_2_8b_instruct_preview.py index 9e291f267..2587be099 100644 --- a/tests/model_serving/model_runtime/vllm/toolcalling/test_granite_3_2_8b_instruct_preview.py +++ b/tests/model_serving/model_runtime/vllm/toolcalling/test_granite_3_2_8b_instruct_preview.py @@ -4,7 +4,6 @@ import pytest from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.vllm.constant import ( COMPLETION_QUERY, @@ -19,6 +18,7 @@ validate_raw_tgis_inference_request, ) from utilities.constants import KServeDeploymentType +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_runtime/vllm/utils.py b/tests/model_serving/model_runtime/vllm/utils.py index 60cd5f402..f4e72324d 100644 --- a/tests/model_serving/model_runtime/vllm/utils.py +++ b/tests/model_serving/model_runtime/vllm/utils.py @@ -7,7 +7,6 @@ from kubernetes.dynamic import DynamicClient from ocp_resources.inference_service import InferenceService from ocp_resources.secret import Secret -from simple_logger.logger import get_logger from tenacity import retry, stop_after_attempt, wait_exponential from tests.model_serving.model_runtime.vllm.constant import ( @@ -19,6 +18,7 @@ ) from utilities.constants import Ports from utilities.exceptions import NotSupportedError +from utilities.opendatahub_logger import get_logger from utilities.plugins.constant import OpenAIEnpoints from utilities.plugins.openai_plugin import OpenAIClient from utilities.plugins.tgis_grpc_plugin import TGISGRPCPlugin diff --git a/tests/model_serving/model_server/conftest.py b/tests/model_serving/model_server/conftest.py index 0d54e4324..41f4a3c96 100644 --- a/tests/model_serving/model_server/conftest.py +++ b/tests/model_serving/model_server/conftest.py @@ -19,7 +19,6 @@ from ocp_resources.serving_runtime import ServingRuntime from ocp_resources.storage_class import StorageClass from pytest_testconfig import config as py_config -from simple_logger.logger import get_logger from utilities.constants import ( DscComponents, @@ -48,6 +47,7 @@ create_resource_flavor, wait_for_kueue_crds_available, ) +from utilities.opendatahub_logger import get_logger from utilities.serving_runtime import ServingRuntimeFromTemplate LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_server/kserve/authentication/conftest.py b/tests/model_serving/model_server/kserve/authentication/conftest.py index a9141c5c1..04a3741a0 100644 --- a/tests/model_serving/model_server/kserve/authentication/conftest.py +++ b/tests/model_serving/model_server/kserve/authentication/conftest.py @@ -13,7 +13,6 @@ from ocp_resources.secret import Secret from ocp_resources.service_account import ServiceAccount from ocp_resources.serving_runtime import ServingRuntime -from simple_logger.logger import get_logger from utilities.constants import ( Annotations, @@ -31,6 +30,7 @@ ) from utilities.jira import is_jira_open from utilities.logger import RedactedString +from utilities.opendatahub_logger import get_logger from utilities.serving_runtime import ServingRuntimeFromTemplate LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_server/kserve/autoscaling/keda/conftest.py b/tests/model_serving/model_server/kserve/autoscaling/keda/conftest.py index 9bc2303ee..6480b1b6e 100644 --- a/tests/model_serving/model_server/kserve/autoscaling/keda/conftest.py +++ b/tests/model_serving/model_server/kserve/autoscaling/keda/conftest.py @@ -10,7 +10,6 @@ from ocp_resources.secret import Secret from ocp_resources.service_account import ServiceAccount from ocp_resources.serving_runtime import ServingRuntime -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.vllm.constant import ACCELERATOR_IDENTIFIER, PREDICT_RESOURCES, TEMPLATE_MAP from tests.model_serving.model_runtime.vllm.utils import ( @@ -29,6 +28,7 @@ ) from utilities.inference_utils import create_isvc from utilities.manifests.vllm import VLLM_INFERENCE_CONFIG +from utilities.opendatahub_logger import get_logger from utilities.serving_runtime import ServingRuntimeFromTemplate LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_server/kserve/autoscaling/keda/test_isvc_keda_scaling_cpu.py b/tests/model_serving/model_server/kserve/autoscaling/keda/test_isvc_keda_scaling_cpu.py index 7e583559a..9f869caae 100644 --- a/tests/model_serving/model_server/kserve/autoscaling/keda/test_isvc_keda_scaling_cpu.py +++ b/tests/model_serving/model_server/kserve/autoscaling/keda/test_isvc_keda_scaling_cpu.py @@ -5,7 +5,6 @@ from kubernetes.dynamic import DynamicClient from ocp_resources.inference_service import InferenceService from ocp_resources.namespace import Namespace -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.vllm.basic_model_deployment.test_granite_7b_starter import SERVING_ARGUMENT from tests.model_serving.model_runtime.vllm.constant import BASE_RAW_DEPLOYMENT_CONFIG @@ -18,6 +17,7 @@ from utilities.inference_utils import Inference from utilities.manifests.onnx import ONNX_INFERENCE_CONFIG from utilities.monitoring import validate_metrics_field +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_server/kserve/autoscaling/keda/test_isvc_keda_scaling_gpu.py b/tests/model_serving/model_server/kserve/autoscaling/keda/test_isvc_keda_scaling_gpu.py index 3ec6a0971..6c6fe0561 100644 --- a/tests/model_serving/model_server/kserve/autoscaling/keda/test_isvc_keda_scaling_gpu.py +++ b/tests/model_serving/model_server/kserve/autoscaling/keda/test_isvc_keda_scaling_gpu.py @@ -5,12 +5,12 @@ from kubernetes.dynamic import DynamicClient from ocp_resources.inference_service import InferenceService from ocp_resources.namespace import Namespace -from simple_logger.logger import get_logger from tests.model_serving.model_runtime.vllm.constant import BASE_RAW_DEPLOYMENT_CONFIG from tests.model_serving.model_server.utils import verify_final_pod_count, verify_keda_scaledobject from utilities.constants import KServeDeploymentType from utilities.monitoring import validate_metrics_field +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_server/kserve/inference_service_lifecycle/test_isvc_replicas_update.py b/tests/model_serving/model_server/kserve/inference_service_lifecycle/test_isvc_replicas_update.py index 944b249b5..5cebf6d0f 100644 --- a/tests/model_serving/model_server/kserve/inference_service_lifecycle/test_isvc_replicas_update.py +++ b/tests/model_serving/model_server/kserve/inference_service_lifecycle/test_isvc_replicas_update.py @@ -1,5 +1,4 @@ import pytest -from simple_logger.logger import get_logger from timeout_sampler import TimeoutSampler from tests.model_serving.model_server.kserve.inference_service_lifecycle.constants import ( @@ -15,6 +14,7 @@ from utilities.inference_utils import Inference from utilities.infra import get_pods_by_isvc_label from utilities.manifests.onnx import ONNX_INFERENCE_CONFIG +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_server/kserve/inference_service_lifecycle/utils.py b/tests/model_serving/model_server/kserve/inference_service_lifecycle/utils.py index 9f91aacae..574d724f6 100644 --- a/tests/model_serving/model_server/kserve/inference_service_lifecycle/utils.py +++ b/tests/model_serving/model_server/kserve/inference_service_lifecycle/utils.py @@ -9,12 +9,12 @@ from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod from ocp_resources.resource import ResourceEditor -from simple_logger.logger import get_logger from timeout_sampler import TimeoutExpiredError, TimeoutSampler from tests.model_serving.model_server.utils import verify_no_inference_pods from utilities.constants import Timeout from utilities.infra import get_pods_by_isvc_label +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_server/kserve/ingress/conftest.py b/tests/model_serving/model_server/kserve/ingress/conftest.py index 03681e594..97918862b 100644 --- a/tests/model_serving/model_server/kserve/ingress/conftest.py +++ b/tests/model_serving/model_server/kserve/ingress/conftest.py @@ -11,13 +11,13 @@ from ocp_resources.secret import Secret from ocp_resources.service_account import ServiceAccount from ocp_resources.serving_runtime import ServingRuntime -from simple_logger.logger import get_logger from timeout_sampler import TimeoutSampler from tests.model_serving.model_server.kserve.ingress.utils import create_curl_pod from utilities.constants import KServeDeploymentType, Labels, ModelStoragePath from utilities.inference_utils import create_isvc from utilities.infra import create_ns +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_server/kserve/ingress/test_internal_endpoint.py b/tests/model_serving/model_server/kserve/ingress/test_internal_endpoint.py index 915983d44..78aac577f 100644 --- a/tests/model_serving/model_server/kserve/ingress/test_internal_endpoint.py +++ b/tests/model_serving/model_server/kserve/ingress/test_internal_endpoint.py @@ -3,10 +3,10 @@ import pytest from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from tests.model_serving.model_server.kserve.ingress.utils import curl_from_pod from utilities.constants import RuntimeTemplates +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_server/kserve/ingress/utils.py b/tests/model_serving/model_server/kserve/ingress/utils.py index 26c477f28..3514766a2 100644 --- a/tests/model_serving/model_server/kserve/ingress/utils.py +++ b/tests/model_serving/model_server/kserve/ingress/utils.py @@ -8,11 +8,11 @@ from kubernetes.dynamic.exceptions import ResourceNotFoundError from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from utilities.constants import Protocols, Timeout from utilities.exceptions import ProtocolNotSupportedError from utilities.infra import get_model_route +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_server/kserve/multi_node/conftest.py b/tests/model_serving/model_server/kserve/multi_node/conftest.py index c3ec84adc..bf01a7bcf 100644 --- a/tests/model_serving/model_server/kserve/multi_node/conftest.py +++ b/tests/model_serving/model_server/kserve/multi_node/conftest.py @@ -14,7 +14,6 @@ from ocp_resources.secret import Secret from ocp_resources.serving_runtime import ServingRuntime from pytest_testconfig import config as py_config -from simple_logger.logger import get_logger from timeout_sampler import TimeoutSampler from tests.model_serving.model_server.kserve.multi_node.constants import WORKER_POD_ROLE @@ -30,6 +29,7 @@ verify_no_failed_pods, wait_for_inference_deployment_replicas, ) +from utilities.opendatahub_logger import get_logger from utilities.serving_runtime import ServingRuntimeFromTemplate LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_server/kserve/multi_node/test_nvidia_multi_node.py b/tests/model_serving/model_server/kserve/multi_node/test_nvidia_multi_node.py index 619aca5b7..04f567793 100644 --- a/tests/model_serving/model_server/kserve/multi_node/test_nvidia_multi_node.py +++ b/tests/model_serving/model_server/kserve/multi_node/test_nvidia_multi_node.py @@ -1,7 +1,6 @@ from typing import Any import pytest -from simple_logger.logger import get_logger from tests.model_serving.model_server.kserve.multi_node.constants import ( HEAD_POD_ROLE, @@ -16,6 +15,7 @@ from tests.model_serving.model_server.utils import verify_inference_response from utilities.constants import Labels, Protocols, StorageClassName from utilities.manifests.vllm import VLLM_INFERENCE_CONFIG +from utilities.opendatahub_logger import get_logger pytestmark = [ pytest.mark.rawdeployment, diff --git a/tests/model_serving/model_server/kserve/multi_node/test_oci_multi_node.py b/tests/model_serving/model_server/kserve/multi_node/test_oci_multi_node.py index c8ac25978..6766aacb6 100644 --- a/tests/model_serving/model_server/kserve/multi_node/test_oci_multi_node.py +++ b/tests/model_serving/model_server/kserve/multi_node/test_oci_multi_node.py @@ -1,9 +1,9 @@ import pytest -from simple_logger.logger import get_logger from tests.model_serving.model_server.utils import verify_inference_response from utilities.constants import Protocols from utilities.manifests.vllm import VLLM_INFERENCE_CONFIG +from utilities.opendatahub_logger import get_logger pytestmark = [ pytest.mark.rawdeployment, diff --git a/tests/model_serving/model_server/kserve/multi_node/utils.py b/tests/model_serving/model_server/kserve/multi_node/utils.py index 190ec865d..d94e92a67 100644 --- a/tests/model_serving/model_server/kserve/multi_node/utils.py +++ b/tests/model_serving/model_server/kserve/multi_node/utils.py @@ -5,12 +5,12 @@ from kubernetes.dynamic.exceptions import ResourceNotFoundError from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod -from simple_logger.logger import get_logger from timeout_sampler import retry from tests.model_serving.model_server.kserve.multi_node.constants import HEAD_POD_ROLE, SUPPORTED_ROLES, WORKER_POD_ROLE from utilities.constants import Timeout from utilities.infra import get_pods_by_isvc_label +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_server/kserve/platform/dsc_deployment_mode/utils.py b/tests/model_serving/model_server/kserve/platform/dsc_deployment_mode/utils.py index 262913d7a..4349f0c72 100644 --- a/tests/model_serving/model_server/kserve/platform/dsc_deployment_mode/utils.py +++ b/tests/model_serving/model_server/kserve/platform/dsc_deployment_mode/utils.py @@ -5,10 +5,10 @@ from ocp_resources.config_map import ConfigMap from ocp_resources.data_science_cluster import DataScienceCluster from ocp_resources.resource import ResourceEditor -from simple_logger.logger import get_logger from timeout_sampler import TimeoutSampler from utilities.constants import Timeout +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_server/kserve/platform/test_custom_resources.py b/tests/model_serving/model_server/kserve/platform/test_custom_resources.py index ad9732830..f02d19faa 100644 --- a/tests/model_serving/model_server/kserve/platform/test_custom_resources.py +++ b/tests/model_serving/model_server/kserve/platform/test_custom_resources.py @@ -1,6 +1,5 @@ import pytest from ocp_resources.inference_service import InferenceService -from simple_logger.logger import get_logger from timeout_sampler import TimeoutExpiredError, TimeoutSampler from utilities.constants import ( @@ -8,6 +7,7 @@ ModelFormat, RuntimeTemplates, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_server/llmd/conftest.py b/tests/model_serving/model_server/llmd/conftest.py index 1dbe233db..19ab0794b 100644 --- a/tests/model_serving/model_server/llmd/conftest.py +++ b/tests/model_serving/model_server/llmd/conftest.py @@ -15,7 +15,6 @@ from ocp_resources.role import Role from ocp_resources.role_binding import RoleBinding from ocp_resources.service_account import ServiceAccount -from simple_logger.logger import get_logger from tests.model_serving.model_server.llmd.llmd_configs import TinyLlamaOciConfig from tests.model_serving.model_server.llmd.utils import wait_for_llmisvc, wait_for_llmisvc_pods_ready @@ -24,6 +23,7 @@ from utilities.llmd_constants import LLMDGateway from utilities.llmd_utils import create_llmd_gateway from utilities.logger import RedactedString +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) logging.getLogger("timeout_sampler").setLevel(logging.WARNING) diff --git a/tests/model_serving/model_server/llmd/utils.py b/tests/model_serving/model_server/llmd/utils.py index d1062e210..edff1e789 100644 --- a/tests/model_serving/model_server/llmd/utils.py +++ b/tests/model_serving/model_server/llmd/utils.py @@ -13,12 +13,12 @@ from ocp_resources.pod import Pod from ocp_resources.prometheus import Prometheus from pyhelper_utils.shell import run_command -from simple_logger.logger import get_logger from timeout_sampler import retry from utilities.certificates_utils import get_ca_bundle from utilities.constants import Timeout from utilities.monitoring import get_metrics_value +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_server/upgrade/conftest.py b/tests/model_serving/model_server/upgrade/conftest.py index 18c61e89f..e9a1e7993 100644 --- a/tests/model_serving/model_server/upgrade/conftest.py +++ b/tests/model_serving/model_server/upgrade/conftest.py @@ -14,7 +14,6 @@ from ocp_resources.secret import Secret from ocp_resources.service_account import ServiceAccount from ocp_resources.serving_runtime import ServingRuntime -from simple_logger.logger import get_logger from utilities.constants import ( KServeDeploymentType, @@ -38,6 +37,7 @@ from utilities.llmd_constants import KServeGateway, LLMDGateway from utilities.llmd_utils import create_llmd_gateway from utilities.logger import RedactedString +from utilities.opendatahub_logger import get_logger from utilities.serving_runtime import ServingRuntimeFromTemplate LOGGER = get_logger(name=__name__) diff --git a/tests/model_serving/model_server/upgrade/utils.py b/tests/model_serving/model_server/upgrade/utils.py index 3f0df2523..a969a2aa2 100644 --- a/tests/model_serving/model_server/upgrade/utils.py +++ b/tests/model_serving/model_server/upgrade/utils.py @@ -198,9 +198,10 @@ def verify_metrics_retained( Raises: AssertionError: If metrics are not retained or below threshold """ - from simple_logger.logger import get_logger from timeout_sampler import TimeoutExpiredError, TimeoutSampler + from utilities.opendatahub_logger import get_logger + logger = get_logger(name=__name__) try: diff --git a/tests/model_serving/model_server/utils.py b/tests/model_serving/model_server/utils.py index ed280b9a5..f8cd2dca3 100644 --- a/tests/model_serving/model_server/utils.py +++ b/tests/model_serving/model_server/utils.py @@ -9,7 +9,6 @@ from ocp_resources.inference_graph import InferenceGraph from ocp_resources.inference_service import InferenceService from ocp_resources.utils.constants import DEFAULT_CLUSTER_RETRY_EXCEPTIONS -from simple_logger.logger import get_logger from timeout_sampler import TimeoutExpiredError, TimeoutSampler, TimeoutWatch from tests.model_serving.model_server.kserve.autoscaling.keda.utils import get_isvc_keda_scaledobject @@ -19,6 +18,7 @@ ) from utilities.inference_utils import UserInference from utilities.infra import get_pods_by_isvc_label +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/workbenches/conftest.py b/tests/workbenches/conftest.py index 3d51e8a9c..f9848561a 100644 --- a/tests/workbenches/conftest.py +++ b/tests/workbenches/conftest.py @@ -8,7 +8,6 @@ from ocp_resources.persistent_volume_claim import PersistentVolumeClaim from ocp_resources.pod import Pod from pytest_testconfig import config as py_config -from simple_logger.logger import get_logger from timeout_sampler import TimeoutExpiredError from tests.workbenches.utils import get_username @@ -16,6 +15,7 @@ from utilities.constants import INTERNAL_IMAGE_REGISTRY_PATH, Labels, Timeout from utilities.general import collect_pod_information from utilities.infra import check_internal_image_registry_available, get_product_version +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/workbenches/notebook-controller/test_custom_images.py b/tests/workbenches/notebook-controller/test_custom_images.py index 86bc6b384..499b7db1e 100644 --- a/tests/workbenches/notebook-controller/test_custom_images.py +++ b/tests/workbenches/notebook-controller/test_custom_images.py @@ -9,10 +9,10 @@ from ocp_resources.notebook import Notebook from ocp_resources.persistent_volume_claim import PersistentVolumeClaim from ocp_resources.pod import ExecOnPodError, Pod -from simple_logger.logger import get_logger from utilities.constants import Timeout from utilities.general import collect_pod_information +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/tests/workbenches/test_imagestream_health.py b/tests/workbenches/test_imagestream_health.py index 29b548b7f..5b44b30cc 100644 --- a/tests/workbenches/test_imagestream_health.py +++ b/tests/workbenches/test_imagestream_health.py @@ -6,7 +6,8 @@ from kubernetes.dynamic import DynamicClient from ocp_resources.image_stream import ImageStream from pytest_testconfig import config as py_config -from simple_logger.logger import get_logger + +from utilities.opendatahub_logger import get_logger pytestmark = [pytest.mark.smoke] LOGGER = get_logger(name=__name__) diff --git a/tests/workbenches/utils.py b/tests/workbenches/utils.py index 563ed024a..8042cf3b9 100644 --- a/tests/workbenches/utils.py +++ b/tests/workbenches/utils.py @@ -1,7 +1,8 @@ from kubernetes.dynamic import DynamicClient from ocp_resources.self_subject_review import SelfSubjectReview from ocp_resources.user import User -from simple_logger.logger import get_logger + +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/utilities/certificates_utils.py b/utilities/certificates_utils.py index 47bab00e0..c797ff6be 100644 --- a/utilities/certificates_utils.py +++ b/utilities/certificates_utils.py @@ -7,12 +7,12 @@ from ocp_resources.ingress_controller import IngressController from ocp_resources.secret import Secret from pytest_testconfig import config as py_config -from simple_logger.logger import get_logger from utilities.constants import ( OPENSHIFT_CA_BUNDLE_FILENAME, ) from utilities.infra import is_managed_cluster +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/utilities/data_science_cluster_utils.py b/utilities/data_science_cluster_utils.py index 3049e9149..77bc6785a 100644 --- a/utilities/data_science_cluster_utils.py +++ b/utilities/data_science_cluster_utils.py @@ -4,10 +4,10 @@ from ocp_resources.data_science_cluster import DataScienceCluster from ocp_resources.resource import ResourceEditor -from simple_logger.logger import get_logger from timeout_sampler import retry from utilities.constants import DscComponents +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/utilities/general.py b/utilities/general.py index 5b8b5c1bf..5d7c8bfc7 100644 --- a/utilities/general.py +++ b/utilities/general.py @@ -11,12 +11,12 @@ from ocp_resources.inference_service import InferenceService from ocp_resources.pod import Pod from ocp_resources.resource import Resource -from simple_logger.logger import get_logger from timeout_sampler import TimeoutExpiredError, TimeoutSampler, retry import utilities.infra from utilities.constants import MODELMESH_SERVING, Annotations, KServeDeploymentType from utilities.exceptions import ResourceValueMismatch, UnexpectedResourceCountError +from utilities.opendatahub_logger import get_logger # Constants for image validation SHA256_DIGEST_PATTERN = r"@sha256:[a-f0-9]{64}$" diff --git a/utilities/inference_utils.py b/utilities/inference_utils.py index 2b337b343..d998113e6 100644 --- a/utilities/inference_utils.py +++ b/utilities/inference_utils.py @@ -16,7 +16,6 @@ from ocp_resources.resource import get_client from ocp_resources.service import Service from pyhelper_utils.shell import run_command -from simple_logger.logger import get_logger from timeout_sampler import TimeoutSampler, TimeoutWatch, retry from utilities.certificates_utils import get_ca_bundle @@ -39,6 +38,7 @@ verify_no_failed_pods, wait_for_inference_deployment_replicas, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/utilities/infra.py b/utilities/infra.py index 9ac68c9cf..82224dd4e 100644 --- a/utilities/infra.py +++ b/utilities/infra.py @@ -56,13 +56,13 @@ from pyhelper_utils.shell import run_command from pytest_testconfig import config as py_config from semver import Version -from simple_logger.logger import get_logger from timeout_sampler import TimeoutExpiredError, TimeoutSampler, TimeoutWatch, retry import utilities.general from utilities.constants import RHOAI_OPERATOR_NAMESPACE, Annotations, ApiGroups, KServeDeploymentType, Labels, Timeout from utilities.exceptions import ClusterLoginError, FailedPodsError, ResourceNotReadyError, UnexpectedResourceCountError from utilities.general import generate_random_name +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/utilities/jira.py b/utilities/jira.py index 5f86be080..3f0a217d3 100644 --- a/utilities/jira.py +++ b/utilities/jira.py @@ -10,9 +10,10 @@ from packaging.version import Version from pytest_testconfig import config as py_config from requests.exceptions import ConnectionError as RequestsConnectionError -from simple_logger.logger import get_logger from urllib3.exceptions import NewConnectionError +from utilities.opendatahub_logger import get_logger + LOGGER = get_logger(name=__name__) JIRA_CLOSED_STATUSES = ("closed", "resolved", "testing") diff --git a/utilities/kueue_utils.py b/utilities/kueue_utils.py index 668b68e36..caab1fd00 100644 --- a/utilities/kueue_utils.py +++ b/utilities/kueue_utils.py @@ -5,10 +5,10 @@ from kubernetes.dynamic import DynamicClient from ocp_resources.pod import Pod from ocp_resources.resource import MissingRequiredArgumentError, NamespacedResource, Resource -from simple_logger.logger import get_logger from timeout_sampler import retry from utilities.constants import Timeout +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/utilities/llmd_utils.py b/utilities/llmd_utils.py index 108f93029..517af6f25 100644 --- a/utilities/llmd_utils.py +++ b/utilities/llmd_utils.py @@ -7,7 +7,6 @@ from kubernetes.dynamic import DynamicClient from ocp_resources.gateway import Gateway from ocp_resources.llm_inference_service import LLMInferenceService -from simple_logger.logger import get_logger from timeout_sampler import TimeoutWatch from utilities.constants import Timeout @@ -17,6 +16,7 @@ KServeGateway, LLMDGateway, ) +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/utilities/logger.py b/utilities/logger.py index 5676f7b7f..1d3627de9 100644 --- a/utilities/logger.py +++ b/utilities/logger.py @@ -4,7 +4,7 @@ from logging.handlers import QueueHandler, QueueListener, RotatingFileHandler from typing import Any -from simple_logger.logger import DuplicateFilter, WrapperLogFormatter +from utilities.opendatahub_logger import DuplicateFilter, WrapperLogFormatter LOGGER = logging.getLogger(__name__) @@ -58,7 +58,6 @@ def setup_logging( "ERROR": "red", "CRITICAL": "red,bg_white", }, - secondary_log_colors={}, ) log_file_handler = RotatingFileHandler(filename=log_file, maxBytes=100 * 1024 * 1024, backupCount=20) diff --git a/utilities/monitoring.py b/utilities/monitoring.py index ee9b11a5b..111a4df5b 100644 --- a/utilities/monitoring.py +++ b/utilities/monitoring.py @@ -2,9 +2,10 @@ from typing import Any from ocp_resources.prometheus import Prometheus -from simple_logger.logger import get_logger from timeout_sampler import TimeoutExpiredError, TimeoutSampler +from utilities.opendatahub_logger import get_logger + LOGGER = get_logger(name=__name__) diff --git a/utilities/must_gather_collector.py b/utilities/must_gather_collector.py index 2ff311280..e27d1bb4e 100644 --- a/utilities/must_gather_collector.py +++ b/utilities/must_gather_collector.py @@ -5,10 +5,10 @@ from pyhelper_utils.shell import run_command from pytest import Item from pytest_testconfig import config as py_config -from simple_logger.logger import get_logger from utilities.exceptions import InvalidArgumentsError from utilities.infra import get_rhods_operator_installed_csv +from utilities.opendatahub_logger import get_logger BASE_DIRECTORY_NAME = "must-gather-collected" BASE_RESULTS_DIR = "/home/odh/opendatahub-tests/" diff --git a/utilities/opendatahub_logger.py b/utilities/opendatahub_logger.py new file mode 100644 index 000000000..d933777f5 --- /dev/null +++ b/utilities/opendatahub_logger.py @@ -0,0 +1,221 @@ +""" +OpenDataHub logging utilities using structlog with third-party logging integration. + +This module provides structured JSON logging using structlog with automatic +third-party library logging integration. + +Example: + from utilities.opendatahub_logger import get_logger + + logger = get_logger("myapp") + logger.info("User logged in", user_id=123) + # Output: {"timestamp": "...", "logger": "myapp", "level": "info", "event": "User logged in", "user_id": 123} +""" + +import inspect +import json +import logging +import traceback +from datetime import UTC, datetime +from typing import Any + +import structlog + + +class DuplicateFilter: + """Filter duplicate log messages.""" + + def __init__(self) -> None: + self.msgs: set[str] = set() + + def filter(self, record: logging.LogRecord) -> bool: + msg = str(record.getMessage()) + if msg not in self.msgs: + self.msgs.add(msg) + return True + return False + + +_FG_CODES = { + "black": "\033[30m", + "red": "\033[31m", + "green": "\033[32m", + "yellow": "\033[33m", + "blue": "\033[34m", + "magenta": "\033[35m", + "cyan": "\033[36m", + "white": "\033[37m", +} + +_BG_CODES = { + "black": "\033[40m", + "red": "\033[41m", + "green": "\033[42m", + "yellow": "\033[43m", + "blue": "\033[44m", + "magenta": "\033[45m", + "cyan": "\033[46m", + "white": "\033[47m", +} + +_RESET = "\033[0m" + + +class WrapperLogFormatter(logging.Formatter): + """ + Formatter with color support for console output. + Compatible with python-simple-logger's WrapperLogFormatter. + """ + + def __init__( + self, + fmt: str | None = None, + log_colors: dict[str, str] | None = None, + **kwargs: Any, + ) -> None: + super().__init__(fmt, **kwargs) + self.log_colors = log_colors or {} + + def format(self, record: logging.LogRecord) -> str: + if self.log_colors and record.levelname in self.log_colors: + record.log_color = self._get_color_code(color=self.log_colors[record.levelname]) + record.reset = _RESET + else: + record.log_color = "" + record.reset = "" + return super().format(record) + + def _get_color_code(self, color: str) -> str: + """Convert color name to ANSI escape code.""" + if "," in color: + fg_color, bg_color = color.split(",", 1) + bg_code = _BG_CODES.get(bg_color[3:], "") if bg_color.startswith("bg_") else "" + return _FG_CODES.get(fg_color, "") + bg_code + + return _FG_CODES.get(color, "") + + +class JSONOnlyFormatter(logging.Formatter): + """Custom formatter that outputs only the message (for pure JSON output)""" + + def format(self, record: logging.LogRecord) -> str: + return record.getMessage() + + +class ThirdPartyJSONFormatter(logging.Formatter): + """Custom formatter that converts third-party logging to JSON format""" + + def format(self, record: logging.LogRecord) -> str: + return json.dumps({ + "timestamp": datetime.fromtimestamp(record.created, tz=UTC).isoformat(), + "logger": record.name, + "level": record.levelname.lower(), + "event": record.getMessage(), + "filename": record.pathname.split("/")[-1] if record.pathname else "", + "lineno": str(record.lineno), + }) + + +_initialized = False + + +def _initialize() -> None: + """One-time setup for structlog and third-party logging.""" + global _initialized + if _initialized: + return + + structlog.configure( + processors=[ + structlog.stdlib.add_logger_name, + structlog.stdlib.add_log_level, + structlog.processors.TimeStamper(fmt="ISO", utc=True), + structlog.processors.JSONRenderer(), + ], + wrapper_class=structlog.stdlib.BoundLogger, + logger_factory=structlog.stdlib.LoggerFactory(), + cache_logger_on_first_use=True, + ) + + # Patch addHandler so new loggers get JSON formatting + original_add_handler = logging.Logger.addHandler + + def patched_add_handler(self: logging.Logger, hdlr: logging.Handler) -> None: + if not isinstance(hdlr.formatter, (ThirdPartyJSONFormatter, JSONOnlyFormatter)): + hdlr.setFormatter(fmt=ThirdPartyJSONFormatter()) + original_add_handler(self, hdlr) # noqa: FCN001 + + logging.Logger.addHandler = patched_add_handler # type: ignore[method-assign] + + # Apply JSON formatter to all existing handlers on all loggers + all_loggers = [logging.getLogger()] + [ + logger for logger in logging.root.manager.loggerDict.values() if isinstance(logger, logging.Logger) + ] + for logger in all_loggers: + for handler in logger.handlers: + if isinstance(handler.formatter, (logging.Formatter, type(None))): + handler.setFormatter(fmt=ThirdPartyJSONFormatter()) + + _initialized = True + + +class StructlogWrapper: + """Wrapper for structlog logger to provide simple_logger-compatible interface""" + + def __init__(self, name: str) -> None: + self.name = name + _initialize() + self._logger = structlog.get_logger(name=name) + + underlying_logger = logging.getLogger(name) + for handler in underlying_logger.handlers: + if isinstance(handler.formatter, (logging.Formatter, type(None))): + handler.setFormatter(fmt=JSONOnlyFormatter()) + + def _log(self, level: str, msg: Any, *args: Any, **kwargs: Any) -> None: + msg_str = str(msg) + if args: + msg_str = msg_str % args + + log_method = getattr(self._logger, level.lower()) + log_method(event=msg_str, **kwargs) + + def info(self, msg: Any, *args: Any, **kwargs: Any) -> None: + self._log("info", msg, *args, **kwargs) # noqa: FCN001 + + def debug(self, msg: Any, *args: Any, **kwargs: Any) -> None: + self._log("debug", msg, *args, **kwargs) # noqa: FCN001 + + def warning(self, msg: Any, *args: Any, **kwargs: Any) -> None: + self._log("warning", msg, *args, **kwargs) # noqa: FCN001 + + def error(self, msg: Any, *args: Any, **kwargs: Any) -> None: + self._log("error", msg, *args, **kwargs) # noqa: FCN001 + + def critical(self, msg: Any, *args: Any, **kwargs: Any) -> None: + self._log("critical", msg, *args, **kwargs) # noqa: FCN001 + + def exception(self, msg: Any, *args: Any, **kwargs: Any) -> None: + kwargs["exception"] = traceback.format_exc() + self._log("error", msg, *args, **kwargs) # noqa: FCN001 + + +def get_logger(name: str | None = None) -> StructlogWrapper: + """ + Get a structlog logger instance. + + Args: + name: Logger name (defaults to caller's module name) + + Returns: + StructlogWrapper instance + """ + if name is None: + frame = inspect.currentframe() + try: + caller_frame = frame.f_back if frame else None + name = caller_frame.f_globals.get("__name__", "unknown") if caller_frame else "unknown" + finally: + del frame + + return StructlogWrapper(name=name or "unknown") diff --git a/utilities/operator_utils.py b/utilities/operator_utils.py index c3de1b3e7..bccbc27f9 100644 --- a/utilities/operator_utils.py +++ b/utilities/operator_utils.py @@ -2,9 +2,9 @@ from kubernetes.dynamic.exceptions import ResourceNotFoundError, ResourceNotUniqueError from ocp_resources.cluster_service_version import ClusterServiceVersion from pytest_testconfig import config as py_config -from simple_logger.logger import get_logger from utilities.infra import get_product_version +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/utilities/plugins/openai_plugin.py b/utilities/plugins/openai_plugin.py index 3d679679e..0aa293bd4 100644 --- a/utilities/plugins/openai_plugin.py +++ b/utilities/plugins/openai_plugin.py @@ -3,10 +3,10 @@ import requests import urllib3 -from simple_logger.logger import get_logger from tenacity import retry, stop_after_attempt, wait_exponential from urllib3.exceptions import InsecureRequestWarning +from utilities.opendatahub_logger import get_logger from utilities.plugins.constant import OpenAIEnpoints, RestHeader urllib3.disable_warnings(category=InsecureRequestWarning) diff --git a/utilities/plugins/tgis_grpc_plugin.py b/utilities/plugins/tgis_grpc_plugin.py index f680c9075..9609db9c7 100644 --- a/utilities/plugins/tgis_grpc_plugin.py +++ b/utilities/plugins/tgis_grpc_plugin.py @@ -4,8 +4,8 @@ from typing import Any import grpc -from simple_logger.logger import get_logger +from utilities.opendatahub_logger import get_logger from utilities.plugins.tgis_grpc import generation_pb2_grpc LOGGER = get_logger(name=__name__) diff --git a/utilities/registry_utils.py b/utilities/registry_utils.py index 2abc25089..503f696fc 100644 --- a/utilities/registry_utils.py +++ b/utilities/registry_utils.py @@ -1,5 +1,6 @@ import requests -from simple_logger.logger import get_logger + +from utilities.opendatahub_logger import get_logger LOGGER = get_logger(name=__name__) diff --git a/uv.lock b/uv.lock index 1364c1690..22ee1f674 100644 --- a/uv.lock +++ b/uv.lock @@ -896,9 +896,9 @@ dependencies = [ { name = "typer" }, { name = "typing-extensions" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/19/15/eafc1c57bf0f8afffb243dcd4c0cceb785e956acc17bba4d9bf2ae21fc9c/huggingface_hub-1.7.2.tar.gz", hash = "sha256:7f7e294e9bbb822e025bdb2ada025fa4344d978175a7f78e824d86e35f7ab43b", size = 724684, upload-time = "2026-03-20T10:36:08.767Z" } +sdist = { url = "https://files.pythonhosted.org/packages/19/15/eafc1c57bf0f8afffb243dcd4c0cceb785e956acc17bba4d9bf2ae21fc9c/huggingface_hub-1.7.2.tar.gz", hash = "sha256:7f7e294e9bbb822e025bdb2ada025fa4344d978175a7f78e824d86e35f7ab43b", size = 724684, upload_time = "2026-03-20T10:36:08.767Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/08/de/3ad061a05f74728927ded48c90b73521b9a9328c85d841bdefb30e01fb85/huggingface_hub-1.7.2-py3-none-any.whl", hash = "sha256:288f33a0a17b2a73a1359e2a5fd28d1becb2c121748c6173ab8643fb342c850e", size = 618036, upload-time = "2026-03-20T10:36:06.824Z" }, + { url = "https://files.pythonhosted.org/packages/08/de/3ad061a05f74728927ded48c90b73521b9a9328c85d841bdefb30e01fb85/huggingface_hub-1.7.2-py3-none-any.whl", hash = "sha256:288f33a0a17b2a73a1359e2a5fd28d1becb2c121748c6173ab8643fb342c850e", size = 618036, upload_time = "2026-03-20T10:36:06.824Z" }, ] [[package]] @@ -1035,9 +1035,9 @@ wheels = [ name = "jaraco-context" version = "6.1.2" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/af/50/4763cd07e722bb6285316d390a164bc7e479db9d90daa769f22578f698b4/jaraco_context-6.1.2.tar.gz", hash = "sha256:f1a6c9d391e661cc5b8d39861ff077a7dc24dc23833ccee564b234b81c82dfe3", size = 16801, upload-time = "2026-03-20T22:13:33.922Z" } +sdist = { url = "https://files.pythonhosted.org/packages/af/50/4763cd07e722bb6285316d390a164bc7e479db9d90daa769f22578f698b4/jaraco_context-6.1.2.tar.gz", hash = "sha256:f1a6c9d391e661cc5b8d39861ff077a7dc24dc23833ccee564b234b81c82dfe3", size = 16801, upload_time = "2026-03-20T22:13:33.922Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/f2/58/bc8954bda5fcda97bd7c19be11b85f91973d67a706ed4a3aec33e7de22db/jaraco_context-6.1.2-py3-none-any.whl", hash = "sha256:bf8150b79a2d5d91ae48629d8b427a8f7ba0e1097dd6202a9059f29a36379535", size = 7871, upload-time = "2026-03-20T22:13:32.808Z" }, + { url = "https://files.pythonhosted.org/packages/f2/58/bc8954bda5fcda97bd7c19be11b85f91973d67a706ed4a3aec33e7de22db/jaraco_context-6.1.2-py3-none-any.whl", hash = "sha256:bf8150b79a2d5d91ae48629d8b427a8f7ba0e1097dd6202a9059f29a36379535", size = 7871, upload_time = "2026-03-20T22:13:32.808Z" }, ] [[package]] @@ -1493,12 +1493,12 @@ dependencies = [ { name = "pytest-progress" }, { name = "pytest-testconfig" }, { name = "pytest-xdist" }, - { name = "python-simple-logger" }, { name = "pyyaml" }, { name = "requests" }, { name = "semver" }, { name = "shortuuid" }, { name = "sqlalchemy" }, + { name = "structlog" }, { name = "syrupy" }, { name = "tenacity" }, { name = "timeout-sampler" }, @@ -1536,12 +1536,12 @@ requires-dist = [ { name = "pytest-progress" }, { name = "pytest-testconfig", specifier = ">=0.2.0" }, { name = "pytest-xdist", specifier = "==3.8.0" }, - { name = "python-simple-logger" }, { name = "pyyaml" }, { name = "requests" }, { name = "semver", specifier = ">=3.0.4" }, { name = "shortuuid", specifier = ">=1.0.13" }, { name = "sqlalchemy", specifier = ">=2.0.40" }, + { name = "structlog", specifier = ">=24.1.0" }, { name = "syrupy" }, { name = "tenacity" }, { name = "timeout-sampler", specifier = ">=1.0.6" }, @@ -1596,7 +1596,7 @@ dependencies = [ { name = "timeout-sampler" }, { name = "xmltodict" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/c1/0b/60d84c7c2570227b299c0004d8cef799e3cfddfb814a075a7c2531eee95d/openshift_python_wrapper-11.0.121.tar.gz", hash = "sha256:4e0f1bc66354262c3db06209eed78261321312414ec9e290fb645014334205ea", size = 5674123, upload-time = "2026-03-22T17:13:27.789Z" } +sdist = { url = "https://files.pythonhosted.org/packages/c1/0b/60d84c7c2570227b299c0004d8cef799e3cfddfb814a075a7c2531eee95d/openshift_python_wrapper-11.0.121.tar.gz", hash = "sha256:4e0f1bc66354262c3db06209eed78261321312414ec9e290fb645014334205ea", size = 5674123, upload_time = "2026-03-22T17:13:27.789Z" } [[package]] name = "openshift-python-wrapper-data-collector" @@ -2014,9 +2014,9 @@ dependencies = [ { name = "typing-extensions" }, { name = "urllib3" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/a6/9a/44f918e9be12e49cb8b053f09d5d0733b74df52bf4dabc570da1c3ecd9f6/pygithub-2.9.0.tar.gz", hash = "sha256:a26abda1222febba31238682634cad11d8b966137ed6cc3c5e445b29a11cb0a4", size = 2592289, upload-time = "2026-03-22T21:14:39.053Z" } +sdist = { url = "https://files.pythonhosted.org/packages/a6/9a/44f918e9be12e49cb8b053f09d5d0733b74df52bf4dabc570da1c3ecd9f6/pygithub-2.9.0.tar.gz", hash = "sha256:a26abda1222febba31238682634cad11d8b966137ed6cc3c5e445b29a11cb0a4", size = 2592289, upload_time = "2026-03-22T21:14:39.053Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/2f/de/72e02bc7674e161b155a4b5a03b2347129d0626115bc97ba5bad5070cac9/pygithub-2.9.0-py3-none-any.whl", hash = "sha256:5e2b260ce327bffce9b00f447b65953ef7078ffe93e5a5425624a3075483927c", size = 449653, upload-time = "2026-03-22T21:14:37.726Z" }, + { url = "https://files.pythonhosted.org/packages/2f/de/72e02bc7674e161b155a4b5a03b2347129d0626115bc97ba5bad5070cac9/pygithub-2.9.0-py3-none-any.whl", hash = "sha256:5e2b260ce327bffce9b00f447b65953ef7078ffe93e5a5425624a3075483927c", size = 449653, upload_time = "2026-03-22T21:14:37.726Z" }, ] [[package]] @@ -2546,25 +2546,25 @@ wheels = [ name = "ruff" version = "0.15.7" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/a1/22/9e4f66ee588588dc6c9af6a994e12d26e19efbe874d1a909d09a6dac7a59/ruff-0.15.7.tar.gz", hash = "sha256:04f1ae61fc20fe0b148617c324d9d009b5f63412c0b16474f3d5f1a1a665f7ac", size = 4601277, upload-time = "2026-03-19T16:26:22.605Z" } +sdist = { url = "https://files.pythonhosted.org/packages/a1/22/9e4f66ee588588dc6c9af6a994e12d26e19efbe874d1a909d09a6dac7a59/ruff-0.15.7.tar.gz", hash = "sha256:04f1ae61fc20fe0b148617c324d9d009b5f63412c0b16474f3d5f1a1a665f7ac", size = 4601277, upload_time = "2026-03-19T16:26:22.605Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/41/2f/0b08ced94412af091807b6119ca03755d651d3d93a242682bf020189db94/ruff-0.15.7-py3-none-linux_armv6l.whl", hash = "sha256:a81cc5b6910fb7dfc7c32d20652e50fa05963f6e13ead3c5915c41ac5d16668e", size = 10489037, upload-time = "2026-03-19T16:26:32.47Z" }, - { url = "https://files.pythonhosted.org/packages/91/4a/82e0fa632e5c8b1eba5ee86ecd929e8ff327bbdbfb3c6ac5d81631bef605/ruff-0.15.7-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:722d165bd52403f3bdabc0ce9e41fc47070ac56d7a91b4e0d097b516a53a3477", size = 10955433, upload-time = "2026-03-19T16:27:00.205Z" }, - { url = "https://files.pythonhosted.org/packages/ab/10/12586735d0ff42526ad78c049bf51d7428618c8b5c467e72508c694119df/ruff-0.15.7-py3-none-macosx_11_0_arm64.whl", hash = "sha256:7fbc2448094262552146cbe1b9643a92f66559d3761f1ad0656d4991491af49e", size = 10269302, upload-time = "2026-03-19T16:26:26.183Z" }, - { url = "https://files.pythonhosted.org/packages/eb/5d/32b5c44ccf149a26623671df49cbfbd0a0ae511ff3df9d9d2426966a8d57/ruff-0.15.7-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6b39329b60eba44156d138275323cc726bbfbddcec3063da57caa8a8b1d50adf", size = 10607625, upload-time = "2026-03-19T16:27:03.263Z" }, - { url = "https://files.pythonhosted.org/packages/5d/f1/f0001cabe86173aaacb6eb9bb734aa0605f9a6aa6fa7d43cb49cbc4af9c9/ruff-0.15.7-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:87768c151808505f2bfc93ae44e5f9e7c8518943e5074f76ac21558ef5627c85", size = 10324743, upload-time = "2026-03-19T16:27:09.791Z" }, - { url = "https://files.pythonhosted.org/packages/7a/87/b8a8f3d56b8d848008559e7c9d8bf367934d5367f6d932ba779456e2f73b/ruff-0.15.7-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fb0511670002c6c529ec66c0e30641c976c8963de26a113f3a30456b702468b0", size = 11138536, upload-time = "2026-03-19T16:27:06.101Z" }, - { url = "https://files.pythonhosted.org/packages/e4/f2/4fd0d05aab0c5934b2e1464784f85ba2eab9d54bffc53fb5430d1ed8b829/ruff-0.15.7-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e0d19644f801849229db8345180a71bee5407b429dd217f853ec515e968a6912", size = 11994292, upload-time = "2026-03-19T16:26:48.718Z" }, - { url = "https://files.pythonhosted.org/packages/64/22/fc4483871e767e5e95d1622ad83dad5ebb830f762ed0420fde7dfa9d9b08/ruff-0.15.7-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4806d8e09ef5e84eb19ba833d0442f7e300b23fe3f0981cae159a248a10f0036", size = 11398981, upload-time = "2026-03-19T16:26:54.513Z" }, - { url = "https://files.pythonhosted.org/packages/b0/99/66f0343176d5eab02c3f7fcd2de7a8e0dd7a41f0d982bee56cd1c24db62b/ruff-0.15.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dce0896488562f09a27b9c91b1f58a097457143931f3c4d519690dea54e624c5", size = 11242422, upload-time = "2026-03-19T16:26:29.277Z" }, - { url = "https://files.pythonhosted.org/packages/5d/3a/a7060f145bfdcce4c987ea27788b30c60e2c81d6e9a65157ca8afe646328/ruff-0.15.7-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:1852ce241d2bc89e5dc823e03cff4ce73d816b5c6cdadd27dbfe7b03217d2a12", size = 11232158, upload-time = "2026-03-19T16:26:42.321Z" }, - { url = "https://files.pythonhosted.org/packages/a7/53/90fbb9e08b29c048c403558d3cdd0adf2668b02ce9d50602452e187cd4af/ruff-0.15.7-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:5f3e4b221fb4bd293f79912fc5e93a9063ebd6d0dcbd528f91b89172a9b8436c", size = 10577861, upload-time = "2026-03-19T16:26:57.459Z" }, - { url = "https://files.pythonhosted.org/packages/2f/aa/5f486226538fe4d0f0439e2da1716e1acf895e2a232b26f2459c55f8ddad/ruff-0.15.7-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:b15e48602c9c1d9bdc504b472e90b90c97dc7d46c7028011ae67f3861ceba7b4", size = 10327310, upload-time = "2026-03-19T16:26:35.909Z" }, - { url = "https://files.pythonhosted.org/packages/99/9e/271afdffb81fe7bfc8c43ba079e9d96238f674380099457a74ccb3863857/ruff-0.15.7-py3-none-musllinux_1_2_i686.whl", hash = "sha256:1b4705e0e85cedc74b0a23cf6a179dbb3df184cb227761979cc76c0440b5ab0d", size = 10840752, upload-time = "2026-03-19T16:26:45.723Z" }, - { url = "https://files.pythonhosted.org/packages/bf/29/a4ae78394f76c7759953c47884eb44de271b03a66634148d9f7d11e721bd/ruff-0.15.7-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:112c1fa316a558bb34319282c1200a8bf0495f1b735aeb78bfcb2991e6087580", size = 11336961, upload-time = "2026-03-19T16:26:39.076Z" }, - { url = "https://files.pythonhosted.org/packages/26/6b/8786ba5736562220d588a2f6653e6c17e90c59ced34a2d7b512ef8956103/ruff-0.15.7-py3-none-win32.whl", hash = "sha256:6d39e2d3505b082323352f733599f28169d12e891f7dd407f2d4f54b4c2886de", size = 10582538, upload-time = "2026-03-19T16:26:15.992Z" }, - { url = "https://files.pythonhosted.org/packages/2b/e9/346d4d3fffc6871125e877dae8d9a1966b254fbd92a50f8561078b88b099/ruff-0.15.7-py3-none-win_amd64.whl", hash = "sha256:4d53d712ddebcd7dace1bc395367aec12c057aacfe9adbb6d832302575f4d3a1", size = 11755839, upload-time = "2026-03-19T16:26:19.897Z" }, - { url = "https://files.pythonhosted.org/packages/8f/e8/726643a3ea68c727da31570bde48c7a10f1aa60eddd628d94078fec586ff/ruff-0.15.7-py3-none-win_arm64.whl", hash = "sha256:18e8d73f1c3fdf27931497972250340f92e8c861722161a9caeb89a58ead6ed2", size = 11023304, upload-time = "2026-03-19T16:26:51.669Z" }, + { url = "https://files.pythonhosted.org/packages/41/2f/0b08ced94412af091807b6119ca03755d651d3d93a242682bf020189db94/ruff-0.15.7-py3-none-linux_armv6l.whl", hash = "sha256:a81cc5b6910fb7dfc7c32d20652e50fa05963f6e13ead3c5915c41ac5d16668e", size = 10489037, upload_time = "2026-03-19T16:26:32.47Z" }, + { url = "https://files.pythonhosted.org/packages/91/4a/82e0fa632e5c8b1eba5ee86ecd929e8ff327bbdbfb3c6ac5d81631bef605/ruff-0.15.7-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:722d165bd52403f3bdabc0ce9e41fc47070ac56d7a91b4e0d097b516a53a3477", size = 10955433, upload_time = "2026-03-19T16:27:00.205Z" }, + { url = "https://files.pythonhosted.org/packages/ab/10/12586735d0ff42526ad78c049bf51d7428618c8b5c467e72508c694119df/ruff-0.15.7-py3-none-macosx_11_0_arm64.whl", hash = "sha256:7fbc2448094262552146cbe1b9643a92f66559d3761f1ad0656d4991491af49e", size = 10269302, upload_time = "2026-03-19T16:26:26.183Z" }, + { url = "https://files.pythonhosted.org/packages/eb/5d/32b5c44ccf149a26623671df49cbfbd0a0ae511ff3df9d9d2426966a8d57/ruff-0.15.7-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6b39329b60eba44156d138275323cc726bbfbddcec3063da57caa8a8b1d50adf", size = 10607625, upload_time = "2026-03-19T16:27:03.263Z" }, + { url = "https://files.pythonhosted.org/packages/5d/f1/f0001cabe86173aaacb6eb9bb734aa0605f9a6aa6fa7d43cb49cbc4af9c9/ruff-0.15.7-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:87768c151808505f2bfc93ae44e5f9e7c8518943e5074f76ac21558ef5627c85", size = 10324743, upload_time = "2026-03-19T16:27:09.791Z" }, + { url = "https://files.pythonhosted.org/packages/7a/87/b8a8f3d56b8d848008559e7c9d8bf367934d5367f6d932ba779456e2f73b/ruff-0.15.7-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fb0511670002c6c529ec66c0e30641c976c8963de26a113f3a30456b702468b0", size = 11138536, upload_time = "2026-03-19T16:27:06.101Z" }, + { url = "https://files.pythonhosted.org/packages/e4/f2/4fd0d05aab0c5934b2e1464784f85ba2eab9d54bffc53fb5430d1ed8b829/ruff-0.15.7-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e0d19644f801849229db8345180a71bee5407b429dd217f853ec515e968a6912", size = 11994292, upload_time = "2026-03-19T16:26:48.718Z" }, + { url = "https://files.pythonhosted.org/packages/64/22/fc4483871e767e5e95d1622ad83dad5ebb830f762ed0420fde7dfa9d9b08/ruff-0.15.7-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4806d8e09ef5e84eb19ba833d0442f7e300b23fe3f0981cae159a248a10f0036", size = 11398981, upload_time = "2026-03-19T16:26:54.513Z" }, + { url = "https://files.pythonhosted.org/packages/b0/99/66f0343176d5eab02c3f7fcd2de7a8e0dd7a41f0d982bee56cd1c24db62b/ruff-0.15.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dce0896488562f09a27b9c91b1f58a097457143931f3c4d519690dea54e624c5", size = 11242422, upload_time = "2026-03-19T16:26:29.277Z" }, + { url = "https://files.pythonhosted.org/packages/5d/3a/a7060f145bfdcce4c987ea27788b30c60e2c81d6e9a65157ca8afe646328/ruff-0.15.7-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:1852ce241d2bc89e5dc823e03cff4ce73d816b5c6cdadd27dbfe7b03217d2a12", size = 11232158, upload_time = "2026-03-19T16:26:42.321Z" }, + { url = "https://files.pythonhosted.org/packages/a7/53/90fbb9e08b29c048c403558d3cdd0adf2668b02ce9d50602452e187cd4af/ruff-0.15.7-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:5f3e4b221fb4bd293f79912fc5e93a9063ebd6d0dcbd528f91b89172a9b8436c", size = 10577861, upload_time = "2026-03-19T16:26:57.459Z" }, + { url = "https://files.pythonhosted.org/packages/2f/aa/5f486226538fe4d0f0439e2da1716e1acf895e2a232b26f2459c55f8ddad/ruff-0.15.7-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:b15e48602c9c1d9bdc504b472e90b90c97dc7d46c7028011ae67f3861ceba7b4", size = 10327310, upload_time = "2026-03-19T16:26:35.909Z" }, + { url = "https://files.pythonhosted.org/packages/99/9e/271afdffb81fe7bfc8c43ba079e9d96238f674380099457a74ccb3863857/ruff-0.15.7-py3-none-musllinux_1_2_i686.whl", hash = "sha256:1b4705e0e85cedc74b0a23cf6a179dbb3df184cb227761979cc76c0440b5ab0d", size = 10840752, upload_time = "2026-03-19T16:26:45.723Z" }, + { url = "https://files.pythonhosted.org/packages/bf/29/a4ae78394f76c7759953c47884eb44de271b03a66634148d9f7d11e721bd/ruff-0.15.7-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:112c1fa316a558bb34319282c1200a8bf0495f1b735aeb78bfcb2991e6087580", size = 11336961, upload_time = "2026-03-19T16:26:39.076Z" }, + { url = "https://files.pythonhosted.org/packages/26/6b/8786ba5736562220d588a2f6653e6c17e90c59ced34a2d7b512ef8956103/ruff-0.15.7-py3-none-win32.whl", hash = "sha256:6d39e2d3505b082323352f733599f28169d12e891f7dd407f2d4f54b4c2886de", size = 10582538, upload_time = "2026-03-19T16:26:15.992Z" }, + { url = "https://files.pythonhosted.org/packages/2b/e9/346d4d3fffc6871125e877dae8d9a1966b254fbd92a50f8561078b88b099/ruff-0.15.7-py3-none-win_amd64.whl", hash = "sha256:4d53d712ddebcd7dace1bc395367aec12c057aacfe9adbb6d832302575f4d3a1", size = 11755839, upload_time = "2026-03-19T16:26:19.897Z" }, + { url = "https://files.pythonhosted.org/packages/8f/e8/726643a3ea68c727da31570bde48c7a10f1aa60eddd628d94078fec586ff/ruff-0.15.7-py3-none-win_arm64.whl", hash = "sha256:18e8d73f1c3fdf27931497972250340f92e8c861722161a9caeb89a58ead6ed2", size = 11023304, upload_time = "2026-03-19T16:26:51.669Z" }, ] [[package]] @@ -2762,9 +2762,18 @@ source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "anyio" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/81/69/17425771797c36cded50b7fe44e850315d039f28b15901ab44839e70b593/starlette-1.0.0.tar.gz", hash = "sha256:6a4beaf1f81bb472fd19ea9b918b50dc3a77a6f2e190a12954b25e6ed5eea149", size = 2655289, upload-time = "2026-03-22T18:29:46.779Z" } +sdist = { url = "https://files.pythonhosted.org/packages/81/69/17425771797c36cded50b7fe44e850315d039f28b15901ab44839e70b593/starlette-1.0.0.tar.gz", hash = "sha256:6a4beaf1f81bb472fd19ea9b918b50dc3a77a6f2e190a12954b25e6ed5eea149", size = 2655289, upload_time = "2026-03-22T18:29:46.779Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/0b/c9/584bc9651441b4ba60cc4d557d8a547b5aff901af35bda3a4ee30c819b82/starlette-1.0.0-py3-none-any.whl", hash = "sha256:d3ec55e0bb321692d275455ddfd3df75fff145d009685eb40dc91fc66b03d38b", size = 72651, upload_time = "2026-03-22T18:29:45.111Z" }, +] + +[[package]] +name = "structlog" +version = "25.5.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ef/52/9ba0f43b686e7f3ddfeaa78ac3af750292662284b3661e91ad5494f21dbc/structlog-25.5.0.tar.gz", hash = "sha256:098522a3bebed9153d4570c6d0288abf80a031dfdb2048d59a49e9dc2190fc98", size = 1460830, upload_time = "2025-10-27T08:28:23.028Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/0b/c9/584bc9651441b4ba60cc4d557d8a547b5aff901af35bda3a4ee30c819b82/starlette-1.0.0-py3-none-any.whl", hash = "sha256:d3ec55e0bb321692d275455ddfd3df75fff145d009685eb40dc91fc66b03d38b", size = 72651, upload-time = "2026-03-22T18:29:45.111Z" }, + { url = "https://files.pythonhosted.org/packages/a8/45/a132b9074aa18e799b891b91ad72133c98d8042c70f6240e4c5f9dabee2f/structlog-25.5.0-py3-none-any.whl", hash = "sha256:a8453e9b9e636ec59bd9e79bbd4a72f025981b3ba0f5837aebf48f02f37a7f9f", size = 72510, upload_time = "2025-10-27T08:28:21.535Z" }, ] [[package]]