cognite-toolkit 0.5.65__tar.gz → 0.5.66__tar.gz

{cognite_toolkit-0.5.65 → cognite_toolkit-0.5.66}/.pre-commit-config.yaml

@@ -20,7 +20,7 @@ repos:
     rev: v0.9.6
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.44.0
+    rev: v0.45.0
     hooks:
     - id: markdownlint
 

{cognite_toolkit-0.5.65 → cognite_toolkit-0.5.66}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite_toolkit
-Version: 0.5.65
+Version: 0.5.66
 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.5.65 → cognite_toolkit-0.5.66}/cdf.toml

@@ -25,4 +25,4 @@ dump = 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.5.65"
+version = "0.5.66"

{cognite_toolkit-0.5.65 → cognite_toolkit-0.5.66}/cognite_toolkit/_builtin_modules/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.5.65"
+version = "0.5.66"
 
 
 [plugins]

{cognite_toolkit-0.5.65 → cognite_toolkit-0.5.66}/cognite_toolkit/_cdf_tk/client/api/extended_data_modeling.py

@@ -9,7 +9,7 @@ from cognite.client._api.data_modeling.instances import InstancesAPI
 from cognite.client._api_client import T
 from cognite.client._cognite_client import ClientConfig, CogniteClient
 from cognite.client._http_client import HTTPClient, HTTPClientConfig, get_global_requests_session
-from cognite.client.data_classes.data_modeling import InstanceApply
+from cognite.client.data_classes.data_modeling import EdgeId, InstanceApply, NodeId
 from cognite.client.exceptions import CogniteConnectionError, CogniteReadTimeout
 from cognite.client.utils import _json
 from cognite.client.utils._concurrency import execute_tasks
@@ -97,9 +97,15 @@ class ExtendedInstancesAPI(InstancesAPI):
             executor=ToolkitConcurrencySettings.get_data_modeling_write_executor(),
         )
 
-        def unwrap_element(el: T) -> InstanceApply | T:
+        def unwrap_element(el: T) -> InstanceApply | NodeId | EdgeId | T:
             if isinstance(el, dict):
-                return type(items[0])._load(el, cognite_client=self._cognite_client)
+                instance_type = el.get("instanceType")
+                if instance_type == "node":
+                    return NodeId.load(el)
+                elif instance_type == "edge":
+                    return EdgeId.load(el)
+                else:
+                    return InstanceApply._load(el)
             else:
                 return el
 

{cognite_toolkit-0.5.65 → cognite_toolkit-0.5.66}/cognite_toolkit/_cdf_tk/data_classes/_built_modules.py

@@ -96,7 +96,7 @@ class BuiltModuleList(list, MutableSequence[BuiltModule]):
             resources = (
                 resource
                 for resource in resources
-                if (resource.source.path == selected or resource.source.path.is_relative_to(selected))
+                if (resource.source.path == selected or resource.source.path.is_relative_to(selected.absolute()))
             )
         if is_supported_file:
             # This is necessary as the destination file can be created from a source file that is not supported.

{cognite_toolkit-0.5.65 → cognite_toolkit-0.5.66}/cognite_toolkit/_repo_files/GitHub/.github/workflows/deploy.yaml

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

{cognite_toolkit-0.5.65 → cognite_toolkit-0.5.66}/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.5.65
+      image: cognite/toolkit:0.5.66
       env:
         CDF_CLUSTER: ${{ vars.CDF_CLUSTER }}
         CDF_PROJECT: ${{ vars.CDF_PROJECT }}

cognite_toolkit-0.5.66/cognite_toolkit/_version.py

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

cognite_toolkit-0.5.66/last_changelog_entry.md

@@ -0,0 +1,10 @@
+## cdf 
+
+### Fixed
+
+- The `cdf module pull <path>` no longer skips resources when the given
+path is relative.
+
+## templates
+
+No changes.

cognite_toolkit-0.5.66/last_git_message.txt

@@ -0,0 +1,30 @@
+[CDF-25127] 🐛Relative path in cdf modules pull (#1680)
+
+# Description
+
+**Context** In Toolkit, we have a command `cdf modules pull` that allows
+you to 'pull' configuration from CDF down to local configurations. For
+example, I have a transformations which I have changed in the fusion UI,
+and I want to update the SQL from the transformation. I can do this with
+the command `cdf modules pull
+modules/my_module/transformations/my_local_config.Transformation.yaml`.
+
+Giving a relative path would skip the selection of the resources and it
+would not be pulled.
+
+## Changelog
+
+- [x] Patch
+- [ ] Minor
+- [ ] Skip
+
+## cdf
+
+### Fixed
+
+- The `cdf module pull <path>` no longer skips resources when the given
+path is relative.
+
+## templates
+
+No changes.

cognite_toolkit-0.5.66/last_version.txt

@@ -0,0 +1 @@
+0.5.65

{cognite_toolkit-0.5.65 → cognite_toolkit-0.5.66}/pyproject.toml

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

{cognite_toolkit-0.5.65 → cognite_toolkit-0.5.66}/tests/auth_utils.py

@@ -88,7 +88,7 @@ class EnvironmentVariables:
     LOGIN_FLOW: _LOGIN_FLOW = "infer"
     IDP_CLIENT_ID: str | None = None
     IDP_CLIENT_SECRET: str | None = None
-    TOKEN: str | None = None
+    CDF_TOKEN: str | None = None
 
     IDP_TENANT_ID: str | None = None
     IDP_TOKEN_URL: str | None = None
@@ -150,7 +150,7 @@ class EnvironmentVariables:
             LOGIN_FLOW=os.environ.get("LOGIN_FLOW", "infer"),  # type: ignore[arg-type]
             IDP_CLIENT_ID=os.environ.get("IDP_CLIENT_ID"),
             IDP_CLIENT_SECRET=os.environ.get("IDP_CLIENT_SECRET"),
-            TOKEN=os.environ.get("TOKEN"),
+            CDF_TOKEN=os.environ.get("CDF_TOKEN"),
             CDF_URL=os.environ.get("CDF_URL"),
             IDP_TOKEN_URL=os.environ.get("IDP_TOKEN_URL"),
             IDP_TENANT_ID=os.environ.get("IDP_TENANT_ID"),
@@ -223,9 +223,9 @@ class EnvironmentVariables:
         )
 
     def get_token(self) -> Token:
-        if not self.TOKEN:
+        if not self.CDF_TOKEN:
             raise KeyError("TOKEN must be set in the environment", "TOKEN")
-        return Token(self.TOKEN)
+        return Token(self.CDF_TOKEN)
 
     def get_client(self, enable_set_pending_ids: bool = False) -> ToolkitClient:
         config = ToolkitClientConfig(
@@ -290,7 +290,7 @@ def _prompt_user() -> EnvironmentVariables:
     variables.LOGIN_FLOW = login_flow  # type: ignore[assignment]
     if login_flow == "token":
         token = Prompt.ask("Enter token")
-        variables.TOKEN = token
+        variables.CDF_TOKEN = token
         return variables
 
     variables.IDP_CLIENT_ID = Prompt.ask("Enter IDP Client ID")

{cognite_toolkit-0.5.65 → cognite_toolkit-0.5.66}/tests/data/build_group_with_unknown_acl/_build_environment.yaml

@@ -4,4 +4,4 @@ project: pytest-project
 type: dev
 selected:
 - modules
-cdf_toolkit_version: 0.5.65
+cdf_toolkit_version: 0.5.66

{cognite_toolkit-0.5.65 → cognite_toolkit-0.5.66}/tests/test_unit/test_cdf_tk/test_client/test_instances.py

@@ -4,7 +4,11 @@ import socket
 import pytest
 import responses
 from cognite.client.data_classes.data_modeling import NodeApply, NodeOrEdgeData, ViewId
-from cognite.client.data_classes.data_modeling.cdm.v1 import CogniteTimeSeriesApply
+from cognite.client.data_classes.data_modeling.cdm.v1 import (
+    CogniteAnnotationApply,
+    CogniteAssetApply,
+    CogniteTimeSeriesApply,
+)
 from cognite.client.exceptions import CogniteAPIError, CogniteConnectionError, CogniteReadTimeout
 
 from cognite_toolkit._cdf_tk.client import ToolkitClient, ToolkitClientConfig
@@ -21,6 +25,46 @@ def some_timeseries() -> CogniteTimeSeriesApply:
 
 
 class TestInstances:
+    def test_apply_fast_failed_multiple_types(self, toolkit_config) -> None:
+        different_instance_types = [
+            CogniteTimeSeriesApply(
+                space="some_space",
+                external_id="test_time_series",
+                is_step=False,
+                time_series_type="numeric",
+            ),
+            CogniteAssetApply(
+                space="some_space",
+                external_id="test_asset",
+                name="Test Asset",
+            ),
+            CogniteAnnotationApply(
+                space="some_space",
+                external_id="test_annotation",
+                type=("some_space", "entity.match"),
+                start_node=("some_space", "test_asset"),
+                end_node=("some_space", "test_asset"),
+                name="Test Annotation",
+            ),
+        ]
+        url = f"{toolkit_config.base_url}/api/v1/projects/test-project/models/instances"
+        with responses.RequestsMock() as rsps:
+            rsps.add(
+                responses.POST,
+                url,
+                status=400,
+                json={"error": "Invalid request", "message": "the message"},
+            )
+            client = ToolkitClient(config=toolkit_config)
+            with pytest.raises(CogniteAPIError) as exc_info:
+                _ = client.data_modeling.instances.apply_fast(different_instance_types)
+
+        error = exc_info.value
+        assert isinstance(error, CogniteAPIError)
+        assert error.code == 400
+        assert error.message == "Invalid request"
+        assert error.failed == [instance.as_id() for instance in different_instance_types]
+
     @pytest.mark.usefixtures("disable_gzip")
     def test_apply_fast_429_status_split(self, toolkit_config: ToolkitClientConfig) -> None:
         instances = [

{cognite_toolkit-0.5.65 → cognite_toolkit-0.5.66}/tests/test_unit/test_cli/test_behavior.py

@@ -31,6 +31,7 @@ from cognite_toolkit._cdf_tk.data_classes import BuildConfigYAML, Environment
 from cognite_toolkit._cdf_tk.exceptions import ToolkitDuplicatedModuleError
 from cognite_toolkit._cdf_tk.loaders import RESOURCE_LOADER_LIST
 from cognite_toolkit._cdf_tk.utils.auth import EnvironmentVariables
+from tests.constants import chdir
 from tests.data import (
     BUILD_GROUP_WITH_UNKNOWN_ACL,
     COMPLETE_ORG_ONLY_IDENTIFIER,
@@ -134,6 +135,33 @@ def test_pull_dataset(
     assert reloaded.description == "New description"
 
 
+def test_pull_dataset_relative_path(
+    build_tmp_path: Path,
+    toolkit_client_approval: ApprovalToolkitClient,
+    env_vars_with_client: EnvironmentVariables,
+    organization_dir_mutable: Path,
+) -> None:
+    # Loading a selected dataset to be pulled
+    dataset_yaml = organization_dir_mutable / MODULES / "cdf_common" / "data_sets" / "demo.DataSet.yaml"
+    dataset = DataSet.load(dataset_yaml.read_text().replace("{{ dataset }}", "ingestion"))
+    dataset.description = "New description"
+    toolkit_client_approval.append(DataSet, dataset)
+
+    with chdir(organization_dir_mutable):
+        cmd = PullCommand(silent=True)
+        cmd.pull_module(
+            module_name_or_path=f"{MODULES}/cdf_common/data_sets/demo.DataSet.yaml",
+            organization_dir=organization_dir_mutable,
+            env="dev",
+            dry_run=False,
+            verbose=False,
+            env_vars=env_vars_with_client,
+        )
+
+    reloaded = DataSet.load(dataset_yaml.read_text().replace("{{ dataset }}", "ingestion"))
+    assert reloaded.description == "New description"
+
+
 def test_pull_transformation_sql(
     build_tmp_path: Path,
     toolkit_client_approval: ApprovalToolkitClient,

{cognite_toolkit-0.5.65 → cognite_toolkit-0.5.66}/uv.lock

@@ -192,7 +192,7 @@ wheels = [
 
 [[package]]
 name = "cognite-toolkit"
-version = "0.5.65"
+version = "0.5.66"
 source = { editable = "." }
 dependencies = [
     { name = "cognite-sdk" },

cognite_toolkit-0.5.65/cognite_toolkit/_version.py

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

cognite_toolkit-0.5.65/last_changelog_entry.md

@@ -1,10 +0,0 @@
-## cdf 
-
-### Added
-
-- [alpha] New command `cdf migrate assets` for moving asset-centric
-assets to CogniteAssets.
- 
-## templates
-
-No changes.

cognite_toolkit-0.5.65/last_git_message.txt

@@ -1,30 +0,0 @@
-[CDF-25015] 🏭 Migrate assets (#1649)
-
-# Description
-
-<del>Stacked on #1644, #1645, #1643</del>
-
-This introduces a command for migration of assets. This creates the
-CogniteAssets, but it also populates the mapping view which can then be
-used in later migrations of Charts, Canvas, 3D, annotaions, Infield, etc
-
-
-![image](https://github.com/user-attachments/assets/52f54793-364f-4d59-a9df-b58550bbbb27)
-
-
-## Changelog
-
-- [x] Patch
-- [ ] Minor
-- [ ] Skip
-
-## cdf
-
-### Added
-
-- [alpha] New command `cdf migrate assets` for moving asset-centric
-assets to CogniteAssets.
- 
-## templates
-
-No changes.

cognite_toolkit-0.5.65/last_version.txt

@@ -1 +0,0 @@
-0.5.64