uipath 2.1.99__py3-none-any.whl → 2.1.101__py3-none-any.whl

uipath/_cli/cli_pull.py

@@ -19,7 +19,7 @@ import click
 from ..telemetry import track
 from ._utils._console import ConsoleLogger
 from ._utils._constants import UIPATH_PROJECT_ID
-from ._utils._project_files import pull_project
+from ._utils._project_files import ProjectPullError, pull_project
 
 console = ConsoleLogger()
 
@@ -63,18 +63,25 @@ def pull(root: Path) -> None:
         $ uipath pull
         $ uipath pull /path/to/project
     """
-    if not (project_id := os.getenv(UIPATH_PROJECT_ID, False)):
+    project_id = os.getenv(UIPATH_PROJECT_ID)
+    if not project_id:
         console.error("UIPATH_PROJECT_ID environment variable not found.")
 
     default_download_configuration = {
         "source_code": root,
         "evals": root / "evals",
     }
-    with console.spinner("Pulling UiPath project files..."):
-        asyncio.run(
-            pull_project(
+
+    async def pull_with_updates():
+        try:
+            async for update in pull_project(
                 project_id,
                 default_download_configuration,
                 InteractiveConflictHandler(console),
-            )
-        )
+            ):
+                console.info(update.message)
+        except ProjectPullError as e:
+            console.error(e.message, include_traceback=True)
+
+    with console.spinner("Pulling UiPath project files..."):
+        asyncio.run(pull_with_updates())

uipath/_cli/cli_push.py

@@ -1,13 +1,15 @@
 # type: ignore
 import asyncio
 import os
-from typing import Any, Optional
+from typing import Any, AsyncIterator, Optional
 from urllib.parse import urlparse
 
 import click
 
+from uipath.models.exceptions import EnrichedException
+
 from ..telemetry import track
-from ._push.sw_file_handler import SwFileHandler
+from ._push.sw_file_handler import FileOperationUpdate, SwFileHandler
 from ._utils._console import ConsoleLogger
 from ._utils._constants import (
     UIPATH_PROJECT_ID,
@@ -35,14 +37,20 @@ async def upload_source_files_to_project(
     settings: Optional[dict[str, Any]],
     directory: str,
     include_uv_lock: bool = True,
-) -> None:
-    """Upload source files to UiPath project.
+) -> AsyncIterator[FileOperationUpdate]:
+    """Upload source files to UiPath project, yielding progress updates.
 
     This function handles the pushing of local files to the remote project:
     - Updates existing files that have changed
     - Uploads new files that don't exist remotely
     - Deletes remote files that no longer exist locally
     - Optionally includes the UV lock file
+
+    Yields:
+        FileOperationUpdate: Progress updates for each file operation
+
+    Raises:
+        ProjectPushError: If the push operation fails
     """
     sw_file_handler = SwFileHandler(
         project_id=project_id,
@@ -50,7 +58,8 @@ async def upload_source_files_to_project(
         include_uv_lock=include_uv_lock,
     )
 
-    await sw_file_handler.upload_source_files(settings)
+    async for update in sw_file_handler.upload_source_files(settings):
+        yield update
 
 
 @click.command()
@@ -88,21 +97,29 @@ def push(root: str, nolock: bool) -> None:
     config = get_project_config(root)
     validate_config(config)
 
-    if not os.getenv(UIPATH_PROJECT_ID, False):
+    project_id = os.getenv(UIPATH_PROJECT_ID)
+    if not project_id:
         console.error("UIPATH_PROJECT_ID environment variable not found.")
 
-    with console.spinner("Pushing coded UiPath project to Studio Web..."):
+    async def push_with_updates():
+        """Wrapper to handle async iteration and display updates."""
+        async for update in upload_source_files_to_project(
+            project_id,
+            config.get("settings", {}),
+            root,
+            include_uv_lock=not nolock,
+        ):
+            console.info(update.message)
+
+    with console.spinner("Pushing UiPath project to Studio Web..."):
         try:
             if not nolock:
                 handle_uv_operations(root)
 
-            asyncio.run(
-                upload_source_files_to_project(
-                    os.getenv(UIPATH_PROJECT_ID),
-                    config.get("settings", {}),
-                    root,
-                    include_uv_lock=not nolock,
-                )
-            )
+            asyncio.run(push_with_updates())
+
         except Exception as e:
-            console.error(f"Failed to push UiPath project: {e}")
+            console.error(
+                f"Failed to push UiPath project: {e}",
+                include_traceback=not isinstance(e, EnrichedException),
+            )

uipath/_uipath.py

@@ -22,6 +22,7 @@ from ._services import (
     UiPathOpenAIService,
 )
 from ._utils._auth import resolve_config
+from ._utils._logs import setup_logging
 from .models.errors import BaseUrlMissingError, SecretMissingError
 
 
@@ -54,7 +55,7 @@ class UiPath:
         self._buckets_service: Optional[BucketsService] = None
         self._attachments_service: Optional[AttachmentsService] = None
         self._connections_service: Optional[ConnectionsService] = None
-
+        setup_logging(should_debug=debug)
         self._execution_context = ExecutionContext()
 
     @property

uipath/_utils/_logs.py

@@ -1,14 +1,13 @@
 import logging
-import sys
 from typing import Optional
 
 logger: logging.Logger = logging.getLogger("uipath")
 
 
 def setup_logging(should_debug: Optional[bool] = None) -> None:
-    logging.basicConfig(
-        format="[%(asctime)s - %(name)s:%(lineno)d - %(levelname)s] %(message)s",
-        datefmt="%Y-%m-%d %H:%M:%S",
-    )
-    logger.setLevel(logging.DEBUG if should_debug else logging.INFO)
-    logger.addHandler(logging.StreamHandler(sys.stderr))
+    if not logging.root.handlers and not logger.handlers:
+        logging.basicConfig(
+            format="%(message)s",
+            datefmt="%Y-%m-%d %H:%M:%S",
+        )
+        logger.setLevel(logging.DEBUG if should_debug else logging.INFO)

uipath/agent/_utils.py

@@ -8,7 +8,6 @@ from uipath._cli._evals._models._evaluation_set import (
     InputMockingStrategy,
     LLMMockingStrategy,
 )
-from uipath._cli._push.sw_file_handler import SwFileHandler
 from uipath._cli._utils._studio_project import (
     ProjectFile,
     ProjectFolder,
@@ -38,14 +37,6 @@ async def create_agent_project(solution_id: str, project_name: str) -> str:
     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/agent/models/agent.py

@@ -6,6 +6,7 @@ from typing import Annotated, Any, Dict, List, Literal, Optional, Union
 from pydantic import BaseModel, ConfigDict, Discriminator, Field, Tag, field_validator
 
 from uipath.models import Connection
+from uipath.models.guardrails import AgentEscalationRecipient, Guardrail
 
 
 class AgentResourceType(str, Enum):
@@ -305,39 +306,6 @@ class AgentMcpResourceConfig(BaseAgentResourceConfig):
     )
 
 
-class AgentEscalationRecipientType(str, Enum):
-    """Enum for escalation recipient types."""
-
-    USER_ID = "UserId"
-    GROUP_ID = "GroupId"
-    USER_EMAIL = "UserEmail"
-
-
-class AgentEscalationRecipient(BaseModel):
-    """Recipient for escalation."""
-
-    type: Union[AgentEscalationRecipientType, str] = Field(..., alias="type")
-    value: str = Field(..., alias="value")
-    display_name: Optional[str] = Field(default=None, alias="displayName")
-
-    @field_validator("type", mode="before")
-    @classmethod
-    def normalize_type(cls, v: Any) -> str:
-        """Normalize recipient type from int (1=UserId, 2=GroupId, 3=UserEmail) or string. Unknown integers are converted to string."""
-        if isinstance(v, int):
-            mapping = {
-                1: AgentEscalationRecipientType.USER_ID,
-                2: AgentEscalationRecipientType.GROUP_ID,
-                3: AgentEscalationRecipientType.USER_EMAIL,
-            }
-            return mapping.get(v, str(v))
-        return v
-
-    model_config = ConfigDict(
-        validate_by_name=True, validate_by_alias=True, extra="allow"
-    )
-
-
 class AgentEscalationChannelProperties(BaseResourceProperties):
     """Agent escalation channel properties."""
 
@@ -508,6 +476,9 @@ class BaseAgentDefinition(BaseModel):
     output_schema: Dict[str, Any] = Field(
         ..., alias="outputSchema", description="JSON schema for output arguments"
     )
+    guardrails: Optional[List[Guardrail]] = Field(
+        None, description="List of agent guardrails"
+    )
 
     model_config = ConfigDict(
         validate_by_name=True, validate_by_alias=True, extra="allow"

uipath/models/exceptions.py

@@ -25,11 +25,15 @@ class EnrichedException(Exception):
             if error.request and error.request.method
             else "Unknown"
         )
-        self.response_content = (
-            error.response.content.decode("utf-8")
-            if error.response and error.response.content
-            else "No content"
-        )
+        max_content_length = 200
+        if error.response and error.response.content:
+            content = error.response.content.decode("utf-8")
+            if len(content) > max_content_length:
+                self.response_content = content[:max_content_length] + "... (truncated)"
+            else:
+                self.response_content = content
+        else:
+            self.response_content = "No content"
 
         enriched_message = (
             f"\nRequest URL: {self.url}"