PyPI - cognite-toolkit - Versions diffs - 0.6.117__tar.gz → 0.6.118__tar.gz - Mend

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite_toolkit
-Version: 0.6.117
+Version: 0.6.118
 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

@@ -33,7 +33,7 @@ dev = true
 [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.117"
+version = "0.6.118"
 [library.toolkit-data]

@@ -8,6 +8,7 @@ from cognite_toolkit._cdf_tk.client.data_classes.charts import Chart, ChartList,
 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.http_client import HTTPClient, HTTPMessage, SimpleBodyRequest
 from cognite_toolkit._cdf_tk.utils.useful_types import JsonVal
 from ._base import Page, UploadableStorageIO, UploadItem
@@ -159,6 +160,28 @@ class CanvasIO(UploadableStorageIO[CanvasSelector, IndustrialCanvas, IndustrialC
             raise ToolkitNotImplementedError(f"Unsupported selector type {type(selector).__name__!r} for CanvasIO")
         return len(selector.external_ids)
+    def upload_items(
+        self,
+        data_chunk: Sequence[UploadItem[IndustrialCanvasApply]],
+        http_client: HTTPClient,
+        selector: CanvasSelector | None = None,
+    ) -> Sequence[HTTPMessage]:
+        config = http_client.config
+        results: list[HTTPMessage] = []
+        for item in data_chunk:
+            instances = item.item.as_instances()
+            responses = http_client.request_with_retries(
+                message=SimpleBodyRequest(
+                    endpoint_url=config.create_api_url("/models/instances"),
+                    method="POST",
+                    # MyPy does not understand that .dump is valid json
+                    body_content={"items": [instance.dump() for instance in instances]},
+                )
+            )
+            results.extend(responses.as_item_responses(item.source_id))
+        return results
     def data_to_json_chunk(
         self, data_chunk: Sequence[IndustrialCanvas], selector: CanvasSelector | None = None
     ) -> list[dict[str, JsonVal]]:

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

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

@@ -0,0 +1,5 @@
+## Changelog
+### Added
+- [alpha] The upload command, `cdf data upload` now support canvas.

@@ -0,0 +1,19 @@
+[CDF-24746] 🧑‍🎨Upload canvas (#2227)
+# Description
+<img width="908" height="701" alt="image"
+src="https://github.com/user-attachments/assets/c6e17dea-6ed3-4ca3-9460-3487df75ff79"
+/>
+## Bump
+- [x] Patch
+- [ ] Skip
+## Changelog
+### Added
+- [alpha] The upload command, `cdf data upload` now support canvas.

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

@@ -0,0 +1,108 @@
+from typing import Any
+import pytest
+from cognite.client.data_classes import DataSet, Event, EventWrite
+from cognite_toolkit._cdf_tk.client import ToolkitClient
+from cognite_toolkit._cdf_tk.storageio import CanvasIO
+from cognite_toolkit._cdf_tk.utils import humanize_collection
+from cognite_toolkit._cdf_tk.utils.http_client import HTTPClient, SuccessResponse
+@pytest.fixture
+def canvas_event(toolkit_client: ToolkitClient, toolkit_dataset: DataSet) -> Event:
+    event = EventWrite(
+        external_id="canvas_event_integration_test",
+        start_time=1_600_000_000_000,
+        end_time=1_600_000_360_000,
+        data_set_id=toolkit_dataset.id,
+        description="Integration test event for canvas",
+        type="canvas_test_event",
+        subtype="canvas_test_event",
+    )
+    if existing := toolkit_client.events.retrieve(external_id=event.external_id):
+        return existing
+    created_event = toolkit_client.events.create(event)
+    return created_event
+@pytest.fixture
+def canvas_raw_data(canvas_event: Event) -> dict[str, Any]:
+    user_id = "ndTFZh9K9-m2W9WBKc30-Q"
+    canvas_id = "70c66b27-c16e-4f6c-bc1e-940f086ec2f7"
+    event_ref = "167ab784-9f33-4130-831e-91d820359ce9"
+    return {
+        "canvas": {
+            "externalId": canvas_id,
+            "instanceType": "node",
+            "space": "IndustrialCanvasInstanceSpace",
+            "sources": [
+                {
+                    "source": {
+                        "space": "cdf_industrial_canvas",
+                        "externalId": "Canvas",
+                        "version": "v7",
+                        "type": "view",
+                    },
+                    "properties": {
+                        "createdBy": user_id,
+                        "isLocked": None,
+                        "visibility": "public",
+                        "sourceCanvasId": None,
+                        "isArchived": None,
+                        "context": [{"type": "FILTERS", "payload": {"filters": []}}],
+                        "name": "Toolkit Integration Test Canvas",
+                        "solutionTags": None,
+                        "updatedAt": "2025-11-23T08:09:13.183+00:00",
+                        "updatedBy": user_id,
+                    },
+                }
+            ],
+        },
+        "containerReferences": [
+            {
+                "externalId": f"{canvas_id}_{event_ref}",
+                "instanceType": "node",
+                "space": "IndustrialCanvasInstanceSpace",
+                "sources": [
+                    {
+                        "source": {
+                            "space": "cdf_industrial_canvas",
+                            "externalId": "ContainerReference",
+                            "version": "v2",
+                            "type": "view",
+                        },
+                        "properties": {
+                            "chartsId": None,
+                            "containerReferenceType": "event",
+                            "height": 500,
+                            "id": event_ref,
+                            "label": "canvas_test_event: canvas_event_integration_test",
+                            "properties": {"zIndex": 0, "unscaledWidth": 600, "unscaledHeight": 500},
+                            "maxHeight": None,
+                            "maxWidth": None,
+                            "resourceExternalId": canvas_event.external_id,
+                            "resourceSubId": None,
+                            "width": 600,
+                            "x": -10,
+                            "y": 418,
+                        },
+                    }
+                ],
+            },
+        ],
+    }
+class TestCanvasIO:
+    def test_upload_canvas(self, toolkit_client: ToolkitClient, canvas_raw_data: dict[str, Any]) -> None:
+        io = CanvasIO(toolkit_client)
+        upload_items = io.json_chunk_to_data([("canvas_data.json", canvas_raw_data)])
+        assert len(upload_items) == 1
+        with HTTPClient(toolkit_client.config) as http_client:
+            upload_result = io.upload_items(upload_items, http_client)
+        not_success = [message for message in upload_result if not isinstance(message, SuccessResponse)]
+        assert len(not_success) == 0, f"Some canvas items failed to upload: {humanize_collection(not_success)}"

@@ -272,7 +272,7 @@ wheels = [
 [[package]]
 name = "cognite-toolkit"
-version = "0.6.117"
+version = "0.6.118"
 source = { editable = "." }
 dependencies = [
     { name = "cognite-sdk" },

@@ -1,6 +0,0 @@
-## Changelog
-### Added
-- [alpha] The command `cdf data upload dir` now supports uploading a
-data modeling file.

	@@ -1 +0,0 @@
1	- 0.6.116

cognite-toolkit 0.6.117__tar.gz → 0.6.118__tar.gz

cognite-toolkit 0.6.117tar.gz → 0.6.118tar.gz