datacosmos 0.0.6__py3-none-any.whl → 0.0.7__py3-none-any.whl

{config → datacosmos/config}/config.py

@@ -12,8 +12,9 @@ import yaml
 from pydantic import field_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
-from config.models.m2m_authentication_config import M2MAuthenticationConfig
-from config.models.url import URL
+from datacosmos.config.models.authentication_config import AuthenticationConfig
+from datacosmos.config.models.m2m_authentication_config import M2MAuthenticationConfig
+from datacosmos.config.models.url import URL
 
 
 class Config(BaseSettings):
@@ -25,7 +26,7 @@ class Config(BaseSettings):
         extra="allow",
     )
 
-    authentication: Optional[M2MAuthenticationConfig] = None
+    authentication: Optional[AuthenticationConfig] = None
     stac: Optional[URL] = None
     datacosmos_cloud_storage: Optional[URL] = None
     mission_id: int = 0
@@ -94,15 +95,15 @@ class Config(BaseSettings):
             environment=os.getenv("ENVIRONMENT", "test"),
         )
 
-    @field_validator("authentication", mode="before")
+    @field_validator("authentication", mode="after")
     @classmethod
     def validate_authentication(
-        cls, auth_data: Optional[dict]
+        cls, auth: Optional[M2MAuthenticationConfig]
     ) -> M2MAuthenticationConfig:
         """Ensure authentication is provided and apply defaults.
 
         Args:
-            auth_data (Optional[dict]): The authentication config as a dictionary.
+            auth (Optional[M2MAuthenticationConfig]): The authentication config.
 
         Returns:
             M2MAuthenticationConfig: The validated authentication configuration.
@@ -110,11 +111,10 @@ class Config(BaseSettings):
         Raises:
             ValueError: If authentication is missing or required fields are not set.
         """
-        if not auth_data:
-            return cls.apply_auth_defaults(M2MAuthenticationConfig())
-
-        auth = cls.parse_auth_config(auth_data)
-        auth = cls.apply_auth_defaults(auth)
+        if auth is None:
+            auth = cls.apply_auth_defaults(M2MAuthenticationConfig())
+        else:
+            auth = cls.apply_auth_defaults(auth)
 
         cls.check_required_auth_fields(auth)
         return auth

datacosmos/config/models/authentication_config.py

@@ -0,0 +1,15 @@
+"""Authentication configuration options."""
+
+from typing import Union
+
+from datacosmos.config.models.local_user_account_authentication_config import (
+    LocalUserAccountAuthenticationConfig,
+)
+from datacosmos.config.models.m2m_authentication_config import M2MAuthenticationConfig
+from datacosmos.config.models.no_authentication_config import NoAuthenticationConfig
+
+AuthenticationConfig = Union[
+    NoAuthenticationConfig,
+    LocalUserAccountAuthenticationConfig,
+    M2MAuthenticationConfig,
+]

datacosmos/config/models/local_user_account_authentication_config.py

@@ -0,0 +1,26 @@
+"""Configuration for local user account authentication.
+
+When this is chosen, the user will be prompted to log in using their OPS credentials.
+This will be used for running scripts locally.
+"""
+
+from typing import Literal
+
+from pydantic import BaseModel
+
+
+class LocalUserAccountAuthenticationConfig(BaseModel):
+    """Configuration for local user account authentication.
+
+    When this is chosen, the user will be prompted to log in using their OPS credentials.
+    This will be used for running scripts locally.
+    """
+
+    type: Literal["local"]
+    client_id: str
+    authorization_endpoint: str
+    token_endpoint: str
+    redirect_port: int
+    scopes: str
+    audience: str
+    cache_file: str

datacosmos/config/models/no_authentication_config.py

@@ -0,0 +1,17 @@
+"""No authentication configuration.
+
+This is used when running scripts in tests.
+"""
+
+from typing import Literal
+
+from pydantic import BaseModel
+
+
+class NoAuthenticationConfig(BaseModel):
+    """No authentication configuration.
+
+    This is used when running scripts in tests.
+    """
+
+    type: Literal["none"]

datacosmos/datacosmos_client.py

@@ -12,7 +12,7 @@ from oauthlib.oauth2 import BackendApplicationClient
 from requests.exceptions import ConnectionError, HTTPError, RequestException, Timeout
 from requests_oauthlib import OAuth2Session
 
-from config.config import Config
+from datacosmos.config.config import Config
 from datacosmos.exceptions.datacosmos_exception import DatacosmosException
 
 

{datacosmos-0.0.6.dist-info → datacosmos-0.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datacosmos
-Version: 0.0.6
+Version: 0.0.7
 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.6.dist-info → datacosmos-0.0.7.dist-info}/RECORD

@@ -1,10 +1,13 @@
-config/__init__.py,sha256=KCsaTb9-ZgFui1GM8wZFIPLJy0D0O8l8Z1Sv3NRD9UM,140
-config/config.py,sha256=vtimmFY2zOXV3OjT7sS5P0p1sW_-ecB5VCF6cseSk4g,7165
-config/models/__init__.py,sha256=r3lThPkyKjBjUZXRNscFzOrmn_-m_i9DvG3RePfCFYc,41
-config/models/m2m_authentication_config.py,sha256=n76N4bakpPPycTOeKpiM8pazYtNqiJGMzZXmI_ogbHM,847
-config/models/url.py,sha256=fwr2C06e_RDS8AWxOV_orVxMWhc57bzYoWSjFxQbkwg,835
 datacosmos/__init__.py,sha256=dVHKpbz5FVtfoJAWHRdsUENG6H-vs4UrkuwnIvOGJr4,66
-datacosmos/datacosmos_client.py,sha256=sivVYf45QEHTkUO62fnb1fnObKVmUngTR1Ga-ZRnoQE,4967
+datacosmos/datacosmos_client.py,sha256=Uage-PRVRrDWy5frefcR2FClDsdpbFBS4JQC3OCupJU,4978
+datacosmos/config/__init__.py,sha256=KCsaTb9-ZgFui1GM8wZFIPLJy0D0O8l8Z1Sv3NRD9UM,140
+datacosmos/config/config.py,sha256=xSzri8sr_hRK1JlG0mxuBW5dLQ4ExL00uk3-77Z4wHo,7243
+datacosmos/config/models/__init__.py,sha256=r3lThPkyKjBjUZXRNscFzOrmn_-m_i9DvG3RePfCFYc,41
+datacosmos/config/models/authentication_config.py,sha256=01Q90-yupbJ5orYDtatZIm9EaL7roQ-oUMoZfFMRzIM,499
+datacosmos/config/models/local_user_account_authentication_config.py,sha256=8WApn720MBXMKQa6w7bCd7Z37GRmYR-I7mBUgUI20lQ,701
+datacosmos/config/models/m2m_authentication_config.py,sha256=n76N4bakpPPycTOeKpiM8pazYtNqiJGMzZXmI_ogbHM,847
+datacosmos/config/models/no_authentication_config.py,sha256=x5xikSGPuqQbrf_S2oIWXo5XxAORci2sSE5KyJvZHVw,312
+datacosmos/config/models/url.py,sha256=fwr2C06e_RDS8AWxOV_orVxMWhc57bzYoWSjFxQbkwg,835
 datacosmos/exceptions/__init__.py,sha256=Crz8W7mOvPUXYcfDVotvjUt_3HKawBpmJA_-uel9UJk,45
 datacosmos/exceptions/datacosmos_exception.py,sha256=rKjJvQDvCEbxXWWccxB5GI_sth662bW8Yml0hX-vRw4,923
 datacosmos/stac/__init__.py,sha256=B4x_Mr4X7TzQoYtRC-VzI4W-fEON5WUOaz8cWJbk3Fc,214
@@ -41,8 +44,8 @@ datacosmos/utils/http_response/check_api_response.py,sha256=dKWW01jn2_lWV0xpOBAB
 datacosmos/utils/http_response/models/__init__.py,sha256=Wj8YT6dqw7rAz_rctllxo5Or_vv8DwopvQvBzwCTvpw,45
 datacosmos/utils/http_response/models/datacosmos_error.py,sha256=Uqi2uM98nJPeCbM7zngV6vHSk97jEAb_nkdDEeUjiQM,740
 datacosmos/utils/http_response/models/datacosmos_response.py,sha256=oV4n-sue7K1wwiIQeHpxdNU8vxeqF3okVPE2rydw5W0,336
-datacosmos-0.0.6.dist-info/licenses/LICENSE.md,sha256=vpbRI-UUbZVQfr3VG_CXt9HpRnL1b5kt8uTVbirxeyI,1486
-datacosmos-0.0.6.dist-info/METADATA,sha256=62t4WIjxXxYdgVWDyJTcLnBYS9LHU1yuS872Zu8YqbQ,896
-datacosmos-0.0.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-datacosmos-0.0.6.dist-info/top_level.txt,sha256=Iu5b533Fmdfz0rFKTnuBPjSUOQL2lEkTfHxsokP72s4,18
-datacosmos-0.0.6.dist-info/RECORD,,
+datacosmos-0.0.7.dist-info/licenses/LICENSE.md,sha256=vpbRI-UUbZVQfr3VG_CXt9HpRnL1b5kt8uTVbirxeyI,1486
+datacosmos-0.0.7.dist-info/METADATA,sha256=tCAZlxKlDV8qI9pjgvdREZBffzkwJ4Ko0CMiK9oe2Bg,896
+datacosmos-0.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+datacosmos-0.0.7.dist-info/top_level.txt,sha256=ueobs5CNeyDbPMgXPcVV0d0yNdm8CvGtDT3CaksRVtA,11
+datacosmos-0.0.7.dist-info/RECORD,,

{datacosmos-0.0.6.dist-info → datacosmos-0.0.7.dist-info}/top_level.txt

@@ -1,2 +1 @@
-config
 datacosmos