datacosmos 0.0.4__py3-none-any.whl → 0.0.5__py3-none-any.whl

config/config.py

@@ -6,7 +6,7 @@ and supports environment variable-based overrides.
 """
 
 import os
-from typing import ClassVar, Literal, Optional
+from typing import ClassVar, Optional
 
 import yaml
 from pydantic import field_validator
@@ -29,7 +29,6 @@ class Config(BaseSettings):
     stac: Optional[URL] = None
     datacosmos_cloud_storage: Optional[URL] = None
     mission_id: int = 0
-    environment: Literal["local", "test", "prod"] = "test"
 
     DEFAULT_AUTH_TYPE: ClassVar[str] = "m2m"
     DEFAULT_AUTH_TOKEN_URL: ClassVar[str] = "https://login.open-cosmos.com/oauth/token"

config/models/m2m_authentication_config.py

@@ -6,7 +6,7 @@ without user interaction.
 
 from typing import Literal
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 
 class M2MAuthenticationConfig(BaseModel):
@@ -16,8 +16,12 @@ class M2MAuthenticationConfig(BaseModel):
     with client credentials.
     """
 
-    type: Literal["m2m"]
+    DEFAULT_TYPE: Literal["m2m"] = "m2m"
+    DEFAULT_TOKEN_URL: str = "https://login.open-cosmos.com/oauth/token"
+    DEFAULT_AUDIENCE: str = "https://beeapp.open-cosmos.com"
+
+    type: Literal["m2m"] = Field(default=DEFAULT_TYPE)
     client_id: str
-    token_url: str
-    audience: str
+    token_url: str = Field(default=DEFAULT_TOKEN_URL)
+    audience: str = Field(default=DEFAULT_AUDIENCE)
     client_secret: str

datacosmos/stac/item/item_client.py

@@ -14,7 +14,6 @@ from datacosmos.stac.item.models.catalog_search_parameters import (
 )
 from datacosmos.stac.item.models.datacosmos_item import DatacosmosItem
 from datacosmos.stac.item.models.item_update import ItemUpdate
-from datacosmos.stac.item.models.search_parameters import SearchParameters
 from datacosmos.utils.http_response.check_api_response import check_api_response
 
 
@@ -45,23 +44,6 @@ class ItemClient:
         check_api_response(response)
         return Item.from_dict(response.json())
 
-    def fetch_collection_items(
-        self, collection_id: str, parameters: Optional[SearchParameters] = None
-    ) -> Generator[Item, None, None]:
-        """Fetch all items in a collection with optional filtering.
-
-        Args:
-            collection_id (str): The ID of the collection.
-            parameters (Optional[SearchParameters]): Filtering parameters (spatial, temporal, etc.).
-
-        Yields:
-            Item: Parsed STAC item.
-        """
-        if parameters is None:
-            parameters = SearchParameters(collections=[collection_id])
-
-        return self.search_items(parameters)
-
     def search_items(
         self, parameters: CatalogSearchParameters, project_id: str
     ) -> Generator[Item, None, None]:
@@ -76,6 +58,8 @@ class ItemClient:
         url = self.base_url.with_suffix("/search")
         parameters_query = parameters.to_query()
         body = {"project": project_id, "limit": 50, "query": parameters_query}
+        if parameters.collections is not None:
+            body = body | {"collections": parameters.collections}
         return self._paginate_items(url, body)
 
     def create_item(self, collection_id: str, item: Item | DatacosmosItem) -> None:
@@ -90,7 +74,6 @@ class ItemClient:
         """
         url = self.base_url.with_suffix(f"/collections/{collection_id}/items")
         item_json: dict = item.to_dict()
-
         response = self.client.post(url, json=item_json)
         check_api_response(response)
 

datacosmos/stac/item/models/catalog_search_parameters.py

@@ -3,7 +3,7 @@
 from datetime import datetime, timedelta
 from typing import Any, List, Optional
 
-from pydantic import BaseModel, field_validator, model_validator
+from pydantic import BaseModel, Field, field_validator, model_validator
 
 from datacosmos.stac.constants.satellite_name_mapping import SATELLITE_NAME_MAPPING
 from datacosmos.stac.enums.processing_level import ProcessingLevel
@@ -20,6 +20,11 @@ class CatalogSearchParameters(BaseModel):
     satellite: Optional[List[str]] = None
     product_type: Optional[List[ProductType]] = None
     processing_level: Optional[List[ProcessingLevel]] = None
+    collections: Optional[list[str]] = Field(
+        None,
+        description="Array of collection IDs to filter by.",
+        example=["collection1", "collection2"],
+    )
 
     # --- Field Validators ---
 
@@ -58,13 +63,13 @@ class CatalogSearchParameters(BaseModel):
             return None
         try:
             dt = datetime.strptime(value, "%m/%d/%Y")
-            if dt < datetime(2015, 5, 15):
-                raise ValueError("Date must be 5/15/2015 or later.")
-            return dt.isoformat() + "Z"
-        except ValueError:
+        except Exception as e:
             raise ValueError(
                 "Invalid start_date format. Use mm/dd/yyyy (e.g., 05/15/2024)"
-            )
+            ) from e
+        if dt < datetime(2015, 5, 15):
+            raise ValueError("Date must be 5/15/2015 or later.")
+        return dt.isoformat() + "Z"
 
     @field_validator("end_date", mode="before")
     @classmethod
@@ -74,15 +79,16 @@ class CatalogSearchParameters(BaseModel):
             return None
         try:
             dt = datetime.strptime(value, "%m/%d/%Y")
-            if dt < datetime(2015, 5, 15):
-                raise ValueError("Date must be 5/15/2015 or later.")
-            dt = dt + timedelta(days=1) - timedelta(milliseconds=1)
-            return dt.isoformat() + "Z"
         except ValueError:
             raise ValueError(
                 "Invalid end_date format. Use mm/dd/yyyy (e.g., 05/15/2024)"
             )
 
+        if dt < datetime(2015, 5, 15):
+            raise ValueError("Date must be 5/15/2015 or later.")
+        dt = dt + timedelta(days=1) - timedelta(milliseconds=1)
+        return dt.isoformat() + "Z"
+
     # --- Model Validator ---
 
     @model_validator(mode="after")

datacosmos/uploader/dataclasses/upload_path.py

@@ -6,7 +6,7 @@ from pathlib import Path
 
 import structlog
 
-from datacosmos.stac.enums.level import Level
+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
 
@@ -18,7 +18,7 @@ class UploadPath:
     """Dataclass for retrieving the upload path of a file."""
 
     mission: str
-    level: Level
+    level: ProcessingLevel
     day: int
     month: int
     year: int
@@ -43,7 +43,7 @@ class UploadPath:
         dt = datetime.strptime(item.properties["datetime"], "%Y-%m-%dT%H:%M:%SZ")
         path = UploadPath(
             mission=mission,
-            level=Level(item.properties["processing:level"].lower()),
+            level=ProcessingLevel(item.properties["processing:level"].upper()),
             day=dt.day,
             month=dt.month,
             year=dt.year,
@@ -60,7 +60,7 @@ class UploadPath:
             raise ValueError(f"Invalid path {path}")
         return cls(
             mission=parts[0],
-            level=Level(parts[1]),
+            level=ProcessingLevel(parts[1]),
             day=int(parts[4]),
             month=int(parts[3]),
             year=int(parts[2]),

{datacosmos-0.0.4.dist-info → datacosmos-0.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datacosmos
-Version: 0.0.4
+Version: 0.0.5
 Summary: A library for interacting with DataCosmos from Python code
 Author-email: Open Cosmos <support@open-cosmos.com>
 Classifier: Programming Language :: Python :: 3
@@ -14,6 +14,7 @@ Requires-Dist: requests-oauthlib==1.3.1
 Requires-Dist: pydantic==2.10.6
 Requires-Dist: pystac==1.12.1
 Requires-Dist: pyyaml==6.0.2
+Requires-Dist: structlog==25.3.0
 Provides-Extra: dev
 Requires-Dist: black==22.3.0; extra == "dev"
 Requires-Dist: ruff==0.9.5; extra == "dev"

{datacosmos-0.0.4.dist-info → datacosmos-0.0.5.dist-info}/RECORD

@@ -1,7 +1,7 @@
 config/__init__.py,sha256=KCsaTb9-ZgFui1GM8wZFIPLJy0D0O8l8Z1Sv3NRD9UM,140
-config/config.py,sha256=h5XwNSA6QFBCDyennyFDNMAmbQOdtg8DsFAvjHlSEx4,7233
+config/config.py,sha256=vtimmFY2zOXV3OjT7sS5P0p1sW_-ecB5VCF6cseSk4g,7165
 config/models/__init__.py,sha256=r3lThPkyKjBjUZXRNscFzOrmn_-m_i9DvG3RePfCFYc,41
-config/models/m2m_authentication_config.py,sha256=1eJ_9df7Twn5WeWPbqMuR63ZdxhnTpBtKzqAPMnzP_k,565
+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
@@ -20,19 +20,18 @@ datacosmos/stac/enums/processing_level.py,sha256=5gHG-0kG5rCUxmXYwF3t94ALKk6zUqg
 datacosmos/stac/enums/product_type.py,sha256=7lL0unJ1hxevW8Pepn9rmydUUWIORu2x4MEtp6rSFbA,196
 datacosmos/stac/enums/season.py,sha256=QvUzXBYtPEfixhlbV0SAw2u_HK3tRFEnHKshJyIatdg,241
 datacosmos/stac/item/__init__.py,sha256=lRuD_yp-JxoLqBA23q0XMkCNImf4T-X3BJnSw9u_3Yk,200
-datacosmos/stac/item/item_client.py,sha256=ib848Pb2j6njvbx97vFFw7AWeKyBnBlK-05D3pFmIdU,7027
+datacosmos/stac/item/item_client.py,sha256=mFcbXqV1Ascd5hUSlZFzNgni_DncHAIyIvhtUHpgHI0,6457
 datacosmos/stac/item/models/__init__.py,sha256=bcOrOcIxGxGBrRVIyQVxSM3C3Xj_qzxIHgQeWo6f7Q8,34
 datacosmos/stac/item/models/asset.py,sha256=mvg_fenYCGOTMGwXXpK2nyqBk5RMsUYxl6KhQTWW_b0,631
-datacosmos/stac/item/models/catalog_search_parameters.py,sha256=VKMBnaTYjpn_zAM6wdk3P69ZoGBcqdzPcTGBlYPFvVk,4704
+datacosmos/stac/item/models/catalog_search_parameters.py,sha256=3HrUm37VezujwuCR45jhMryS5m1FGc1XmX8-fdTy4jU,4870
 datacosmos/stac/item/models/datacosmos_item.py,sha256=AImz0GRxrpZfIETdzzNfaKX35wpr39Q4f4u0z6r8eys,1745
 datacosmos/stac/item/models/eo_band.py,sha256=YC3Scn_wFhIo51pIVcJeuJienF7JGWoEv39JngDM6rI,309
 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/stac/item/models/search_parameters.py,sha256=yMmcb-Tr2as8585MD5wuZLWcqzwtRRkj07WBkootVS0,2022
 datacosmos/uploader/__init__.py,sha256=ZtfCVJ_pWKKh2F1r_NArnbG3_JtpcEiXcA_tmSwSKmQ,128
 datacosmos/uploader/datacosmos_uploader.py,sha256=LUtBDvAjZI7AYxKnC9TZQDP4z6lV2aHusz92XqivFGw,4398
 datacosmos/uploader/dataclasses/__init__.py,sha256=IjcyA8Vod-z1_Gi1FMZhK58Owman0foL25Hs0YtkYYs,43
-datacosmos/uploader/dataclasses/upload_path.py,sha256=WPl9u-oB-ti07ssKNDjL4vRQXhlOmLCgjt8MxFGrf3A,3153
+datacosmos/uploader/dataclasses/upload_path.py,sha256=X8zkfw3_FO9qTiKHu-nL_uDmQJYfaov6e4Y2-f-opaU,3204
 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
@@ -42,8 +41,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.4.dist-info/licenses/LICENSE.md,sha256=vpbRI-UUbZVQfr3VG_CXt9HpRnL1b5kt8uTVbirxeyI,1486
-datacosmos-0.0.4.dist-info/METADATA,sha256=8yM44qsv1vBDxutLlUte916Z6zgPVT0mnyR1Bz2drJ8,872
-datacosmos-0.0.4.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-datacosmos-0.0.4.dist-info/top_level.txt,sha256=Iu5b533Fmdfz0rFKTnuBPjSUOQL2lEkTfHxsokP72s4,18
-datacosmos-0.0.4.dist-info/RECORD,,
+datacosmos-0.0.5.dist-info/licenses/LICENSE.md,sha256=vpbRI-UUbZVQfr3VG_CXt9HpRnL1b5kt8uTVbirxeyI,1486
+datacosmos-0.0.5.dist-info/METADATA,sha256=vng8nMwWZjm4IZgXymw6cjWEJZOm6LZSahL0vUNUmPA,905
+datacosmos-0.0.5.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+datacosmos-0.0.5.dist-info/top_level.txt,sha256=Iu5b533Fmdfz0rFKTnuBPjSUOQL2lEkTfHxsokP72s4,18
+datacosmos-0.0.5.dist-info/RECORD,,

{datacosmos-0.0.4.dist-info → datacosmos-0.0.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

datacosmos/stac/item/models/search_parameters.py

@@ -1,58 +0,0 @@
-"""Module defining the SearchParameters model for STAC API queries, encapsulating filtering criteria.
-
-It includes spatial, temporal, and property-based filters for querying STAC items efficiently.
-"""
-
-from typing import Optional, Union
-
-from pydantic import BaseModel, Field, model_validator
-
-
-class SearchParameters(BaseModel):
-    """Encapsulates the parameters for the STAC search API with validation."""
-
-    bbox: Optional[list[float]] = Field(
-        None,
-        description="Bounding box filter [minX, minY, maxX, maxY]. Optional six values for 3D bounding box.",
-        example=[-180.0, -90.0, 180.0, 90.0],
-    )
-    datetime_range: Optional[str] = Field(
-        None,
-        alias="datetime",
-        description=(
-            "Temporal filter, either a single RFC 3339 datetime or an interval. "
-            'Example: "2025-01-01T00:00:00Z/.."'
-        ),
-    )
-    intersects: Optional[dict] = Field(
-        None, description="GeoJSON geometry filter, e.g., a Polygon or Point."
-    )
-    ids: Optional[list[str]] = Field(
-        None,
-        description="Array of item IDs to filter by.",
-        example=["item1", "item2"],
-    )
-    collections: Optional[list[str]] = Field(
-        None,
-        description="Array of collection IDs to filter by.",
-        example=["collection1", "collection2"],
-    )
-    limit: Optional[int] = Field(
-        None,
-        ge=1,
-        le=10000,
-        description="Maximum number of items per page. Default: 10, Max: 10000.",
-        example=10,
-    )
-    query: Optional[dict[str, dict[str, Union[str, int, float]]]] = Field(
-        None,
-        description="Additional property filters, e.g., { 'cloud_coverage': { 'lt': 10 } }.",
-    )
-
-    @model_validator(mode="before")
-    def validate_bbox(cls, values):
-        """Validate that the `bbox` field contains either 4 or 6 values."""
-        bbox = values.get("bbox")
-        if bbox and len(bbox) not in {4, 6}:
-            raise ValueError("bbox must contain 4 or 6 values.")
-        return values