fix(platform): move ExternalApplicationService out of common to break identity↔common import cycle (#1787)

andreiancuta-uipath · web-flow · commit f5c00ccb1069 · 2026-07-03T13:37:02.000+03:00
diff --git a/packages/uipath-platform/pyproject.toml b/packages/uipath-platform/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "uipath-platform"
-version = "0.1.90"
+version = "0.1.91"
 description = "HTTP client library for programmatic access to UiPath Platform"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.11"
diff --git a/packages/uipath-platform/src/uipath/platform/_uipath.py b/packages/uipath-platform/src/uipath/platform/_uipath.py
@@ -12,7 +12,6 @@
 from .chat import ConversationsService, UiPathLlmChatService, UiPathOpenAIService
 from .common import (
     ApiClient,
-    ExternalApplicationService,
     UiPathApiConfig,
     UiPathExecutionContext,
 )
@@ -22,6 +21,7 @@
 from .documents import DocumentsService
 from .entities import EntitiesService
 from .errors import BaseUrlMissingError, SecretMissingError
+from .external_applications import ExternalApplicationService
 from .governance import GovernanceService
 from .guardrails import GuardrailsService
 from .memory import MemoryService
diff --git a/packages/uipath-platform/src/uipath/platform/common/__init__.py b/packages/uipath-platform/src/uipath/platform/common/__init__.py
@@ -17,7 +17,6 @@
 from ._config import UiPathApiConfig, UiPathConfig
 from ._endpoints_manager import EndpointManager
 from ._execution_context import ExecutionSourceContext, UiPathExecutionContext
-from ._external_application_service import ExternalApplicationService
 from ._folder_context import FolderContext, header_folder
 from ._http_config import get_ca_bundle_path, get_httpx_client_kwargs
 from ._models import Endpoint, RequestSpec
@@ -70,7 +69,6 @@
     "UiPathApiConfig",
     "UiPathExecutionContext",
     "ExecutionSourceContext",
-    "ExternalApplicationService",
     "FolderContext",
     "TokenData",
     "UiPathConfig",
diff --git a/packages/uipath-platform/src/uipath/platform/external_applications/__init__.py b/packages/uipath-platform/src/uipath/platform/external_applications/__init__.py
@@ -0,0 +1,5 @@
+"""UiPath External Applications."""
+
+from ._external_application_service import ExternalApplicationService
+
+__all__ = ["ExternalApplicationService"]
diff --git a/packages/uipath-platform/src/uipath/platform/external_applications/_external_application_service.py b/packages/uipath-platform/src/uipath/platform/external_applications/_external_application_service.py
@@ -1,3 +1,5 @@
+from collections.abc import Iterator
+from contextlib import contextmanager
 from os import environ as env
 from typing import Optional
 from urllib.parse import urlparse
@@ -7,9 +9,9 @@
 
 from uipath.platform.constants import ENV_BASE_URL
 
+from ..common.auth import TokenData
 from ..errors import EnrichedException
 from ..identity import IdentityService
-from .auth import TokenData
 
 
 class ExternalApplicationService:
@@ -72,6 +74,31 @@ def _extract_environment_from_base_url(self, base_url: str) -> str:
             # Default to cloud if parsing fails
             return "cloud"
 
+    @contextmanager
+    def _translate_auth_errors(self) -> Iterator[None]:
+        """Translate token acquisition failures into authentication errors."""
+        try:
+            yield
+        except HTTPStatusError as e:
+            match e.response.status_code:
+                case 400:
+                    message = "Invalid client credentials or request parameters."
+                case 401:
+                    message = "Unauthorized: Invalid client credentials."
+                case _:
+                    message = f"Authentication failed with unexpected status: {e.response.status_code}"
+            raise EnrichedException(
+                HTTPStatusError(
+                    message=message,
+                    request=e.request,
+                    response=e.response,
+                )
+            ) from e
+        except httpx.RequestError as e:
+            raise Exception(f"Network error during authentication: {e}") from e
+        except Exception as e:
+            raise Exception(f"Unexpected error during authentication: {e}") from e
+
     def get_token_data(
         self, client_id: str, client_secret: str, scope: Optional[str] = "OR.Execution"
     ) -> TokenData:
@@ -85,42 +112,12 @@ def get_token_data(
         Returns:
             Token data if successful
         """
-        try:
+        with self._translate_auth_errors():
             return self._identity_service.get_client_credentials_token(
                 client_id=client_id,
                 client_secret=client_secret,
                 scope=scope,
             )
-        except HTTPStatusError as e:
-            match e.response.status_code:
-                case 400:
-                    raise EnrichedException(
-                        HTTPStatusError(
-                            message="Invalid client credentials or request parameters.",
-                            request=e.request,
-                            response=e.response,
-                        )
-                    ) from e
-                case 401:
-                    raise EnrichedException(
-                        HTTPStatusError(
-                            message="Unauthorized: Invalid client credentials.",
-                            request=e.request,
-                            response=e.response,
-                        )
-                    ) from e
-                case _:
-                    raise EnrichedException(
-                        HTTPStatusError(
-                            message=f"Authentication failed with unexpected status: {e.response.status_code}",
-                            request=e.request,
-                            response=e.response,
-                        )
-                    ) from e
-        except httpx.RequestError as e:
-            raise Exception(f"Network error during authentication: {e}") from e
-        except Exception as e:
-            raise Exception(f"Unexpected error during authentication: {e}") from e
 
     async def get_token_data_async(
         self, client_id: str, client_secret: str, scope: Optional[str] = "OR.Execution"
@@ -135,39 +132,9 @@ async def get_token_data_async(
         Returns:
             Token data if successful
         """
-        try:
+        with self._translate_auth_errors():
             return await self._identity_service.get_client_credentials_token_async(
                 client_id=client_id,
                 client_secret=client_secret,
                 scope=scope,
             )
-        except HTTPStatusError as e:
-            match e.response.status_code:
-                case 400:
-                    raise EnrichedException(
-                        HTTPStatusError(
-                            message="Invalid client credentials or request parameters.",
-                            request=e.request,
-                            response=e.response,
-                        )
-                    ) from e
-                case 401:
-                    raise EnrichedException(
-                        HTTPStatusError(
-                            message="Unauthorized: Invalid client credentials.",
-                            request=e.request,
-                            response=e.response,
-                        )
-                    ) from e
-                case _:
-                    raise EnrichedException(
-                        HTTPStatusError(
-                            message=f"Authentication failed with unexpected status: {e.response.status_code}",
-                            request=e.request,
-                            response=e.response,
-                        )
-                    ) from e
-        except httpx.RequestError as e:
-            raise Exception(f"Network error during authentication: {e}") from e
-        except Exception as e:
-            raise Exception(f"Unexpected error during authentication: {e}") from e
diff --git a/packages/uipath-platform/tests/services/test_external_application_service.py b/packages/uipath-platform/tests/services/test_external_application_service.py
@@ -3,11 +3,9 @@
 import httpx
 import pytest
 
-from uipath.platform.common._external_application_service import (
-    ExternalApplicationService,
-)
 from uipath.platform.common.auth import TokenData
 from uipath.platform.errors import EnrichedException
+from uipath.platform.external_applications import ExternalApplicationService
 
 IDENTITY_SERVICE_SYNC = (
     "uipath.platform.identity.IdentityService.get_client_credentials_token"
diff --git a/packages/uipath-platform/uv.lock b/packages/uipath-platform/uv.lock
diff --git a/packages/uipath/pyproject.toml b/packages/uipath/pyproject.toml
@@ -1,13 +1,13 @@
 [project]
 name = "uipath"
-version = "2.12.6"
+version = "2.12.7"
 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.11"
 dependencies = [
   "uipath-core>=0.5.26, <0.6.0",
   "uipath-runtime>=0.11.7, <0.12.0",
-  "uipath-platform>=0.1.89, <0.2.0",
+  "uipath-platform>=0.1.91, <0.2.0",
   "click>=8.3.1",
   "httpx>=0.28.1",
   "pyjwt>=2.10.1",
diff --git a/packages/uipath/src/uipath/_cli/_auth/_auth_service.py b/packages/uipath/src/uipath/_cli/_auth/_auth_service.py
@@ -8,13 +8,14 @@
 from uipath._cli._auth._utils import get_parsed_token_data
 from uipath._cli._utils._console import ConsoleLogger
 from uipath._utils._auth import update_env_file
-from uipath.platform.common import ExternalApplicationService, TokenData
+from uipath.platform.common import TokenData
 from uipath.platform.constants import (
     ENV_BASE_URL,
     ENV_ORGANIZATION_ID,
     ENV_TENANT_ID,
     ENV_UIPATH_ACCESS_TOKEN,
 )
+from uipath.platform.external_applications import ExternalApplicationService
 
 from ._utils import update_auth_file
 
diff --git a/packages/uipath/uv.lock b/packages/uipath/uv.lock
