Implement OGC API Features Part 4 transactions for Senosorthings provider

docs/source/data-publishing/ogcapi-features.rst

@@ -31,7 +31,7 @@ parameters.
    `Parquet`_,✅/✅,results/hits,✅,✅,❌,✅,❌,❌,✅
    `PostgreSQL`_,✅/✅,results/hits,✅,✅,✅,✅,✅,✅,✅
    `SQLiteGPKG`_,✅/❌,results/hits,✅,❌,❌,✅,❌,❌,✅
-   `SensorThings API`_,✅/✅,results/hits,✅,✅,✅,✅,❌,❌,✅
+   `SensorThings API`_,✅/✅,results/hits,✅,✅,✅,✅,❌,✅,✅
    `Socrata`_,✅/✅,results/hits,✅,✅,✅,✅,❌,❌,✅
    `TinyDB`_,✅/✅,results/hits,✅,✅,✅,✅,❌,✅,✅
 

pygeoapi/provider/sensorthings.py

@@ -3,7 +3,7 @@
 # Authors: Benjamin Webb <[email protected]>
 # Authors: Tom Kralidis <[email protected]>
 #
-# Copyright (c) 2024 Benjamin Webb
+# Copyright (c) 2025 Benjamin Webb
 # Copyright (c) 2022 Tom Kralidis
 #
 # Permission is hereby granted, free of charge, to any person
@@ -32,13 +32,16 @@
 from json.decoder import JSONDecodeError
 import logging
 from requests import Session
+from requests.exceptions import ConnectionError
 from urllib.parse import urlparse
 
 from pygeoapi.config import get_config
 from pygeoapi.provider.base import (
-    BaseProvider, ProviderQueryError, ProviderConnectionError)
+    BaseProvider, ProviderQueryError, ProviderConnectionError,
+    ProviderInvalidDataError)
 from pygeoapi.util import (
-    url_join, get_provider_default, crs_transform, get_base_url)
+    url_join, get_provider_default, crs_transform, get_base_url,
+    get_typed_value)
 
 LOGGER = logging.getLogger(__name__)
 
@@ -101,12 +104,16 @@ def get_fields(self):
         :returns: dict of fields
         """
         if not self._fields:
-            r = self._get_response(self._url, {'$top': 1})
             try:
+                r = self._get_response(self._url, {'$top': 1})
                 results = r['value'][0]
             except IndexError:
                 LOGGER.warning('could not get fields; returning empty set')
                 return {}
+            except (ConnectionError, ProviderConnectionError):
+                msg = f'Unable to contact SensorThings endpoint at {self._url}'
+                LOGGER.error(msg)
+                raise ProviderConnectionError(msg)
 
             for (n, v) in results.items():
                 if isinstance(v, (int, float)) or \
@@ -155,6 +162,65 @@ def get(self, identifier, **kwargs):
         response = self._get_response(f'{self._url}({identifier})')
         return self._make_feature(response)
 
+    def create(self, item):
+        """
+        Create a new item
+
+        :param item: `dict` of new item
+
+        :returns: identifier of created item
+        """
+        response = self.http.post(self._url, json=item)
+
+        if response.status_code == 201:
+            location = response.headers.get("Location")
+            iotid = location[location.find("(")+1:location.find(")")]
+
+            LOGGER.debug(f'Feature created with @iot.id: {iotid}')
+            return get_typed_value(iotid)
+        else:
+            msg = f"Failed to create item: {response.text}"
+            raise ProviderInvalidDataError(msg)
+
+    def update(self, identifier, item):
+        """
+        Updates an existing item
+
+        :param identifier: feature id
+        :param item: `dict` of partial or full item
+
+        :returns: `bool` of update result
+        """
+        id = f"'{identifier}'" \
+             if isinstance(identifier, str) else str(identifier)
+        LOGGER.debug(f'Updating @iot.id: {id}')
+        response = self.http.put(f"{self._url}({id})", json=item)
+
+        if response.status_code == 200:
+            return True
+        else:
+            msg = f'Failed to update item: {response.text}'
+            raise ProviderConnectionError(msg)
+
+    def delete(self, identifier):
+        """
+        Deletes an existing item
+
+        :param identifier: item id
+
+        :returns: `bool` of deletion result
+        """
+        id = f"'{identifier}'" \
+             if isinstance(identifier, str) else str(identifier)
+        LOGGER.debug(f'Deleting @iot.id: {id}')
+        response = self.http.delete(f"{self._url}({id})")
+
+        if response.status_code == 200:
+            return True
+        else:
+            msg = f"Failed to delete item: {response.text}"
+            raise ProviderConnectionError(msg)
+
     def _load(self, offset=0, limit=10, resulttype='results',
               bbox=[], datetime_=None, properties=[], sortby=[],
               select_properties=[], skip_geometry=False, q=None):
@@ -208,13 +274,13 @@ def _load(self, offset=0, limit=10, resulttype='results',
         v = response.get('value')
         while len(v) < limit:
             try:
-                LOGGER.debug('Fetching next set of values')
-                next_ = response['@iot.nextLink']
-
                 # Ensure we only use provided network location
-                next_ = next_.replace(urlparse(next_).netloc,
-                                      urlparse(self.data).netloc)
+                next_ = urlparse(response['@iot.nextLink'])._replace(
+                    scheme=self.parsed_url.scheme,
+                    netloc=self.parsed_url.netloc
+                ).geturl()
 
+                LOGGER.debug('Fetching next set of values')
                 response = self._get_response(next_)
                 v.extend(response['value'])
             except (ProviderConnectionError, KeyError):
@@ -517,6 +583,8 @@ def _generate_mappings(self, provider_def: dict):
             self._url = self.data
             self.data = self._url.rstrip(f'/{self.entity}')
 
+        self.parsed_url = urlparse(self.data)
+
         # Default id
         if self.id_field:
             LOGGER.debug(f'Using id field: {self.id_field}')

tests/test_sensorthings_provider.py

@@ -2,7 +2,7 @@
 #
 # Authors: Benjamin Webb <[email protected]>
 #
-# Copyright (c) 2024 Benjamin Webb
+# Copyright (c) 2025 Benjamin Webb
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -44,6 +44,27 @@ def config():
     }
 
 
+@pytest.fixture()
+def post_body():
+    return {
+        '@iot.id': 121,
+        'name': 'Temperature Datastream',
+        'description': 'Datastream for measuring temperature in Celsius.',
+        'observationType': 'http://www.opengis.net/def/observationType/OGC-OM/2.0/OM_Measurement', # noqa
+        'unitOfMeasurement': {
+            'name': 'Degree Celsius',
+            'symbol': 'degC',
+            'definition': 'http://www.qudt.org/qudt/owl/1.0.0/unit/Instances.html#DegreeCelsius' # noqa
+        },
+        'Thing': {'@iot.id': 2},
+        'ObservedProperty': {'@iot.id': 3},
+        'Sensor': {'@iot.id': 5},
+        'properties': {
+            'uri': 'https://geoconnex.us/test/datastream'
+        }
+    }
+
+
 def test_query_datastreams(config):
     p = SensorThingsProvider(config)
     fields = p.get_fields()
@@ -162,3 +183,28 @@ def test_custom_expand(config):
     assert 'Observations' in fields
     assert 'ObservedProperty' not in fields
     assert 'Sensor' not in fields
+
+
+def test_transactions(config, post_body):
+    p = SensorThingsProvider(config)
+    results = p.query(resulttype='hits')
+    assert results['numberMatched'] == 120
+
+    id = p.create(post_body)
+    assert id == 121
+    results = p.query(resulttype='hits')
+    assert results['numberMatched'] == 121
+
+    datastream = p.get(121)
+    assert datastream['properties']['name'] == 'Temperature Datastream'
+
+    post_body['name'] = 'Temperature'
+    result = p.update(id, post_body)
+    assert result is True
+
+    datastream = p.get(121)
+    assert datastream['properties']['name'] == 'Temperature'
+
+    assert p.delete(id) is True
+    results = p.query(resulttype='hits')
+    assert results['numberMatched'] == 120