uipath 2.1.21__tar.gz → 2.1.22__tar.gz

{uipath-2.1.21 → uipath-2.1.22}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [project]
 name = "uipath"
-version = "2.1.21"
+version = "2.1.22"
 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.21 → uipath-2.1.22}/src/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-2.1.21 → uipath-2.1.22}/src/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-2.1.21 → uipath-2.1.22}/tests/cli/test_push.py

@@ -14,33 +14,78 @@ from tests.cli.utils.common import configure_env_vars
 from uipath._cli.cli_push import push
 
 
-def extract_agent_json_file_from_request(request: Request) -> dict[Any, str]:
-    boundary = re.search(rb"--([a-f0-9]+)", request.content).group(1).decode()
-    parts = request.content.split(f"--{boundary}".encode())
-
-    # Locate the agent.json file
-    agent_json_part = None
+def extract_agent_json_from_modified_resources(
+    request: Request, *, agent_file_id: str | None = None
+) -> dict[str, Any]:
+    """Extract agent.json content from ModifiedResources in StructuralMigration payload."""
+    match = re.search(
+        rb"boundary=([-._0-9A-Za-z]+)", request.headers.get("Content-Type", "").encode()
+    )
+    if match is None:
+        # Fallback to body sniffing like older helper
+        match = re.search(rb"--([-._0-9A-Za-z]+)", request.content)
+    assert match is not None, "Could not detect multipart boundary"
+    boundary = match.group(1)
+    parts = request.content.split(b"--" + boundary)
+
+    # Require agent_file_id and search only ModifiedResources
+    assert agent_file_id is not None, (
+        "agent_file_id is required to extract agent.json from ModifiedResources"
+    )
+    target_index: str | None = None
     for part in parts:
         if (
-            b'Content-Disposition: form-data; name="file"; filename="agent.json"'
-            in part
+            b"Content-Disposition: form-data;" in part
+            and b"ModifiedResources[" in part
+            and b"].Id" in part
         ):
-            agent_json_part = part
-            break
+            body = part.split(b"\r\n\r\n", 1)
+            if len(body) == 2:
+                value = body[1].strip().strip(b"\r\n")
+                if value.decode(errors="ignore") == agent_file_id:
+                    m = re.search(rb"ModifiedResources\[(\d+)\]\.Id", part)
+                    if m:
+                        target_index = m.group(1).decode()
+                        break
+
+    if target_index is not None:
+        for part in parts:
+            if (
+                b"Content-Disposition: form-data;" in part
+                and f"ModifiedResources[{target_index}].Content".encode() in part
+            ):
+                content_bytes = part.split(b"\r\n\r\n", 1)[1].split(b"\r\n")[0]
+                return json.loads(content_bytes.decode())
 
-    assert agent_json_part is not None, (
-        "agent.json part not found in the multipart/form-data payload."
+    raise AssertionError(
+        "agent.json content not found in ModifiedResources of StructuralMigration payload"
     )
 
-    # Extract the agent.json content
-    agent_json_content = (
-        agent_json_part.split(b"\r\n\r\n", 1)[1].split(b"\r\n--")[0].decode()
+
+def extract_agent_json_from_added_resources(request: Request) -> dict[str, Any]:
+    """Extract agent.json content from AddedResources in StructuralMigration payload."""
+    match = re.search(
+        rb"boundary=([-._0-9A-Za-z]+)", request.headers.get("Content-Type", "").encode()
     )
+    if match is None:
+        match = re.search(rb"--([-._0-9A-Za-z]+)", request.content)
+    assert match is not None, "Could not detect multipart boundary"
+    boundary = match.group(1)
+    parts = request.content.split(b"--" + boundary)
 
-    # Parse the agent.json payload
-    agent_json_data = json.loads(agent_json_content)
+    for part in parts:
+        if (
+            b"Content-Disposition: form-data;" in part
+            and b"AddedResources[" in part
+            and b"].Content" in part
+            and b'filename="agent.json"' in part
+        ):
+            content_bytes = part.split(b"\r\n\r\n", 1)[1].split(b"\r\n")[0]
+            return json.loads(content_bytes.decode())
 
-    return agent_json_data
+    raise AssertionError(
+        "agent.json content not found in AddedResources of StructuralMigration payload"
+    )
 
 
 class TestPush:
@@ -144,6 +189,14 @@ class TestPush:
                     "isEntryPoint": False,
                     "ignoredFromPublish": False,
                 },
+                {
+                    "id": "898",
+                    "name": "entry-points.json",
+                    "isMain": False,
+                    "fileType": "1",
+                    "isEntryPoint": False,
+                    "ignoredFromPublish": False,
+                },
             ],
             "folderType": "0",
         }
@@ -153,7 +206,7 @@ class TestPush:
             json=mock_structure,
         )
 
-        self._mock_lock_retrieval(httpx_mock, base_url, project_id, times=2)
+        self._mock_lock_retrieval(httpx_mock, base_url, project_id, times=1)
 
         # Mock agent.json download
         httpx_mock.add_response(
@@ -163,6 +216,14 @@ class TestPush:
             json={"metadata": {"codeVersion": "0.1.0"}},
         )
 
+        # Mock entry-points.json download
+        httpx_mock.add_response(
+            method="GET",
+            url=f"{base_url}/studio_/backend/api/Project/{project_id}/FileOperations/File/898",
+            status_code=200,
+            json={"entryPoints": {}},
+        )
+
         httpx_mock.add_response(
             method="POST",
             url=f"{base_url}/studio_/backend/api/Project/{project_id}/FileOperations/StructuralMigration",
@@ -176,14 +237,6 @@ class TestPush:
             json=mock_structure,
         )
 
-        # For agent.json
-        httpx_mock.add_response(
-            method="PUT",
-            url=f"{base_url}/studio_/backend/api/Project/{project_id}/FileOperations/File/246",
-            status_code=200,
-            json={},
-        )
-
         with runner.isolated_filesystem(temp_dir=temp_dir):
             # Create necessary files
             with open("uipath.json", "w") as f:
@@ -209,19 +262,17 @@ class TestPush:
             assert "Updating pyproject.toml" in result.output
             assert "Updating uipath.json" in result.output
             assert "Uploading uv.lock" in result.output
-            assert "Updated agent.json" in result.output
-
-            # check incremented code version
-            agent_upload_request = None
-            for request in httpx_mock.get_requests(
-                method="PUT",
-                url=f"{base_url}/studio_/backend/api/Project/{project_id}/FileOperations/File/246",
-            ):
-                agent_upload_request = request
-                break
+            assert "Updating agent.json" in result.output
+            assert "Updating entry-points.json" in result.output
 
-            agent_json_content = extract_agent_json_file_from_request(
-                agent_upload_request
+            # check incremented code version via StructuralMigration payload
+            structural_migration_request = httpx_mock.get_request(
+                method="POST",
+                url=f"{base_url}/studio_/backend/api/Project/{project_id}/FileOperations/StructuralMigration",
+            )
+            assert structural_migration_request is not None
+            agent_json_content = extract_agent_json_from_modified_resources(
+                structural_migration_request, agent_file_id="246"
             )
 
             # Validate `metadata["codeVersion"]`
@@ -272,7 +323,7 @@ class TestPush:
             json=mock_structure,
         )
 
-        self._mock_lock_retrieval(httpx_mock, base_url, project_id, times=3)
+        self._mock_lock_retrieval(httpx_mock, base_url, project_id, times=2)
 
         httpx_mock.add_response(
             method="POST",
@@ -287,13 +338,6 @@ class TestPush:
             json=mock_structure,
         )
 
-        httpx_mock.add_response(
-            method="POST",
-            url=f"{base_url}/studio_/backend/api/Project/{project_id}/FileOperations/File",
-            status_code=200,
-            json={},
-        )
-
         with runner.isolated_filesystem(temp_dir=temp_dir):
             # Create necessary files
             with open("uipath.json", "w") as f:
@@ -319,23 +363,17 @@ class TestPush:
             assert "Uploading pyproject.toml" in result.output
             assert "Uploading uipath.json" in result.output
             assert "Uploading uv.lock" in result.output
-            assert "Uploaded agent.json" in result.output
+            assert "Uploading agent.json" in result.output
+            assert "Uploading entry-points.json" in result.output
 
             # check expected agent.json fields
-            agent_upload_request = None
-            for request in httpx_mock.get_requests(
+            structural_migration_request = httpx_mock.get_request(
                 method="POST",
-                url=f"{base_url}/studio_/backend/api/Project/{project_id}/FileOperations/File",
-            ):
-                if (
-                    b'Content-Disposition: form-data; name="file"; filename="agent.json"'
-                    in request.content
-                ):
-                    agent_upload_request = request
-                    break
-
-            agent_json_content = extract_agent_json_file_from_request(
-                agent_upload_request
+                url=f"{base_url}/studio_/backend/api/Project/{project_id}/FileOperations/StructuralMigration",
+            )
+            assert structural_migration_request is not None
+            agent_json_content = extract_agent_json_from_added_resources(
+                structural_migration_request
             )
 
             expected_code_version = "1.0.0"
@@ -446,7 +484,7 @@ class TestPush:
             json=mock_structure,
         )
 
-        self._mock_lock_retrieval(httpx_mock, base_url, project_id, times=2)
+        self._mock_lock_retrieval(httpx_mock, base_url, project_id, times=1)
 
         httpx_mock.add_response(
             method="POST",
@@ -461,13 +499,6 @@ class TestPush:
             json=mock_structure,
         )
 
-        httpx_mock.add_response(
-            method="POST",
-            url=f"{base_url}/studio_/backend/api/Project/{project_id}/FileOperations/File",
-            status_code=200,
-            json={},
-        )
-
         with runner.isolated_filesystem(temp_dir=temp_dir):
             # Create necessary files
             with open("uipath.json", "w") as f:

{uipath-2.1.21 → uipath-2.1.22}/uv.lock

@@ -2029,7 +2029,7 @@ wheels = [
 
 [[package]]
 name = "uipath"
-version = "2.1.21"
+version = "2.1.22"
 source = { editable = "." }
 dependencies = [
     { name = "azure-monitor-opentelemetry" },