Remove the 'UUIDLike' type alias (#1258)

This is not strictly necessary and importantly it isn't interpreted as
we'd like by Sphinx, so users are seeing the `UUIDLike` name in our
docs instead of the union.


<!-- readthedocs-preview globus-sdk-python start -->
----
📚 Documentation preview 📚:
https://globus-sdk-python--1258.org.readthedocs.build/en/1258/

<!-- readthedocs-preview globus-sdk-python end -->

Author: sirosen

src/globus_sdk/_guards.py

@@ -4,8 +4,6 @@
 import typing as t
 import uuid
 
-from globus_sdk._types import UUIDLike
-
 # some error types use guards, so import from the specific module to avoid circularity
 from globus_sdk.exc.base import ValidationError
 
@@ -94,7 +92,7 @@ def instance_or_dict(name: str, value: t.Any, cls: type[S]) -> S:
         )
 
     @staticmethod
-    def uuidlike(name: str, s: t.Any) -> UUIDLike:
+    def uuidlike(name: str, s: t.Any) -> uuid.UUID | str:
         """
         Raise an error if the input is not a UUID
 
@@ -108,7 +106,7 @@ def uuidlike(name: str, s: t.Any) -> UUIDLike:
 
         .. code-block:: python
 
-            def frob_it(collection_id: UUIDLike) -> Frob:
+            def frob_it(collection_id: uuid.UUID | str) -> Frob:
                 validators.uuidlike(collection_id, name="collection_id")
                 return Frob(collection_id)
 

src/globus_sdk/_types.py

@@ -2,15 +2,13 @@
 
 import datetime
 import typing as t
-import uuid
 
 if t.TYPE_CHECKING:
     from globus_sdk.scopes import MutableScope, Scope
 
 
 # these types are aliases meant for internal use
 IntLike = t.Union[int, str]
-UUIDLike = t.Union[uuid.UUID, str]
 DateLike = t.Union[str, datetime.datetime]
 
 ScopeCollectionType = t.Union[

src/globus_sdk/globus_app/app.py

@@ -4,6 +4,7 @@
 import contextlib
 import copy
 import typing as t
+import uuid
 
 from globus_sdk import (
     AuthClient,
@@ -12,7 +13,7 @@
     IDTokenDecoder,
     Scope,
 )
-from globus_sdk._types import ScopeCollectionType, UUIDLike
+from globus_sdk._types import ScopeCollectionType
 from globus_sdk.authorizers import GlobusAuthorizer
 from globus_sdk.gare import GlobusAuthorizationParameters
 from globus_sdk.scopes import AuthScopes, scopes_to_scope_list
@@ -65,7 +66,7 @@ def __init__(
         app_name: str = "Unnamed Globus App",
         *,
         login_client: AuthLoginClient | None = None,
-        client_id: UUIDLike | None = None,
+        client_id: uuid.UUID | str | None = None,
         client_secret: str | None = None,
         scope_requirements: t.Mapping[str, ScopeCollectionType] | None = None,
         config: GlobusAppConfig = DEFAULT_CONFIG,
@@ -135,9 +136,9 @@ def _resolve_client_info(
         app_name: str,
         config: GlobusAppConfig,
         login_client: AuthLoginClient | None,
-        client_id: UUIDLike | None,
+        client_id: uuid.UUID | str | None,
         client_secret: str | None,
-    ) -> tuple[UUIDLike, AuthLoginClient]:
+    ) -> tuple[uuid.UUID | str, AuthLoginClient]:
         """
         Extracts a client_id and login_client from GlobusApp initialization parameters,
         validating that the parameters were provided correctly.
@@ -188,7 +189,7 @@ def _initialize_login_client(
         self,
         app_name: str,
         config: GlobusAppConfig,
-        client_id: UUIDLike,
+        client_id: uuid.UUID | str,
         client_secret: str | None,
     ) -> AuthLoginClient:
         """
@@ -216,7 +217,7 @@ def _initialize_validating_token_storage(
         return validating_token_storage
 
     def _resolve_token_storage(
-        self, app_name: str, client_id: UUIDLike, config: GlobusAppConfig
+        self, app_name: str, client_id: uuid.UUID | str, config: GlobusAppConfig
     ) -> TokenStorage:
         """
         Resolve the raw token storage to be used by the app.

src/globus_sdk/globus_app/client_app.py

@@ -1,7 +1,9 @@
 from __future__ import annotations
 
+import uuid
+
 from globus_sdk import AuthLoginClient, ConfidentialAppAuthClient, GlobusSDKUsageError
-from globus_sdk._types import ScopeCollectionType, UUIDLike
+from globus_sdk._types import ScopeCollectionType
 from globus_sdk.gare import GlobusAuthorizationParameters
 
 from .app import GlobusApp
@@ -55,7 +57,7 @@ def __init__(
         app_name: str = "Unnamed Globus App",
         *,
         login_client: ConfidentialAppAuthClient | None = None,
-        client_id: UUIDLike | None = None,
+        client_id: uuid.UUID | str | None = None,
         client_secret: str | None = None,
         scope_requirements: dict[str, ScopeCollectionType] | None = None,
         config: GlobusAppConfig = DEFAULT_CONFIG,
@@ -81,7 +83,7 @@ def _initialize_login_client(
         self,
         app_name: str,
         config: GlobusAppConfig,
-        client_id: UUIDLike,
+        client_id: uuid.UUID | str,
         client_secret: str | None,
     ) -> AuthLoginClient:
         if not client_secret:

src/globus_sdk/globus_app/protocols.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
 import typing as t
+import uuid
 
 if t.TYPE_CHECKING:
     from globus_sdk import AuthLoginClient, IDTokenDecoder
-    from globus_sdk._types import UUIDLike
     from globus_sdk.login_flows import LoginFlowManager
     from globus_sdk.tokenstorage import TokenStorage, TokenValidationError
 
@@ -26,7 +26,7 @@ def for_globus_app(
         *,
         app_name: str,
         config: GlobusAppConfig,
-        client_id: UUIDLike,
+        client_id: uuid.UUID | str,
         namespace: str,
     ) -> TokenStorage:
         """

src/globus_sdk/globus_app/user_app.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import typing as t
+import uuid
 
 from globus_sdk import (
     AuthClient,
@@ -10,7 +11,7 @@
     NativeAppAuthClient,
     Scope,
 )
-from globus_sdk._types import ScopeCollectionType, UUIDLike
+from globus_sdk._types import ScopeCollectionType
 from globus_sdk.gare import GlobusAuthorizationParameters
 from globus_sdk.login_flows import CommandLineLoginFlowManager, LoginFlowManager
 from globus_sdk.tokenstorage import (
@@ -78,7 +79,7 @@ def __init__(
         app_name: str = "Unnamed Globus App",
         *,
         login_client: AuthLoginClient | None = None,
-        client_id: UUIDLike | None = None,
+        client_id: uuid.UUID | str | None = None,
         client_secret: str | None = None,
         scope_requirements: t.Mapping[str, ScopeCollectionType] | None = None,
         config: GlobusAppConfig = DEFAULT_CONFIG,
@@ -127,7 +128,7 @@ def _initialize_login_client(
         self,
         app_name: str,
         config: GlobusAppConfig,
-        client_id: UUIDLike,
+        client_id: uuid.UUID | str,
         client_secret: str | None,
     ) -> AuthLoginClient:
         if client_secret:

src/globus_sdk/scopes/consents/_model.py

@@ -27,11 +27,10 @@
 
 import textwrap
 import typing as t
+import uuid
 from dataclasses import dataclass
 from datetime import datetime
 
-from globus_sdk._types import UUIDLike
-
 from ..representation import Scope
 from ._errors import ConsentParseError, ConsentTreeConstructionError
 
@@ -49,11 +48,11 @@ class Consent:
             operations (consents) defined in the "dependency_path".
     """
 
-    client: UUIDLike
-    scope: UUIDLike
+    client: uuid.UUID | str
+    scope: uuid.UUID | str
     scope_name: str
     id: int
-    effective_identity: UUIDLike
+    effective_identity: uuid.UUID | str
     # A list representing the path of consent dependencies leading from a "root consent"
     #   to this. The last element of this list will always be this consent's ID.
     # Downstream dependency relationships may exist but will not be defined here.

src/globus_sdk/scopes/data/flows.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
 import typing as t
-
-from globus_sdk._types import UUIDLike
+import uuid
 
 from ..builder import ScopeBuilder, ScopeBuilderScopes
 
@@ -105,7 +104,7 @@ class SpecificFlowScopeBuilder(ScopeBuilder):
 
     _CLASS_STUB = _SpecificFlowScopesClassStub()
 
-    def __init__(self, flow_id: UUIDLike) -> None:
+    def __init__(self, flow_id: uuid.UUID | str) -> None:
         self._flow_id = flow_id
         str_flow_id = str(flow_id)
         super().__init__(

src/globus_sdk/services/auth/client/base_login_client.py

@@ -2,11 +2,11 @@
 
 import logging
 import typing as t
+import uuid
 
 from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicKey
 
 from globus_sdk import _guards, client, exc, utils
-from globus_sdk._types import UUIDLike
 from globus_sdk.authorizers import GlobusAuthorizer, NullAuthorizer
 from globus_sdk.response import GlobusHTTPResponse
 from globus_sdk.scopes import AuthScopes, Scope
@@ -45,7 +45,7 @@ class AuthLoginClient(client.BaseClient):
 
     def __init__(
         self,
-        client_id: UUIDLike | None = None,
+        client_id: uuid.UUID | str | None = None,
         environment: str | None = None,
         base_url: str | None = None,
         authorizer: GlobusAuthorizer | None = None,
@@ -141,9 +141,13 @@ def get_jwk(
     def oauth2_get_authorize_url(
         self,
         *,
-        session_required_identities: UUIDLike | t.Iterable[UUIDLike] | None = None,
+        session_required_identities: (
+            uuid.UUID | str | t.Iterable[uuid.UUID | str] | None
+        ) = None,
         session_required_single_domain: str | t.Iterable[str] | None = None,
-        session_required_policies: UUIDLike | t.Iterable[UUIDLike] | None = None,
+        session_required_policies: (
+            uuid.UUID | str | t.Iterable[uuid.UUID | str] | None
+        ) = None,
         session_required_mfa: bool | None = None,
         session_message: str | None = None,
         prompt: t.Literal["login"] | None = None,

src/globus_sdk/services/auth/client/confidential_client.py

@@ -2,9 +2,10 @@
 
 import logging
 import typing as t
+import uuid
 
 from globus_sdk import exc, utils
-from globus_sdk._types import ScopeCollectionType, UUIDLike
+from globus_sdk._types import ScopeCollectionType
 from globus_sdk.authorizers import BasicAuthorizer
 from globus_sdk.response import GlobusHTTPResponse
 
@@ -44,7 +45,7 @@ class ConfidentialAppAuthClient(AuthLoginClient):
 
     def __init__(
         self,
-        client_id: UUIDLike,
+        client_id: uuid.UUID | str,
         client_secret: str,
         environment: str | None = None,
         base_url: str | None = None,
@@ -64,7 +65,7 @@ def get_identities(
         self,
         *,
         usernames: t.Iterable[str] | str | None = None,
-        ids: t.Iterable[UUIDLike] | UUIDLike | None = None,
+        ids: t.Iterable[uuid.UUID | str] | uuid.UUID | str | None = None,
         provision: bool = False,
         query_params: dict[str, t.Any] | None = None,
     ) -> GetIdentitiesResponse:
@@ -344,8 +345,8 @@ def create_child_client(
         redirect_uris: t.Iterable[str] | utils.MissingType = utils.MISSING,
         terms_and_conditions: str | utils.MissingType = utils.MISSING,
         privacy_policy: str | utils.MissingType = utils.MISSING,
-        required_idp: UUIDLike | utils.MissingType = utils.MISSING,
-        preselect_idp: UUIDLike | utils.MissingType = utils.MISSING,
+        required_idp: uuid.UUID | str | utils.MissingType = utils.MISSING,
+        preselect_idp: uuid.UUID | str | utils.MissingType = utils.MISSING,
         additional_fields: dict[str, t.Any] | utils.MissingType = utils.MISSING,
     ) -> GlobusHTTPResponse:
         """