datacosmos 0.0.6__py3-none-any.whl → 0.0.8__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,10 +26,9 @@ 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
 
     DEFAULT_AUTH_TYPE: ClassVar[str] = "m2m"
     DEFAULT_AUTH_TOKEN_URL: ClassVar[str] = "https://login.open-cosmos.com/oauth/token"
@@ -94,15 +94,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 +110,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

@@ -1,8 +1,4 @@
-"""DatacosmosClient handles authenticated interactions with the Datacosmos API.
-
-Automatically manages token refreshing and provides HTTP convenience
-methods.
-"""
+"""Client to interact with the Datacosmos API with authentication and request handling."""
 
 from datetime import datetime, timedelta, timezone
 from typing import Any, Optional
@@ -12,30 +8,64 @@ 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
 
 
 class DatacosmosClient:
     """Client to interact with the Datacosmos API with authentication and request handling."""
 
-    def __init__(self, config: Optional[Config] = None):
+    def __init__(
+        self,
+        config: Optional[Config | Any] = None,
+        http_session: Optional[requests.Session | OAuth2Session] = None,
+    ):
         """Initialize the DatacosmosClient.
 
         Args:
-            config (Optional[Config]): Configuration object.
+            config (Optional[Config]): Configuration object (only needed when SDK creates its own session).
+            http_session (Optional[requests.Session]): Pre-authenticated session.
         """
-        if config:
-            self.config = config
-        else:
+        if http_session is not None:
+            self._http_client = http_session
+            self._owns_session = False
+            if isinstance(http_session, OAuth2Session):
+                token_data = http_session.token
+            elif isinstance(http_session, requests.Session):
+                auth_header = http_session.headers.get("Authorization", "")
+                if not auth_header.startswith("Bearer "):
+                    raise DatacosmosException(
+                        "Injected requests.Session must include a 'Bearer' token in its headers"
+                    )
+                token_data = {"access_token": auth_header.split(" ", 1)[1]}
+            else:
+                raise DatacosmosException(
+                    f"Unsupported session type: {type(http_session)}"
+                )
             try:
-                self.config = Config.from_yaml()
-            except ValueError:
-                self.config = Config.from_env()
+                self.token = token_data.get("access_token")
+                self.token_expiry = token_data.get("expires_at") or token_data.get(
+                    "expires_in"
+                )
+            except Exception:
+                raise DatacosmosException(
+                    "Failed to extract token from injected session"
+                )
 
-        self.token = None
-        self.token_expiry = None
-        self._http_client = self._authenticate_and_initialize_client()
+            self.config = config
+        else:
+            if config:
+                self.config = config
+            else:
+                try:
+                    self.config = Config.from_yaml()
+                except ValueError:
+                    self.config = Config.from_env()
+
+            self._owns_session = True
+            self.token = None
+            self.token_expiry = None
+            self._http_client = self._authenticate_and_initialize_client()
 
     def _authenticate_and_initialize_client(self) -> requests.Session:
         """Authenticate and initialize the HTTP client with a valid token."""
@@ -68,8 +98,10 @@ class DatacosmosClient:
             ) from e
 
     def _refresh_token_if_needed(self):
-        """Refresh the token if it has expired."""
-        if not self.token or self.token_expiry <= datetime.now(timezone.utc):
+        """Refresh the token if it has expired (only if SDK created it)."""
+        if self._owns_session and (
+            not self.token or self.token_expiry <= datetime.now(timezone.utc)
+        ):
             self._http_client = self._authenticate_and_initialize_client()
 
     def request(

datacosmos/uploader/dataclasses/upload_path.py

@@ -8,7 +8,6 @@ import structlog
 
 from datacosmos.stac.enums.processing_level import ProcessingLevel
 from datacosmos.stac.item.models.datacosmos_item import DatacosmosItem
-from datacosmos.utils.missions import get_mission_id
 
 logger = structlog.get_logger()
 
@@ -35,11 +34,6 @@ class UploadPath:
         cls, item: DatacosmosItem, mission: str, item_path: str
     ) -> "Path":
         """Create a Path instance from a DatacosmosItem and a path."""
-        for asset in item.assets.values():
-            if mission == "":
-                mission = cls._get_mission_name(asset.href)
-            else:
-                break
         dt = datetime.strptime(item.properties["datetime"], "%Y-%m-%dT%H:%M:%SZ")
         path = UploadPath(
             mission=mission,
@@ -67,27 +61,3 @@ class UploadPath:
             id=parts[5],
             path="/".join(parts[6:]),
         )
-
-    @classmethod
-    def _get_mission_name(cls, href: str) -> str:
-        mission = ""
-        # bruteforce mission name from asset path
-        # traverse the path and check if any part is a mission name (generates a mission id)
-        href_parts = href.split("/")
-        for idx, part in enumerate(href_parts):
-            try:
-                # when an id is found, then the mission name is valid
-                get_mission_id(
-                    part, "test"
-                )  # using test as it is more wide and anything on prod should exists on test
-            except KeyError:
-                continue
-            # validate the mission name by checking if the path is correct
-            # using the same logic as the __str__ method
-            mission = part.lower()
-            h = "/".join(["full", *href_parts[idx:]])
-            p = UploadPath.from_path("/".join([mission, *href_parts[idx + 1 :]]))
-            if str(p) != h:
-                raise ValueError(f"Could not find mission name in asset path {href}")
-            break
-        return mission

datacosmos/uploader/datacosmos_uploader.py

@@ -9,7 +9,6 @@ from datacosmos.datacosmos_client import DatacosmosClient
 from datacosmos.stac.item.item_client import ItemClient
 from datacosmos.stac.item.models.datacosmos_item import DatacosmosItem
 from datacosmos.uploader.dataclasses.upload_path import UploadPath
-from datacosmos.utils.missions import get_mission_name
 
 
 class DatacosmosUploader:
@@ -17,14 +16,10 @@ class DatacosmosUploader:
 
     def __init__(self, client: DatacosmosClient):
         """Initialize the uploader with DatacosmosClient."""
-        mission_id = client.config.mission_id
-        environment = client.config.environment
+        self.environment = client.config.environment
 
         self.datacosmos_client = client
         self.item_client = ItemClient(client)
-        self.mission_name = (
-            get_mission_name(mission_id, environment) if mission_id != 0 else ""
-        )
         self.base_url = client.config.datacosmos_cloud_storage.as_domain_url()
 
     def upload_and_register_item(self, item_json_file_path: str) -> None:
@@ -92,9 +87,9 @@ class DatacosmosUploader:
         except Exception:  # nosec
             pass  # Ignore if item doesn't exist
 
-    def _get_upload_path(self, item: DatacosmosItem) -> str:
+    def _get_upload_path(self, item: DatacosmosItem, mission_name: str = "") -> str:
         """Constructs the storage upload path based on the item and mission name."""
-        return UploadPath.from_item_path(item, self.mission_name, "")
+        return UploadPath.from_item_path(item, mission_name, "")
 
     def _update_item_assets(self, item: DatacosmosItem) -> None:
         """Updates the item's assets with uploaded file URLs."""

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datacosmos
-Version: 0.0.6
+Version: 0.0.8
 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.8.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=3BurTz1fPk1Dzp8B5xt5gZZrFiqk1AT5oaqKeYmXPec,6517
+datacosmos/config/__init__.py,sha256=KCsaTb9-ZgFui1GM8wZFIPLJy0D0O8l8Z1Sv3NRD9UM,140
+datacosmos/config/config.py,sha256=qj9e68enxX61Iw8lqEXUUCNJ2O7vy-1j9nAoBIB-4Ao,7219
+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
@@ -29,20 +32,18 @@ datacosmos/stac/item/models/eo_band.py,sha256=YC3Scn_wFhIo51pIVcJeuJienF7JGWoEv3
 datacosmos/stac/item/models/item_update.py,sha256=_CpjQn9SsfedfuxlHSiGeptqY4M-p15t9YX__mBRueI,2088
 datacosmos/stac/item/models/raster_band.py,sha256=CoEVs-YyPE5Fse0He9DdOs4dGZpzfCsCuVzOcdXa_UM,354
 datacosmos/uploader/__init__.py,sha256=ZtfCVJ_pWKKh2F1r_NArnbG3_JtpcEiXcA_tmSwSKmQ,128
-datacosmos/uploader/datacosmos_uploader.py,sha256=QFFzR9Z2KFu_G5EcmvEn251IiwbPAfZSrOYZ_vC3NSg,4393
+datacosmos/uploader/datacosmos_uploader.py,sha256=FDBUSZ9mpieXi3dms3RM17aIrnRuAKd0rFkD7Jwl1pY,4195
 datacosmos/uploader/dataclasses/__init__.py,sha256=IjcyA8Vod-z1_Gi1FMZhK58Owman0foL25Hs0YtkYYs,43
-datacosmos/uploader/dataclasses/upload_path.py,sha256=X8zkfw3_FO9qTiKHu-nL_uDmQJYfaov6e4Y2-f-opaU,3204
+datacosmos/uploader/dataclasses/upload_path.py,sha256=5QadynHxkJrnOk1lyPtLyiVAHdzBshEuhjA9hwVF0NI,1903
 datacosmos/utils/__init__.py,sha256=XQbAnoqJrPpnSpEzAbjh84yqYWw8cBM8mNp8ynTG-54,50
-datacosmos/utils/constants.py,sha256=f7pOqCpdXk7WFGoaTyuCpr65jb-TtfhoVGuYTz3_T6Y,272
-datacosmos/utils/missions.py,sha256=7GOnrjxB8V11C_Jr3HHI4vpXifgkOSeirNjIDx17C58,940
 datacosmos/utils/url.py,sha256=iQwZr6mYRoePqUZg-k3KQSV9o2wju5ZuCa5WS_GyJo4,2114
 datacosmos/utils/http_response/__init__.py,sha256=BvOWwC5coYqq_kFn8gIw5m54TLpdfJKlW9vgRkfhXiA,33
 datacosmos/utils/http_response/check_api_response.py,sha256=dKWW01jn2_lWV0xpOBABhEP42CFSsx9dP0iSxykbN54,1186
 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.8.dist-info/licenses/LICENSE.md,sha256=vpbRI-UUbZVQfr3VG_CXt9HpRnL1b5kt8uTVbirxeyI,1486
+datacosmos-0.0.8.dist-info/METADATA,sha256=tK8nQIG9_5zJ-gCQPQB7S2q6z7HabdgYdpPLfkinP9g,896
+datacosmos-0.0.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+datacosmos-0.0.8.dist-info/top_level.txt,sha256=ueobs5CNeyDbPMgXPcVV0d0yNdm8CvGtDT3CaksRVtA,11
+datacosmos-0.0.8.dist-info/RECORD,,

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

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

datacosmos/utils/constants.py

@@ -1,16 +0,0 @@
-"""Package for storing constants."""
-
-TEST_MISSION_NAMES = {
-    55: "MENUT",
-    56: "PHISAT-2",
-    57: "HAMMER",
-    63: "MANTIS",
-    64: "PLATERO",
-}
-PROD_MISSION_NAMES = {
-    23: "MENUT",
-    29: "MANTIS",
-    35: "PHISAT-2",
-    37: "PLATERO",
-    48: "HAMMER",
-}

datacosmos/utils/missions.py

@@ -1,27 +0,0 @@
-"""Package for storing mission specific information."""
-
-from datacosmos.utils.constants import PROD_MISSION_NAMES, TEST_MISSION_NAMES
-
-
-def get_mission_name(mission: int, env: str) -> str:
-    """Get the mission name from the mission number."""
-    if env == "test" or env == "local":
-        return TEST_MISSION_NAMES[mission]
-    elif env == "prod":
-        return PROD_MISSION_NAMES[mission]
-    else:
-        raise ValueError(f"Unsupported environment: {env}")
-
-
-def get_mission_id(mission_name: str, env: str) -> int:
-    """Get the mission number from the mission name."""
-    if env == "test" or env == "local":
-        return {v.upper(): k for k, v in TEST_MISSION_NAMES.items()}[
-            mission_name.upper()
-        ]
-    elif env == "prod":
-        return {v.upper(): k for k, v in PROD_MISSION_NAMES.items()}[
-            mission_name.upper()
-        ]
-    else:
-        raise ValueError(f"Unsupported environment: {env}")