cognite-toolkit 0.6.113__py3-none-any.whl → 0.6.115__py3-none-any.whl

cognite_toolkit/_cdf.py

@@ -94,8 +94,6 @@ _app.add_typer(RepoApp(**default_typer_kws), name="repo")
 
 
 if Plugins.run.value.is_enabled():
-    if Flags.v07.is_enabled():
-        print("The run plugin is deprecated and will be replaced by the dev plugin in v0.8.0.")
     _app.add_typer(RunApp(**default_typer_kws), name="run")
 
 if Plugins.dump.value.is_enabled():

cognite_toolkit/_cdf_tk/apps/_download_app.py

@@ -12,6 +12,7 @@ from cognite_toolkit._cdf_tk.commands import DownloadCommand
 from cognite_toolkit._cdf_tk.constants import DATA_DEFAULT_DIR
 from cognite_toolkit._cdf_tk.storageio import (
     AssetIO,
+    CanvasIO,
     ChartIO,
     EventIO,
     FileMetadataIO,
@@ -22,6 +23,8 @@ from cognite_toolkit._cdf_tk.storageio import (
 )
 from cognite_toolkit._cdf_tk.storageio.selectors import (
     AssetSubtreeSelector,
+    CanvasExternalIdSelector,
+    CanvasSelector,
     ChartExternalIdSelector,
     ChartSelector,
     DataSetSelector,
@@ -37,6 +40,7 @@ from cognite_toolkit._cdf_tk.utils.interactive_select import (
     DataModelingSelect,
     EventInteractiveSelect,
     FileMetadataInteractiveSelect,
+    InteractiveCanvasSelect,
     InteractiveChartSelect,
     RawTableInteractiveSelect,
     TimeSeriesInteractiveSelect,
@@ -67,6 +71,10 @@ class ChartFormats(str, Enum):
     ndjson = "ndjson"
 
 
+class CanvasFormats(str, Enum):
+    ndjson = "ndjson"
+
+
 class InstanceTypes(str, Enum):
     node = "node"
     edge = "edge"
@@ -92,6 +100,7 @@ class DownloadApp(typer.Typer):
         self.command("hierarchy")(self.download_hierarchy_cmd)
         self.command("instances")(self.download_instances_cmd)
         self.command("charts")(self.download_charts_cmd)
+        self.command("canvas")(self.download_canvas_cmd)
 
     @staticmethod
     def download_main(ctx: typer.Context) -> None:
@@ -840,3 +849,76 @@ class DownloadApp(typer.Typer):
                 verbose=verbose,
             )
         )
+
+    @staticmethod
+    def download_canvas_cmd(
+        ctx: typer.Context,
+        external_ids: Annotated[
+            list[str] | None,
+            typer.Argument(
+                help="List of canvas external IDs to download. If not provided, an interactive selection will be made.",
+            ),
+        ] = None,
+        file_format: Annotated[
+            CanvasFormats,
+            typer.Option(
+                "--format",
+                "-f",
+                help="Format for downloading the canvas.",
+            ),
+        ] = CanvasFormats.ndjson,
+        compression: Annotated[
+            CompressionFormat,
+            typer.Option(
+                "--compression",
+                "-z",
+                help="Compression format to use when downloading the canvas.",
+            ),
+        ] = CompressionFormat.none,
+        output_dir: Annotated[
+            Path,
+            typer.Option(
+                "--output-dir",
+                "-o",
+                help="Where to download the canvas.",
+                allow_dash=True,
+            ),
+        ] = DEFAULT_DOWNLOAD_DIR,
+        limit: Annotated[
+            int,
+            typer.Option(
+                "--limit",
+                "-l",
+                help="The maximum number of canvas to download. Use -1 to download all canvas.",
+            ),
+        ] = 1000,
+        verbose: Annotated[
+            bool,
+            typer.Option(
+                "--verbose",
+                "-v",
+                help="Turn on to get more verbose output when running the command",
+            ),
+        ] = False,
+    ) -> None:
+        """This command will download Canvas from CDF into a temporary directory."""
+        cmd = DownloadCommand()
+        client = EnvironmentVariables.create_from_environment().get_client()
+        selector: CanvasSelector
+        if external_ids is None:
+            selected_external_ids = InteractiveCanvasSelect(client).select_external_ids()
+            selector = CanvasExternalIdSelector(external_ids=tuple(selected_external_ids))
+        else:
+            selector = CanvasExternalIdSelector(external_ids=tuple(external_ids))
+
+        cmd.run(
+            lambda: cmd.download(
+                selectors=[selector],
+                io=CanvasIO(client),
+                output_dir=output_dir,
+                file_format=f".{file_format.value}",
+                compression=compression.value,
+                limit=limit if limit != -1 else None,
+                verbose=verbose,
+            )
+        )

cognite_toolkit/_cdf_tk/apps/_run.py

@@ -10,6 +10,7 @@ from cognite_toolkit._cdf_tk.commands import (
     RunTransformationCommand,
     RunWorkflowCommand,
 )
+from cognite_toolkit._cdf_tk.feature_flags import Flags
 from cognite_toolkit._cdf_tk.utils.auth import EnvironmentVariables
 
 CDF_TOML = CDFToml.load(Path.cwd())
@@ -23,9 +24,16 @@ class RunApp(typer.Typer):
         self.command("workflow")(self.run_workflow)
         self.add_typer(RunFunctionApp(*args, **kwargs), name="function")
 
+    @staticmethod
+    def _print_deprecation_warning() -> None:
+        """Print deprecation warning for the run plugin."""
+        if Flags.v07.is_enabled():
+            print("The run plugin is deprecated and will be replaced by the dev plugin in v0.8.0.")
+
     @staticmethod
     def main(ctx: typer.Context) -> None:
         """Commands to execute processes in CDF."""
+        RunApp._print_deprecation_warning()
         if ctx.invoked_subcommand is None:
             print("Use [bold yellow]cdf run --help[/] for more information.")
 
@@ -51,6 +59,7 @@ class RunApp(typer.Typer):
         ] = False,
     ) -> None:
         """This command will run the specified transformation using a one-time session."""
+        RunApp._print_deprecation_warning()
         cmd = RunTransformationCommand()
         client = EnvironmentVariables.create_from_environment().get_client()
         cmd.run(lambda: cmd.run_transformation(client, external_id))
@@ -108,6 +117,7 @@ class RunApp(typer.Typer):
         ] = False,
     ) -> None:
         """This command will run the specified workflow."""
+        RunApp._print_deprecation_warning()
         cmd = RunWorkflowCommand()
         env_vars = EnvironmentVariables.create_from_environment()
         cmd.run(lambda: cmd.run_workflow(env_vars, organization_dir, env_name, external_id, version, wait))
@@ -123,6 +133,7 @@ class RunFunctionApp(typer.Typer):
     @staticmethod
     def main(ctx: typer.Context) -> None:
         """Commands to execute function."""
+        RunApp._print_deprecation_warning()
         if ctx.invoked_subcommand is None:
             print("Use [bold yellow]cdf run function --help[/] for more information.")
 
@@ -178,6 +189,7 @@ class RunFunctionApp(typer.Typer):
         ] = False,
     ) -> None:
         """This command will run the specified function locally."""
+        RunApp._print_deprecation_warning()
         cmd = RunFunctionCommand()
         env_vars = EnvironmentVariables.create_from_environment()
         cmd.run(
@@ -243,6 +255,7 @@ class RunFunctionApp(typer.Typer):
         ] = False,
     ) -> None:
         """This command will run the specified function (assuming it is deployed) in CDF."""
+        RunApp._print_deprecation_warning()
         cmd = RunFunctionCommand()
         env_vars = EnvironmentVariables.create_from_environment()
         cmd.run(lambda: cmd.run_cdf(env_vars, organization_dir, env_name, external_id, schedule, wait))

cognite_toolkit/_cdf_tk/apps/_upload_app.py

@@ -1,10 +1,12 @@
 from pathlib import Path
 from typing import Annotated, Any
 
+import questionary
 import typer
+from questionary import Choice
 
 from cognite_toolkit._cdf_tk.commands import UploadCommand
-from cognite_toolkit._cdf_tk.constants import DATA_DEFAULT_DIR
+from cognite_toolkit._cdf_tk.constants import DATA_DEFAULT_DIR, DATA_MANIFEST_SUFFIX, DATA_RESOURCE_DIR
 from cognite_toolkit._cdf_tk.utils.auth import EnvironmentVariables
 
 DEFAULT_INPUT_DIR = Path.cwd() / DATA_DEFAULT_DIR
@@ -13,21 +15,21 @@ DEFAULT_INPUT_DIR = Path.cwd() / DATA_DEFAULT_DIR
 class UploadApp(typer.Typer):
     def __init__(self, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, **kwargs)
-        self.callback(invoke_without_command=True)(self.upload_main)
+        self.command("dir")(self.upload_main)
 
     @staticmethod
     def upload_main(
         ctx: typer.Context,
         input_dir: Annotated[
-            Path,
+            Path | None,
             typer.Argument(
-                help="The directory containing the data to upload.",
+                help="The directory containing the data to upload. If not specified, an interactive prompt will ask for the directory.",
                 exists=True,
                 file_okay=False,
                 dir_okay=True,
                 resolve_path=True,
             ),
-        ],
+        ] = None,
         dry_run: Annotated[
             bool,
             typer.Option(
@@ -43,7 +45,7 @@ class UploadApp(typer.Typer):
                 "-r",
                 help="If set, the command will look for resource configuration files in adjacent folders and create them if they do not exist.",
             ),
-        ] = True,
+        ] = False,
         verbose: Annotated[
             bool,
             typer.Option(
@@ -55,14 +57,43 @@ class UploadApp(typer.Typer):
     ) -> None:
         """Commands to upload data to CDF."""
         cmd = UploadCommand()
+        if input_dir is None:
+            input_candidate = sorted({p.parent for p in DEFAULT_INPUT_DIR.rglob(f"*/**{DATA_MANIFEST_SUFFIX}")})
+            if not input_candidate:
+                typer.echo(f"No data manifests found in default directory: {DEFAULT_INPUT_DIR}")
+                raise typer.Exit(code=1)
+            input_dir = questionary.select(
+                "Select the input directory containing the data to upload:",
+                choices=[Choice(str(option.name), value=option) for option in input_candidate],
+            ).ask()
+            if input_dir is None:
+                typer.echo("No input directory selected. Exiting.")
+                raise typer.Exit(code=1)
+            dry_run = questionary.confirm("Proceed with dry run?", default=dry_run).ask()
+            if dry_run is None:
+                typer.echo("No selection made for dry run. Exiting.")
+                raise typer.Exit(code=1)
+            resource_dir = Path(input_dir) / DATA_RESOURCE_DIR
+            if resource_dir.exists():
+                if resource_dir.is_relative_to(Path.cwd()):
+                    display_name = resource_dir.relative_to(Path.cwd()).as_posix()
+                else:
+                    display_name = resource_dir.as_posix()
+
+                deploy_resources = questionary.confirm(
+                    f"Deploy resources found in {display_name!r}?", default=deploy_resources
+                ).ask()
+                if deploy_resources is None:
+                    typer.echo("No selection made for deploying resources. Exiting.")
+                    raise typer.Exit(code=1)
 
-        client = EnvironmentVariables.create_from_environment().get_client()
-        cmd.run(
-            lambda: cmd.upload(
-                input_dir=input_dir,
-                dry_run=dry_run,
-                verbose=verbose,
-                deploy_resources=deploy_resources,
-                client=client,
+            client = EnvironmentVariables.create_from_environment().get_client()
+            cmd.run(
+                lambda: cmd.upload(
+                    input_dir=input_dir,
+                    dry_run=dry_run,
+                    verbose=verbose,
+                    deploy_resources=deploy_resources,
+                    client=client,
+                )
             )
-        )

cognite_toolkit/_cdf_tk/client/data_classes/canvas.py

@@ -2,7 +2,7 @@ import sys
 from abc import ABC
 from collections.abc import Sequence
 from datetime import datetime, timezone
-from typing import Any
+from typing import Any, TypeVar
 from uuid import uuid4
 
 from cognite.client import CogniteClient
@@ -31,6 +31,7 @@ from cognite.client.data_classes.data_modeling.instances import (
 )
 
 from cognite_toolkit._cdf_tk.client.data_classes.migration import AssetCentricId
+from cognite_toolkit._cdf_tk.utils.useful_types import JsonVal
 
 if sys.version_info >= (3, 11):
     from typing import Self
@@ -68,6 +69,9 @@ class ExtendedTypedNodeApply(TypedNodeApply, ABC):
         return output
 
 
+T_ExtendedTypedNodeApply = TypeVar("T_ExtendedTypedNodeApply", bound=ExtendedTypedNodeApply)
+
+
 class _CanvasProperties:
     created_by = PropertyOptions("createdBy")
     updated_at = PropertyOptions("updatedAt")
@@ -901,7 +905,7 @@ class IndustrialCanvasApply(CogniteResource):
                 raise TypeError(f"Unexpected instance type: {type(instance)}")
         return ids
 
-    def dump(self, keep_existing_version: bool = True) -> dict[str, object]:
+    def dump(self, keep_existing_version: bool = True) -> dict[str, JsonVal]:
         """Dump the IndustrialCanvasApply to a dictionary."""
         return {
             "canvas": self.canvas.dump(keep_existing_version=keep_existing_version),
@@ -953,7 +957,46 @@ class IndustrialCanvasApply(CogniteResource):
     @classmethod
     def _load(cls, resource: dict[str, Any], cognite_client: CogniteClient | None = None) -> Self:
         """Load an IndustrialCanvasApply instance from a resource dictionary."""
-        raise NotImplementedError("IndustrialCanvasApply cannot be loaded from dict.")
+        if "canvas" not in resource:
+            raise ValueError("Resource does not contain a canvas node.")
+        canvas_resource = resource["canvas"]
+        if isinstance(canvas_resource, dict):
+            canvas = CanvasApply._load(canvas_resource)
+        elif isinstance(canvas_resource, CanvasApply):
+            canvas = canvas_resource
+        elif isinstance(canvas_resource, NodeApply):
+            canvas = CanvasApply._load(canvas_resource.dump())
+        else:
+            raise TypeError(f"Canvas resource {type(canvas_resource)} is not supported.")
+        return cls(
+            canvas=canvas,
+            annotations=cls._load_apply_items(resource.get("annotations"), CanvasAnnotationApply),
+            container_references=cls._load_apply_items(resource.get("containerReferences"), ContainerReferenceApply),
+            fdm_instance_container_references=cls._load_apply_items(
+                resource.get("fdmInstanceContainerReferences"), FdmInstanceContainerReferenceApply
+            ),
+            solution_tags=cls._load_apply_items(resource.get("solutionTags"), CogniteSolutionTagApply),
+        )
+
+    @classmethod
+    def _load_apply_items(
+        cls, items: object | None, node_cls: type[T_ExtendedTypedNodeApply]
+    ) -> list[T_ExtendedTypedNodeApply]:
+        if items is None:
+            return []
+        elif isinstance(items, Sequence):
+            nodes: list[T_ExtendedTypedNodeApply] = []
+            for node in items:
+                if isinstance(node, dict):
+                    nodes.append(node_cls._load(node))
+                elif isinstance(node, node_cls):
+                    nodes.append(node)
+                elif isinstance(node, NodeApply):
+                    nodes.append(node_cls._load(node.dump()))
+                else:
+                    raise TypeError(f"Expected a sequence of {node_cls.__name__}, got {type(node).__name__}")
+            return nodes
+        raise TypeError(f"Expected a sequence of {node_cls.__name__}, got {type(items).__name__}")
 
 
 class IndustrialCanvas(WriteableCogniteResource[IndustrialCanvasApply]):

cognite_toolkit/_cdf_tk/commands/build_cmd.py

@@ -65,6 +65,7 @@ from cognite_toolkit._cdf_tk.exceptions import (
     ToolkitMissingModuleError,
     ToolkitYAMLFormatError,
 )
+from cognite_toolkit._cdf_tk.feature_flags import Flags
 from cognite_toolkit._cdf_tk.hints import Hint, ModuleDefinition, verify_module_directory
 from cognite_toolkit._cdf_tk.tk_warnings import (
     DuplicatedItemWarning,
@@ -358,6 +359,16 @@ class BuildCommand(ToolkitCommand):
         for resource_name, resource_files in module.source_paths_by_resource_folder.items():
             source_files = self._replace_variables(resource_files, module_variables, resource_name, module.dir, verbose)
 
+            if resource_name == "data_models":
+                resource_name = "data_modeling"
+                if Flags.v07:
+                    self.warn(
+                        MediumSeverityWarning(
+                            "The resource folder 'data_models' is deprecated and will be removed in v1.0. "
+                            "Please rename the folder to 'data_modeling'."
+                        )
+                    )
+
             builder = self._get_builder(build_dir, resource_name)
 
             built_resources = BuiltResourceList[Hashable]()

cognite_toolkit/_cdf_tk/commands/deploy.py

@@ -15,6 +15,7 @@ from cognite_toolkit._cdf_tk.commands.clean import CleanCommand
 from cognite_toolkit._cdf_tk.constants import (
     _RUNNING_IN_BROWSER,
     BUILD_ENVIRONMENT_FILE,
+    DATA_UPLOAD_URL,
     HINT_LEAD_TEXT,
 )
 from cognite_toolkit._cdf_tk.cruds import (
@@ -43,6 +44,7 @@ from cognite_toolkit._cdf_tk.exceptions import (
     ToolkitFileNotFoundError,
     ToolkitNotADirectoryError,
 )
+from cognite_toolkit._cdf_tk.feature_flags import Flags
 from cognite_toolkit._cdf_tk.protocols import (
     T_ResourceRequest,
     T_ResourceRequestList,
@@ -52,6 +54,7 @@ from cognite_toolkit._cdf_tk.protocols import (
 from cognite_toolkit._cdf_tk.tk_warnings import EnvironmentVariableMissingWarning
 from cognite_toolkit._cdf_tk.tk_warnings.base import WarningList, catch_warnings
 from cognite_toolkit._cdf_tk.tk_warnings.other import (
+    HighSeverityWarning,
     LowSeverityWarning,
     ToolkitDependenciesIncludedWarning,
 )
@@ -292,6 +295,15 @@ class DeployCommand(ToolkitCommand):
             read_modules = build.read_modules
         output_results = DeployResults([], "deploy", dry_run=dry_run) if results is None else results
         for loader_cls in ordered_loaders:
+            if issubclass(loader_cls, DataCRUD) and Flags.v07:
+                self.warn(
+                    HighSeverityWarning(
+                        f"Uploading {loader_cls.kind} data is deprecated and will be removed in v0.8. "
+                        f"Use the `cdf data upload dir` command instead. See [{DATA_UPLOAD_URL}]({DATA_UPLOAD_URL}) for more information about "
+                        "the upload command."
+                    )
+                )
+
             loader = loader_cls.create_loader(client, build_dir)
             resource_result: DeployResult | None
             if isinstance(loader, ResourceCRUD):

cognite_toolkit/_cdf_tk/constants.py

@@ -178,6 +178,7 @@ DATA_RESOURCE_DIR = "resources"
 DATA_MANIFEST_STEM = "Manifest"
 DATA_MANIFEST_SUFFIX = f".{DATA_MANIFEST_STEM}.yaml"
 
+DATA_UPLOAD_URL = "https://docs.cognite.com/cdf/deploy/cdf_toolkit/guides/plugins/data_plugin/index"
 # Migration Constants
 MISSING_INSTANCE_SPACE = "<InstanceSpaceMissing>"
 MISSING_EXTERNAL_ID = "INTERNAL_ID_project_{project}_id_{id}"

cognite_toolkit/_cdf_tk/cruds/__init__.py

@@ -106,6 +106,9 @@ for _loader in itertools.chain(
     CRUDS_BY_FOLDER_NAME[_loader.folder_name].append(_loader)  # type: ignore[arg-type, attr-defined]
 del _loader  # cleanup module namespace
 
+# For backwards compatibility
+CRUDS_BY_FOLDER_NAME["data_models"] = CRUDS_BY_FOLDER_NAME["data_modeling"]  # Todo: Remove in v1.0
+
 CRUD_LIST = list(itertools.chain.from_iterable(CRUDS_BY_FOLDER_NAME.values()))
 RESOURCE_CRUD_LIST = [loader for loader in CRUD_LIST if issubclass(loader, ResourceCRUD)]
 RESOURCE_CRUD_CONTAINER_LIST = [loader for loader in CRUD_LIST if issubclass(loader, ResourceContainerCRUD)]
@@ -123,7 +126,8 @@ ResourceTypes: TypeAlias = Literal[
     "auth",
     "cdf_applications",
     "classic",
-    "data_models",
+    "data_modeling",
+    "data_models",  # Todo: Remove in v1.0
     "data_sets",
     "hosted_extractors",
     "locations",

cognite_toolkit/_cdf_tk/cruds/_resource_cruds/datamodel.py

@@ -120,7 +120,7 @@ from .auth import GroupAllScopedCRUD
 @final
 class SpaceCRUD(ResourceContainerCRUD[str, SpaceApply, Space, SpaceApplyList, SpaceList]):
     item_name = "nodes and edges"
-    folder_name = "data_models"
+    folder_name = "data_modeling"
     filename_pattern = r"^.*space$"
     resource_cls = Space
     resource_write_cls = SpaceApply
@@ -252,7 +252,7 @@ class SpaceCRUD(ResourceContainerCRUD[str, SpaceApply, Space, SpaceApplyList, Sp
 
 class ContainerCRUD(ResourceContainerCRUD[ContainerId, ContainerApply, Container, ContainerApplyList, ContainerList]):
     item_name = "nodes and edges"
-    folder_name = "data_models"
+    folder_name = "data_modeling"
     filename_pattern = r"^.*container$"
     resource_cls = Container
     resource_write_cls = ContainerApply
@@ -516,7 +516,7 @@ class ContainerCRUD(ResourceContainerCRUD[ContainerId, ContainerApply, Container
 
 
 class ViewCRUD(ResourceCRUD[ViewId, ViewApply, View, ViewApplyList, ViewList]):
-    folder_name = "data_models"
+    folder_name = "data_modeling"
     filename_pattern = r"^.*view$"
     resource_cls = View
     resource_write_cls = ViewApply
@@ -857,7 +857,7 @@ class ViewCRUD(ResourceCRUD[ViewId, ViewApply, View, ViewApplyList, ViewList]):
 
 @final
 class DataModelCRUD(ResourceCRUD[DataModelId, DataModelApply, DataModel, DataModelApplyList, DataModelList]):
-    folder_name = "data_models"
+    folder_name = "data_modeling"
     filename_pattern = r"^.*datamodel$"
     resource_cls = DataModel
     resource_write_cls = DataModelApply
@@ -991,7 +991,7 @@ class DataModelCRUD(ResourceCRUD[DataModelId, DataModelApply, DataModel, DataMod
 @final
 class NodeCRUD(ResourceContainerCRUD[NodeId, NodeApply, Node, NodeApplyList, NodeList]):
     item_name = "nodes"
-    folder_name = "data_models"
+    folder_name = "data_modeling"
     filename_pattern = r"^.*node$"
     resource_cls = Node
     resource_write_cls = NodeApply
@@ -1150,7 +1150,7 @@ class GraphQLCRUD(
         DataModelId, GraphQLDataModelWrite, GraphQLDataModel, GraphQLDataModelWriteList, GraphQLDataModelList
     ]
 ):
-    folder_name = "data_models"
+    folder_name = "data_modeling"
     filename_pattern = r"^.*GraphQLSchema"
     resource_cls = GraphQLDataModel
     resource_write_cls = GraphQLDataModelWrite
@@ -1350,7 +1350,7 @@ class GraphQLCRUD(
 @final
 class EdgeCRUD(ResourceContainerCRUD[EdgeId, EdgeApply, Edge, EdgeApplyList, EdgeList]):
     item_name = "edges"
-    folder_name = "data_models"
+    folder_name = "data_modeling"
     filename_pattern = r"^.*edge"
     resource_cls = Edge
     resource_write_cls = EdgeApply

cognite_toolkit/_cdf_tk/storageio/_applications.py

@@ -6,11 +6,19 @@ from cognite_toolkit._cdf_tk.client.data_classes.canvas import (
 )
 from cognite_toolkit._cdf_tk.client.data_classes.charts import Chart, ChartList, ChartWrite
 from cognite_toolkit._cdf_tk.exceptions import ToolkitNotImplementedError
+from cognite_toolkit._cdf_tk.tk_warnings import MediumSeverityWarning
 from cognite_toolkit._cdf_tk.utils.collection import chunker_sequence
 from cognite_toolkit._cdf_tk.utils.useful_types import JsonVal
 
 from ._base import Page, UploadableStorageIO, UploadItem
-from .selectors import AllChartsSelector, CanvasSelector, ChartExternalIdSelector, ChartOwnerSelector, ChartSelector
+from .selectors import (
+    AllChartsSelector,
+    CanvasExternalIdSelector,
+    CanvasSelector,
+    ChartExternalIdSelector,
+    ChartOwnerSelector,
+    ChartSelector,
+)
 
 
 class ChartIO(UploadableStorageIO[ChartSelector, Chart, ChartWrite]):
@@ -128,17 +136,181 @@ class CanvasIO(UploadableStorageIO[CanvasSelector, IndustrialCanvas, IndustrialC
         return item.as_id()
 
     def stream_data(self, selector: CanvasSelector, limit: int | None = None) -> Iterable[Page]:
-        raise ToolkitNotImplementedError("Streaming canvases is not implemented yet.")
+        if not isinstance(selector, CanvasExternalIdSelector):
+            raise ToolkitNotImplementedError(f"Unsupported selector type {type(selector).__name__!r} for CanvasIO")
+        canvas_ids = selector.external_ids
+        if limit is not None and len(canvas_ids) > limit:
+            canvas_ids = canvas_ids[:limit]
+
+        for chunk in chunker_sequence(canvas_ids, self.CHUNK_SIZE):
+            items: list[IndustrialCanvas] = []
+            for canvas_id in chunk:
+                canvas = self.client.canvas.industrial.retrieve(canvas_id)
+                if canvas is not None:
+                    items.append(canvas)
+                else:
+                    MediumSeverityWarning("Canvas with external ID {canvas_id!r} not found. Skipping.").print_warning(
+                        console=self.client.console
+                    )
+            yield Page(worker_id="main", items=items)
 
     def count(self, selector: CanvasSelector) -> int | None:
-        raise ToolkitNotImplementedError("Counting canvases is not implemented yet.")
+        if not isinstance(selector, CanvasExternalIdSelector):
+            raise ToolkitNotImplementedError(f"Unsupported selector type {type(selector).__name__!r} for CanvasIO")
+        return len(selector.external_ids)
 
     def data_to_json_chunk(
         self, data_chunk: Sequence[IndustrialCanvas], selector: CanvasSelector | None = None
     ) -> list[dict[str, JsonVal]]:
-        # Need to do lookup to get external IDs for all asset-centric resources.
-        raise ToolkitNotImplementedError("Exporting canvases is not implemented yet.")
+        self._populate_id_cache(data_chunk)
+        return [self._dump_resource(canvas) for canvas in data_chunk]
+
+    def _populate_id_cache(self, data_chunk: Sequence[IndustrialCanvas]) -> None:
+        """Populate the client's lookup cache with all referenced resources in the canvases."""
+        asset_ids: set[int] = set()
+        time_series_ids: set[int] = set()
+        event_ids: set[int] = set()
+        file_ids: set[int] = set()
+        for canvas in data_chunk:
+            for container_ref in canvas.container_references:
+                if container_ref.container_reference_type == "asset":
+                    asset_ids.add(container_ref.resource_id)
+                elif container_ref.container_reference_type == "timeseries":
+                    time_series_ids.add(container_ref.resource_id)
+                elif container_ref.container_reference_type == "event":
+                    event_ids.add(container_ref.resource_id)
+                elif container_ref.container_reference_type == "file":
+                    file_ids.add(container_ref.resource_id)
+        if asset_ids:
+            self.client.lookup.assets.external_id(list(asset_ids))
+        if time_series_ids:
+            self.client.lookup.time_series.external_id(list(time_series_ids))
+        if event_ids:
+            self.client.lookup.events.external_id(list(event_ids))
+        if file_ids:
+            self.client.lookup.files.external_id(list(file_ids))
+
+    def _dump_resource(self, canvas: IndustrialCanvas) -> dict[str, JsonVal]:
+        dumped = canvas.as_write().dump()
+        references = dumped.get("containerReferences", [])
+        if not isinstance(references, list):
+            return dumped
+        for container_ref in references:
+            if not isinstance(container_ref, dict):
+                continue
+            sources = container_ref.get("sources", [])
+            if not isinstance(sources, list) or len(sources) == 0:
+                continue
+            source = sources[0]
+            if not isinstance(source, dict) or "properties" not in source:
+                continue
+            properties = source["properties"]
+            if not isinstance(properties, dict):
+                continue
+            resource_id = properties.pop("resourceId", None)
+            if not isinstance(resource_id, int):
+                continue
+            reference_type = properties.get("containerReferenceType")
+            if reference_type == "asset":
+                external_id = self.client.lookup.assets.external_id(resource_id)
+            elif reference_type == "timeseries":
+                external_id = self.client.lookup.time_series.external_id(resource_id)
+            elif reference_type == "event":
+                external_id = self.client.lookup.events.external_id(resource_id)
+            elif reference_type == "file":
+                external_id = self.client.lookup.files.external_id(resource_id)
+            else:
+                continue
+            if external_id is not None:
+                properties["resourceExternalId"] = external_id
+        return dumped
+
+    def json_chunk_to_data(
+        self, data_chunk: list[tuple[str, dict[str, JsonVal]]]
+    ) -> Sequence[UploadItem[IndustrialCanvasApply]]:
+        self._populate_external_id_cache([item_json for _, item_json in data_chunk])
+        return super().json_chunk_to_data(data_chunk)
+
+    def _populate_external_id_cache(self, item_jsons: Sequence[dict[str, JsonVal]]) -> None:
+        """Populate the client's lookup cache with all referenced resources in the canvases."""
+        asset_external_ids: set[str] = set()
+        time_series_external_ids: set[str] = set()
+        event_external_ids: set[str] = set()
+        file_external_ids: set[str] = set()
+        for item_json in item_jsons:
+            references = item_json.get("containerReferences", [])
+            if not isinstance(references, list):
+                continue
+            for container_ref in references:
+                if not isinstance(container_ref, dict):
+                    continue
+                sources = container_ref.get("sources", [])
+                if not isinstance(sources, list) or len(sources) == 0:
+                    continue
+                source = sources[0]
+                if not isinstance(source, dict) or "properties" not in source:
+                    continue
+                properties = source["properties"]
+                if not isinstance(properties, dict):
+                    continue
+
+                resource_external_id = properties.get("resourceExternalId")
+                if not isinstance(resource_external_id, str):
+                    continue
+
+                reference_type = properties.get("containerReferenceType")
+                if reference_type == "asset":
+                    asset_external_ids.add(resource_external_id)
+                elif reference_type == "timeseries":
+                    time_series_external_ids.add(resource_external_id)
+                elif reference_type == "event":
+                    event_external_ids.add(resource_external_id)
+                elif reference_type == "file":
+                    file_external_ids.add(resource_external_id)
+
+        if asset_external_ids:
+            self.client.lookup.assets.id(list(asset_external_ids))
+        if time_series_external_ids:
+            self.client.lookup.time_series.id(list(time_series_external_ids))
+        if event_external_ids:
+            self.client.lookup.events.id(list(event_external_ids))
+        if file_external_ids:
+            self.client.lookup.files.id(list(file_external_ids))
 
     def json_to_resource(self, item_json: dict[str, JsonVal]) -> IndustrialCanvasApply:
-        # Need to do lookup to get external IDs for all asset-centric resources.
-        raise ToolkitNotImplementedError("Importing canvases is not implemented yet.")
+        return self._load_resource(item_json)
+
+    def _load_resource(self, item_json: dict[str, JsonVal]) -> IndustrialCanvasApply:
+        references = item_json.get("containerReferences", [])
+        if not isinstance(references, list):
+            return IndustrialCanvasApply._load(item_json)
+        for container_ref in references:
+            if not isinstance(container_ref, dict):
+                continue
+            sources = container_ref.get("sources", [])
+            if not isinstance(sources, list) or len(sources) == 0:
+                continue
+            source = sources[0]
+            if not isinstance(source, dict) or "properties" not in source:
+                continue
+            properties = source["properties"]
+            if not isinstance(properties, dict):
+                continue
+            resource_external_id = properties.pop("resourceExternalId", None)
+            if not isinstance(resource_external_id, str):
+                continue
+            reference_type = properties.get("containerReferenceType")
+            if reference_type == "asset":
+                resource_id = self.client.lookup.assets.id(resource_external_id)
+            elif reference_type == "timeseries":
+                resource_id = self.client.lookup.time_series.id(resource_external_id)
+            elif reference_type == "event":
+                resource_id = self.client.lookup.events.id(resource_external_id)
+            elif reference_type == "file":
+                resource_id = self.client.lookup.files.id(resource_external_id)
+            else:
+                continue
+            if resource_id is not None:
+                properties["resourceId"] = resource_id
+
+        return IndustrialCanvasApply._load(item_json)

cognite_toolkit/_cdf_tk/storageio/selectors/__init__.py

@@ -4,7 +4,7 @@ from pydantic import Field, TypeAdapter
 
 from ._asset_centric import AssetCentricFileSelector, AssetCentricSelector, AssetSubtreeSelector, DataSetSelector
 from ._base import DataSelector
-from ._canvas import CanvasSelector
+from ._canvas import CanvasExternalIdSelector, CanvasSelector
 from ._charts import AllChartsSelector, ChartExternalIdSelector, ChartOwnerSelector, ChartSelector
 from ._datapoints import (
     DataPointsFileSelector,
@@ -40,6 +40,7 @@ Selector = Annotated[
     | DataSetSelector
     | DataPointsFileSelector
     | ChartExternalIdSelector
+    | CanvasExternalIdSelector
     | FileMetadataTemplateSelector
     | FileDataModelingTemplateSelector,
     Field(discriminator="type"),
@@ -53,6 +54,7 @@ __all__ = [
     "AssetCentricFileSelector",
     "AssetCentricSelector",
     "AssetSubtreeSelector",
+    "CanvasExternalIdSelector",
     "CanvasSelector",
     "ChartExternalIdSelector",
     "ChartOwnerSelector",

cognite_toolkit/_cdf_tk/storageio/selectors/_canvas.py

@@ -1,3 +1,4 @@
+import hashlib
 from abc import ABC
 from typing import Literal
 
@@ -6,3 +7,16 @@ from ._base import DataSelector
 
 class CanvasSelector(DataSelector, ABC):
     kind: Literal["IndustrialCanvas"] = "IndustrialCanvas"
+
+
+class CanvasExternalIdSelector(CanvasSelector):
+    type: Literal["canvasExternalId"] = "canvasExternalId"
+    external_ids: tuple[str, ...]
+
+    @property
+    def group(self) -> str:
+        return "Canvas"
+
+    def __str__(self) -> str:
+        hash_ = hashlib.md5(",".join(sorted(self.external_ids)).encode()).hexdigest()[:8]
+        return f"canvas_count_{len(self.external_ids)}_hash_{hash_}"

cognite_toolkit/_repo_files/GitHub/.github/workflows/deploy.yaml

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

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.6.113
+      image: cognite/toolkit:0.6.115
       env:
         CDF_CLUSTER: ${{ vars.CDF_CLUSTER }}
         CDF_PROJECT: ${{ vars.CDF_PROJECT }}

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.6.113"
+version = "0.6.115"
 
 [alpha_flags]
 external-libraries = true

cognite_toolkit/_version.py

@@ -1 +1 @@
-__version__ = "0.6.113"
+__version__ = "0.6.115"

{cognite_toolkit-0.6.113.dist-info → cognite_toolkit-0.6.115.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite_toolkit
-Version: 0.6.113
+Version: 0.6.115
 Summary: Official Cognite Data Fusion tool for project templates and configuration deployment
 Project-URL: Homepage, https://docs.cognite.com/cdf/deploy/cdf_toolkit/
 Project-URL: Changelog, https://github.com/cognitedata/toolkit/releases

{cognite_toolkit-0.6.113.dist-info → cognite_toolkit-0.6.115.dist-info}/RECORD

@@ -1,9 +1,9 @@
 cognite_toolkit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite_toolkit/_cdf.py,sha256=0abeQr1Tfk4lkGaoXyrnFC28wDSlR_8UGrh10noGduQ,6085
-cognite_toolkit/_version.py,sha256=DOT6K-RJWjRjHJkjxqDVc26V3kiyLy4jbrtF9QPajHQ,24
+cognite_toolkit/_cdf.py,sha256=qr31QC3AhJukM-9rBeWHBTLuNU01XIXAtV5dzqOU3iA,5958
+cognite_toolkit/_version.py,sha256=Z89ggLJjU4yNR7PZQ8iPexZJTOjFTQDJaPNdozHGQjA,24
 cognite_toolkit/_cdf_tk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite_toolkit/_cdf_tk/cdf_toml.py,sha256=VSWV9h44HusWIaKpWgjrOMrc3hDoPTTXBXlp6-NOrIM,9079
-cognite_toolkit/_cdf_tk/constants.py,sha256=aFcJkY03sYOJ92YfvcVpau-waj6akOAb4KgyIwKI-bs,7135
+cognite_toolkit/_cdf_tk/constants.py,sha256=3UpFZ60xXdqgPqqpqCITQuAvjnVExH_IlbASxoelvu8,7236
 cognite_toolkit/_cdf_tk/exceptions.py,sha256=xG0jMwi5A20nvPvyo6sCyz_cyKycynPyIzpYiGR4gcU,6064
 cognite_toolkit/_cdf_tk/feature_flags.py,sha256=TjwUmGG5qXBQ-8P1ongh2qQnuRfVRvGaP1JBtuUot88,3106
 cognite_toolkit/_cdf_tk/hints.py,sha256=UI1ymi2T5wCcYOpEbKbVaDnlyFReFy8TDtMVt-5E1h8,6493
@@ -16,7 +16,7 @@ cognite_toolkit/_cdf_tk/apps/_auth_app.py,sha256=ER7uYb3ViwsHMXiQEZpyhwU6TIjKaB9
 cognite_toolkit/_cdf_tk/apps/_core_app.py,sha256=Xlhdv2MoCs2kBk0kgJixiy8ouCfixUWXuK3crEXAqB0,14032
 cognite_toolkit/_cdf_tk/apps/_data_app.py,sha256=rFnTcUBAuoFcTQCjxwqZGG0HjUMGdYTFyBGXxWg5gXE,824
 cognite_toolkit/_cdf_tk/apps/_dev_app.py,sha256=q8DBr4BAK33AwsHW3gAWZWSjSaQRuCisqPbsBjmYSxk,589
-cognite_toolkit/_cdf_tk/apps/_download_app.py,sha256=InnjM0MTre0RHK_nrvvnYAy9Z2GJcdvHr_Jbx2tgrEA,29267
+cognite_toolkit/_cdf_tk/apps/_download_app.py,sha256=g-VA51KI91wziVuO3w305rmr33xIb0ghYTtW06LhNz8,31994
 cognite_toolkit/_cdf_tk/apps/_dump_app.py,sha256=Ec0aEqbKwCkxni09i06rfY31qZUyOVwbbvo7MHh4cf8,39056
 cognite_toolkit/_cdf_tk/apps/_landing_app.py,sha256=HxzSln3fJXs5NzulfQGUMropXcwMobUYpyePrCrQTQs,1502
 cognite_toolkit/_cdf_tk/apps/_migrate_app.py,sha256=g4S_53kbIgk57ziPLdRMuR6xUe434gkMqa69VmVm5Vg,39619
@@ -24,8 +24,8 @@ cognite_toolkit/_cdf_tk/apps/_modules_app.py,sha256=95_H2zccRJl2mWn0oQ5mjCaEDnG6
 cognite_toolkit/_cdf_tk/apps/_profile_app.py,sha256=vSRJW54bEvIul8_4rOqyOYA7ztXx7TFOvZRZWZTxMbg,7007
 cognite_toolkit/_cdf_tk/apps/_purge.py,sha256=e8IgDK2Fib2u30l71Q2trbJ1az90zSLWr5TViTINmL0,15415
 cognite_toolkit/_cdf_tk/apps/_repo_app.py,sha256=jOf_s7oUWJqnRyz89JFiSzT2l8GlyQ7wqidHUQavGo0,1455
-cognite_toolkit/_cdf_tk/apps/_run.py,sha256=nJtIu1hG79MgTIH63FovftczlJHMztLk5Y1Z6u4OzSE,8502
-cognite_toolkit/_cdf_tk/apps/_upload_app.py,sha256=OfXRUEoqCWFaZTb-KzuZrVdrAZ_f4DR4Wm1Votbs2W8,2146
+cognite_toolkit/_cdf_tk/apps/_run.py,sha256=9tn3o9iWtCP85KcLmnytIaIB_cj1EegtEm51r85Sl44,9082
+cognite_toolkit/_cdf_tk/apps/_upload_app.py,sha256=LPv3iQJTMDo2cq4Ev26DGguqPd3LjySw9FXrG1iRGU0,3942
 cognite_toolkit/_cdf_tk/builders/__init__.py,sha256=Y-AJ4VrcUCRquGNEgDCiwmWW3iGWnJl2DrL17gsUIBg,1172
 cognite_toolkit/_cdf_tk/builders/_base.py,sha256=N32Y17hfepp45rMW_o4qeUY9nsysmtcxpX4GkF-tsio,7829
 cognite_toolkit/_cdf_tk/builders/_datamodels.py,sha256=hN3fWQAktrWdaGAItZ0tHpBXqJDu0JfH6t7pO7EIl2Q,3541
@@ -74,7 +74,7 @@ cognite_toolkit/_cdf_tk/client/data_classes/__init__.py,sha256=47DEQpj8HBSa-_TIm
 cognite_toolkit/_cdf_tk/client/data_classes/api_classes.py,sha256=X-aGFnYzSxXYDxlFP2rqJ8P10Um7bcRRUZxVVzblYBw,477
 cognite_toolkit/_cdf_tk/client/data_classes/apm_config_v1.py,sha256=0bPq7R0qvdf8SMFS06kX7TXHIClDcJNHwdTBweQB-GU,20150
 cognite_toolkit/_cdf_tk/client/data_classes/base.py,sha256=QG4S0HlByMB6zwxUXWaVHwP-DrA2Y97XGN_o6QsL6FY,2776
-cognite_toolkit/_cdf_tk/client/data_classes/canvas.py,sha256=1yOSXkARz6QgIUnNryRy1UbV62dPAxE9qu5jfpOmPGE,48618
+cognite_toolkit/_cdf_tk/client/data_classes/canvas.py,sha256=DrE-7HOLnk1ELhydySsEhw-VOjriUqB_zzon5qb7CDk,50721
 cognite_toolkit/_cdf_tk/client/data_classes/capabilities.py,sha256=muqpAC2JLCFcEpRPzuh_3sS3o_q42WFyfsGzl-LfB_U,8773
 cognite_toolkit/_cdf_tk/client/data_classes/charts.py,sha256=l4LM1eqn8_2lRzw-DdwwL0zxgSczC0lp1LjgW-4wqPI,3770
 cognite_toolkit/_cdf_tk/client/data_classes/charts_data.py,sha256=Zcx3st3bMJE2aa5U6TepDqRzqf-LuTTWW5grSaVGr9E,12244
@@ -112,10 +112,10 @@ cognite_toolkit/_cdf_tk/commands/_upload.py,sha256=g4DIgBv6chsa10KpIS3uxjCSZKE5H
 cognite_toolkit/_cdf_tk/commands/_utils.py,sha256=UxMJW5QYKts4om5n6x2Tq2ihvfO9gWjhQKeqZNFTlKg,402
 cognite_toolkit/_cdf_tk/commands/_virtual_env.py,sha256=GFAid4hplixmj9_HkcXqU5yCLj-fTXm4cloGD6U2swY,2180
 cognite_toolkit/_cdf_tk/commands/auth.py,sha256=PLjfxfJJKaqux1eB2fycIRlwwSMCbM3qxWDnFX-blJU,31720
-cognite_toolkit/_cdf_tk/commands/build_cmd.py,sha256=k2_BhmTJRXuB640-g4hFsN2tD58b-aujk6kFn400qsc,30516
+cognite_toolkit/_cdf_tk/commands/build_cmd.py,sha256=ppaSstd4zd5ZLcwwU9ueg3kH6MflxOL7DXnDuGAcbcY,31007
 cognite_toolkit/_cdf_tk/commands/clean.py,sha256=KDcUn1MEpvk_K7WqQPBiZcIlGV61JVG6D0DcYUXj7BM,16567
 cognite_toolkit/_cdf_tk/commands/collect.py,sha256=zBMKhhvjOpuASMnwP0eeHRI02tANcvFEZgv0CQO1ECc,627
-cognite_toolkit/_cdf_tk/commands/deploy.py,sha256=R185y7oFr3yhh10RSPE81dpYX346ghVYOrVEF-JKaaI,23020
+cognite_toolkit/_cdf_tk/commands/deploy.py,sha256=YV_GcD5bbELlXMixoVoCA2W4mcwHej_6jvb9J8JBQd0,23589
 cognite_toolkit/_cdf_tk/commands/dump_data.py,sha256=8l4M2kqV4DjiV5js5s7EbFVNxV0Np4ld8ogw19vaJp0,21804
 cognite_toolkit/_cdf_tk/commands/dump_resource.py,sha256=ylAFST3GgkWT1Qa-JIzmQXbrQgNCB1UrptrBf3WsyvY,39658
 cognite_toolkit/_cdf_tk/commands/featureflag.py,sha256=lgLMwuNIwFjvvKn1sNMunkq4VTwdNqXtrZfdGFTrNcI,968
@@ -137,7 +137,7 @@ cognite_toolkit/_cdf_tk/commands/_migrate/issues.py,sha256=L2-kODPavEwcuhte7EXAN
 cognite_toolkit/_cdf_tk/commands/_migrate/migration_io.py,sha256=wrdBH5P6NgiZQSYLR0iJ3ZvqfQ5fY-_Ne2yKv9E1g4o,16277
 cognite_toolkit/_cdf_tk/commands/_migrate/prepare.py,sha256=RfqaNoso5CyBwc-p6ckwcYqBfZXKhdJgdGIyd0TATaI,2635
 cognite_toolkit/_cdf_tk/commands/_migrate/selectors.py,sha256=N1H_-rBpPUD6pbrlcofn1uEK1bA694EUXEe1zIXeqyo,2489
-cognite_toolkit/_cdf_tk/cruds/__init__.py,sha256=kxiB8gZo0Y4TyttWHGTLPCW5R1DUkN1uTZewTvaZRjo,6298
+cognite_toolkit/_cdf_tk/cruds/__init__.py,sha256=JLi1k2C2YitmV-Ez-TKcvTHnCnXDHMZSllh5iPwQ1KE,6474
 cognite_toolkit/_cdf_tk/cruds/_base_cruds.py,sha256=3ExMHowKi9jV-EwfKL1jfeSfQLM59z8jZAGq_wJb5Jc,20088
 cognite_toolkit/_cdf_tk/cruds/_data_cruds.py,sha256=PacTXdXaw0sf38tM6_DgNXVYdZXf_J90ZUeLk5v2VRg,9071
 cognite_toolkit/_cdf_tk/cruds/_worker.py,sha256=XdLm6DMFln9DqDgEbeqzepw9WRSXx7WdChbDtmOc89Q,9358
@@ -147,7 +147,7 @@ cognite_toolkit/_cdf_tk/cruds/_resource_cruds/auth.py,sha256=iGG2_btpEqip3o6OKpc
 cognite_toolkit/_cdf_tk/cruds/_resource_cruds/classic.py,sha256=7RdiWvh6MLI1lLmt3gcqDQj61xbwREhsvoyjFuJn2F0,26402
 cognite_toolkit/_cdf_tk/cruds/_resource_cruds/configuration.py,sha256=KrL7bj8q5q18mGB2V-NDkW5U5nfseZOyorXiUbp2uLw,6100
 cognite_toolkit/_cdf_tk/cruds/_resource_cruds/data_organization.py,sha256=iXn9iAtwA8mhH-7j9GF-MlLomTcaw3GhEbFY28Wx0iA,9927
-cognite_toolkit/_cdf_tk/cruds/_resource_cruds/datamodel.py,sha256=XaVUjYKfa2ceOicAgE_mPknMdQm_ldwiaNIs3wWjFA0,65823
+cognite_toolkit/_cdf_tk/cruds/_resource_cruds/datamodel.py,sha256=kX5psba0lUlvKKabstJWxM8eZsHDD7rTR_FOkHBukBE,65837
 cognite_toolkit/_cdf_tk/cruds/_resource_cruds/extraction_pipeline.py,sha256=zv36HPO9goRmU3NM_i1wOvWQEdsgpQTI4bcAl-eis1g,18232
 cognite_toolkit/_cdf_tk/cruds/_resource_cruds/fieldops.py,sha256=SnQMbxiZ3SSYkTLXQ_vIu2HVf_WyD1jplNRJuoeOUfA,16723
 cognite_toolkit/_cdf_tk/cruds/_resource_cruds/file.py,sha256=F3n2FOWAPder4z3OTYs81VB-6C6r3oUzJsHvigdhaD0,15500
@@ -240,7 +240,7 @@ cognite_toolkit/_cdf_tk/resource_classes/robotics/location.py,sha256=dbc9HT-bc2Q
 cognite_toolkit/_cdf_tk/resource_classes/robotics/map.py,sha256=j77z7CzCMiMj8r94BdUKCum9EuZRUjaSlUAy9K9DL_Q,942
 cognite_toolkit/_cdf_tk/storageio/__init__.py,sha256=T2PzfD2Tf5khE0cmSDLcqTlRy9YEKTU-raKePIFSMNQ,1910
 cognite_toolkit/_cdf_tk/storageio/_annotations.py,sha256=JI_g18_Y9S7pbc9gm6dZMyo3Z-bCndJXF9C2lOva0bQ,4848
-cognite_toolkit/_cdf_tk/storageio/_applications.py,sha256=CdqJueM9ZmXVh8RUme2lAgNasjAM8QTQDAfeJMm2ZYo,7026
+cognite_toolkit/_cdf_tk/storageio/_applications.py,sha256=TuhO5d465RG_maukaAazXi7P7upiJeSofxXrf9guJQE,15113
 cognite_toolkit/_cdf_tk/storageio/_asset_centric.py,sha256=mRwcVvBzUES21zNb-mDH7XqZWN37p4GUs0JRx7lbRyw,32817
 cognite_toolkit/_cdf_tk/storageio/_base.py,sha256=cllSyg3rRGov_X45CoJ_isXhz0cU9Mt7OyV7_t_SeWw,12156
 cognite_toolkit/_cdf_tk/storageio/_data_classes.py,sha256=s3TH04BJ1q7rXndRhEbVMEnoOXjxrGg4n-w9Z5uUL-o,3480
@@ -248,10 +248,10 @@ cognite_toolkit/_cdf_tk/storageio/_datapoints.py,sha256=AGTQm9CBRbu1oXbBh0X7UGzF
 cognite_toolkit/_cdf_tk/storageio/_file_content.py,sha256=HKf3Dg3PMH_QBbPrMhpC75H74laDRVx9R0KiEGKXikI,6103
 cognite_toolkit/_cdf_tk/storageio/_instances.py,sha256=t9fNpHnT6kCk8LDoPj3qZXmHpyDbPF5BZ6pI8ziTyFw,10810
 cognite_toolkit/_cdf_tk/storageio/_raw.py,sha256=5WjAFiVR0KKRhMqCy1IRy1TQFWj86D7nGu5WSFNLp6U,3869
-cognite_toolkit/_cdf_tk/storageio/selectors/__init__.py,sha256=pUQE6xze0z1N8RhWkFj5Kea64UOWKO_qM3qSbEy5OCA,2074
+cognite_toolkit/_cdf_tk/storageio/selectors/__init__.py,sha256=h7fpasWnxINhwe5prJ_ZhxJw-aPQcOvPqlI_1oHmfI8,2163
 cognite_toolkit/_cdf_tk/storageio/selectors/_asset_centric.py,sha256=7Iv_ccVX6Vzt3ZLFZ0Er3hN92iEsFTm9wgF-yermOWE,1467
 cognite_toolkit/_cdf_tk/storageio/selectors/_base.py,sha256=hjFkbmNGsK3QIW-jnJV_8YNmvVROERxzG82qIZhU7SM,3065
-cognite_toolkit/_cdf_tk/storageio/selectors/_canvas.py,sha256=fs0i5rI13x6IStOPFQ3E-n8ey1eoV_QORD1-RtPF4A4,182
+cognite_toolkit/_cdf_tk/storageio/selectors/_canvas.py,sha256=E9S-wr-JUqRosI_2cSCfR0tF8MdIFTrMxDItuWRcuO4,597
 cognite_toolkit/_cdf_tk/storageio/selectors/_charts.py,sha256=lQHuNtF3i6SEIMPAlziMm0QlqRcvZJ7MKIug6HMTDrs,1012
 cognite_toolkit/_cdf_tk/storageio/selectors/_datapoints.py,sha256=EHVkWJYJ_HCs2i4Ur6Fj98UwuDvf67u0HOzrJXAHNt0,1719
 cognite_toolkit/_cdf_tk/storageio/selectors/_file_content.py,sha256=bDcU0Unbb_qG6z004aKTKgeAVhRnFQ4mz-rjNuouXu4,2881
@@ -302,13 +302,13 @@ cognite_toolkit/_repo_files/.gitignore,sha256=ip9kf9tcC5OguF4YF4JFEApnKYw0nG0vPi
 cognite_toolkit/_repo_files/AzureDevOps/.devops/README.md,sha256=OLA0D7yCX2tACpzvkA0IfkgQ4_swSd-OlJ1tYcTBpsA,240
 cognite_toolkit/_repo_files/AzureDevOps/.devops/deploy-pipeline.yml,sha256=brULcs8joAeBC_w_aoWjDDUHs3JheLMIR9ajPUK96nc,693
 cognite_toolkit/_repo_files/AzureDevOps/.devops/dry-run-pipeline.yml,sha256=OBFDhFWK1mlT4Dc6mDUE2Es834l8sAlYG50-5RxRtHk,723
-cognite_toolkit/_repo_files/GitHub/.github/workflows/deploy.yaml,sha256=LlS9ma4kuTtppYQwCFL5pBw_ZJ1fldSwCoC6LO9am-c,668
-cognite_toolkit/_repo_files/GitHub/.github/workflows/dry-run.yaml,sha256=vYjDXyC529ScKEi4OH5L8RnRH5RzIuyrt1Ki5z4DpKE,2431
-cognite_toolkit/_resources/cdf.toml,sha256=cI4FFAswvHyeVPN-uZQkvhju8mbd-yFZQ4jagNwGG-M,488
+cognite_toolkit/_repo_files/GitHub/.github/workflows/deploy.yaml,sha256=PjN9SjPDdv1gpMbLk4BENfZSsfvk1FcYm09Wi-GGoR0,668
+cognite_toolkit/_repo_files/GitHub/.github/workflows/dry-run.yaml,sha256=7tIIyJNaWWVKWPUs6s4oSpsBBs14c1UzOSy-VpOn638,2431
+cognite_toolkit/_resources/cdf.toml,sha256=QLuQRCrDWpi6Z_YIAkV9LySofdxFW86-2YztdKmxUZw,488
 cognite_toolkit/demo/__init__.py,sha256=-m1JoUiwRhNCL18eJ6t7fZOL7RPfowhCuqhYFtLgrss,72
 cognite_toolkit/demo/_base.py,sha256=6xKBUQpXZXGQ3fJ5f7nj7oT0s2n7OTAGIa17ZlKHZ5U,8052
-cognite_toolkit-0.6.113.dist-info/METADATA,sha256=suhsfAM6ZMpOe4Ahq4rdh8jC01qoKdTY-ocRlfr5qag,4502
-cognite_toolkit-0.6.113.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cognite_toolkit-0.6.113.dist-info/entry_points.txt,sha256=JlR7MH1_UMogC3QOyN4-1l36VbrCX9xUdQoHGkuJ6-4,83
-cognite_toolkit-0.6.113.dist-info/licenses/LICENSE,sha256=CW0DRcx5tL-pCxLEN7ts2S9g2sLRAsWgHVEX4SN9_Mc,752
-cognite_toolkit-0.6.113.dist-info/RECORD,,
+cognite_toolkit-0.6.115.dist-info/METADATA,sha256=F2AdvNhKV2uNNLV94cAmf1rq0Bj_huntJkH2OuoUqBQ,4502
+cognite_toolkit-0.6.115.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cognite_toolkit-0.6.115.dist-info/entry_points.txt,sha256=JlR7MH1_UMogC3QOyN4-1l36VbrCX9xUdQoHGkuJ6-4,83
+cognite_toolkit-0.6.115.dist-info/licenses/LICENSE,sha256=CW0DRcx5tL-pCxLEN7ts2S9g2sLRAsWgHVEX4SN9_Mc,752
+cognite_toolkit-0.6.115.dist-info/RECORD,,