cognite-toolkit 0.7.36__tar.gz → 0.7.38__tar.gz

{cognite_toolkit-0.7.36 → cognite_toolkit-0.7.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite_toolkit
-Version: 0.7.36
+Version: 0.7.38
 Summary: Official Cognite Data Fusion tool for project templates and configuration deployment
 Author: Cognite AS
 Author-email: Cognite AS <support@cognite.com>

{cognite_toolkit-0.7.36 → cognite_toolkit-0.7.38}/cognite_toolkit/_cdf_tk/client/api/legacy/canvas.py

@@ -133,6 +133,9 @@ class IndustrialCanvasAPI:
 
     @classmethod
     def _retrieve_query(cls, external_id: str) -> query.Query:
+        # The limit for canvas components must be high enough to cover all annotations/references in a canvas.
+        # Using 1000 as a safe upper bound (same as _APPLY_LIMIT).
+        query_limit = 1000
         return query.Query(
             with_={
                 "canvas": query.NodeResultSetExpression(
@@ -142,18 +145,21 @@ class IndustrialCanvasAPI:
                 "solutionTags": query.NodeResultSetExpression(
                     from_="canvas",
                     through=Canvas.get_source().as_property_ref("solutionTags"),
+                    limit=query_limit,
                 ),
                 "annotationEdges": query.EdgeResultSetExpression(
                     from_="canvas",
                     filter=filters.Equals(["edge", "type"], ANNOTATION_EDGE_TYPE.dump()),
                     node_filter=filters.HasData(views=[CanvasAnnotation.get_source()]),
                     direction="outwards",
+                    limit=query_limit,
                 ),
                 "containerReferenceEdges": query.EdgeResultSetExpression(
                     from_="canvas",
                     filter=filters.Equals(["edge", "type"], CONTAINER_REFERENCE_EDGE_TYPE.dump()),
                     node_filter=filters.HasData(views=[ContainerReference.get_source()]),
                     direction="outwards",
+                    limit=query_limit,
                 ),
                 "fdmInstanceContainerReferenceEdges": query.EdgeResultSetExpression(
                     from_="canvas",
@@ -163,11 +169,14 @@ class IndustrialCanvasAPI:
                     ),
                     node_filter=filters.HasData(views=[FdmInstanceContainerReference.get_source()]),
                     direction="outwards",
+                    limit=query_limit,
+                ),
+                "annotations": query.NodeResultSetExpression(from_="annotationEdges", limit=query_limit),
+                "containerReferences": query.NodeResultSetExpression(
+                    from_="containerReferenceEdges", limit=query_limit
                 ),
-                "annotations": query.NodeResultSetExpression(from_="annotationEdges"),
-                "containerReferences": query.NodeResultSetExpression(from_="containerReferenceEdges"),
                 "fdmInstanceContainerReferences": query.NodeResultSetExpression(
-                    from_="fdmInstanceContainerReferenceEdges"
+                    from_="fdmInstanceContainerReferenceEdges", limit=query_limit
                 ),
             },
             select={

{cognite_toolkit-0.7.36 → cognite_toolkit-0.7.38}/cognite_toolkit/_cdf_tk/commands/_migrate/conversion.py

@@ -9,6 +9,7 @@ from cognite.client.data_classes.data_modeling import (
     MappedProperty,
     NodeApply,
     NodeId,
+    ViewId,
 )
 from cognite.client.data_classes.data_modeling.instances import EdgeApply, NodeOrEdgeData, PropertyValueWrite
 from cognite.client.data_classes.data_modeling.views import ViewProperty
@@ -29,7 +30,7 @@ from cognite_toolkit._cdf_tk.utils.useful_types import (
     AssetCentricTypeExtended,
 )
 
-from .data_model import INSTANCE_SOURCE_VIEW_ID
+from .data_model import COGNITE_MIGRATION_SPACE_ID, INSTANCE_SOURCE_VIEW_ID
 from .issues import ConversionIssue, FailedConversion, InvalidPropertyDataType
 
 
@@ -169,6 +170,7 @@ def asset_centric_to_dm(
     view_source: ResourceViewMappingApply,
     view_properties: dict[str, ViewProperty],
     direct_relation_cache: DirectRelationCache,
+    preferred_consumer_view: ViewId | None = None,
 ) -> tuple[NodeApply | EdgeApply | None, ConversionIssue]:
     """Convert an asset-centric resource to a data model instance.
 
@@ -178,6 +180,7 @@ def asset_centric_to_dm(
         view_source (ResourceViewMappingApply): The view source defining how to map the resource to the data model.
         view_properties (dict[str, ViewProperty]): The defined properties referenced in the view source mapping.
         direct_relation_cache (DirectRelationCache): Cache for direct relation references.
+        preferred_consumer_view (ViewId | None): The preferred consumer view for the instance.
 
     Returns:
         tuple[NodeApply | EdgeApply, ConversionIssue]: A tuple containing the converted NodeApply and any ConversionIssue encountered.
@@ -213,7 +216,10 @@ def asset_centric_to_dm(
             "id": id_,
             "dataSetId": data_set_id,
             "classicExternalId": external_id,
+            "resourceViewMapping": {"space": COGNITE_MIGRATION_SPACE_ID, "externalId": view_source.external_id},
         }
+        if preferred_consumer_view:
+            instance_source_properties["preferredConsumerViewId"] = preferred_consumer_view.dump()
         sources.append(NodeOrEdgeData(source=INSTANCE_SOURCE_VIEW_ID, properties=instance_source_properties))
 
     instance: NodeApply | EdgeApply

{cognite_toolkit-0.7.36 → cognite_toolkit-0.7.38}/cognite_toolkit/_cdf_tk/commands/_migrate/data_mapper.py

@@ -147,6 +147,7 @@ class AssetCentricMapper(
             view_source=view_source,
             view_properties=view_properties,
             direct_relation_cache=self._direct_relation_cache,
+            preferred_consumer_view=mapping.preferred_consumer_view,
         )
         if mapping.instance_id.space == MISSING_INSTANCE_SPACE:
             conversion_issue.missing_instance_space = f"Missing instance space for dataset ID {mapping.data_set_id!r}"

{cognite_toolkit-0.7.36 → cognite_toolkit-0.7.38}/cognite_toolkit/_cdf_tk/commands/_migrate/data_model.py

@@ -4,6 +4,7 @@ from cognite.client.data_classes.data_modeling.containers import BTreeIndex
 SPACE = dm.SpaceApply(
     "cognite_migration", description="Space for the asset-centric to data modeling migration", name="cdf_migration"
 )
+COGNITE_MIGRATION_SPACE_ID = SPACE.space
 
 RESOURCE_VIEW_MAPPING = dm.ContainerApply(
     space=SPACE.space,

{cognite_toolkit-0.7.36 → cognite_toolkit-0.7.38}/cognite_toolkit/_cdf_tk/cruds/_resource_cruds/function.py

@@ -22,6 +22,7 @@ from cognite.client.data_classes.capabilities import (
     FunctionsAcl,
     SessionsAcl,
 )
+from cognite.client.data_classes.data_modeling import NodeId
 from cognite.client.data_classes.data_modeling.cdm.v1 import CogniteFileApply
 from cognite.client.data_classes.functions import HANDLER_FILE_NAME
 from cognite.client.exceptions import CogniteAPIError
@@ -406,7 +407,18 @@ class FunctionCRUD(ResourceCRUD[str, FunctionWrite, Function]):
 
         self.client.functions.delete_with_429_retry(external_id=ids, ignore_unknown_ids=True)
         file_ids = {func.file_id for func in functions if func.file_id}
-        self.client.files.delete(id=list(file_ids), ignore_unknown_ids=True)
+        files = self.client.files.retrieve_multiple(list(file_ids), ignore_unknown_ids=True)
+        dm_file_nodes: set[NodeId] = set()
+        classic_file_ids: set[int] = set()
+        for file in files:
+            if file.instance_id is not None:
+                dm_file_nodes.add(file.instance_id)
+            else:
+                classic_file_ids.add(file.id)
+        if classic_file_ids:
+            self.client.files.delete(id=list(classic_file_ids), ignore_unknown_ids=True)
+        if dm_file_nodes:
+            self.client.data_modeling.instances.delete(list(dm_file_nodes))
         return len(ids)
 
     def _iterate(

{cognite_toolkit-0.7.36 → cognite_toolkit-0.7.38}/cognite_toolkit/_repo_files/GitHub/.github/workflows/deploy.yaml

@@ -12,7 +12,7 @@ jobs:
     environment: dev
     name: Deploy
     container:
-      image: cognite/toolkit:0.7.36
+      image: cognite/toolkit:0.7.38
       env:
         CDF_CLUSTER: ${{ vars.CDF_CLUSTER }}
         CDF_PROJECT: ${{ vars.CDF_PROJECT }}

{cognite_toolkit-0.7.36 → cognite_toolkit-0.7.38}/cognite_toolkit/_repo_files/GitHub/.github/workflows/dry-run.yaml

@@ -10,7 +10,7 @@ jobs:
     environment: dev
     name: Deploy Dry Run
     container:
-      image: cognite/toolkit:0.7.36
+      image: cognite/toolkit:0.7.38
       env:
         CDF_CLUSTER: ${{ vars.CDF_CLUSTER }}
         CDF_PROJECT: ${{ vars.CDF_PROJECT }}

{cognite_toolkit-0.7.36 → cognite_toolkit-0.7.38}/cognite_toolkit/_resources/cdf.toml

@@ -4,7 +4,7 @@ default_env = "<DEFAULT_ENV_PLACEHOLDER>"
 [modules]
 # This is the version of the modules. It should not be changed manually.
 # It will be updated by the 'cdf modules upgrade' command.
-version = "0.7.36"
+version = "0.7.38"
 
 
 [plugins]

cognite_toolkit-0.7.38/cognite_toolkit/_version.py

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

{cognite_toolkit-0.7.36 → cognite_toolkit-0.7.38}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cognite_toolkit"
-version = "0.7.36"
+version = "0.7.38"
 description = "Official Cognite Data Fusion tool for project templates and configuration deployment"
 authors = [
     {name ="Cognite AS", email="support@cognite.com"}

cognite_toolkit-0.7.36/cognite_toolkit/_version.py

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