cognite-neat 0.70.1__py3-none-any.whl → 0.70.3__py3-none-any.whl

cognite/neat/_version.py

@@ -1 +1 @@
-__version__ = "0.70.1"
+__version__ = "0.70.3"

cognite/neat/rules/exporters/_rules2dms.py

@@ -175,12 +175,13 @@ class DMSExporter(CDFExporter[DMSSchema]):
         # are changed. This is a workaround to force the conversion.
         redeploy_data_model = False
 
-        for items, loader in to_export:
-            all_item_ids = loader.get_ids(items)
+        for all_items, loader in to_export:
+            all_item_ids = loader.get_ids(all_items)
             skipped = sum(1 for item_id in all_item_ids if item_id in schema.frozen_ids)
             item_ids = [item_id for item_id in all_item_ids if item_id not in schema.frozen_ids]
             cdf_items = loader.retrieve(item_ids)
             cdf_item_by_id = {loader.get_id(item): item for item in cdf_items}
+            items = [item for item in all_items if loader.get_id(item) in item_ids]
             to_create, to_update, unchanged, to_delete = [], [], [], []
             is_redeploying = loader.resource_name == "data_models" and redeploy_data_model
             for item in items:

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/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/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/rules/models/_rules/dms_architect_rules.py

@@ -632,7 +632,9 @@ class _DMSExporter:
             if not view.in_model
         }
         data_model = rules.metadata.as_data_model()
-        data_model.views = [view_id for view_id in views.as_ids() if view_id not in views_not_in_model]
+        data_model.views = sorted(
+            [view_id for view_id in views.as_ids() if view_id not in views_not_in_model], key=lambda v: v.as_tuple()  # type: ignore[union-attr]
+        )
 
         spaces = self._create_spaces(rules.metadata, containers, views, data_model)
 

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.1.dist-info → cognite_neat-0.70.3.dist-info}/METADATA

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

{cognite_neat-0.70.1.dist-info → cognite_neat-0.70.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 cognite/neat/__init__.py,sha256=v-rRiDOgZ3sQSMQKq0vgUQZvpeOkoHFXissAx6Ktg84,61
-cognite/neat/_version.py,sha256=WVjSRSd2zgGQFanscfNpVjo_q_ShT12r7ukn4JBk-AU,23
+cognite/neat/_version.py,sha256=F-q5hXyPtZzXmX2Dnq2XZj8mpyj_44adbjIxdt654tM,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
@@ -113,7 +113,7 @@ 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=5KUVBYyGr4Q4YVqBs6taTeh8nDVM1L-ABGFTpcaph4c,12129
+cognite/neat/rules/exporters/_rules2dms.py,sha256=hvmMxwL9RCAA1b2i5RndjgWnKJv3TKkxdWFovLpJacA,12221
 cognite/neat/rules/exporters/_rules2excel.py,sha256=uK-aS9sBwXUCFQLIO1jciBQrB4w7ySF6MafDqG23hrQ,9080
 cognite/neat/rules/exporters/_rules2ontology.py,sha256=70T28d1tcT179kt5yOZQlLgAQ67uydz3XbhbA10IRuI,19768
 cognite/neat/rules/exporters/_rules2yaml.py,sha256=HKgFlpgD7U2vWLQC_VdSvkDk19QgeVAd_J8wQ9ZgrN8,3038
@@ -141,10 +141,10 @@ cognite/neat/rules/importers/_dtdl2rules/dtdl_converter.py,sha256=o-n9KBWvA5Y7Fj
 cognite/neat/rules/importers/_dtdl2rules/dtdl_importer.py,sha256=QThkjUuEVWI19ynl8zca6nE-zHMk_Pv-9dFwGwovEUE,6925
 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=9iv_5FWVNcR8UZcXPTvzvQgMA-_-y52I39wHzpM0Q6U,7610
+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=AJzdmsTrfDUbmJ4n6fTr_Sp8uUSPVGAWvCxpKS9Na7I,7304
-cognite/neat/rules/importers/_owl2rules/_owl2rules.py,sha256=Ojjatyb6JFxC4kkGn9akkuK2NE1S2eh4RKZbVcwlPAo,5442
+cognite/neat/rules/importers/_owl2rules/_owl2properties.py,sha256=KNOrOySUXM9Krg6HEPNtiThlHfSEhd0EoQBtu_lczu8,7319
+cognite/neat/rules/importers/_owl2rules/_owl2rules.py,sha256=0QplDQnDslqwZ7B8-TuJWJkC30C7MAGyG81YhHdvasQ,7116
 cognite/neat/rules/importers/_spreadsheet2rules.py,sha256=GVkTtWnQkM8nXkPAOs2UpxKnsPHA6898Tb7aTgcDDPM,10573
 cognite/neat/rules/importers/_yaml2rules.py,sha256=sIaYY3Zo--v1cXSu65n4ZPv47cS-5InvSbpkw3Ahov4,4198
 cognite/neat/rules/issues/__init__.py,sha256=Ms6jgCxCezc5IgTOwCFtXQPtoVFfOvdcXj84_rs917I,563
@@ -163,7 +163,7 @@ cognite/neat/rules/models/_rules/_types/_base.py,sha256=EsTqjXUP0zpuQ-Z_BMP-00rJ
 cognite/neat/rules/models/_rules/_types/_field.py,sha256=dOVAU1jWCupFVnrYYwLfI-nNUC4rv4vXHMzpiObtWiw,10295
 cognite/neat/rules/models/_rules/_types/_value.py,sha256=I7Ke388M2NOi0U5F9kAzOjE0O4ZXbIxefupgDAjnISM,6079
 cognite/neat/rules/models/_rules/base.py,sha256=9DgtdCmpz84sMFxZB_stWkalVbjA4HQKsTMpSjjOVLU,10635
-cognite/neat/rules/models/_rules/dms_architect_rules.py,sha256=aevTRWHscgYBih4DqdMzKPAHpj5NVOrCpld0sTp-5Qk,49379
+cognite/neat/rules/models/_rules/dms_architect_rules.py,sha256=d4WKTyuSWWw6ioOYCnayTQcTWNGv-dys2LU3PBI8Fuc,49465
 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=e_SesgvMbzgC9WMFx0b_6qrpOIQvoQ_kXUiXrSYC9RI,20984
@@ -171,7 +171,7 @@ cognite/neat/rules/models/raw_rules.py,sha256=Y7ZVKyvLhX0s6WdwztbFiYFj4EijGEfjtB
 cognite/neat/rules/models/rdfpath.py,sha256=kk1dqxl3n2W_vSQtpSJri2O4nCXnCDZB2lhLsLV1PN0,7344
 cognite/neat/rules/models/rules.py,sha256=ECKrQEtoiQqtR8W-rKMAWmODpHeHhI8Qzf3TwCa3dy8,51063
 cognite/neat/rules/models/tables.py,sha256=hj7qjjIpwDXBnkVQrL47V2kjFxDz7aE4mkYOZTwepj8,171
-cognite/neat/rules/models/value_types.py,sha256=CcAaj7-SfLE9HkQBOmqJFGlWaq19YiB9mIZhR7Ly9oY,4316
+cognite/neat/rules/models/value_types.py,sha256=3OPP5i4CtXfRsgtoBB53Cptr3ZSOm3AqhX4uSgCMiuw,4395
 cognite/neat/utils/__init__.py,sha256=l5Nyqhqo25bcQXCOb_lk01cr-UXsG8cczz_y_I0u6bg,68
 cognite/neat/utils/auxiliary.py,sha256=E2-YtddzScvN7l7j0kNYIMlfqIUT9NWMqLpcJYPK4rY,309
 cognite/neat/utils/cdf.py,sha256=dTg8wnm2916yhWT_2Jg9_PlauHCbmnuNgmpqrGU8eO0,711
@@ -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.70.1.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.70.1.dist-info/METADATA,sha256=olXq5x4vGn839BRr4LQBKuE8gsBpqDuiUW57iH9he1k,9321
-cognite_neat-0.70.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-cognite_neat-0.70.1.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
-cognite_neat-0.70.1.dist-info/RECORD,,
+cognite_neat-0.70.3.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.70.3.dist-info/METADATA,sha256=qocFaYXnky1ctPppojAvHonQARRka6NpByF7SmanOU0,9321
+cognite_neat-0.70.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+cognite_neat-0.70.3.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
+cognite_neat-0.70.3.dist-info/RECORD,,