cognite-toolkit 0.7.40__tar.gz → 0.7.41__tar.gz

{cognite_toolkit-0.7.40 → cognite_toolkit-0.7.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite_toolkit
-Version: 0.7.40
+Version: 0.7.41
 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.40 → cognite_toolkit-0.7.41}/cognite_toolkit/_cdf_tk/client/_toolkit_client.py

@@ -15,6 +15,7 @@ from cognite_toolkit._cdf_tk.client.api.legacy.robotics import RoboticsAPI
 from cognite_toolkit._cdf_tk.client.http_client import HTTPClient
 
 from .api.assets import AssetsAPI
+from .api.events import EventsAPI
 from .api.infield import InfieldAPI
 from .api.lookup import LookUpGroup
 from .api.migration import MigrationAPI
@@ -22,6 +23,7 @@ from .api.project import ProjectAPI
 from .api.search import SearchAPI
 from .api.streams import StreamsAPI
 from .api.three_d import ThreeDAPI
+from .api.timeseries import TimeSeriesAPI
 from .api.token import TokenAPI
 from .api.verify import VerifyAPI
 from .config import ToolkitClientConfig
@@ -34,6 +36,8 @@ class ToolAPI:
         self.http_client = http_client
         self.three_d = ThreeDAPI(http_client, console)
         self.assets = AssetsAPI(http_client)
+        self.time_series = TimeSeriesAPI(http_client)
+        self.events = EventsAPI(http_client)
 
 
 class ToolkitClient(CogniteClient):

{cognite_toolkit-0.7.40 → cognite_toolkit-0.7.41}/cognite_toolkit/_cdf_tk/client/api/events.py

@@ -1,4 +1,5 @@
 from collections.abc import Sequence
+from typing import Literal
 
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, PagedResponse, ResponseItems
 from cognite_toolkit._cdf_tk.client.cdf_client.api import Endpoint
@@ -14,8 +15,9 @@ class EventsAPI(CDFResourceAPI[InternalOrExternalId, EventRequest, EventResponse
             method_endpoint_map={
                 "create": Endpoint(method="POST", path="/events", item_limit=1000, concurrency_max_workers=1),
                 "retrieve": Endpoint(method="POST", path="/events/byids", item_limit=1000, concurrency_max_workers=1),
+                "update": Endpoint(method="POST", path="/events/update", item_limit=1000, concurrency_max_workers=1),
                 "delete": Endpoint(method="POST", path="/events/delete", item_limit=1000, concurrency_max_workers=1),
-                "list": Endpoint(method="GET", path="/events", item_limit=1000),
+                "list": Endpoint(method="POST", path="/events/list", item_limit=1000),
             },
         )
 
@@ -25,7 +27,7 @@ class EventsAPI(CDFResourceAPI[InternalOrExternalId, EventRequest, EventResponse
     def _reference_response(self, response: SuccessResponse2) -> ResponseItems[InternalOrExternalId]:
         return ResponseItems[InternalOrExternalId].model_validate_json(response.body)
 
-    def create(self, items: list[EventRequest]) -> list[EventResponse]:
+    def create(self, items: Sequence[EventRequest]) -> list[EventResponse]:
         """Create events in CDF.
 
         Args:
@@ -44,16 +46,32 @@ class EventsAPI(CDFResourceAPI[InternalOrExternalId, EventRequest, EventResponse
         Returns:
             List of retrieved EventResponse objects.
         """
-        return self._request_item_response(items, method="retrieve", params={"ignoreUnknownIds": ignore_unknown_ids})
+        return self._request_item_response(
+            items, method="retrieve", extra_body={"ignoreUnknownIds": ignore_unknown_ids}
+        )
+
+    def update(
+        self, items: Sequence[EventRequest], mode: Literal["patch", "replace"] = "replace"
+    ) -> list[EventResponse]:
+        """Update events in CDF.
+
+        Args:
+            items: List of EventRequest objects to update.
+            mode: Update mode, either "patch" or "replace".
+
+        Returns:
+            List of updated EventResponse objects.
+        """
+        return self._update(items, mode=mode)
 
-    def delete(self, items: list[InternalOrExternalId], ignore_unknown_ids: bool = False) -> None:
+    def delete(self, items: Sequence[InternalOrExternalId], ignore_unknown_ids: bool = False) -> None:
         """Delete events from CDF.
 
         Args:
             items: List of InternalOrExternalId objects to delete.
             ignore_unknown_ids: Whether to ignore unknown IDs.
         """
-        self._request_no_response(items, "delete", params={"ignoreUnknownIds": ignore_unknown_ids})
+        self._request_no_response(items, "delete", extra_body={"ignoreUnknownIds": ignore_unknown_ids})
 
     def iterate(
         self,

{cognite_toolkit-0.7.40 → cognite_toolkit-0.7.41}/cognite_toolkit/_cdf_tk/client/api/timeseries.py

@@ -1,4 +1,5 @@
 from collections.abc import Sequence
+from typing import Literal
 
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, PagedResponse, ResponseItems
 from cognite_toolkit._cdf_tk.client.cdf_client.api import Endpoint
@@ -16,10 +17,13 @@ class TimeSeriesAPI(CDFResourceAPI[InternalOrExternalId, TimeSeriesRequest, Time
                 "retrieve": Endpoint(
                     method="POST", path="/timeseries/byids", item_limit=1000, concurrency_max_workers=1
                 ),
+                "update": Endpoint(
+                    method="POST", path="/timeseries/update", item_limit=1000, concurrency_max_workers=1
+                ),
                 "delete": Endpoint(
                     method="POST", path="/timeseries/delete", item_limit=1000, concurrency_max_workers=1
                 ),
-                "list": Endpoint(method="GET", path="/timeseries", item_limit=1000),
+                "list": Endpoint(method="POST", path="/timeseries/list", item_limit=1000),
             },
         )
 
@@ -29,7 +33,7 @@ class TimeSeriesAPI(CDFResourceAPI[InternalOrExternalId, TimeSeriesRequest, Time
     def _reference_response(self, response: SuccessResponse2) -> ResponseItems[InternalOrExternalId]:
         return ResponseItems[InternalOrExternalId].model_validate_json(response.body)
 
-    def create(self, items: list[TimeSeriesRequest]) -> list[TimeSeriesResponse]:
+    def create(self, items: Sequence[TimeSeriesRequest]) -> list[TimeSeriesResponse]:
         """Create time series in CDF.
 
         Args:
@@ -50,16 +54,32 @@ class TimeSeriesAPI(CDFResourceAPI[InternalOrExternalId, TimeSeriesRequest, Time
         Returns:
             List of retrieved TimeSeriesResponse objects.
         """
-        return self._request_item_response(items, method="retrieve", params={"ignoreUnknownIds": ignore_unknown_ids})
+        return self._request_item_response(
+            items, method="retrieve", extra_body={"ignoreUnknownIds": ignore_unknown_ids}
+        )
+
+    def update(
+        self, items: Sequence[TimeSeriesRequest], mode: Literal["patch", "replace"] = "replace"
+    ) -> list[TimeSeriesResponse]:
+        """Update time series in CDF.
+
+        Args:
+            items: List of TimeSeriesRequest objects to update.
+            mode: Update mode, either "patch" or "replace".
+
+        Returns:
+            List of updated TimeSeriesResponse objects.
+        """
+        return self._update(items, mode=mode)
 
-    def delete(self, items: list[InternalOrExternalId], ignore_unknown_ids: bool = False) -> None:
+    def delete(self, items: Sequence[InternalOrExternalId], ignore_unknown_ids: bool = False) -> None:
         """Delete time series from CDF.
 
         Args:
             items: List of InternalOrExternalId objects to delete.
             ignore_unknown_ids: Whether to ignore unknown IDs.
         """
-        self._request_no_response(items, "delete", params={"ignoreUnknownIds": ignore_unknown_ids})
+        self._request_no_response(items, "delete", extra_body={"ignoreUnknownIds": ignore_unknown_ids})
 
     def iterate(
         self,

cognite_toolkit-0.7.41/cognite_toolkit/_cdf_tk/client/data_classes/agent.py

@@ -0,0 +1,127 @@
+from typing import Annotated, Any, Literal
+
+from pydantic import BeforeValidator, Field
+
+from cognite_toolkit._cdf_tk.client.data_classes.base import BaseModelObject, RequestResource, ResponseResource
+from tests.test_unit.test_cdf_tk.test_tk_warnings.test_warnings_metatest import get_all_subclasses
+
+from .identifiers import ExternalId
+
+
+class AgentToolDefinition(BaseModelObject):
+    type: str
+    name: str
+    description: str
+
+
+class AskDocument(AgentToolDefinition):
+    type: Literal["askDocument"] = "askDocument"
+
+
+class ExamineDataSemantically(AgentToolDefinition):
+    type: Literal["examineDataSemantically"] = "examineDataSemantically"
+
+
+class AgentDataModel(BaseModelObject):
+    space: str
+    external_id: str
+    version: str
+    view_external_ids: list[str] | None = None
+
+
+class AgentInstanceSpacesDefinition(BaseModelObject):
+    type: str
+
+
+class AllInstanceSpaces(AgentInstanceSpacesDefinition):
+    type: Literal["all"] = "all"
+
+
+class ManualInstanceSpaces(AgentInstanceSpacesDefinition):
+    type: Literal["manual"] = "manual"
+    spaces: list[str]
+
+
+AgentInstanceSpaces = Annotated[
+    AllInstanceSpaces | ManualInstanceSpaces,
+    Field(discriminator="type"),
+]
+
+
+class QueryKnowledgeGraphConfig(BaseModelObject):
+    data_models: list[AgentDataModel]
+    instance_spaces: AgentInstanceSpaces | None = None
+    # This is deviating from the API documentation, but the Atlas team has confirmed that "v2" is the default
+    version: Literal["v1", "v2"] = "v2"
+
+
+class QueryKnowledgeGraph(AgentToolDefinition):
+    type: Literal["queryKnowledgeGraph"] = "queryKnowledgeGraph"
+    configuration: QueryKnowledgeGraphConfig
+
+
+class QueryTimeSeriesDatapoints(AgentToolDefinition):
+    type: Literal["queryTimeSeriesDatapoints"] = "queryTimeSeriesDatapoints"
+
+
+class SummarizeDocument(AgentToolDefinition):
+    type: Literal["summarizeDocument"] = "summarizeDocument"
+
+
+class UnknownAgentTool(AgentToolDefinition):
+    """Fallback for unknown tool types."""
+
+    ...
+
+
+KNOWN_TOOLS = {tool.type: tool for tool in get_all_subclasses(AgentToolDefinition) if hasattr(tool, "type")}
+
+
+def _handle_unknown_tool(value: Any) -> Any:
+    if isinstance(value, dict):
+        tool_type = value.get("type")
+        if tool_type not in KNOWN_TOOLS:
+            return UnknownAgentTool(**value)
+        else:
+            return KNOWN_TOOLS[tool_type].model_validate(value)
+    return value
+
+
+AgentTool = Annotated[
+    AskDocument
+    | QueryKnowledgeGraph
+    | QueryTimeSeriesDatapoints
+    | SummarizeDocument
+    | ExamineDataSemantically
+    | UnknownAgentTool,
+    BeforeValidator(_handle_unknown_tool),
+]
+
+
+class AgentRequest(RequestResource):
+    external_id: str
+    name: str
+    description: str | None = None
+    instructions: str | None = None
+    model: str = "azure/gpt-4o-mini"
+    tools: list[AgentTool] | None = None
+    runtime_version: str | None = None
+
+    def as_id(self) -> ExternalId:
+        return ExternalId(external_id=self.external_id)
+
+
+class AgentResponse(ResponseResource[AgentRequest]):
+    created_time: int
+    last_updated_time: int
+    owner_id: str
+    external_id: str
+    name: str
+    description: str | None = None
+    instructions: str | None = None
+    model: str = "azure/gpt-4o-mini"
+    tools: list[AgentTool] | None = None
+    runtime_version: str
+
+    def as_request_resource(self) -> AgentRequest:
+        return AgentRequest.model_validate(self.dump(), extra="ignore")

{cognite_toolkit-0.7.40 → cognite_toolkit-0.7.41}/cognite_toolkit/_cdf_tk/client/data_classes/asset.py

@@ -1,4 +1,4 @@
-from typing import Literal
+from typing import ClassVar, Literal
 
 from pydantic import JsonValue
 
@@ -8,8 +8,8 @@ from .identifiers import ExternalId
 
 
 class AssetRequest(RequestUpdateable):
-    container_fields = frozenset({"metadata", "labels"})
-    non_nullable_fields = frozenset({"parent_id", "parent_external_id"})
+    container_fields: ClassVar[frozenset[str]] = frozenset({"metadata", "labels"})
+    non_nullable_fields: ClassVar[frozenset[str]] = frozenset({"parent_id", "parent_external_id"})
     external_id: str | None = None
     name: str
     parent_id: int | None = None

{cognite_toolkit-0.7.40 → cognite_toolkit-0.7.41}/cognite_toolkit/_cdf_tk/client/data_classes/event.py

@@ -1,9 +1,12 @@
-from cognite_toolkit._cdf_tk.client.data_classes.base import RequestResource, ResponseResource
+from typing import ClassVar
+
+from cognite_toolkit._cdf_tk.client.data_classes.base import RequestUpdateable, ResponseResource
 
 from .identifiers import ExternalId, InternalOrExternalId
 
 
-class EventRequest(RequestResource):
+class EventRequest(RequestUpdateable):
+    container_fields: ClassVar[frozenset[str]] = frozenset({"metadata", "asset_ids"})
     external_id: str | None = None
     data_set_id: int | None = None
     start_time: int | None = None

cognite_toolkit-0.7.41/cognite_toolkit/_cdf_tk/client/data_classes/filemetadata.py

@@ -0,0 +1,56 @@
+from typing import ClassVar, Literal
+
+from pydantic import JsonValue
+
+from cognite_toolkit._cdf_tk.client.data_classes.base import RequestUpdateable, ResponseResource
+
+from .identifiers import ExternalId
+from .instance_api import NodeReference
+
+
+class FileMetadataRequest(RequestUpdateable):
+    container_fields: ClassVar[frozenset[str]] = frozenset({"metadata", "labels", "asset_ids", "security_categories"})
+    non_nullable_fields: ClassVar[frozenset[str]] = frozenset({"asset_ids", "security_categories"})
+    external_id: str | None = None
+    name: str
+    directory: str | None = None
+    source: str | None = None
+    mime_type: str | None = None
+    metadata: dict[str, str] | None = None
+    asset_ids: list[int] | None = None
+    data_set_id: int | None = None
+    labels: list[dict[Literal["externalId"], str]] | None = None
+    geo_location: JsonValue | None = None
+    source_created_time: int | None = None
+    source_modified_time: int | None = None
+    security_categories: list[int] | None = None
+
+    def as_id(self) -> ExternalId:
+        if self.external_id is None:
+            raise ValueError("Cannot convert FileMetadataRequest to ExternalId when external_id is None")
+        return ExternalId(external_id=self.external_id)
+
+
+class FileMetadataResponse(ResponseResource[FileMetadataRequest]):
+    created_time: int
+    last_updated_time: int
+    uploaded_time: int | None = None
+    uploaded: bool
+    id: int
+    external_id: str | None = None
+    name: str
+    directory: str | None = None
+    instance_id: NodeReference | None = None
+    source: str | None = None
+    mime_type: str | None = None
+    metadata: dict[str, str] | None = None
+    asset_ids: list[int] | None = None
+    data_set_id: int | None = None
+    labels: list[dict[Literal["externalId"], str]] | None = None
+    geo_location: JsonValue | None = None
+    source_created_time: int | None = None
+    source_modified_time: int | None = None
+    security_categories: list[int] | None = None
+
+    def as_request_resource(self) -> FileMetadataRequest:
+        return FileMetadataRequest.model_validate(self.dump(), extra="ignore")

cognite_toolkit-0.7.41/cognite_toolkit/_cdf_tk/client/data_classes/raw.py

@@ -0,0 +1,43 @@
+import sys
+
+from pydantic import Field
+
+from cognite_toolkit._cdf_tk.client.data_classes.base import (
+    Identifier,
+    RequestResource,
+    ResponseResource,
+)
+
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
+
+
+class RAWDatabase(RequestResource, Identifier, ResponseResource["RAWDatabase"]):
+    name: str
+
+    def as_id(self) -> Self:
+        return self
+
+    def __str__(self) -> str:
+        return f"name='{self.name}'"
+
+    def as_request_resource(self) -> "RAWDatabase":
+        return type(self).model_validate(self.dump(), extra="ignore")
+
+
+class RAWTable(RequestResource, Identifier, ResponseResource["RAWTable"]):
+    # This is a query parameter, so we exclude it from serialization
+    db_name: str = Field(exclude=True)
+    name: str
+
+    def as_id(self) -> Self:
+        return self
+
+    def __str__(self) -> str:
+        return f"dbName='{self.db_name}', tableName='{self.name}'"
+
+    def as_request_resource(self) -> "RAWTable":
+        dumped = {**self.dump(), "dbName": self.db_name}
+        return type(self).model_validate(dumped, extra="ignore")

{cognite_toolkit-0.7.40 → cognite_toolkit-0.7.41}/cognite_toolkit/_cdf_tk/client/data_classes/timeseries.py

@@ -1,13 +1,17 @@
-from cognite_toolkit._cdf_tk.client.data_classes.base import RequestResource, ResponseResource
+from typing import Any, ClassVar, Literal
+
+from cognite_toolkit._cdf_tk.client.data_classes.base import RequestUpdateable, ResponseResource
 
 from .identifiers import ExternalId, InternalOrExternalId
 from .instance_api import NodeReference
 
 
-class TimeSeriesRequest(RequestResource):
+class TimeSeriesRequest(RequestUpdateable):
+    container_fields: ClassVar[frozenset[str]] = frozenset({"metadata", "security_categories"})
+    non_nullable_fields: ClassVar[frozenset[str]] = frozenset({"is_step"})
     external_id: str | None = None
     name: str | None = None
-    is_sting: bool = False
+    is_string: bool = False
     metadata: dict[str, str] | None = None
     unit: str | None = None
     unit_external_id: str | None = None
@@ -22,13 +26,19 @@ class TimeSeriesRequest(RequestResource):
             raise ValueError("Cannot convert TimeSeriesRequest to ExternalId when external_id is None")
         return ExternalId(external_id=self.external_id)
 
+    def as_update(self, mode: Literal["patch", "replace"]) -> dict[str, Any]:
+        dumped = super().as_update(mode)
+        # isString is immutable in CDF, so we remove it from update payloads
+        dumped.pop("isString", None)
+        return dumped
+
 
 class TimeSeriesResponse(ResponseResource[TimeSeriesRequest]):
     id: int
     instance_id: NodeReference | None = None
     external_id: str | None = None
     name: str | None = None
-    is_sting: bool
+    is_string: bool
     metadata: dict[str, str] | None = None
     unit: str | None = None
     type: str

{cognite_toolkit-0.7.40 → cognite_toolkit-0.7.41}/cognite_toolkit/_cdf_tk/client/testing.py

@@ -33,6 +33,7 @@ from cognite_toolkit._cdf_tk.client.api.legacy.robotics import LocationsAPI as R
 from cognite_toolkit._cdf_tk.client.api.legacy.search_config import SearchConfigurationsAPI
 
 from ._toolkit_client import ToolAPI
+from .api.events import EventsAPI
 from .api.infield import InfieldAPI, InFieldCDMConfigAPI, InfieldConfigAPI
 from .api.lookup import (
     AssetLookUpAPI,
@@ -58,6 +59,7 @@ from .api.project import ProjectAPI
 from .api.search import SearchAPI
 from .api.streams import StreamsAPI
 from .api.three_d import ThreeDAPI, ThreeDModelAPI
+from .api.timeseries import TimeSeriesAPI
 from .api.token import TokenAPI
 from .api.verify import VerifyAPI
 
@@ -140,6 +142,8 @@ class ToolkitClientMock(CogniteClientMock):
         self.tool.three_d = MagicMock(spec=ThreeDAPI)
         self.tool.three_d.models = MagicMock(spec_set=ThreeDModelAPI)
         self.tool.assets = MagicMock(spec_set=AssetsAPI)
+        self.tool.time_series = MagicMock(spec_set=TimeSeriesAPI)
+        self.tool.events = MagicMock(spec_set=EventsAPI)
 
         self.streams = MagicMock(spec=StreamsAPI)
 

{cognite_toolkit-0.7.40 → cognite_toolkit-0.7.41}/cognite_toolkit/_cdf_tk/commands/pull.py

@@ -1,5 +1,6 @@
 import dataclasses
 import itertools
+import json
 import re
 import sys
 import tempfile
@@ -28,6 +29,7 @@ from cognite_toolkit._cdf_tk.cruds import (
     HostedExtractorSourceCRUD,
     ResourceCRUD,
     StreamlitCRUD,
+    ViewCRUD,
 )
 from cognite_toolkit._cdf_tk.data_classes import (
     BuildEnvironment,
@@ -643,6 +645,44 @@ class PullCommand(ToolkitCommand):
         loader: ResourceCRUD[T_ID, T_ResourceRequest, T_ResourceResponse],
         source_file: Path,
     ) -> tuple[str, dict[Path, str]]:
+        """Convert resource data from CDF into YAML file content ready to be written to disk.
+
+        This method takes the raw CDF resource data and transforms it back into a properly
+        formatted YAML file that preserves:
+        - Template variables (e.g., {{ variable_name }}) instead of their resolved values
+        - YAML comments from the original source file
+        - The original key ordering in dictionaries
+
+        The transformation process:
+        1. Replace all template variables with unique placeholders
+        2. Load source YAML content while preserving comments
+        3. Update the resource data with placeholder values where variables were used
+        4. Dump the updated data back to YAML format
+        5. Replace placeholders with the original template variable syntax
+        6. Restore the YAML comments
+
+        Args:
+            source: The original YAML file content as a string.
+            to_write: A mapping from resource identifiers to their updated data dictionaries
+                pulled from CDF.
+            resources: The list of built resources containing build variables and metadata.
+            environment_variables: A mapping of environment variable names to their values,
+                used to resolve variables like ${VAR_NAME} in template values.
+            loader: The ResourceCRUD loader instance for this resource type.
+            source_file: The path to the source file being processed.
+
+        Returns:
+            A tuple containing:
+            - The final YAML content string ready to be written to disk.
+            - A dictionary mapping extra file paths to their content (for resources
+              that have additional files, like SQL queries for transformations).
+
+        Raises:
+            ValueError: If the loaded YAML structure doesn't match between the original
+                and placeholder versions.
+            ToolkitMissingResourceError: If a resource identifier is not found in the
+                to_write or resources mappings.
+        """
         # 1. Replace all variables with placeholders
         # 2. Load source and keep the comments
         # 3. Update the to_write dict with the placeholders
@@ -762,9 +802,22 @@ class PullCommand(ToolkitCommand):
 
 
 class ResourceReplacer:
-    """Replaces values in a local resource directory with the updated values from CDF.
+    """Replaces values in a local resource dictionary with the updated values from CDF.
 
     The local resource dict order is maintained. In addition, placeholders are used for variables.
+
+    This class is responsible for merging CDF resource values back into local configuration files
+    while preserving:
+    - The original key ordering in dictionaries
+    - Template variable placeholders (e.g., {{ variable_name }})
+    - Comments and formatting where possible
+
+    Args:
+        value_by_placeholder: A mapping from placeholder strings to their corresponding
+            BuildVariable objects. Placeholders are temporary substitutes for template
+            variables during processing.
+        loader: The ResourceCRUD loader instance used to determine how to diff lists
+            and handle resource-specific logic.
     """
 
     def __init__(self, value_by_placeholder: dict[str, BuildVariable], loader: ResourceCRUD) -> None:
@@ -777,7 +830,49 @@ class ResourceReplacer:
         placeholder: dict[str, Any],
         to_write: dict[str, Any],
     ) -> dict[str, Any]:
-        return self._replace_dict(current, placeholder, to_write, tuple())
+        """Replace values in a local resource dict with updated values from CDF.
+
+        Merges the CDF resource values into the local configuration while maintaining
+        the original dictionary key ordering and preserving template variable placeholders.
+
+        Args:
+            current: The current local resource dictionary with resolved variable values.
+                This represents the source file content after template variables have
+                been substituted with their actual values.
+            placeholder: The local resource dictionary with placeholder strings instead
+                of resolved values. Used to identify which values contain template
+                variables that should be preserved.
+            to_write: The resource dictionary from CDF containing the updated values
+                to merge into the local configuration.
+
+        Returns:
+            A new dictionary with CDF values merged in, maintaining the original key
+            order from `current`. Template variables are preserved as placeholders
+            (to be converted back to {{ variable }} syntax by the caller). New keys
+            from CDF are appended at the end, and removed keys are omitted.
+
+        Raises:
+            ToolkitValueError: If a list variable has changed and cannot be updated,
+                or if there's a type mismatch between local and CDF values.
+        """
+        has_stringified_view_filter = False
+        if isinstance(self._loader, ViewCRUD):
+            # view.filter are recursive nested dicts that are complex. To avoid issues with comparing
+            # lists inside the filters, we stringify them before processing such that they are compared
+            # as strings.
+            processed = []
+            for d in (current, placeholder, to_write):
+                if isinstance(d.get("filter"), dict):
+                    d = d.copy()
+                    d["filter"] = json.dumps(d["filter"])
+                    has_stringified_view_filter = True
+                processed.append(d)
+            current, placeholder, to_write = processed
+        output = self._replace_dict(current, placeholder, to_write, tuple())
+        if has_stringified_view_filter and "filter" in output:
+            # Special case for ViewCRUD where the filter is stringified in CDF
+            output["filter"] = json.loads(output["filter"])
+        return output
 
     def _replace_dict(
         self,

{cognite_toolkit-0.7.40 → cognite_toolkit-0.7.41}/cognite_toolkit/_repo_files/GitHub/.github/workflows/deploy.yaml

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

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

{cognite_toolkit-0.7.40 → cognite_toolkit-0.7.41}/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.40"
+version = "0.7.41"
 
 
 [plugins]

cognite_toolkit-0.7.41/cognite_toolkit/_version.py

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

{cognite_toolkit-0.7.40 → cognite_toolkit-0.7.41}/pyproject.toml

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

cognite_toolkit-0.7.40/cognite_toolkit/_version.py

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