cognite-neat 0.72.2__py3-none-any.whl → 0.72.3__py3-none-any.whl

cognite/neat/_version.py

@@ -1 +1 @@
-__version__ = "0.72.2"
+__version__ = "0.72.3"

cognite/neat/constants.py

@@ -11,6 +11,7 @@ EXAMPLE_RULES = PACKAGE_DIRECTORY / "rules" / "examples"
 EXAMPLE_GRAPHS = PACKAGE_DIRECTORY / "graph" / "examples"
 EXAMPLE_WORKFLOWS = PACKAGE_DIRECTORY / "workflows" / "examples"
 
+DEFAULT_NAMESPACE = Namespace("http://purl.org/cognite/neat#")
 
 PREFIXES = {
     "rdf": RDF._NS,
@@ -27,10 +28,10 @@ PREFIXES = {
     "md": Namespace("http://iec.ch/TC57/61970-552/ModelDescription/1#"),
     "pti": Namespace("http://www.pti-us.com/PTI_CIM-schema-cim16#"),
     "tnt": Namespace("http://purl.org/cognite/tnt#"),
-    "neat": Namespace("http://purl.org/cognite/neat#"),
+    "neat": DEFAULT_NAMESPACE,
 }
 
-DEFAULT_NAMESPACE = Namespace("http://purl.org/cognite/app#")
+
 DEFAULT_URI = ""
 
 DEFAULT_DOCS_URL = "https://cognite-neat.readthedocs-hosted.com/en/latest/"

cognite/neat/rules/exporters/_rules2dms.py

@@ -40,8 +40,6 @@ class DMSExporter(CDFExporter[DMSSchema]):
             If set, only export components in the given spaces. Defaults to None which means all spaces.
         existing_handling (Literal["fail", "skip", "update", "force"], optional): How to handle existing components.
             Defaults to "update". See below for details.
-        standardize_casing(bool, optional): Whether to standardize the casing. This means PascalCase for external ID
-            of views, containers, and data models, and camelCase for properties.
         export_pipeline (bool, optional): Whether to export the pipeline. Defaults to False. This means setting
             up transformations, RAW databases and tables to populate the data model.
         instance_space (str, optional): The space to use for the instance. Defaults to None.
@@ -59,14 +57,12 @@ class DMSExporter(CDFExporter[DMSSchema]):
         export_components: Component | Collection[Component] = "all",
         include_space: set[str] | None = None,
         existing_handling: Literal["fail", "skip", "update", "force"] = "update",
-        standardize_casing: bool = True,
         export_pipeline: bool = False,
         instance_space: str | None = None,
     ):
         self.export_components = {export_components} if isinstance(export_components, str) else set(export_components)
         self.include_space = include_space
         self.existing_handling = existing_handling
-        self.standardize_casing = standardize_casing
         self.export_pipeline = export_pipeline
         self.instance_space = instance_space
         self._schema: DMSSchema | None = None
@@ -119,11 +115,11 @@ class DMSExporter(CDFExporter[DMSSchema]):
         )
         is_new_model = dms_rules.reference is None
         if is_new_model or is_solution_model:
-            return dms_rules.as_schema(self.standardize_casing, self.export_pipeline, self.instance_space)
+            return dms_rules.as_schema(self.export_pipeline, self.instance_space)
 
         # This is an extension of an existing model.
         reference_rules = cast(DMSRules, dms_rules.reference).copy(deep=True)
-        reference_schema = reference_rules.as_schema(self.standardize_casing, self.export_pipeline)
+        reference_schema = reference_rules.as_schema(self.export_pipeline)
 
         # Todo Move this to an appropriate location
         # Merging Reference with User Rules
@@ -146,7 +142,7 @@ class DMSExporter(CDFExporter[DMSSchema]):
                 property_.reference = None
                 combined_rules.properties.append(property_)
 
-        schema = combined_rules.as_schema(self.standardize_casing, self.export_pipeline, self.instance_space)
+        schema = combined_rules.as_schema(self.export_pipeline, self.instance_space)
 
         if dms_rules.metadata.extension in (ExtensionCategory.addition, ExtensionCategory.reshape):
             # We do not freeze views as they might be changed, even for addition,

cognite/neat/rules/exporters/_rules2ontology.py

@@ -8,6 +8,7 @@ from pydantic import BaseModel, ConfigDict, ValidationInfo, field_validator
 from rdflib import DCTERMS, OWL, RDF, RDFS, XSD, BNode, Graph, Literal, Namespace, URIRef
 from rdflib.collection import Collection as GraphCollection
 
+from cognite.neat.constants import DEFAULT_NAMESPACE as NEAT_NAMESPACE
 from cognite.neat.rules import exceptions
 from cognite.neat.rules._analysis._information_rules import InformationArchitectRulesAnalysis
 from cognite.neat.rules.models._rules import DMSRules
@@ -217,6 +218,7 @@ class OWLMetadata(InformationMetadata):
             (URIRef(self.namespace), DCTERMS.hasVersion, Literal(self.version)),
             (URIRef(self.namespace), OWL.versionInfo, Literal(self.version)),
             (URIRef(self.namespace), RDFS.label, Literal(self.name)),
+            (URIRef(self.namespace), NEAT_NAMESPACE.prefix, Literal(self.prefix)),
             (URIRef(self.namespace), DCTERMS.title, Literal(self.name)),
             (URIRef(self.namespace), DCTERMS.created, Literal(self.created, datatype=XSD.dateTime)),
             (URIRef(self.namespace), DCTERMS.description, Literal(self.description)),

cognite/neat/rules/importers/_owl2rules/_owl2metadata.py

@@ -3,6 +3,7 @@ import re
 
 from rdflib import Graph, Namespace
 
+from cognite.neat.constants import DEFAULT_NAMESPACE
 from cognite.neat.rules.models._rules.base import RoleTypes, SchemaCompleteness
 from cognite.neat.rules.models.rules import (
     prefix_compliance_regex,
@@ -29,23 +30,23 @@ def parse_owl_metadata(graph: Graph, make_compliant: bool = False) -> dict:
     """
     # TODO: Move dataframe to dict representation
 
-    query = """SELECT ?namespace ?prefix ?version ?created ?updated ?title ?description ?creator ?rights ?license
-    WHERE {
+    query = f"""SELECT ?namespace ?prefix ?version ?created ?updated ?title ?description ?creator ?rights ?license
+    WHERE {{
         ?namespace a owl:Ontology .
-        OPTIONAL {?namespace owl:versionInfo ?version }.
-        OPTIONAL {?namespace dcterms:creator ?creator }.
-        OPTIONAL {?namespace dcterms:title|rdfs:label|skos:prefLabel ?title }.
-        OPTIONAL {?namespace dcterms:modified ?updated }.
-        OPTIONAL {?namespace dcterms:created ?created }.
-        OPTIONAL {?namespace dcterms:description ?description }.
-
-        OPTIONAL {?namespace dcterms:rights|dc:rights ?rights }.
-
-        OPTIONAL {?namespace dcterms:license|dc:license ?license }.
+        OPTIONAL {{?namespace owl:versionInfo ?version }}.
+        OPTIONAL {{?namespace dcterms:creator ?creator }}.
+        OPTIONAL {{?namespace <{DEFAULT_NAMESPACE.prefix}> ?prefix }}.
+        OPTIONAL {{?namespace dcterms:title|rdfs:label|skos:prefLabel ?title }}.
+        OPTIONAL {{?namespace dcterms:modified ?updated }}.
+        OPTIONAL {{?namespace dcterms:created ?created }}.
+        OPTIONAL {{?namespace dcterms:description ?description }}.
+        OPTIONAL {{?namespace dcterms:rights|dc:rights ?rights }}.
+
+        OPTIONAL {{?namespace dcterms:license|dc:license ?license }}.
         FILTER (!isBlank(?namespace))
         FILTER (!bound(?description) || LANG(?description) = "" || LANGMATCHES(LANG(?description), "en"))
         FILTER (!bound(?title) || LANG(?title) = "" || LANGMATCHES(LANG(?title), "en"))
-    }
+    }}
     """
 
     results = [{item for item in sublist} for sublist in list(zip(*graph.query(query), strict=True))]
@@ -72,7 +73,6 @@ def parse_owl_metadata(graph: Graph, make_compliant: bool = False) -> dict:
     )
 
     if make_compliant:
-        raw_metadata.pop("created")
         return make_metadata_compliant(raw_metadata)
 
     return raw_metadata
@@ -176,7 +176,7 @@ def fix_date(
     if date := metadata.get(date_type, None):
         try:
             if isinstance(date, datetime.datetime):
-                pass
+                return metadata
             elif isinstance(date, datetime.date):
                 metadata[date_type] = datetime.datetime.combine(metadata[date_type], datetime.datetime.min.time())
             elif isinstance(date, str):

cognite/neat/rules/importers/_owl2rules/_owl2properties.py

@@ -40,6 +40,8 @@ def parse_owl_properties(graph: Graph, make_compliant: bool = False, language: s
         FILTER (!bound(?class) || !isBlank(?class))
         FILTER (!bound(?name) || LANG(?name) = "" || LANGMATCHES(LANG(?name), "en"))
         FILTER (!bound(?description) || LANG(?description) = "" || LANGMATCHES(LANG(?description), "en"))
+        BIND(IF(bound(?minCount), ?minCount, 0) AS ?minCount)
+        BIND(IF(bound(?maxCount), ?maxCount, 1) AS ?maxCount)
     }
     """
 

cognite/neat/rules/importers/_owl2rules/_owl2rules.py

@@ -38,7 +38,7 @@ class OWLImporter(BaseImporter):
 
     """
 
-    def __init__(self, owl_filepath: Path, make_compliant: bool = True):
+    def __init__(self, owl_filepath: Path, make_compliant: bool = False):
         self.owl_filepath = owl_filepath
         self.make_compliant = make_compliant
 

cognite/neat/rules/importers/_spreadsheet2rules.py

@@ -4,6 +4,7 @@ generating a list of rules based on which nodes that form the graph are made.
 """
 
 from collections import UserDict, defaultdict
+from dataclasses import dataclass
 from pathlib import Path
 from typing import Literal, cast, overload
 
@@ -49,6 +50,12 @@ class MetadataRaw(UserDict):
     def has_schema_field(self) -> bool:
         return self.get("schema") in [schema.value for schema in SchemaCompleteness.__members__.values()]
 
+    @property
+    def schema(self) -> SchemaCompleteness | None:
+        if not self.has_schema_field:
+            return None
+        return SchemaCompleteness(self["schema"])
+
     def is_valid(self, issue_list: IssueList, filepath: Path) -> bool:
         if not self.has_role_field:
             issue_list.append(issues.spreadsheet_file.RoleMissingOrUnsupportedError(filepath))
@@ -61,6 +68,14 @@ class MetadataRaw(UserDict):
         return True
 
 
+@dataclass
+class ReadResult:
+    sheets: dict[str, dict | list]
+    read_info_by_sheet: dict[str, SpreadsheetRead]
+    role: RoleTypes
+    schema: SchemaCompleteness | None
+
+
 class SpreadsheetReader:
     def __init__(self, issue_list: IssueList, is_reference: bool = False):
         self.issue_list = issue_list
@@ -79,7 +94,7 @@ class SpreadsheetReader:
     def to_reference_sheet(cls, sheet_name: str) -> str:
         return f"Ref{sheet_name}"
 
-    def read(self, filepath: Path) -> Rules | None:
+    def read(self, filepath: Path) -> None | ReadResult:
         with pd.ExcelFile(filepath) as excel_file:
             if self.metadata_sheet_name not in excel_file.sheet_names:
                 self.issue_list.append(
@@ -95,21 +110,10 @@ class SpreadsheetReader:
                 return None
 
             sheets, read_info_by_sheet = self._read_sheets(metadata, excel_file)
-            if self.issue_list.has_errors:
-                return None
-
-            rules_cls = RULES_PER_ROLE[metadata.role]
-            with _handle_issues(
-                self.issue_list,
-                error_cls=issues.spreadsheet.InvalidSheetError,
-                error_args={"read_info_by_sheet": read_info_by_sheet},
-            ) as future:
-                rules = rules_cls.model_validate(sheets)  # type: ignore[attr-defined]
-
-            if future.result == "failure" or self.issue_list.has_errors:
+            if sheets is None or self.issue_list.has_errors:
                 return None
 
-        return rules
+            return ReadResult(sheets, read_info_by_sheet, metadata.role, metadata.schema)
 
     def _read_sheets(
         self, metadata: MetadataRaw, excel_file: ExcelFile
@@ -167,43 +171,60 @@ class ExcelImporter(BaseImporter):
         is_reference: bool = False,
     ) -> tuple[Rules | None, IssueList] | Rules:
         issue_list = IssueList(title=f"'{self.filepath.name}'")
-
         if not self.filepath.exists():
             issue_list.append(issues.spreadsheet_file.SpreadsheetNotFoundError(self.filepath))
             return self._return_or_raise(issue_list, errors)
 
-        user_rules: Rules | None = None
+        user_result: ReadResult | None = None
         if not is_reference:
-            user_rules = SpreadsheetReader(issue_list, is_reference=False).read(self.filepath)
-            if issue_list.has_errors:
+            user_result = SpreadsheetReader(issue_list, is_reference=False).read(self.filepath)
+            if user_result is None or issue_list.has_errors:
                 return self._return_or_raise(issue_list, errors)
 
-        reference_rules: Rules | None = None
+        reference_result: ReadResult | None = None
         if is_reference or (
-            user_rules
-            and user_rules.metadata.role != RoleTypes.domain_expert
-            and cast(DMSRules | InformationRules, user_rules).metadata.schema_ == SchemaCompleteness.extended
+            user_result
+            and user_result.role != RoleTypes.domain_expert
+            and user_result.schema == SchemaCompleteness.extended
         ):
-            reference_rules = SpreadsheetReader(issue_list, is_reference=True).read(self.filepath)
+            reference_result = SpreadsheetReader(issue_list, is_reference=True).read(self.filepath)
             if issue_list.has_errors:
                 return self._return_or_raise(issue_list, errors)
 
-        if user_rules and reference_rules and user_rules.metadata.role != reference_rules.metadata.role:
+        if user_result and reference_result and user_result.role != reference_result.role:
             issue_list.append(issues.spreadsheet_file.RoleMismatchError(self.filepath))
             return self._return_or_raise(issue_list, errors)
 
-        if user_rules and reference_rules:
-            rules = user_rules
-            rules.reference = reference_rules
-        elif user_rules:
-            rules = user_rules
-        elif reference_rules:
-            rules = reference_rules
+        if user_result and reference_result:
+            user_result.sheets["reference"] = reference_result.sheets
+            sheets = user_result.sheets
+            original_role = user_result.role
+            read_info_by_sheet = user_result.read_info_by_sheet
+            read_info_by_sheet.update(reference_result.read_info_by_sheet)
+        elif user_result:
+            sheets = user_result.sheets
+            original_role = user_result.role
+            read_info_by_sheet = user_result.read_info_by_sheet
+        elif reference_result:
+            sheets = reference_result.sheets
+            original_role = reference_result.role
+            read_info_by_sheet = reference_result.read_info_by_sheet
         else:
             raise ValueError(
                 "No rules were generated. This should have been caught earlier. " f"Bug in {type(self).__name__}."
             )
 
+        rules_cls = RULES_PER_ROLE[original_role]
+        with _handle_issues(
+            issue_list,
+            error_cls=issues.spreadsheet.InvalidSheetError,
+            error_args={"read_info_by_sheet": read_info_by_sheet},
+        ) as future:
+            rules = rules_cls.model_validate(sheets)  # type: ignore[attr-defined]
+
+        if future.result == "failure" or issue_list.has_errors:
+            return self._return_or_raise(issue_list, errors)
+
         return self._to_output(
             rules,
             issue_list,

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

@@ -14,7 +14,6 @@ from cognite.neat.rules.models.rdfpath import (
     TransformationRuleType,
     parse_rule,
 )
-from cognite.neat.utils.text import to_pascal
 
 if sys.version_info >= (3, 11):
     from enum import StrEnum
@@ -197,15 +196,14 @@ class ContainerEntity(Entity):
     def from_id(cls, container_id: ContainerId) -> "ContainerEntity":
         return ContainerEntity(prefix=container_id.space, suffix=container_id.external_id)
 
-    def as_id(self, default_space: str | None, standardize_casing: bool = True) -> ContainerId:
+    def as_id(self, default_space: str | None) -> ContainerId:
         if self.space is Undefined and default_space is None:
             raise ValueError("Space is Undefined! Set default_space!")
 
-        external_id = to_pascal(self.external_id) if standardize_casing else self.external_id
         if self.space is Undefined:
-            return ContainerId(space=cast(str, default_space), external_id=external_id)
+            return ContainerId(space=cast(str, default_space), external_id=self.external_id)
         else:
-            return ContainerId(space=self.space, external_id=external_id)
+            return ContainerId(space=self.space, external_id=self.external_id)
 
 
 class ViewEntity(Entity):
@@ -233,7 +231,6 @@ class ViewEntity(Entity):
         allow_none: Literal[False] = False,
         default_space: str | None = None,
         default_version: str | None = None,
-        standardize_casing: bool = True,
     ) -> ViewId:
         ...
 
@@ -243,7 +240,6 @@ class ViewEntity(Entity):
         allow_none: Literal[True],
         default_space: str | None = None,
         default_version: str | None = None,
-        standardize_casing: bool = True,
     ) -> ViewId | None:
         ...
 
@@ -252,7 +248,6 @@ class ViewEntity(Entity):
         allow_none: bool = False,
         default_space: str | None = None,
         default_version: str | None = None,
-        standardize_casing: bool = True,
     ) -> ViewId | None:
         if self.suffix is Unknown and allow_none:
             return None
@@ -265,8 +260,7 @@ class ViewEntity(Entity):
             raise ValueError("space is required")
         if version is None:
             raise ValueError("version is required")
-        external_id = to_pascal(self.external_id) if standardize_casing else self.external_id
-        return ViewId(space=space, external_id=external_id, version=version)
+        return ViewId(space=space, external_id=self.external_id, version=version)
 
 
 class ViewPropEntity(ViewEntity):
@@ -303,14 +297,10 @@ class ViewPropEntity(ViewEntity):
             property_=prop_id.property,
         )
 
-    def as_prop_id(
-        self, default_space: str | None = None, default_version: str | None = None, standardize_casing: bool = True
-    ) -> PropertyId:
+    def as_prop_id(self, default_space: str | None = None, default_version: str | None = None) -> PropertyId:
         if self.property_ is None:
             raise ValueError("property is required to create PropertyId")
-        return PropertyId(
-            source=self.as_id(False, default_space, default_version, standardize_casing), property=self.property_
-        )
+        return PropertyId(source=self.as_id(False, default_space, default_version), property=self.property_)
 
     @property
     def versioned_id(self) -> str:

cognite/neat/rules/models/_rules/dms_architect_rules.py

@@ -19,7 +19,6 @@ from rdflib import Namespace
 import cognite.neat.rules.issues.spreadsheet
 from cognite.neat.rules import issues
 from cognite.neat.rules.models._rules.domain_rules import DomainRules
-from cognite.neat.utils.text import to_camel
 
 from ._types import (
     CdfValueType,
@@ -207,11 +206,11 @@ class DMSContainer(SheetEntity):
     reference: ReferenceType = Field(alias="Reference", default=None)
     constraint: ContainerListType | None = Field(None, alias="Constraint")
 
-    def as_container(self, default_space: str, standardize_casing: bool = True) -> dm.ContainerApply:
-        container_id = self.container.as_id(default_space, standardize_casing)
+    def as_container(self, default_space: str) -> dm.ContainerApply:
+        container_id = self.container.as_id(default_space)
         constraints: dict[str, dm.Constraint] = {}
         for constraint in self.constraint or []:
-            requires = dm.RequiresConstraint(constraint.as_id(default_space, standardize_casing))
+            requires = dm.RequiresConstraint(constraint.as_id(default_space))
             constraints[f"{constraint.space}_{constraint.external_id}"] = requires
 
         return dm.ContainerApply(
@@ -246,18 +245,15 @@ class DMSView(SheetEntity):
     filter_: Literal["hasData", "nodeType"] | None = Field(None, alias="Filter")
     in_model: bool = Field(True, alias="InModel")
 
-    def as_view(self, default_space: str, default_version: str, standardize_casing: bool = True) -> dm.ViewApply:
-        view_id = self.view.as_id(False, default_space, default_version, standardize_casing)
+    def as_view(self, default_space: str, default_version: str) -> dm.ViewApply:
+        view_id = self.view.as_id(False, default_space, default_version)
         return dm.ViewApply(
             space=view_id.space,
             external_id=view_id.external_id,
             version=view_id.version or default_version,
             name=self.name or None,
             description=self.description,
-            implements=[
-                parent.as_id(False, default_space, default_version, standardize_casing)
-                for parent in self.implements or []
-            ]
+            implements=[parent.as_id(False, default_space, default_version) for parent in self.implements or []]
             or None,
             properties={},
         )
@@ -564,10 +560,8 @@ class DMSRules(BaseRules):
             "Containers" if info.by_alias else "containers": containers,
         }
 
-    def as_schema(
-        self, standardize_casing: bool = True, include_pipeline: bool = False, instance_space: str | None = None
-    ) -> DMSSchema:
-        return _DMSExporter(standardize_casing, include_pipeline, instance_space).to_schema(self)
+    def as_schema(self, include_pipeline: bool = False, instance_space: str | None = None) -> DMSSchema:
+        return _DMSExporter(include_pipeline, instance_space).to_schema(self)
 
     def as_information_architect_rules(self) -> "InformationRules":
         return _DMSRulesConverter(self).as_information_architect_rules()
@@ -599,17 +593,12 @@ class _DMSExporter:
     (This module cannot have a dependency on the exporter module, as it would create a circular dependency.)
 
     Args
-        standardize_casing (bool): If True, the casing of the identifiers will be standardized. This means external IDs
-            are PascalCase and property names are camelCase.
         include_pipeline (bool): If True, the pipeline will be included with the schema. Pipeline means the
             raw tables and transformations necessary to populate the data model.
         instance_space (str): The space to use for the instance. Defaults to None,`Rules.metadata.space` will be used
     """
 
-    def __init__(
-        self, standardize_casing: bool = True, include_pipeline: bool = False, instance_space: str | None = None
-    ):
-        self.standardize_casing = standardize_casing
+    def __init__(self, include_pipeline: bool = False, instance_space: str | None = None):
         self.include_pipeline = include_pipeline
         self.instance_space = instance_space
 
@@ -628,9 +617,7 @@ class _DMSExporter:
         )
 
         views_not_in_model = {
-            view.view.as_id(False, default_space, default_version, self.standardize_casing)
-            for view in rules.views
-            if not view.in_model
+            view.view.as_id(False, default_space, default_version) for view in rules.views if not view.in_model
         }
         data_model = rules.metadata.as_data_model()
         data_model.views = sorted(
@@ -675,12 +662,9 @@ class _DMSExporter:
         default_space: str,
         default_version: str,
     ) -> tuple[dm.ViewApplyList, dm.NodeApplyList]:
-        views = dm.ViewApplyList(
-            [dms_view.as_view(default_space, default_version, self.standardize_casing) for dms_view in dms_views]
-        )
+        views = dm.ViewApplyList([dms_view.as_view(default_space, default_version) for dms_view in dms_views])
         dms_view_by_id = {
-            dms_view.view.as_id(False, default_space, default_version, self.standardize_casing): dms_view
-            for dms_view in dms_views
+            dms_view.view.as_id(False, default_space, default_version): dms_view for dms_view in dms_views
         }
 
         for view in views:
@@ -694,7 +678,7 @@ class _DMSExporter:
                     # This is not yet supported in the CDF API, a warning has already been issued, here we convert it to
                     # a multi-edge connection.
                     if isinstance(prop.value_type, ViewEntity):
-                        source = prop.value_type.as_id(False, default_space, default_version, self.standardize_casing)
+                        source = prop.value_type.as_id(False, default_space, default_version)
                     else:
                         raise ValueError(
                             "Direct relation must have a view as value type. "
@@ -709,43 +693,48 @@ class _DMSExporter:
                         direction="outwards",
                     )
                 elif prop.container and prop.container_property and prop.view_property:
-                    container_prop_identifier = (
-                        to_camel(prop.container_property) if self.standardize_casing else prop.container_property
-                    )
+                    container_prop_identifier = prop.container_property
                     extra_args: dict[str, Any] = {}
                     if prop.relation == "direct" and isinstance(prop.value_type, ViewEntity):
-                        extra_args["source"] = prop.value_type.as_id(
-                            True, default_space, default_version, self.standardize_casing
-                        )
+                        extra_args["source"] = prop.value_type.as_id(True, default_space, default_version)
                     elif prop.relation == "direct" and not isinstance(prop.value_type, ViewEntity):
                         raise ValueError(
                             "Direct relation must have a view as value type. "
                             "This should have been validated in the rules"
                         )
                     view_property = dm.MappedPropertyApply(
-                        container=prop.container.as_id(default_space, self.standardize_casing),
+                        container=prop.container.as_id(default_space),
                         container_property_identifier=container_prop_identifier,
                         **extra_args,
                     )
                 elif prop.view and prop.view_property and prop.relation == "multiedge":
                     if isinstance(prop.value_type, ViewEntity):
-                        source = prop.value_type.as_id(False, default_space, default_version, self.standardize_casing)
+                        source = prop.value_type.as_id(False, default_space, default_version)
                     else:
                         raise ValueError(
                             "Multiedge relation must have a view as value type. "
                             "This should have been validated in the rules"
                         )
-                    view_property = dm.MultiEdgeConnectionApply(
-                        type=dm.DirectRelationReference(
+                    if isinstance(prop.reference, ReferenceEntity):
+                        ref_view_prop = prop.reference.as_prop_id(default_space, default_version)
+                        edge_type = dm.DirectRelationReference(
+                            space=ref_view_prop.source.space,
+                            external_id=f"{ref_view_prop.source.external_id}.{ref_view_prop.property}",
+                        )
+                    else:
+                        edge_type = dm.DirectRelationReference(
                             space=source.space,
                             external_id=f"{prop.view.external_id}.{prop.view_property}",
-                        ),
+                        )
+
+                    view_property = dm.MultiEdgeConnectionApply(
+                        type=edge_type,
                         source=source,
                         direction="outwards",
                     )
                 elif prop.view and prop.view_property and prop.relation == "reversedirect":
                     if isinstance(prop.value_type, ViewPropEntity):
-                        source = prop.value_type.as_id(False, default_space, default_version, self.standardize_casing)
+                        source = prop.value_type.as_id(False, default_space, default_version)
                     else:
                         raise ValueError(
                             "Reverse direct relation must have a view as value type. "
@@ -765,11 +754,19 @@ class _DMSExporter:
                         warnings.warn(
                             issues.dms.ReverseOfDirectRelationListWarning(view_id, prop.property_), stacklevel=2
                         )
-                        view_property = dm.MultiEdgeConnectionApply(
-                            type=dm.DirectRelationReference(
+                        if isinstance(reverse_prop.reference, ReferenceEntity):
+                            ref_view_prop = reverse_prop.reference.as_prop_id(default_space, default_version)
+                            edge_type = dm.DirectRelationReference(
+                                space=ref_view_prop.source.space,
+                                external_id=f"{ref_view_prop.source.external_id}.{ref_view_prop.property}",
+                            )
+                        else:
+                            edge_type = dm.DirectRelationReference(
                                 space=source.space,
                                 external_id=f"{reverse_prop.view.external_id}.{reverse_prop.view_property}",
-                            ),
+                            )
+                        view_property = dm.MultiEdgeConnectionApply(
+                            type=edge_type,
                             source=source,
                             direction="inwards",
                         )
@@ -797,16 +794,24 @@ class _DMSExporter:
                     continue
                 else:
                     continue
-                prop_name = to_camel(prop.view_property) if self.standardize_casing else prop.view_property
+                prop_name = prop.view_property
                 view.properties[prop_name] = view_property
 
         node_types = dm.NodeApplyList([])
         parent_views = {parent for view in views for parent in view.implements or []}
         for view in views:
             ref_containers = sorted(view.referenced_containers(), key=lambda c: c.as_tuple())
-            has_data = dm.filters.HasData(containers=list(ref_containers)) if ref_containers else None
-            node_type = dm.filters.Equals(["node", "type"], {"space": view.space, "externalId": view.external_id})
             dms_view = dms_view_by_id.get(view.as_id())
+            has_data = dm.filters.HasData(containers=list(ref_containers)) if ref_containers else None
+            if dms_view and isinstance(dms_view.reference, ReferenceEntity):
+                # If the view is a reference, we implement the reference view,
+                # and need the filter to match the reference
+                ref_view = dms_view.reference.as_id(False, default_space, default_version)
+                node_type = dm.filters.Equals(
+                    ["node", "type"], {"space": ref_view.space, "externalId": ref_view.external_id}
+                )
+            else:
+                node_type = dm.filters.Equals(["node", "type"], {"space": view.space, "externalId": view.external_id})
             if view.as_id() in parent_views:
                 if dms_view and dms_view.filter_ == "nodeType":
                     warnings.warn(issues.dms.NodeTypeFilterOnParentViewWarning(view.as_id()), stacklevel=2)
@@ -838,10 +843,7 @@ class _DMSExporter:
         default_space: str,
     ) -> dm.ContainerApplyList:
         containers = dm.ContainerApplyList(
-            [
-                dms_container.as_container(default_space, self.standardize_casing)
-                for dms_container in dms_container or []
-            ]
+            [dms_container.as_container(default_space) for dms_container in dms_container or []]
         )
         container_to_drop = set()
         for container in containers:
@@ -858,7 +860,7 @@ class _DMSExporter:
                 else:
                     type_cls = dm.DirectRelation
 
-                prop_name = to_camel(prop.container_property) if self.standardize_casing else prop.container_property
+                prop_name = prop.container_property
 
                 if type_cls is dm.DirectRelation:
                     container.properties[prop_name] = dm.ContainerProperty(
@@ -919,21 +921,21 @@ class _DMSExporter:
         container_properties_by_id: dict[dm.ContainerId, list[DMSProperty]] = defaultdict(list)
         view_properties_by_id: dict[dm.ViewId, list[DMSProperty]] = defaultdict(list)
         for prop in rules.properties:
-            view_id = prop.view.as_id(False, default_space, default_version, self.standardize_casing)
+            view_id = prop.view.as_id(False, default_space, default_version)
             view_properties_by_id[view_id].append(prop)
 
             if prop.container and prop.container_property:
                 if prop.relation == "direct" and prop.is_list:
                     warnings.warn(
                         issues.dms.DirectRelationListWarning(
-                            container_id=prop.container.as_id(default_space, self.standardize_casing),
-                            view_id=prop.view.as_id(False, default_space, default_version, self.standardize_casing),
+                            container_id=prop.container.as_id(default_space),
+                            view_id=prop.view.as_id(False, default_space, default_version),
                             property=prop.container_property,
                         ),
                         stacklevel=2,
                     )
                     continue
-                container_id = prop.container.as_id(default_space, self.standardize_casing)
+                container_id = prop.container.as_id(default_space)
                 container_properties_by_id[container_id].append(prop)
 
         return container_properties_by_id, view_properties_by_id

cognite/neat/workflows/steps/lib/rules_exporter.py

@@ -102,7 +102,6 @@ class RulesToDMS(Step):
             if multi_space_components_create
             else {input_rules.metadata.space if isinstance(input_rules, DMSRules) else input_rules.metadata.prefix},
             existing_handling=existing_components_handling,
-            standardize_casing=False,
         )
 
         output_dir = self.data_store_path / Path("staging")

{cognite_neat-0.72.2.dist-info → cognite_neat-0.72.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cognite-neat
-Version: 0.72.2
+Version: 0.72.3
 Summary: Knowledge graph transformation
 Home-page: https://cognite-neat.readthedocs-hosted.com/
 License: Apache-2.0

{cognite_neat-0.72.2.dist-info → cognite_neat-0.72.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 cognite/neat/__init__.py,sha256=v-rRiDOgZ3sQSMQKq0vgUQZvpeOkoHFXissAx6Ktg84,61
-cognite/neat/_version.py,sha256=TB9NfKJN3p__h60nooN7qSNFiqOO_zE_B3dfGb0-uXQ,23
+cognite/neat/_version.py,sha256=AZKRaRERnGxRM4Vpp2s8T1LNhTACd4GALrf4Zjj-jCM,23
 cognite/neat/app/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/app/api/asgi/metrics.py,sha256=nxFy7L5cChTI0a-zkCiJ59Aq8yLuIJp5c9Dg0wRXtV0,152
 cognite/neat/app/api/configuration.py,sha256=xnKdBE_dtq1nRvKa79YGA_wimI5UhoSRuBQz4LkLzQw,4606
@@ -39,7 +39,7 @@ cognite/neat/app/ui/neat-app/build/static/js/main.2efd96b2.js.LICENSE.txt,sha256
 cognite/neat/app/ui/neat-app/build/static/js/main.2efd96b2.js.map,sha256=zUzgUBAKbtIFkXu3E6wz1hL7IKv8Xi86iym_P5OPATU,6234629
 cognite/neat/app/ui/neat-app/build/static/media/logo.8093b84df9ed36a174c629d6fe0b730d.svg,sha256=EYf9q9JoVJ1L1np-XloeEZXCmaibzKmmpXCKn_44xzA,240334
 cognite/neat/config.py,sha256=5_dTuoL5crCmbSdKNuNOMQJVPNGiPy7ib2MlMkgPlOM,1503
-cognite/neat/constants.py,sha256=O3BpKbqfre0jQF6h72Yr-mY0jIByqI_dkbI3rnHdwqM,1228
+cognite/neat/constants.py,sha256=5ujOhkmobXBleswTahlLltQwDu9bl7w00nwrVyr5_0k,1205
 cognite/neat/exceptions.py,sha256=CM7aCvbek9klOgjTsJ9bfEA8t7KTAL6dc7Mviu4NvSI,4268
 cognite/neat/graph/__init__.py,sha256=31uTeejWOSd-I8iUG8GOZFhHZcQCsBitJ6X8vu2r1nU,73
 cognite/neat/graph/examples/Knowledge-Graph-Nordic44-dirty.xml,sha256=ujJip6XBs5n8enVDPzNnuGkMBwv8g21tIr1sEVJpK5M,1439359
@@ -113,9 +113,9 @@ cognite/neat/rules/exporter/_validation.py,sha256=CnEer181-EdnWl3yOuZJKOJ80W7H7q
 cognite/neat/rules/exporters/__init__.py,sha256=Gn3CjkVKHJF9Po1ZPH4wAJ-sRW9up7b2CpXm-eReV3Q,413
 cognite/neat/rules/exporters/_base.py,sha256=aRCzRjGDoXILkGvASev2UjVvLXrVCRTFiKgYwzJZqAo,1518
 cognite/neat/rules/exporters/_models.py,sha256=f_RbFhoyD27z6Dsk4upYMHp7JHZRCfIvZsEzH5JSvtc,1645
-cognite/neat/rules/exporters/_rules2dms.py,sha256=hvmMxwL9RCAA1b2i5RndjgWnKJv3TKkxdWFovLpJacA,12221
+cognite/neat/rules/exporters/_rules2dms.py,sha256=JPwaD42STCLi3N2zH8fKeKhWTNUsT-KsM3t56Pzap3A,11854
 cognite/neat/rules/exporters/_rules2excel.py,sha256=uK-aS9sBwXUCFQLIO1jciBQrB4w7ySF6MafDqG23hrQ,9080
-cognite/neat/rules/exporters/_rules2ontology.py,sha256=70T28d1tcT179kt5yOZQlLgAQ67uydz3XbhbA10IRuI,19768
+cognite/neat/rules/exporters/_rules2ontology.py,sha256=PqE62FIPWFWUkivyxzOUVFf9Nx8yVJghZBB9A_7us4Q,19922
 cognite/neat/rules/exporters/_rules2yaml.py,sha256=HKgFlpgD7U2vWLQC_VdSvkDk19QgeVAd_J8wQ9ZgrN8,3038
 cognite/neat/rules/exporters/_validation.py,sha256=E6nn1QicaJpDFiXrYRzwTqsJ5VULVzzeqhCBVlRxH4M,4092
 cognite/neat/rules/importer/__init__.py,sha256=h1owL8pBPEtOmlIFAdkqAABH1A_Op5plh8C53og0uag,636
@@ -142,10 +142,10 @@ cognite/neat/rules/importers/_dtdl2rules/dtdl_importer.py,sha256=QThkjUuEVWI19yn
 cognite/neat/rules/importers/_dtdl2rules/spec.py,sha256=7Kd4WJEVoRoM8ssvl5zv2ALHDh3Mc0EUJ7v_6i8xJOk,11926
 cognite/neat/rules/importers/_owl2rules/__init__.py,sha256=tdGcrgtozdQyST-pTlxIa4cLBNTLvtk1nNYR4vOdFSw,63
 cognite/neat/rules/importers/_owl2rules/_owl2classes.py,sha256=tCEwwJPCdFLodM0q0gXfbyEe0rZvIG4emDTcUzDYRWI,7597
-cognite/neat/rules/importers/_owl2rules/_owl2metadata.py,sha256=kCTCAbUaUGgSwnH-jgFg01SfxD2VikyPy5L-vgxUjHA,7674
-cognite/neat/rules/importers/_owl2rules/_owl2properties.py,sha256=KNOrOySUXM9Krg6HEPNtiThlHfSEhd0EoQBtu_lczu8,7319
-cognite/neat/rules/importers/_owl2rules/_owl2rules.py,sha256=R8Z6f7f-MbKyr9fgKW5sStKlXxvUeOiS4lotjavIx2E,7119
-cognite/neat/rules/importers/_spreadsheet2rules.py,sha256=GVkTtWnQkM8nXkPAOs2UpxKnsPHA6898Tb7aTgcDDPM,10573
+cognite/neat/rules/importers/_owl2rules/_owl2metadata.py,sha256=UPOPBYpOjpOdV8Bcbx31O62Tkjzg-nGjx8uE4JD-HoQ,7791
+cognite/neat/rules/importers/_owl2rules/_owl2properties.py,sha256=VW0pC09Hm_EC0O89HX8RrGCpcemaWshIW7hKHWWZ63I,7443
+cognite/neat/rules/importers/_owl2rules/_owl2rules.py,sha256=xVGOo5wnoXLI3E9OUIDfvpNLOIAhkbcC6--PVkUhgk4,7120
+cognite/neat/rules/importers/_spreadsheet2rules.py,sha256=QIYTW-3Uc5ffFp3rJNyiqigWvc6x2eZTvhxqrXlGGSs,11481
 cognite/neat/rules/importers/_yaml2rules.py,sha256=sIaYY3Zo--v1cXSu65n4ZPv47cS-5InvSbpkw3Ahov4,4198
 cognite/neat/rules/issues/__init__.py,sha256=Ms6jgCxCezc5IgTOwCFtXQPtoVFfOvdcXj84_rs917I,563
 cognite/neat/rules/issues/base.py,sha256=dS4lmbW9VQ8awgOIB-Ah9z9LdNbCa-fPd8tbyPb8sM4,5856
@@ -159,11 +159,11 @@ cognite/neat/rules/models/__init__.py,sha256=23T73EaHuS0dsYTh6tww6gXAc7S4rdx8e5n
 cognite/neat/rules/models/_base.py,sha256=1WNXBJHJ3nwnVoeNhpm9B6TBuqWYYgChkrdK4FJIpQM,4989
 cognite/neat/rules/models/_rules/__init__.py,sha256=jA4kMOAg4GJZjhCW1ovSjUCv-Top7O2HocZV0zJ78o4,517
 cognite/neat/rules/models/_rules/_types/__init__.py,sha256=Px0uB5fqk-8qH-HRi0ZvgGkLhYcS5A8EJ9QDB2TFwNQ,1299
-cognite/neat/rules/models/_rules/_types/_base.py,sha256=EsTqjXUP0zpuQ-Z_BMP-00rJBy2A2s-lJHzudIDAfqw,17145
+cognite/neat/rules/models/_rules/_types/_base.py,sha256=okf8ebEcKrXf1rZQNp_cMsTS4pNKdJk2QMz_8-wi_so,16681
 cognite/neat/rules/models/_rules/_types/_field.py,sha256=dOVAU1jWCupFVnrYYwLfI-nNUC4rv4vXHMzpiObtWiw,10295
 cognite/neat/rules/models/_rules/_types/_value.py,sha256=ubyWmU6neyNxx17fqcciIjyB-CIpYNUuM97Xh2sVrYo,6308
 cognite/neat/rules/models/_rules/base.py,sha256=9DgtdCmpz84sMFxZB_stWkalVbjA4HQKsTMpSjjOVLU,10635
-cognite/neat/rules/models/_rules/dms_architect_rules.py,sha256=2JbQm-5rWQLpuZJbov5pKigddE_GslmxhA18GiNXWms,50201
+cognite/neat/rules/models/_rules/dms_architect_rules.py,sha256=bsuwCFiVFnDQuoAdwTu_-kp5oJGepuD24kLO9B_5YYc,50424
 cognite/neat/rules/models/_rules/dms_schema.py,sha256=-ru40beGY2WJvf9_sd5eO2Wh8x2qLQ2UmgzExloBWac,30229
 cognite/neat/rules/models/_rules/domain_rules.py,sha256=mOE4M6wOurmnAehxbnxvP9vIVXsFuKSiyMmD1shXKpA,2051
 cognite/neat/rules/models/_rules/information_rules.py,sha256=kETaZ3HsPw0EFXIeU-YhfEZeK4FhAh5RvNQAWbrcE-E,21026
@@ -211,7 +211,7 @@ cognite/neat/workflows/steps/lib/graph_extractor.py,sha256=vW9UpJScx5dFVCSairpOd
 cognite/neat/workflows/steps/lib/graph_loader.py,sha256=HfGg1HRZhbV58TFu89FTjKeUxGsbCYLeFJIQFDN_pQM,2341
 cognite/neat/workflows/steps/lib/graph_store.py,sha256=NV5SZFTrbq_gtZZZdoEL8tIohdbsieKmpwrdWAHis-E,6288
 cognite/neat/workflows/steps/lib/io_steps.py,sha256=QAGypoi1vP32BRiIgBZ0B4qsbFMcwhzpRiVUUnWysLA,16874
-cognite/neat/workflows/steps/lib/rules_exporter.py,sha256=qRIdsNvj-gWdGF6ilTfSXBwBeEEwwxVHH9g-gDPKNzY,18272
+cognite/neat/workflows/steps/lib/rules_exporter.py,sha256=RDsRaRb9xRgFLO-x5qodDfyfDzQqXT0A-i2Se-FcFfI,18234
 cognite/neat/workflows/steps/lib/rules_importer.py,sha256=tckiHIS9Vnqx3df62jdtNwSm-Nk_XQwgo1sM0zKOw_s,7327
 cognite/neat/workflows/steps/lib/rules_validator.py,sha256=uGXcMncrtAu3IAMY3dqDNLfoL7sKSLzU1jz85xNrtO4,4785
 cognite/neat/workflows/steps/lib/v1/__init__.py,sha256=725aFzVqhE0tbVOAW70zWXTGKFiYImVupRZ4C5_IkUo,274
@@ -227,8 +227,8 @@ cognite/neat/workflows/steps_registry.py,sha256=PZVoHX4d6Vmjz6XzUFnFFWMCnrVnqkUC
 cognite/neat/workflows/tasks.py,sha256=dqlJwKAb0jlkl7abbY8RRz3m7MT4SK8-7cntMWkOYjw,788
 cognite/neat/workflows/triggers.py,sha256=_BLNplzoz0iic367u1mhHMHiUrCwP-SLK6_CZzfODX0,7071
 cognite/neat/workflows/utils.py,sha256=gKdy3RLG7ctRhbCRwaDIWpL9Mi98zm56-d4jfHDqP1E,453
-cognite_neat-0.72.2.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.72.2.dist-info/METADATA,sha256=1k5nxYBvZSbu3_bbjMgjMq21jCOvMv3LlwE8fUIcAO4,9321
-cognite_neat-0.72.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-cognite_neat-0.72.2.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
-cognite_neat-0.72.2.dist-info/RECORD,,
+cognite_neat-0.72.3.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.72.3.dist-info/METADATA,sha256=4KC49y0DSL83A7qqb5OkxQv78ryoxQR22uLNhJs24Js,9321
+cognite_neat-0.72.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+cognite_neat-0.72.3.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
+cognite_neat-0.72.3.dist-info/RECORD,,