fix: address comments, reuse kwargs, add docstrings

Author: adolfo-ab

tests/model_explainability/trustyai_service/conftest.py

@@ -250,8 +250,13 @@ def mlserver_runtime(
     model_namespace: Namespace,
     teardown_resources: bool,
 ) -> Generator[ServingRuntime, Any, Any]:
-    name = "kserve-mlserver"
-    serving_runtime = ServingRuntime(client=admin_client, namespace=model_namespace.name, name=name)
+    mlserver_runtime_kwargs = {
+        "client": admin_client,
+        "namespace": model_namespace.name,
+        "name": "kserve-mlserver",
+    }
+
+    serving_runtime = ServingRuntime(**mlserver_runtime_kwargs)
 
     if pytestconfig.option.post_upgrade:
         yield serving_runtime
@@ -283,9 +288,6 @@ def mlserver_runtime(
     ]
 
     with ServingRuntime(
-        client=admin_client,
-        name=name,
-        namespace=model_namespace.name,
         containers=containers,
         supported_model_formats=supported_model_formats,
         protocol_versions=["v2"],
@@ -298,6 +300,7 @@ def mlserver_runtime(
         },
         label={Labels.OpenDataHub.DASHBOARD: "true"},
         teardown=teardown_resources,
+        **mlserver_runtime_kwargs,
     ) as mlserver:
         yield mlserver
 
@@ -314,18 +317,19 @@ def gaussian_credit_model(
     trustyai_service_with_pvc_storage: TrustyAIService,
     teardown_resources: bool,
 ) -> Generator[InferenceService, Any, Any]:
-    name = ("gaussian-credit-model",)
-    isvc = InferenceService(client=admin_client, namespace=model_namespace.name, name=name)
+    gaussian_credit_model_kwargs = {
+        "client": admin_client,
+        "namespace": model_namespace.name,
+        "name": "gaussian-credit-model",
+    }
+
+    isvc = InferenceService(**gaussian_credit_model_kwargs)
 
     if pytestconfig.option.post_upgrade:
         yield isvc
         isvc.clean_up()
-
     else:
         with create_isvc(
-            client=admin_client,
-            name="gaussian-credit-model",
-            namespace=model_namespace.name,
             deployment_mode=KServeDeploymentType.SERVERLESS,
             model_format=XGBOOST,
             runtime=mlserver_runtime.name,
@@ -335,6 +339,7 @@ def gaussian_credit_model(
             wait_for_predictor_pods=False,
             resources={"requests": {"cpu": "1", "memory": "2Gi"}, "limits": {"cpu": "1", "memory": "2Gi"}},
             teardown=teardown_resources,
+            **gaussian_credit_model_kwargs,
         ) as isvc:
             wait_for_isvc_deployment_registered_by_trustyai_service(
                 client=admin_client,

tests/model_explainability/trustyai_service/trustyai_service_utils.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import json
 import os
 from http import HTTPStatus

tests/model_explainability/trustyai_service/upgrade/test_trustyai_service_upgrade.py

@@ -52,7 +52,7 @@ def test_trustyai_service_pre_upgrade_data_upload(
         current_client_token,
         trustyai_service_with_pvc_storage,
     ) -> None:
-        """"""
+        """Upload data to TrustyAIService before upgrade."""
         verify_upload_data_to_trustyai_service(
             client=admin_client,
             trustyai_service=trustyai_service_with_pvc_storage,
@@ -61,13 +61,14 @@ def test_trustyai_service_pre_upgrade_data_upload(
         )
 
     @pytest.mark.pre_upgrade
-    def test_drift_metric_schedule_meanshift(
+    def test_trustyai_service_pre_upgrade_drift_metric_schedule_meanshift(
         self,
         admin_client,
         current_client_token,
         trustyai_service_with_pvc_storage,
         gaussian_credit_model,
     ):
+        """Schedule a drift metric before upgrade."""
         verify_trustyai_service_metric_scheduling_request(
             client=admin_client,
             trustyai_service=trustyai_service_with_pvc_storage,
@@ -101,6 +102,7 @@ def test_drift_metric_delete(
         current_client_token,
         trustyai_service_with_pvc_storage,
     ):
+        """Retrieve the metric scheduled before upgrade and delete it."""
         verify_trustyai_service_metric_delete_request(
             client=admin_client,
             trustyai_service=trustyai_service_with_pvc_storage,