Merge pull request #995 from UiPath/akshaya/instantiate

fix(instantiation): improving instantiation

Author: akshaylive

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "uipath"
-version = "2.2.22"
+version = "2.2.23"
 description = "Python SDK and CLI for UiPath Platform, enabling programmatic interaction with automation services, process management, and deployment tools."
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.11"

src/uipath/_cli/_evals/mocks/mockito_mocker.py

@@ -1,11 +1,13 @@
 """Mockito mocker implementation. https://mockito-python.readthedocs.io/en/latest ."""
 
+import importlib
 from typing import Any, Callable
 
 from mockito import (  # type: ignore[import-untyped] # explicit ignore
     invocation,
     mocking,
 )
+from pydantic import JsonValue
 
 from uipath._cli._evals._models._evaluation_set import (
     EvaluationItem,
@@ -32,43 +34,30 @@ def func(*_args, **_kwargs):
         return func
 
 
-def _resolve_value(config: Any) -> Any:
-    # Handle {"_attr_": "mockito.any"}
-    if isinstance(config, dict) and "_attr_" in config:
-        attr = config["_attr_"]
-        if attr == "mockito.any":
-            from mockito import any as mockito_any
-
-            return mockito_any()
-
-    # Handle {"_target_": "..."}
-    if isinstance(config, dict) and "_target_" in config:
-        target = config["_target_"]
-        module_path, name = target.rsplit(".", 1)
-
-        import importlib
-
-        module = importlib.import_module(module_path)
-        obj = getattr(module, name)
+def _resolve_value(config: JsonValue) -> Any:
+    if isinstance(config, dict):
+        if "_target_" in config:
+            target = config["_target_"]
+            assert isinstance(target, str), (
+                "Please check mocking configuration -- _target_ must be a string."
+            )
+            module_path, name = target.rsplit(".", 1)
 
-        args = [_resolve_value(v) for v in config.get("_args_", [])]
-        kwargs = {
-            k: _resolve_value(v)
-            for k, v in config.items()
-            if k not in ("_target_", "_args_")
-        }
-        return obj(*args, **kwargs)
+            module = importlib.import_module(module_path)
+            obj = getattr(module, name)
 
-    if isinstance(config, dict):
-        return {k: _resolve_value(v) for k, v in config.items()}
+            kwargs = {
+                k: _resolve_value(v) for k, v in config.items() if k != "_target_"
+            }
+            return obj(**kwargs)
+        else:
+            return {k: _resolve_value(v) for k, v in config.items()}
 
-    if isinstance(config, list):
+    elif isinstance(config, list):
         return [_resolve_value(v) for v in config]
 
-    if isinstance(config, tuple):
-        return tuple(_resolve_value(v) for v in config)
-
-    return config
+    else:
+        return config
 
 
 class MockitoMocker(Mocker):

tests/cli/eval/mocks/test_mocks.py

@@ -71,7 +71,7 @@ def foofoo(*args, **kwargs):
     assert foo(x=1) == "bar1"
 
     evaluation.mocking_strategy.behaviors[0].arguments.kwargs = {
-        "x": {"_attr_": "mockito.any"}
+        "x": {"_target_": "mockito.any"}
     }
     set_execution_context(evaluation, _mock_span_collector, "test-execution-id")
     assert foo(x=2) == "bar1"
@@ -129,7 +129,7 @@ async def foofoo(*args, **kwargs):
     assert await foo(x=1) == "bar1"
 
     evaluation.mocking_strategy.behaviors[0].arguments.kwargs = {
-        "x": {"_attr_": "mockito.any"}
+        "x": {"_target_": "mockito.any"}
     }
     set_execution_context(evaluation, _mock_span_collector, "test-execution-id")
     assert await foo(x=2) == "bar1"