cognite-neat 0.70.2__tar.gz → 0.71.0__tar.gz

{cognite_neat-0.70.2 → cognite_neat-0.71.0}/PKG-INFO

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

cognite_neat-0.71.0/cognite/neat/_version.py

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

{cognite_neat-0.70.2 → cognite_neat-0.71.0}/cognite/neat/app/api/routers/core.py

@@ -6,7 +6,8 @@ from typing import cast
 
 from fastapi import APIRouter, UploadFile
 
-from cognite.neat.rules import importers
+from cognite.neat.rules import exporters, importers
+from cognite.neat.rules.models._rules import DMSRules
 from cognite.neat.rules.models._rules.base import RoleTypes
 
 router = APIRouter()
@@ -49,3 +50,13 @@ async def convert_data_model_to_rules(file: UploadFile):
     temp_filepath.unlink()
 
     return {"filename": file.filename, "content": rules.model_dump(by_alias=True) if rules else None, "issues": issues}
+
+
+@router.post("/api/core/rules2dms")
+async def convert_rules_to_dms(rules: DMSRules):
+    dms_schema = exporters.DMSExporter().export(rules)
+
+    return {
+        "views": dms_schema.views.dump() if dms_schema.views else None,
+        "containers": dms_schema.containers.dump() if dms_schema.containers else None,
+    }

{cognite_neat-0.70.2 → cognite_neat-0.71.0}/cognite/neat/rules/importers/_owl2rules/_owl2classes.py

@@ -25,7 +25,7 @@ def parse_owl_classes(graph: Graph, make_compliant: bool = False, language: str
     """
 
     query = """
-        SELECT ?class ?name ?description ?parentClass ?source ?match ?comment
+        SELECT ?class ?name ?description ?parentClass ?reference ?match ?comment
         WHERE {
         ?class a owl:Class .
         OPTIONAL {?class rdfs:subClassOf ?parentClass }.
@@ -62,7 +62,7 @@ def parse_owl_classes(graph: Graph, make_compliant: bool = False, language: str
 def _parse_raw_dataframe(query_results: list[tuple]) -> pd.DataFrame:
     df = pd.DataFrame(
         query_results,
-        columns=["Class", "Name", "Description", "Parent Class", "Source", "Match", "Comment"],
+        columns=["Class", "Name", "Description", "Parent Class", "Reference", "Match", "Comment"],
     )
     if df.empty:
         return df
@@ -70,9 +70,8 @@ def _parse_raw_dataframe(query_results: list[tuple]) -> pd.DataFrame:
     # # remove NaNs
     df.replace(np.nan, "", regex=True, inplace=True)
 
-    df.Source = df.Class
+    df.Reference = df.Class
     df.Class = df.Class.apply(lambda x: remove_namespace(x))
-    df["Source Entity Name"] = df.Class
     df["Match Type"] = len(df) * [MatchType.exact]
     df["Comment"] = len(df) * [None]
     df["Parent Class"] = df["Parent Class"].apply(lambda x: remove_namespace(x))
@@ -87,7 +86,7 @@ def _clean_up_classes(df: pd.DataFrame) -> pd.DataFrame:
             "Name": group_df["Name"].unique()[0],
             "Description": "\n".join(list(group_df.Description.unique())),
             "Parent Class": ", ".join(list(group_df["Parent Class"].unique())),
-            "Source": group_df["Source"].unique()[0],
+            "Reference": group_df["Reference"].unique()[0],
             "Match Type": group_df["Match Type"].unique()[0],
             "Comment": group_df["Comment"].unique()[0],
         }
@@ -154,7 +153,7 @@ def _object_property_class() -> dict:
         "Name": None,
         "Description": "The class of object properties.",
         "Parent Class": None,
-        "Source": OWL.ObjectProperty,
+        "Reference": OWL.ObjectProperty,
         "Match Type": MatchType.exact,
         "Comment": "Added by NEAT based on owl:ObjectProperty but adapted to NEAT and use in CDF.",
     }
@@ -166,7 +165,7 @@ def _data_type_property_class() -> dict:
         "Name": None,
         "Description": "The class of data properties.",
         "Parent Class": None,
-        "Source": OWL.DatatypeProperty,
+        "Reference": OWL.DatatypeProperty,
         "Match Type": MatchType.exact,
         "Comment": "Added by NEAT based on owl:DatatypeProperty but adapted to NEAT and use in CDF.",
     }
@@ -178,7 +177,7 @@ def _thing_class() -> dict:
         "Name": None,
         "Description": "The class of holding class individuals.",
         "Parent Class": None,
-        "Source": OWL.Thing,
+        "Reference": OWL.Thing,
         "Match Type": MatchType.exact,
         "Comment": (
             "Added by NEAT. "
@@ -206,7 +205,7 @@ def _add_parent_class(df: pd.DataFrame) -> list[dict]:
                 "Name": None,
                 "Description": None,
                 "Parent Class": None,
-                "Source": None,
+                "Reference": None,
                 "Match Type": None,
                 "Comment": (
                     "Added by NEAT. "

{cognite_neat-0.70.2 → cognite_neat-0.71.0}/cognite/neat/rules/importers/_owl2rules/_owl2properties.py

@@ -24,7 +24,7 @@ def parse_owl_properties(graph: Graph, make_compliant: bool = False, language: s
 
     query = """
 
-    SELECT ?class ?property ?name ?description ?type ?minCount ?maxCount ?source
+    SELECT ?class ?property ?name ?description ?type ?minCount ?maxCount ?reference
      ?match ?propertyType
     WHERE {
         ?property a ?propertyType.
@@ -71,7 +71,7 @@ def _parse_raw_dataframe(query_results: list[tuple]) -> pd.DataFrame:
             "Value Type",
             "Min Count",
             "Max Count",
-            "Source",
+            "Reference",
             "Match Type",
             "_property_type",
         ],
@@ -81,7 +81,7 @@ def _parse_raw_dataframe(query_results: list[tuple]) -> pd.DataFrame:
 
     df.replace(np.nan, "", regex=True, inplace=True)
 
-    df.Source = df.Property
+    df.Reference = df.Property
     df.Class = df.Class.apply(lambda x: remove_namespace(x))
     df.Property = df.Property.apply(lambda x: remove_namespace(x))
     df["Value Type"] = df["Value Type"].apply(lambda x: remove_namespace(x))
@@ -109,7 +109,7 @@ def _clean_up_properties(df: pd.DataFrame) -> pd.DataFrame:
                     "Value Type": property_grouped_df["Value Type"].unique()[0],
                     "Min Count": property_grouped_df["Min Count"].unique()[0],
                     "Max Count": property_grouped_df["Max Count"].unique()[0],
-                    "Source": property_grouped_df["Source"].unique()[0],
+                    "Reference": property_grouped_df["Reference"].unique()[0],
                     "Match Type": property_grouped_df["Match Type"].unique()[0],
                     "Comment": property_grouped_df["Comment"].unique()[0],
                     "_property_type": property_grouped_df["_property_type"].unique()[0],

{cognite_neat-0.70.2 → cognite_neat-0.71.0}/cognite/neat/rules/importers/_owl2rules/_owl2rules.py

@@ -88,6 +88,7 @@ class OWLImporter(BaseImporter):
 def make_components_compliant(components: dict) -> dict:
     components = _add_missing_classes(components)
     components = _add_missing_value_types(components)
+    components = _add_default_property_to_dangling_classes(components)
 
     return components
 
@@ -129,11 +130,24 @@ def _add_missing_value_types(components: dict) -> dict:
     """
 
     xsd_types = set(XSD_VALUE_TYPE_MAPPINGS.keys())
-    value_types = {definition["Value Type"] for definition in components["Properties"]}
+    candidate_value_types = {definition["Value Type"] for definition in components["Properties"]} - {
+        definition["Class"] for definition in components["Classes"]
+    }
+
+    # to avoid issue of case sensitivity for xsd types
+    value_types_lower = {v.lower() for v in candidate_value_types}
+    xsd_types_lower = {x.lower() for x in xsd_types}
+
+    # Create a mapping from lowercase strings to original strings
+    value_types_mapping = {v.lower(): v for v in candidate_value_types}
 
-    classes = {definition["Class"] for definition in components["Classes"]}
+    # Find the difference
+    difference = value_types_lower - xsd_types_lower
 
-    for class_ in value_types.difference(classes).difference(xsd_types):
+    # Convert the difference back to the original case
+    difference_original_case = {value_types_mapping[d] for d in difference}
+
+    for class_ in difference_original_case:
         components["Classes"].append(
             {
                 "Class": class_,
@@ -146,3 +160,39 @@ def _add_missing_value_types(components: dict) -> dict:
         )
 
     return components
+
+
+def _add_default_property_to_dangling_classes(components: dict[str, list[dict]]) -> dict:
+    """Add missing classes to Classes.
+
+    Args:
+        tables: imported tables from owl ontology
+
+    Returns:
+        Updated tables with missing classes added to containers
+    """
+
+    dangling_classes = {
+        definition["Class"] for definition in components["Classes"] if not definition.get("Parent Class", None)
+    } - {definition["Class"] for definition in components["Properties"]}
+
+    comment = (
+        "Added by NEAT. "
+        "This is property has been added to this class since otherwise it will create "
+        "dangling classes in the ontology."
+    )
+
+    for class_ in dangling_classes:
+        components["Properties"].append(
+            {
+                "Class": class_,
+                "Property": "label",
+                "Value Type": "string",
+                "Comment": comment,
+                "Min Count": 0,
+                "Max Count": 1,
+                "Reference": "http://www.w3.org/2000/01/rdf-schema#label",
+            }
+        )
+
+    return components

{cognite_neat-0.70.2 → cognite_neat-0.71.0}/cognite/neat/rules/models/value_types.py

@@ -83,6 +83,7 @@ _DATA_TYPES: list[dict] = [
     {"name": "anyURI", "python": str, "GraphQL": "String", "dms": Text},
     {"name": "normalizedString", "python": str, "GraphQL": "String", "dms": Text},
     {"name": "token", "python": str, "GraphQL": "String", "dms": Text},
+    {"name": "PlainLiteral", "python": str, "GraphQL": "String", "dms": Text},
     # Graphql does not have a datetime/date type this is CDF specific
     {"name": "dateTime", "python": datetime, "GraphQL": "Timestamp", "dms": Timestamp},
     {"name": "dateTimeStamp", "python": datetime, "GraphQL": "Timestamp", "dms": Timestamp},

{cognite_neat-0.70.2 → cognite_neat-0.71.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cognite-neat"
-version = "0.70.2"
+version = "0.71.0"
 readme = "README.md"
 description = "Knowledge graph transformation"
 authors = [

cognite_neat-0.70.2/cognite/neat/_version.py

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