cognite-neat 0.119.3__tar.gz → 0.119.5__tar.gz

{cognite_neat-0.119.3 → cognite_neat-0.119.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: cognite-neat
-Version: 0.119.3
+Version: 0.119.5
 Summary: Knowledge graph transformation
 License: Apache-2.0
 Author: Nikola Vasiljevic

{cognite_neat-0.119.3 → cognite_neat-0.119.5}/cognite/neat/_session/_template.py

@@ -189,8 +189,8 @@ class TemplateAPI:
 
         return None
 
-    def extension(self, io: Any, output: str | Path | None = None, dummy_property: str = "GUID") -> IssueList:
-        """Creates a template for an extension of a Cognite model.
+    def expand(self, io: Any, output: str | Path | None = None, dummy_property: str = "GUID") -> IssueList:
+        """Creates a template for an extension of a Cognite model by expanding properties from CDM.
 
         The input is a spreadsheet of a conceptual model in which the concepts are defined
         and marked with the Cognite concept they are extending. For example, if you have a pump
@@ -218,10 +218,10 @@ class TemplateAPI:
         path = reader.materialize_path()
         if output is None:
             if isinstance(reader, PathReader):
-                output_path = path.with_name(f"{path.stem}_extension{path.suffix}")
+                output_path = path.with_name(f"{path.stem}_expand{path.suffix}")
             else:
                 # The source is not a file, for example, a URL or a stream.
-                output_path = Path.cwd() / f"{path.stem}_extension{path.suffix}"
+                output_path = Path.cwd() / f"{path.stem}_expand{path.suffix}"
         else:
             output_path = Path(output)
 
@@ -240,4 +240,8 @@ class TemplateAPI:
 
                     ExcelExporter(styling="maximal").export_to_file(info, output_path)
         issues.action = "Created extension template"
+
+        # Adding issues to the state in the rule store
+        if issues:
+            self._state.rule_store._last_issues = issues
         return issues

{cognite_neat-0.119.3 → cognite_neat-0.119.5}/cognite/neat/_store/_graph_store.py

@@ -17,10 +17,11 @@ from cognite.neat._graph.extractors import RdfFileExtractor, TripleExtractors
 from cognite.neat._graph.queries import Queries
 from cognite.neat._graph.transformers import Transformers
 from cognite.neat._issues import IssueList, catch_issues
-from cognite.neat._issues.errors import OxigraphStorageLockedError
+from cognite.neat._issues.errors import NeatValueError, OxigraphStorageLockedError
 from cognite.neat._shared import InstanceType, Triple
 from cognite.neat._utils.auxiliary import local_import
 from cognite.neat._utils.rdf_ import add_triples_in_batch, remove_namespace_from_uri
+from cognite.neat._utils.text import humanize_collection
 
 from ._provenance import Change, Entity, Provenance
 
@@ -319,45 +320,43 @@ class NeatGraphStore:
         """
         add_triples_in_batch(self.graph(named_graph), triples, batch_size)
 
-    def transform(self, transformer: Transformers, named_graph: URIRef | None = None) -> None:
+    def transform(self, transformer: Transformers, named_graph: URIRef | None = None) -> IssueList:
         """Transforms the graph store using a transformer."""
-
         named_graph = named_graph or self.default_named_graph
-        if named_graph in self.named_graphs:
-            missing_changes = [
-                change for change in transformer._need_changes if not self.provenance.activity_took_place(change)
-            ]
-            if self.provenance.activity_took_place(type(transformer).__name__) and transformer._use_only_once:
-                warnings.warn(
+        issue_list = IssueList()
+        if named_graph not in self.named_graphs:
+            issue_list.append(NeatValueError(f"Named graph {named_graph} not found in graph store, cannot transform"))
+            return issue_list
+        if self.provenance.activity_took_place(type(transformer).__name__) and transformer._use_only_once:
+            issue_list.append(
+                NeatValueError(
                     f"Cannot transform graph store with {type(transformer).__name__}, already applied",
-                    stacklevel=2,
-                )
-            elif missing_changes:
-                warnings.warn(
-                    (
-                        f"Cannot transform graph store with {type(transformer).__name__}, "
-                        f"missing one or more required changes [{', '.join(missing_changes)}]"
-                    ),
-                    stacklevel=2,
                 )
-
-            else:
-                _start = datetime.now(timezone.utc)
-                transformer.transform(self.graph(named_graph))
-                self.provenance.append(
-                    Change.record(
-                        activity=f"{type(transformer).__name__}",
-                        start=_start,
-                        end=datetime.now(timezone.utc),
-                        description=transformer.description,
-                    )
+            )
+            return issue_list
+        if missing_changes := [
+            change for change in transformer._need_changes if not self.provenance.activity_took_place(change)
+        ]:
+            issue_list.append(
+                NeatValueError(
+                    f"Cannot transform graph store with {type(transformer).__name__}, "
+                    f"missing one or more required changes {humanize_collection(missing_changes)}",
                 )
-
-        else:
-            warnings.warn(
-                f"Named graph {named_graph} not found in graph store, cannot transform",
-                stacklevel=2,
             )
+            return issue_list
+        _start = datetime.now(timezone.utc)
+        with catch_issues({}) as transform_issues:
+            transformer.transform(self.graph(named_graph))
+        issue_list.extend(transform_issues)
+        self.provenance.append(
+            Change.record(
+                activity=f"{type(transformer).__name__}",
+                start=_start,
+                end=datetime.now(timezone.utc),
+                description=transformer.description,
+            )
+        )
+        return issue_list
 
     @property
     def summary(self) -> dict[URIRef, pd.DataFrame]:

cognite_neat-0.119.5/cognite/neat/_version.py

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

{cognite_neat-0.119.3 → cognite_neat-0.119.5}/pyproject.toml

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

cognite_neat-0.119.3/cognite/neat/_version.py

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