uipath 2.1.21__py3-none-any.whl → 2.1.23__py3-none-any.whl

uipath/_cli/_push/sw_file_handler.py

@@ -133,12 +133,14 @@ class SwFileHandler:
         self,
         local_files: list[FileInfo],
         source_code_files: Dict[str, ProjectFile],
+        root_files: Dict[str, ProjectFile],
     ) -> None:
         """Process all file uploads to the source_code folder.
 
         Args:
             local_files: List of files to upload
             source_code_files: Dictionary of existing remote files
+            root_files: Dictionary of existing root-level files
 
         Returns:
             Set of processed file names
@@ -186,13 +188,25 @@ class SwFileHandler:
                     )
                 )
                 self.console.info(
-                    f"Uploading {click.style(local_file.file_name, fg='cyan')}"
+                    f"Uploading {click.style(local_file.relative_path, fg='cyan')}"
                 )
 
         # identify and add deleted files
         structural_migration.deleted_resources.extend(
             self._collect_deleted_files(source_code_files, processed_source_files)
         )
+
+        with open(os.path.join(self.directory, "uipath.json"), "r") as f:
+            uipath_config = json.load(f)
+
+        await self._prepare_agent_json_migration(
+            structural_migration, root_files, uipath_config
+        )
+
+        await self._prepare_entrypoints_json_migration(
+            structural_migration, root_files, uipath_config
+        )
+
         await self._studio_client.perform_structural_migration_async(
             structural_migration
         )
@@ -303,40 +317,65 @@ class SwFileHandler:
 
         return True
 
-    async def _update_agent_json(
+    async def _prepare_entrypoints_json_migration(
         self,
-        agent_json_file: Optional[ProjectFile] = None,
+        structural_migration: StructuralMigration,
+        root_files: Dict[str, ProjectFile],
+        uipath_config: Dict[str, Any],
     ) -> None:
-        """Update agent.json file with metadata from uipath.json.
+        """Prepare entry-points.json to be included in the same structural migration."""
+        existing = root_files.get("entry-points.json")
+        if existing:
+            try:
+                entry_points_json = (
+                    await self._studio_client.download_file_async(existing.id)
+                ).json()
+                entry_points_json["entryPoints"] = uipath_config["entryPoints"]
 
-        This function:
-        1. Downloads existing agent.json if it exists
-        2. Updates metadata based on uipath.json content
-        3. Increments code version
-        4. Updates author from JWT or pyproject.toml
-        5. Uploads updated agent.json
+            except Exception:
+                self.console.warning(
+                    "Could not parse existing entry-points.json file, using default version"
+                )
+            structural_migration.modified_resources.append(
+                ModifiedResource(
+                    id=existing.id,
+                    content_string=json.dumps(entry_points_json),
+                )
+            )
+            self.console.info(
+                f"Updating {click.style('entry-points.json', fg='yellow')}"
+            )
 
-        Args:
-            agent_json_file: Optional existing agent.json file
+        else:
+            self.console.warning(
+                "'entry-points.json' file does not exist in Studio Web project, initializing using default version"
+            )
+            entry_points_json = {
+                "$schema": "https://cloud.uipath.com/draft/2024-12/entry-point",
+                "$id": "entry-points.json",
+                "entryPoints": uipath_config["entryPoints"],
+            }
+            structural_migration.added_resources.append(
+                AddedResource(
+                    file_name="entry-points.json",
+                    content_string=json.dumps(entry_points_json),
+                )
+            )
+            self.console.info(
+                f"Uploading {click.style('entry-points.json', fg='cyan')}"
+            )
 
-        Raises:
-            httpx.HTTPError: If API requests fail
-            FileNotFoundError: If required files are missing
-            json.JSONDecodeError: If JSON parsing fails
-        """
+    async def _prepare_agent_json_migration(
+        self,
+        structural_migration: StructuralMigration,
+        root_files: Dict[str, ProjectFile],
+        uipath_config: Dict[str, Any],
+    ) -> None:
+        """Prepare agent.json to be included in the same structural migration."""
 
         def get_author_from_token_or_toml() -> str:
             import jwt
 
-            """Extract preferred_username from JWT token or fall back to pyproject.toml author.
-
-            Args:
-                directory: Project directory containing pyproject.toml
-
-            Returns:
-                str: Author name from JWT preferred_username or pyproject.toml authors field
-            """
-            # Try to get author from JWT token first
             token = os.getenv("UIPATH_ACCESS_TOKEN")
             if token:
                 try:
@@ -350,19 +389,15 @@ class SwFileHandler:
                     # If JWT decoding fails, fall back to toml
                     pass
 
-            toml_data = read_toml_project(os.path.join(directory, "pyproject.toml"))
-
+            toml_data = read_toml_project(
+                os.path.join(self.directory, "pyproject.toml")
+            )
             return toml_data.get("authors", "").strip()
 
-        # Read uipath.json
-        directory = os.getcwd()
-        with open(os.path.join(directory, "uipath.json"), "r") as f:
-            uipath_config = json.load(f)
-
         try:
             entrypoints = [
-                {"input": entry_point["input"], "output": entry_point["output"]}
-                for entry_point in uipath_config["entryPoints"]
+                {"input": entrypoint["input"], "output": entrypoint["output"]}
+                for entrypoint in uipath_config["entryPoints"]
             ]
         except (FileNotFoundError, KeyError) as e:
             self.console.error(
@@ -388,14 +423,12 @@ class SwFileHandler:
             ),
         }
 
-        if agent_json_file:
-            # Download existing agent.json
-            existing_agent_json = (
-                await self._studio_client.download_file_async(agent_json_file.id)
-            ).json()
-
+        existing = root_files.get("agent.json")
+        if existing:
             try:
-                # Get current version and increment patch version
+                existing_agent_json = (
+                    await self._studio_client.download_file_async(existing.id)
+                ).json()
                 version_parts = existing_agent_json["metadata"]["codeVersion"].split(
                     "."
                 )
@@ -403,20 +436,32 @@ class SwFileHandler:
                     version_parts[-1] = str(int(version_parts[-1]) + 1)
                     agent_json["metadata"]["codeVersion"] = ".".join(version_parts)
                 else:
-                    # If version format is invalid, start from initial version + 1
                     agent_json["metadata"]["codeVersion"] = (
                         AGENT_INITIAL_CODE_VERSION[:-1] + "1"
                     )
-            except (json.JSONDecodeError, KeyError, ValueError):
+            except Exception:
                 self.console.warning(
-                    "Could not parse existing agent.json, using default version"
+                    "Could not parse existing agent.json file, using default version"
                 )
-        file, action = await self._studio_client.upload_file_async(
-            file_content=json.dumps(agent_json),
-            file_name="agent.json",
-            remote_file=agent_json_file,
-        )
-        self.console.success(f"{action} {click.style('agent.json', fg='cyan')}")
+
+            structural_migration.modified_resources.append(
+                ModifiedResource(
+                    id=existing.id,
+                    content_string=json.dumps(agent_json),
+                )
+            )
+            self.console.info(f"Updating {click.style('agent.json', fg='yellow')}")
+        else:
+            self.console.warning(
+                "'agent.json' file does not exist in Studio Web project, initializing using default version"
+            )
+            structural_migration.added_resources.append(
+                AddedResource(
+                    file_name="agent.json",
+                    content_string=json.dumps(agent_json),
+                )
+            )
+            self.console.info(f"Uploading {click.style('agent.json', fg='cyan')}")
 
     async def upload_source_files(self, config_data: dict[str, Any]) -> None:
         """Main method to upload source files to the UiPath project.
@@ -457,8 +502,4 @@ class SwFileHandler:
             self.include_uv_lock,
             directories_to_ignore=["evals"],
         )
-        await self._process_file_uploads(files, source_code_files)
-
-        await self._update_agent_json(
-            root_files.get("agent.json", None),
-        )
+        await self._process_file_uploads(files, source_code_files, root_files)

uipath/_cli/_utils/_studio_project.py

@@ -175,13 +175,20 @@ def get_folder_by_name(
 
 
 class AddedResource(BaseModel):
-    content_file_path: str
+    """Represents a new file to be added during a structural migration."""
+
+    content_file_path: Optional[str] = None
     parent_path: Optional[str] = None
+    file_name: Optional[str] = None
+    content_string: Optional[str] = None
 
 
 class ModifiedResource(BaseModel):
+    """Represents a file update during a structural migration."""
+
     id: str
-    content_file_path: str
+    content_file_path: Optional[str] = None
+    content_string: Optional[str] = None
 
 
 class StructuralMigration(BaseModel):
@@ -336,6 +343,53 @@ class StudioClient:
             headers=headers or {},
         )
 
+    def _resolve_content_and_filename(
+        self,
+        *,
+        content_string: Optional[str],
+        content_file_path: Optional[str],
+        file_name: Optional[str] = None,
+        modified: bool = False,
+    ) -> tuple[bytes, Optional[str]]:
+        """Resolve multipart content bytes and filename for a resource.
+
+        Args:
+            content_string: Inline content as a string.
+            content_file_path: Path to a local file to read if inline content is not provided.
+            file_name: Explicit filename to use when adding a new resource.
+
+        Returns:
+            A tuple of (content_bytes, filename).
+
+        Raises:
+            FileNotFoundError: If a provided file path does not exist.
+            ValueError: If a filename cannot be determined.
+        """
+        content_bytes: bytes = b""
+        resolved_name: Optional[str] = None
+        if content_string is not None:
+            content_bytes = content_string.encode("utf-8")
+        elif content_file_path:
+            if os.path.exists(content_file_path):
+                with open(content_file_path, "rb") as f:
+                    content_bytes = f.read()
+            else:
+                raise FileNotFoundError(f"File not found: {content_file_path}")
+
+        if file_name:
+            resolved_name = file_name
+        elif content_file_path:
+            resolved_name = os.path.basename(content_file_path)
+        elif not modified:
+            raise ValueError(
+                "Unable to determine filename for multipart upload. "
+                "When providing inline content (content_string), you must also provide file_name. "
+                "Alternatively, set content_file_path so the filename can be inferred. "
+                f"Received file_name={file_name!r}, content_file_path={content_file_path!r}."
+            )
+
+        return content_bytes, resolved_name
+
     @with_lock_retry
     async def perform_structural_migration_async(
         self,
@@ -360,44 +414,37 @@ class StudioClient:
                 (None, deleted_resources_json),
             )
         )
-
         for i, added_resource in enumerate(structural_migration.added_resources):
-            if os.path.exists(added_resource.content_file_path):
-                with open(added_resource.content_file_path, "rb") as f:
-                    content = f.read()
-
-                filename = os.path.basename(added_resource.content_file_path)
-                files.append((f"AddedResources[{i}].Content", (filename, content)))
-
-                if added_resource.parent_path:
-                    files.append(
-                        (
-                            f"AddedResources[{i}].ParentPath",
-                            (None, added_resource.parent_path),
-                        )
-                    )
-            else:
-                raise FileNotFoundError(
-                    f"File not found: {added_resource.content_file_path}"
-                )
+            content_bytes, filename = self._resolve_content_and_filename(
+                content_string=added_resource.content_string,
+                content_file_path=added_resource.content_file_path,
+                file_name=added_resource.file_name,
+            )
 
-        for i, modified_resource in enumerate(structural_migration.modified_resources):
-            if os.path.exists(modified_resource.content_file_path):
-                with open(modified_resource.content_file_path, "rb") as f:
-                    content = f.read()
+            files.append((f"AddedResources[{i}].Content", (filename, content_bytes)))
 
-                filename = os.path.basename(modified_resource.content_file_path)
-                files.append((f"ModifiedResources[{i}].Content", (filename, content)))
+            if added_resource.parent_path:
                 files.append(
                     (
-                        f"ModifiedResources[{i}].Id",
-                        (None, modified_resource.id),
+                        f"AddedResources[{i}].ParentPath",
+                        (None, added_resource.parent_path),
                     )
                 )
-            else:
-                raise FileNotFoundError(
-                    f"File not found: {modified_resource.content_file_path}"
+
+        for i, modified_resource in enumerate(structural_migration.modified_resources):
+            content_bytes, _ = self._resolve_content_and_filename(
+                content_string=modified_resource.content_string,
+                content_file_path=modified_resource.content_file_path,
+                modified=True,
+            )
+
+            files.append((f"ModifiedResources[{i}].Content", content_bytes))
+            files.append(
+                (
+                    f"ModifiedResources[{i}].Id",
+                    (None, modified_resource.id),
                 )
+            )
 
         response = await self.uipath.api_client.request_async(
             "POST",

uipath/tracing/_utils.py

@@ -37,7 +37,7 @@ class UiPathSpan:
     )
     expiry_time_utc: Optional[str] = None
     folder_key: Optional[str] = field(
-        default_factory=lambda: env.get("UIPATH_FOLDER_KEY_XYZ", "")
+        default_factory=lambda: env.get("UIPATH_FOLDER_KEY", "")
     )
     source: Optional[str] = None
     span_type: str = "Coded Agents"

{uipath-2.1.21.dist-info → uipath-2.1.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uipath
-Version: 2.1.21
+Version: 2.1.23
 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.21.dist-info → uipath-2.1.23.dist-info}/RECORD

@@ -42,7 +42,7 @@ uipath/_cli/_evals/_evaluators/_trajectory_evaluator.py,sha256=dnogQTOskpI4_cNF0
 uipath/_cli/_evals/_models/__init__.py,sha256=Ewjp3u2YeTH2MmzY9LWf7EIbAoIf_nW9fMYbj7pGlPs,420
 uipath/_cli/_evals/_models/_evaluation_set.py,sha256=tVHykSget-G3sOCs9bSchMYUTpFqzXVlYYbY8L9SI0c,1518
 uipath/_cli/_evals/_models/_evaluators.py,sha256=l57NEVyYmzSKuoIXuGkE94Br01hAMg35fiS2MlTkaQM,2115
-uipath/_cli/_push/sw_file_handler.py,sha256=tRE9n68xv0r20ulwOyALHtYwzbjGneiASwzNm8xtBN0,16372
+uipath/_cli/_push/sw_file_handler.py,sha256=5zAt03gSlni7RnJmZJP4d4RVC33u8lZWj3W9xwx-CFM,18064
 uipath/_cli/_runtime/_contracts.py,sha256=WlpaiQAMWCo-JFHjee35Klf49A3GsKjOU1Mf2IpUGHY,16033
 uipath/_cli/_runtime/_escalation.py,sha256=x3vI98qsfRA-fL_tNkRVTFXioM5Gv2w0GFcXJJ5eQtg,7981
 uipath/_cli/_runtime/_hitl.py,sha256=aexwe0dIXvh6SlVS1jVnO_aGZc6e3gLsmGkCyha5AHo,11300
@@ -62,7 +62,7 @@ uipath/_cli/_utils/_input_args.py,sha256=3LGNqVpJItvof75VGm-ZNTUMUH9-c7-YgleM5b2
 uipath/_cli/_utils/_parse_ast.py,sha256=8Iohz58s6bYQ7rgWtOTjrEInLJ-ETikmOMZzZdIY2Co,20072
 uipath/_cli/_utils/_processes.py,sha256=q7DfEKHISDWf3pngci5za_z0Pbnf_shWiYEcTOTCiyk,1855
 uipath/_cli/_utils/_project_files.py,sha256=MMexSE6BapxitYBl1UUWy_AgkJMdGNFD1t2MkU0hwz4,13115
-uipath/_cli/_utils/_studio_project.py,sha256=iVcCm-aps-EQ7Pym_OWGOA48xeDigzcofUxXKy29x6U,13727
+uipath/_cli/_utils/_studio_project.py,sha256=X4X9HbdbGgLQtJRE-h8rcALCrupWkrpqOfSnt9c-hlo,15541
 uipath/_cli/_utils/_tracing.py,sha256=2igb03j3EHjF_A406UhtCKkPfudVfFPjUq5tXUEG4oo,1541
 uipath/_cli/_utils/_uv_helpers.py,sha256=6SvoLnZPoKIxW0sjMvD1-ENV_HOXDYzH34GjBqwT138,3450
 uipath/_services/__init__.py,sha256=10xtw3ENC30yR9CCq_b94RMZ3YrUeyfHV33yWYUd8tU,896
@@ -112,11 +112,11 @@ uipath/telemetry/_track.py,sha256=I8SzROQcySAXNfxx4QgZlJ6ib8DjTKn50CiZYsbjjr8,45
 uipath/tracing/__init__.py,sha256=GKRINyWdHVrDsI-8mrZDLdf0oey6GHGlNZTOADK-kgc,224
 uipath/tracing/_otel_exporters.py,sha256=X7cnuGqvxGbACZuFD2XYTWXwIse8pokOEAjeTPE6DCQ,3158
 uipath/tracing/_traced.py,sha256=qeVDrds2OUnpdUIA0RhtF0kg2dlAZhyC1RRkI-qivTM,18528
-uipath/tracing/_utils.py,sha256=ZeensQexnw69jVcsVrGyED7mPlAU-L1agDGm6_1A3oc,10388
+uipath/tracing/_utils.py,sha256=wJRELaPu69iY0AhV432Dk5QYf_N_ViRU4kAUG1BI1ew,10384
 uipath/utils/__init__.py,sha256=VD-KXFpF_oWexFg6zyiWMkxl2HM4hYJMIUDZ1UEtGx0,105
 uipath/utils/_endpoints_manager.py,sha256=iRTl5Q0XAm_YgcnMcJOXtj-8052sr6jpWuPNz6CgT0Q,8408
-uipath-2.1.21.dist-info/METADATA,sha256=O_9m-ZcdrpDqGwxFfOtVQDN9TvtCtuaCB33jpMuzLnY,6367
-uipath-2.1.21.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-uipath-2.1.21.dist-info/entry_points.txt,sha256=9C2_29U6Oq1ExFu7usihR-dnfIVNSKc-0EFbh0rskB4,43
-uipath-2.1.21.dist-info/licenses/LICENSE,sha256=-KBavWXepyDjimmzH5fVAsi-6jNVpIKFc2kZs0Ri4ng,1058
-uipath-2.1.21.dist-info/RECORD,,
+uipath-2.1.23.dist-info/METADATA,sha256=CEP-ypBLLKYH4Tkpc9iWDIUx-uWRHty7PqgnuX3CcTg,6367
+uipath-2.1.23.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+uipath-2.1.23.dist-info/entry_points.txt,sha256=9C2_29U6Oq1ExFu7usihR-dnfIVNSKc-0EFbh0rskB4,43
+uipath-2.1.23.dist-info/licenses/LICENSE,sha256=-KBavWXepyDjimmzH5fVAsi-6jNVpIKFc2kZs0Ri4ng,1058
+uipath-2.1.23.dist-info/RECORD,,