specklia 1.9.12__tar.gz → 1.9.14__tar.gz

{specklia-1.9.12 → specklia-1.9.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: specklia
-Version: 1.9.12
+Version: 1.9.14
 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.12 → specklia-1.9.14}/specklia/client.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 from datetime import datetime
 import json
 import logging
-from typing import Dict, List, Optional, Tuple, Union
+from typing import Dict, List, Literal, Optional, Tuple, Union
 import warnings
 
 from dateutil import parser
@@ -270,7 +270,8 @@ class Specklia:
         raise NotImplementedError()
 
     def add_points_to_dataset(
-            self: Specklia, dataset_id: str, new_points: List[Dict[str, Union[Dict, gpd.GeoDataFrame]]]) -> None:
+            self: Specklia, dataset_id: str, new_points: List[Dict[str, Union[Dict, gpd.GeoDataFrame]]],
+            duplicate_source_behaviour: Literal['error', 'ignore', 'replace', 'merge'] = 'error') -> None:
         """
         Add new data to a dataset.
 
@@ -300,6 +301,12 @@ class Specklia:
             The timestamp column must contain POSIX timestamps.
             The 'geometry' column must contain Points following the (lon, lat) convention.
             The GeoDataFrame must have its CRS specified as EPSG 4326.
+        duplicate_source_behaviour : Literal['error', 'ignore', 'replace', 'merge']
+            Determines what should happen if a source already exists in the dataset:
+            - 'error': Throw an error.
+            - 'ignore': Ignore the incoming data and continue. Leave existing data unchanged.
+            - 'replace': Delete existing data for the source, and replace it with the incoming data.
+            - 'merge': Append incoming data to existing data, sharing the same source.
         """
         # serialise and upload each dataframe
         for n in new_points:
@@ -308,9 +315,15 @@ class Specklia:
                     chunked_transfer.serialise_dataframe(n['gdf'])), _log)
             del n['gdf']
 
-        response = requests.post(self.server_url + "/ingest",
-                                 json={'dataset_id': dataset_id, 'new_points': new_points},
-                                 headers={"Authorization": "Bearer " + self.auth_token})
+        response = requests.post(
+            self.server_url + "/ingest",
+            json={
+                'dataset_id': dataset_id,
+                'new_points': new_points,
+                'duplicate_source_behaviour': duplicate_source_behaviour,
+            },
+            headers={"Authorization": "Bearer " + self.auth_token},
+        )
         _check_response_ok(response)
 
         _log.info('Added new data to specklia dataset ID %s.', dataset_id)

{specklia-1.9.12 → specklia-1.9.14}/specklia.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: specklia
-Version: 1.9.12
+Version: 1.9.14
 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.12 → specklia-1.9.14}/tests/test_client.py

@@ -104,7 +104,8 @@ def test_add_points_to_dataset(
         call('https://localhost/ingest',
              json={'dataset_id': 'dummy_dataset',
                    'new_points': [
-                       {'source': {'reference': 'cheese'}, 'chunk_set_uuid': 'brian'}]},
+                       {'source': {'reference': 'cheese'}, 'chunk_set_uuid': 'brian'}],
+                   'duplicate_source_behaviour': 'error'},
              headers={'Authorization': 'Bearer fake_token'})])