cognite-neat 0.81.11__tar.gz → 0.81.12__tar.gz

{cognite_neat-0.81.11 → cognite_neat-0.81.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cognite-neat
-Version: 0.81.11
+Version: 0.81.12
 Summary: Knowledge graph transformation
 Home-page: https://cognite-neat.readthedocs-hosted.com/
 License: Apache-2.0

cognite_neat-0.81.12/cognite/neat/_version.py

@@ -0,0 +1 @@
+__version__ = "0.81.12"

{cognite_neat-0.81.11 → cognite_neat-0.81.12}/cognite/neat/graph/stores/_base.py

@@ -14,6 +14,7 @@ from cognite.neat.graph._shared import MIMETypes
 from cognite.neat.graph.extractors import RdfFileExtractor, TripleExtractors
 from cognite.neat.graph.models import Triple
 from cognite.neat.graph.transformers import Transformers
+from cognite.neat.rules.models.entities import ClassEntity
 from cognite.neat.rules.models.information import InformationRules
 from cognite.neat.utils import remove_namespace
 from cognite.neat.utils.auxiliary import local_import
@@ -42,6 +43,8 @@ class NeatGraphStore:
         graph: Graph,
         rules: InformationRules | None = None,
     ):
+        self.rules: InformationRules | None = None
+
         _start = datetime.now(timezone.utc)
         self.graph = graph
         self.provenance = Provenance(
@@ -54,11 +57,30 @@ class NeatGraphStore:
                 )
             ]
         )
-        self.rules = rules
 
-        if self.rules and self.rules.prefixes:
-            self._upsert_prefixes(self.rules.prefixes)
+        if rules:
+            self.rules = rules
             self.base_namespace = self.rules.metadata.namespace
+            self.provenance.append(
+                Change.record(
+                    activity=f"{type(self)}.rules",
+                    start=_start,
+                    end=datetime.now(timezone.utc),
+                    description=f"Added rules to graph store as {type(self.rules).__name__}",
+                )
+            )
+
+            if self.rules.prefixes:
+                self._upsert_prefixes(self.rules.prefixes)
+                self.provenance.append(
+                    Change.record(
+                        activity=f"{type(self).__name__}._upsert_prefixes",
+                        start=_start,
+                        end=datetime.now(timezone.utc),
+                        description="Upsert prefixes to graph store",
+                    )
+                )
+
         else:
             self.base_namespace = DEFAULT_NAMESPACE
 
@@ -144,6 +166,23 @@ class NeatGraphStore:
             )
         )
 
+    def read(self, class_: str) -> list[tuple[str, str, str]]:
+        """Read instances for given view from the graph store."""
+        # PLACEHOLDER: Implement reading instances for a given view
+        # not yet developed
+
+        if not self.rules:
+            warnings.warn("No rules found for the graph store, returning empty list.", stacklevel=2)
+            return []
+
+        class_entity = ClassEntity(prefix=self.rules.metadata.prefix, suffix=class_)
+
+        if class_entity not in [definition.class_ for definition in self.rules.classes.data]:
+            warnings.warn("Desired type not found in graph!", stacklevel=2)
+            return []
+
+        return []
+
     def _parse_file(
         self,
         filepath: Path,

{cognite_neat-0.81.11 → cognite_neat-0.81.12}/cognite/neat/rules/analysis/_information_rules.py

@@ -8,7 +8,7 @@ import pandas as pd
 from pydantic import ValidationError
 
 from cognite.neat.rules.models import SchemaCompleteness
-from cognite.neat.rules.models._rdfpath import TransformationRuleType
+from cognite.neat.rules.models._rdfpath import RDFPath
 from cognite.neat.rules.models.entities import ClassEntity, EntityTypes, ParentClassEntity, ReferenceEntity
 from cognite.neat.rules.models.information import InformationClass, InformationProperty, InformationRules
 from cognite.neat.utils.utils import get_inheritance_path
@@ -191,7 +191,7 @@ class InformationArchitectRulesAnalysis(BaseAnalysis):
                     )
                     continue
 
-                if (only_rdfpath and property_.rule_type == TransformationRuleType.rdfpath) or not only_rdfpath:
+                if (only_rdfpath and isinstance(property_.transformation, RDFPath)) or not only_rdfpath:
                     processed_properties[property_.property_] = property_
             class_property_pairs[class_] = processed_properties
 

{cognite_neat-0.81.11 → cognite_neat-0.81.12}/cognite/neat/rules/models/information/_rules.py

@@ -23,13 +23,8 @@ from cognite.neat.rules.models._base import (
     SheetList,
 )
 from cognite.neat.rules.models._rdfpath import (
-    AllReferences,
-    Hop,
-    RawLookup,
-    SingleProperty,
-    SPARQLQuery,
+    RDFPath,
     TransformationRuleType,
-    Traversal,
     parse_rule,
 )
 from cognite.neat.rules.models._types import (
@@ -156,9 +151,7 @@ class InformationProperty(SheetEntity):
         default: Default value of the property
         reference: Reference to the source of the information, HTTP URI
         match_type: The match type of the resource being described and the source entity.
-        rule_type: Rule type for the transformation from source to target representation
-                   of knowledge graph. Defaults to None (no transformation)
-        rule: Actual rule for the transformation from source to target representation of
+        transformation: Actual rule for the transformation from source to target representation of
               knowledge graph. Defaults to None (no transformation)
     """
 
@@ -174,10 +167,7 @@ class InformationProperty(SheetEntity):
     default: Any | None = Field(alias="Default", default=None)
     reference: URLEntity | ReferenceEntity | None = Field(alias="Reference", default=None, union_mode="left_to_right")
     match_type: MatchType | None = Field(alias="Match Type", default=None)
-    rule_type: str | TransformationRuleType | None = Field(alias="Rule Type", default=None)
-    rule: str | AllReferences | SingleProperty | Hop | RawLookup | SPARQLQuery | Traversal | None = Field(
-        alias="Rule", default=None
-    )
+    transformation: str | RDFPath | None = Field(alias="Transformation", default=None)
     comment: str | None = Field(alias="Comment", default=None)
 
     @field_serializer("max_count", when_used="json-unless-none")
@@ -193,15 +183,10 @@ class InformationProperty(SheetEntity):
         return value
 
     @model_validator(mode="after")
-    def is_valid_rule(self):
-        # TODO: Can we skip rule_type and simply try to parse the rule and if it fails, raise an error?
-        if self.rule_type:
-            self.rule_type = self.rule_type.lower()
-            if not self.rule:
-                raise exceptions.RuleTypeProvidedButRuleMissing(
-                    self.property_, self.class_, self.rule_type
-                ).to_pydantic_custom_error()
-            self.rule = parse_rule(self.rule, self.rule_type)
+    def generate_valid_transformation(self):
+        # TODO: Currently only supporting RDFpath
+        if self.transformation:
+            self.transformation = parse_rule(self.transformation, TransformationRuleType.rdfpath)
         return self
 
     @model_validator(mode="after")

{cognite_neat-0.81.11 → cognite_neat-0.81.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cognite-neat"
-version = "0.81.11"
+version = "0.81.12"
 readme = "README.md"
 description = "Knowledge graph transformation"
 authors = [

cognite_neat-0.81.11/cognite/neat/_version.py

@@ -1 +0,0 @@
-__version__ = "0.81.11"