uipath 2.1.83__tar.gz → 2.1.85__tar.gz

{uipath-2.1.83 → uipath-2.1.85}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uipath
-Version: 2.1.83
+Version: 2.1.85
 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.83 → uipath-2.1.85}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "uipath"
-version = "2.1.83"
+version = "2.1.85"
 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.83 → uipath-2.1.85}/src/uipath/_cli/_evals/_runtime.py

@@ -432,12 +432,12 @@ class UiPathEvalRuntime(UiPathBaseRuntime, Generic[T, C]):
     async def execute_runtime(
         self, eval_item: EvaluationItem
     ) -> UiPathEvalRunExecutionOutput:
-        eval_item_id = eval_item.id
+        execution_id = str(uuid.uuid4())
         runtime_context: C = self.factory.new_context(
-            execution_id=eval_item_id,
+            execution_id=execution_id,
             input_json=eval_item.inputs,
             is_eval_run=True,
-            log_handler=self._setup_execution_logging(eval_item_id),
+            log_handler=self._setup_execution_logging(execution_id),
         )
         if runtime_context.execution_id is None:
             raise ValueError("execution_id must be set for eval runs")
@@ -445,9 +445,8 @@ class UiPathEvalRuntime(UiPathBaseRuntime, Generic[T, C]):
         attributes = {
             "evalId": eval_item.id,
             "span_type": "eval",
+            "execution.id": runtime_context.execution_id,
         }
-        if runtime_context.execution_id:
-            attributes["execution.id"] = runtime_context.execution_id
 
         start_time = time()
         try:

{uipath-2.1.83 → uipath-2.1.85}/src/uipath/_cli/_push/sw_file_handler.py

@@ -7,6 +7,7 @@ from typing import Any, Dict, Optional, Set
 
 import click
 
+from ...models.exceptions import EnrichedException
 from .._utils._console import ConsoleLogger
 from .._utils._constants import (
     AGENT_INITIAL_CODE_VERSION,
@@ -483,7 +484,15 @@ class SwFileHandler:
         Raises:
             Exception: If any step in the process fails
         """
-        structure = await self._studio_client.get_project_structure_async()
+        try:
+            structure = await self._studio_client.get_project_structure_async()
+        except EnrichedException as e:
+            if e.status_code == 404:
+                structure = ProjectStructure(name="", files=[], folders=[])
+                await self._studio_client._put_lock()
+            else:
+                raise
+
         source_code_folder = self._get_folder_by_name(structure, "source_code")
         root_files, source_code_files = self._get_remote_files(
             structure, source_code_folder

{uipath-2.1.83 → uipath-2.1.85}/src/uipath/_cli/_utils/_studio_project.py

@@ -224,6 +224,45 @@ def with_lock_retry(func: Callable[..., Any]) -> Callable[..., Any]:
     return wrapper
 
 
+class StudioSolutionsClient:
+    def __init__(self, solution_id: str):
+        from uipath import UiPath
+
+        self.uipath: UiPath = UiPath()
+        self._solutions_base_url: str = f"/studio_/backend/api/Solution/{solution_id}"
+
+    async def create_project_async(
+        self,
+        project_name: str,
+        project_type: str = "Agent",
+        trigger_type: str = "Manual",
+    ):
+        """Create a new project in the specified solution.
+
+        Args:
+            project_name: The name for the new project
+            project_type: The type of project to create (default: "Agent")
+            trigger_type: The trigger type for the project (default: "Manual")
+
+        Returns:
+            dict: The created project details including project ID
+        """
+        data = {
+            "createDefaultProjectCommand[projectType]": project_type,
+            "createDefaultProjectCommand[triggerType]": trigger_type,
+            "createDefaultProjectCommand[name]": project_name,
+        }
+
+        response = await self.uipath.api_client.request_async(
+            "POST",
+            url=f"{self._solutions_base_url}/projects",
+            data=data,
+            scoped="org",
+        )
+
+        return response.json()
+
+
 class StudioClient:
     def __init__(self, project_id: str):
         from uipath import UiPath
@@ -464,3 +503,10 @@ class StudioClient:
             scoped="org",
         )
         return LockInfo.model_validate(response.json())
+
+    async def _put_lock(self):
+        await self.uipath.api_client.request_async(
+            "PUT",
+            url=f"{self._lock_operations_base_url}/dummy-uuid-Shared?api-version=2",
+            scoped="org",
+        )

{uipath-2.1.83 → uipath-2.1.85}/src/uipath/_services/connections_service.py

@@ -7,7 +7,7 @@ from httpx import Response
 from .._config import Config
 from .._execution_context import ExecutionContext
 from .._utils import Endpoint, RequestSpec, header_folder, infer_bindings
-from ..models import Connection, ConnectionToken, EventArguments
+from ..models import Connection, ConnectionMetadata, ConnectionToken, EventArguments
 from ..models.connections import ConnectionTokenType
 from ..tracing._traced import traced
 from ._base_service import BaseService
@@ -54,6 +54,31 @@ class ConnectionsService(BaseService):
         response = self.request(spec.method, url=spec.endpoint)
         return Connection.model_validate(response.json())
 
+    @traced(
+        name="connections_metadata",
+        run_type="uipath",
+        hide_output=True,
+    )
+    def metadata(
+        self, element_instance_id: int, tool_path: str, schema_mode: bool = True
+    ) -> ConnectionMetadata:
+        """Synchronously retrieve connection API metadata.
+
+        This method fetches the metadata for a connection,
+        which can be used to establish communication with an external service.
+
+        Args:
+            element_instance_id (int): The element instance ID of the connection.
+            tool_path (str): The tool path to retrieve metadata for.
+            schema_mode (bool): Whether or not to represent the output schema in the response fields.
+
+        Returns:
+            ConnectionMetadata: The connection metadata.
+        """
+        spec = self._metadata_spec(element_instance_id, tool_path, schema_mode)
+        response = self.request(spec.method, url=spec.endpoint, headers=spec.headers)
+        return ConnectionMetadata.model_validate(response.json())
+
     @traced(name="connections_list", run_type="uipath")
     def list(
         self,
@@ -186,6 +211,33 @@ class ConnectionsService(BaseService):
         response = await self.request_async(spec.method, url=spec.endpoint)
         return Connection.model_validate(response.json())
 
+    @traced(
+        name="connections_metadata",
+        run_type="uipath",
+        hide_output=True,
+    )
+    async def metadata_async(
+        self, element_instance_id: int, tool_path: str, schema_mode: bool = True
+    ) -> ConnectionMetadata:
+        """Asynchronously retrieve connection API metadata.
+
+        This method fetches the metadata for a connection,
+        which can be used to establish communication with an external service.
+
+        Args:
+            element_instance_id (int): The element instance ID of the connection.
+            tool_path (str): The tool path to retrieve metadata for.
+            schema_mode (bool): Whether or not to represent the output schema in the response fields.
+
+        Returns:
+            ConnectionMetadata: The connection metadata.
+        """
+        spec = self._metadata_spec(element_instance_id, tool_path, schema_mode)
+        response = await self.request_async(
+            spec.method, url=spec.endpoint, headers=spec.headers
+        )
+        return ConnectionMetadata.model_validate(response.json())
+
     @traced(
         name="connections_retrieve_token",
         run_type="uipath",
@@ -324,6 +376,20 @@ class ConnectionsService(BaseService):
             endpoint=Endpoint(f"/connections_/api/v1/Connections/{key}"),
         )
 
+    def _metadata_spec(
+        self, element_instance_id: int, tool_path: str, schema_mode: bool
+    ) -> RequestSpec:
+        metadata_endpoint_url = f"/elements_/v3/element/instances/{element_instance_id}/elements/{tool_path}/metadata"
+        return RequestSpec(
+            method="GET",
+            endpoint=Endpoint(metadata_endpoint_url),
+            headers={
+                "accept": "application/schema+json"
+                if schema_mode
+                else "application/json"
+            },
+        )
+
     def _retrieve_token_spec(
         self, key: str, token_type: ConnectionTokenType = ConnectionTokenType.DIRECT
     ) -> RequestSpec:

{uipath-2.1.83 → uipath-2.1.85}/src/uipath/agent/_utils.py

@@ -5,10 +5,12 @@ from httpx import Response
 from pydantic import TypeAdapter
 
 from uipath._cli._evals._models._evaluation_set import LLMMockingStrategy
+from uipath._cli._push.sw_file_handler import SwFileHandler
 from uipath._cli._utils._studio_project import (
     ProjectFile,
     ProjectFolder,
     StudioClient,
+    StudioSolutionsClient,
     resolve_path,
 )
 from uipath.agent.models.agent import (
@@ -27,6 +29,20 @@ async def get_file(
     return await studio_client.download_file_async(resolved.id)
 
 
+async def create_agent_project(solution_id: str, project_name: str) -> str:
+    studio_client = StudioSolutionsClient(solution_id=solution_id)
+    project = await studio_client.create_project_async(project_name=project_name)
+    return project["id"]
+
+
+async def upload_project_files(project_id: str, root: str) -> None:
+    sw_file_handler = SwFileHandler(
+        project_id=project_id,
+        directory=root,
+    )
+    await sw_file_handler.upload_source_files({})
+
+
 async def load_agent_definition(project_id: str) -> AgentDefinition:
     studio_client = StudioClient(project_id=project_id)
     project_structure = await studio_client.get_project_structure_async()

{uipath-2.1.83 → uipath-2.1.85}/src/uipath/models/__init__.py

@@ -3,7 +3,7 @@ from .actions import Action
 from .assets import Asset, UserAsset
 from .attachment import Attachment
 from .buckets import Bucket
-from .connections import Connection, ConnectionToken, EventArguments
+from .connections import Connection, ConnectionMetadata, ConnectionToken, EventArguments
 from .context_grounding import ContextGroundingQueryResponse
 from .context_grounding_index import ContextGroundingIndex
 from .errors import BaseUrlMissingError, SecretMissingError
@@ -38,6 +38,7 @@ __all__ = [
     "QueueItemPriority",
     "TransactionItemResult",
     "Connection",
+    "ConnectionMetadata",
     "ConnectionToken",
     "EventArguments",
     "Job",

{uipath-2.1.83 → uipath-2.1.85}/src/uipath/models/connections.py

@@ -4,6 +4,14 @@ from typing import Any, Optional
 from pydantic import BaseModel, ConfigDict, Field
 
 
+class ConnectionMetadata(BaseModel):
+    """Metadata about a connection."""
+
+    fields: dict[str, Any] = Field(default_factory=dict, alias="fields")
+
+    model_config = ConfigDict(populate_by_name=True, extra="allow")
+
+
 class Connection(BaseModel):
     model_config = ConfigDict(
         validate_by_name=True,

uipath-2.1.85/src/uipath/utils/dynamic_schema.py

@@ -0,0 +1,111 @@
+"""Json schema to dynamic pydantic model."""
+
+from typing import Any, Dict, List, Optional, Type, Union
+
+from pydantic import BaseModel, Field, create_model
+
+
+def jsonschema_to_pydantic(
+    schema: dict[str, Any],
+    definitions: Optional[dict[str, Any]] = None,
+) -> Type[BaseModel]:
+    """Convert a schema dict to a pydantic model.
+
+    Modified version of https://github.com/kreneskyp/jsonschema-pydantic to account for two unresolved issues.
+
+    Args:
+        schema: JSON schema.
+        definitions: Definitions dict. Defaults to `$def`.
+
+    Returns: Pydantic model.
+    """
+    title = schema.get("title", "DynamicModel")
+    assert isinstance(title, str), "Title of a model must be a string."
+
+    description = schema.get("description", None)
+
+    # top level schema provides definitions
+    if definitions is None:
+        if "$defs" in schema:
+            definitions = schema["$defs"]
+        elif "definitions" in schema:
+            definitions = schema["definitions"]
+        else:
+            definitions = {}
+
+    def convert_type(prop: dict[str, Any]) -> Any:
+        if "$ref" in prop:
+            ref_path = prop["$ref"].split("/")
+            ref = definitions[ref_path[-1]]
+            return jsonschema_to_pydantic(ref, definitions)
+
+        if "type" in prop:
+            type_mapping = {
+                "string": str,
+                "number": float,
+                "integer": int,
+                "boolean": bool,
+                "array": List,
+                "object": Dict[str, Any],
+                "null": None,
+            }
+
+            type_ = prop["type"]
+
+            if type_ == "array":
+                item_type: Any = convert_type(prop.get("items", {}))
+                assert isinstance(item_type, type)
+                return List[item_type]  # noqa F821
+            elif type_ == "object":
+                if "properties" in prop:
+                    return jsonschema_to_pydantic(prop, definitions)
+                else:
+                    return Dict[str, Any]
+            else:
+                return type_mapping.get(type_, Any)
+
+        elif "allOf" in prop:
+            combined_fields = {}
+            for sub_schema in prop["allOf"]:
+                model = jsonschema_to_pydantic(sub_schema, definitions)
+                combined_fields.update(model.__annotations__)
+            return create_model("CombinedModel", **combined_fields)
+
+        elif "anyOf" in prop:
+            unioned_types = tuple(
+                convert_type(sub_schema) for sub_schema in prop["anyOf"]
+            )
+            return Union[unioned_types]
+        elif prop == {} or "type" not in prop:
+            return Any
+        else:
+            raise ValueError(f"Unsupported schema: {prop}")
+
+    fields: dict[str, Any] = {}
+    required_fields = schema.get("required", [])
+
+    for name, prop in schema.get("properties", {}).items():
+        pydantic_type = convert_type(prop)
+        field_kwargs = {}
+        if "default" in prop:
+            field_kwargs["default"] = prop["default"]
+        if name not in required_fields:
+            # Note that we do not make this optional. This is due to a limitation in Pydantic/Python.
+            # If we convert the Optional type back to json schema, it is represented as type | None.
+            # pydantic_type = Optional[pydantic_type]
+
+            if "default" not in field_kwargs:
+                field_kwargs["default"] = None
+        if "description" in prop:
+            field_kwargs["description"] = prop["description"]
+        if "title" in prop:
+            field_kwargs["title"] = prop["title"]
+
+        fields[name] = (pydantic_type, Field(**field_kwargs))
+
+    convert_type(schema.get("properties", {}).get("choices", {}))
+
+    model = create_model(title, **fields)
+    if description:
+        model.__doc__ = description
+    return model

uipath-2.1.85/tests/cli/utils/test_dynamic_schema.py

@@ -0,0 +1,95 @@
+from typing import List, Optional
+
+from pydantic import BaseModel, Field
+
+from uipath.utils.dynamic_schema import jsonschema_to_pydantic
+
+
+def test_dynamic_schema():
+    # Arrange
+    class InnerSchema(BaseModel):
+        """Inner schema description."""
+
+        pass
+
+    class Schema(BaseModel):
+        """Schema description."""
+
+        string: str = Field(
+            default="", title="String Title", description="String Description"
+        )
+        optional_string: Optional[str] = Field(
+            default=None,
+            title="Optional String Title",
+            description="Optional String Description",
+        )
+        list_str: List[str] = Field(
+            default=[], title="List String", description="List String Description"
+        )
+
+        integer: int = Field(
+            default=0, title="Integer Title", description="Integer Description"
+        )
+        optional_integer: Optional[int] = Field(
+            default=None,
+            title="Option Integer Title",
+            description="Option Integer Description",
+        )
+        list_integer: List[int] = Field(
+            default=[],
+            title="List Integer Title",
+            description="List Integer Description",
+        )
+
+        floating: float = Field(
+            default=0.0, title="Floating Title", description="Floating Description"
+        )
+        optional_floating: Optional[float] = Field(
+            default=None,
+            title="Option Floating Title",
+            description="Option Floating Description",
+        )
+        list_floating: List[float] = Field(
+            default=[],
+            title="List Floating Title",
+            description="List Floating Description",
+        )
+
+        boolean: bool = Field(
+            default=False, title="Boolean Title", description="Boolean Description"
+        )
+        optional_boolean: Optional[bool] = Field(
+            default=None,
+            title="Option Boolean Title",
+            description="Option Boolean Description",
+        )
+        list_boolean: List[bool] = Field(
+            default=[],
+            title="List Boolean Title",
+            description="List Boolean Description",
+        )
+
+        nested_object: InnerSchema = Field(
+            default=InnerSchema(),
+            title="Nested Object Title",
+            description="Nested Object Description",
+        )
+        optional_nested_object: Optional[InnerSchema] = Field(
+            default=None,
+            title="Optional Nested Object Title",
+            description="Optional Nested Object Description",
+        )
+        list_nested_object: List[InnerSchema] = Field(
+            default=[],
+            title="List Nested Object Title",
+            description="List Nested Object Description",
+        )
+
+    schema_json = Schema.model_json_schema()
+
+    # Act
+    dynamic_schema = jsonschema_to_pydantic(schema_json)
+    dynamic_schema_json = dynamic_schema.model_json_schema()
+
+    # Assert
+    assert dynamic_schema_json == schema_json