cognite-toolkit 0.6.112__py3-none-any.whl → 0.6.113__py3-none-any.whl

cognite_toolkit/_cdf_tk/commands/init.py

@@ -19,7 +19,7 @@ from cognite_toolkit._cdf_tk.commands.collect import CollectCommand
 from cognite_toolkit._cdf_tk.commands.modules import ModulesCommand
 from cognite_toolkit._cdf_tk.commands.repo import RepoCommand
 from cognite_toolkit._cdf_tk.exceptions import ToolkitError
-from cognite_toolkit._cdf_tk.feature_flags import Flags
+from cognite_toolkit._cdf_tk.feature_flags import FeatureFlag, Flags
 
 
 class InitItemStatus(Enum):
@@ -32,8 +32,6 @@ class InitItemStatus(Enum):
 
 @dataclass
 class InitChecklistItem:
-    """Represents an item in the init checklist"""
-
     name: str
     description: str
     function: Callable[[], None]
@@ -41,7 +39,6 @@ class InitChecklistItem:
     mandatory: bool = False
 
     def get_status_display(self) -> str:
-        """Get a display string for the status"""
         if self.status == InitItemStatus.SUCCESSFUL:
             return "✓"
         elif self.status == InitItemStatus.FAILED:
@@ -50,12 +47,17 @@ class InitChecklistItem:
             return "○"
 
     def get_choice_title(self) -> str:
-        """Get the title for the questionary choice"""
         status_icon = self.get_status_display()
         return f"{status_icon} {self.description} (required)" if self.mandatory else f"{status_icon} {self.description}"
 
 
 class InitCommand(ToolkitCommand):
+    organization_dir: Path | None
+
+    def __init__(self, print_warning: bool = True, skip_tracking: bool = False, silent: bool = False) -> None:
+        super().__init__(print_warning, skip_tracking, silent)
+        self.organization_dir = None
+
     def execute(self, dry_run: bool = False, emulate_dot_seven: bool = False) -> None:
         if not Flags.v07.is_enabled() and not emulate_dot_seven:
             print("This command is deprecated. Use 'cdf modules init' instead.")
@@ -140,7 +142,6 @@ class InitCommand(ToolkitCommand):
             if selected == "__exit__":
                 if all_mandatory_complete:
                     print("Setup complete!")
-                    print("You can now start using the Cognite Toolkit.")
                     break
                 else:
                     incomplete_mandatory = [
@@ -168,7 +169,6 @@ class InitCommand(ToolkitCommand):
                 if not confirm:
                     continue
 
-            # Run the function
             try:
                 selected_item.function()
                 selected_item.status = InitItemStatus.SUCCESSFUL
@@ -188,12 +188,14 @@ class InitCommand(ToolkitCommand):
                 print(f"Unexpected error occurred. Full traceback:\n{traceback.format_exc()}")
 
     def _init_toml(self, dry_run: bool = False) -> None:
-        organization_dir = ModulesCommand._prompt_organization_dir()
+        if self.organization_dir is None:
+            self.organization_dir = ModulesCommand._prompt_organization_dir()
         if dry_run:
             print("Would initialize cdf.toml configuration file")
             return
-        CDFToml.write(organization_dir, "dev")
-        print(f"cdf.toml configuration file initialized in {organization_dir}")
+        CDFToml.write(self.organization_dir, "dev")
+        FeatureFlag.flush()
+        print(f"cdf.toml configuration file initialized in {self.organization_dir}")
 
     def _init_auth(self, dry_run: bool = False) -> None:
         auth_command = AuthCommand()
@@ -201,12 +203,14 @@ class InitCommand(ToolkitCommand):
 
     def _init_modules(self, dry_run: bool = False) -> None:
         with ModulesCommand() as modules_command:
+            if self.organization_dir is None:
+                self.organization_dir = ModulesCommand._prompt_organization_dir()
             if dry_run:
                 organization_dir = Path(tempfile.mkdtemp(prefix="init_modules_", suffix=".tmp", dir=Path.cwd()))
                 modules_command.run(lambda: modules_command.init(organization_dir=organization_dir))
                 shutil.rmtree(organization_dir)
             else:
-                modules_command.run(lambda: modules_command.init())
+                modules_command.run(lambda: modules_command.init(organization_dir=self.organization_dir))
 
     def _init_repo(self, dry_run: bool = False) -> None:
         repo_command = RepoCommand()
@@ -216,7 +220,7 @@ class InitCommand(ToolkitCommand):
         """Opt in to collect usage statistics"""
 
         opt_in = questionary.confirm(
-            "Do you want to opt in to collect usage statistics?",
+            "Do you want to opt in to collect usage statistics? This will help us improve the Toolkit.",
             default=True,
         ).ask()
         if dry_run:

cognite_toolkit/_cdf_tk/commands/modules.py

@@ -756,6 +756,7 @@ class ModulesCommand(ToolkitCommand):
         """
 
         cdf_toml = CDFToml.load()
+
         if (Flags.EXTERNAL_LIBRARIES.is_enabled() or user_library) and self._module_source_dir is None:
             libraries = {"userdefined": user_library} if user_library else cdf_toml.libraries
 

cognite_toolkit/_cdf_tk/feature_flags.py

@@ -99,3 +99,7 @@ class FeatureFlag:
     @lru_cache(typed=True)
     def is_enabled(flag: Flags) -> bool:
         return CDFToml.load().alpha_flags.get(clean_name(flag.name), False)
+
+    @staticmethod
+    def flush() -> None:
+        FeatureFlag.is_enabled.cache_clear()

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

@@ -12,7 +12,7 @@ jobs:
     environment: dev
     name: Deploy
     container:
-      image: cognite/toolkit:0.6.112
+      image: cognite/toolkit:0.6.113
       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.6.112
+      image: cognite/toolkit:0.6.113
       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.6.112"
+version = "0.6.113"
 
 [alpha_flags]
 external-libraries = true

cognite_toolkit/_version.py

@@ -1 +1 @@
-__version__ = "0.6.112"
+__version__ = "0.6.113"

{cognite_toolkit-0.6.112.dist-info → cognite_toolkit-0.6.113.dist-info}/METADATA

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

@@ -1,11 +1,11 @@
 cognite_toolkit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite_toolkit/_cdf.py,sha256=0abeQr1Tfk4lkGaoXyrnFC28wDSlR_8UGrh10noGduQ,6085
-cognite_toolkit/_version.py,sha256=YdtCh7IlYHUXy1k7RzpZ9PwL65uDkujJSpGAeXnu7a0,24
+cognite_toolkit/_version.py,sha256=DOT6K-RJWjRjHJkjxqDVc26V3kiyLy4jbrtF9QPajHQ,24
 cognite_toolkit/_cdf_tk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite_toolkit/_cdf_tk/cdf_toml.py,sha256=VSWV9h44HusWIaKpWgjrOMrc3hDoPTTXBXlp6-NOrIM,9079
 cognite_toolkit/_cdf_tk/constants.py,sha256=aFcJkY03sYOJ92YfvcVpau-waj6akOAb4KgyIwKI-bs,7135
 cognite_toolkit/_cdf_tk/exceptions.py,sha256=xG0jMwi5A20nvPvyo6sCyz_cyKycynPyIzpYiGR4gcU,6064
-cognite_toolkit/_cdf_tk/feature_flags.py,sha256=XMIZIOjPCdnH42SupUOETf_0d11TgKPZSfjCKnLoDJo,3017
+cognite_toolkit/_cdf_tk/feature_flags.py,sha256=TjwUmGG5qXBQ-8P1ongh2qQnuRfVRvGaP1JBtuUot88,3106
 cognite_toolkit/_cdf_tk/hints.py,sha256=UI1ymi2T5wCcYOpEbKbVaDnlyFReFy8TDtMVt-5E1h8,6493
 cognite_toolkit/_cdf_tk/plugins.py,sha256=JwaN_jrrky1PXBJ3tRpZ22cIcD01EB46WVFgp_bK-fQ,856
 cognite_toolkit/_cdf_tk/protocols.py,sha256=Lc8XnBfmDZN6dwmSopmK7cFE9a9jZ2zdUryEeCXn27I,3052
@@ -119,8 +119,8 @@ cognite_toolkit/_cdf_tk/commands/deploy.py,sha256=R185y7oFr3yhh10RSPE81dpYX346gh
 cognite_toolkit/_cdf_tk/commands/dump_data.py,sha256=8l4M2kqV4DjiV5js5s7EbFVNxV0Np4ld8ogw19vaJp0,21804
 cognite_toolkit/_cdf_tk/commands/dump_resource.py,sha256=ylAFST3GgkWT1Qa-JIzmQXbrQgNCB1UrptrBf3WsyvY,39658
 cognite_toolkit/_cdf_tk/commands/featureflag.py,sha256=lgLMwuNIwFjvvKn1sNMunkq4VTwdNqXtrZfdGFTrNcI,968
-cognite_toolkit/_cdf_tk/commands/init.py,sha256=55FlBxrRlSkkAkIkdFtHjnV3Z3qniE_Zw-XhYJAIwpI,9171
-cognite_toolkit/_cdf_tk/commands/modules.py,sha256=hw5riBMfv9ohXSxV88BfOzcsCTrqrayD1PHMxatLr94,41091
+cognite_toolkit/_cdf_tk/commands/init.py,sha256=M5qT6qMG2AxKwjsi8y6t9tLWBX4nb5uSYp4J6ER8M2A,9463
+cognite_toolkit/_cdf_tk/commands/modules.py,sha256=buGS_SqbrSykechbh-MTfFNvl1VyPhrL_91JE4_jL4I,41092
 cognite_toolkit/_cdf_tk/commands/pull.py,sha256=ktPXHW3f0HpmqCxeMhH8Ac52dAuQqAum3VBmLWJwQSM,39246
 cognite_toolkit/_cdf_tk/commands/repo.py,sha256=MNy8MWphTklIZHvQOROCweq8_SYxGv6BaqnLpkFFnuk,3845
 cognite_toolkit/_cdf_tk/commands/run.py,sha256=JyX9jLEQej9eRrHVCCNlw4GuF80qETSol3-T5CCofgw,37331
@@ -302,13 +302,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=KQO8WZbRDnrPRvcqQhR9RnDTd3f2r-ZYaE67TAL_zgA,668
-cognite_toolkit/_repo_files/GitHub/.github/workflows/dry-run.yaml,sha256=_zX7CZV50WD8jgLI-sc95uffoOiw11hfhd3ChWfJcSg,2431
-cognite_toolkit/_resources/cdf.toml,sha256=y4PqbIfBl47XVEnfal8OOVNmcgHk0VZ03NGvlXdaAbA,488
+cognite_toolkit/_repo_files/GitHub/.github/workflows/deploy.yaml,sha256=LlS9ma4kuTtppYQwCFL5pBw_ZJ1fldSwCoC6LO9am-c,668
+cognite_toolkit/_repo_files/GitHub/.github/workflows/dry-run.yaml,sha256=vYjDXyC529ScKEi4OH5L8RnRH5RzIuyrt1Ki5z4DpKE,2431
+cognite_toolkit/_resources/cdf.toml,sha256=cI4FFAswvHyeVPN-uZQkvhju8mbd-yFZQ4jagNwGG-M,488
 cognite_toolkit/demo/__init__.py,sha256=-m1JoUiwRhNCL18eJ6t7fZOL7RPfowhCuqhYFtLgrss,72
 cognite_toolkit/demo/_base.py,sha256=6xKBUQpXZXGQ3fJ5f7nj7oT0s2n7OTAGIa17ZlKHZ5U,8052
-cognite_toolkit-0.6.112.dist-info/METADATA,sha256=zeQt_5Nhh667iyf7QmikzJkYDiLEM-MCPiCXTfzx6C0,4502
-cognite_toolkit-0.6.112.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cognite_toolkit-0.6.112.dist-info/entry_points.txt,sha256=JlR7MH1_UMogC3QOyN4-1l36VbrCX9xUdQoHGkuJ6-4,83
-cognite_toolkit-0.6.112.dist-info/licenses/LICENSE,sha256=CW0DRcx5tL-pCxLEN7ts2S9g2sLRAsWgHVEX4SN9_Mc,752
-cognite_toolkit-0.6.112.dist-info/RECORD,,
+cognite_toolkit-0.6.113.dist-info/METADATA,sha256=suhsfAM6ZMpOe4Ahq4rdh8jC01qoKdTY-ocRlfr5qag,4502
+cognite_toolkit-0.6.113.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cognite_toolkit-0.6.113.dist-info/entry_points.txt,sha256=JlR7MH1_UMogC3QOyN4-1l36VbrCX9xUdQoHGkuJ6-4,83
+cognite_toolkit-0.6.113.dist-info/licenses/LICENSE,sha256=CW0DRcx5tL-pCxLEN7ts2S9g2sLRAsWgHVEX4SN9_Mc,752
+cognite_toolkit-0.6.113.dist-info/RECORD,,