cognite-neat 0.119.0__py3-none-any.whl → 0.119.2__py3-none-any.whl

cognite/neat/_issues/_contextmanagers.py

@@ -20,7 +20,9 @@ def catch_warnings() -> Iterator[IssueList]:
             yield issues
         finally:
             if warning_logger:
-                issues.extend([from_warning(warning) for warning in warning_logger])
+                issues.extend(
+                    [from_warning(warning) for warning in warning_logger if from_warning(warning) is not None]
+                )
 
 
 @contextmanager

cognite/neat/_issues/_factory.py

@@ -7,7 +7,6 @@ from cognite.neat._issues._base import NeatError, NeatWarning
 from cognite.neat._utils.spreadsheet import SpreadsheetRead
 
 from .errors import NeatValueError, SpreadsheetError
-from .warnings import NeatValueWarning
 
 
 def from_pydantic_errors(
@@ -23,13 +22,11 @@ def from_pydantic_errors(
     ]
 
 
-def from_warning(warning: WarningMessage) -> NeatWarning:
+def from_warning(warning: WarningMessage) -> NeatWarning | None:
     if isinstance(warning.message, NeatWarning):
         return warning.message
-    message = f"{warning.category.__name__}: {warning.message!s}"
-    if warning.source:
-        message += f" Source: {warning.source}"
-    return NeatValueWarning(message)
+
+    return None
 
 
 def _from_pydantic_error(error: ErrorDetails, read_info_by_sheet: dict[str, SpreadsheetRead]) -> NeatError:

cognite/neat/_issues/errors/_external.py

@@ -1,6 +1,7 @@
 from dataclasses import dataclass
 from pathlib import Path
 
+from cognite.client import data_modeling as dm
 from yaml import YAMLError
 
 from cognite.neat._issues import NeatError
@@ -84,6 +85,7 @@ class CDFMissingClientError(NeatError, RuntimeError):
 
 @dataclass(unsafe_hash=True)
 class CDFMissingResourcesError(NeatError, RuntimeError):
-    """Following CDF resources are missing: {resources}"""
+    """Following containers {containers} and views {views} are missing in the CDF project."""
 
-    resources: str
+    containers: tuple[dm.ContainerId, ...]
+    views: tuple[dm.ViewId, ...]

cognite/neat/_rules/importers/_yaml2rules.py

@@ -8,6 +8,7 @@ from cognite.neat._issues.errors import (
     FileMissingRequiredFieldError,
     FileNotAFileError,
     FileNotFoundNeatError,
+    FileReadError,
     FileTypeUnexpectedError,
 )
 from cognite.neat._issues.warnings import NeatValueWarning
@@ -55,7 +56,12 @@ class YAMLImporter(BaseImporter[T_InputRules]):
             return cls({}, [FileNotAFileError(filepath)])
         elif filepath.suffix not in [".yaml", ".yml"]:
             return cls({}, [FileTypeUnexpectedError(filepath, frozenset([".yaml", ".yml"]))])
-        return cls(yaml.safe_load(filepath.read_text()), filepaths=[filepath], source_name=source_name)
+        try:
+            data = yaml.safe_load(filepath.read_text())
+        except yaml.YAMLError as exc:
+            return cls({}, [FileReadError(filepath, f"Invalid YAML: {exc!s}")])
+
+        return cls(data, filepaths=[filepath], source_name=source_name)
 
     def to_rules(self) -> ReadRules[T_InputRules]:
         if self._read_issues.has_errors or not self.raw_data:

cognite/neat/_rules/models/dms/_validation.py

@@ -127,7 +127,7 @@ class DMSValidation:
             }
 
             if missing_views or missing_containers:
-                raise CDFMissingResourcesError(resources=f"{missing_views.union(missing_containers)}")
+                raise CDFMissingResourcesError(containers=tuple(missing_containers), views=tuple(missing_views))
 
         # Setup data structures for validation
         dms_schema = self._rules.as_schema()

cognite/neat/_version.py

@@ -1,2 +1,2 @@
-__version__ = "0.119.0"
+__version__ = "0.119.2"
 __engine__ = "^2.0.4"

{cognite_neat-0.119.0.dist-info → cognite_neat-0.119.2.dist-info}/METADATA

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

{cognite_neat-0.119.0.dist-info → cognite_neat-0.119.2.dist-info}/RECORD

@@ -57,10 +57,10 @@ cognite/neat/_graph/transformers/_rdfpath.py,sha256=9KCiq8UCeNWcV9VAmyV5gbqwmozU
 cognite/neat/_graph/transformers/_value_type.py,sha256=9Ihk-NMra91c_KOKonKUNgZXwylSrE7pDluzd31NHfM,15797
 cognite/neat/_issues/__init__.py,sha256=NQ-PN3fqp-hBPlpG2AZEND4cDn3_3UXAPfhLNtF5mtc,457
 cognite/neat/_issues/_base.py,sha256=UDcx0s9_PqLD4z1NnOxI4wgsk2z6IiVCuJoG-V8aPyQ,11671
-cognite/neat/_issues/_contextmanagers.py,sha256=Qve1778doz41N6NYxs_lVhJfvUEtD1r-WwBv386UUnc,1502
-cognite/neat/_issues/_factory.py,sha256=aSEWacUkFxU6z5RVMq0DOZMrS3lwFJ0tpqltq_QyNZg,3000
+cognite/neat/_issues/_contextmanagers.py,sha256=lfASjmq0wHHCJQtgChvOMFZGp_rL513baHSRXbW0ugU,1577
+cognite/neat/_issues/_factory.py,sha256=-22ptgqVeqkaL7RqaIEexhXh3Z27dFvj7Q-9D0tu-4E,2811
 cognite/neat/_issues/errors/__init__.py,sha256=1MK8nHFrN5c2Uiq9r4PkjL8GnBY7TGhcqGNkgQzVmKs,2359
-cognite/neat/_issues/errors/_external.py,sha256=WISG6rA0GH7lD23hN7WDhDIfOh9QrsXUDSxMCkTcBj4,2210
+cognite/neat/_issues/errors/_external.py,sha256=LIze-eY3gEWEA_UmCGmknoazhKa73-ZGaHDz3xsR9DM,2349
 cognite/neat/_issues/errors/_general.py,sha256=MnBm9V1S-Agr9kUfTMvviBB4_NkuOXamlgJCu2UojEM,849
 cognite/neat/_issues/errors/_properties.py,sha256=T_nquQeEQS3DQY--DQ13acxhGX_-gpUMjWGTBKCh6r8,2536
 cognite/neat/_issues/errors/_resources.py,sha256=qndhGGPdulWpU7G4PkFHsF4Bjflf3lehGV4A0l-BeNI,3966
@@ -105,7 +105,7 @@ cognite/neat/_rules/importers/_rdf/_inference2rules.py,sha256=NSPFEe6ZLHbFTUGTpQ
 cognite/neat/_rules/importers/_rdf/_owl2rules.py,sha256=gTMe94DC9xe8NR9KNVHTMTshg_NzVuN1v8Lz95BUshI,3392
 cognite/neat/_rules/importers/_rdf/_shared.py,sha256=nLHEXOwEs9n-4t6kIGyPJIlFMGw4VKCpU8_NBC0XLr0,5876
 cognite/neat/_rules/importers/_spreadsheet2rules.py,sha256=wjB7RVevjvXL3gaL1SGEW411ie76ZrFbe9fngzO-ncQ,10977
-cognite/neat/_rules/importers/_yaml2rules.py,sha256=k2oDgz--mxFVeyqQG3uvyYcb0BkFHwKHdBYHVaxtAEc,3721
+cognite/neat/_rules/importers/_yaml2rules.py,sha256=tqfHhLnlcu4iFrF5ol26lUquBoXHW95mfpmtjdTQx-Q,3896
 cognite/neat/_rules/models/__init__.py,sha256=tf6tyWiYO0eC2PHCcpy208dwOHjEi9hg0sEaQLcB3uA,1024
 cognite/neat/_rules/models/_base_input.py,sha256=ZcSheXMz72w907RAcuMMupTk35zApQ8lS43As7dFVgA,6661
 cognite/neat/_rules/models/_base_rules.py,sha256=5Z2iyyumJn0oR-1XZ2-O696UTSpsjQ-6cBAdW3dvnE0,14996
@@ -115,7 +115,7 @@ cognite/neat/_rules/models/dms/__init__.py,sha256=fRaUH0IwG0YwWd_DNKM6j-jHHFyiIV
 cognite/neat/_rules/models/dms/_exporter.py,sha256=2QiTLX4UF89jGd_YRz9EczDFprBphdO_oyaQWMBmSiM,28576
 cognite/neat/_rules/models/dms/_rules.py,sha256=QEKNw31nkTwzjyNEnWYUdDFUdJvDJ5_14iQzWsFizxs,23537
 cognite/neat/_rules/models/dms/_rules_input.py,sha256=HfC4Z9UfDSBlKhoBdk57NqyPic1pVNymZYYEeV8Ow-k,16410
-cognite/neat/_rules/models/dms/_validation.py,sha256=Uh6DaCywdpTljy3trmVGaHrRI1wqZSAHRBpSi1hemsU,32165
+cognite/neat/_rules/models/dms/_validation.py,sha256=TdIcYpjWNkNT9V3H2po4yzRnlAr1Kq6ZUbmfe-_rAzk,32175
 cognite/neat/_rules/models/entities/__init__.py,sha256=Hlucp3LyV6ncLl79aqRTbSy2qgiGzoyN8x54D_zaJCY,1469
 cognite/neat/_rules/models/entities/_constants.py,sha256=GXRzVfArwxF3C67VCkzy0JWTZRkRJUYXBQaaecrqcWc,351
 cognite/neat/_rules/models/entities/_loaders.py,sha256=OQDbz5ANMQ_7ZcdMIBdTR94BoCpWrBA2KBH3fCW0JQo,2728
@@ -177,10 +177,10 @@ cognite/neat/_utils/text.py,sha256=9T0mzcNn6J9X8DriNntLN5ThCXOWbU1BYareukbLT7A,8
 cognite/neat/_utils/time_.py,sha256=7ayUm0OWZm1JDmy32E4ip8WRr2o0GLwrHwJA8sJ43Z4,357
 cognite/neat/_utils/upload.py,sha256=xWtM6mFuD2QYQHaZ7zCAuGptbEpPIxcH-raWQu93-Ug,5845
 cognite/neat/_utils/xml_.py,sha256=FQkq84u35MUsnKcL6nTMJ9ajtG9D5i1u4VBnhGqP2DQ,1710
-cognite/neat/_version.py,sha256=TJTHDgA0OrwVmqyL7--NeoKjn6AUK1SpOFTw5WFlYms,46
+cognite/neat/_version.py,sha256=xLW6qWr9en3vnNky4xTA19gaRQx83AyykePJu290fog,46
 cognite/neat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite_neat-0.119.0.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.119.0.dist-info/METADATA,sha256=83ednd4awU-v4LrLtW-WNmIV9LE0HAe0C_hkKQup5wo,5421
-cognite_neat-0.119.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-cognite_neat-0.119.0.dist-info/entry_points.txt,sha256=SsQlnl8SNMSSjE3acBI835JYFtsIinLSbVmHmMEXv6E,51
-cognite_neat-0.119.0.dist-info/RECORD,,
+cognite_neat-0.119.2.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.119.2.dist-info/METADATA,sha256=TXPc5I1wH0FXQw6_nA1vly50A781eRZbf_SVyVnd3Kw,5421
+cognite_neat-0.119.2.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+cognite_neat-0.119.2.dist-info/entry_points.txt,sha256=SsQlnl8SNMSSjE3acBI835JYFtsIinLSbVmHmMEXv6E,51
+cognite_neat-0.119.2.dist-info/RECORD,,