split in code + test

Author: chicco785

src/conftest.py

@@ -68,9 +68,10 @@ def insert(self, entity, service=None, service_path=None):
         return r
 
     def update_attr(self, entity_id, attrs, service=None, service_path=None):
-        r = requests.patch('{}/v2/entities/{}/attrs'.format(self.url, entity_id),
-                           data=json.dumps(attrs),
-                           headers=headers(service, service_path))
+        r = requests.patch(
+            '{}/v2/entities/{}/attrs'.format(self.url, entity_id),
+            data=json.dumps(attrs),
+            headers=headers(service, service_path))
         return r
 
     def delete(self, entity_id, service=None, service_path=None):
@@ -173,7 +174,8 @@ def delete_entities(self, entity_type=None, fiware_service=None,
 
         def entity_types(self, fiware_service=None, **kwargs):
             r = CrateTranslator.query_entity_types(
-                self, entity_type=None, fiware_service=fiware_service, **kwargs)
+                self, entity_type=None, fiware_service=fiware_service,
+                **kwargs)
             try:
                 self._refresh(r, fiware_service=fiware_service)
             except exceptions.ProgrammingError:
@@ -193,7 +195,9 @@ def clean(self, fiware_service=None, **kwargs):
                 except exceptions.ProgrammingError:
                     pass
 
-    with Translator(CrateConnectionData(host=crate_host, port=crate_port, db_user=crate_db_username, db_pass=crate_db_password)) as trans:
+    with Translator(CrateConnectionData(host=crate_host, port=crate_port,
+                                        db_user=crate_db_username,
+                                        db_pass=crate_db_password)) as trans:
         yield trans
         trans.dispose_connection()
 
@@ -226,7 +230,8 @@ def delete_entities(self, entity_type=None, fiware_service=None,
 
         def entity_types(self, fiware_service=None, **kwargs):
             r = PostgresTranslator.query_entity_types(
-                self, entity_type=None, fiware_service=fiware_service, **kwargs)
+                self, entity_type=None, fiware_service=fiware_service,
+                **kwargs)
             return r
 
         def clean(self, fiware_service=None, **kwargs):
@@ -527,7 +532,10 @@ def ngsi_ld():
             "type": "GeoProperty",
             "value": {
                 "type": "Point",
-                "coordinates": [-3.164485591715449, 40.62785133667262]
+                "coordinates": [
+                    -3.164485591715449,
+                    40.62785133667262
+                ]
             }
         },
         "areaServed": {
@@ -574,9 +582,52 @@ def ngsi_ld():
             }
         },
         "@context": [
-            "https://schema.lab.fiware.org/ld/context",
+            "https://smartdatamodels.org/context.jsonld",
             "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
         ]
     }
 
     return entity
+
+
+@pytest.fixture
+def ngsi_ld_partially_expanded():
+    """
+    :return: dict
+        The NGSI LD model as received within an Orion notification.
+    """
+    entity = {
+        "@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld",
+        "id": "urn:ngsi-ld:Building:farm001",
+        "type": "https://uri.fiware.org/ns/data-models#Building",
+        "https://schema.org/address": {
+            "type": "Property",
+            "value": {
+                "streetAddress": "Großer Stern 1",
+                "addressRegion": "Berlin",
+                "addressLocality": "Tiergarten",
+                "postalCode": "10557"
+            },
+            "verified": {
+                "type": "Property",
+                "value": True
+            }
+        },
+        "name": {
+            "type": "Property",
+            "value": "Victory Farm"
+        },
+        "https://uri.fiware.org/ns/data-models#category": {
+            "type": "Property",
+            "value": "farm"
+        },
+        "location": {
+            "type": "GeoProperty",
+            "value": {
+                "type": "Point",
+                "coordinates": [13.3505, 52.5144]
+            }
+        }
+    }
+
+    return entity

src/ld/test.py

@@ -0,0 +1,36 @@
+from ld.utils import get_context, compute_attribute_mappings
+from ld.cached_aiohttp import cached_aiohttp_document_loader
+from pyld import jsonld
+
+
+def test_ld_compacted(ngsi_ld):
+    jsonld.set_document_loader(cached_aiohttp_document_loader(timeout=30))
+    context = get_context(ngsi_ld)
+    assert context == ['https://smartdatamodels.org/context.jsonld', 'https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld']
+    mappings = compute_attribute_mappings(ngsi_ld, context)
+    assert mappings['location'] == 'https://uri.etsi.org/ngsi-ld/location'
+    assert mappings['controllingMethod'] == 'https://smart-data-models.github.io/data-models/terms.jsonld#/definitions/controllingMethod'
+
+
+def test_ld_partially_expanded(ngsi_ld_partially_expanded):
+    jsonld.set_document_loader(cached_aiohttp_document_loader(timeout=30))
+    context = get_context(ngsi_ld_partially_expanded)
+    assert context == 'https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld'
+    mappings = compute_attribute_mappings(ngsi_ld_partially_expanded, context)
+    assert mappings['name'] == 'https://uri.etsi.org/ngsi-ld/default-context/name'
+    assert mappings['https://uri.fiware.org/ns/data-models#category'] == 'https://uri.fiware.org/ns/data-models#category'
+
+
+def test_ld_expand_partially_expanded(ngsi_ld_partially_expanded):
+    jsonld.set_document_loader(cached_aiohttp_document_loader(timeout=30))
+    expanded = jsonld.expand(ngsi_ld_partially_expanded)
+    print(expanded)
+
+
+
+
+
+
+
+
+

src/ld/tests/test_ld.py

@@ -0,0 +1,28 @@
+from pyld import jsonld
+
+
+def get_context(doc: dict) -> dict:
+    if doc and '@context' in doc:
+        return doc['@context']
+    else:
+        return {}
+
+
+def expand_attribute(name: str, value: any, context: dict) -> (str, dict):
+    attr = {
+        name: value,
+        '@context': context
+    }
+    expanded = jsonld.expand(attr)
+    for item in expanded:
+        for uri in item.keys():
+            return uri, item[uri]
+    return name, value
+
+
+def compute_attribute_mappings(compacted: dict, context: dict) -> dict:
+    mapping = {}
+    for key in compacted:
+        uri, value = expand_attribute(key, compacted[key], context)
+        mapping[key] = uri
+    return mapping

src/ld/utils.py

@@ -164,8 +164,8 @@ def notify():
         # Validate entity update
         error = _validate_payload(entity)
         if error:
-            # TODO in this way we return error for even if only one entity
-            #  is wrong
+            # TODO in this way we return error even if only one entity
+            #   is wrong
             return error, 400
         # Add TIME_INDEX attribute
         custom_index = request.headers.get(TIME_INDEX_HEADER_NAME, None)