cognite-neat 0.127.23__py3-none-any.whl → 0.127.25__py3-none-any.whl

cognite/neat/_utils/validation.py

@@ -93,6 +93,8 @@ def humanize_validation_error(
         )
     elif type_ == "union_tag_invalid":
         msg = error["msg"].replace(", 'direct'", "").replace("found using 'type' ", "").replace("tag", "value")
+    elif type_ == "string_pattern_mismatch":
+        msg = f"string '{error['input']}' does not match the required pattern: '{error['ctx']['pattern']}'."
 
     elif type_.endswith("_type"):
         msg = f"{error['msg']}. Got {error['input']!r} of type {type(error['input']).__name__}."
@@ -142,8 +144,11 @@ def _enum_message(type_: str, loc: tuple[int | str, ...], context: ValidationCon
     if loc[-1] != "values":
         raise RuntimeError("This is a neat bug, report to the team.")
     if type_ == "missing":
-        return f"In {context.humanize_location(loc[:-1])} definition is missing the collection reference"
+        return (
+            f"In {context.humanize_location(loc[:-1])} definition should include "
+            "a reference to a collection in the 'Enum' sheet (e.g., collection='MyEnumCollection')."
+        )
     elif type_ == "too_short":
-        return f"In {context.humanize_location(loc[:-1])} collection is not defined in 'Enum' sheet"
+        return f"In {context.humanize_location(loc[:-1])} collection is not defined in the 'Enum' sheet"
     else:
         raise RuntimeError("This is a neat bug, report to the team.")

cognite/neat/_version.py

@@ -1,2 +1,2 @@
-__version__ = "0.127.23"
+__version__ = "0.127.25"
 __engine__ = "^2.0.4"

cognite/neat/v0/core/_data_model/importers/_rdf/_owl2data_model.py

@@ -27,33 +27,53 @@ CLASSES_QUERY = """SELECT ?concept  ?name ?description ?implements
 
 CLASSES_QUERY_PARAMETERS = {"concept", "name", "description", "implements"}
 
-PROPERTIES_QUERY = """
-
-    SELECT ?concept  ?property_ ?name ?description ?value_type ?minCount ?maxCount ?default
+PROPERTIES_QUERY = """ SELECT ?concept ?property_ ?name ?description ?value_type ?min_count ?max_count ?default
     WHERE {{
         ?property_ a ?property_Type.
         FILTER (?property_Type IN (owl:ObjectProperty, owl:DatatypeProperty ) )
 
+        # --- 1. Explicit Domain Discovery ---
 
+        # A. Handling owl:domain when it is expressed as owl restriction
+        OPTIONAL {{
+            ?property_ rdfs:domain ?domain_exp_node .
+            FILTER(isBlank(?domain_exp_node))
+            ?domain_exp_node owl:unionOf|owl:intersectionOf ?exp_concepts_list .
+            ?exp_concepts_list rdf:rest*/rdf:first ?explicit_concept.
+        }}
 
-        # Handling owl:domain when it is expressed as
-        # owl restriction
+        # B. Handling the domain when it is a single concept
         OPTIONAL {{
-            ?property_ rdfs:domain ?domain .
-            FILTER(isBlank(?domain))
-            ?domain owl:unionOf|owl:intersectionOf ?concepts .
-            ?concepts rdf:rest*/rdf:first ?concept.
+            ?property_ rdfs:domain ?domain_exp_node .
+            FILTER(!isBlank(?domain_exp_node))
+            BIND(?domain_exp_node AS ?explicit_concept)
         }}
 
-        # Handling the domain when it is a single concept
+        # --- 2. Inherited Domain Discovery (Fallback) ---
+
+        # C. Handling inherited domain when parent domain is a restriction
         OPTIONAL {{
-            ?property_ rdfs:domain ?domain .
-            FILTER(!isBlank(?domain))
-            BIND(?domain AS ?concept)
+            ?property_ rdfs:subPropertyOf ?parent_property .
+            ?parent_property rdfs:domain ?parent_domain_node .
+            FILTER(isBlank(?parent_domain_node))
+            ?parent_domain_node owl:unionOf|owl:intersectionOf ?parent_concepts_list .
+            ?parent_concepts_list rdf:rest*/rdf:first ?inherited_concept.
         }}
 
-        # Handling owl:range when it is expressed as
-        # owl restriction
+        # D. Handling inherited domain when parent domain is a single concept
+        OPTIONAL {{
+            ?property_ rdfs:subPropertyOf ?parent_property .
+            ?parent_property rdfs:domain ?parent_domain_node .
+            FILTER(!isBlank(?parent_domain_node))
+            BIND(?parent_domain_node AS ?inherited_concept)
+        }}
+
+        # Final Concept Assignment with Priority ---
+        # COALESCE prioritizes ?explicit_concept over ?inherited_concept
+        BIND(COALESCE(?explicit_concept, ?inherited_concept) AS ?concept)
+
+
+        # Handling owl:range when it is expressed as owl restriction
         OPTIONAL {{
             ?property_ rdfs:range ?range .
             FILTER(isBlank(?range))
@@ -70,8 +90,8 @@ PROPERTIES_QUERY = """
 
         OPTIONAL {{?property_ rdfs:label|skos:prefLabel ?name }}.
         OPTIONAL {{?property_ rdfs:comment|skos:definition ?description}}.
-        OPTIONAL {{?property_ owl:maxCardinality ?maxCount}}.
-        OPTIONAL {{?property_ owl:minCardinality ?minCount}}.
+        OPTIONAL {{?property_ owl:maxCardinality ?max_count}}.
+        OPTIONAL {{?property_ owl:minCardinality ?min_count}}.
 
         # FILTERS
         FILTER (!isBlank(?property_))
@@ -85,8 +105,8 @@ PROPERTIES_QUERY_PARAMETERS = {
     "name",
     "description",
     "value_type",
-    "minCount",
-    "maxCount",
+    "min_count",
+    "max_count",
     "default",
 }
 

{cognite_neat-0.127.23.dist-info → cognite_neat-0.127.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite-neat
-Version: 0.127.23
+Version: 0.127.25
 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.127.23.dist-info → cognite_neat-0.127.25.dist-info}/RECORD

@@ -1,7 +1,7 @@
 cognite/neat/__init__.py,sha256=Lo4DbjDOwnhCYUoAgPp5RG1fDdF7OlnomalTe7n1ydw,211
 cognite/neat/_exceptions.py,sha256=ox-5hXpee4UJlPE7HpuEHV2C96aLbLKo-BhPDoOAzhA,1650
 cognite/neat/_issues.py,sha256=wH1mnkrpBsHUkQMGUHFLUIQWQlfJ_qMfdF7q0d9wNhY,1871
-cognite/neat/_version.py,sha256=6DktX2aOea0YNw_rdzDYmaQ9evSmuWHFadhPA0xSc_M,47
+cognite/neat/_version.py,sha256=Hsl6r_Z4Ik-HLkbCToNXmmjME2_bdiVlGTB06JNU8HM,47
 cognite/neat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/v1.py,sha256=owqW5Mml2DSZx1AvPvwNRTBngfhBNrQ6EH-7CKL7Jp0,61
 cognite/neat/_client/__init__.py,sha256=75Bh7eGhaN4sOt3ZcRzHl7pXaheu1z27kmTHeaI05vo,114
@@ -116,7 +116,7 @@ cognite/neat/_utils/auxiliary.py,sha256=Cx-LP8dfN782R3iUcm--q26zdzQ0k_RFnVbJ0bwV
 cognite/neat/_utils/collection.py,sha256=BIwRrFbUXNPvHhEVujLHgVoDJXzdPEMScrbSBhyCibk,446
 cognite/neat/_utils/text.py,sha256=-ujNaG_hLkdurKsUmZB9ZI_kJkddlCKEf8g-g_XCk10,2010
 cognite/neat/_utils/useful_types.py,sha256=BwTjcWnpxnxN8rWXuYXMgU55O_YjVteMtYK0y25OmH0,1260
-cognite/neat/_utils/validation.py,sha256=Pg6EzS-sxB3k4P3OR1O15SSqBXIzpbPwvPSrosOxNJk,6675
+cognite/neat/_utils/validation.py,sha256=U422V0TY5KujFJFyfhRLONVj5A4AcCWgqIKVK6BUm7M,6938
 cognite/neat/_utils/http_client/__init__.py,sha256=qaCLLLhi7H3b_cmbknX0S66KILT7JSKX1YSgZjNdd1U,786
 cognite/neat/_utils/http_client/_client.py,sha256=TO9C77LcsqX0R3Fu-mP560nnV6rP5oRXki9kxRYtBlg,9658
 cognite/neat/_utils/http_client/_config.py,sha256=C8IF1JoijmVMjA_FEMgAkiD1buEV1cY5Og3t-Ecyfmk,756
@@ -166,7 +166,7 @@ cognite/neat/v0/core/_data_model/importers/_spreadsheet2data_model.py,sha256=ksD
 cognite/neat/v0/core/_data_model/importers/_rdf/__init__.py,sha256=1yOjV2PKCxwH7uCTXVZhSdxtn5etmFX40cksvwtKcZ8,199
 cognite/neat/v0/core/_data_model/importers/_rdf/_base.py,sha256=Rv24TQQDZqAuFD8Qh0yRBiB7-JvoMVj3mGoPBm-xBFs,6052
 cognite/neat/v0/core/_data_model/importers/_rdf/_inference2rdata_model.py,sha256=w8LsdkzgoTXN3LZyjEL_5grWZGlf7PPj8qOu370_K6M,28976
-cognite/neat/v0/core/_data_model/importers/_rdf/_owl2data_model.py,sha256=JsL2gpVs4ntLyzncgRYic-4qSiDhXT-6xN3jTLo629U,4031
+cognite/neat/v0/core/_data_model/importers/_rdf/_owl2data_model.py,sha256=6fS2IhmRjsQdENYb47bSvRcqTzp7zr0YUuRIsYY-EPc,5200
 cognite/neat/v0/core/_data_model/importers/_rdf/_shared.py,sha256=lcMnGIvqYZJ41JPjzanZHi9uG826EzYHpQXSMYVRK8A,9839
 cognite/neat/v0/core/_data_model/models/__init__.py,sha256=whWV0FrdUi01Du2mgan3_kZHQ9T2tGrGb2xRxoFDhNo,1258
 cognite/neat/v0/core/_data_model/models/_base_unverified.py,sha256=1Wfbp-tJaEF6hd1bFdp2FhTgPkInf-1ZokuEoVJRPxQ,6842
@@ -312,7 +312,7 @@ cognite/neat/v0/session/engine/__init__.py,sha256=D3MxUorEs6-NtgoICqtZ8PISQrjrr4
 cognite/neat/v0/session/engine/_import.py,sha256=1QxA2_EK613lXYAHKQbZyw2yjo5P9XuiX4Z6_6-WMNQ,169
 cognite/neat/v0/session/engine/_interface.py,sha256=3W-cYr493c_mW3P5O6MKN1xEQg3cA7NHR_ev3zdF9Vk,533
 cognite/neat/v0/session/engine/_load.py,sha256=u0x7vuQCRoNcPt25KJBJRn8sJabonYK4vtSZpiTdP4k,5201
-cognite_neat-0.127.23.dist-info/METADATA,sha256=Ax86njFaCOT2zngYvUBqbGlWnTbu744tClzc7erssFs,9150
-cognite_neat-0.127.23.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cognite_neat-0.127.23.dist-info/licenses/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.127.23.dist-info/RECORD,,
+cognite_neat-0.127.25.dist-info/METADATA,sha256=t6VBbJO1-wAlt1FwCCk-rq9Pcdood0JN3AIw8SwdyTI,9150
+cognite_neat-0.127.25.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cognite_neat-0.127.25.dist-info/licenses/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.127.25.dist-info/RECORD,,