datacosmos 0.0.14__tar.gz → 0.0.16__tar.gz

{datacosmos-0.0.14 → datacosmos-0.0.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datacosmos
-Version: 0.0.14
+Version: 0.0.16
 Summary: A library for interacting with DataCosmos from Python code
 Author-email: Open Cosmos <support@open-cosmos.com>
 Classifier: Programming Language :: Python :: 3
@@ -15,6 +15,7 @@ Requires-Dist: pydantic>=2
 Requires-Dist: pystac==1.12.1
 Requires-Dist: pyyaml==6.0.2
 Requires-Dist: structlog==24.4.0
+Requires-Dist: tenacity>=8.2.3
 Provides-Extra: dev
 Requires-Dist: black==22.3.0; extra == "dev"
 Requires-Dist: ruff==0.9.5; extra == "dev"

datacosmos-0.0.16/datacosmos/auth/base_authenticator.py

@@ -0,0 +1,62 @@
+"""Base authenticator class for DatacosmosClient."""
+from __future__ import annotations
+
+from abc import ABC, abstractmethod
+from datetime import datetime
+from typing import TYPE_CHECKING, Optional
+
+if TYPE_CHECKING:
+    import requests
+
+    from datacosmos.config.config import Config
+
+
+class AuthResult:
+    """Authentication result object."""
+
+    def __init__(
+        self,
+        http_client: requests.Session,
+        token: Optional[str] = None,
+        token_expiry: Optional[datetime] = None,
+    ):
+        """Initializes an AuthResult object.
+
+        Args:
+            http_client (requests.Session): The HTTP client/session to use for requests.
+            token (Optional[str], optional): The authentication token, if available.
+            token_expiry (Optional[datetime], optional): The expiry time of the token, if available.
+        """
+        self.http_client = http_client
+        self.token = token
+        self.token_expiry = token_expiry
+
+
+class BaseAuthenticator(ABC):
+    """Abstract base class for all authenticators."""
+
+    def __init__(self, config: Config):
+        """Initializes the BaseAuthenticator with the given configuration.
+
+        Args:
+            config (Config): The configuration object containing authentication settings.
+        """
+        self.config = config
+
+    @abstractmethod
+    def authenticate_and_build_session(self) -> AuthResult:
+        """Authenticates and builds a requests.Session object.
+
+        Returns:
+            AuthResult: An object containing the authenticated session, token, and token expiry.
+        """
+        ...
+
+    @abstractmethod
+    def refresh_token(self) -> AuthResult:
+        """Refreshes the authentication token.
+
+        Returns:
+            AuthResult: An object with the new token and expiry.
+        """
+        ...

datacosmos-0.0.16/datacosmos/auth/local_authenticator.py

@@ -0,0 +1,72 @@
+"""Local (interactive/cached) authenticator for DatacosmosClient."""
+from datetime import datetime, timezone
+from pathlib import Path
+from typing import Any
+
+import requests
+
+from datacosmos.auth.base_authenticator import AuthResult, BaseAuthenticator
+from datacosmos.auth.local_token_fetcher import LocalTokenFetcher
+from datacosmos.exceptions.datacosmos_exception import DatacosmosException
+
+
+class LocalAuthenticator(BaseAuthenticator):
+    """Handles authentication via the interactive local login flow."""
+
+    def __init__(self, config: Any):
+        """Initializes a LocalAuthenticator instance.
+
+        Args:
+            config (Any): Configuration object containing authentication settings.
+        """
+        super().__init__(config)
+        self._local_token_fetcher = self._init_fetcher()
+
+    def _init_fetcher(self) -> LocalTokenFetcher:
+        """Initializes the LocalTokenFetcher."""
+        auth = self.config.authentication
+        try:
+            return LocalTokenFetcher(
+                client_id=auth.client_id,
+                authorization_endpoint=auth.authorization_endpoint,
+                token_endpoint=auth.token_endpoint,
+                redirect_port=int(auth.redirect_port),
+                audience=auth.audience,
+                scopes=auth.scopes,
+                token_file=Path(auth.cache_file).expanduser(),
+            )
+        except Exception as e:
+            raise DatacosmosException(
+                f"Failed to initialize LocalTokenFetcher: {e}"
+            ) from e
+
+    def authenticate_and_build_session(self) -> AuthResult:
+        """Builds an authenticated session using the local token fetcher."""
+        try:
+            tok = self._local_token_fetcher.get_token()
+            token = tok.access_token
+            token_expiry = datetime.fromtimestamp(tok.expires_at, tz=timezone.utc)
+            http_client = requests.Session()
+            http_client.headers.update({"Authorization": f"Bearer {token}"})
+            return AuthResult(
+                http_client=http_client, token=token, token_expiry=token_expiry
+            )
+        except Exception as e:
+            raise DatacosmosException(f"Local authentication failed: {e}") from e
+
+    def refresh_token(self) -> AuthResult:
+        """Refreshes the local token non-interactively."""
+        try:
+            tok = self._local_token_fetcher.get_token()
+            token = tok.access_token
+            token_expiry = datetime.fromtimestamp(tok.expires_at, tz=timezone.utc)
+
+            # Create a new session with the new token
+            http_client = requests.Session()
+            http_client.headers.update({"Authorization": f"Bearer {token}"})
+
+            return AuthResult(
+                http_client=http_client, token=token, token_expiry=token_expiry
+            )
+        except Exception as e:
+            raise DatacosmosException(f"Local token refresh failed: {e}") from e

datacosmos-0.0.16/datacosmos/auth/m2m_authenticator.py

@@ -0,0 +1,63 @@
+"""M2M (Machine-to-Machine) authenticator for DatacosmosClient."""
+from datetime import datetime, timedelta, timezone
+
+import requests
+from oauthlib.oauth2 import BackendApplicationClient
+from requests.exceptions import ConnectionError, HTTPError, RequestException, Timeout
+from requests_oauthlib import OAuth2Session
+from tenacity import (
+    retry,
+    retry_if_exception_type,
+    stop_after_attempt,
+    wait_exponential,
+)
+
+from datacosmos.auth.base_authenticator import AuthResult, BaseAuthenticator
+from datacosmos.exceptions.datacosmos_exception import DatacosmosException
+
+
+class M2MAuthenticator(BaseAuthenticator):
+    """Handles authentication using the Client Credentials (M2M) flow."""
+
+    @retry(
+        stop=stop_after_attempt(3),
+        wait=wait_exponential(multiplier=1, min=2, max=10),
+        retry=retry_if_exception_type((ConnectionError, Timeout)),
+    )
+    def authenticate_and_build_session(self) -> AuthResult:
+        """Builds an authenticated session using the M2M flow."""
+        auth = self.config.authentication
+        try:
+            client = BackendApplicationClient(client_id=auth.client_id)
+            oauth_session = OAuth2Session(client=client)
+            token_response = oauth_session.fetch_token(
+                token_url=auth.token_url,
+                client_id=auth.client_id,
+                client_secret=auth.client_secret,
+                audience=auth.audience,
+            )
+            token = token_response["access_token"]
+            expires_at = token_response.get("expires_at")
+            if isinstance(expires_at, (int, float)):
+                token_expiry = datetime.fromtimestamp(expires_at, tz=timezone.utc)
+            else:
+                expires_in = int(token_response.get("expires_in", 3600))
+                token_expiry = datetime.now(timezone.utc) + timedelta(
+                    seconds=expires_in
+                )
+
+            http_client = requests.Session()
+            http_client.headers.update({"Authorization": f"Bearer {token}"})
+            return AuthResult(
+                http_client=http_client, token=token, token_expiry=token_expiry
+            )
+        except (HTTPError, ConnectionError, Timeout) as e:
+            raise DatacosmosException(f"M2M authentication failed: {e}") from e
+        except RequestException as e:
+            raise DatacosmosException(
+                f"Unexpected request failure during M2M authentication: {e}"
+            ) from e
+
+    def refresh_token(self) -> AuthResult:
+        """Refreshes the M2M token by re-running the authentication flow."""
+        return self.authenticate_and_build_session()

{datacosmos-0.0.14 → datacosmos-0.0.16}/datacosmos/datacosmos_client.py

@@ -1,15 +1,23 @@
 """Client to interact with the Datacosmos API with authentication and request handling."""
+from __future__ import annotations
 
 import threading
 from datetime import datetime, timedelta, timezone
-from pathlib import Path
 from typing import Any, Optional
 
 import requests
-from oauthlib.oauth2 import BackendApplicationClient
 from requests.exceptions import ConnectionError, HTTPError, RequestException, Timeout
 from requests_oauthlib import OAuth2Session
-
+from tenacity import (
+    retry,
+    retry_if_exception_type,
+    stop_after_attempt,
+    wait_exponential,
+)
+
+from datacosmos.auth.base_authenticator import BaseAuthenticator
+from datacosmos.auth.local_authenticator import LocalAuthenticator
+from datacosmos.auth.m2m_authenticator import M2MAuthenticator
 from datacosmos.config.config import Config
 from datacosmos.exceptions.datacosmos_exception import DatacosmosException
 
@@ -34,6 +42,7 @@ class DatacosmosClient:
         self.token: Optional[str] = None
         self.token_expiry: Optional[datetime] = None
         self._refresh_lock = threading.Lock()
+        self._authenticator: Optional[BaseAuthenticator] = None
 
         if http_session is not None:
             self._init_with_injected_session(http_session)
@@ -101,79 +110,26 @@ class DatacosmosClient:
             try:
                 return datetime.now(timezone.utc) + timedelta(seconds=int(expires_in))
             except (TypeError, ValueError):
-                # Unknown/invalid expiry -> mark as unknown so refresh logic kicks in
                 return None
         return None
 
-    # --------------------------- auth/session ---------------------------
+    # --------------------------- auth/session (refactored) ---------------------------
 
     def _authenticate_and_initialize_client(self) -> requests.Session:
-        auth = self.config.authentication
-        auth_type = getattr(auth, "type", "m2m")
+        auth_type = getattr(self.config.authentication, "type", "m2m")
         if auth_type == "m2m":
-            return self.__build_m2m_session()
-        if auth_type == "local":
-            return self.__build_local_session()
-        raise DatacosmosException(f"Unsupported authentication type: {auth_type}")
-
-    def __build_m2m_session(self) -> requests.Session:
-        """Client Credentials (M2M) flow using requests-oauthlib."""
-        auth = self.config.authentication
-        try:
-            client = BackendApplicationClient(client_id=auth.client_id)
-            oauth_session = OAuth2Session(client=client)
-            token_response = oauth_session.fetch_token(
-                token_url=auth.token_url,
-                client_id=auth.client_id,
-                client_secret=auth.client_secret,
-                audience=auth.audience,
-            )
-            self.token = token_response["access_token"]
-            expires_at = token_response.get("expires_at")
-            if isinstance(expires_at, (int, float)):
-                self.token_expiry = datetime.fromtimestamp(expires_at, tz=timezone.utc)
-            else:
-                self.token_expiry = datetime.now(timezone.utc) + timedelta(
-                    seconds=int(token_response.get("expires_in", 3600))
-                )
-            http_client = requests.Session()
-            http_client.headers.update({"Authorization": f"Bearer {self.token}"})
-            return http_client
-        except (HTTPError, ConnectionError, Timeout) as e:
-            raise DatacosmosException(f"Authentication failed: {e}") from e
-        except RequestException as e:
-            raise DatacosmosException(
-                f"Unexpected request failure during authentication: {e}"
-            ) from e
-
-    def __build_local_session(self) -> requests.Session:
-        """Interactive local login via LocalTokenFetcher (cached + refresh)."""
-        auth = self.config.authentication
-        try:
-            from datacosmos.auth.local_token_fetcher import LocalTokenFetcher
-
-            fetcher = LocalTokenFetcher(
-                client_id=auth.client_id,
-                authorization_endpoint=auth.authorization_endpoint,
-                token_endpoint=auth.token_endpoint,
-                redirect_port=int(auth.redirect_port),
-                audience=auth.audience,
-                scopes=auth.scopes,
-                token_file=Path(auth.cache_file).expanduser(),
-            )
-            tok = fetcher.get_token()
-        except Exception as e:
-            raise DatacosmosException(f"Local authentication failed: {e}") from e
+            self._authenticator = M2MAuthenticator(self.config)
+        elif auth_type == "local":
+            self._authenticator = LocalAuthenticator(self.config)
+        else:
+            raise DatacosmosException(f"Unsupported authentication type: {auth_type}")
 
-        self.token = tok.access_token
-        self.token_expiry = datetime.fromtimestamp(tok.expires_at, tz=timezone.utc)
+        auth_result = self._authenticator.authenticate_and_build_session()
+        self.token = auth_result.token
+        self.token_expiry = auth_result.token_expiry
+        return auth_result.http_client
 
-        http_client = requests.Session()
-        http_client.headers.update({"Authorization": f"Bearer {self.token}"})
-        self._local_token_fetcher = fetcher
-        return http_client
-
-    # --------------------------- refresh logic ---------------------------
+    # --------------------------- refresh logic (refactored) ---------------------------
 
     def _needs_refresh(self) -> bool:
         if not getattr(self, "_owns_session", False):
@@ -185,29 +141,22 @@ class DatacosmosClient:
         )
 
     def _refresh_now(self) -> None:
-        """Force refresh.
-
-        In case of local auth it uses LocalTokenFetcher (non-interactive refresh/cached token).
-        In case of m2m auth it re-runs client-credentials flow.
-        """
+        """Force refresh using the delegated authenticator."""
         with self._refresh_lock:
             if not self._needs_refresh():
                 return
 
-            auth_type = getattr(self.config.authentication, "type", "m2m")
-            if auth_type == "local" and hasattr(self, "_local_token_fetcher"):
-                tok = self._local_token_fetcher.get_token()
-                self.token = tok.access_token
-                self.token_expiry = datetime.fromtimestamp(
-                    tok.expires_at, tz=timezone.utc
-                )
+            if self._authenticator:
+                auth_result = self._authenticator.refresh_token()
+                self.token = auth_result.token
+                self.token_expiry = auth_result.token_expiry
                 self._http_client.headers.update(
                     {"Authorization": f"Bearer {self.token}"}
                 )
-                return
-
-            # default/m2m:
-            self._http_client = self.__build_m2m_session()
+            else:
+                raise DatacosmosException(
+                    "Cannot refresh token, no authenticator initialized."
+                )
 
     def _refresh_token_if_needed(self) -> None:
         if self._needs_refresh():
@@ -215,10 +164,15 @@ class DatacosmosClient:
 
     # --------------------------- request API ---------------------------
 
+    @retry(
+        stop=stop_after_attempt(5),
+        wait=wait_exponential(multiplier=1, min=2, max=20),
+        retry=retry_if_exception_type((ConnectionError, Timeout)),
+    )
     def request(
         self, method: str, url: str, *args: Any, **kwargs: Any
     ) -> requests.Response:
-        """Send an HTTP request using the authenticated session (with auto-refresh)."""
+        """Send an HTTP request using the authenticated session (with auto-refresh and retries)."""
         self._refresh_token_if_needed()
         try:
             response = self._http_client.request(method, url, *args, **kwargs)
@@ -227,7 +181,6 @@ class DatacosmosClient:
         except HTTPError as e:
             status = getattr(e.response, "status_code", None)
             if status in (401, 403) and getattr(self, "_owns_session", False):
-                # token likely expired/invalid — refresh once and retry
                 self._refresh_now()
                 retry_response = self._http_client.request(method, url, *args, **kwargs)
                 try:
@@ -242,14 +195,6 @@ class DatacosmosClient:
                 f"HTTP error during {method.upper()} request to {url}",
                 response=getattr(e, "response", None),
             ) from e
-        except ConnectionError as e:
-            raise DatacosmosException(
-                f"Connection error during {method.upper()} request to {url}: {e}"
-            ) from e
-        except Timeout as e:
-            raise DatacosmosException(
-                f"Request timeout during {method.upper()} request to {url}: {e}"
-            ) from e
         except RequestException as e:
             raise DatacosmosException(
                 f"Unexpected request failure during {method.upper()} request to {url}: {e}"

{datacosmos-0.0.14 → datacosmos-0.0.16}/datacosmos.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datacosmos
-Version: 0.0.14
+Version: 0.0.16
 Summary: A library for interacting with DataCosmos from Python code
 Author-email: Open Cosmos <support@open-cosmos.com>
 Classifier: Programming Language :: Python :: 3
@@ -15,6 +15,7 @@ Requires-Dist: pydantic>=2
 Requires-Dist: pystac==1.12.1
 Requires-Dist: pyyaml==6.0.2
 Requires-Dist: structlog==24.4.0
+Requires-Dist: tenacity>=8.2.3
 Provides-Extra: dev
 Requires-Dist: black==22.3.0; extra == "dev"
 Requires-Dist: ruff==0.9.5; extra == "dev"

{datacosmos-0.0.14 → datacosmos-0.0.16}/datacosmos.egg-info/SOURCES.txt

@@ -9,7 +9,10 @@ datacosmos.egg-info/dependency_links.txt
 datacosmos.egg-info/requires.txt
 datacosmos.egg-info/top_level.txt
 datacosmos/auth/__init__.py
+datacosmos/auth/base_authenticator.py
+datacosmos/auth/local_authenticator.py
 datacosmos/auth/local_token_fetcher.py
+datacosmos/auth/m2m_authenticator.py
 datacosmos/auth/token.py
 datacosmos/config/__init__.py
 datacosmos/config/config.py

{datacosmos-0.0.14 → datacosmos-0.0.16}/datacosmos.egg-info/requires.txt

@@ -6,6 +6,7 @@ pydantic>=2
 pystac==1.12.1
 pyyaml==6.0.2
 structlog==24.4.0
+tenacity>=8.2.3
 
 [dev]
 black==22.3.0

{datacosmos-0.0.14 → datacosmos-0.0.16}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "datacosmos"
-version = "0.0.14"
+version = "0.0.16"
 authors = [
     { name="Open Cosmos", email="support@open-cosmos.com" },
 ]
@@ -22,7 +22,8 @@ dependencies = [
     "pydantic>=2",
     "pystac==1.12.1",
     "pyyaml==6.0.2",
-    "structlog==24.4.0"
+    "structlog==24.4.0",
+    "tenacity>=8.2.3"
 ]
 
 [project.optional-dependencies]
@@ -51,4 +52,4 @@ multi_line_output = 3
 include_trailing_comma = true
 force_grid_wrap = 0
 use_parentheses = true
-line_length = 88
+line_length = 88