cognite-toolkit 0.7.58__tar.gz → 0.7.60__tar.gz

{cognite_toolkit-0.7.58 → cognite_toolkit-0.7.60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite_toolkit
-Version: 0.7.58
+Version: 0.7.60
 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.58 → cognite_toolkit-0.7.60}/cognite_toolkit/_cdf_tk/apps/_dump_app.py

@@ -17,6 +17,7 @@ from cognite_toolkit._cdf_tk.commands.dump_resource import (
     GroupFinder,
     LocationFilterFinder,
     NodeFinder,
+    ResourceViewMappingFinder,
     SearchConfigFinder,
     SpaceFinder,
     StreamlitFinder,
@@ -52,6 +53,8 @@ class DumpApp(typer.Typer):
         self.command("agents")(DumpConfigApp.dump_agents)
 
         self.command("search-config")(DumpConfigApp.dump_search_config)
+        if Flags.MIGRATE.is_enabled():
+            self.command("resource-view-mapping")(DumpConfigApp.dump_resource_view_mapping)
 
     @staticmethod
     def dump_main(ctx: typer.Context) -> None:
@@ -79,6 +82,8 @@ class DumpConfigApp(typer.Typer):
         self.command("streamlit")(DumpConfigApp.dump_streamlit)
         self.command("agents")(self.dump_agents)
         self.command("search-config")(self.dump_search_config)
+        if Flags.MIGRATE.is_enabled():
+            self.command("resource-view-mapping")(self.dump_resource_view_mapping)
 
     @staticmethod
     def dump_config_main(ctx: typer.Context) -> None:
@@ -758,6 +763,54 @@ class DumpConfigApp(typer.Typer):
             )
         )
 
+    @staticmethod
+    def dump_resource_view_mapping(
+        ctx: typer.Context,
+        external_id: Annotated[
+            list[str] | None,
+            typer.Argument(
+                help="The external ID(s) of the resource view mapping(s) you want to dump. "
+                "If nothing is provided, an interactive prompt will be shown to select the resource view mappings.",
+            ),
+        ] = None,
+        output_dir: Annotated[
+            Path,
+            typer.Option(
+                "--output-dir",
+                "-o",
+                help="Where to dump the resource view mapping files.",
+                allow_dash=True,
+            ),
+        ] = Path("tmp"),
+        clean: Annotated[
+            bool,
+            typer.Option(
+                "--clean",
+                "-c",
+                help="Delete the output directory before dumping the resource view mappings.",
+            ),
+        ] = False,
+        verbose: Annotated[
+            bool,
+            typer.Option(
+                "--verbose",
+                "-v",
+                help="Turn on to get more verbose output when running the command",
+            ),
+        ] = False,
+    ) -> None:
+        """[MIGRATION] This command will dump the selected resource view mapping(s) as yaml to the folder specified, defaults to /tmp."""
+        client = EnvironmentVariables.create_from_environment().get_client()
+        cmd = DumpResourceCommand(client=client)
+        cmd.run(
+            lambda: cmd.dump_to_yamls(
+                ResourceViewMappingFinder(client, tuple(external_id) if external_id else None),
+                output_dir=output_dir,
+                clean=clean,
+                verbose=verbose,
+            )
+        )
+
 
 class DumpDataApp(typer.Typer):
     def __init__(self, *args: Any, **kwargs: Any) -> None:

{cognite_toolkit-0.7.58 → cognite_toolkit-0.7.60}/cognite_toolkit/_cdf_tk/client/http_client/_data_classes.py

@@ -1,10 +1,10 @@
 import gzip
 from abc import ABC, abstractmethod
-from typing import Any, Literal
+from typing import TYPE_CHECKING, Any, Literal
 
 import httpx
 from cognite.client import global_config
-from pydantic import TYPE_CHECKING, BaseModel, JsonValue, TypeAdapter, model_validator
+from pydantic import BaseModel, JsonValue, TypeAdapter, model_validator
 
 from cognite_toolkit._cdf_tk.client.http_client._exception import ToolkitAPIError
 from cognite_toolkit._cdf_tk.utils.useful_types import PrimitiveType

{cognite_toolkit-0.7.58 → cognite_toolkit-0.7.60}/cognite_toolkit/_cdf_tk/commands/dump_resource.py

@@ -28,7 +28,7 @@ from cognite.client.data_classes._base import (
 from cognite.client.data_classes.agents import (
     AgentList,
 )
-from cognite.client.data_classes.data_modeling import DataModelId
+from cognite.client.data_classes.data_modeling import DataModelId, NodeList
 from cognite.client.data_classes.documents import SourceFileProperty
 from cognite.client.data_classes.extractionpipelines import ExtractionPipelineConfigList
 from cognite.client.data_classes.functions import (
@@ -53,6 +53,7 @@ from rich.panel import Panel
 
 from cognite_toolkit._cdf_tk.client import ToolkitClient
 from cognite_toolkit._cdf_tk.client.resource_classes.legacy.location_filters import LocationFilterList
+from cognite_toolkit._cdf_tk.client.resource_classes.legacy.migration import ResourceViewMapping
 from cognite_toolkit._cdf_tk.client.resource_classes.legacy.search_config import SearchConfigList
 from cognite_toolkit._cdf_tk.client.resource_classes.legacy.search_config import ViewId as SearchConfigViewId
 from cognite_toolkit._cdf_tk.client.resource_classes.legacy.streamlit_ import Streamlit, StreamlitList
@@ -69,6 +70,7 @@ from cognite_toolkit._cdf_tk.cruds import (
     LocationFilterCRUD,
     NodeCRUD,
     ResourceCRUD,
+    ResourceViewMappingCRUD,
     SearchConfigCRUD,
     SpaceCRUD,
     StreamlitCRUD,
@@ -797,6 +799,44 @@ class SearchConfigFinder(ResourceFinder[tuple[SearchConfigViewId, ...]]):
             yield list(self.identifier), None, loader, None
 
 
+class ResourceViewMappingFinder(ResourceFinder[tuple[str, ...]]):
+    def __init__(self, client: ToolkitClient, identifier: tuple[str, ...] | None = None):
+        super().__init__(client, identifier)
+        self.resource_view_mappings: list[ResourceViewMapping] | None = None
+
+    def _interactive_select(self) -> tuple[str, ...]:
+        mappings = self.client.migration.resource_view_mapping.list(limit=-1)
+        if not mappings:
+            raise ToolkitMissingResourceError("No resource view mappings found")
+        self.resource_view_mappings = list(mappings)
+        choices = [
+            Choice(
+                f"{mapping.external_id} ({mapping.resource_type} -> {mapping.view_id.external_id})",
+                value=mapping.external_id,
+            )
+            for mapping in sorted(mappings, key=lambda m: m.external_id)
+        ]
+        selected_ids: list[str] | None = questionary.checkbox(
+            "Which resource view mapping(s) would you like to dump?",
+            choices=choices,
+            validate=lambda choices: True if choices else "You must select at least one resource view mapping.",
+        ).unsafe_ask()
+        if not selected_ids:
+            raise ToolkitValueError(f"No resource view mappings selected for dumping.{_INTERACTIVE_SELECT_HELPER_TEXT}")
+        return tuple(selected_ids)
+
+    def __iter__(self) -> Iterator[tuple[list[Hashable], CogniteResourceList | None, ResourceCRUD, None | str]]:
+        self.identifier = self._selected()
+        loader = ResourceViewMappingCRUD.create_loader(self.client)
+        if self.resource_view_mappings:
+            selected_mappings = NodeList[ResourceViewMapping](
+                [m for m in self.resource_view_mappings if m.external_id in self.identifier]
+            )
+            yield [], selected_mappings, loader, None
+        else:
+            yield list(self.identifier), None, loader, None
+
+
 class DumpResourceCommand(ToolkitCommand):
     def dump_to_yamls(
         self,

{cognite_toolkit-0.7.58 → cognite_toolkit-0.7.60}/cognite_toolkit/_repo_files/GitHub/.github/workflows/deploy.yaml

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

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

{cognite_toolkit-0.7.58 → cognite_toolkit-0.7.60}/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.58"
+version = "0.7.60"
 
 
 [plugins]

cognite_toolkit-0.7.60/cognite_toolkit/_version.py

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

{cognite_toolkit-0.7.58 → cognite_toolkit-0.7.60}/pyproject.toml

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

cognite_toolkit-0.7.58/cognite_toolkit/_version.py

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