uipath 2.1.24__py3-none-any.whl → 2.1.25__py3-none-any.whl

uipath/_cli/__init__.py

@@ -3,7 +3,7 @@ import sys
 
 import click
 
-from .cli_auth import auth as auth  # type: ignore
+from .cli_auth import auth as auth
 from .cli_deploy import deploy as deploy  # type: ignore
 from .cli_eval import eval as eval  # type: ignore
 from .cli_init import init as init  # type: ignore

uipath/_cli/_auth/_client_credentials.py

@@ -70,7 +70,7 @@ class ClientCredentialsService:
             return "cloud"
 
     def authenticate(
-        self, client_id: str, client_secret: str, scope: str = "OR.Execution"
+        self, client_id: str, client_secret: str, scope: Optional[str] = "OR.Execution"
     ) -> Optional[TokenData]:
         """Authenticate using client credentials flow.
 

uipath/_cli/_auth/_oidc_utils.py

@@ -5,6 +5,7 @@ import os
 from urllib.parse import urlencode
 
 from ._models import AuthConfig
+from ._url_utils import build_service_url
 
 
 def generate_code_verifier_and_challenge():
@@ -65,5 +66,5 @@ def get_auth_url(domain: str) -> tuple[str, str, str]:
     }
 
     query_string = urlencode(query_params)
-    url = f"https://{domain}.uipath.com/identity_/connect/authorize?{query_string}"
+    url = build_service_url(domain, f"/identity_/connect/authorize?{query_string}")
     return url, code_verifier, state

uipath/_cli/_auth/_portal_service.py

@@ -9,6 +9,7 @@ from ..._utils._ssl_context import get_httpx_client_kwargs
 from .._utils._console import ConsoleLogger
 from ._models import TenantsAndOrganizationInfoResponse, TokenData
 from ._oidc_utils import get_auth_config
+from ._url_utils import build_service_url, get_base_url
 from ._utils import (
     get_auth_data,
     get_parsed_token_data,
@@ -24,7 +25,7 @@ class PortalService:
 
     access_token: Optional[str] = None
     prt_id: Optional[str] = None
-    domain: Optional[str] = None
+    domain: str
     selected_tenant: Optional[str] = None
 
     _client: Optional[httpx.Client] = None
@@ -65,7 +66,10 @@ class PortalService:
         if self._client is None:
             raise RuntimeError("HTTP client is not initialized")
 
-        url = f"https://{self.domain}.uipath.com/{self.prt_id}/portal_/api/filtering/leftnav/tenantsAndOrganizationInfo"
+        url = build_service_url(
+            self.domain,
+            f"/{self.prt_id}/portal_/api/filtering/leftnav/tenantsAndOrganizationInfo",
+        )
         response = self._client.get(
             url, headers={"Authorization": f"Bearer {self.access_token}"}
         )
@@ -90,13 +94,14 @@ class PortalService:
             console.error("Organization not found.")
             return ""
         account_name = organization.get("name")
-        return f"https://{self.domain}.uipath.com/{account_name}/{self.selected_tenant}/orchestrator_"
+        base_url = get_base_url(self.domain)
+        return f"{base_url}/{account_name}/{self.selected_tenant}/orchestrator_"
 
     def post_refresh_token_request(self, refresh_token: str) -> TokenData:
         if self._client is None:
             raise RuntimeError("HTTP client is not initialized")
 
-        url = f"https://{self.domain}.uipath.com/identity_/connect/token"
+        url = build_service_url(self.domain, "/identity_/connect/token")
         client_id = get_auth_config().get("client_id")
 
         data = {
@@ -213,12 +218,15 @@ def select_tenant(
     account_name = tenants_and_organizations["organization"]["name"]
     console.info(f"Selected tenant: {click.style(tenant_name, fg='cyan')}")
 
+    base_url = get_base_url(domain)
+    uipath_url = f"{base_url}/{account_name}/{tenant_name}"
+
     update_env_file(
         {
-            "UIPATH_URL": f"https://{domain if domain else 'alpha'}.uipath.com/{account_name}/{tenant_name}",
+            "UIPATH_URL": uipath_url,
             "UIPATH_TENANT_ID": tenants_and_organizations["tenants"][tenant_idx]["id"],
             "UIPATH_ORGANIZATION_ID": tenants_and_organizations["organization"]["id"],
         }
     )
 
-    return f"https://{domain if domain else 'alpha'}.uipath.com/{account_name}/{tenant_name}"
+    return uipath_url

uipath/_cli/_auth/_url_utils.py

@@ -0,0 +1,41 @@
+import os
+from urllib.parse import urlparse
+
+
+def get_base_url(domain: str) -> str:
+    """Get the base URL for UiPath services.
+
+    Args:
+        domain: Either a domain name (e.g., 'cloud', 'alpha') or a full URL from UIPATH_URL
+
+    Returns:
+        The base URL to use for UiPath services
+    """
+    # If UIPATH_URL is set and domain is 'cloud' (default), use the base from UIPATH_URL
+    uipath_url = os.getenv("UIPATH_URL")
+    if uipath_url and domain == "cloud":
+        parsed_url = urlparse(uipath_url)
+        return f"{parsed_url.scheme}://{parsed_url.netloc}"
+
+    # If domain is already a full URL, use it directly
+    if domain.startswith("http"):
+        return domain
+
+    # Otherwise, construct the URL using the domain
+    return f"https://{domain if domain else 'cloud'}.uipath.com"
+
+
+def build_service_url(domain: str, path: str) -> str:
+    """Build a service URL by combining the base URL with a path.
+
+    Args:
+        domain: Either a domain name or full URL
+        path: The path to append (should start with /)
+
+    Returns:
+        The complete service URL
+    """
+    base_url = get_base_url(domain)
+    # Remove trailing slash from base_url to avoid double slashes
+    base_url = base_url.rstrip("/")
+    return f"{base_url}{path}"

uipath/_cli/_auth/index.html

@@ -477,7 +477,15 @@
                 formData.append('client_id', '__PY_REPLACE_CLIENT_ID__');
                 formData.append('code_verifier', codeVerifier);
 
-                const response = await fetch('https://__PY_REPLACE_DOMAIN__.uipath.com/identity_/connect/token', {
+                const domainOrUrl = '__PY_REPLACE_DOMAIN__';
+                let tokenUrl;
+                if (domainOrUrl.startsWith('http')) {
+                    tokenUrl = `${domainOrUrl}/identity_/connect/token`;
+                } else {
+                    tokenUrl = `https://${domainOrUrl}.uipath.com/identity_/connect/token`;
+                }
+
+                const response = await fetch(tokenUrl, {
                     method: 'POST',
                     headers: {
                         'Content-Type': 'application/x-www-form-urlencoded'

uipath/_cli/cli_auth.py

@@ -1,9 +1,10 @@
-# type: ignore
 import asyncio
 import json
 import os
 import socket
 import webbrowser
+from typing import Optional
+from urllib.parse import urlparse
 
 import click
 from dotenv import load_dotenv
@@ -33,10 +34,10 @@ def is_port_in_use(port: int) -> bool:
 
 def set_port():
     auth_config = get_auth_config()
-    port = auth_config.get("port", 8104)
-    port_option_one = auth_config.get("portOptionOne", 8104)
-    port_option_two = auth_config.get("portOptionTwo", 8055)
-    port_option_three = auth_config.get("portOptionThree", 42042)
+    port = int(auth_config.get("port", 8104))
+    port_option_one = int(auth_config.get("portOptionOne", 8104))  # type: ignore
+    port_option_two = int(auth_config.get("portOptionTwo", 8055))  # type: ignore
+    port_option_three = int(auth_config.get("portOptionThree", 42042))  # type: ignore
     if is_port_in_use(port):
         if is_port_in_use(port_option_one):
             if is_port_in_use(port_option_two):
@@ -90,14 +91,17 @@ def set_port():
 @track
 def auth(
     domain,
-    force: None | bool = False,
-    client_id: str = None,
-    client_secret: str = None,
-    base_url: str = None,
-    scope: str = None,
+    force: Optional[bool] = False,
+    client_id: Optional[str] = None,
+    client_secret: Optional[str] = None,
+    base_url: Optional[str] = None,
+    scope: Optional[str] = None,
 ):
     """Authenticate with UiPath Cloud Platform.
 
+    The domain for authentication is determined by the UIPATH_URL environment variable if set.
+    Otherwise, it can be specified with --cloud (default), --staging, or --alpha flags.
+
     Interactive mode (default): Opens browser for OAuth authentication.
     Unattended mode: Use --client-id, --client-secret, --base-url and --scope for client credentials flow.
 
@@ -106,6 +110,17 @@ def auth(
     - Set REQUESTS_CA_BUNDLE to specify a custom CA bundle for SSL verification
     - Set UIPATH_DISABLE_SSL_VERIFY to disable SSL verification (not recommended)
     """
+    uipath_url = os.getenv("UIPATH_URL")
+    if uipath_url and domain == "cloud":  # "cloud" is the default
+        parsed_url = urlparse(uipath_url)
+        if parsed_url.scheme and parsed_url.netloc:
+            domain = f"{parsed_url.scheme}://{parsed_url.netloc}"
+        else:
+            console.error(
+                f"Malformed UIPATH_URL: '{uipath_url}'. Please ensure it includes both scheme and netloc (e.g., 'https://cloud.uipath.com')."
+            )
+            return
+
     # Check if client credentials are provided for unattended authentication
     if client_id and client_secret:
         if not base_url:

{uipath-2.1.24.dist-info → uipath-2.1.25.dist-info}/METADATA

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

@@ -5,8 +5,8 @@ uipath/_folder_context.py,sha256=UMMoU1VWEfYHAZW3Td2SIFYhw5dYsmaaKFhW_JEm6oc,192
 uipath/_uipath.py,sha256=ZfEcqpY7NRSm6rB2OPgyVXBl9DCnn750ikq8VzzTO_s,4146
 uipath/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uipath/_cli/README.md,sha256=GLtCfbeIKZKNnGTCsfSVqRQ27V1btT1i2bSAyW_xZl4,474
-uipath/_cli/__init__.py,sha256=oG0oTrb60qfIncJ0EcGsytBYxAVbepcBlOkqBKQlsJM,2104
-uipath/_cli/cli_auth.py,sha256=79LoffaBNT5LTCDAWn1Ft586mhBa3Zu5D2OmCOT0OJU,7004
+uipath/_cli/__init__.py,sha256=eMtRrLZO6DyNaDcbatrp0FvIQo6BuMWeTOgZm9kzkMo,2088
+uipath/_cli/cli_auth.py,sha256=-KgyI_IKWNWoEUFr4GxrQJF9qQHSYqTGvjNOj1mkxPc,7831
 uipath/_cli/cli_deploy.py,sha256=KPCmQ0c_NYD5JofSDao5r6QYxHshVCRxlWDVnQvlp5w,645
 uipath/_cli/cli_eval.py,sha256=INkfaZKadShtFOrVfTNM7K2kjXV-cwIqsOfIEYqDSGc,3656
 uipath/_cli/cli_init.py,sha256=jksza6bHfh4z1nKyEJBEEZlkO37yZoCz_FJWq_RPhWI,6093
@@ -20,13 +20,14 @@ uipath/_cli/cli_run.py,sha256=1W3cPMgaVzm1wTnTD4-tJQwJ5h4riKRUBQb1hzsGMcw,7767
 uipath/_cli/middlewares.py,sha256=CN-QqV69zZPI-hvizvEIb-zTcNh9WjsZIYCF3_nHSio,4915
 uipath/_cli/spinner.py,sha256=bS-U_HA5yne11ejUERu7CQoXmWdabUD2bm62EfEdV8M,1107
 uipath/_cli/_auth/_auth_server.py,sha256=Wx3TaK5QvGzaJytp2cnYO3NFVIvTsNqxfVMwBquEyQs,7162
-uipath/_cli/_auth/_client_credentials.py,sha256=eENVb54-uzEqi7bC5VNjsiULW4fSfs-sK0kgUjRKorA,5412
+uipath/_cli/_auth/_client_credentials.py,sha256=aC_xtEzWBQohRlxt85ZE8Ro0Pv9LmNltXECV8yjjO0U,5422
 uipath/_cli/_auth/_models.py,sha256=sYMCfvmprIqnZxStlD_Dxx2bcxgn0Ri4D7uwemwkcNg,948
-uipath/_cli/_auth/_oidc_utils.py,sha256=WaX9jDlXrlX6yD8i8gsocV8ngjaT72Xd1tvsZMmSbco,2127
-uipath/_cli/_auth/_portal_service.py,sha256=iAxEDEY7OcEbIUSKNZnURAuNsimNmU90NLHkkTLqREY,8079
+uipath/_cli/_auth/_oidc_utils.py,sha256=tsYuueJoAYgS9d_ly0b3RmQ4Yybhr4G7ZkAc6lf8Gck,2169
+uipath/_cli/_auth/_portal_service.py,sha256=-985pkS9N9lMelesAz4hJUzgWDyf4L4ie4sv3-iklGE,8128
+uipath/_cli/_auth/_url_utils.py,sha256=OmCGMukMfpMGtq3zoqqhD9WR5n0RlkXnH5BTFXOcbQ4,1307
 uipath/_cli/_auth/_utils.py,sha256=9nb76xe5XmDZ0TAncp-_1SKqL6FdwRi9eS3C2noN1lY,1591
 uipath/_cli/_auth/auth_config.json,sha256=UnAhdum8phjuZaZKE5KLp0IcPCbIltDEU1M_G8gVbos,443
-uipath/_cli/_auth/index.html,sha256=_Q2OtqPfapG_6vumbQYqtb2PfFe0smk7TlGERKEBvB4,22518
+uipath/_cli/_auth/index.html,sha256=uGK0CDTP8Rys_p4O_Pbd2x4tz0frKNVcumjrXnal5Nc,22814
 uipath/_cli/_auth/localhost.crt,sha256=oGl9oLLOiouHubAt39B4zEfylFvKEtbtr_43SIliXJc,1226
 uipath/_cli/_auth/localhost.key,sha256=X31VYXD8scZtmGA837dGX5l6G-LXHLo5ItWJhZXaz3c,1679
 uipath/_cli/_evals/evaluation_service.py,sha256=zqYRB-tZpTTFqMctjIpEli3joIlmrz3dCVZsxekxIps,22053
@@ -115,8 +116,8 @@ uipath/tracing/_traced.py,sha256=qeVDrds2OUnpdUIA0RhtF0kg2dlAZhyC1RRkI-qivTM,185
 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.24.dist-info/METADATA,sha256=fXeGzgEiKF_18KFXUd3hhF0yJzeUrdzopw0kw8o7IWA,6367
-uipath-2.1.24.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-uipath-2.1.24.dist-info/entry_points.txt,sha256=9C2_29U6Oq1ExFu7usihR-dnfIVNSKc-0EFbh0rskB4,43
-uipath-2.1.24.dist-info/licenses/LICENSE,sha256=-KBavWXepyDjimmzH5fVAsi-6jNVpIKFc2kZs0Ri4ng,1058
-uipath-2.1.24.dist-info/RECORD,,
+uipath-2.1.25.dist-info/METADATA,sha256=07yw-KMr0bRb2bR0C7iJrYPf3fi4qEhYyVUeezOackA,6367
+uipath-2.1.25.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+uipath-2.1.25.dist-info/entry_points.txt,sha256=9C2_29U6Oq1ExFu7usihR-dnfIVNSKc-0EFbh0rskB4,43
+uipath-2.1.25.dist-info/licenses/LICENSE,sha256=-KBavWXepyDjimmzH5fVAsi-6jNVpIKFc2kZs0Ri4ng,1058
+uipath-2.1.25.dist-info/RECORD,,