datacosmos 0.0.4__tar.gz → 0.0.5__tar.gz

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

@@ -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 → datacosmos-0.0.5}/README.md

@@ -54,6 +54,7 @@ The client will automatically read these values when initialized.
 If manually instantiating `Config`, default values are now applied where possible.
 
 ```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
@@ -116,7 +117,8 @@ params = CatalogSearchParameters(
      end_date="2/9/2025",
      satellite=["MANTIS"],
      product_type=["Satellite"],
-     processing_level=["L1A"]
+     processing_level=["L1A"],
+     collections=["mantis-l1a"]
 )
 
 items = list(stac_client.search_items(parameters=params, project_id="your-project-id"))
@@ -132,19 +134,7 @@ stac_client = STACClient(client)
 
 item = stac_client.fetch_item(item_id="example-item", collection_id="example-collection")
 ```
-
-#### 3. **Fetch All Items in a Collection**
-```python
-from datacosmos.datacosmos_client import DatacosmosClient
-from datacosmos.stac.stac_client import STACClient
-
-client = DatacosmosClient()
-stac_client = STACClient(client)
-
-items = stac_client.fetch_collection_items(collection_id="example-collection")
-```
-
-#### 4. **Create a New STAC Item**
+#### 3. **Create a New STAC Item**
 ```python
 from pystac import Item, Asset
 from datetime import datetime
@@ -160,7 +150,7 @@ stac_item = Item(
     geometry={"type": "Point", "coordinates": [102.0, 0.5]},
     bbox=[101.0, 0.0, 103.0, 1.0],
     datetime=datetime.utcnow(),
-    properties={},
+    properties={"datetime": datetime.utcnow(), "processing:level": "example-processing-level"},
     collection="example-collection"
 )
 
@@ -177,9 +167,9 @@ stac_item.add_asset(
 stac_client.create_item(collection_id="example-collection", item=stac_item)
 ```
 
-#### 5. **Update an Existing STAC Item**
+#### 4. **Update an Existing STAC Item**
 ```python
-from datacosmos.stac.models.item_update import ItemUpdate
+from datacosmos.stac.item.models.item_update import ItemUpdate
 from pystac import Asset, Link
 
 from datacosmos.datacosmos_client import DatacosmosClient
@@ -212,7 +202,7 @@ update_payload = ItemUpdate(
 stac_client.update_item(item_id="new-item", collection_id="example-collection", update_data=update_payload)
 ```
 
-#### 6. **Delete an Item**
+#### 5. **Delete an Item**
 ```python
 
 from datacosmos.datacosmos_client import DatacosmosClient
@@ -224,7 +214,7 @@ stac_client = STACClient(client)
 stac_client.delete_item(item_id="new-item", collection_id="example-collection")
 ```
 
-#### 7. Fetch a Collection
+#### 6. Fetch a Collection
 
 ```python
 
@@ -237,7 +227,7 @@ stac_client = STACClient(client)
 collection = stac_client.fetch_collection("test-collection")
 ```
 
-#### 8. Fetch All Collections
+#### 7. Fetch All Collections
 
 ```python
 
@@ -250,7 +240,7 @@ stac_client = STACClient(client)
 collections = list(stac_client.fetch_all_collections())
 ```
 
-#### 9. Create a Collection
+#### 8. Create a Collection
 
 ```python
 from pystac import Collection
@@ -275,7 +265,7 @@ new_collection = Collection(
 stac_client.create_collection(new_collection)
 ```
 
-#### 10. Update a Collection
+#### 9. Update a Collection
 
 ```python
 from datacosmos.stac.collection.models.collection_update import CollectionUpdate
@@ -294,7 +284,7 @@ update_data = CollectionUpdate(
 stac_client.update_collection("test-collection", update_data)
 ```
 
-#### 11. Delete a Collection
+#### 10. Delete a Collection
 
 ```python
 
@@ -307,24 +297,51 @@ stac_client = STACClient(client)
 stac_client.delete_collection("test-collection")
 ```
 
-### Uploading Files and Registering STAC Items
+## Uploading Files and Registering STAC Items
 
-You can use the `DatacosmosUploader` class to upload files to the DataCosmos cloud storage and register a STAC item.
+You can use the `DatacosmosUploader` class to upload files to the DataCosmos cloud storage and register a STAC item. The `upload_and_register_item` method will take care of both uploading files and creating the STAC item.
 
-#### Upload Files and Register STAC Item
+### **Upload Files and Register STAC Item**
 
-```python
-from datacosmos.uploader.datacosmos_uploader import DatacosmosUploader
+1. Make sure you have a directory with the same name as your STAC item JSON file (this directory should contain the files you want to upload).
+2. Call the `upload_and_register_item` method, providing the path to the STAC item JSON file.
 
+```python
 from datacosmos.datacosmos_client import DatacosmosClient
+from datacosmos.uploader.datacosmos_uploader import DatacosmosUploader
 
-client = DatacosmosClient()
+# Initialize the client with the configuration
+client = DatacosmosClient(config=config)
 
+# Create the uploader instance
 uploader = DatacosmosUploader(client)
-item_json_file_path = "/path/to/stac_item.json"
+
+# Path to your STAC item JSON file
+item_json_file_path = "/home/peres/repos/datacosmos-sdk/MENUT_L1A_000001943_20250304134812_20250304134821_49435814.json"
+
+# Upload the item and its assets, and register it in the STAC API
 uploader.upload_and_register_item(item_json_file_path)
 ```
 
+### **Folder Structure**
+
+For the `upload_and_register_item` method to work correctly, ensure that the directory structure matches the name of the STAC item JSON file. For example:
+
+```
+/home/peres/repos/datacosmos-sdk/MENUT_L1A_000001943_20250304134812_20250304134821_49435814.json
+/home/peres/repos/datacosmos-sdk/MENUT_L1A_000001943_20250304134812_20250304134821_49435814/
+    ├── asset1.tiff
+    ├── asset2.tiff
+    └── ...
+```
+
+The folder `MENUT_L1A_000001943_20250304134812_20250304134821_49435814` should contain the assets (files) for upload.
+
+The `upload_and_register_item` method will:
+1. Delete any existing item with the same ID (if it exists).
+2. Upload the assets in the folder to DataCosmos cloud storage.
+3. Register the item in the STAC API.
+
 ## Error Handling
 
 Use `try-except` blocks to handle API errors gracefully:

{datacosmos-0.0.4 → datacosmos-0.0.5}/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"

{datacosmos-0.0.4 → datacosmos-0.0.5}/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-0.0.4 → datacosmos-0.0.5}/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-0.0.4 → datacosmos-0.0.5}/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-0.0.4 → datacosmos-0.0.5}/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 → datacosmos-0.0.5/datacosmos.egg-info}/PKG-INFO

@@ -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 → datacosmos-0.0.5}/datacosmos.egg-info/SOURCES.txt

@@ -36,7 +36,6 @@ datacosmos/stac/item/models/datacosmos_item.py
 datacosmos/stac/item/models/eo_band.py
 datacosmos/stac/item/models/item_update.py
 datacosmos/stac/item/models/raster_band.py
-datacosmos/stac/item/models/search_parameters.py
 datacosmos/uploader/__init__.py
 datacosmos/uploader/datacosmos_uploader.py
 datacosmos/uploader/dataclasses/__init__.py

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

@@ -5,6 +5,7 @@ requests-oauthlib==1.3.1
 pydantic==2.10.6
 pystac==1.12.1
 pyyaml==6.0.2
+structlog==25.3.0
 
 [dev]
 black==22.3.0

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "datacosmos"
-version = "0.0.4"
+version = "0.0.5"
 authors = [
     { name="Open Cosmos", email="support@open-cosmos.com" },
 ]
@@ -21,7 +21,8 @@ dependencies = [
     "requests-oauthlib==1.3.1",
     "pydantic==2.10.6",
     "pystac==1.12.1",
-    "pyyaml==6.0.2"
+    "pyyaml==6.0.2",
+    "structlog==25.3.0"
 ]
 
 [project.optional-dependencies]

datacosmos-0.0.4/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