cognite-toolkit 0.6.78__py3-none-any.whl → 0.6.79__py3-none-any.whl

cognite_toolkit/_builtin_modules/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.78"
+version = "0.6.79"
 
 
 [plugins]

cognite_toolkit/_cdf_tk/apps/_migrate_app.py

@@ -8,13 +8,13 @@ from cognite.client.data_classes.data_modeling import ContainerId
 
 from cognite_toolkit._cdf_tk.client import ToolkitClient
 from cognite_toolkit._cdf_tk.commands import (
-    MigrateFilesCommand,
     MigrationCanvasCommand,
     MigrationPrepareCommand,
 )
 from cognite_toolkit._cdf_tk.commands._migrate import MigrationCommand
 from cognite_toolkit._cdf_tk.commands._migrate.adapter import (
     AssetCentricMigrationIOAdapter,
+    FileMetaIOAdapter,
     MigrateDataSetSelector,
     MigrationCSVFileSelector,
     MigrationSelector,
@@ -581,11 +581,12 @@ class MigrateApp(typer.Typer):
             )
         )
 
-    @staticmethod
+    @classmethod
     def files(
+        cls,
         ctx: typer.Context,
         mapping_file: Annotated[
-            Path,
+            Path | None,
             typer.Option(
                 "--mapping-file",
                 "-m",
@@ -593,7 +594,51 @@ class MigrateApp(typer.Typer):
                 "This file is expected to have the following columns: [id, dataSetId, space, externalId]."
                 "The dataSetId is optional, and can be skipped. If it is set, it is used to check the access to the dataset.",
             ),
-        ],
+        ] = None,
+        data_set_id: Annotated[
+            str | None,
+            typer.Option(
+                "--data-set-id",
+                "-s",
+                help="The data set ID to select for the files to migrate. If not provided, the dataSetId from the mapping file is used. "
+                "If neither is provided, the default data set for the project is used.",
+            ),
+        ] = None,
+        ingestion_mapping: Annotated[
+            str | None,
+            typer.Option(
+                "--ingestion-mapping",
+                "-i",
+                help="The ingestion mapping to use for the migrated files. If not provided, "
+                "the default mapping to CogniteFile in CogniteCore will be used.",
+            ),
+        ] = None,
+        consumption_view: Annotated[
+            str | None,
+            typer.Option(
+                "--consumption-view",
+                "-c",
+                help="The consumption view to assign to the migrated files Given as space:externalId/version. "
+                "This will be used in Canvas to select which view to use when migrating timeseries. If not provided, "
+                "CogniteFile in CogniteCore will be used.",
+            ),
+        ] = None,
+        log_dir: Annotated[
+            Path,
+            typer.Option(
+                "--log-dir",
+                "-l",
+                help="Path to the directory where logs will be stored. If the directory does not exist, it will be created.",
+            ),
+        ] = Path(f"migration_logs_{TODAY!s}"),
+        skip_linking: Annotated[
+            bool,
+            typer.Option(
+                "--skip-linking",
+                "-x",
+                help="If set, the migration will not create links between the old FileMetadata and the new CogniteFile.",
+            ),
+        ] = False,
         dry_run: Annotated[
             bool,
             typer.Option(
@@ -612,13 +657,33 @@ class MigrateApp(typer.Typer):
         ] = False,
     ) -> None:
         """Migrate Files to CogniteFiles."""
-
         client = EnvironmentVariables.create_from_environment().get_client(enable_set_pending_ids=True)
-        cmd = MigrateFilesCommand()
+
+        selected, dry_run, verbose = cls._prepare_asset_centric_arguments(
+            client=client,
+            mapping_file=mapping_file,
+            data_set_id=data_set_id,
+            consumption_view=consumption_view,
+            ingestion_mapping=ingestion_mapping,
+            dry_run=dry_run,
+            verbose=verbose,
+            kind="FileMetadata",
+            resource_type="file",
+            container_id=ContainerId("cdf_cdm", "CogniteFile"),
+        )
+        cmd = MigrationCommand()
+
+        if data_set_id is None:
+            skip_linking = not questionary.confirm(
+                "Do you want to link old and new Files?", default=not skip_linking
+            ).ask()
+
         cmd.run(
-            lambda: cmd.migrate_files(
-                client,
-                mapping_file=mapping_file,
+            lambda: cmd.migrate(
+                selected=selected,
+                data=FileMetaIOAdapter(client, skip_linking=skip_linking),
+                mapper=AssetCentricMapper(client),
+                log_dir=log_dir,
                 dry_run=dry_run,
                 verbose=verbose,
             )

cognite_toolkit/_cdf_tk/commands/_migrate/adapter.py

@@ -326,7 +326,7 @@ class LinkingAdapter(
         return results
 
 
-class FileMetaAdapter(
+class FileMetaIOAdapter(
     LinkingAdapter[
         str,
         FileMetadataWrite,

cognite_toolkit/_cdf_tk/commands/_migrate/default_mappings.py

@@ -32,6 +32,7 @@ def create_default_mappings() -> list[ResourceViewMappingApply]:
         "labels": "tags",
         "mimeType": "mimeType",
         "directory": "directory",
+        "assetIds": "assets",
         "sourceCreatedTime": "sourceCreatedTime",
         "sourceModifiedTime": "sourceUpdatedTime",
     }

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

@@ -12,7 +12,7 @@ jobs:
     environment: dev
     name: Deploy
     container:
-      image: cognite/toolkit:0.6.78
+      image: cognite/toolkit:0.6.79
       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.78
+      image: cognite/toolkit:0.6.79
       env:
         CDF_CLUSTER: ${{ vars.CDF_CLUSTER }}
         CDF_PROJECT: ${{ vars.CDF_PROJECT }}

cognite_toolkit/_version.py

@@ -1 +1 @@
-__version__ = "0.6.78"
+__version__ = "0.6.79"

{cognite_toolkit-0.6.78.dist-info → cognite_toolkit-0.6.79.dist-info}/METADATA

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

@@ -1,9 +1,9 @@
 cognite_toolkit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite_toolkit/_cdf.py,sha256=Lbv1moBfndOXDazAoDao6ZtDHqiN6L7Nv8sj8w6dkTE,5941
-cognite_toolkit/_version.py,sha256=CsBJy00_X3h-8DAU3fkhHtVkiF8payXogeGpwkSdK3c,23
+cognite_toolkit/_version.py,sha256=LwNDLmfO-2-d9ejGMyparcS52Lej3rOsbuOvuFDbBaM,23
 cognite_toolkit/_builtin_modules/README.md,sha256=roU3G05E6ogP5yhw4hdIvVDKV831zCh2pzt9BVddtBg,307
 cognite_toolkit/_builtin_modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite_toolkit/_builtin_modules/cdf.toml,sha256=xrW2OhstP4kDedUy5gzuPGqzgnTOYQpusWKDMrcey0E,273
+cognite_toolkit/_builtin_modules/cdf.toml,sha256=1VS9GTUQqLILK3sscFjExe0fw2fVuzWvGB3pGAhgvC0,273
 cognite_toolkit/_builtin_modules/packages.toml,sha256=-z_dCOcZwhW86GV6SCB__XzKSQfZcAupGO7JoNB0TZQ,2735
 cognite_toolkit/_builtin_modules/bootcamp/README.md,sha256=iTVqoy3PLpC-xPi5pbuMIAEHILBSfWTGLexwa1AltpY,211
 cognite_toolkit/_builtin_modules/bootcamp/default.config.yaml,sha256=cBKReVJt2ZqFf5nBJl6mod_yo8iqSpXqh_7MQxi692U,94
@@ -494,7 +494,7 @@ cognite_toolkit/_cdf_tk/apps/_data_app.py,sha256=rFnTcUBAuoFcTQCjxwqZGG0HjUMGdYT
 cognite_toolkit/_cdf_tk/apps/_download_app.py,sha256=faAuhFYn7eQ_uzP3BNmnXeaeeoyZR1JvRZx2ATKrsao,16691
 cognite_toolkit/_cdf_tk/apps/_dump_app.py,sha256=Ec0aEqbKwCkxni09i06rfY31qZUyOVwbbvo7MHh4cf8,39056
 cognite_toolkit/_cdf_tk/apps/_landing_app.py,sha256=tV8hpqxLm2YgqB-TWieheK7ucN-JhQVtN13V3Zth6Os,386
-cognite_toolkit/_cdf_tk/apps/_migrate_app.py,sha256=BakIZ54DPdQQ7Cj0lp9mdqwGBhijaivs54kAr6CwIQ0,26399
+cognite_toolkit/_cdf_tk/apps/_migrate_app.py,sha256=68jVGqtShpohcohgZnOPp1qg2nO99DignpBVhcvvInE,29030
 cognite_toolkit/_cdf_tk/apps/_modules_app.py,sha256=Ydjho3z89YCT7Jeq1sOg2rRkLffWH81KTYeWp8SW__Y,6623
 cognite_toolkit/_cdf_tk/apps/_populate_app.py,sha256=CDQup8xVGbTUR_G9O0phLVhz8GyRPM3quyFesdhnxY4,2783
 cognite_toolkit/_cdf_tk/apps/_profile_app.py,sha256=vSRJW54bEvIul8_4rOqyOYA7ztXx7TFOvZRZWZTxMbg,7007
@@ -594,7 +594,7 @@ cognite_toolkit/_cdf_tk/commands/pull.py,sha256=2Zf6IOXxSxZ-5XkNE80FlrXBuNejAWrA
 cognite_toolkit/_cdf_tk/commands/repo.py,sha256=MNy8MWphTklIZHvQOROCweq8_SYxGv6BaqnLpkFFnuk,3845
 cognite_toolkit/_cdf_tk/commands/run.py,sha256=JyX9jLEQej9eRrHVCCNlw4GuF80qETSol3-T5CCofgw,37331
 cognite_toolkit/_cdf_tk/commands/_migrate/__init__.py,sha256=ODut2BHBKAMSQMane2S7v-3Z8EjJ67ab2k99zRASpvY,373
-cognite_toolkit/_cdf_tk/commands/_migrate/adapter.py,sha256=XravqmR0Dp_QgaeHCvczEzTnVFCpXo1DvR27ejnJG3I,14356
+cognite_toolkit/_cdf_tk/commands/_migrate/adapter.py,sha256=l1mbV8LSRQyjof_U7QuxDtPYbsBn0-1LJjn0F5vdYfo,14358
 cognite_toolkit/_cdf_tk/commands/_migrate/assets.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite_toolkit/_cdf_tk/commands/_migrate/base.py,sha256=aS32Wa-gd7vFNOdCTKEIpSSdjQKZ8jblzD6c3YcOmzA,4942
 cognite_toolkit/_cdf_tk/commands/_migrate/canvas.py,sha256=Tv4OG9V6tDsQbSH13YW8M0n8Ury5gU16oJB-OISVR0w,6398
@@ -604,7 +604,7 @@ cognite_toolkit/_cdf_tk/commands/_migrate/creators.py,sha256=PlDypLBxRDDwCNk9baL
 cognite_toolkit/_cdf_tk/commands/_migrate/data_classes.py,sha256=fQy-N1Jc3wjxj84mxRbQHSVGkefJGlyw1_Ll9NCuPSM,7237
 cognite_toolkit/_cdf_tk/commands/_migrate/data_mapper.py,sha256=TXqXgT_XcWwCB8yViEHNFOWjIdXr-EDHuJKOOf2smWs,5915
 cognite_toolkit/_cdf_tk/commands/_migrate/data_model.py,sha256=i1eUsNX6Dueol9STIEwyksBnBsWUk13O8qHIjW964pM,7860
-cognite_toolkit/_cdf_tk/commands/_migrate/default_mappings.py,sha256=QWR_WZE96rWmuL9us-6vga6oiMila7SPuJwkjAQY2gE,5517
+cognite_toolkit/_cdf_tk/commands/_migrate/default_mappings.py,sha256=KkSq_4R6hQ15ccG-jHy7vVgPwC5IDd5OaXZLvz5mIZs,5547
 cognite_toolkit/_cdf_tk/commands/_migrate/files.py,sha256=uDGNwTnlpc0cjwLX7P9GHcqf4IsD5Q9_4w7rUOpGWWU,6790
 cognite_toolkit/_cdf_tk/commands/_migrate/issues.py,sha256=lWSnuS3CfRDbA7i1g12gJ2reJnQcLmZWxHDK19-Wxkk,5772
 cognite_toolkit/_cdf_tk/commands/_migrate/prepare.py,sha256=sTxeEgIp2xNJXW-RoOhtdAXlww5Wxe94GyzZG1RyYW4,2483
@@ -765,12 +765,12 @@ 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=GNCA1X5TNm6U2Uq6WqxEGotEn5r5jEUZIe3jlfbbFSY,667
-cognite_toolkit/_repo_files/GitHub/.github/workflows/dry-run.yaml,sha256=7QRn6XMfRQyGE3ykBe9E1AmhcqAYxL76DDMjQp1d-5s,2430
+cognite_toolkit/_repo_files/GitHub/.github/workflows/deploy.yaml,sha256=biC0TeyQtp-3sRMCN2JJ3PtNsgeSYMJBTi3uI_71YyY,667
+cognite_toolkit/_repo_files/GitHub/.github/workflows/dry-run.yaml,sha256=PkVSZUv0ATqVoI6uNjeqENt-pstThjKTpE1k8MLRXu8,2430
 cognite_toolkit/demo/__init__.py,sha256=-m1JoUiwRhNCL18eJ6t7fZOL7RPfowhCuqhYFtLgrss,72
 cognite_toolkit/demo/_base.py,sha256=6xKBUQpXZXGQ3fJ5f7nj7oT0s2n7OTAGIa17ZlKHZ5U,8052
-cognite_toolkit-0.6.78.dist-info/METADATA,sha256=B-2qyoZEjPI3V15Ikfdi8MJHTw6m9jEgr4EGcEaJ7ic,4501
-cognite_toolkit-0.6.78.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cognite_toolkit-0.6.78.dist-info/entry_points.txt,sha256=JlR7MH1_UMogC3QOyN4-1l36VbrCX9xUdQoHGkuJ6-4,83
-cognite_toolkit-0.6.78.dist-info/licenses/LICENSE,sha256=CW0DRcx5tL-pCxLEN7ts2S9g2sLRAsWgHVEX4SN9_Mc,752
-cognite_toolkit-0.6.78.dist-info/RECORD,,
+cognite_toolkit-0.6.79.dist-info/METADATA,sha256=5kcS_-BqYNoz-0_WovD9HbD48sKG7Nl8HHqj5aiwHEI,4501
+cognite_toolkit-0.6.79.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cognite_toolkit-0.6.79.dist-info/entry_points.txt,sha256=JlR7MH1_UMogC3QOyN4-1l36VbrCX9xUdQoHGkuJ6-4,83
+cognite_toolkit-0.6.79.dist-info/licenses/LICENSE,sha256=CW0DRcx5tL-pCxLEN7ts2S9g2sLRAsWgHVEX4SN9_Mc,752
+cognite_toolkit-0.6.79.dist-info/RECORD,,