cognite-neat 0.123.10__py3-none-any.whl → 0.123.12__py3-none-any.whl

cognite/neat/_version.py

@@ -1,2 +1,2 @@
-__version__ = "0.123.10"
+__version__ = "0.123.12"
 __engine__ = "^2.0.4"

cognite/neat/core/_data_model/importers/_rdf/_shared.py

@@ -1,4 +1,5 @@
 from typing import cast
+from urllib.parse import quote
 
 from rdflib import BNode, Graph
 from rdflib.plugins.sparql import prepareQuery
@@ -33,6 +34,9 @@ def parse_concepts(graph: Graph, query: str, language: str, issue_list: IssueLis
         res: dict = convert_rdflib_content(cast(ResultRow, raw).asdict(), True)
         res = {key: res.get(key, None) for key in expected_keys}
 
+        # Quote the concept id to ensure it is web-safe
+        res["concept"] = quote(res["concept"], safe="")
+
         concept_id = res["concept"]
 
         # Safeguarding against incomplete semantic definitions
@@ -91,6 +95,8 @@ def parse_properties(graph: Graph, query: str, language: str, issue_list: IssueL
         res: dict = convert_rdflib_content(cast(ResultRow, raw).asdict(), True)
         res = {key: res.get(key, None) for key in expected_keys}
 
+        # Quote the concept id to ensure it is web-safe
+        res["property_"] = quote(res["property_"], safe="")
         property_id = res["property_"]
 
         # Safeguarding against incomplete semantic definitions
@@ -115,6 +121,10 @@ def parse_properties(graph: Graph, query: str, language: str, issue_list: IssueL
             )
             continue
 
+        # Quote the concept and value_type to ensure they are web-safe
+        res["concept"] = quote(res["concept"], safe="")
+        res["value_type"] = quote(res["value_type"], safe="")
+
         id_ = f"{res['concept']}.{res['property_']}"
 
         if id_ not in properties:

cognite/neat/core/_data_model/models/conceptual/_unverified.py

@@ -146,8 +146,8 @@ class UnverifiedConcept(UnverifiedComponent[Concept]):
 @dataclass
 class UnverifiedConceptualDataModel(UnverifiedDataModel[ConceptualDataModel]):
     metadata: UnverifiedConceptualMetadata
-    properties: list[UnverifiedConceptualProperty] = field(default_factory=list)
     concepts: list[UnverifiedConcept] = field(default_factory=list)
+    properties: list[UnverifiedConceptualProperty] = field(default_factory=list)
     prefixes: dict[str, Namespace] | None = None
 
     @classmethod

cognite/neat/core/_data_model/models/conceptual/_validation.py

@@ -11,7 +11,7 @@ from cognite.neat.core._issues.errors._resources import (
     ResourceDuplicatedError,
     ResourceNotDefinedError,
 )
-from cognite.neat.core._issues.warnings._models import UndefinedConceptWarning
+from cognite.neat.core._issues.warnings._models import ConceptOnlyDataModelWarning, UndefinedConceptWarning
 from cognite.neat.core._issues.warnings._resources import (
     ResourceNotDefinedWarning,
     ResourceRegexViolationWarning,
@@ -46,10 +46,16 @@ class ConceptualValidation:
         self._parent_concept_defined()
         self._referenced_classes_exist()
         self._referenced_value_types_exist()
+        self._concept_only_data_model()
         self._regex_compliance_with_physical_data_model()
 
         return self.issue_list
 
+    def _concept_only_data_model(self) -> None:
+        """Check if the data model only consists of concepts without any properties."""
+        if not self._properties:
+            self.issue_list.append(ConceptOnlyDataModelWarning())
+
     def _duplicated_resources(self) -> None:
         properties_sheet = self._read_info_by_spreadsheet.get("Properties")
         concepts_sheet = self._read_info_by_spreadsheet.get("Concepts")

cognite/neat/core/_data_model/models/conceptual/_verified.py

@@ -241,8 +241,10 @@ class ConceptualProperty(SheetRow):
 
 class ConceptualDataModel(BaseVerifiedDataModel):
     metadata: ConceptualMetadata = Field(alias="Metadata", description="Metadata for the conceptual data model")
-    properties: SheetList[ConceptualProperty] = Field(alias="Properties", description="List of properties")
     concepts: SheetList[Concept] = Field(alias="Concepts", description="List of concepts")
+    properties: SheetList[ConceptualProperty] = Field(
+        alias="Properties", default_factory=SheetList, description="List of properties"
+    )
     prefixes: dict[str, Namespace] = Field(
         alias="Prefixes",
         default_factory=get_default_prefixes_and_namespaces,

cognite/neat/core/_issues/warnings/_models.py

@@ -101,6 +101,14 @@ class UndefinedConceptWarning(UserModelingWarning):
     concept_id: str
 
 
+@dataclass(unsafe_hash=True)
+class ConceptOnlyDataModelWarning(UserModelingWarning):
+    """Data model is concept-only (contains concepts but no properties).
+    This model will likely cause issues when converting to a physical data model."""
+
+    fix = "Define properties for concepts or make sure that concepts implement other concepts that have properties."
+
+
 @dataclass(unsafe_hash=True)
 class UndefinedViewWarning(UserModelingWarning):
     """Undefined view {value_type} has been referred as value type for property <{view_property}> of view {view_id}."""

{cognite_neat-0.123.10.dist-info → cognite_neat-0.123.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite-neat
-Version: 0.123.10
+Version: 0.123.12
 Summary: Knowledge graph transformation
 Project-URL: Documentation, https://cognite-neat.readthedocs-hosted.com/
 Project-URL: Homepage, https://cognite-neat.readthedocs-hosted.com/

{cognite_neat-0.123.10.dist-info → cognite_neat-0.123.12.dist-info}/RECORD

@@ -1,5 +1,5 @@
 cognite/neat/__init__.py,sha256=12StS1dzH9_MElqxGvLWrNsxCJl9Hv8A2a9D0E5OD_U,193
-cognite/neat/_version.py,sha256=1gIfsiIXBpIQcL009UOK01UgGBkk1zRJKTokYRpZEmY,47
+cognite/neat/_version.py,sha256=Mzqn-YIDR_mqLMU1RkQCFPerYxlahGnGKv-rz3QId68,47
 cognite/neat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/core/_config.py,sha256=WT1BS8uADcFvGoUYOOfwFOVq_VBl472TisdoA3wLick,280
@@ -44,16 +44,16 @@ cognite/neat/core/_data_model/importers/_rdf/__init__.py,sha256=1yOjV2PKCxwH7uCT
 cognite/neat/core/_data_model/importers/_rdf/_base.py,sha256=FKceKumKmhEGpMZvo1BwEewnUvfAsTF3Ax9fo1nxsGE,6020
 cognite/neat/core/_data_model/importers/_rdf/_inference2rdata_model.py,sha256=PCgM9-qGSLlupN7tYCFLHjivgICtMiahNry1ub8JCYk,28934
 cognite/neat/core/_data_model/importers/_rdf/_owl2data_model.py,sha256=WmncZNpELeZnt6mdw6X8yWnr7XsFXZGfoVe5wTd0HH4,3438
-cognite/neat/core/_data_model/importers/_rdf/_shared.py,sha256=yB4BkupiPhizWSHNKdaspj3xE_6pKDiNG-_IHtTN1gI,5961
+cognite/neat/core/_data_model/importers/_rdf/_shared.py,sha256=KJz4HirSpWBXsOw8YGBJh-6Yj_pBjrMB9_K8UQ00sQg,6411
 cognite/neat/core/_data_model/models/__init__.py,sha256=hmF7MDR1XmpLxYdMkOEuPuHUqOQKE4AgsuUqdc-ySSQ,1249
 cognite/neat/core/_data_model/models/_base_unverified.py,sha256=1Wfbp-tJaEF6hd1bFdp2FhTgPkInf-1ZokuEoVJRPxQ,6842
 cognite/neat/core/_data_model/models/_base_verified.py,sha256=nzPrlj7ZvYull_Fdh2zeDXz98hux-eQOdTGy9jhUtYA,15127
 cognite/neat/core/_data_model/models/_types.py,sha256=70E8fiLdZkVF2sDUGPuDhzXNA5niVECkVDI7YN0NF60,5488
 cognite/neat/core/_data_model/models/data_types.py,sha256=uQ_u9KxCetLjxo-VtFzOXSxQuuf97Kg-9lfTTGzY6hc,10150
 cognite/neat/core/_data_model/models/conceptual/__init__.py,sha256=9A6myEV8s0-LqdXejaljqPj8S0pIpUL75rNdRDZzyR8,585
-cognite/neat/core/_data_model/models/conceptual/_unverified.py,sha256=apisgtXMb50dOs7rxZ-jcCW4JqxCdAWGtsYtRe3ssfs,6282
-cognite/neat/core/_data_model/models/conceptual/_validation.py,sha256=ywWFkxhQvDvB-NCIjWNv7-aOouBCz7HoxtJ0aC_b6BY,13034
-cognite/neat/core/_data_model/models/conceptual/_verified.py,sha256=e5Qs7n1np4g6inHQwuLUk2rCwgLf129je54xLnzENpw,13659
+cognite/neat/core/_data_model/models/conceptual/_unverified.py,sha256=ufNHLd9czY0XHV_C2zbQDarKSPeew7ohRbmq6dyo-_o,6282
+cognite/neat/core/_data_model/models/conceptual/_validation.py,sha256=twgVP-SQypAf3R8RB5Rp8EjCgblePK_zUbUyYQfut28,13339
+cognite/neat/core/_data_model/models/conceptual/_verified.py,sha256=HPNjzASKP9hs8lI8Xxfvdl2a9MdlP-JoEtXFk0a2ISw,13700
 cognite/neat/core/_data_model/models/entities/__init__.py,sha256=UsW-_6fwd-TW0WcnShPKf40h75l1elVn80VurUwRAic,1567
 cognite/neat/core/_data_model/models/entities/_constants.py,sha256=GXRzVfArwxF3C67VCkzy0JWTZRkRJUYXBQaaecrqcWc,351
 cognite/neat/core/_data_model/models/entities/_loaders.py,sha256=PkrVtGlZWYLvAVIRABrgVSgkMvJYpBqdrHBfz-H0Ut8,2783
@@ -131,7 +131,7 @@ cognite/neat/core/_issues/errors/_wrapper.py,sha256=clhuSwUuHy-FQXQopFIQRY8c_NZM
 cognite/neat/core/_issues/warnings/__init__.py,sha256=lzNZrguzwXyifehsCilAXa5UL94DWHIeO-slyC-EYZc,3165
 cognite/neat/core/_issues/warnings/_external.py,sha256=w-1R7ea6DXTIWqwlwMMjY0YxKDMSJ8gKAbp_nIIM1AI,1324
 cognite/neat/core/_issues/warnings/_general.py,sha256=_6dAFaMz-LIv7GsBBIBq2d-kmbuxVXKvU4jZeb7tjAo,972
-cognite/neat/core/_issues/warnings/_models.py,sha256=0uqJTR8sXiobIqqh05sRc8-QdMuV6h_4ZDm2RfxpEew,4396
+cognite/neat/core/_issues/warnings/_models.py,sha256=mnoNxVvTifkIGxOxXAgdY-5ZDwy_IyxNsIxdTIcXdNY,4759
 cognite/neat/core/_issues/warnings/_properties.py,sha256=I3vqc1aL-ce_FRQNgQQy34RW7kQxcjbwhZIIVtGVmg8,3807
 cognite/neat/core/_issues/warnings/_resources.py,sha256=_iPRq0pRMmRu3LFjqZTaG3OqOzw4f8-Vc9G4Im__FHc,3578
 cognite/neat/core/_issues/warnings/user_modeling.py,sha256=Qn_S8TLw7MMYQaJcZBScJA48kz_PrTWz0NaepSR70Fk,4144
@@ -186,7 +186,7 @@ cognite/neat/session/engine/__init__.py,sha256=D3MxUorEs6-NtgoICqtZ8PISQrjrr4dvc
 cognite/neat/session/engine/_import.py,sha256=1QxA2_EK613lXYAHKQbZyw2yjo5P9XuiX4Z6_6-WMNQ,169
 cognite/neat/session/engine/_interface.py,sha256=3W-cYr493c_mW3P5O6MKN1xEQg3cA7NHR_ev3zdF9Vk,533
 cognite/neat/session/engine/_load.py,sha256=g52uYakQM03VqHt_RDHtpHso1-mFFifH5M4T2ScuH8A,5198
-cognite_neat-0.123.10.dist-info/METADATA,sha256=8GWYEXewakZw_c6yK9-zMHt5NpzeoPBFyjliGHAAGn4,9172
-cognite_neat-0.123.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cognite_neat-0.123.10.dist-info/licenses/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.123.10.dist-info/RECORD,,
+cognite_neat-0.123.12.dist-info/METADATA,sha256=U5jaZlc_AdCI7uML_9DBtq-V7bEIciJgBDxR8brvp0E,9172
+cognite_neat-0.123.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cognite_neat-0.123.12.dist-info/licenses/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.123.12.dist-info/RECORD,,