cognite-neat 0.123.9__tar.gz → 0.123.11__tar.gz

{cognite_neat-0.123.9 → cognite_neat-0.123.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite-neat
-Version: 0.123.9
+Version: 0.123.11
 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.11/cognite/neat/_version.py

@@ -0,0 +1,2 @@
+__version__ = "0.123.11"
+__engine__ = "^2.0.4"

{cognite_neat-0.123.9 → cognite_neat-0.123.11}/cognite/neat/core/_data_model/_constants.py

@@ -111,12 +111,8 @@ PHYSICAL_PROPERTY_ID_COMPLIANCE_REGEX = (
     rf"(?!^({'|'.join(get_reserved_words('property'))})$)"
     r"(^[a-zA-Z][a-zA-Z0-9_]{0,253}[a-zA-Z0-9]?$)"
 )
-CONCEPT_ID_COMPLIANCE_REGEX = (
-    rf"(?!^({'|'.join(get_reserved_words('concept'))})$)"
-    r"(^[a-zA-Z0-9._-]{0,253}[a-zA-Z0-9]?$)"
-)
+CONCEPT_ID_COMPLIANCE_REGEX = r"^[a-zA-Z0-9._~?@!$&'*+,;=%-]+$"
 
-INFORMATION_PROPERTY_ID_COMPLIANCE_REGEX = r"^(\*)|(?!^(Property|property)$)(^[a-zA-Z0-9._-]{0,253}[a-zA-Z0-9]?$)"
 VERSION_COMPLIANCE_REGEX = r"^[a-zA-Z0-9]([.a-zA-Z0-9_-]{0,41}[a-zA-Z0-9])?$"
 
 
@@ -156,7 +152,7 @@ class _Patterns:
 
     @cached_property
     def conceptual_property_id_compliance(self) -> re.Pattern[str]:
-        return re.compile(INFORMATION_PROPERTY_ID_COMPLIANCE_REGEX)
+        return re.compile(CONCEPT_ID_COMPLIANCE_REGEX)
 
     @cached_property
     def version_compliance(self) -> re.Pattern[str]:

{cognite_neat-0.123.9 → cognite_neat-0.123.11}/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-0.123.9 → cognite_neat-0.123.11}/cognite/neat/core/_data_model/models/conceptual/_validation.py

@@ -46,7 +46,7 @@ class ConceptualValidation:
         self._parent_concept_defined()
         self._referenced_classes_exist()
         self._referenced_value_types_exist()
-        self._regex_compliance_with_dms()
+        self._regex_compliance_with_physical_data_model()
 
         return self.issue_list
 
@@ -180,7 +180,7 @@ class ConceptualValidation:
                     )
                 )
 
-    def _regex_compliance_with_dms(self) -> None:
+    def _regex_compliance_with_physical_data_model(self) -> None:
         """Check regex compliance with DMS of properties, classes and value types."""
 
         for prop_ in self._properties:
@@ -239,7 +239,7 @@ class ConceptualValidation:
                     ResourceRegexViolationWarning(
                         concepts.concept,
                         "Concept",
-                        "Concepts sheet, Class column",
+                        "Concepts sheet, Concept column",
                         PATTERNS.view_id_compliance.pattern,
                     )
                 )

cognite_neat-0.123.11/last_changelog_entry.md

@@ -0,0 +1,4 @@
+### Improved
+
+- OWL importer got improved flexibility for ids of entities that making
+ontology

cognite_neat-0.123.11/last_git_message.txt

@@ -0,0 +1,23 @@
+Improve OWL importer by quoting IDs (#1246)
+
+# Description
+
+OWL importer has been improved allowing for class and property ids which
+contain "non-web-safe" characters, which can exist since OWL allows
+defining ids using IRIs , which are allow for more characters than URIs.
+
+## Bump
+
+- [x] Patch
+- [ ] Minor
+- [ ] Skip
+
+## Changelog
+### Improved
+
+- OWL importer got improved flexibility for ids of entities that making
+ontology
+
+---------
+
+Co-authored-by: Nikola Vasiljevic <nikola@Nikolas-MacBook-Air.local>

cognite_neat-0.123.11/last_version.txt

@@ -0,0 +1 @@
+0.123.10

{cognite_neat-0.123.9 → cognite_neat-0.123.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cognite-neat"
-version = "0.123.9"
+version = "0.123.11"
 readme = "README.md"
 description = "Knowledge graph transformation"
 authors = [

{cognite_neat-0.123.9 → cognite_neat-0.123.11}/tests/data/__init__.py

@@ -49,6 +49,7 @@ class SchemaData:
         information_unknown_value_type_xlsx = _conceptual / "information-unknown-value-type.xlsx"
         info_with_cdm_ref_xlsx = _conceptual / "info_with_cdm_ref.xlsx"
         broken_concepts_xlsx = _conceptual / "broken_concepts.xlsx"
+        ontology_with_regex_warnings = _conceptual / "ontology.ttl"
 
     class NonNeatFormats:
         class DTDL:

cognite_neat-0.123.11/tests/data/_schema/conceptual/ontology.ttl

@@ -0,0 +1,42 @@
+@prefix : <http://example.com/industrial#> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+
+<http://example.com/industrial>
+    a owl:Ontology .
+
+### Classes
+
+<http://example.com/industrial/Machine.Type-A(01)~?@!$&'*+,;=%[]>
+    a owl:Class ;
+    rdfs:label "Machine Type A" .
+
+<http://example.com/industrial/Sensor.Unit_01(Temp)~?@!$&'*+,;=%[]>
+    a owl:Class ;
+    rdfs:label "Temperature Sensor Unit" .
+
+<http://example.com/industrial/Control.Panel-1(Safety)~?@!$&'*+,;=%[]>
+    a owl:Class ;
+    rdfs:label "Safety Control Panel" .
+
+### Object Properties with special characters in URIs
+
+<http://example.com/industrial/has.Sensor-Unit(01):Temp~?@!$&'*+,;=%[]>
+    a owl:ObjectProperty ;
+    rdfs:domain <http://example.com/industrial/Machine.Type-A(01)~?@!$&'*+,;=%[]> ;
+    rdfs:range <http://example.com/industrial/Sensor.Unit_01(Temp)~?@!$&'*+,;=%[]> ;
+    rdfs:label "has sensor unit" .
+
+<http://example.com/industrial/is.Controlled-By(Panel):Safety~?@!$&'*+,;=%[]>
+    a owl:ObjectProperty ;
+    rdfs:domain <http://example.com/industrial/Machine.Type-A(01)~?@!$&'*+,;=%[]> ;
+    rdfs:range <http://example.com/industrial/Control.Panel-1(Safety)~?@!$&'*+,;=%[]> ;
+    rdfs:label "is controlled by" .
+
+<http://example.com/industrial/is.Connected-To(Control):Panel~?@!$&'*+,;=%[]>
+    a owl:ObjectProperty ;
+    rdfs:domain <http://example.com/industrial/Sensor.Unit_01(Temp)~?@!$&'*+,;=%[]> ;
+    rdfs:range <http://example.com/industrial/Control.Panel-1(Safety)~?@!$&'*+,;=%[]> ;
+    rdfs:label "is connected to" .

{cognite_neat-0.123.9 → cognite_neat-0.123.11}/tests/tests_unit/test_rules/test_importers/test_owl_importer.py

@@ -4,6 +4,8 @@ from cognite.neat.core._data_model.analysis import DataModelAnalysis
 from cognite.neat.core._data_model.models.entities import ConceptEntity
 from cognite.neat.core._data_model.transformers._verification import VerifyAnyDataModel
 from cognite.neat.core._issues import catch_issues
+from cognite.neat.core._issues.warnings._resources import ResourceNotDefinedWarning, ResourceRegexViolationWarning
+from tests.data import SchemaData
 
 
 def test_ill_formed_owl_importer():
@@ -13,7 +15,6 @@ def test_ill_formed_owl_importer():
 
     assert len(issues) == 6
     assert issues.has_errors
-    assert issues.has_errors
     assert str(issues.errors[0].identifier) == "neat_space:Award"
 
     acceptable_properties = []
@@ -37,3 +38,27 @@ def test_ill_formed_owl_importer():
         .type_
         == EntityTypes.data_property
     )
+
+
+def test_owl_enitity_quoting():
+    input = importers.OWLImporter.from_file(filepath=SchemaData.Conceptual.ontology_with_regex_warnings).to_data_model()
+    with catch_issues() as issues:
+        conceptual_data_model = VerifyAnyDataModel().transform(input)
+
+    categorized_issues = {}
+    for issue in issues:
+        if type(issue) not in categorized_issues:
+            categorized_issues[type(issue)] = []
+        categorized_issues[type(issue)].append(issue)
+
+    assert len(issues) == 13
+    # quoting is successful, but regex warnings are raised
+    assert not issues.has_errors
+    assert issues.has_warnings
+
+    assert len(categorized_issues) == 2
+    assert len(categorized_issues[ResourceRegexViolationWarning]) == 12
+    assert len(categorized_issues[ResourceNotDefinedWarning]) == 1
+
+    assert len(conceptual_data_model.concepts) == 3
+    assert len(conceptual_data_model.properties) == 3

{cognite_neat-0.123.9 → cognite_neat-0.123.11}/tests/tests_unit/test_rules/test_models/test_entities.py

@@ -1,7 +1,9 @@
+from urllib.parse import quote
+
 import pytest
 from cognite.client.data_classes.data_modeling import DataModelId
 
-from cognite.neat.core._data_model._constants import ENTITY_PATTERN
+from cognite.neat.core._data_model._constants import ENTITY_PATTERN, PATTERNS
 from cognite.neat.core._data_model.models.entities import (
     AssetEntity,
     ConceptEntity,
@@ -75,6 +77,16 @@ TEST_CASES = [
         "cdf_cdm:CogniteAsset(version=v1)",
         ConceptEntity(prefix="cdf_cdm", suffix="CogniteAsset", version="v1"),
     ),
+    (
+        ConceptEntity,
+        "cdf_cdm:Concept(version=v1)",
+        ConceptEntity(prefix="cdf_cdm", suffix="Concept", version="v1"),
+    ),
+    (
+        ConceptEntity,
+        "cdf_cdm:Conceptual%20%Concept(version=v1)",
+        ConceptEntity(prefix="cdf_cdm", suffix="Conceptual%20%Concept", version="v1"),
+    ),
     (
         ViewEntity,
         "subject:person(version=1.0)",
@@ -184,6 +196,42 @@ class TestEntities:
     def test_are_not_equal(self, entity1: ConceptualEntity, entity2: ConceptualEntity) -> None:
         assert entity1 != entity2, f"Expected {entity1} and {entity2} to be different entities"
 
+    @pytest.mark.parametrize(
+        "propety_id",
+        [
+            "耐久性",
+            "信頼性",
+            "効率",
+            "精度",
+            "柔軟性",
+            "スケーラビリティ",
+            "持続可能性",
+            "保守性",
+            "安全性",
+            "オートメーション",
+            "標準化",
+            "統合",
+            "モジュール性",
+            "費用対効果",
+            "生産性",
+            "革新",
+            "品質",
+            "負荷容量",
+            "耐熱性",
+            "耐食性",
+            "エネルギー効率",
+            "環境への親しみやすさ",
+            "ノイズリダクション",
+            "サイクル時間",
+            "スループット",
+        ],
+    )
+    def test_conceptual_property(self, propety_id: str) -> None:
+        encoded_prop = quote(propety_id, safe="")
+        assert PATTERNS.conceptual_property_id_compliance.match(encoded_prop), (
+            f"Property ID '{propety_id}' should be valid but is not."
+        )
+
 
 class TestEntityPattern:
     @pytest.mark.parametrize(

{cognite_neat-0.123.9 → cognite_neat-0.123.11}/uv.lock

@@ -346,7 +346,7 @@ wheels = [
 
 [[package]]
 name = "cognite-neat"
-version = "0.123.9"
+version = "0.123.11"
 source = { editable = "." }
 dependencies = [
     { name = "backports-strenum", marker = "python_full_version < '3.11'" },

cognite_neat-0.123.9/cognite/neat/_version.py

@@ -1,2 +0,0 @@
-__version__ = "0.123.9"
-__engine__ = "^2.0.4"

cognite_neat-0.123.9/last_changelog_entry.md

@@ -1,4 +0,0 @@
-
-### Improved
-
-- Added validation of indices.

cognite_neat-0.123.9/last_git_message.txt

@@ -1,24 +0,0 @@
-[NEAT-1004] 🧑‍🏫Validation of indices (#1230)
-
-# Description
-
-Stacked on #1241 
-
-This introduce the validation for the cases:
-* Composite indices missing order.
-* Composite indices order is ambiguous.
-* Indices are not consistently defined for the same container property.
-* Inverted index for non-listable or btree index for listable property.
-* IndexType not explicitly defined.
-* Set invalid cursorable on inverted
-
-## Bump
-
-- [x] Patch
-- [ ] Minor
-- [ ] Skip
-
-## Changelog
-### Improved
-
-- Added validation of indices.

cognite_neat-0.123.9/last_version.txt

@@ -1 +0,0 @@
-0.123.8