cognite-toolkit 0.7.44__py3-none-any.whl → 0.7.46__py3-none-any.whl

cognite_toolkit/_cdf_tk/storageio/_applications.py

@@ -2,12 +2,12 @@ from collections.abc import Iterable, Sequence
 from typing import Any
 
 from cognite_toolkit._cdf_tk.client import ToolkitClient
-from cognite_toolkit._cdf_tk.client.data_classes.legacy.canvas import (
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, HTTPMessage, SimpleBodyRequest
+from cognite_toolkit._cdf_tk.client.resource_classes.legacy.canvas import (
     IndustrialCanvas,
     IndustrialCanvasApply,
 )
-from cognite_toolkit._cdf_tk.client.data_classes.legacy.charts import Chart, ChartList, ChartWrite
-from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, HTTPMessage, SimpleBodyRequest
+from cognite_toolkit._cdf_tk.client.resource_classes.legacy.charts import Chart, ChartList, ChartWrite
 from cognite_toolkit._cdf_tk.exceptions import ToolkitNotImplementedError
 from cognite_toolkit._cdf_tk.tk_warnings import HighSeverityWarning, MediumSeverityWarning
 from cognite_toolkit._cdf_tk.utils.collection import chunker_sequence

cognite_toolkit/_cdf_tk/storageio/_asset_centric.py

@@ -6,11 +6,12 @@ from typing import Any, ClassVar, Generic
 from cognite.client.data_classes import Label, LabelDefinition
 
 from cognite_toolkit._cdf_tk.client import ToolkitClient
-from cognite_toolkit._cdf_tk.client.data_classes.asset import AssetAggregateItem, AssetRequest, AssetResponse
-from cognite_toolkit._cdf_tk.client.data_classes.event import EventRequest, EventResponse
-from cognite_toolkit._cdf_tk.client.data_classes.filemetadata import FileMetadataResponse
-from cognite_toolkit._cdf_tk.client.data_classes.identifiers import InternalId
-from cognite_toolkit._cdf_tk.client.data_classes.timeseries import TimeSeriesRequest, TimeSeriesResponse
+from cognite_toolkit._cdf_tk.client.request_classes.filters import ClassicFilter
+from cognite_toolkit._cdf_tk.client.resource_classes.asset import AssetAggregateItem, AssetRequest, AssetResponse
+from cognite_toolkit._cdf_tk.client.resource_classes.event import EventRequest, EventResponse
+from cognite_toolkit._cdf_tk.client.resource_classes.filemetadata import FileMetadataResponse
+from cognite_toolkit._cdf_tk.client.resource_classes.identifiers import InternalId
+from cognite_toolkit._cdf_tk.client.resource_classes.timeseries import TimeSeriesRequest, TimeSeriesResponse
 from cognite_toolkit._cdf_tk.cruds import (
     AssetCRUD,
     DataSetsCRUD,
@@ -89,17 +90,14 @@ class AssetCentricIO(
             list(self._downloaded_labels_by_selector[selector]), LabelCRUD.create_loader(self.client)
         )
 
-    def _get_hierarchy_dataset_pair(self, selector: AssetCentricSelector) -> tuple[list[str] | None, list[str] | None]:
-        asset_subtree_external_ids: list[str] | None = None
-        data_set_external_ids: list[str] | None = None
+    def _get_classic_filter(self, selector: AssetCentricSelector) -> ClassicFilter:
         if isinstance(selector, DataSetSelector):
-            data_set_external_ids = [selector.data_set_external_id]
+            return ClassicFilter.from_asset_subtree_and_data_sets(data_set_id=selector.data_set_external_id)
         elif isinstance(selector, AssetSubtreeSelector):
-            asset_subtree_external_ids = [selector.hierarchy]
+            return ClassicFilter.from_asset_subtree_and_data_sets(asset_subtree_id=selector.hierarchy)
         else:
             # This selector is for uploads, not for downloading from CDF.
             raise ToolkitNotImplementedError(f"Selector type {type(selector)} not supported for {type(self).__name__}.")
-        return asset_subtree_external_ids, data_set_external_ids
 
     def _collect_dependencies(
         self,
@@ -307,14 +305,13 @@ class AssetIO(UploadableAssetCentricIO[AssetResponse, AssetRequest]):
         return asset_schema + metadata_schema
 
     def stream_data(self, selector: AssetCentricSelector, limit: int | None = None) -> Iterable[Page]:
-        asset_subtree_external_ids, data_set_external_ids = self._get_hierarchy_dataset_pair(selector)
+        filter_ = self._get_classic_filter(selector)
         cursor: str | None = None
         total_count = 0
         while True:
-            page = self.client.tool.assets.iterate(
+            page = self.client.tool.assets.paginate(
                 aggregated_properties=True,
-                data_set_external_ids=data_set_external_ids,
-                asset_subtree_external_ids=asset_subtree_external_ids,
+                filter=filter_,
                 limit=self.CHUNK_SIZE,
                 cursor=cursor,
             )
@@ -436,13 +433,12 @@ class FileMetadataIO(AssetCentricIO[FileMetadataResponse]):
     def stream_data(
         self, selector: AssetCentricSelector, limit: int | None = None
     ) -> Iterable[Page[FileMetadataResponse]]:
-        asset_subtree_external_ids, data_set_external_ids = self._get_hierarchy_dataset_pair(selector)
+        filter_ = self._get_classic_filter(selector)
         cursor: str | None = None
         total_count = 0
         while True:
-            page = self.client.tool.filemetadata.iterate(
-                data_set_external_ids=data_set_external_ids,
-                asset_subtree_external_ids=asset_subtree_external_ids,
+            page = self.client.tool.filemetadata.paginate(
+                filter=filter_,
                 limit=self.CHUNK_SIZE,
                 cursor=cursor,
             )
@@ -490,13 +486,12 @@ class TimeSeriesIO(UploadableAssetCentricIO[TimeSeriesResponse, TimeSeriesReques
         return self.client.tool.timeseries.retrieve(InternalId.from_ids(ids))
 
     def stream_data(self, selector: AssetCentricSelector, limit: int | None = None) -> Iterable[Page]:
-        asset_subtree_external_ids, data_set_external_ids = self._get_hierarchy_dataset_pair(selector)
+        filter_ = self._get_classic_filter(selector)
         cursor: str | None = None
         total_count = 0
         while True:
-            page = self.client.tool.timeseries.iterate(
-                data_set_external_ids=data_set_external_ids,
-                asset_subtree_external_ids=asset_subtree_external_ids,
+            page = self.client.tool.timeseries.paginate(
+                filter=filter_,
                 limit=self.CHUNK_SIZE,
                 cursor=cursor,
             )
@@ -624,13 +619,12 @@ class EventIO(UploadableAssetCentricIO[EventResponse, EventRequest]):
         return event_schema + metadata_schema
 
     def stream_data(self, selector: AssetCentricSelector, limit: int | None = None) -> Iterable[Page]:
-        asset_subtree_external_ids, data_set_external_ids = self._get_hierarchy_dataset_pair(selector)
+        filter_ = self._get_classic_filter(selector)
         cursor: str | None = None
         total_count = 0
         while True:
-            page = self.client.tool.events.iterate(
-                data_set_external_ids=data_set_external_ids,
-                asset_subtree_external_ids=asset_subtree_external_ids,
+            page = self.client.tool.events.paginate(
+                filter=filter_,
                 limit=self.CHUNK_SIZE,
                 cursor=cursor,
             )

cognite_toolkit/_cdf_tk/storageio/_file_content.py

@@ -9,8 +9,6 @@ import httpx
 from cognite.client.data_classes.data_modeling import ViewId
 
 from cognite_toolkit._cdf_tk.client import ToolkitClient
-from cognite_toolkit._cdf_tk.client.data_classes.data_modeling import NodeReference
-from cognite_toolkit._cdf_tk.client.data_classes.filemetadata import FileMetadataRequest, FileMetadataResponse
 from cognite_toolkit._cdf_tk.client.http_client import (
     DataBodyRequest,
     ErrorDetails,
@@ -21,6 +19,8 @@ from cognite_toolkit._cdf_tk.client.http_client import (
     ResponseList,
     SimpleBodyRequest,
 )
+from cognite_toolkit._cdf_tk.client.resource_classes.data_modeling import NodeReference
+from cognite_toolkit._cdf_tk.client.resource_classes.filemetadata import FileMetadataRequest, FileMetadataResponse
 from cognite_toolkit._cdf_tk.cruds import FileMetadataCRUD
 from cognite_toolkit._cdf_tk.exceptions import ToolkitNotImplementedError
 from cognite_toolkit._cdf_tk.protocols import ResourceResponseProtocol

cognite_toolkit/_cdf_tk/storageio/_instances.py

@@ -17,7 +17,7 @@ from cognite.client.utils._identifier import InstanceId
 
 from cognite_toolkit._cdf_tk import constants
 from cognite_toolkit._cdf_tk.client import ToolkitClient
-from cognite_toolkit._cdf_tk.client.data_classes.legacy.instances import InstanceList
+from cognite_toolkit._cdf_tk.client.resource_classes.legacy.instances import InstanceList
 from cognite_toolkit._cdf_tk.cruds import ContainerCRUD, SpaceCRUD, ViewCRUD
 from cognite_toolkit._cdf_tk.utils import sanitize_filename
 from cognite_toolkit._cdf_tk.utils.cdf import iterate_instances

cognite_toolkit/_cdf_tk/utils/cdf.py

@@ -21,7 +21,7 @@ from filelock import BaseFileLock, FileLock, Timeout
 from rich.console import Console
 
 from cognite_toolkit._cdf_tk.client import ToolkitClient, ToolkitClientConfig
-from cognite_toolkit._cdf_tk.client.data_classes.legacy.raw import RawTable
+from cognite_toolkit._cdf_tk.client.resource_classes.legacy.raw import RawTable
 from cognite_toolkit._cdf_tk.constants import ENV_VAR_PATTERN, MAX_ROW_ITERATION_RUN_QUERY, MAX_RUN_QUERY_FREQUENCY_MIN
 from cognite_toolkit._cdf_tk.exceptions import (
     ToolkitError,

cognite_toolkit/_cdf_tk/utils/interactive_select.py

@@ -21,11 +21,11 @@ from questionary import Choice
 from rich.console import Console
 
 from cognite_toolkit._cdf_tk.client import ToolkitClient
-from cognite_toolkit._cdf_tk.client.data_classes.legacy.canvas import Canvas
-from cognite_toolkit._cdf_tk.client.data_classes.legacy.charts import Chart, ChartList, Visibility
-from cognite_toolkit._cdf_tk.client.data_classes.legacy.migration import ResourceViewMapping
-from cognite_toolkit._cdf_tk.client.data_classes.legacy.raw import RawTable
-from cognite_toolkit._cdf_tk.client.data_classes.three_d import ThreeDModelResponse
+from cognite_toolkit._cdf_tk.client.resource_classes.legacy.canvas import Canvas
+from cognite_toolkit._cdf_tk.client.resource_classes.legacy.charts import Chart, ChartList, Visibility
+from cognite_toolkit._cdf_tk.client.resource_classes.legacy.migration import ResourceViewMapping
+from cognite_toolkit._cdf_tk.client.resource_classes.legacy.raw import RawTable
+from cognite_toolkit._cdf_tk.client.resource_classes.three_d import ThreeDModelResponse
 from cognite_toolkit._cdf_tk.exceptions import ToolkitMissingResourceError, ToolkitValueError
 
 from . import humanize_collection

cognite_toolkit/_cdf_tk/utils/useful_types2.py

@@ -4,9 +4,9 @@ from typing import TypeAlias, TypeVar
 
 from cognite.client.data_classes import Annotation, FileMetadata
 
-from cognite_toolkit._cdf_tk.client.data_classes.asset import AssetResponse
-from cognite_toolkit._cdf_tk.client.data_classes.event import EventResponse
-from cognite_toolkit._cdf_tk.client.data_classes.timeseries import TimeSeriesResponse
+from cognite_toolkit._cdf_tk.client.resource_classes.asset import AssetResponse
+from cognite_toolkit._cdf_tk.client.resource_classes.event import EventResponse
+from cognite_toolkit._cdf_tk.client.resource_classes.timeseries import TimeSeriesResponse
 
 AssetCentricResource: TypeAlias = AssetResponse | FileMetadata | EventResponse | TimeSeriesResponse
 AssetCentricResourceExtended: TypeAlias = AssetResponse | FileMetadata | EventResponse | TimeSeriesResponse | Annotation

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

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

cognite_toolkit/_version.py

@@ -1 +1 @@
-__version__ = "0.7.44"
+__version__ = "0.7.46"

{cognite_toolkit-0.7.44.dist-info → cognite_toolkit-0.7.46.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite_toolkit
-Version: 0.7.44
+Version: 0.7.46
 Summary: Official Cognite Data Fusion tool for project templates and configuration deployment
 Author: Cognite AS
 Author-email: Cognite AS <support@cognite.com>
@@ -37,10 +37,10 @@ Requires-Dist: sqlparse>=0.5.3 ; extra == 'sql'
 Requires-Dist: pyarrow>=20.0.0 ; extra == 'table'
 Requires-Dist: openpyxl>=3.1.5 ; extra == 'table'
 Requires-Python: >=3.10
+Project-URL: Homepage, https://docs.cognite.com/cdf/deploy/cdf_toolkit/
 Project-URL: Changelog, https://github.com/cognitedata/toolkit/releases
-Project-URL: Documentation, https://docs.cognite.com/cdf/deploy/cdf_toolkit/references/resource_library
 Project-URL: GitHub, https://github.com/cognitedata/toolkit
-Project-URL: Homepage, https://docs.cognite.com/cdf/deploy/cdf_toolkit/
+Project-URL: Documentation, https://docs.cognite.com/cdf/deploy/cdf_toolkit/references/resource_library
 Provides-Extra: sql
 Provides-Extra: table
 Description-Content-Type: text/markdown