cecil 0.0.27__tar.gz → 0.0.28__tar.gz

{cecil-0.0.27 → cecil-0.0.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cecil
-Version: 0.0.27
+Version: 0.0.28
 Summary: Python SDK for Cecil Earth
 License-Expression: MIT
 License-File: LICENSE.txt

{cecil-0.0.27 → cecil-0.0.28}/src/cecil/client.py

@@ -36,6 +36,7 @@ from .models import (
     User,
     UserCreate,
     DataRequestMetadata,
+    DataRequestParquetFiles,
 )
 from .version import __version__
 from .xarray import load_xarray
@@ -90,24 +91,12 @@ class Client:
         return load_xarray(metadata)
 
     def load_dataframe(self, data_request_id: str) -> pd.DataFrame:
-
-        data_request = self.get_data_request(data_request_id)
-
-        try:
-            secure_view = {
-                "528f54b8-1cb9-412c-a646-30a55ddb7cbd": "data_request_db.ibat.kba",
-                "f30f2125-c472-43c7-85c8-52f0d4b1d160": "data_request_db.ibat.redlist",
-                "c1ee0d62-95ef-49b1-adf1-6a5a933d726d": "data_request_db.ibat.wdpa",
-            }[data_request.dataset_id]
-        except KeyError:
-            raise Error(
-                "method not allowed",
-                {"message": "load_dataframe() is not supported for raster datasets."},
-            )
-
-        return self._query(
-            f"select * from {secure_view} where data_request_id = '{data_request_id}'"
-        )
+        res = self._get(url=f"/v0/data-requests/{data_request_id}/parquet-files")
+        metadata = DataRequestParquetFiles(**res)
+        df = pd.concat((pd.read_parquet(f) for f in metadata.files))
+        return df[
+            [col for col in df.columns if col not in ("organisation_id", "created_at")]
+        ]
 
     def create_transformation(
         self, data_request_id: str, crs: str, spatial_resolution: float

{cecil-0.0.27 → cecil-0.0.28}/src/cecil/models.py

@@ -135,3 +135,8 @@ class DataRequestMetadata(BaseModel):
     aoi_id: str
     data_request_id: str
     files: List[File]
+
+
+class DataRequestParquetFiles(BaseModel):
+    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
+    files: List[str]

cecil-0.0.28/src/cecil/version.py

@@ -0,0 +1 @@
+__version__ = "0.0.28"

cecil-0.0.27/src/cecil/version.py

@@ -1 +0,0 @@
-__version__ = "0.0.27"