cognite-neat 0.75.8__py3-none-any.whl → 0.76.0__py3-none-any.whl

cognite/neat/rules/models/entities.py

@@ -4,7 +4,7 @@ from abc import ABC, abstractmethod
 from functools import total_ordering
 from typing import Annotated, Any, ClassVar, Generic, TypeVar, cast
 
-from cognite.client.data_classes.data_modeling.ids import ContainerId, DataModelId, PropertyId, ViewId
+from cognite.client.data_classes.data_modeling.ids import ContainerId, DataModelId, NodeId, PropertyId, ViewId
 from pydantic import AnyHttpUrl, BaseModel, BeforeValidator, Field, PlainSerializer, model_serializer, model_validator
 
 if sys.version_info >= (3, 11):
@@ -30,6 +30,7 @@ class EntityTypes(StrEnum):
     data_value_type = "data_value_type"  # these are strings, floats, ...
     xsd_value_type = "xsd_value_type"
     dms_value_type = "dms_value_type"
+    dms_node = "dms_node"
     view = "view"
     reference_entity = "reference_entity"
     container = "container"
@@ -57,8 +58,7 @@ _PROPERTY_ID_REGEX = rf"\((?P<{EntityTypes.property_}>{_ENTITY_ID_REGEX})\)"
 _ENTITY_PATTERN = re.compile(r"^(?P<prefix>.*?):?(?P<suffix>[^(:]*)(\((?P<content>[^)]+)\))?$")
 
 
-class _UndefinedType(BaseModel):
-    ...
+class _UndefinedType(BaseModel): ...
 
 
 class _UnknownType(BaseModel):
@@ -249,7 +249,7 @@ class UnknownEntity(ClassEntity):
         return str(Unknown)
 
 
-T_ID = TypeVar("T_ID", bound=ContainerId | ViewId | DataModelId | PropertyId | None)
+T_ID = TypeVar("T_ID", bound=ContainerId | ViewId | DataModelId | PropertyId | NodeId | None)
 
 
 class DMSEntity(Entity, Generic[T_ID], ABC):
@@ -303,7 +303,9 @@ class ContainerEntity(DMSEntity[ContainerId]):
 class DMSVersionedEntity(DMSEntity[T_ID], ABC):
     version: str
 
-    def as_class(self) -> ClassEntity:
+    def as_class(self, skip_version: bool = False) -> ClassEntity:
+        if skip_version:
+            return ClassEntity(prefix=self.space, suffix=self.external_id)
         return ClassEntity(prefix=self.space, suffix=self.external_id, version=self.version)
 
 
@@ -316,10 +318,13 @@ class ViewEntity(DMSVersionedEntity[ViewId]):
         return ViewId(space=self.space, external_id=self.external_id, version=self.version)
 
     @classmethod
-    def from_id(cls, id: ViewId) -> "ViewEntity":
-        if id.version is None:
+    def from_id(cls, id: ViewId, default_version: str | None = None) -> "ViewEntity":
+        if id.version is not None:
+            return cls(space=id.space, externalId=id.external_id, version=id.version)
+        elif default_version is not None:
+            return cls(space=id.space, externalId=id.external_id, version=default_version)
+        else:
             raise ValueError("Version must be specified")
-        return cls(space=id.space, externalId=id.external_id, version=id.version)
 
 
 class DMSUnknownEntity(DMSEntity[None]):
@@ -377,6 +382,17 @@ class DataModelEntity(DMSVersionedEntity[DataModelId]):
         return cls(space=id.space, externalId=id.external_id, version=id.version)
 
 
+class DMSNodeEntity(DMSEntity[NodeId]):
+    type_: ClassVar[EntityTypes] = EntityTypes.dms_node
+
+    def as_id(self) -> NodeId:
+        return NodeId(space=self.space, external_id=self.external_id)
+
+    @classmethod
+    def from_id(cls, id: NodeId) -> "DMSNodeEntity":
+        return cls(space=id.space, externalId=id.external_id)
+
+
 class ReferenceEntity(ClassEntity):
     type_: ClassVar[EntityTypes] = EntityTypes.reference_entity
     prefix: str
@@ -392,6 +408,12 @@ class ReferenceEntity(ClassEntity):
             raise ValueError("Property is not defined or prefix is not defined or suffix is unknown")
         return PropertyId(source=self.as_view_id(), property=self.property_)
 
+    def as_node_id(self) -> NodeId:
+        return NodeId(space=self.prefix, external_id=self.suffix)
+
+    def as_node_entity(self) -> DMSNodeEntity:
+        return DMSNodeEntity(space=self.prefix, externalId=self.suffix)
+
     def as_class_entity(self) -> ClassEntity:
         return ClassEntity(prefix=self.prefix, suffix=self.suffix, version=self.version)
 

cognite/neat/rules/models/rdfpath.py

@@ -1,5 +1,4 @@
-"""
-"""
+""" """
 
 import re
 import sys

cognite/neat/rules/models/rules/_base.py

@@ -27,8 +27,6 @@ from pydantic import (
 )
 from pydantic.fields import FieldInfo
 
-from cognite.neat.rules.models.entities import ClassEntity
-
 if sys.version_info >= (3, 11):
     from enum import StrEnum
     from typing import Self
@@ -140,6 +138,11 @@ class ExtensionCategory(StrEnum):
     rebuild = "rebuild"
 
 
+class DataModelType(StrEnum):
+    solution = "solution"
+    enterprise = "enterprise"
+
+
 class RoleTypes(StrEnum):
     domain_expert = "domain expert"
     information_architect = "information architect"
@@ -274,10 +277,6 @@ class BaseRules(RuleModel):
 
 # An sheet entity is either a class or a property.
 class SheetEntity(RuleModel):
-    class_: ClassEntity = Field(alias="Class")
-    name: str | None = Field(alias="Name", default=None)
-    description: str | None = Field(alias="Description", default=None)
-
     @field_validator("*", mode="before")
     def strip_string(cls, value: Any) -> Any:
         if isinstance(value, str):