cognite-neat 0.94.0__tar.gz → 0.95.0__tar.gz

{cognite_neat-0.94.0 → cognite_neat-0.95.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cognite-neat
-Version: 0.94.0
+Version: 0.95.0
 Summary: Knowledge graph transformation
 Home-page: https://cognite-neat.readthedocs-hosted.com/
 License: Apache-2.0
@@ -30,7 +30,7 @@ Requires-Dist: google-auth-oauthlib ; extra == "google"
 Requires-Dist: gspread ; extra == "google"
 Requires-Dist: ipycytoscape (>=1.3.3,<2.0.0)
 Requires-Dist: jinja2 (>=3.1.2,<4.0.0) ; extra == "graphql" or extra == "all"
-Requires-Dist: matplotlib (>=3.9.2,<4.0.0)
+Requires-Dist: matplotlib (==3.5.2)
 Requires-Dist: mkdocs ; extra == "docs"
 Requires-Dist: mkdocs-autorefs (>=0.5.0,<0.6.0) ; extra == "docs"
 Requires-Dist: mkdocs-git-authors-plugin ; extra == "docs"

{cognite_neat-0.94.0 → cognite_neat-0.95.0}/cognite/neat/_rules/models/dms/_rules.py

@@ -5,6 +5,7 @@ from collections.abc import Hashable
 from datetime import datetime
 from typing import TYPE_CHECKING, Any, ClassVar, Literal
 
+import pandas as pd
 from cognite.client import data_modeling as dm
 from pydantic import Field, field_serializer, field_validator, model_validator
 from pydantic_core.core_schema import SerializationInfo, ValidationInfo
@@ -451,3 +452,18 @@ class DMSRules(BaseRules):
         from ._exporter import _DMSExporter
 
         return _DMSExporter(self, include_pipeline, instance_space).to_schema()
+
+    def _repr_html_(self) -> str:
+        summary = {
+            "type": "Physical Data Model",
+            "intended for": "DMS Architect",
+            "name": self.metadata.name,
+            "space": self.metadata.space,
+            "external_id": self.metadata.external_id,
+            "version": self.metadata.version,
+            "views": len(self.views),
+            "containers": len(self.containers) if self.containers else 0,
+            "properties": len(self.properties),
+        }
+
+        return pd.DataFrame([summary]).T.rename(columns={0: ""})._repr_html_()  # type: ignore

{cognite_neat-0.94.0 → cognite_neat-0.95.0}/cognite/neat/_rules/models/dms/_rules_input.py

@@ -3,6 +3,7 @@ from dataclasses import dataclass
 from datetime import datetime
 from typing import Any, Literal
 
+import pandas as pd
 from cognite.client import data_modeling as dm
 
 from cognite.neat._rules.models._base_input import InputComponent, InputRules
@@ -291,3 +292,18 @@ class DMSInputRules(InputRules[DMSRules]):
             "Last": last,
             "Reference": reference,
         }
+
+    def _repr_html_(self) -> str:
+        summary = {
+            "type": "Physical Data Model",
+            "intended for": "DMS Architect",
+            "name": self.metadata.name,
+            "space": self.metadata.space,
+            "external_id": self.metadata.external_id,
+            "version": self.metadata.version,
+            "views": len(self.views),
+            "containers": len(self.containers) if self.containers else 0,
+            "properties": len(self.properties),
+        }
+
+        return pd.DataFrame([summary]).T.rename(columns={0: ""})._repr_html_()  # type: ignore

{cognite_neat-0.94.0 → cognite_neat-0.95.0}/cognite/neat/_rules/models/information/_rules.py

@@ -4,6 +4,7 @@ from collections.abc import Hashable
 from datetime import datetime
 from typing import TYPE_CHECKING, Any, ClassVar
 
+import pandas as pd
 from pydantic import Field, field_serializer, field_validator, model_validator
 from pydantic_core.core_schema import SerializationInfo
 from rdflib import Namespace
@@ -380,3 +381,16 @@ class InformationRules(BaseRules):
         from cognite.neat._rules.transformers._converters import _InformationRulesConverter
 
         return _InformationRulesConverter(self).as_dms_rules()
+
+    def _repr_html_(self) -> str:
+        summary = {
+            "type": "Logical Data Model",
+            "intended for": "Information Architect",
+            "name": self.metadata.name,
+            "external_id": self.metadata.prefix,
+            "version": self.metadata.version,
+            "classes": len(self.classes),
+            "properties": len(self.properties),
+        }
+
+        return pd.DataFrame([summary]).T.rename(columns={0: ""})._repr_html_()  # type: ignore

{cognite_neat-0.94.0 → cognite_neat-0.95.0}/cognite/neat/_rules/models/information/_rules_input.py

@@ -2,6 +2,7 @@ from dataclasses import dataclass, field
 from datetime import datetime
 from typing import Any, Literal
 
+import pandas as pd
 from rdflib import Namespace
 
 from cognite.neat._rules.models._base_input import InputComponent, InputRules
@@ -144,3 +145,16 @@ class InformationInputRules(InputRules[InformationRules]):
             Last=last,
             Reference=reference,
         )
+
+    def _repr_html_(self) -> str:
+        summary = {
+            "type": "Logical Data Model",
+            "intended for": "Information Architect",
+            "name": self.metadata.name,
+            "external_id": self.metadata.prefix,
+            "version": self.metadata.version,
+            "classes": len(self.classes),
+            "properties": len(self.properties),
+        }
+
+        return pd.DataFrame([summary]).T.rename(columns={0: ""})._repr_html_()  # type: ignore

{cognite_neat-0.94.0 → cognite_neat-0.95.0}/cognite/neat/_session/_base.py

@@ -1,13 +1,11 @@
 from typing import Literal, cast
 
-import pandas as pd
 from cognite.client import CogniteClient
 
 from cognite.neat._issues import IssueList
 from cognite.neat._rules import importers
 from cognite.neat._rules._shared import ReadRules
 from cognite.neat._rules.models import DMSRules
-from cognite.neat._rules.models._base_input import InputComponent
 from cognite.neat._rules.models.information._rules import InformationRules
 from cognite.neat._rules.models.information._rules_input import InformationInputRules
 from cognite.neat._rules.transformers import ConvertToRules, VerifyAnyRules
@@ -72,13 +70,10 @@ class NeatSession:
 
         output = []
         if state.input_rules and not state.verified_rules:
-            metadata = cast(InputComponent, state.input_rule.rules.metadata)  # type: ignore[union-attr]
-            table = pd.DataFrame([metadata.dump()]).T._repr_html_()  # type: ignore[operator]
-            output.append(f"<H2>Raw Data Model</H2><br />{table}")
+            output.append(f"<H2>Raw Data Model</H2><br />{state.input_rule.rules._repr_html_()}")  # type: ignore
 
         if state.verified_rules:
-            table = pd.DataFrame([state.last_verified_rule.metadata.model_dump()]).T._repr_html_()  # type: ignore[operator]
-            output.append(f"<H2>Data Model</H2><br />{table}")
+            output.append(f"<H2>Data Model</H2><br />{state.last_verified_rule._repr_html_()}")  # type: ignore
 
         if state.has_store:
             output.append(f"<H2>Instances</H2> {state.store._repr_html_()}")

{cognite_neat-0.94.0 → cognite_neat-0.95.0}/cognite/neat/_session/_prepare.py

@@ -9,8 +9,10 @@ from cognite.neat._rules.models.information._rules_input import InformationInput
 from cognite.neat._rules.transformers import ReduceCogniteModel, ToCompliantEntities, ToExtension
 
 from ._state import SessionState
+from .exceptions import intercept_session_exceptions
 
 
+@intercept_session_exceptions
 class PrepareAPI:
     def __init__(self, state: SessionState, verbose: bool) -> None:
         self._state = state
@@ -18,6 +20,7 @@ class PrepareAPI:
         self.data_model = DataModelPrepareAPI(state, verbose)
 
 
+@intercept_session_exceptions
 class DataModelPrepareAPI:
     def __init__(self, state: SessionState, verbose: bool) -> None:
         self._state = state

{cognite_neat-0.94.0 → cognite_neat-0.95.0}/cognite/neat/_session/_read.py

@@ -12,8 +12,10 @@ from cognite.neat._rules._shared import ReadRules
 
 from ._state import SessionState
 from ._wizard import NeatObjectType, RDFFileType, object_wizard, rdf_dm_wizard
+from .exceptions import intercept_session_exceptions
 
 
+@intercept_session_exceptions
 class ReadAPI:
     def __init__(self, state: SessionState, client: CogniteClient | None, verbose: bool) -> None:
         self._state = state
@@ -23,6 +25,7 @@ class ReadAPI:
         self.excel = ExcelReadAPI(state, client, verbose)
 
 
+@intercept_session_exceptions
 class BaseReadAPI:
     def __init__(self, state: SessionState, client: CogniteClient | None, verbose: bool) -> None:
         self._state = state
@@ -47,6 +50,7 @@ class BaseReadAPI:
             raise ValueError(f"Expected str or Path, got {type(io)}")
 
 
+@intercept_session_exceptions
 class CDFReadAPI(BaseReadAPI):
     def data_model(self, data_model_id: DataModelIdentifier) -> IssueList:
         if self._client is None:
@@ -58,6 +62,7 @@ class CDFReadAPI(BaseReadAPI):
         return input_rules.issues
 
 
+@intercept_session_exceptions
 class ExcelReadAPI(BaseReadAPI):
     def __call__(self, io: Any) -> IssueList:
         filepath = self._return_filepath(io)
@@ -66,6 +71,7 @@ class ExcelReadAPI(BaseReadAPI):
         return input_rules.issues
 
 
+@intercept_session_exceptions
 class RDFReadAPI(BaseReadAPI):
     def __init__(self, state: SessionState, client: CogniteClient | None, verbose: bool) -> None:
         super().__init__(state, client, verbose)

{cognite_neat-0.94.0 → cognite_neat-0.95.0}/cognite/neat/_session/_show.py

@@ -13,8 +13,10 @@ from cognite.neat._session.exceptions import NeatSessionError
 from cognite.neat._utils.rdf_ import remove_namespace_from_uri
 
 from ._state import SessionState
+from .exceptions import intercept_session_exceptions
 
 
+@intercept_session_exceptions
 class ShowAPI:
     def __init__(self, state: SessionState) -> None:
         self._state = state
@@ -22,6 +24,7 @@ class ShowAPI:
         self.instances = ShowInstanceAPI(self._state)
 
 
+@intercept_session_exceptions
 class ShowInstanceAPI:
     def __init__(self, state: SessionState) -> None:
         self._state = state
@@ -134,6 +137,7 @@ class ShowInstanceAPI:
         return template
 
 
+@intercept_session_exceptions
 class ShowDataModelAPI:
     def __init__(self, state: SessionState) -> None:
         self._state = state

{cognite_neat-0.94.0 → cognite_neat-0.95.0}/cognite/neat/_session/_to.py

@@ -8,8 +8,10 @@ from cognite.neat._rules import exporters
 from cognite.neat._session._wizard import space_wizard
 
 from ._state import SessionState
+from .exceptions import intercept_session_exceptions
 
 
+@intercept_session_exceptions
 class ToAPI:
     def __init__(self, state: SessionState, client: CogniteClient | None, verbose: bool) -> None:
         self._state = state
@@ -39,6 +41,7 @@ class ToAPI:
         return None
 
 
+@intercept_session_exceptions
 class CDFToAPI:
     def __init__(self, state: SessionState, client: CogniteClient | None, verbose: bool) -> None:
         self._client = client

{cognite_neat-0.94.0 → cognite_neat-0.95.0}/cognite/neat/_session/exceptions.py

@@ -23,6 +23,8 @@ def _intercept_session_exceptions(func: Callable):
             return func(*args, **kwargs)
         except NeatSessionError as e:
             action = func.__name__
+            if action == "__call__":
+                action = func.__qualname__.removesuffix(".__call__").removesuffix("API")
             print(f"{_PREFIX} Cannot {action}: {e}")
 
     return wrapper
@@ -33,10 +35,11 @@ def intercept_session_exceptions(cls: type):
     while to_check:
         cls = to_check.pop()
         for attr_name in dir(cls):
-            if not attr_name.startswith("_"):
-                attr = getattr(cls, attr_name)
-                if callable(attr):
-                    setattr(cls, attr_name, _intercept_session_exceptions(attr))
-                elif isinstance(attr, type):
-                    to_check.append(attr)
+            if attr_name.startswith("_") and not attr_name == "__call__":
+                continue
+            attr = getattr(cls, attr_name)
+            if callable(attr):
+                setattr(cls, attr_name, _intercept_session_exceptions(attr))
+            elif isinstance(attr, type):
+                to_check.append(attr)
     return cls

cognite_neat-0.95.0/cognite/neat/_version.py

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

{cognite_neat-0.94.0 → cognite_neat-0.95.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cognite-neat"
-version = "0.94.0"
+version = "0.95.0"
 readme = "README.md"
 description = "Knowledge graph transformation"
 authors = [
@@ -62,7 +62,7 @@ urllib3 = "^2"
 openpyxl = "*"
 networkx = "^3.4.2"
 ipycytoscape = "^1.3.3"
-matplotlib = "^3.9.2"
+matplotlib = "=3.5.2"
 
 
 # Notebook

cognite_neat-0.94.0/cognite/neat/_version.py

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