uipath 2.1.61__tar.gz → 2.1.63__tar.gz

{uipath-2.1.61 → uipath-2.1.63}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [project]
 name = "uipath"
-version = "2.1.61"
+version = "2.1.63"
 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.61 → uipath-2.1.63}/src/uipath/_cli/_auth/_auth_service.py

@@ -9,7 +9,11 @@ from urllib.parse import urlparse
 from uipath._cli._auth._auth_server import HTTPServer
 from uipath._cli._auth._client_credentials import ClientCredentialsService
 from uipath._cli._auth._oidc_utils import OidcUtils
-from uipath._cli._auth._portal_service import PortalService, select_tenant
+from uipath._cli._auth._portal_service import (
+    PortalService,
+    get_tenant_id,
+    select_tenant,
+)
 from uipath._cli._auth._url_utils import set_force_flag
 from uipath._cli._auth._utils import update_auth_file, update_env_file
 from uipath._cli._utils._console import ConsoleLogger
@@ -24,6 +28,7 @@ class AuthService:
         client_id: Optional[str],
         client_secret: Optional[str],
         base_url: Optional[str],
+        tenant: Optional[str],
         scope: Optional[str],
     ):
         self._force = force
@@ -32,6 +37,7 @@ class AuthService:
         self._client_id = client_id
         self._client_secret = client_secret
         self._base_url = base_url
+        self._tenant = tenant
         self._scope = scope
         set_force_flag(self._force)
 
@@ -108,7 +114,14 @@ class AuthService:
             update_env_file({"UIPATH_ACCESS_TOKEN": access_token})
 
             tenants_and_organizations = portal_service.get_tenants_and_organizations()
-            base_url = select_tenant(self._domain, tenants_and_organizations)
+
+            if self._tenant:
+                base_url = get_tenant_id(
+                    self._domain, self._tenant, tenants_and_organizations
+                )
+            else:
+                base_url = select_tenant(self._domain, tenants_and_organizations)
+
             try:
                 portal_service.post_auth(base_url)
             except Exception:

{uipath-2.1.61 → uipath-2.1.63}/src/uipath/_cli/_auth/_portal_service.py

@@ -231,3 +231,32 @@ def select_tenant(
     )
 
     return uipath_url
+
+
+def get_tenant_id(
+    domain: str,
+    tenant_name: str,
+    tenants_and_organizations: TenantsAndOrganizationInfoResponse,
+) -> str:
+    tenants = tenants_and_organizations["tenants"]
+
+    matched_tenant = next((t for t in tenants if t["name"] == tenant_name), None)
+    if not matched_tenant:
+        console.error(f"Tenant '{tenant_name}' not found.")
+        raise ValueError(f"Tenant '{tenant_name}' not found.")
+
+    domain = get_base_url(domain)
+    account_name = tenants_and_organizations["organization"]["name"]
+
+    base_url = get_base_url(domain)
+    uipath_url = f"{base_url}/{account_name}/{tenant_name}"
+
+    update_env_file(
+        {
+            "UIPATH_URL": uipath_url,
+            "UIPATH_TENANT_ID": matched_tenant["id"],
+            "UIPATH_ORGANIZATION_ID": tenants_and_organizations["organization"]["id"],
+        }
+    )
+
+    return uipath_url

{uipath-2.1.61 → uipath-2.1.63}/src/uipath/_cli/_utils/_studio_project.py

@@ -126,8 +126,8 @@ class LockInfo(BaseModel):
         arbitrary_types_allowed=True,
         extra="allow",
     )
-    project_lock_key: str = Field(alias="projectLockKey")
-    solution_lock_key: str = Field(alias="solutionLockKey")
+    project_lock_key: Optional[str] = Field(alias="projectLockKey")
+    solution_lock_key: Optional[str] = Field(alias="solutionLockKey")
 
 
 def get_folder_by_name(
@@ -203,6 +203,8 @@ def with_lock_retry(func: Callable[..., Any]) -> Callable[..., Any]:
     async def wrapper(self, *args, **kwargs):
         try:
             lock_info = await self._retrieve_lock()
+            if not lock_info.project_lock_key:
+                raise RuntimeError("Failed to retrieve project lock key.")
 
             headers = kwargs.get("headers", {}) or {}
             headers[HEADER_SW_LOCK_KEY] = lock_info.project_lock_key

{uipath-2.1.61 → uipath-2.1.63}/src/uipath/_cli/cli_auth.py

@@ -35,6 +35,11 @@ console = ConsoleLogger()
     required=False,
     help="Base URL for the UiPath tenant instance (required for client credentials)",
 )
+@click.option(
+    "--tenant",
+    required=False,
+    help="Tenant name within UiPath Automation Cloud",
+)
 @click.option(
     "--scope",
     required=False,
@@ -48,6 +53,7 @@ def auth(
     client_id: Optional[str] = None,
     client_secret: Optional[str] = None,
     base_url: Optional[str] = None,
+    tenant: Optional[str] = None,
     scope: Optional[str] = None,
 ):
     """Authenticate with UiPath Cloud Platform.
@@ -69,6 +75,7 @@ def auth(
         client_id=client_id,
         client_secret=client_secret,
         base_url=base_url,
+        tenant=tenant,
         scope=scope,
     )
     with console.spinner("Authenticating with UiPath ..."):

{uipath-2.1.61 → uipath-2.1.63}/tests/cli/test_auth.py

@@ -146,3 +146,47 @@ class TestAuth:
             assert result.exit_code == 1
             assert "Malformed UIPATH_URL" in result.output
             assert "custom.uipath.com" in result.output
+
+    def test_auth_with_tenant_flag(self):
+        """
+        Test that providing --tenant bypasses interactive tenant selection
+        and uses the specified tenant name.
+        """
+        runner = CliRunner()
+        with (
+            patch("uipath._cli._auth._auth_service.webbrowser.open") as mock_open,
+            patch("uipath._cli._auth._auth_service.HTTPServer") as mock_server,
+            patch(
+                "uipath._cli._auth._auth_service.PortalService"
+            ) as mock_portal_service,
+            patch(
+                "uipath._cli._auth._auth_service.select_tenant"
+            ) as mock_select_tenant,
+            patch(
+                "uipath._cli._auth._url_utils.get_base_url",
+                return_value="https://alpha.uipath.com",
+            ),
+        ):
+            mock_server.return_value.start = AsyncMock(
+                return_value={"access_token": "test_token"}
+            )
+
+            mock_portal_service.return_value.__enter__.return_value.get_tenants_and_organizations.return_value = {
+                "tenants": [
+                    {"name": "MyTenantName", "id": "tenant-id"},
+                    {"name": "OtherTenant", "id": "other-id"},
+                ],
+                "organization": {"name": "MyOrg", "id": "org-id"},
+            }
+
+            result = runner.invoke(
+                cli, ["auth", "--alpha", "--tenant", "MyTenantName", "--force"]
+            )
+
+            assert result.exit_code == 0, result.output
+            mock_open.assert_called_once()
+
+            assert not mock_select_tenant.called
+
+            portal = mock_portal_service.return_value.__enter__.return_value
+            assert portal.get_tenants_and_organizations.called

{uipath-2.1.61 → uipath-2.1.63}/uv.lock

@@ -2092,7 +2092,7 @@ wheels = [
 
 [[package]]
 name = "uipath"
-version = "2.1.61"
+version = "2.1.63"
 source = { editable = "." }
 dependencies = [
     { name = "azure-monitor-opentelemetry" },