cognite-neat 0.82.2__tar.gz → 0.83.0__tar.gz

{cognite_neat-0.82.2 → cognite_neat-0.83.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cognite-neat
-Version: 0.82.2
+Version: 0.83.0
 Summary: Knowledge graph transformation
 Home-page: https://cognite-neat.readthedocs-hosted.com/
 License: Apache-2.0
@@ -17,15 +17,16 @@ Provides-Extra: docs
 Provides-Extra: google
 Provides-Extra: graphql
 Provides-Extra: oxi
+Provides-Extra: service
 Requires-Dist: PyYAML
 Requires-Dist: backports.strenum (>=1.2,<2.0) ; python_version < "3.11"
-Requires-Dist: cognite-sdk (>=7.37.0,<8.0.0)
+Requires-Dist: cognite-sdk (>=7.52.0,<8.0.0)
 Requires-Dist: deepdiff
 Requires-Dist: exceptiongroup (>=1.1.3,<2.0.0) ; python_version < "3.11"
-Requires-Dist: fastapi (>=0,<1)
-Requires-Dist: google-api-python-client ; extra == "google" or extra == "all"
-Requires-Dist: google-auth-oauthlib ; extra == "google" or extra == "all"
-Requires-Dist: gspread ; extra == "google" or extra == "all"
+Requires-Dist: fastapi (>=0,<1) ; extra == "service" or extra == "all"
+Requires-Dist: google-api-python-client ; extra == "google"
+Requires-Dist: google-auth-oauthlib ; extra == "google"
+Requires-Dist: gspread ; extra == "google"
 Requires-Dist: jinja2 (>=3.1.2,<4.0.0) ; extra == "graphql" or extra == "all"
 Requires-Dist: mkdocs ; extra == "docs"
 Requires-Dist: mkdocs-autorefs (>=0.5.0,<0.6.0) ; extra == "docs"
@@ -39,18 +40,17 @@ Requires-Dist: mkdocstrings[python] ; extra == "docs"
 Requires-Dist: openpyxl
 Requires-Dist: oxrdflib[oxigraph] (>=0.3.3,<0.4.0) ; extra == "oxi" or extra == "all"
 Requires-Dist: pandas
-Requires-Dist: prometheus-client (>=0.20.0,<0.21.0)
+Requires-Dist: prometheus-client (>=0,<1) ; extra == "service" or extra == "all"
 Requires-Dist: pydantic (>=2,<3)
 Requires-Dist: pymdown-extensions ; extra == "docs"
-Requires-Dist: pyoxigraph (==0.3.19)
-Requires-Dist: python-multipart (>=0,<1)
+Requires-Dist: pyoxigraph (==0.3.19) ; extra == "oxi" or extra == "all"
 Requires-Dist: rdflib
 Requires-Dist: requests
-Requires-Dist: schedule (>=1,<2)
+Requires-Dist: schedule (>=1,<2) ; extra == "service" or extra == "all"
 Requires-Dist: tomli (>=2.0.1,<3.0.0) ; python_version < "3.11"
 Requires-Dist: typing_extensions (>=4.8,<5.0) ; python_version < "3.11"
 Requires-Dist: urllib3 (>=2,<3)
-Requires-Dist: uvicorn[standard] (>=0,<1)
+Requires-Dist: uvicorn[standard] (>=0,<1) ; extra == "service" or extra == "all"
 Project-URL: Documentation, https://cognite-neat.readthedocs-hosted.com/
 Project-URL: Repository, https://github.com/cognitedata/neat
 Description-Content-Type: text/markdown

cognite_neat-0.83.0/cognite/neat/_version.py

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

{cognite_neat-0.82.2 → cognite_neat-0.83.0}/cognite/neat/legacy/rules/examples/power-grid-containers.yaml

@@ -3,6 +3,7 @@
   properties:
     name:
       autoIncrement: false
+      immutable: false
       defaultValue: null
       description: 'The name that identifies Greographical
 
@@ -20,6 +21,7 @@
   properties:
     aliasName:
       autoIncrement: false
+      immutable: false
       defaultValue: null
       description: 'The alternative name that identifies Substation
 
@@ -32,6 +34,7 @@
         type: text
     name:
       autoIncrement: false
+      immutable: false
       defaultValue: null
       description: 'The name that identifies Terminal
 
@@ -44,6 +47,7 @@
         type: text
     substation:
       autoIncrement: false
+      immutable: false
       defaultValue: null
       description: 'Substation to which terminal belongs to
 
@@ -61,6 +65,7 @@
   properties:
     name:
       autoIncrement: false
+      immutable: false
       defaultValue: null
       description: 'The name that identifies SubGreographical
 
@@ -73,6 +78,7 @@
         type: text
     region:
       autoIncrement: false
+      immutable: false
       defaultValue: null
       description: 'Region to which subgeographical region belongs to
 
@@ -90,6 +96,7 @@
   properties:
     name:
       autoIncrement: false
+      immutable: false
       defaultValue: null
       description: 'The name that identifies Substation
 
@@ -102,6 +109,7 @@
         type: text
     subGeographicalRegion:
       autoIncrement: false
+      immutable: false
       defaultValue: null
       description: 'The subgeographical region containing the substation
 

{cognite_neat-0.82.2 → cognite_neat-0.83.0}/cognite/neat/legacy/rules/examples/power-grid-model.yaml

@@ -23,6 +23,7 @@ views:
           type: text
         nullable: false
         autoIncrement: false
+        immutable: false
         source: null
         defaultValue: null
         name: name
@@ -67,6 +68,7 @@ views:
           type: text
         nullable: false
         autoIncrement: false
+        immutable: false
         source: null
         defaultValue: null
         name: name
@@ -88,6 +90,7 @@ views:
             version: "1"
         nullable: true
         autoIncrement: false
+        immutable: false
         defaultValue: null
         name: region
         description: "Region to which subgeographical region belongs to
@@ -119,6 +122,7 @@ views:
           type: text
         nullable: false
         autoIncrement: false
+        immutable: false
         source: null
         defaultValue: null
         name: name
@@ -140,6 +144,7 @@ views:
             version: bbe4295878a47f
         nullable: true
         autoIncrement: false
+        immutable: false
         defaultValue: null
         name: subGeographicalRegion
         description: "The subgeographical region containing the substation
@@ -166,6 +171,7 @@ views:
           type: text
         nullable: false
         autoIncrement: false
+        immutable: false
         source: null
         defaultValue: null
         name: name
@@ -183,6 +189,7 @@ views:
           type: text
         nullable: true
         autoIncrement: false
+        immutable: false
         source: null
         defaultValue: null
         name: aliasName
@@ -204,6 +211,7 @@ views:
             version: "1"
         nullable: true
         autoIncrement: false
+        immutable: false
         defaultValue: null
         name: substation
         description: "Substation to which terminal belongs to

{cognite_neat-0.82.2 → cognite_neat-0.83.0}/cognite/neat/rules/models/dms/_schema.py

@@ -746,6 +746,7 @@ class DMSSchema:
                 type=container_prop.type,
                 nullable=container_prop.nullable,
                 auto_increment=container_prop.auto_increment,
+                immutable=container_prop.immutable,
                 # Likely bug in SDK.
                 default_value=container_prop.default_value,  # type: ignore[arg-type]
             )

{cognite_neat-0.82.2 → cognite_neat-0.83.0}/cognite/neat/rules/models/information/_converter.py

@@ -1,8 +1,12 @@
 import re
 from collections import Counter, defaultdict
 from collections.abc import Collection
+from datetime import date, datetime
 from typing import TYPE_CHECKING, Literal
 
+from cognite.client.data_classes import data_modeling as dms
+
+from cognite.neat.rules.models import data_types
 from cognite.neat.rules.models._base import (
     ExtensionCategory,
     SchemaCompleteness,
@@ -15,6 +19,7 @@ from cognite.neat.rules.models.entities import (
     ClassEntity,
     ContainerEntity,
     DMSUnknownEntity,
+    MultiValueTypeInfo,
     ReferenceEntity,
     UnknownEntity,
     ViewEntity,
@@ -172,6 +177,8 @@ class _InformationRulesConverter:
             value_type = DMSUnknownEntity()
         elif isinstance(prop.value_type, ClassEntity):
             value_type = prop.value_type.as_view_entity(default_space, default_version)
+        elif isinstance(prop.value_type, MultiValueTypeInfo):
+            value_type = self.convert_multi_value_type(prop.value_type)
         else:
             raise ValueError(f"Unsupported value type: {prop.value_type.type_}")
 
@@ -271,3 +278,24 @@ class _InformationRulesConverter:
             return suffix[: suffix_number.start()] + str(int(suffix_number.group()) + 1)
         else:
             return f"{suffix}2"
+
+    @staticmethod
+    def convert_multi_value_type(value_type: MultiValueTypeInfo) -> DataType:
+        if not all(isinstance(type_, DataType) for type_ in value_type.types):
+            raise ValueError("Only MultiValueType with DataType types is supported")
+        # We check above that there are no ClassEntity types in the MultiValueType
+        py_types = {type_.python for type_ in value_type.types}  # type: ignore[union-attr]
+        if dms.Json in py_types and len(py_types) > 1:
+            raise ValueError("MultiValueType with Json and other types is not supported")
+        elif dms.Json in py_types:
+            return data_types.Json()
+        elif not (py_types - {bool}):
+            return data_types.Boolean()
+        elif not (py_types - {int, bool}):
+            return data_types.Integer()
+        elif not (py_types - {float, int, bool}):
+            return data_types.Double()
+        elif not (py_types - {datetime, date}):
+            return data_types.DateTime()
+
+        return data_types.String()

{cognite_neat-0.82.2 → cognite_neat-0.83.0}/cognite/neat/workflows/migration/steps.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from ruamel.yaml import YAML
+import yaml
 
 # Migration mapping
 
@@ -62,9 +62,7 @@ step_rename_mapping = {
 
 def rename_workflow_steps(workflow_path: Path, dry_run: bool) -> str:
     # Load the YAML file
-    yaml = YAML()
-    with workflow_path.open() as file:
-        data = yaml.load(file)
+    data = yaml.safe_load(workflow_path.read_text())
     # Replace old step names with new ones
     for step in data["steps"]:
         if step["method"] in step_rename_mapping:
@@ -73,7 +71,7 @@ def rename_workflow_steps(workflow_path: Path, dry_run: bool) -> str:
 
     # Save the updated YAML file
     with workflow_path.open("w") as file:
-        yaml.dump(data, file)
+        yaml.safe_dump(data, file)
     return "ok"
 
 

{cognite_neat-0.82.2 → cognite_neat-0.83.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cognite-neat"
-version = "0.82.2"
+version = "0.83.0"
 readme = "README.md"
 description = "Knowledge graph transformation"
 authors = [
@@ -20,12 +20,6 @@ exclude = [
     "cognite/neat/app/ui/neat-app/*.json",
 ]
 
-
-[tool.black]
-line-length = 120
-target_version = ['py310']
-include = '\.py$'
-
 [tool.ruff.lint]
 # See https://docs.astral.sh/ruff/rules/ for an overview of ruff rules
 select = ["E", "W", "F", "I", "RUF", "TID", "UP", "B", "FLY", "PTH", "ERA"]
@@ -55,36 +49,46 @@ warn_required_dynamic_aliases = true
 [tool.poetry.scripts]
 neat = "cognite.neat.app.main:run"
 
-
 [tool.poetry.dependencies]
 python = "^3.10"
+# Core dependencies
 pandas = "*"
+cognite-sdk = "^7.52.0"
 rdflib = "*"
 pydantic = "^2"
 PyYAML = "*"
 requests = "*"
 urllib3 = "^2"
 openpyxl = "*"
+deepdiff = "*"
+
 # Backport from Python 3.11
 exceptiongroup = { version = "^1.1.3", python = "<3.11" }
 'backports.strenum' = { version = "^1.2", python = "<3.11" }
 typing_extensions = { version = "^4.8", python = "<3.11" }
 tomli = { version = "^2.0.1", python = "<3.11" }
 
-uvicorn = { extras = ["standard"], version = "^0" }
-prometheus-client = "^0.20.0"
-cognite-sdk = "^7.37.0"
-deepdiff = "*"
-fastapi = "^0"
-schedule = "^1"
-python-multipart = "^0"
-oxrdflib = { version = "^0.3.3", optional = true, extras = ["oxigraph"] }
+# API
+uvicorn = { extras = ["standard"], version = "^0", optional = true }
+prometheus-client = {version="^0", optional = true}
+fastapi = {version="^0", optional = true }
 
+# WorkFlow
+schedule = {version ="^1", optional = true}
 
+# Alternative graph for NEAT Store
+oxrdflib = { version = "^0.3.3", optional = true, extras = ["oxigraph"] }
+pyoxigraph = {version= "0.3.19", optional = true}
+
+# Only used for GoogleSheetImporter
 gspread = { version = "*", optional = true }
 google-api-python-client = { version = "*", optional = true }
 google-auth-oauthlib = { version = "*", optional = true }
 
+# Remove when ledacy is removed
+jinja2 = { version = "^3.1.2", optional = true }
+
+# Documentation dependencies
 mkdocs = { version = "*", optional = true }
 mkdocs-jupyter = { version = "*", optional = true }
 mkdocs-material-extensions = { version = "*", optional = true }
@@ -95,8 +99,7 @@ mkdocs-glightbox = { version = "*", optional = true }
 pymdown-extensions = { version = "*", optional = true }
 mkdocs-autorefs = { version = "^0.5.0", optional = true }
 mkdocstrings = { version = "*", optional = true, extras = ["python"] }
-jinja2 = { version = "^3.1.2", optional = true }
-pyoxigraph = "0.3.19"
+
 
 [tool.poetry.extras]
 docs = [
@@ -112,14 +115,18 @@ docs = [
     "mkdocs-autorefs",
 ]
 google = ["gspread", "google-api-python-client", "google-auth-oauthlib"]
-oxi = ["oxrdflib"]
+oxi = ["oxrdflib", "pyoxigraph"]
+service = ["uvicorn", "prometheus-client", "fastapi", "schedule"]
 graphql = ["jinja2"]
+
 all = [
-    "gspread",
-    "google-api-python-client",
-    "google-auth-oauthlib",
     "jinja2",
+    "pyoxigraph",
     "oxrdflib",
+    "uvicorn",
+    "prometheus-client",
+    "fastapi",
+    "schedule",
 ]
 
 [tool.poetry.dev-dependencies]
@@ -132,8 +139,6 @@ pytest-notebook = "*"
 freezegun = "^1.5.1"
 pytest-xdist = "^3.6.1"
 pre-commit = "*"
-safety = "*"
-bandit = "*"
 jupyter = "*"
 pytest-regressions = "*"
 memray = [

cognite_neat-0.82.2/cognite/neat/_version.py

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