datacosmos 0.0.5__tar.gz → 0.0.7__tar.gz

{datacosmos-0.0.5/datacosmos.egg-info → datacosmos-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datacosmos
-Version: 0.0.5
+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
@@ -10,11 +10,11 @@ License-File: LICENSE.md
 Requires-Dist: pydantic_settings>=2.7.0
 Requires-Dist: requests==2.31.0
 Requires-Dist: oauthlib==3.2.0
-Requires-Dist: requests-oauthlib==1.3.1
-Requires-Dist: pydantic==2.10.6
+Requires-Dist: requests-oauthlib==2
+Requires-Dist: pydantic>=2
 Requires-Dist: pystac==1.12.1
 Requires-Dist: pyyaml==6.0.2
-Requires-Dist: structlog==25.3.0
+Requires-Dist: structlog==24.4.0
 Provides-Extra: dev
 Requires-Dist: black==22.3.0; extra == "dev"
 Requires-Dist: ruff==0.9.5; extra == "dev"

{datacosmos-0.0.5 → datacosmos-0.0.7}/README.md

@@ -55,9 +55,8 @@ If manually instantiating `Config`, default values are now applied where possibl
 
 ```python
 from datacosmos.datacosmos_client import DatacosmosClient
-from config.config import Config
-from config.models.m2m_authentication_config import M2MAuthenticationConfig
-from config.models.url import URL
+from datacosmos.config.config import Config
+from datacosmos.config.models.m2m_authentication_config import M2MAuthenticationConfig
 
 config = Config(
     authentication=M2MAuthenticationConfig(

{datacosmos-0.0.5 → datacosmos-0.0.7/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-0.0.7/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-0.0.7/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-0.0.7/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-0.0.5 → datacosmos-0.0.7}/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.5 → datacosmos-0.0.7}/datacosmos/uploader/datacosmos_uploader.py

@@ -47,7 +47,7 @@ class DatacosmosUploader:
 
     def upload_file(self, src: str, dst: str) -> None:
         """Uploads a single file to the specified destination path."""
-        url = self.base_url.with_suffix(str(dst))
+        url = self.base_url.with_suffix(dst)
 
         with open(src, "rb") as f:
             response = self.datacosmos_client.put(url, data=f)

{datacosmos-0.0.5 → datacosmos-0.0.7/datacosmos.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datacosmos
-Version: 0.0.5
+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
@@ -10,11 +10,11 @@ License-File: LICENSE.md
 Requires-Dist: pydantic_settings>=2.7.0
 Requires-Dist: requests==2.31.0
 Requires-Dist: oauthlib==3.2.0
-Requires-Dist: requests-oauthlib==1.3.1
-Requires-Dist: pydantic==2.10.6
+Requires-Dist: requests-oauthlib==2
+Requires-Dist: pydantic>=2
 Requires-Dist: pystac==1.12.1
 Requires-Dist: pyyaml==6.0.2
-Requires-Dist: structlog==25.3.0
+Requires-Dist: structlog==24.4.0
 Provides-Extra: dev
 Requires-Dist: black==22.3.0; extra == "dev"
 Requires-Dist: ruff==0.9.5; extra == "dev"

{datacosmos-0.0.5 → datacosmos-0.0.7}/datacosmos.egg-info/SOURCES.txt

@@ -1,11 +1,6 @@
 LICENSE.md
 README.md
 pyproject.toml
-config/__init__.py
-config/config.py
-config/models/__init__.py
-config/models/m2m_authentication_config.py
-config/models/url.py
 datacosmos/__init__.py
 datacosmos/datacosmos_client.py
 datacosmos.egg-info/PKG-INFO
@@ -13,6 +8,14 @@ datacosmos.egg-info/SOURCES.txt
 datacosmos.egg-info/dependency_links.txt
 datacosmos.egg-info/requires.txt
 datacosmos.egg-info/top_level.txt
+datacosmos/config/__init__.py
+datacosmos/config/config.py
+datacosmos/config/models/__init__.py
+datacosmos/config/models/authentication_config.py
+datacosmos/config/models/local_user_account_authentication_config.py
+datacosmos/config/models/m2m_authentication_config.py
+datacosmos/config/models/no_authentication_config.py
+datacosmos/config/models/url.py
 datacosmos/exceptions/__init__.py
 datacosmos/exceptions/datacosmos_exception.py
 datacosmos/stac/__init__.py

{datacosmos-0.0.5 → datacosmos-0.0.7}/datacosmos.egg-info/requires.txt

@@ -1,11 +1,11 @@
 pydantic_settings>=2.7.0
 requests==2.31.0
 oauthlib==3.2.0
-requests-oauthlib==1.3.1
-pydantic==2.10.6
+requests-oauthlib==2
+pydantic>=2
 pystac==1.12.1
 pyyaml==6.0.2
-structlog==25.3.0
+structlog==24.4.0
 
 [dev]
 black==22.3.0

{datacosmos-0.0.5 → datacosmos-0.0.7}/datacosmos.egg-info/top_level.txt

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

{datacosmos-0.0.5 → datacosmos-0.0.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "datacosmos"
-version = "0.0.5"
+version = "0.0.7"
 authors = [
     { name="Open Cosmos", email="support@open-cosmos.com" },
 ]
@@ -18,11 +18,11 @@ dependencies = [
     "pydantic_settings>=2.7.0",
     "requests==2.31.0",
     "oauthlib==3.2.0",
-    "requests-oauthlib==1.3.1",
-    "pydantic==2.10.6",
+    "requests-oauthlib==2",
+    "pydantic>=2",
     "pystac==1.12.1",
     "pyyaml==6.0.2",
-    "structlog==25.3.0"
+    "structlog==24.4.0"
 ]
 
 [project.optional-dependencies]
@@ -36,7 +36,7 @@ dev = [
 ]
 
 [tool.setuptools.packages.find]
-include = ["datacosmos*", "config*"]
+include = ["datacosmos*"]
 
 [tool.bandit]
 exclude_dirs = [".venv"]