cognite-toolkit 0.7.61__py3-none-any.whl → 0.7.63__py3-none-any.whl

cognite_toolkit/_cdf_tk/apps/_migrate_app.py

@@ -745,7 +745,7 @@ class MigrateApp(typer.Typer):
         )
         cmd = MigrationCommand(client=client)
 
-        if data_set_id is None:
+        if data_set_id is None and mapping_file is None:
             skip_linking = not questionary.confirm(
                 "Do you want to link old and new Files?", default=not skip_linking
             ).unsafe_ask()

cognite_toolkit/_cdf_tk/commands/_migrate/conversion.py

@@ -137,11 +137,19 @@ class DirectRelationCache:
         if source_ids:
             # SourceSystems are not cached in the client, so we have to handle the caching ourselves.
             cache = cast(dict[str, DirectRelationReference], self._cache_map[self.TableName.SOURCE_NAME])
-            missing = set(source_ids) - set(cache.keys())
+            missing: dict[str, str] = {}
+            for source_id in source_ids:
+                if source_id.casefold() not in cache:
+                    missing[source_id.casefold()] = source_id
+                elif source_id not in cache:
+                    missing[source_id] = source_id
             if missing:
                 source_systems = self._client.migration.created_source_system.retrieve(list(missing))
                 for source_system in source_systems:
-                    cache[source_system.source] = source_system.as_direct_relation_reference()
+                    source_reference = source_system.as_direct_relation_reference()
+                    cache[source_system.source] = source_reference
+                    if original_str := missing.get(source_system.source):
+                        cache[original_str] = source_reference
         if file_ids:
             self._update_cache(self._client.migration.lookup.files(id=list(file_ids)), self.TableName.FILE_ID)
         if asset_external_ids:

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/_repo_files/GitHub/.github/workflows/deploy.yaml

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

cognite_toolkit/_version.py

@@ -1 +1 @@
-__version__ = "0.7.61"
+__version__ = "0.7.63"

{cognite_toolkit-0.7.61.dist-info → cognite_toolkit-0.7.63.dist-info}/METADATA

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

@@ -10,7 +10,7 @@ cognite_toolkit/_cdf_tk/apps/_download_app.py,sha256=Iw-q4lIMagFQ7b8RVRubUQNAPbq
 cognite_toolkit/_cdf_tk/apps/_dump_app.py,sha256=8Z0D2snV48FC5eMBYJQ9fDnaNQCII3yrgrGolRtSOSc,39325
 cognite_toolkit/_cdf_tk/apps/_import_app.py,sha256=5n5AF40HJ0Q_3LENCknG0MxH4pMUS8OwsqvtCYj_t7w,2086
 cognite_toolkit/_cdf_tk/apps/_landing_app.py,sha256=qZqO0qN33-6TTF9O4fYuNF6zhJH-QyUWsuElWr8sH6w,1365
-cognite_toolkit/_cdf_tk/apps/_migrate_app.py,sha256=XmSX8rYO65sfdYe5e8yjAofbhsfXa2kBFzGm3Kq4up8,49142
+cognite_toolkit/_cdf_tk/apps/_migrate_app.py,sha256=RKCZwlOuHiQ8YSDYM5W2XQ6asitsdte-KuVHEG_JJUk,49167
 cognite_toolkit/_cdf_tk/apps/_modules_app.py,sha256=sbgTYVKSb-HdaSJrccZGLRj28ifCIjbxQC6eADy16vk,8958
 cognite_toolkit/_cdf_tk/apps/_profile_app.py,sha256=ilJ8GuFkzexEAqZDuEqp7P-H_RxSFH2oO1t_bcDhJIQ,7067
 cognite_toolkit/_cdf_tk/apps/_purge.py,sha256=P7WoQURdrUGDOvBQMZ695Xqj_j8Mfln6eIovGQdOqUE,14172
@@ -224,8 +224,8 @@ cognite_toolkit/_cdf_tk/commands/_download.py,sha256=dVddH9t7oGx1kdQ3CCYYQb96Uxx
 cognite_toolkit/_cdf_tk/commands/_import_cmd.py,sha256=_qUF8xdJFoXDbtDYGCVC6kz9kyrcN_abXV9nFicThvw,11276
 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=-sZktmsDIqkhNg-kg95Ty6eTm7FiyFRi1ZQLOkZ5x2w,17889
-cognite_toolkit/_cdf_tk/commands/_migrate/creators.py,sha256=Gp3CKruTxeSDS3HiWiLsQ4mN2SZ4BQB5xQ50o68GTs8,9616
+cognite_toolkit/_cdf_tk/commands/_migrate/conversion.py,sha256=-LTIQUalqlRZxK0rfKWqljHLVh8VIH7yq_P-timfQDw,18318
+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
@@ -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=zJSH3g3zv_WpISBObwAezRGoRTbW9u1Z0oet9teVHh0,667
-cognite_toolkit/_repo_files/GitHub/.github/workflows/dry-run.yaml,sha256=IU0cSDAzXnlCj1Q_w1PPI5WRVPMk1XkTHVEMJ2fKilI,2430
-cognite_toolkit/_resources/cdf.toml,sha256=FmX_hAxEVzghXUlYYZtmUC2qrdhkv7fDpmDgzgFCa90,475
-cognite_toolkit/_version.py,sha256=nnN1KGFIyav_JeSFcpJNcA3TybG4__uPpHfhpv8AtFc,23
+cognite_toolkit/_repo_files/GitHub/.github/workflows/deploy.yaml,sha256=SirbUy0Kcvvbva0BeT1O4fZ4QWa6Chk8eR_GkoAtgwg,667
+cognite_toolkit/_repo_files/GitHub/.github/workflows/dry-run.yaml,sha256=JQekh5r35a9AgCpXYwzT1QwzyqRHsTVR7pcxTOe2zOQ,2430
+cognite_toolkit/_resources/cdf.toml,sha256=SOsS5JgHNeMYgeV_UWRXczssd6x0jutfuJCQjxJ8sAw,475
+cognite_toolkit/_version.py,sha256=oQs5nDLBiJV3A-cTJuhMbabRY2LIGf9C4v6xF17N4gs,23
 cognite_toolkit/demo/__init__.py,sha256=-m1JoUiwRhNCL18eJ6t7fZOL7RPfowhCuqhYFtLgrss,72
 cognite_toolkit/demo/_base.py,sha256=6xKBUQpXZXGQ3fJ5f7nj7oT0s2n7OTAGIa17ZlKHZ5U,8052
-cognite_toolkit-0.7.61.dist-info/WHEEL,sha256=e_m4S054HL0hyR3CpOk-b7Q7fDX6BuFkgL5OjAExXas,80
-cognite_toolkit-0.7.61.dist-info/entry_points.txt,sha256=EtZ17K2mUjh-AY0QNU1CPIB_aDSSOdmtNI_4Fj967mA,84
-cognite_toolkit-0.7.61.dist-info/METADATA,sha256=UrmXRAFcA-IvLVxM7J3ZkSQ-vLv6__j1dO9bBZWBBVk,5026
-cognite_toolkit-0.7.61.dist-info/RECORD,,
+cognite_toolkit-0.7.63.dist-info/WHEEL,sha256=e_m4S054HL0hyR3CpOk-b7Q7fDX6BuFkgL5OjAExXas,80
+cognite_toolkit-0.7.63.dist-info/entry_points.txt,sha256=EtZ17K2mUjh-AY0QNU1CPIB_aDSSOdmtNI_4Fj967mA,84
+cognite_toolkit-0.7.63.dist-info/METADATA,sha256=DKhf2nuKq7ucWOMAqd3VPWoSqw3Dr2xdqPK2Y_uqpNM,5026
+cognite_toolkit-0.7.63.dist-info/RECORD,,