Merge branch 'main' into standalone_detector

Author: kpunwatk

.pre-commit-config.yaml

@@ -36,7 +36,7 @@ repos:
         exclude: .*/__snapshots__/.*|.*-input\.json$
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.8
+    rev: v0.12.9
     hooks:
       - id: ruff
       - id: ruff-format

tests/model_serving/model_server/keda/utils.py

@@ -0,0 +1,20 @@
+from kubernetes.dynamic import DynamicClient
+from ocp_resources.inference_service import InferenceService
+from ocp_resources.scaled_object import ScaledObject
+
+
+def get_isvc_keda_scaledobject(client: DynamicClient, isvc: InferenceService) -> ScaledObject:
+    """
+    Get KEDA ScaledObject resource associated with an InferenceService.
+
+    Args:
+        client (DynamicClient): OCP Client to use.
+        isvc (InferenceService): InferenceService object.
+
+    Returns:
+        ScaledObject: The ScaledObject for the InferenceService
+
+    Raises:
+        ResourceNotFoundError: if the ScaledObject is not found.
+    """
+    return ScaledObject(client=client, name=f"{isvc.name}-predictor", namespace=isvc.namespace, ensure_exists=True)

tests/model_serving/model_server/utils.py

@@ -15,7 +15,8 @@
 )
 from utilities.constants import Timeout
 from utilities.inference_utils import UserInference
-from utilities.infra import get_isvc_keda_scaledobject, get_pods_by_isvc_label
+from utilities.infra import get_pods_by_isvc_label
+from tests.model_serving.model_server.keda.utils import get_isvc_keda_scaledobject
 from utilities.constants import Protocols
 from timeout_sampler import TimeoutWatch, TimeoutSampler
 
@@ -247,10 +248,9 @@ def verify_keda_scaledobject(
         expected_query: Expected query string
         expected_threshold: Expected threshold as string (e.g. "50.000000")
     """
-    scaled_objects = get_isvc_keda_scaledobject(client=client, isvc=isvc)
-    scaled_object = scaled_objects[0]
-    trigger_meta = scaled_object.spec.triggers[0].metadata
-    trigger_type = scaled_object.spec.triggers[0].type
+    scaled_object = get_isvc_keda_scaledobject(client=client, isvc=isvc)
+    trigger_meta = scaled_object.instance.spec.triggers[0].metadata
+    trigger_type = scaled_object.instance.spec.triggers[0].type
     query = trigger_meta.get("query")
     threshold = trigger_meta.get("threshold")
 

utilities/infra.py

@@ -1003,29 +1003,6 @@ def wait_for_isvc_pods(client: DynamicClient, isvc: InferenceService, runtime_na
     return get_pods_by_isvc_label(client=client, isvc=isvc, runtime_name=runtime_name)
 
 
-def get_isvc_keda_scaledobject(client: DynamicClient, isvc: InferenceService) -> list[Any]:
-    """
-    Get KEDA ScaledObject resources associated with an InferenceService.
-
-    Args:
-        client (DynamicClient): OCP Client to use.
-        isvc (InferenceService): InferenceService object.
-
-    Returns:
-        list[Any]: A list of all matching ScaledObjects
-
-    Raises:
-        ResourceNotFoundError: if no ScaledObjects are found.
-    """
-    namespace = isvc.namespace
-    scaled_object_client = client.resources.get(api_version="keda.sh/v1alpha1", kind="ScaledObject")
-    scaled_object = scaled_object_client.get(namespace=namespace, name=isvc.name + "-predictor")
-
-    if scaled_object:
-        return [scaled_object]
-    raise ResourceNotFoundError(f"{isvc.name} has no KEDA ScaledObjects")
-
-
 def get_rhods_subscription() -> Subscription | None:
     subscriptions = Subscription.get(dyn_client=get_client(), namespace=RHOAI_OPERATOR_NAMESPACE)
     if subscriptions: