datacosmos 0.0.20__tar.gz → 0.0.21__tar.gz

{datacosmos-0.0.20 → datacosmos-0.0.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datacosmos
-Version: 0.0.20
+Version: 0.0.21
 Summary: A library for interacting with DataCosmos from Python code
 Author-email: Open Cosmos <support@open-cosmos.com>
 Classifier: Programming Language :: Python :: 3

{datacosmos-0.0.20 → datacosmos-0.0.21}/datacosmos/config/auth/factory.py

@@ -5,11 +5,6 @@ This module normalizes the `authentication` config into a concrete model:
 - `apply_auth_defaults` fills sensible defaults per auth type without inventing secrets.
 - `check_required_auth_fields` enforces the minimum required inputs.
 - `normalize_authentication` runs the whole pipeline.
-
-Design notes:
-- Auth models accept partial data (fields are Optional with None defaults).
-- We DO NOT pass `None` explicitly when constructing models here.
-- Required-ness is enforced centrally by `check_required_auth_fields`, not by model init.
 """
 
 from typing import Optional, Union, cast
@@ -33,49 +28,45 @@ AuthModel = Union[M2MAuthenticationConfig, LocalUserAccountAuthenticationConfig]
 
 
 def parse_auth_config(raw: dict | AuthModel | None) -> Optional[AuthModel]:
-    """Turn a raw dict (e.g., from YAML) into a concrete auth model.
-
-    - If `raw` is already an auth model (M2M or local), return it unchanged.
-    - If `raw` is a dict, choose/validate the type using `raw['type']`
-      (or DEFAULT_AUTH_TYPE), then construct the corresponding model.
-      For missing fields we *may* apply non-secret defaults (endpoints, etc.).
-    """
-    if raw is None or isinstance(
-        raw, (M2MAuthenticationConfig, LocalUserAccountAuthenticationConfig)
-    ):
+    """Turn a raw dict (e.g., from YAML/env) into a concrete auth model."""
+    if isinstance(raw, (M2MAuthenticationConfig, LocalUserAccountAuthenticationConfig)):
         return cast(Optional[AuthModel], raw)
 
-    auth_type = _normalize_auth_type(raw.get("type") or DEFAULT_AUTH_TYPE)
+    if raw is None:
+        raw_data = {}
+    else:
+        raw_data = raw.copy()
+
+    if raw is None and not raw_data:
+        return None
+
+    auth_type = _normalize_auth_type(raw_data.get("type") or DEFAULT_AUTH_TYPE)
 
     if auth_type == "local":
         return LocalUserAccountAuthenticationConfig(
             type="local",
-            client_id=raw.get("client_id"),
-            authorization_endpoint=raw.get(
+            client_id=raw_data.get("client_id"),
+            authorization_endpoint=raw_data.get(
                 "authorization_endpoint", DEFAULT_LOCAL_AUTHORIZATION_ENDPOINT
             ),
-            token_endpoint=raw.get("token_endpoint", DEFAULT_LOCAL_TOKEN_ENDPOINT),
-            redirect_port=raw.get("redirect_port", DEFAULT_LOCAL_REDIRECT_PORT),
-            scopes=raw.get("scopes", DEFAULT_LOCAL_SCOPES),
-            audience=raw.get("audience", DEFAULT_AUTH_AUDIENCE),
-            cache_file=raw.get("cache_file", DEFAULT_LOCAL_CACHE_FILE),
+            token_endpoint=raw_data.get("token_endpoint", DEFAULT_LOCAL_TOKEN_ENDPOINT),
+            redirect_port=raw_data.get("redirect_port", DEFAULT_LOCAL_REDIRECT_PORT),
+            scopes=raw_data.get("scopes", DEFAULT_LOCAL_SCOPES),
+            audience=raw_data.get("audience", DEFAULT_AUTH_AUDIENCE),
+            cache_file=raw_data.get("cache_file", DEFAULT_LOCAL_CACHE_FILE),
         )
 
     return M2MAuthenticationConfig(
         type="m2m",
-        token_url=raw.get("token_url", DEFAULT_AUTH_TOKEN_URL),
-        audience=raw.get("audience", DEFAULT_AUTH_AUDIENCE),
-        client_id=raw.get("client_id"),
-        client_secret=raw.get("client_secret"),
+        token_url=raw_data.get("token_url", DEFAULT_AUTH_TOKEN_URL),
+        audience=raw_data.get("audience", DEFAULT_AUTH_AUDIENCE),
+        client_id=raw_data.get("client_id"),
+        client_secret=raw_data.get("client_secret"),
     )
 
 
 def apply_auth_defaults(auth: AuthModel | None) -> AuthModel:
-    """Fill in any missing defaults by type (non-secret values only).
-
-    If `auth` is None, construct a default "shell" based on DEFAULT_AUTH_TYPE,
-    without passing None for unknown credentials.
-    """
+    """Fill in any missing defaults by type (non-secret values only)."""
     if auth is None:
         default_type = _normalize_auth_type(DEFAULT_AUTH_TYPE)
         if default_type == "local":
@@ -101,7 +92,6 @@ def apply_auth_defaults(auth: AuthModel | None) -> AuthModel:
         auth.audience = auth.audience or DEFAULT_AUTH_AUDIENCE
         return auth
 
-    # Local defaults (Pydantic already coerces types; only set when missing)
     auth.type = auth.type or "local"
     auth.authorization_endpoint = (
         auth.authorization_endpoint or DEFAULT_LOCAL_AUTHORIZATION_ENDPOINT
@@ -116,11 +106,7 @@ def apply_auth_defaults(auth: AuthModel | None) -> AuthModel:
 
 
 def check_required_auth_fields(auth: AuthModel) -> None:
-    """Enforce required fields per auth type.
-
-    - m2m requires client_id and client_secret.
-    - local requires client_id.
-    """
+    """Enforce required fields per auth type."""
     if isinstance(auth, M2MAuthenticationConfig):
         missing = [f for f in ("client_id", "client_secret") if not getattr(auth, f)]
         if missing:

{datacosmos-0.0.20 → datacosmos-0.0.21}/datacosmos/config/config.py

@@ -7,7 +7,7 @@ and supports environment variable-based overrides.
 
 from typing import Optional
 
-from pydantic import field_validator
+from pydantic import Field, field_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 from datacosmos.config.auth.factory import normalize_authentication, parse_auth_config
@@ -18,6 +18,10 @@ from datacosmos.config.constants import (
 )
 from datacosmos.config.loaders.yaml_source import yaml_settings_source
 from datacosmos.config.models.authentication_config import AuthenticationConfig
+from datacosmos.config.models.local_user_account_authentication_config import (
+    LocalUserAccountAuthenticationConfig,
+)
+from datacosmos.config.models.m2m_authentication_config import M2MAuthenticationConfig
 from datacosmos.config.models.url import URL
 
 
@@ -31,9 +35,14 @@ class Config(BaseSettings):
     )
 
     authentication: Optional[AuthenticationConfig] = None
-    stac: URL | None = None
-    datacosmos_cloud_storage: URL | None = None
-    datacosmos_public_cloud_storage: URL | None = None
+
+    stac: URL = Field(default_factory=lambda: URL(**DEFAULT_STAC))
+    datacosmos_cloud_storage: URL = Field(
+        default_factory=lambda: URL(**DEFAULT_STORAGE)
+    )
+    datacosmos_public_cloud_storage: URL = Field(
+        default_factory=lambda: URL(**DEFAULT_STORAGE)
+    )
 
     @classmethod
     def settings_customise_sources(cls, *args, **kwargs):
@@ -65,13 +74,6 @@ class Config(BaseSettings):
     def _parse_authentication(cls, raw):
         if raw is None:
             return None
-        from datacosmos.config.models.local_user_account_authentication_config import (
-            LocalUserAccountAuthenticationConfig,
-        )
-        from datacosmos.config.models.m2m_authentication_config import (
-            M2MAuthenticationConfig,
-        )
-
         if isinstance(
             raw, (M2MAuthenticationConfig, LocalUserAccountAuthenticationConfig)
         ):
@@ -84,18 +86,3 @@ class Config(BaseSettings):
     @classmethod
     def _validate_authentication(cls, auth: Optional[AuthenticationConfig]):
         return normalize_authentication(auth)
-
-    @field_validator("stac", mode="before")
-    @classmethod
-    def _default_stac(cls, value: URL | None) -> URL:
-        return value or URL(**DEFAULT_STAC)
-
-    @field_validator("datacosmos_cloud_storage", mode="before")
-    @classmethod
-    def _default_cloud_storage(cls, value: URL | None) -> URL:
-        return value or URL(**DEFAULT_STORAGE)
-
-    @field_validator("datacosmos_public_cloud_storage", mode="before")
-    @classmethod
-    def _default_public_cloud_storage(cls, value: URL | None) -> URL:
-        return value or URL(**DEFAULT_STORAGE)

{datacosmos-0.0.20 → datacosmos-0.0.21}/datacosmos/stac/storage/storage_base.py

@@ -62,7 +62,7 @@ class StorageBase:
                 try:
                     result = future.result()
                 except Exception as e:
-                    failures.append({'error': str(e), 'exception': e})
+                    failures.append({"error": str(e), "exception": e})
                 else:
                     successes.append(result)
 

{datacosmos-0.0.20 → datacosmos-0.0.21}/datacosmos.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datacosmos
-Version: 0.0.20
+Version: 0.0.21
 Summary: A library for interacting with DataCosmos from Python code
 Author-email: Open Cosmos <support@open-cosmos.com>
 Classifier: Programming Language :: Python :: 3

{datacosmos-0.0.20 → datacosmos-0.0.21}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "datacosmos"
-version = "0.0.20"
+version = "0.0.21"
 authors = [
     { name="Open Cosmos", email="support@open-cosmos.com" },
 ]