cognite-toolkit 0.7.68__py3-none-any.whl → 0.7.70__py3-none-any.whl

cognite_toolkit/_cdf_tk/client/resource_classes/legacy/location_filters.py

@@ -146,7 +146,7 @@ class LocationFilterCore(WriteableCogniteResource["LocationFilterWrite"], ABC):
         scene: LocationFilterScene | None = None,
         asset_centric: AssetCentricFilter | None = None,
         views: list[LocationFilterView] | None = None,
-        data_modeling_type: Literal["HYBRID", "DATA_MODELING_ONLY"] | None = None,
+        data_modeling_type: Literal["HYBRID", "DATA_MODELING_ONLY", "ASSET_CENTRIC_ONLY"] | None = None,
         _parent_external_id: str | None = None,
     ) -> None:
         self.external_id = external_id
@@ -250,7 +250,7 @@ class LocationFilter(LocationFilterCore):
         scene: LocationFilterScene | None = None,
         asset_centric: AssetCentricFilter | None = None,
         views: list[LocationFilterView] | None = None,
-        data_modeling_type: Literal["HYBRID", "DATA_MODELING_ONLY"] | None = None,
+        data_modeling_type: Literal["HYBRID", "DATA_MODELING_ONLY", "ASSET_CENTRIC_ONLY"] | None = None,
         locations: "LocationFilterList | None" = None,
     ) -> None:
         super().__init__(

cognite_toolkit/_cdf_tk/cruds/_resource_cruds/function.py

@@ -486,6 +486,10 @@ class FunctionScheduleCRUD(ResourceCRUD[FunctionScheduleID, FunctionScheduleWrit
             raise ToolkitRequiredValueError("FunctionSchedule must have functionExternalId and Name set.")
         return FunctionScheduleID(item.function_external_id, item.name)
 
+    @classmethod
+    def as_str(cls, id: FunctionScheduleID) -> str:
+        return sanitize_filename(f"{id.function_external_id}-{id.name}")
+
     @classmethod
     def get_dependent_items(cls, item: dict) -> Iterable[tuple[type[ResourceCRUD], Hashable]]:
         if "functionExternalId" in item:
@@ -624,10 +628,17 @@ class FunctionScheduleCRUD(ResourceCRUD[FunctionScheduleID, FunctionScheduleWrit
         if parent_ids is None:
             yield from self.client.functions.schedules
         else:
-            for parent_id in parent_ids:
-                if not isinstance(parent_id, str):
-                    continue
-                yield from self.client.functions.schedules(function_external_id=parent_id)
+            external_ids = [external_id for external_id in parent_ids if isinstance(external_id, str)]
+            if not external_ids:
+                return
+            internal_ids = self.client.lookup.functions.id(external_ids)
+            for func_id in internal_ids:
+                funct_external_id = self.client.lookup.functions.external_id(func_id)
+                for schedule in self.client.functions.schedules(function_id=func_id):
+                    # FunctionExternalId is not set in the schedule object returned from the API,
+                    # so we need to set it here.
+                    schedule.function_external_id = funct_external_id
+                    yield schedule
 
     def sensitive_strings(self, item: FunctionScheduleWrite) -> Iterable[str]:
         id_ = self.get_id(item)

cognite_toolkit/_cdf_tk/cruds/_resource_cruds/location.py

@@ -126,10 +126,9 @@ class LocationFilterCRUD(ResourceCRUD[str, LocationFilterWrite, LocationFilter])
 
     def dump_resource(self, resource: LocationFilter, local: dict[str, Any] | None = None) -> dict[str, Any]:
         dumped = resource.as_write().dump()
-        local = local or {}
         if parent_id := dumped.pop("parentId", None):
             dumped["parentExternalId"] = self.client.lookup.location_filters.external_id(parent_id)
-        if "dataModelingType" in dumped and "dataModelingType" not in local:
+        if dumped.get("dataModelingType") == "HYBRID" and local is not None and "dataModelingType" not in local:
             # Default set on server side
             dumped.pop("dataModelingType")
         if "assetCentric" not in dumped:

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

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

cognite_toolkit/_version.py

@@ -1 +1 @@
-__version__ = "0.7.68"
+__version__ = "0.7.70"

{cognite_toolkit-0.7.68.dist-info → cognite_toolkit-0.7.70.dist-info}/METADATA

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

@@ -177,7 +177,7 @@ cognite_toolkit/_cdf_tk/client/resource_classes/legacy/extended_timeseries.py,sh
 cognite_toolkit/_cdf_tk/client/resource_classes/legacy/functions.py,sha256=r9vhkS7sJ-wCiwvtD9CDKKthAktDMS6FJWDsLzq6iJ8,378
 cognite_toolkit/_cdf_tk/client/resource_classes/legacy/graphql_data_models.py,sha256=N_1dfXSdsLlhw5uXreNfmSCo5bA4XeiZneMdnHWDgJI,4313
 cognite_toolkit/_cdf_tk/client/resource_classes/legacy/instances.py,sha256=aGV3XtBGwG1ELks3kqFkScO-MGC5zvcSZtYXOVWL2BE,2501
-cognite_toolkit/_cdf_tk/client/resource_classes/legacy/location_filters.py,sha256=IgHU7Hto0Zz3Bk_QW17JC3vUw0yN1oaTeJ3ZPKOGFAE,12112
+cognite_toolkit/_cdf_tk/client/resource_classes/legacy/location_filters.py,sha256=At-Olj-daQcR239fVpUZuezbKkOY7jsIx-n1wxlWleQ,12156
 cognite_toolkit/_cdf_tk/client/resource_classes/legacy/migration.py,sha256=AoYgqwSoYn1ok_ksG9Lljb270J4zPF_qyJSu5ZHtD_Q,18632
 cognite_toolkit/_cdf_tk/client/resource_classes/legacy/pending_instances_ids.py,sha256=W99jhHMLzW_0TvZoaeeaeWXljN9GjuXPoFO-SRjsd-s,1888
 cognite_toolkit/_cdf_tk/client/resource_classes/legacy/project.py,sha256=y0rcIZvoTf5b3LPgz9ufUU2UTkDTyzz-HmNgH6cXRNA,1226
@@ -274,11 +274,11 @@ cognite_toolkit/_cdf_tk/cruds/_resource_cruds/datamodel.py,sha256=Deyx0iAxiGmw3j
 cognite_toolkit/_cdf_tk/cruds/_resource_cruds/extraction_pipeline.py,sha256=yzRGAp1h7G0LN1ix81ZXpq-QZw0qHAjlW8aNaI0ehT8,17712
 cognite_toolkit/_cdf_tk/cruds/_resource_cruds/fieldops.py,sha256=WEFfSnkzKSUrDamAEDxzJvrJlmK1nnu6Mc_2feqic4Q,21007
 cognite_toolkit/_cdf_tk/cruds/_resource_cruds/file.py,sha256=LvlukwvRIQm8cX-YWfTGVjO74ZnPMDGv3m5Cd7pfgx8,14977
-cognite_toolkit/_cdf_tk/cruds/_resource_cruds/function.py,sha256=HwKu-RtBOIkKB32EcrjsMBoLYDXqNnoelb_VzCRDQ70,28977
+cognite_toolkit/_cdf_tk/cruds/_resource_cruds/function.py,sha256=OSJlIiqyBqbSiEf4w7EGflMAk9Yvc96J3VFkYZlk3zw,29605
 cognite_toolkit/_cdf_tk/cruds/_resource_cruds/group_scoped.py,sha256=WEg8-CxMP64WfE_XXIlH114zM51K0uLaYa4atd992zI,1690
 cognite_toolkit/_cdf_tk/cruds/_resource_cruds/hosted_extractors.py,sha256=pRyClYj2-NwDJOr7jo2-yaduLirf1Uts_IrLKb5-nR0,17764
 cognite_toolkit/_cdf_tk/cruds/_resource_cruds/industrial_tool.py,sha256=iZJGzo02cVjs_9zcVobe84mkBe5HcTzFEZU7HAA1RZ0,7867
-cognite_toolkit/_cdf_tk/cruds/_resource_cruds/location.py,sha256=juUiQAvBouBlzuXSdLSJpOiXGltU6Nknmmnc6LYPv90,12218
+cognite_toolkit/_cdf_tk/cruds/_resource_cruds/location.py,sha256=sOZunu027t-2ocuICqc2WgRYOMVYxc7n2fVgXmIfkmo,12226
 cognite_toolkit/_cdf_tk/cruds/_resource_cruds/migration.py,sha256=8-7QgL4g-DMJHwBbOFAg4QscMNA1RMCqHfZYQlSNKU4,4467
 cognite_toolkit/_cdf_tk/cruds/_resource_cruds/raw.py,sha256=T_j0vJp8URJGsKeTi_bYvnNtdte_Axw5htmsu0CfG88,12104
 cognite_toolkit/_cdf_tk/cruds/_resource_cruds/relationship.py,sha256=TO2Y6TZJEGxyKv7EMOtyyALz3Wyigp0mwBSQVTL-D5A,6330
@@ -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=Iwq43lowmWSYOF2Go1ve0GZLw6IauZRKh_ZQkcpimQ0,667
-cognite_toolkit/_repo_files/GitHub/.github/workflows/dry-run.yaml,sha256=cOOyMF6XnD2ejFfMgBsW-cwCow4uzfUhnbR_vHOlUKc,2430
-cognite_toolkit/_resources/cdf.toml,sha256=Ichf1svtm1IvjxRIrKaJZSxcGsMXiLg_fj9RjM3i7MQ,475
-cognite_toolkit/_version.py,sha256=_6QHdVtUxX6ebdvBnyY3uH22dCrqQAiBIRPdDfFUz0A,23
+cognite_toolkit/_repo_files/GitHub/.github/workflows/deploy.yaml,sha256=qQ_xDd8t-BoDn8jQH0myosDup607lUlFP0XyFYjNyvI,667
+cognite_toolkit/_repo_files/GitHub/.github/workflows/dry-run.yaml,sha256=RfOWvAlbfEX2AN-p778iZ1-BQKh3CkrsZ20regQHgZU,2430
+cognite_toolkit/_resources/cdf.toml,sha256=_eXFo5nNSYSt5pSGNJy_XryxMBGOe-Y3T6ZmAxgoBII,475
+cognite_toolkit/_version.py,sha256=ZfQz5T6Qc8giGJV4KwdZES652C1RbgB-gyM_Mb-p5AE,23
 cognite_toolkit/demo/__init__.py,sha256=-m1JoUiwRhNCL18eJ6t7fZOL7RPfowhCuqhYFtLgrss,72
 cognite_toolkit/demo/_base.py,sha256=6xKBUQpXZXGQ3fJ5f7nj7oT0s2n7OTAGIa17ZlKHZ5U,8052
-cognite_toolkit-0.7.68.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
-cognite_toolkit-0.7.68.dist-info/entry_points.txt,sha256=EtZ17K2mUjh-AY0QNU1CPIB_aDSSOdmtNI_4Fj967mA,84
-cognite_toolkit-0.7.68.dist-info/METADATA,sha256=0cyiw6FtLVnRRN7FU7Bh0dIQ02aDbexz5LVwAGnnnGI,5026
-cognite_toolkit-0.7.68.dist-info/RECORD,,
+cognite_toolkit-0.7.70.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
+cognite_toolkit-0.7.70.dist-info/entry_points.txt,sha256=EtZ17K2mUjh-AY0QNU1CPIB_aDSSOdmtNI_4Fj967mA,84
+cognite_toolkit-0.7.70.dist-info/METADATA,sha256=dJLGdBD0b3wIoIPt1gb6IinqJ-39kikvePgaS98EVpE,5026
+cognite_toolkit-0.7.70.dist-info/RECORD,,