uipath 2.1.52__tar.gz → 2.1.54__tar.gz

{uipath-2.1.52 → uipath-2.1.54}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uipath
-Version: 2.1.52
+Version: 2.1.54
 Summary: Python SDK and CLI for UiPath Platform, enabling programmatic interaction with automation services, process management, and deployment tools.
 Project-URL: Homepage, https://uipath.com
 Project-URL: Repository, https://github.com/UiPath/uipath-python

{uipath-2.1.52 → uipath-2.1.54}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "uipath"
-version = "2.1.52"
+version = "2.1.54"
 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.10"

{uipath-2.1.52/src/uipath/_cli/_evals/_evaluators → uipath-2.1.54/src/uipath/_cli/_evals}/_evaluator_factory.py

@@ -1,18 +1,21 @@
 from typing import Any, Dict
 
-from .._models import EvaluatorCategory, EvaluatorType
-from ._evaluator_base import EvaluatorBase, EvaluatorBaseParams
-from ._exact_match_evaluator import ExactMatchEvaluator
-from ._json_similarity_evaluator import JsonSimilarityEvaluator
-from ._llm_as_judge_evaluator import LlmAsAJudgeEvaluator
-from ._trajectory_evaluator import TrajectoryEvaluator
+from uipath._cli._evals._models._evaluator_base_params import EvaluatorBaseParams
+from uipath.eval.evaluators import (
+    BaseEvaluator,
+    ExactMatchEvaluator,
+    JsonSimilarityEvaluator,
+    LlmAsAJudgeEvaluator,
+    TrajectoryEvaluator,
+)
+from uipath.eval.models.models import EvaluatorCategory, EvaluatorType
 
 
 class EvaluatorFactory:
     """Factory class for creating evaluator instances based on configuration."""
 
-    @staticmethod
-    def create_evaluator(data: Dict[str, Any]) -> EvaluatorBase:
+    @classmethod
+    def create_evaluator(cls, data: Dict[str, Any]) -> BaseEvaluator[Any]:
         """Create an evaluator instance from configuration data.
 
         Args:
@@ -25,13 +28,15 @@ class EvaluatorFactory:
             ValueError: If category is unknown or required fields are missing
         """
         # Extract common fields
-        evaluator_id = data.get("id")
-        if not evaluator_id:
+        name = data.get("name", "")
+        if not name:
+            raise ValueError("Evaluator configuration must include 'name' field")
+        id = data.get("id", "")
+        if not id:
             raise ValueError("Evaluator configuration must include 'id' field")
 
         category = EvaluatorCategory.from_int(data.get("category"))
         evaluator_type = EvaluatorType.from_int(data.get("type", EvaluatorType.Unknown))
-        name = data.get("name", "")
         description = data.get("description", "")
         created_at = data.get("createdAt", "")
         updated_at = data.get("updatedAt", "")
@@ -39,7 +44,7 @@ class EvaluatorFactory:
 
         # Create base parameters
         base_params = EvaluatorBaseParams(
-            evaluator_id=evaluator_id,
+            id=id,
             category=category,
             evaluator_type=evaluator_type,
             name=name,
@@ -49,7 +54,6 @@ class EvaluatorFactory:
             target_output_key=target_output_key,
         )
 
-        # Create evaluator based on category
         match category:
             case EvaluatorCategory.Deterministic:
                 if evaluator_type == evaluator_type.Equals:
@@ -80,9 +84,8 @@ class EvaluatorFactory:
         base_params: EvaluatorBaseParams, data: Dict[str, Any]
     ) -> ExactMatchEvaluator:
         """Create a deterministic evaluator."""
-        return ExactMatchEvaluator.from_params(
-            base_params,
-            target_output_key=data.get("targetOutputKey", "*"),
+        return ExactMatchEvaluator(
+            **base_params.model_dump(),
         )
 
     @staticmethod
@@ -90,9 +93,8 @@ class EvaluatorFactory:
         base_params: EvaluatorBaseParams, data: Dict[str, Any]
     ) -> JsonSimilarityEvaluator:
         """Create a deterministic evaluator."""
-        return JsonSimilarityEvaluator.from_params(
-            base_params,
-            target_output_key=data.get("targetOutputKey", "*"),
+        return JsonSimilarityEvaluator(
+            **base_params.model_dump(),
         )
 
     @staticmethod
@@ -112,16 +114,15 @@ class EvaluatorFactory:
                 "'same-as-agent' model option is not supported by coded agents evaluations. Please select a specific model for the evaluator."
             )
 
-        return LlmAsAJudgeEvaluator.from_params(
-            base_params,
+        return LlmAsAJudgeEvaluator(
+            **base_params.model_dump(),
             prompt=prompt,
             model=model,
-            target_output_key=data.get("targetOutputKey", "*"),
         )
 
     @staticmethod
     def _create_trajectory_evaluator(
         base_params: EvaluatorBaseParams, data: Dict[str, Any]
-    ) -> TrajectoryEvaluator:
+    ) -> TrajectoryEvaluator[Any]:
         """Create a trajectory evaluator."""
         raise NotImplementedError()

{uipath-2.1.52 → uipath-2.1.54}/src/uipath/_cli/_evals/_models/_evaluation_set.py

@@ -1,40 +1,45 @@
 from enum import IntEnum
 from typing import Any, Dict, List
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field
+from pydantic.alias_generators import to_camel
 
 
 class EvaluationItem(BaseModel):
     """Individual evaluation item within an evaluation set."""
 
+    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
+
     id: str
     name: str
     inputs: Dict[str, Any]
-    expectedOutput: Dict[str, Any]
-    expectedAgentBehavior: str = ""
-    simulationInstructions: str = ""
-    simulateInput: bool = False
-    inputGenerationInstructions: str = ""
-    simulateTools: bool = False
-    toolsToSimulate: List[str] = Field(default_factory=list)
-    evalSetId: str
-    createdAt: str
-    updatedAt: str
+    expected_output: Dict[str, Any]
+    expected_agent_behavior: str = ""
+    simulation_instructions: str = ""
+    simulate_input: bool = False
+    input_generation_instructions: str = ""
+    simulate_tools: bool = False
+    tools_to_simulate: List[str] = Field(default_factory=list)
+    eval_set_id: str
+    created_at: str
+    updated_at: str
 
 
 class EvaluationSet(BaseModel):
     """Complete evaluation set model."""
 
+    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
+
     id: str
-    fileName: str
-    evaluatorRefs: List[str] = Field(default_factory=list)
+    file_name: str
+    evaluator_refs: List[str] = Field(default_factory=list)
     evaluations: List[EvaluationItem] = Field(default_factory=list)
     name: str
-    batchSize: int = 10
-    timeoutMinutes: int = 20
-    modelSettings: List[Dict[str, Any]] = Field(default_factory=list)
-    createdAt: str
-    updatedAt: str
+    batch_size: int = 10
+    timeout_minutes: int = 20
+    model_settings: List[Dict[str, Any]] = Field(default_factory=list)
+    created_at: str
+    updated_at: str
 
     def extract_selected_evals(self, eval_ids) -> None:
         selected_evals: list[EvaluationItem] = []

uipath-2.1.54/src/uipath/_cli/_evals/_models/_evaluator_base_params.py

@@ -0,0 +1,16 @@
+from pydantic import BaseModel
+
+from uipath.eval.models.models import EvaluatorCategory, EvaluatorType
+
+
+class EvaluatorBaseParams(BaseModel):
+    """Parameters for initializing the base evaluator."""
+
+    id: str
+    category: EvaluatorCategory
+    evaluator_type: EvaluatorType
+    name: str
+    description: str
+    created_at: str
+    updated_at: str
+    target_output_key: str

uipath-2.1.54/src/uipath/_cli/_evals/_models/_output.py

@@ -0,0 +1,85 @@
+from typing import List, Optional
+
+from opentelemetry.sdk.trace import ReadableSpan
+from pydantic import BaseModel, ConfigDict, model_serializer
+from pydantic.alias_generators import to_camel
+
+from uipath._cli._runtime._contracts import UiPathRuntimeResult
+from uipath.eval.models.models import EvaluationResult, ScoreType
+
+
+class UiPathEvalRunExecutionOutput(BaseModel):
+    """Result of a single agent response."""
+
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+    execution_time: float
+    spans: list[ReadableSpan]
+    result: UiPathRuntimeResult
+
+
+class EvaluationResultDto(BaseModel):
+    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
+
+    score: float
+    details: Optional[str] = None
+    evaluation_time: Optional[float] = None
+
+    @model_serializer(mode="wrap")
+    def serialize_model(self, serializer, info):
+        data = serializer(self)
+        if self.details is None and isinstance(data, dict):
+            data.pop("details", None)
+        return data
+
+    @classmethod
+    def from_evaluation_result(
+        cls, evaluation_result: EvaluationResult
+    ) -> "EvaluationResultDto":
+        score_type = evaluation_result.score_type
+        score: float
+        if score_type == ScoreType.BOOLEAN:
+            score = 100 if evaluation_result.score else 0
+        elif score_type == ScoreType.ERROR:
+            score = 0
+        else:
+            score = evaluation_result.score
+
+        return cls(
+            score=score,
+            details=evaluation_result.details,
+            evaluation_time=evaluation_result.evaluation_time,
+        )
+
+
+class EvaluationRunResultDto(BaseModel):
+    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
+
+    evaluator_name: str
+    result: EvaluationResultDto
+
+
+class EvaluationRunResult(BaseModel):
+    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
+
+    evaluation_name: str
+    evaluation_run_results: List[EvaluationRunResultDto]
+
+
+class UiPathEvalOutput(BaseModel):
+    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
+
+    evaluation_set_name: str
+    score: float
+    evaluation_set_results: List[EvaluationRunResult]
+
+    def compute_average_score(self) -> None:
+        total_score = 0.0
+        total_count = 0
+
+        for evaluation_set_result in self.evaluation_set_results:
+            for evaluation_run_result in evaluation_set_result.evaluation_run_results:
+                total_score += evaluation_run_result.result.score
+                total_count += 1
+
+        self.score = total_score / total_count if total_count > 0 else 0.0

{uipath-2.1.52 → uipath-2.1.54}/src/uipath/_cli/_evals/_runtime.py

@@ -1,10 +1,15 @@
+import json
 from collections import defaultdict
+from pathlib import Path
 from time import time
-from typing import Dict, Generic, List, Optional, Sequence, TypeVar
+from typing import Any, Dict, Generic, List, Optional, Sequence, TypeVar
 
 from opentelemetry.sdk.trace import ReadableSpan
 from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
 
+from ...eval.evaluators import BaseEvaluator
+from ...eval.models import EvaluationResult
+from ...eval.models.models import AgentExecution
 from .._runtime._contracts import (
     UiPathBaseRuntime,
     UiPathRuntimeContext,
@@ -13,8 +18,15 @@ from .._runtime._contracts import (
     UiPathRuntimeStatus,
 )
 from .._utils._eval_set import EvalHelpers
-from ._models import EvaluationItem
-from ._models._agent_execution_output import UiPathEvalRunExecutionOutput
+from ._evaluator_factory import EvaluatorFactory
+from ._models._evaluation_set import EvaluationItem, EvaluationSet
+from ._models._output import (
+    EvaluationResultDto,
+    EvaluationRunResult,
+    EvaluationRunResultDto,
+    UiPathEvalOutput,
+    UiPathEvalRunExecutionOutput,
+)
 
 T = TypeVar("T", bound=UiPathBaseRuntime)
 C = TypeVar("C", bound=UiPathRuntimeContext)
@@ -86,15 +98,36 @@ class UiPathEvalRuntime(UiPathBaseRuntime, Generic[T, C]):
         evaluation_set = EvalHelpers.load_eval_set(
             self.context.eval_set, self.context.eval_ids
         )
-        execution_output_list: list[UiPathEvalRunExecutionOutput] = []
+        evaluators = self._load_evaluators(evaluation_set)
+        results = UiPathEvalOutput(
+            evaluation_set_name=evaluation_set.name, score=0, evaluation_set_results=[]
+        )
         for eval_item in evaluation_set.evaluations:
-            execution_output = await self.execute_runtime(eval_item)
-            execution_output_list.append(execution_output)
-
+            evaluation_run_results = EvaluationRunResult(
+                evaluation_name=eval_item.name, evaluation_run_results=[]
+            )
+
+            results.evaluation_set_results.append(evaluation_run_results)
+            agent_execution_output = await self.execute_runtime(eval_item)
+            # we run each evaluator on the agent_output
+            for evaluator in evaluators:
+                evaluation_result = await self.run_evaluator(
+                    evaluator=evaluator,
+                    execution_output=agent_execution_output,
+                    eval_item=eval_item,
+                )
+                evaluation_run_results.evaluation_run_results.append(
+                    EvaluationRunResultDto(
+                        evaluator_name=evaluator.name,
+                        result=EvaluationResultDto.from_evaluation_result(
+                            evaluation_result
+                        ),
+                    )
+                )
+
+        results.compute_average_score()
         self.context.result = UiPathRuntimeResult(
-            output={
-                "results": execution_output_list,
-            },
+            output={**results.model_dump(by_alias=True)},
             status=UiPathRuntimeStatus.SUCCESSFUL,
         )
 
@@ -128,6 +161,65 @@ class UiPathEvalRuntime(UiPathBaseRuntime, Generic[T, C]):
             result=result,
         )
 
+    async def run_evaluator(
+        self,
+        evaluator: BaseEvaluator[Any],
+        execution_output: UiPathEvalRunExecutionOutput,
+        eval_item: EvaluationItem,
+    ) -> EvaluationResult:
+        agent_execution = AgentExecution(
+            agent_input=eval_item.inputs,
+            agent_output=execution_output.result.output or {},
+            agent_trace=execution_output.spans,
+        )
+
+        result = await evaluator.evaluate(
+            agent_execution=agent_execution,
+            # at the moment evaluation_criteria is always the expected output
+            evaluation_criteria=eval_item.expected_output,
+        )
+
+        return result
+
+    def _load_evaluators(
+        self, evaluation_set: EvaluationSet
+    ) -> List[BaseEvaluator[Any]]:
+        """Load evaluators referenced by the evaluation set."""
+        evaluators = []
+        evaluators_dir = Path(self.context.eval_set).parent.parent / "evaluators"  # type: ignore
+        evaluator_refs = set(evaluation_set.evaluator_refs)
+        found_evaluator_ids = set()
+
+        for file in evaluators_dir.glob("*.json"):
+            try:
+                with open(file, "r", encoding="utf-8") as f:
+                    data = json.load(f)
+            except json.JSONDecodeError as e:
+                raise ValueError(
+                    f"Invalid JSON in evaluator file '{file}': {str(e)}. "
+                    f"Please check the file for syntax errors."
+                ) from e
+
+            try:
+                evaluator_id = data.get("id")
+                if evaluator_id in evaluator_refs:
+                    evaluator = EvaluatorFactory.create_evaluator(data)
+                    evaluators.append(evaluator)
+                    found_evaluator_ids.add(evaluator_id)
+            except Exception as e:
+                raise ValueError(
+                    f"Failed to create evaluator from file '{file}': {str(e)}. "
+                    f"Please verify the evaluator configuration."
+                ) from e
+
+        missing_evaluators = evaluator_refs - found_evaluator_ids
+        if missing_evaluators:
+            raise ValueError(
+                f"Could not find the following evaluators: {missing_evaluators}"
+            )
+
+        return evaluators
+
     async def cleanup(self) -> None:
         """Cleanup runtime resources."""
         pass

{uipath-2.1.52 → uipath-2.1.54}/src/uipath/_cli/_runtime/_contracts.py

@@ -125,8 +125,12 @@ class UiPathRuntimeResult(BaseModel):
 
     def to_dict(self) -> Dict[str, Any]:
         """Convert to dictionary format for output."""
+        output_data = self.output or {}
+        if isinstance(self.output, BaseModel):
+            output_data = self.output.model_dump()
+
         result = {
-            "output": self.output or {},
+            "output": output_data,
             "status": self.status,
         }
 
@@ -595,7 +599,12 @@ class UiPathBaseRuntime(ABC):
             # Write the execution output to file if requested
             if self.context.execution_output_file:
                 with open(self.context.execution_output_file, "w") as f:
-                    json.dump(execution_result.output or {}, f, indent=2, default=str)
+                    if isinstance(execution_result.output, BaseModel):
+                        f.write(execution_result.output.model_dump())
+                    else:
+                        json.dump(
+                            execution_result.output or {}, f, indent=2, default=str
+                        )
 
             # Don't suppress exceptions
             return False

{uipath-2.1.52 → uipath-2.1.54}/src/uipath/_cli/_utils/_eval_set.py

@@ -4,7 +4,7 @@ from typing import List, Optional
 
 import click
 
-from uipath._cli._evals._models import EvaluationSet
+from uipath._cli._evals._models._evaluation_set import EvaluationSet
 from uipath._cli._utils._console import ConsoleLogger
 
 console = ConsoleLogger()

{uipath-2.1.52 → uipath-2.1.54}/src/uipath/_cli/_utils/_studio_project.py

@@ -1,6 +1,7 @@
 import json
 import os
 from functools import wraps
+from pathlib import PurePath
 from typing import Any, Callable, List, Optional, Union
 
 from pydantic import BaseModel, ConfigDict, Field, field_validator
@@ -103,7 +104,7 @@ class ProjectFolder(BaseModel):
         return v
 
 
-class ProjectStructure(BaseModel):
+class ProjectStructure(ProjectFolder):
     """Model representing the complete file structure of a UiPath project.
 
     Attributes:
@@ -114,34 +115,7 @@ class ProjectStructure(BaseModel):
         folder_type: The type of the root folder (optional)
     """
 
-    model_config = ConfigDict(
-        validate_by_name=True,
-        validate_by_alias=True,
-        use_enum_values=True,
-        arbitrary_types_allowed=True,
-        extra="allow",
-    )
-
-    id: Optional[str] = Field(default=None, alias="id")
-    name: Optional[str] = Field(default=None, alias="name")
-    folders: List[ProjectFolder] = Field(default_factory=list)
-    files: List[ProjectFile] = Field(default_factory=list)
-    folder_type: Optional[str] = Field(default=None, alias="folderType")
-
-    @field_validator("folder_type", mode="before")
-    @classmethod
-    def convert_folder_type(cls, v: Union[str, int, None]) -> Optional[str]:
-        """Convert numeric folder type to string.
-
-        Args:
-            v: The value to convert
-
-        Returns:
-            Optional[str]: The converted value or None
-        """
-        if isinstance(v, int):
-            return str(v)
-        return v
+    pass
 
 
 class LockInfo(BaseModel):
@@ -174,6 +148,33 @@ def get_folder_by_name(
     return None
 
 
+def resolve_path(
+    folder: ProjectFolder,
+    path: PurePath,
+) -> ProjectFile | ProjectFolder:
+    """Resolve a path relative to the folder.
+
+    Args:
+        folder: Project folder
+        path: Path relative to the folder
+
+    Returns: The resolved folder or file. If resolution fails, an assertion is raised.
+    """
+    root = path.parts
+    while len(root) > 1:
+        child = next(
+            (folder for folder in folder.folders if folder.name == root[0]), None
+        )
+        assert child, "Path not found."
+        folder = child
+        root = root[1:]
+    file = next((f for f in folder.files if f.name == root[0]), None)
+    child = next((folder for folder in folder.folders if folder.name == root[0]), None)
+    resolved = file or child
+    assert resolved, "Path not found."
+    return resolved
+
+
 class AddedResource(BaseModel):
     """Represents a new file to be added during a structural migration."""