cognite-toolkit 0.7.63__tar.gz → 0.7.64__tar.gz

{cognite_toolkit-0.7.63 → cognite_toolkit-0.7.64}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite_toolkit
-Version: 0.7.63
+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.63 → cognite_toolkit-0.7.64}/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-0.7.63 → cognite_toolkit-0.7.64}/cognite_toolkit/_repo_files/GitHub/.github/workflows/deploy.yaml

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

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

{cognite_toolkit-0.7.63 → cognite_toolkit-0.7.64}/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.63"
+version = "0.7.64"
 
 
 [plugins]

cognite_toolkit-0.7.64/cognite_toolkit/_version.py

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

{cognite_toolkit-0.7.63 → cognite_toolkit-0.7.64}/pyproject.toml

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

cognite_toolkit-0.7.63/cognite_toolkit/_version.py

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