cognite-toolkit 0.7.62__py3-none-any.whl → 0.7.64__py3-none-any.whl

cognite_toolkit/_cdf_tk/commands/_migrate/creators.py

@@ -20,6 +20,7 @@ from cognite.client.data_classes.documents import SourceFileProperty
 from cognite.client.data_classes.events import EventProperty
 
 from cognite_toolkit._cdf_tk.client import ToolkitClient
+from cognite_toolkit._cdf_tk.client.resource_classes.data_modeling import NodeReference
 from cognite_toolkit._cdf_tk.client.resource_classes.legacy.apm_config_v1 import APMConfig, APMConfigList
 from cognite_toolkit._cdf_tk.cruds import NodeCRUD, ResourceCRUD, SpaceCRUD
 from cognite_toolkit._cdf_tk.exceptions import ToolkitMissingResourceError, ToolkitRequiredValueError
@@ -146,6 +147,7 @@ class SourceSystemCreator(MigrationCreator[NodeApplyList]):
         self.hierarchy = hierarchy
 
     def create_resources(self) -> NodeApplyList:
+        existing_resources = self._get_existing_source_systems()
         seen: set[str] = set()
         nodes = NodeApplyList([])
         for source in self._lookup_sources():
@@ -153,6 +155,9 @@ class SourceSystemCreator(MigrationCreator[NodeApplyList]):
             if not isinstance(source_str, str) or source_str in seen:
                 continue
             seen.add(source_str)
+            if existing_id := existing_resources.get(source_str):
+                self.client.console.print(f"Skipping {source_str} as it already exists in {existing_id!r}.")
+                continue
             nodes.append(
                 NodeApply(
                     space=self._instance_space,
@@ -165,6 +170,10 @@ class SourceSystemCreator(MigrationCreator[NodeApplyList]):
             )
         return nodes
 
+    def _get_existing_source_systems(self) -> dict[str, NodeReference]:
+        all_existing = self.client.migration.created_source_system.list(limit=-1)
+        return {node.source: NodeReference(space=node.space, external_id=node.external_id) for node in all_existing}
+
     def resource_configs(self, resources: NodeApplyList) -> list[ResourceConfig]:
         output: list[ResourceConfig] = []
         for node in resources:

cognite_toolkit/_cdf_tk/commands/auth.py

@@ -21,6 +21,7 @@ from collections import defaultdict
 from dataclasses import dataclass
 from pathlib import Path
 from time import sleep
+from typing import Literal
 
 import questionary
 from cognite.client.data_classes.capabilities import (
@@ -160,7 +161,10 @@ class AuthCommand(ToolkitCommand):
         if not user_groups:
             raise AuthorizationError("The current user is not member of any groups in the CDF project.")
 
-        loader_capabilities, loaders_by_capability_tuple = self._get_capabilities_by_loader(client)
+        data_modeling_status = client.project.status().this_project.data_modeling_status
+        loader_capabilities, loaders_by_capability_tuple = self._get_capabilities_by_loader(
+            client, data_modeling_status
+        )
         toolkit_group = self._create_toolkit_group(loader_capabilities, demo_principal)
 
         if not is_demo:
@@ -200,7 +204,7 @@ class AuthCommand(ToolkitCommand):
                 and questionary.confirm("Do you want to update the group with the missing capabilities?").unsafe_ask()
             ) or is_demo:
                 has_added_capabilities = self._update_missing_capabilities(
-                    client, cdf_toolkit_group, missing_capabilities, dry_run
+                    client, cdf_toolkit_group, missing_capabilities, dry_run, data_modeling_status
                 )
         elif is_toolkit_group_existing:  # and not is_user_in_toolkit_group
             self.warn(MediumSeverityWarning(f"The current client is not member of the {toolkit_group.name!r} group."))
@@ -215,7 +219,9 @@ class AuthCommand(ToolkitCommand):
                 and missing_capabilities
                 and questionary.confirm("Do you want to update the group with the missing capabilities?").unsafe_ask()
             ):
-                self._update_missing_capabilities(client, cdf_toolkit_group, missing_capabilities, dry_run)
+                self._update_missing_capabilities(
+                    client, cdf_toolkit_group, missing_capabilities, dry_run, data_modeling_status
+                )
         elif is_demo:
             # We create the group for the demo user
             cdf_toolkit_group = self._create_toolkit_group_in_cdf(client, toolkit_group)
@@ -360,6 +366,7 @@ class AuthCommand(ToolkitCommand):
         existing_group: Group,
         missing_capabilities: list[Capability],
         dry_run: bool,
+        data_modeling_status: Literal["HYBRID", "DATA_MODELING_ONLY"],
     ) -> bool:
         """Updates the missing capabilities. This assumes interactive mode."""
         updated_toolkit_group = GroupWrite.load(existing_group.dump())
@@ -368,6 +375,24 @@ class AuthCommand(ToolkitCommand):
         else:
             updated_toolkit_group.capabilities.extend(missing_capabilities)
 
+        if data_modeling_status == "DATA_MODELING_ONLY":
+            # Remove any AssetsAcl and RelationshipsAcl capabilities as these
+            # are not allowed in DATA_MODELING_ONLY projects.
+            filtered_capabilities: list[Capability] = []
+            removed: list[str] = []
+            for cap in updated_toolkit_group.capabilities:
+                if isinstance(cap, AssetsAcl | RelationshipsAcl):
+                    removed.append(str(cap))
+                else:
+                    filtered_capabilities.append(cap)
+            if removed:
+                self.console(
+                    f"Removing {humanize_collection(removed)} as the project is in DATA_MODELING_ONLY mode."
+                    f"These capabilities are not allowed in DATA_MODELING_ONLY projects.",
+                    prefix="  [bold yellow]INFO[/] - ",
+                )
+            updated_toolkit_group.capabilities = filtered_capabilities
+
         with warnings.catch_warnings():
             # If the user has unknown capabilities, we don't want the user to see the warning:
             # "UserWarning: Unknown capability '<unknown warning>' will be ignored in comparison"
@@ -424,11 +449,10 @@ class AuthCommand(ToolkitCommand):
 
     @staticmethod
     def _get_capabilities_by_loader(
-        client: ToolkitClient,
+        client: ToolkitClient, data_modeling_status: Literal["HYBRID", "DATA_MODELING_ONLY"]
     ) -> tuple[list[Capability], dict[tuple, list[str]]]:
         loaders_by_capability_tuple: dict[tuple, list[str]] = defaultdict(list)
         capability_by_id: dict[frozenset[tuple], Capability] = {}
-        project_type = client.project.status().this_project.data_modeling_status
         for crud_cls in cruds.RESOURCE_CRUD_LIST:
             crud = crud_cls.create_loader(client)
             if crud.prerequisite_warning() is not None:
@@ -451,7 +475,7 @@ class AuthCommand(ToolkitCommand):
                 capability = crud_cls.get_required_capability(None, read_only=False)
                 capabilities = capability if isinstance(capability, list) else [capability]
             for cap in capabilities:
-                if project_type == "DATA_MODELING_ONLY" and isinstance(cap, AssetsAcl | RelationshipsAcl):
+                if data_modeling_status == "DATA_MODELING_ONLY" and isinstance(cap, AssetsAcl | RelationshipsAcl):
                     continue
                 id_ = frozenset(cap.as_tuples())
                 if id_ not in capability_by_id:

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

@@ -12,7 +12,7 @@ jobs:
     environment: dev
     name: Deploy
     container:
-      image: cognite/toolkit:0.7.62
+      image: cognite/toolkit:0.7.64
       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.7.62
+      image: cognite/toolkit:0.7.64
       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.7.62"
+version = "0.7.64"
 
 
 [plugins]

cognite_toolkit/_version.py

@@ -1 +1 @@
-__version__ = "0.7.62"
+__version__ = "0.7.64"

{cognite_toolkit-0.7.62.dist-info → cognite_toolkit-0.7.64.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite_toolkit
-Version: 0.7.62
+Version: 0.7.64
 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.62.dist-info → cognite_toolkit-0.7.64.dist-info}/RECORD

@@ -225,7 +225,7 @@ cognite_toolkit/_cdf_tk/commands/_import_cmd.py,sha256=_qUF8xdJFoXDbtDYGCVC6kz9k
 cognite_toolkit/_cdf_tk/commands/_migrate/__init__.py,sha256=8ki04tJGH1dHdF2NtVF4HyhaC0XDDS7onrH_nvd9KtE,153
 cognite_toolkit/_cdf_tk/commands/_migrate/command.py,sha256=meyp2cFcq5Wtq4FvELSqdwHRA45o9FMWFL_5AnXALvc,13587
 cognite_toolkit/_cdf_tk/commands/_migrate/conversion.py,sha256=-LTIQUalqlRZxK0rfKWqljHLVh8VIH7yq_P-timfQDw,18318
-cognite_toolkit/_cdf_tk/commands/_migrate/creators.py,sha256=Gp3CKruTxeSDS3HiWiLsQ4mN2SZ4BQB5xQ50o68GTs8,9616
+cognite_toolkit/_cdf_tk/commands/_migrate/creators.py,sha256=-1dIhKKSbyfH9Wcc1BVP_WTOMhW4CvRFQ5gBBGquXIE,10241
 cognite_toolkit/_cdf_tk/commands/_migrate/data_classes.py,sha256=_b2hXpTUI2_t-WKHzYXw1iSGb3w4pcIb53CTi9rbJ7k,13667
 cognite_toolkit/_cdf_tk/commands/_migrate/data_mapper.py,sha256=qHYeFCBBGPejbgC_g_uHNM8fJLBkxWBBNKLFILkPaTI,28097
 cognite_toolkit/_cdf_tk/commands/_migrate/data_model.py,sha256=0lRyDRJ8zo00OngwWagQgHQIaemK4eufW9kbWwZ9Yo0,7901
@@ -241,7 +241,7 @@ cognite_toolkit/_cdf_tk/commands/_upload.py,sha256=h4Ct02_7zyGr_SfQ2hOQAkDEcbjak
 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/about.py,sha256=pEXNdCeJYONOalH8x-7QRsKLgj-9gdIqN16pPxA3bhg,9395
-cognite_toolkit/_cdf_tk/commands/auth.py,sha256=dDw6zi7vQKHKD6soumvngTg16H2FKvg7G79PQMrnrrU,32542
+cognite_toolkit/_cdf_tk/commands/auth.py,sha256=l_WW_tDgkpN_e0Aoc_3EYql_omYZTg5PBtMFCSbJ_b8,33780
 cognite_toolkit/_cdf_tk/commands/build_cmd.py,sha256=e9BwCdfc_QyEJLC5jxmmD_Tbvy7oL-fC6HBoaMyQbjU,29145
 cognite_toolkit/_cdf_tk/commands/build_v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite_toolkit/_cdf_tk/commands/build_v2/_module_parser.py,sha256=B_Ddt8oB3tWto0Ocja9kvWaoIZyt8Oa-ukuoptQBYww,5916
@@ -432,13 +432,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=jJYHZX7YNodw2J3zPCKpUt7zOcRq4Z9DDWSUFu2mpMc,667
-cognite_toolkit/_repo_files/GitHub/.github/workflows/dry-run.yaml,sha256=a2RU5KGKbZS_SSvkInZtkbswTrWMQkqSr42Wlhx4Di0,2430
-cognite_toolkit/_resources/cdf.toml,sha256=r-m4fwgvn8-Q6ZHEEr7NWW9HOhavJZUCNxlS7_HcTjA,475
-cognite_toolkit/_version.py,sha256=-lU0l5-pIa7inPRB-7jzbkH90Ef12r9upMApt29G7Nk,23
+cognite_toolkit/_repo_files/GitHub/.github/workflows/deploy.yaml,sha256=7FN5fi7yF2adj-ke8bq9ctcgQzGtCyOaIuKkoK3qYTs,667
+cognite_toolkit/_repo_files/GitHub/.github/workflows/dry-run.yaml,sha256=fvN1_GVygzZ1hiDlE6riH89hGodmICuVtsGQNBXR10I,2430
+cognite_toolkit/_resources/cdf.toml,sha256=Wx_KlVj5a5EoQXUMrQEy7jYT8hlejSLRi52EtHQKHrk,475
+cognite_toolkit/_version.py,sha256=YcVDXDbCWggmIHUePf77MZIOJHqpdf1nK5FnmEuIUrY,23
 cognite_toolkit/demo/__init__.py,sha256=-m1JoUiwRhNCL18eJ6t7fZOL7RPfowhCuqhYFtLgrss,72
 cognite_toolkit/demo/_base.py,sha256=6xKBUQpXZXGQ3fJ5f7nj7oT0s2n7OTAGIa17ZlKHZ5U,8052
-cognite_toolkit-0.7.62.dist-info/WHEEL,sha256=e_m4S054HL0hyR3CpOk-b7Q7fDX6BuFkgL5OjAExXas,80
-cognite_toolkit-0.7.62.dist-info/entry_points.txt,sha256=EtZ17K2mUjh-AY0QNU1CPIB_aDSSOdmtNI_4Fj967mA,84
-cognite_toolkit-0.7.62.dist-info/METADATA,sha256=WAFBnCs67Rq4CJev_KTtMluhrABDvTE_5yrnOVbuJKg,5026
-cognite_toolkit-0.7.62.dist-info/RECORD,,
+cognite_toolkit-0.7.64.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
+cognite_toolkit-0.7.64.dist-info/entry_points.txt,sha256=EtZ17K2mUjh-AY0QNU1CPIB_aDSSOdmtNI_4Fj967mA,84
+cognite_toolkit-0.7.64.dist-info/METADATA,sha256=MJAqtZLpAeeqDqCyUiJIvxCJJmlcE51qJjNmN-YsaYw,5026
+cognite_toolkit-0.7.64.dist-info/RECORD,,

{cognite_toolkit-0.7.62.dist-info → cognite_toolkit-0.7.64.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.9.27
+Generator: uv 0.9.28
 Root-Is-Purelib: true
 Tag: py3-none-any