PyGeoFetch 1.0.3__tar.gz → 1.0.4__tar.gz

{pygeofetch-1.0.3 → pygeofetch-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygeofetch
-Version: 1.0.3
+Version: 1.0.4
 Summary: Universal satellite data pipeline — unified access to 22+ providers
 Author: PyGeoFetch Contributors
 License: MIT License

{pygeofetch-1.0.3 → pygeofetch-1.0.4}/pygeofetch/__init__.py

@@ -1,5 +1,5 @@
 """
-PyGeoFetch v1.0.3 — Universal Satellite Data Pipeline.
+PyGeoFetch v1.0.4 — Universal Satellite Data Pipeline.
 
 Unified access to 22+ satellite data providers with a consistent
 Python API and CLI. Supports authentication management, federated search,
@@ -30,7 +30,7 @@ CLI::
     pygeofetch doctor
 """
 
-__version__ = "1.0.3"
+__version__ = "1.0.4"
 __author__ = "PyGeoFetch Contributors"
 __license__ = "MIT"
 

{pygeofetch-1.0.3 → pygeofetch-1.0.4}/pygeofetch/cli/main.py

@@ -1,5 +1,5 @@
 """
-PyGeoFetch CLI v1.0.3 main entry point.
+PyGeoFetch CLI v1.0.4 main entry point.
 
 Full command reference:
   pygeofetch auth       — credential management
@@ -59,7 +59,7 @@ def cli(ctx: click.Context, log_level: str, log_file: str, log_format: str,
         config_file: str) -> None:
     """
     \b
-    PyGeoFetch v1.0.3 — Universal Satellite Data Pipeline
+    PyGeoFetch v1.0.4 — Universal Satellite Data Pipeline
     ===========================================================
     Unified access to 22+ satellite data providers.
 

{pygeofetch-1.0.3 → pygeofetch-1.0.4}/pygeofetch/models/satellite_data.py

@@ -290,7 +290,7 @@ class SatelliteData(BaseModel):
         """
         item: Dict[str, Any] = {
             "type": "Feature",
-            "stac_version": "1.0.3",
+            "stac_version": "1.0.4",
             "stac_extensions": self.stac_extensions,
             "id": self.id,
             "geometry": self.geometry or self._bbox_to_geometry(),

{pygeofetch-1.0.3 → pygeofetch-1.0.4}/pygeofetch/providers/copernicus.py

@@ -91,12 +91,26 @@ class CopernicusProvider(AbstractBaseProvider):
 
     # Map user-friendly satellite names to CDSE collection names
     SATELLITE_COLLECTION_MAP = {
-        "sentinel-1": "SENTINEL-1",
-        "sentinel-2": "SENTINEL-2",
-        "sentinel-3": "SENTINEL-3",
-        "sentinel-5": "SENTINEL-5P",
+        # Sentinel-1 — all platform variants map to the same collection
+        "sentinel-1":  "SENTINEL-1",
+        "sentinel-1a": "SENTINEL-1",
+        "sentinel-1b": "SENTINEL-1",
+        "sentinel-1c": "SENTINEL-1",   # active constellation (May 2025+)
+        "sentinel-1d": "SENTINEL-1",   # active constellation (Apr 2026+)
+        "s1a":         "SENTINEL-1",
+        "s1b":         "SENTINEL-1",
+        "s1c":         "SENTINEL-1",
+        "s1d":         "SENTINEL-1",
+        # Sentinel-2
+        "sentinel-2":  "SENTINEL-2",
+        "sentinel-2a": "SENTINEL-2",
+        "sentinel-2b": "SENTINEL-2",
+        "sentinel-2c": "SENTINEL-2",
+        # Sentinel-3, 5P, 6
+        "sentinel-3":  "SENTINEL-3",
+        "sentinel-5":  "SENTINEL-5P",
         "sentinel-5p": "SENTINEL-5P",
-        "sentinel-6": "SENTINEL-6",
+        "sentinel-6":  "SENTINEL-6",
     }
 
     def authenticate(self, credentials: Credentials) -> AuthSession:
@@ -220,17 +234,41 @@ class CopernicusProvider(AbstractBaseProvider):
             return [c.upper() for c in query.collections]
 
         if not query.satellites:
-            return ["SENTINEL-2"]  # sensible default
+            # Use product_type to pick a sensible default collection
+            pt = getattr(query, "product_type", None) or ""
+            if pt.upper() in ("SLC", "GRD", "GRD-COG", "OCN"):
+                return ["SENTINEL-1"]   # SAR product type → Sentinel-1
+            return ["SENTINEL-2"]       # default for optical
 
         collections = set()
         for sat in query.satellites:
-            sat_lower = sat.lower()
+            sat_lower = sat.lower().replace("-", "").replace("_", "").replace(" ", "")
+            sat_orig  = sat.lower()
+            matched = False
+            # Try exact match first, then prefix/substring
             for key, col in self.SATELLITE_COLLECTION_MAP.items():
-                if key in sat_lower:
+                key_norm = key.replace("-", "").replace("_", "")
+                if key_norm == sat_lower or key in sat_orig or sat_orig.startswith(key):
                     collections.add(col)
+                    matched = True
                     break
+            if not matched:
+                # Fall back: if it mentions "sentinel-1" anywhere, use SENTINEL-1
+                if "sentinel-1" in sat_orig or sat_orig.startswith("s1"):
+                    collections.add("SENTINEL-1")
+                elif "sentinel-2" in sat_orig or sat_orig.startswith("s2"):
+                    collections.add("SENTINEL-2")
+                else:
+                    # Pass through as-is (user may know the collection name)
+                    collections.add(sat.upper())
+
+        # If no satellite matched but product_type suggests SAR, use Sentinel-1
+        if not collections:
+            pt = getattr(query, "product_type", None) or ""
+            if pt.upper() in ("SLC", "GRD", "GRD-COG", "OCN"):
+                collections.add("SENTINEL-1")
             else:
-                collections.add(sat.upper())
+                collections.add("SENTINEL-2")
 
         return list(collections)
 
@@ -268,6 +306,33 @@ class CopernicusProvider(AbstractBaseProvider):
             )
             filters.append(f"({level_filter})")
 
+        # Product type filter (SLC, GRD, GRD-COG, OCN for Sentinel-1)
+        pt = getattr(query, "product_type", None)
+        if pt:
+            filters.append(
+                f"Attributes/OData.CSC.StringAttribute/any("
+                f"att:att/Name eq 'productType' and "
+                f"att/OData.CSC.StringAttribute/Value eq '{pt.upper()}')"
+            )
+
+        # Polarisation filter (VV, VH, VV+VH, HH etc.)
+        pol = getattr(query, "polarisation", None)
+        if pol:
+            filters.append(
+                f"Attributes/OData.CSC.StringAttribute/any("
+                f"att:att/Name eq 'polarisationChannels' and "
+                f"att/OData.CSC.StringAttribute/Value eq '{pol.upper()}')"
+            )
+
+        # Pass direction filter (ascending / descending)
+        pass_dir = getattr(query, "pass_direction", None)
+        if pass_dir:
+            filters.append(
+                f"Attributes/OData.CSC.StringAttribute/any("
+                f"att:att/Name eq 'orbitDirection' and "
+                f"att/OData.CSC.StringAttribute/Value eq '{pass_dir.upper()}')"
+            )
+
         return " and ".join(filters)
 
     def _search_collection(self, collection: str, query: SearchQuery) -> List[SatelliteData]:
@@ -334,9 +399,18 @@ class CopernicusProvider(AbstractBaseProvider):
             except (ValueError, TypeError):
                 cloud_cover = None
 
-        # Determine satellite from name
+        # Determine satellite platform from product name (e.g. S1C_IW_SLC...)
         satellite = "Sentinel"
-        if name.startswith("S1"):
+        platform  = attributes.get("platform") or attributes.get("platformShortName", "")
+        if name.startswith("S1C") or "SENTINEL-1C" in platform.upper():
+            satellite = "SENTINEL-1C"
+        elif name.startswith("S1D") or "SENTINEL-1D" in platform.upper():
+            satellite = "SENTINEL-1D"
+        elif name.startswith("S1A") or "SENTINEL-1A" in platform.upper():
+            satellite = "SENTINEL-1A"
+        elif name.startswith("S1B") or "SENTINEL-1B" in platform.upper():
+            satellite = "SENTINEL-1B"
+        elif name.startswith("S1"):
             satellite = "Sentinel-1"
         elif name.startswith("S2"):
             satellite = "Sentinel-2"
@@ -345,6 +419,41 @@ class CopernicusProvider(AbstractBaseProvider):
         elif name.startswith("S5P"):
             satellite = "Sentinel-5P"
 
+        # Extract SAR-specific attributes
+        # Copernicus OData attribute names (from $expand=Attributes):
+        product_type   = attributes.get("productType")   # "SLC", "GRD", "GRD-COG"
+        polarisation   = attributes.get("polarisationChannels")  # "VV VH", "HH", etc.
+        pass_direction = attributes.get("orbitDirection") # "ASCENDING", "DESCENDING"
+        rel_orbit      = attributes.get("relativeOrbitNumber")
+        abs_orbit      = attributes.get("absoluteOrbitNumber")
+        incidence_angle = attributes.get("incidenceAngleMax")
+
+        # Normalise polarisation to "VV+VH" style
+        if polarisation:
+            polarisation = polarisation.strip().replace(" ", "+")
+
+        # Normalise pass direction to lowercase
+        if pass_direction:
+            pass_direction = pass_direction.lower()  # "ascending" / "descending"
+
+        # Parse orbit numbers to int
+        try:
+            rel_orbit = int(rel_orbit) if rel_orbit is not None else None
+        except (ValueError, TypeError):
+            rel_orbit = None
+        try:
+            abs_orbit = int(abs_orbit) if abs_orbit is not None else None
+        except (ValueError, TypeError):
+            abs_orbit = None
+        try:
+            incidence_angle = float(incidence_angle) if incidence_angle is not None else None
+        except (ValueError, TypeError):
+            incidence_angle = None
+
+        # GSD from product type
+        gsd_map = {"SLC": 5.0, "GRD": 10.0, "GRD-COG": 10.0, "OCN": None}
+        gsd_m = gsd_map.get(product_type or "", None)
+
         # Build assets
         assets: Dict[str, SatelliteAsset] = {}
         s3_path = product.get("S3Path")
@@ -388,6 +497,15 @@ class CopernicusProvider(AbstractBaseProvider):
                 "s3_path": s3_path,
                 **attributes,
             },
+            # SAR / platform fields (Capability 1 + 2)
+            product_type=product_type,
+            polarisation=polarisation,
+            pass_direction=pass_direction,
+            relative_orbit=rel_orbit,
+            orbit_number=abs_orbit,
+            incidence_angle=incidence_angle,
+            gsd_m=gsd_m,
+            resolution_m=gsd_m,
         )
 
     def download(

{pygeofetch-1.0.3 → pygeofetch-1.0.4}/pygeofetch/providers/sentinel_hub.py

@@ -107,7 +107,7 @@ class SentinelHubProvider(AbstractBaseProvider):
             payload["filter"] = {"maxCloudCoverage": query.cloud_cover_max}
         try:
             resp = httpx.post(
-                f"{self.BASE_URL}/api/v1/catalog/1.0.3/search",
+                f"{self.BASE_URL}/api/v1/catalog/1.0.4/search",
                 json=payload, headers={"Authorization": f"Bearer {self._session.access_token}"},
                 timeout=self.config.get("timeout", 60),
             )

{pygeofetch-1.0.3 → pygeofetch-1.0.4}/pygeofetch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygeofetch
-Version: 1.0.3
+Version: 1.0.4
 Summary: Universal satellite data pipeline — unified access to 22+ providers
 Author: PyGeoFetch Contributors
 License: MIT License

{pygeofetch-1.0.3 → pygeofetch-1.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pygeofetch"
-version = "1.0.3"
+version = "1.0.4"
 description = "Universal satellite data pipeline — unified access to 22+ providers"
 readme = "README.md"
 license = { file = "LICENSE" }