staplus-client 0.3.4__tar.gz → 0.4.2__tar.gz

{staplus_client-0.3.4/staplus_client.egg-info → staplus_client-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: staplus-client
-Version: 0.3.4
+Version: 0.4.2
 Summary: A client library to facilitate interaction with a STAplus Server
 Home-page: https://github.com/securedimensions/STAplus-Python-Client
 Author: Andreas Matheus
@@ -17,7 +17,7 @@ Requires-Dist: requests>=2.26.0
 Requires-Dist: jsonpatch
 Requires-Dist: python-dateutil
 Requires-Dist: pillow
-Requires-Dist: sd-frost-sta-client
+Requires-Dist: sd-frost-sta-client>=1.1.47
 Dynamic: author
 Dynamic: author-email
 Dynamic: description
@@ -31,7 +31,7 @@ Dynamic: summary
 
 # OGC STAplus (SensorThings) API Python Client
 
-This STAplus Python Client implements the [STAplus](https://docs.ogc.org/is/22-022r1/22-022r1.html) API. The aim is to simplify development of STAplus and SensorThings enabled client applications.
+This STAplus Python Client implements the STAplus 1.0 Corrigendum (not published yet) on [STAplus](https://docs.ogc.org/is/22-022r1/22-022r1.html) API. The aim is to simplify development of STAplus and SensorThings enabled client applications.
 
 **_NOTE:_** This implementation is an extension to the [FROST API Python Client](https://github.com/FraunhoferIOSB/FROST-Python-Client). To have better control over bug fixing and improvements, this implementation is actually based on a fork of the FROST API Python Client, hosted on a Secure Dimensions Github repository: [STA Python Client](https://github.com/securedimensions/STA-Python-Client).
 
@@ -51,6 +51,21 @@ This library requires Python 3.11 or better to support parsing ISO datetime valu
 ## Installation via PyPi
 Installation via pip: `pip install staplus-client`
 
+## Combined with STA-DGGS
+
+The STAplus `Cell` entity lives in the [STA-DGGS Python Client](https://github.com/securedimensions/STA-DGGS-Python-Client). A client that needs both STAplus (Party, License, Campaign, …) and Cell uses `compose()`. That returns one service whose Datastream, MultiDatastream, and Observation classes carry both models. Install `sta-dggs-client` in addition to `staplus-client`. `compose()` accepts the same constructor arguments as STA-Python-Client (`url`, `auth_handler`, `proxies`).
+
+```python
+import staplus_client as plus
+import sta_dggs_client as dggs
+service = dggs.compose(url, auth_handler=auth)
+ds = plus.Datastream(name='Temperature', description='temp',
+                     party=party, cell=cell)
+mds = plus.MultiDatastream(name='Air quality', description='multi',
+                           party=party, cell=cell)
+obs = plus.Observation(result=21.5, cell=cell)
+```
+
 ## Limitations
 This implementation has the following limitations for the Entity `Location` and `FeatureOfInterest`:
 

{staplus_client-0.3.4 → staplus_client-0.4.2}/README.md

@@ -1,6 +1,6 @@
 # OGC STAplus (SensorThings) API Python Client
 
-This STAplus Python Client implements the [STAplus](https://docs.ogc.org/is/22-022r1/22-022r1.html) API. The aim is to simplify development of STAplus and SensorThings enabled client applications.
+This STAplus Python Client implements the STAplus 1.0 Corrigendum (not published yet) on [STAplus](https://docs.ogc.org/is/22-022r1/22-022r1.html) API. The aim is to simplify development of STAplus and SensorThings enabled client applications.
 
 **_NOTE:_** This implementation is an extension to the [FROST API Python Client](https://github.com/FraunhoferIOSB/FROST-Python-Client). To have better control over bug fixing and improvements, this implementation is actually based on a fork of the FROST API Python Client, hosted on a Secure Dimensions Github repository: [STA Python Client](https://github.com/securedimensions/STA-Python-Client).
 
@@ -20,6 +20,21 @@ This library requires Python 3.11 or better to support parsing ISO datetime valu
 ## Installation via PyPi
 Installation via pip: `pip install staplus-client`
 
+## Combined with STA-DGGS
+
+The STAplus `Cell` entity lives in the [STA-DGGS Python Client](https://github.com/securedimensions/STA-DGGS-Python-Client). A client that needs both STAplus (Party, License, Campaign, …) and Cell uses `compose()`. That returns one service whose Datastream, MultiDatastream, and Observation classes carry both models. Install `sta-dggs-client` in addition to `staplus-client`. `compose()` accepts the same constructor arguments as STA-Python-Client (`url`, `auth_handler`, `proxies`).
+
+```python
+import staplus_client as plus
+import sta_dggs_client as dggs
+service = dggs.compose(url, auth_handler=auth)
+ds = plus.Datastream(name='Temperature', description='temp',
+                     party=party, cell=cell)
+mds = plus.MultiDatastream(name='Air quality', description='multi',
+                           party=party, cell=cell)
+obs = plus.Observation(result=21.5, cell=cell)
+```
+
 ## Limitations
 This implementation has the following limitations for the Entity `Location` and `FeatureOfInterest`:
 

staplus_client-0.4.2/setup.cfg

@@ -0,0 +1,11 @@
+[project]
+name = "staplus_client"
+dynamic = ["version"]
+
+[tool.setuptools.dynamic]
+version = {attr = "package.__version__"}
+
+[egg_info]
+tag_build = 
+tag_date = 0
+

{staplus_client-0.3.4 → staplus_client-0.4.2}/setup.py

@@ -22,6 +22,7 @@ setup(
     packages=find_packages(exclude="tests"),
     #data_files=[('.',['__version__.py'])],
     install_requires=['demjson3>=3.0.5', 'furl>=2.1.3', 'geojson>=2.5.0', 'jsonpickle>=2.0.0',
-                      'requests>=2.26.0', 'jsonpatch', 'python-dateutil', 'pillow', 'sd-frost-sta-client'],
+                      'requests>=2.26.0', 'jsonpatch', 'python-dateutil', 'pillow',
+                      'sd-frost-sta-client>=1.1.47'],
     keywords=['ogc', 'staplus', 'sensorthingsapi', 'IoT']
 )

{staplus_client-0.3.4 → staplus_client-0.4.2}/staplus_client/__init__.py

@@ -18,7 +18,14 @@ from staplus_client import dao
 from staplus_client import service
 from staplus_client import query
 
-from staplus_client.model.party import Party
+from staplus_client.model.party import Party, PARTY_ROLE_CODES, PARTY_ROLE_INDIVIDUAL, PARTY_ROLE_INSTITUTIONAL, PARTY_ROLE_SYSTEM
+from staplus_client.model.ext.datatypes import (
+    ENCODING_TYPES,
+    ENCODING_TYPE_GEOJSON,
+    ENCODING_TYPE_GEOJSON_VND,
+    ENCODING_TYPE_JSON_FG,
+    ENCODING_TYPE_WKT,
+)
 from staplus_client.model.license import License
 from staplus_client.model.thing import Thing
 from staplus_client.model.datastream import Datastream
@@ -36,6 +43,7 @@ from staplus_client.model.ext.entity_type import EntityTypes
 from staplus_client.model.ext.unitofmeasurement import UnitOfMeasurement
 from staplus_client.service.staplusservice import STAplusService
 
+
 import jsonpickle
 import demjson3
 

{staplus_client-0.3.4 → staplus_client-0.4.2}/staplus_client/__version__.py

@@ -1,5 +1,5 @@
 __title__ = 'staplus-client'
-__version__ = '0.3.4'
+__version__ = '0.4.2'
 __license__ = 'LGPL3'
 __author__ = 'Andreas Matheus'
 __copyright__ = 'Secure Dimensions'

{staplus_client-0.3.4 → staplus_client-0.4.2}/staplus_client/model/campaign.py

@@ -16,6 +16,7 @@ from datetime import datetime
 
 from frost_sta_client.utils import check_datetime
 from staplus_client.utils import transform_json_to_entity_list
+from staplus_client.model.ext.datatypes import check_url
 from staplus_client.model import entity, datastream, multi_datastream, license, observation_group, party
 from staplus_client.model.ext import entity_list, entity_type
 from staplus_client.dao.campaign import CampaignDao
@@ -60,9 +61,9 @@ class Campaign(entity.Entity):
     def __new__(cls, *args, **kwargs):
         new_campaign = super().__new__(cls)
         attributes = {'_id': None, '_name': '', '_description': '', '_classification': None, '_terms_of_use': '',
-                      '_privacy_statement': None, '_creation_time': '', '_start_time': None, '_end_start': None,
+                      '_privacy_policy': None, '_creation_time': '', '_start_time': None, '_end_time': None,
                       '_url': None, '_properties': None,
-                      '_datastreams': None, '_multi_datastreams': None, 'observation_groups': None,
+                      '_datastreams': None, '_multi_datastreams': None, '_observation_groups': None,
                       '_party': None, '_license': None,
                       '_self_link': '', '_service': None}
         for key, value in attributes.items():
@@ -173,12 +174,7 @@ class Campaign(entity.Entity):
 
     @url.setter
     def url(self, value):
-        if value is None:
-            self._url = None
-            return
-        if not isinstance(value, str):
-            raise ValueError('url should be of type str!')
-        self._url = value
+        self._url = check_url(value, 'url')
 
     @property
     def properties(self):
@@ -249,7 +245,7 @@ class Campaign(entity.Entity):
             self._observation_groups = None
             return
         if isinstance(values, list) and all(isinstance(gs, observation_group.ObservationGroup) for gs in values):
-            entity_class = entity_type.EntityTypes['ObservationGroups']['class']
+            entity_class = entity_type.EntityTypes['ObservationGroup']['class']
             self._observation_groups = entity_list.EntityList(entity_class=entity_class, entities=values)
             return
         if not isinstance(values, entity_list.EntityList) or \
@@ -289,7 +285,7 @@ class Campaign(entity.Entity):
             return
         raise ValueError('license should be of type License!')
 
-    def get_licence(self):
+    def get_license(self):
         result = self.service.license()
         result.parent = self
         return result
@@ -358,7 +354,7 @@ class Campaign(entity.Entity):
             data['endTime'] = datetime.fromisoformat(self.end_time)
         if self.url is not None and self.url != '':
             data['url'] = self.url
-        if self.properties is not None and self.terms_of_use != {}:
+        if self.properties is not None and self.properties != {}:
             data['properties'] = self.properties
         if self._datastreams is not None and len(self.datastreams.entities) > 0:
             data['Datastreams'] = self.datastreams.__getstate__()

{staplus_client-0.3.4 → staplus_client-0.4.2}/staplus_client/model/datastream.py

@@ -16,11 +16,12 @@
 from frost_sta_client.model import datastream
 from staplus_client import utils
 from staplus_client.model.ext import entity_list, entity_type
+from staplus_client.model.ext.cell_attribute import CellAttribute
 from staplus_client.dao.datastream import DatastreamDao
 from staplus_client.model import license, party, campaign
 
 
-class Datastream(datastream.Datastream):
+class Datastream(CellAttribute, datastream.Datastream):
 
     def __init__(self,
                  name='',
@@ -38,6 +39,7 @@ class Datastream(datastream.Datastream):
                  campaigns=None,
                  party=None,
                  license=None,
+                 cell=None,
                  **kwargs):
         super().__init__(name, description, observation_type, unit_of_measurement,
                          observed_area, properties, phenomenon_time, result_time, thing,
@@ -45,12 +47,13 @@ class Datastream(datastream.Datastream):
         self.campaigns = campaigns
         self.party = party
         self.license = license
+        self.cell = cell
 
     def __new__(cls, *args, **kwargs):
-        new_datastream = super().__new__(cls, args, kwargs)
-        attributes = dict(_campaigns=None, _party=None, _license=None, _self_link='', _service=None)
+        new_datastream = super().__new__(cls, *args, **kwargs)
+        attributes = dict(_campaigns=None, _party=None, _license=None, _cell=None, _self_link='', _service=None)
         for key, value in attributes.items():
-            new_datastream.__dict__[key] = value
+            new_datastream.__dict__.setdefault(key, value)
         return new_datastream
 
     @property
@@ -99,7 +102,7 @@ class Datastream(datastream.Datastream):
         result = self.service.observed_property()
         result.parent = self
         return result
-
+    
     @property
     def campaigns(self):
         return self._campaigns
@@ -109,7 +112,7 @@ class Datastream(datastream.Datastream):
         if values is None:
             self._campaigns = None
             return
-        if isinstance(values, list) and all(isinstance(ps, campaign.Campaign) for ps in values):
+        if isinstance(values, list) and all(isinstance(cs, campaign.Campaign) for cs in values):
             entity_class = entity_type.EntityTypes['Campaign']['class']
             self._campaigns = entity_list.EntityList(entity_class=entity_class, entities=values)
             return
@@ -131,12 +134,14 @@ class Datastream(datastream.Datastream):
             self.license.set_service(service)
         if self.campaigns is not None:
             self.campaigns.set_service(service)
+        if self.cell is not None and hasattr(self.cell, 'set_service'):
+            self.cell.set_service(service)
 
     def __getstate__(self):
         data = super().__getstate__()
-        if self.party is not None:
+        if self._party is not None:
             data['Party'] = self.party
-        if self.license is not None:
+        if self._license is not None:
             data['License'] = self.license
         if self._campaigns is not None and len(self.campaigns.entities) > 0:
             data['Campaigns'] = self.campaigns.__getstate__()

{staplus_client-0.3.4 → staplus_client-0.4.2}/staplus_client/model/entity.py

@@ -17,6 +17,11 @@ from frost_sta_client.model import entity
 from staplus_client.service.staplusservice import STAplusService
 
 class Entity(entity.Entity):
+    @property
+    def service(self):
+        return self._service
+
+    @service.setter
     def service(self, value):
         if value is None or isinstance(value, STAplusService):
             self._service = value

staplus_client-0.4.2/staplus_client/model/ext/cell_attribute.py

@@ -0,0 +1,33 @@
+# Copyright (C) 2026 Secure Dimensions GmbH, Munich, Germany.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from typing import Any
+
+
+class CellAttribute:
+    """
+    Optional Cell navigation for type checkers and for sta_dggs_client.compose().
+
+    Cell JSON round-trip is provided by STA-DGGS when the clients are composed.
+    The value is typically a sta_dggs_client.model.cell.Cell instance.
+    """
+
+    @property
+    def cell(self) -> Any:
+        return getattr(self, '_cell', None)
+
+    @cell.setter
+    def cell(self, value: Any) -> None:
+        self._cell = value

staplus_client-0.4.2/staplus_client/model/ext/datatypes.py

@@ -0,0 +1,86 @@
+# Copyright (C) 2023-2024 Secure Dimensions GmbH, Munich, Germany.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import re
+from urllib.parse import urlparse
+
+# STAplus 1.0 clause 13 media types for FeatureOfInterest and Location.encodingType.
+# application/vnd.geo+json is the SensorThings 1.0 Table 8-6 ValueCode (STAplus extends STA 1.0).
+ENCODING_TYPE_GEOJSON = 'application/geo+json'
+ENCODING_TYPE_GEOJSON_VND = 'application/vnd.geo+json'
+ENCODING_TYPE_JSON_FG = 'application/vnd.ogc.fg+json'
+ENCODING_TYPE_WKT = 'application/wkt'
+ENCODING_TYPES = (
+    ENCODING_TYPE_GEOJSON,
+    ENCODING_TYPE_GEOJSON_VND,
+    ENCODING_TYPE_JSON_FG,
+    ENCODING_TYPE_WKT,
+)
+
+_URI_SCHEME = re.compile(r'^[A-Za-z][A-Za-z0-9+.-]*$')
+_URL_SCHEMES = ('http', 'https')
+
+
+def is_uri(value):
+    if not isinstance(value, str):
+        return False
+    value = value.strip()
+    if not value or any(ch.isspace() for ch in value):
+        return False
+    parsed = urlparse(value)
+    if not parsed.scheme or not _URI_SCHEME.fullmatch(parsed.scheme):
+        return False
+    if parsed.scheme.lower() in _URL_SCHEMES or parsed.scheme.lower() in ('ftp', 'ftps'):
+        return bool(parsed.netloc)
+    return bool(parsed.netloc or parsed.path)
+
+
+def is_url(value):
+    if not is_uri(value):
+        return False
+    parsed = urlparse(value)
+    return parsed.scheme.lower() in _URL_SCHEMES and bool(parsed.netloc)
+
+
+def check_encoding_type(value, field_name='encodingType'):
+    if value is None or value == '':
+        return None
+    if not isinstance(value, str):
+        raise ValueError(f'{field_name} should be of type str!')
+    if value not in ENCODING_TYPES:
+        raise ValueError(
+            f'{field_name} should be one of: {", ".join(ENCODING_TYPES)}'
+        )
+    return value
+
+
+def check_uri(value, field_name='URI'):
+    if value is None or value == '':
+        return None
+    if not isinstance(value, str):
+        raise ValueError(f'{field_name} should be of type str!')
+    if not is_uri(value):
+        raise ValueError(f'{field_name} should be a URI!')
+    return value
+
+
+def check_url(value, field_name='URL'):
+    if value is None or value == '':
+        return None
+    if not isinstance(value, str):
+        raise ValueError(f'{field_name} should be of type str!')
+    if not is_url(value):
+        raise ValueError(f'{field_name} should be a URL!')
+    return value

{staplus_client-0.3.4 → staplus_client-0.4.2}/staplus_client/model/ext/entity_list.py

@@ -16,8 +16,9 @@
 import logging
 import requests
 
+import staplus_client
 from staplus_client.service.staplusservice import STAplusService
-from staplus_client.model.entity import Entity
+from frost_sta_client.model.entity import Entity as FrostEntity
 from frost_sta_client.model.ext import entity_list
 
 class EntityList(entity_list.EntityList):
@@ -68,8 +69,13 @@ class EntityList(entity_list.EntityList):
         for entity in self.entities:
             entity.set_service(service)
 
+    @property
+    def entities(self):
+        return self._entities
+
+    @entities.setter
     def entities(self, values):
-        if isinstance(values, list) and all(isinstance(v, Entity) for v in values):
+        if isinstance(values, list) and all(isinstance(v, FrostEntity) for v in values):
             self._entities = values
             return
         raise ValueError('entities should be a list of STAplus entities')

{staplus_client-0.3.4 → staplus_client-0.4.2}/staplus_client/model/ext/entity_type.py

@@ -18,13 +18,13 @@ EntityTypes = {
         'singular': 'Datastream',
         'plural': 'Datastreams',
         'class': 'staplus_client.model.datastream.Datastream',
-        'relations_list': ['Sensor', 'Thing', 'ObservedProperty', 'Observations', 'Party', 'License', 'Campaign']
+        'relations_list': ['Sensor', 'Thing', 'ObservedProperty', 'Observations', 'Party', 'License', 'Campaigns']
     },
     'MultiDatastream': {
         'singular': 'MultiDatastream',
         'plural': 'MultiDatastreams',
         'class': 'staplus_client.model.multi_datastream.MultiDatastream',
-        'relations_list': ['Sensor', 'Thing', 'ObservedProperties', 'Observations', 'Party', 'License', 'Campaign']
+        'relations_list': ['Sensor', 'Thing', 'ObservedProperties', 'Observations', 'Party', 'License', 'Campaigns']
     },
     'FeatureOfInterest': {
         'singular': 'FeatureOfInterest',
@@ -54,7 +54,7 @@ EntityTypes = {
         'singular': 'Observation',
         'plural': 'Observations',
         'class': 'staplus_client.model.observation.Observation',
-        'relations_list': ['FeatureOfInterest', 'Datastream', 'MultiDatastream', 'Subjects', 'Objects']
+        'relations_list': ['FeatureOfInterest', 'Datastream', 'MultiDatastream', 'Subjects', 'Objects', 'ObservationGroups']
     },
     'Thing': {
         'singular': 'Thing',
@@ -129,14 +129,24 @@ EntityTypes = {
         'plural': 'Relations',
         'class': 'staplus_client.model.relation.Relation',
         'relations_list': ['Subject', 'Object', 'ObservationGroups']
-    }
+    },
 }
 
 list_for_class = {}
-for key, entity_type in EntityTypes.items():
-    list_for_class[entity_type["class"]] = entity_type["plural"]
+
+
+def rebuild_class_index():
+    list_for_class.clear()
+    for entity_type in EntityTypes.values():
+        list_for_class[entity_type["class"]] = entity_type["plural"]
+
+
+rebuild_class_index()
 
 
 def get_list_for_class(clazz):
-    clazz_name = clazz.__module__ + "." + clazz.__name__
-    return list_for_class[clazz_name]
+    for base in clazz.__mro__:
+        clazz_name = base.__module__ + "." + base.__name__
+        if clazz_name in list_for_class:
+            return list_for_class[clazz_name]
+    raise KeyError(clazz.__module__ + "." + clazz.__name__)

staplus_client-0.4.2/staplus_client/model/feature_of_interest.py

@@ -0,0 +1,40 @@
+from frost_sta_client.model import feature_of_interest
+from staplus_client.dao.features_of_interest import FeaturesOfInterestDao
+from staplus_client.model.ext.datatypes import (
+    ENCODING_TYPE_GEOJSON,
+    ENCODING_TYPE_GEOJSON_VND,
+    ENCODING_TYPE_JSON_FG,
+    ENCODING_TYPE_WKT,
+    ENCODING_TYPES,
+    check_encoding_type,
+)
+
+class FeatureOfInterest(feature_of_interest.FeatureOfInterest):
+
+    ENCODING_TYPE_GEOJSON = ENCODING_TYPE_GEOJSON
+    ENCODING_TYPE_GEOJSON_VND = ENCODING_TYPE_GEOJSON_VND
+    ENCODING_TYPE_JSON_FG = ENCODING_TYPE_JSON_FG
+    ENCODING_TYPE_WKT = ENCODING_TYPE_WKT
+    ENCODING_TYPES = ENCODING_TYPES
+
+    @property
+    def encoding_type(self):
+        return self._encoding_type
+
+    @encoding_type.setter
+    def encoding_type(self, value):
+        self._encoding_type = check_encoding_type(value)
+
+
+    def clone(self):
+        entity = self.__class__()
+        entity.id = self.id
+        return entity
+
+    def get_observations(self):
+        result = self.service.observations()
+        result.parent = self
+        return result
+
+    def get_dao(self, service):
+        return FeaturesOfInterestDao(service)

{staplus_client-0.3.4 → staplus_client-0.4.2}/staplus_client/model/license.py

@@ -15,6 +15,7 @@
 
 from staplus_client import utils
 from staplus_client.model import entity, campaign, datastream, multi_datastream, observation_group
+from staplus_client.model.ext.datatypes import check_uri
 from staplus_client.model.ext import entity_list, entity_type
 from staplus_client.dao.license import LicenseDao
 
@@ -86,12 +87,7 @@ class License(entity.Entity):
 
     @definition.setter
     def definition(self, value):
-        if value is None:
-            self._definition = None
-            return
-        if not isinstance(value, str):
-            raise ValueError('definition should be of type str!')
-        self._definition = value
+        self._definition = check_uri(value, 'definition')
 
     @property
     def logo(self):
@@ -100,7 +96,7 @@ class License(entity.Entity):
     @logo.setter
     def logo(self, value):
         if value is None:
-            self._value = None
+            self._logo = None
             return
         if not isinstance(value, str):
             raise ValueError('logo should be of type str!')
@@ -245,6 +241,8 @@ class License(entity.Entity):
 
     def __getstate__(self):
         data = super().__getstate__()
+        if self.name is not None and self.name != '':
+            data['name'] = self.name
         if self.description is not None and self.description != '':
             data['description'] = self.description
         if self.definition is not None and self.definition != '':

staplus_client-0.4.2/staplus_client/model/location.py

@@ -0,0 +1,45 @@
+from frost_sta_client.model import location
+from staplus_client.dao.location import LocationDao
+from staplus_client.model.ext.datatypes import (
+    ENCODING_TYPE_GEOJSON,
+    ENCODING_TYPE_GEOJSON_VND,
+    ENCODING_TYPE_JSON_FG,
+    ENCODING_TYPE_WKT,
+    ENCODING_TYPES,
+    check_encoding_type,
+)
+
+class Location(location.Location):
+
+    ENCODING_TYPE_GEOJSON = ENCODING_TYPE_GEOJSON
+    ENCODING_TYPE_GEOJSON_VND = ENCODING_TYPE_GEOJSON_VND
+    ENCODING_TYPE_JSON_FG = ENCODING_TYPE_JSON_FG
+    ENCODING_TYPE_WKT = ENCODING_TYPE_WKT
+    ENCODING_TYPES = ENCODING_TYPES
+
+    @property
+    def encoding_type(self):
+        return self._encoding_type
+
+    @encoding_type.setter
+    def encoding_type(self, value):
+        self._encoding_type = check_encoding_type(value)
+
+
+    def clone(self):
+        entity = self.__class__()
+        entity.id = self.id
+        return entity
+    
+    def get_things(self):
+        result = self.service.things()
+        result.parent = self
+        return result
+    
+    def get_historical_locations(self):
+        result = self.service.historical_locations()
+        result.parent = self
+        return result
+
+    def get_dao(self, service):
+        return LocationDao(service)

{staplus_client-0.3.4 → staplus_client-0.4.2}/staplus_client/model/multi_datastream.py

@@ -16,10 +16,11 @@
 from frost_sta_client.model import multi_datastream
 from staplus_client import utils
 from staplus_client.model.ext import entity_list, entity_type
+from staplus_client.model.ext.cell_attribute import CellAttribute
 from staplus_client.dao.multi_datastream import MultiDatastreamDao
 from staplus_client.model import license, campaign, party
 
-class MultiDatastream(multi_datastream.MultiDatastream):
+class MultiDatastream(CellAttribute, multi_datastream.MultiDatastream):
     def __init__(self,
                  name='',
                  description='',
@@ -37,6 +38,7 @@ class MultiDatastream(multi_datastream.MultiDatastream):
                  campaigns=None,
                  party=None,
                  license=None,
+                 cell=None,
                  **kwargs):
         super().__init__(name, description, properties, unit_of_measurements, observation_type,
                          multi_observation_data_types, observed_area, phenomenon_time, result_time,
@@ -44,12 +46,13 @@ class MultiDatastream(multi_datastream.MultiDatastream):
         self.party = party
         self.license = license
         self.campaigns = campaigns
+        self.cell = cell
 
     def __new__(cls, *args, **kwargs):
-        new_mds = super().__new__(cls, args, kwargs)
-        attributes = dict( _campaigns=None, _party=None, _license=None, _self_link='', _service=None)
+        new_mds = super().__new__(cls, *args, **kwargs)
+        attributes = dict(_campaigns=None, _party=None, _license=None, _cell=None, _self_link='', _service=None)
         for key, value in attributes.items():
-            new_mds.__dict__[key] = value
+            new_mds.__dict__.setdefault(key, value)
         return new_mds
 
     @property
@@ -125,6 +128,8 @@ class MultiDatastream(multi_datastream.MultiDatastream):
             self.license.set_service(service)
         if self.campaigns is not None:
             self.campaigns.set_service(service)
+        if self.cell is not None and hasattr(self.cell, 'set_service'):
+            self.cell.set_service(service)
 
     def __getstate__(self):
         data = super().__getstate__()
@@ -134,7 +139,6 @@ class MultiDatastream(multi_datastream.MultiDatastream):
             data['License'] = self.license
         if self._campaigns is not None and len(self.campaigns.entities) > 0:
             data['Campaigns'] = self.campaigns.__getstate__()
-
         return data
 
     def __setstate__(self, state):