specklia 1.9.21__tar.gz → 1.9.28__tar.gz

{specklia-1.9.21 → specklia-1.9.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: specklia
-Version: 1.9.21
+Version: 1.9.28
 Summary: Python client for Specklia, a geospatial point cloud database by Earthwave.
 Home-page: https://specklia.earthwave.co.uk/
 Author: Earthwave Ltd

{specklia-1.9.21 → specklia-1.9.28}/specklia/chunked_transfer.py

@@ -212,7 +212,7 @@ def deserialise_dataframe(data: bytes) -> Union[DataFrame, GeoDataFrame]:
     """
     try:
         buffer = BytesIO(data)
-        df = read_geofeather(buffer)
+        df = read_geofeather(buffer)  # type: ignore
     except ValueError as e:
         # First attempt to deserialise as a geodataframe. If geo meta is missing, we expect a clear ValueError
         # and we then load as a plain dataframe instead.

{specklia-1.9.21 → specklia-1.9.28}/specklia/client.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 from datetime import datetime
 import json
 import logging
-from typing import Dict, List, Literal, Optional, Tuple, Union
+from typing import cast, Dict, List, Literal, Optional, Tuple, Union
 import warnings
 
 from dateutil import parser
@@ -15,6 +15,7 @@ from shapely import MultiPolygon, Polygon, to_geojson
 from shapely.geometry import shape
 
 from specklia import chunked_transfer, utilities
+from specklia.utilities import NewPoints
 
 _log = logging.getLogger(__name__)
 
@@ -239,7 +240,7 @@ class Specklia:
         # perform some light deserialisation of sources for backwards compatibility.
         sources = utilities.deserialise_sources(response_dict['sources'])
 
-        return gdf, sources
+        return cast(gpd.GeoDataFrame, gdf), cast(list[dict], sources)
 
     def update_points_in_dataset(
             self: Specklia, _dataset_id: str, _new_points: pd.DataFrame, _source_description: Dict) -> None:
@@ -270,7 +271,7 @@ class Specklia:
         raise NotImplementedError()
 
     def add_points_to_dataset(
-            self: Specklia, dataset_id: str, new_points: List[Dict[str, Union[Dict, gpd.GeoDataFrame]]],
+            self: Specklia, dataset_id: str, new_points: List[NewPoints],
             duplicate_source_behaviour: Literal['error', 'ignore', 'replace', 'merge'] = 'error') -> None:
         """
         Add new data to a dataset.
@@ -309,17 +310,22 @@ class Specklia:
             - 'merge': Append incoming data to existing data, sharing the same source.
         """
         # serialise and upload each dataframe
+        upload_points = []
         for n in new_points:
-            n['chunk_set_uuid'] = chunked_transfer.upload_chunks(
+            chunk_set_uuid = chunked_transfer.upload_chunks(
                 self.server_url, chunked_transfer.split_into_chunks(
                     chunked_transfer.serialise_dataframe(n['gdf'])), _log)
-            del n['gdf']
+            upload_points.append({
+                'source': n['source'],
+                'chunk_set_uuid': chunk_set_uuid
+            })
+            del n
 
         response = requests.post(
             self.server_url + "/ingest",
             json={
                 'dataset_id': dataset_id,
-                'new_points': new_points,
+                'new_points': upload_points,
                 'duplicate_source_behaviour': duplicate_source_behaviour,
             },
             headers={"Authorization": "Bearer " + self.auth_token},
@@ -672,7 +678,7 @@ class Specklia:
                     lambda x: parser.parse(x, ignoretz=True) if x is not None else None)
             if column == 'epsg4326_coverage':
                 datasets_df[column] = gpd.GeoSeries(
-                    datasets_df[column].apply(lambda x: shape(x) if x is not None else None), crs=4326)
+                    datasets_df[column].apply(lambda x: shape(x) if x is not None else None), crs=4326)  # type: ignore
 
         return datasets_df.convert_dtypes()  # convert the rest of the dtypes to pandas' best guest
 

{specklia-1.9.21 → specklia-1.9.28}/specklia/utilities.py

@@ -1,11 +1,12 @@
 """This file contains client-side utilities provided to make it easier to use Specklia."""
 from datetime import datetime
 import os
-from typing import Dict, List, Optional
+from typing import Dict, List, Optional, TypedDict
 
 import geopandas as gpd
 import numpy as np
 import rasterio
+import rasterio.transform
 from shapely.geometry import shape
 
 
@@ -113,3 +114,10 @@ def deserialise_sources(sources: List[Dict]) -> List[Dict]:
         source['max_time'] = datetime.fromisoformat(source['max_time'])
 
     return sources
+
+
+class NewPoints(TypedDict):
+    """List of data points to ingest."""
+
+    gdf: gpd.GeoDataFrame
+    source: dict

{specklia-1.9.21 → specklia-1.9.28}/specklia.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: specklia
-Version: 1.9.21
+Version: 1.9.28
 Summary: Python client for Specklia, a geospatial point cloud database by Earthwave.
 Home-page: https://specklia.earthwave.co.uk/
 Author: Earthwave Ltd

{specklia-1.9.21 → specklia-1.9.28}/tests/test_client.py

@@ -157,7 +157,7 @@ def test_query_dataset(
       AttributeError, "object has no attribute 'timestamp'")
      ])
 def test_query_dataset_invalid_request(test_client: Specklia, invalid_json: dict,
-                                       expected_exception: Exception, expected_match: str):
+                                       expected_exception: type[Exception], expected_match: str):
     with pytest.raises(expected_exception, match=expected_match):
         test_client.query_dataset(
             dataset_id=invalid_json['dataset_id'],