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

cognite_toolkit/_cdf_tk/apps/_download_app.py

@@ -7,7 +7,7 @@ import typer
 from questionary import Choice
 from rich import print
 
-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.commands import DownloadCommand
 from cognite_toolkit._cdf_tk.constants import DATA_DEFAULT_DIR
 from cognite_toolkit._cdf_tk.feature_flags import Flags

cognite_toolkit/_cdf_tk/apps/_dump_app.py

@@ -6,7 +6,7 @@ from cognite.client.data_classes import WorkflowVersionId
 from cognite.client.data_classes.data_modeling import DataModelId, ViewId
 from rich import print
 
-from cognite_toolkit._cdf_tk.client.data_classes.legacy.search_config import ViewId as SearchConfigViewId
+from cognite_toolkit._cdf_tk.client.resource_classes.legacy.search_config import ViewId as SearchConfigViewId
 from cognite_toolkit._cdf_tk.commands import DumpResourceCommand
 from cognite_toolkit._cdf_tk.commands.dump_resource import (
     AgentFinder,

cognite_toolkit/_cdf_tk/builders/_raw.py

@@ -3,7 +3,7 @@ from collections.abc import Callable, Iterable, Sequence
 from typing import Any
 
 from cognite_toolkit._cdf_tk.builders import Builder
-from cognite_toolkit._cdf_tk.client.data_classes.legacy.raw import RawDatabase
+from cognite_toolkit._cdf_tk.client.resource_classes.legacy.raw import RawDatabase
 from cognite_toolkit._cdf_tk.cruds import RawDatabaseCRUD, RawTableCRUD, ResourceCRUD
 from cognite_toolkit._cdf_tk.data_classes import (
     BuildDestinationFile,

cognite_toolkit/_cdf_tk/client/_toolkit_client.py

@@ -15,20 +15,28 @@ from cognite_toolkit._cdf_tk.client.api.legacy.robotics import RoboticsAPI
 from cognite_toolkit._cdf_tk.client.http_client import HTTPClient
 
 from .api.assets import AssetsAPI
+from .api.datasets import DataSetsAPI
 from .api.events import EventsAPI
+from .api.extraction_pipelines import ExtractionPipelinesAPI
 from .api.filemetadata import FileMetadataAPI
+from .api.hosted_extractors import HostedExtractorsAPI
 from .api.infield import InfieldAPI
+from .api.labels import LabelsAPI
 from .api.lookup import LookUpGroup
 from .api.migration import MigrationAPI
 from .api.project import ProjectAPI
 from .api.raw import RawAPI
 from .api.search import SearchAPI
+from .api.security_categories import SecurityCategoriesAPI
+from .api.sequences import SequencesAPI
 from .api.simulators import SimulatorsAPI
 from .api.streams import StreamsAPI
 from .api.three_d import ThreeDAPI
 from .api.timeseries import TimeSeriesAPI
 from .api.token import TokenAPI
+from .api.transformations import TransformationsAPI
 from .api.verify import VerifyAPI
+from .api.workflows import WorkflowsAPI
 from .config import ToolkitClientConfig
 
 
@@ -37,13 +45,21 @@ class ToolAPI:
 
     def __init__(self, http_client: HTTPClient, console: Console) -> None:
         self.http_client = http_client
-        self.three_d = ThreeDAPI(http_client, console)
         self.assets = AssetsAPI(http_client)
-        self.timeseries = TimeSeriesAPI(http_client)
-        self.filemetadata = FileMetadataAPI(http_client)
+        self.datasets = DataSetsAPI(http_client)
         self.events = EventsAPI(http_client)
+        self.extraction_pipelines = ExtractionPipelinesAPI(http_client)
+        self.hosted_extractors = HostedExtractorsAPI(http_client)
+        self.labels = LabelsAPI(http_client)
+        self.filemetadata = FileMetadataAPI(http_client)
         self.raw = RawAPI(http_client)
+        self.security_categories = SecurityCategoriesAPI(http_client)
+        self.sequences = SequencesAPI(http_client)
         self.simulators = SimulatorsAPI(http_client)
+        self.three_d = ThreeDAPI(http_client, console)
+        self.timeseries = TimeSeriesAPI(http_client)
+        self.transformations = TransformationsAPI(http_client)
+        self.workflows = WorkflowsAPI(http_client)
 
 
 class ToolkitClient(CogniteClient):

cognite_toolkit/_cdf_tk/client/api/assets.py

@@ -1,11 +1,12 @@
-from collections.abc import Sequence
-from typing import Any, Literal
+from collections.abc import Iterable, Sequence
+from typing import Literal
 
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, PagedResponse, ResponseItems
 from cognite_toolkit._cdf_tk.client.cdf_client.api import Endpoint
-from cognite_toolkit._cdf_tk.client.data_classes.asset import AssetRequest, AssetResponse
-from cognite_toolkit._cdf_tk.client.data_classes.identifiers import InternalOrExternalId
 from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse2, SuccessResponse2
+from cognite_toolkit._cdf_tk.client.request_classes.filters import ClassicFilter
+from cognite_toolkit._cdf_tk.client.resource_classes.asset import AssetRequest, AssetResponse
+from cognite_toolkit._cdf_tk.client.resource_classes.identifiers import InternalOrExternalId
 
 
 class AssetsAPI(CDFResourceAPI[InternalOrExternalId, AssetRequest, AssetResponse]):
@@ -21,7 +22,9 @@ class AssetsAPI(CDFResourceAPI[InternalOrExternalId, AssetRequest, AssetResponse
             },
         )
 
-    def _page_response(self, response: SuccessResponse2 | ItemsSuccessResponse2) -> PagedResponse[AssetResponse]:
+    def _validate_page_response(
+        self, response: SuccessResponse2 | ItemsSuccessResponse2
+    ) -> PagedResponse[AssetResponse]:
         return PagedResponse[AssetResponse].model_validate_json(response.body)
 
     def _reference_response(self, response: SuccessResponse2) -> ResponseItems[InternalOrExternalId]:
@@ -78,11 +81,10 @@ class AssetsAPI(CDFResourceAPI[InternalOrExternalId, AssetRequest, AssetResponse
             items, "delete", extra_body={"recursive": recursive, "ignoreUnknownIds": ignore_unknown_ids}
         )
 
-    def iterate(
+    def paginate(
         self,
         aggregated_properties: bool = False,
-        data_set_external_ids: list[str] | None = None,
-        asset_subtree_external_ids: list[str] | None = None,
+        filter: ClassicFilter | None = None,
         limit: int = 100,
         cursor: str | None = None,
     ) -> PagedResponse[AssetResponse]:
@@ -91,25 +93,35 @@ class AssetsAPI(CDFResourceAPI[InternalOrExternalId, AssetRequest, AssetResponse
         Returns:
             PagedResponse of AssetResponse objects.
         """
-        filter_: dict[str, Any] = {}
-        if asset_subtree_external_ids:
-            filter_["assetSubtreeExternalIds"] = [{"externalId": ext_id} for ext_id in asset_subtree_external_ids]
-        if data_set_external_ids:
-            filter_["dataSetIds"] = [{"externalId": ds_id} for ds_id in data_set_external_ids]
-
-        return self._iterate(
+        return self._paginate(
             cursor=cursor,
             limit=limit,
             body={
                 "aggregatedProperties": ["childCount", "path", "depth"] if aggregated_properties else [],
-                "filter": filter_ or None,
+                "filter": filter.dump() if filter else None,
             },
         )
 
-    def list(
+    def iterate(
         self,
+        aggregated_properties: bool = False,
+        filter: ClassicFilter | None = None,
         limit: int | None = 100,
-    ) -> list[AssetResponse]:
+    ) -> Iterable[list[AssetResponse]]:
+        """Iterate over all assets in CDF.
+
+        Returns:
+            Sequence of AssetResponse objects.
+        """
+        return self._iterate(
+            limit=limit,
+            body={
+                "aggregatedProperties": ["childCount", "path", "depth"] if aggregated_properties else [],
+                "filter": filter.dump() if filter else None,
+            },
+        )
+
+    def list(self, limit: int | None = 100) -> list[AssetResponse]:
         """List all asset references in CDF.
 
         Returns:

cognite_toolkit/_cdf_tk/client/api/datasets.py

@@ -0,0 +1,141 @@
+from collections.abc import Iterable, Sequence
+from typing import Any, Literal
+
+from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, PagedResponse, ResponseItems
+from cognite_toolkit._cdf_tk.client.cdf_client.api import Endpoint
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse2, SuccessResponse2
+from cognite_toolkit._cdf_tk.client.resource_classes.dataset import DataSetRequest, DataSetResponse
+from cognite_toolkit._cdf_tk.client.resource_classes.identifiers import InternalOrExternalId
+
+
+class DataSetsAPI(CDFResourceAPI[InternalOrExternalId, DataSetRequest, DataSetResponse]):
+    def __init__(self, http_client: HTTPClient) -> None:
+        super().__init__(
+            http_client=http_client,
+            method_endpoint_map={
+                "create": Endpoint(method="POST", path="/datasets", item_limit=10, concurrency_max_workers=1),
+                "retrieve": Endpoint(method="POST", path="/datasets/byids", item_limit=1000, concurrency_max_workers=1),
+                "update": Endpoint(method="POST", path="/datasets/update", item_limit=1000, concurrency_max_workers=1),
+                "list": Endpoint(method="POST", path="/datasets/list", item_limit=1000),
+            },
+        )
+
+    def _validate_page_response(
+        self, response: SuccessResponse2 | ItemsSuccessResponse2
+    ) -> PagedResponse[DataSetResponse]:
+        return PagedResponse[DataSetResponse].model_validate_json(response.body)
+
+    def _reference_response(self, response: SuccessResponse2) -> ResponseItems[InternalOrExternalId]:
+        return ResponseItems[InternalOrExternalId].model_validate_json(response.body)
+
+    def create(self, items: Sequence[DataSetRequest]) -> list[DataSetResponse]:
+        """Create data sets in CDF.
+
+        Args:
+            items: List of DataSetRequest objects to create.
+        Returns:
+            List of created DataSetResponse objects.
+        """
+        return self._request_item_response(items, "create")
+
+    def retrieve(
+        self, items: Sequence[InternalOrExternalId], ignore_unknown_ids: bool = False
+    ) -> list[DataSetResponse]:
+        """Retrieve data sets from CDF.
+
+        Args:
+            items: List of InternalOrExternalId objects to retrieve.
+            ignore_unknown_ids: Whether to ignore unknown IDs.
+        Returns:
+            List of retrieved DataSetResponse objects.
+        """
+        return self._request_item_response(
+            items, method="retrieve", extra_body={"ignoreUnknownIds": ignore_unknown_ids}
+        )
+
+    def update(
+        self, items: Sequence[DataSetRequest], mode: Literal["patch", "replace"] = "replace"
+    ) -> list[DataSetResponse]:
+        """Update data sets in CDF.
+
+        Args:
+            items: List of DataSetRequest objects to update.
+            mode: Update mode, either "patch" or "replace".
+
+        Returns:
+            List of updated DataSetResponse objects.
+        """
+        return self._update(items, mode=mode)
+
+    def paginate(
+        self,
+        metadata: dict[str, str] | None = None,
+        external_id_prefix: str | None = None,
+        write_protected: bool | None = None,
+        limit: int = 100,
+        cursor: str | None = None,
+    ) -> PagedResponse[DataSetResponse]:
+        """Iterate over all data sets in CDF.
+
+        Args:
+            metadata: Filter by metadata.
+            external_id_prefix: Filter by external ID prefix.
+            write_protected: Filter by write protection status.
+            limit: Maximum number of items to return.
+            cursor: Cursor for pagination.
+
+        Returns:
+            PagedResponse of DataSetResponse objects.
+        """
+        filter_body: dict[str, Any] = {}
+        if metadata is not None:
+            filter_body["metadata"] = metadata
+        if external_id_prefix is not None:
+            filter_body["externalIdPrefix"] = external_id_prefix
+        if write_protected is not None:
+            filter_body["writeProtected"] = write_protected
+
+        return self._paginate(
+            cursor=cursor,
+            limit=limit,
+            body={"filter": filter_body} if filter_body else {},
+        )
+
+    def iterate(
+        self,
+        metadata: dict[str, str] | None = None,
+        external_id_prefix: str | None = None,
+        write_protected: bool | None = None,
+        limit: int = 100,
+    ) -> Iterable[list[DataSetResponse]]:
+        """Iterate over all data sets in CDF.
+
+        Args:
+            metadata: Filter by metadata.
+            external_id_prefix: Filter by external ID prefix.
+            write_protected: Filter by write protection status.
+            limit: Maximum number of items to return per page.
+
+        Returns:
+            Iterable of lists of DataSetResponse objects.
+        """
+        filter_body: dict[str, Any] = {}
+        if metadata is not None:
+            filter_body["metadata"] = metadata
+        if external_id_prefix is not None:
+            filter_body["externalIdPrefix"] = external_id_prefix
+        if write_protected is not None:
+            filter_body["writeProtected"] = write_protected
+
+        return self._iterate(
+            limit=limit,
+            body={"filter": filter_body} if filter_body else {},
+        )
+
+    def list(self, limit: int | None = 100) -> list[DataSetResponse]:
+        """List all data sets in CDF.
+
+        Returns:
+            List of DataSetResponse objects.
+        """
+        return self._list(limit=limit)

cognite_toolkit/_cdf_tk/client/api/events.py

@@ -1,11 +1,12 @@
-from collections.abc import Sequence
-from typing import Any, Literal
+from collections.abc import Iterable, Sequence
+from typing import Literal
 
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, PagedResponse, ResponseItems
 from cognite_toolkit._cdf_tk.client.cdf_client.api import Endpoint
-from cognite_toolkit._cdf_tk.client.data_classes.event import EventRequest, EventResponse
-from cognite_toolkit._cdf_tk.client.data_classes.identifiers import InternalOrExternalId
 from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse2, SuccessResponse2
+from cognite_toolkit._cdf_tk.client.request_classes.filters import ClassicFilter
+from cognite_toolkit._cdf_tk.client.resource_classes.event import EventRequest, EventResponse
+from cognite_toolkit._cdf_tk.client.resource_classes.identifiers import InternalOrExternalId
 
 
 class EventsAPI(CDFResourceAPI[InternalOrExternalId, EventRequest, EventResponse]):
@@ -21,7 +22,9 @@ class EventsAPI(CDFResourceAPI[InternalOrExternalId, EventRequest, EventResponse
             },
         )
 
-    def _page_response(self, response: SuccessResponse2 | ItemsSuccessResponse2) -> PagedResponse[EventResponse]:
+    def _validate_page_response(
+        self, response: SuccessResponse2 | ItemsSuccessResponse2
+    ) -> PagedResponse[EventResponse]:
         return PagedResponse[EventResponse].model_validate_json(response.body)
 
     def _reference_response(self, response: SuccessResponse2) -> ResponseItems[InternalOrExternalId]:
@@ -73,34 +76,45 @@ class EventsAPI(CDFResourceAPI[InternalOrExternalId, EventRequest, EventResponse
         """
         self._request_no_response(items, "delete", extra_body={"ignoreUnknownIds": ignore_unknown_ids})
 
-    def iterate(
+    def paginate(
         self,
-        data_set_external_ids: list[str] | None = None,
-        asset_subtree_external_ids: list[str] | None = None,
+        filter: ClassicFilter | None = None,
         limit: int = 100,
         cursor: str | None = None,
     ) -> PagedResponse[EventResponse]:
         """Iterate over all events in CDF.
 
         Args:
-            data_set_external_ids: Filter by data set external IDs.
-            asset_subtree_external_ids: Filter by asset subtree external IDs.
+            filter: Filter by data set IDs and/or asset subtree IDs.
             limit: Maximum number of items to return.
             cursor: Cursor for pagination.
 
         Returns:
             PagedResponse of EventResponse objects.
         """
-        filter_: dict[str, Any] = {}
-        if asset_subtree_external_ids:
-            filter_["assetSubtreeIds"] = [{"externalId": ext_id} for ext_id in asset_subtree_external_ids]
-        if data_set_external_ids:
-            filter_["dataSetIds"] = [{"externalId": ds_id} for ds_id in data_set_external_ids]
+        return self._paginate(
+            cursor=cursor,
+            limit=limit,
+            body={"filter": filter.dump() if filter else None},
+        )
 
+    def iterate(
+        self,
+        filter: ClassicFilter | None = None,
+        limit: int | None = 100,
+    ) -> Iterable[list[EventResponse]]:
+        """Iterate over all events in CDF.
+
+        Args:
+            filter: Filter by data set IDs and/or asset subtree IDs.
+            limit: Maximum number of items to return per page.
+
+        Returns:
+            Iterable of lists of EventResponse objects.
+        """
         return self._iterate(
-            cursor=cursor,
             limit=limit,
-            body={"filter": filter_ or None},
+            body={"filter": filter.dump() if filter else None},
         )
 
     def list(

cognite_toolkit/_cdf_tk/client/api/extraction_pipelines.py

@@ -0,0 +1,148 @@
+from collections.abc import Iterable, Sequence
+from typing import Any, Literal
+
+from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, PagedResponse, ResponseItems
+from cognite_toolkit._cdf_tk.client.cdf_client.api import Endpoint
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse2, SuccessResponse2
+from cognite_toolkit._cdf_tk.client.request_classes.filters import ClassicFilter
+from cognite_toolkit._cdf_tk.client.resource_classes.extraction_pipeline import (
+    ExtractionPipelineRequest,
+    ExtractionPipelineResponse,
+)
+from cognite_toolkit._cdf_tk.client.resource_classes.identifiers import InternalOrExternalId
+
+
+class ExtractionPipelinesAPI(
+    CDFResourceAPI[InternalOrExternalId, ExtractionPipelineRequest, ExtractionPipelineResponse]
+):
+    def __init__(self, http_client: HTTPClient) -> None:
+        super().__init__(
+            http_client=http_client,
+            method_endpoint_map={
+                "create": Endpoint(method="POST", path="/extpipes", item_limit=1000, concurrency_max_workers=1),
+                "retrieve": Endpoint(method="POST", path="/extpipes/byids", item_limit=1000, concurrency_max_workers=1),
+                "update": Endpoint(method="POST", path="/extpipes/update", item_limit=1000, concurrency_max_workers=1),
+                "delete": Endpoint(method="POST", path="/extpipes/delete", item_limit=1000, concurrency_max_workers=1),
+                "list": Endpoint(method="POST", path="/extpipes/list", item_limit=1000),
+            },
+        )
+
+    def _validate_page_response(
+        self, response: SuccessResponse2 | ItemsSuccessResponse2
+    ) -> PagedResponse[ExtractionPipelineResponse]:
+        return PagedResponse[ExtractionPipelineResponse].model_validate_json(response.body)
+
+    def _reference_response(self, response: SuccessResponse2) -> ResponseItems[InternalOrExternalId]:
+        return ResponseItems[InternalOrExternalId].model_validate_json(response.body)
+
+    def create(self, items: Sequence[ExtractionPipelineRequest]) -> list[ExtractionPipelineResponse]:
+        """Create extraction pipelines in CDF.
+
+        Args:
+            items: List of ExtractionPipelineRequest objects to create.
+        Returns:
+            List of created ExtractionPipelineResponse objects.
+        """
+        return self._request_item_response(items, "create")
+
+    def retrieve(
+        self, items: Sequence[InternalOrExternalId], ignore_unknown_ids: bool = False
+    ) -> list[ExtractionPipelineResponse]:
+        """Retrieve extraction pipelines from CDF.
+
+        Args:
+            items: List of InternalOrExternalId objects to retrieve.
+            ignore_unknown_ids: Whether to ignore unknown IDs.
+        Returns:
+            List of retrieved ExtractionPipelineResponse objects.
+        """
+        return self._request_item_response(
+            items, method="retrieve", extra_body={"ignoreUnknownIds": ignore_unknown_ids}
+        )
+
+    def update(
+        self, items: Sequence[ExtractionPipelineRequest], mode: Literal["patch", "replace"] = "replace"
+    ) -> list[ExtractionPipelineResponse]:
+        """Update extraction pipelines in CDF.
+
+        Args:
+            items: List of ExtractionPipelineRequest objects to update.
+            mode: Update mode, either "patch" or "replace".
+
+        Returns:
+            List of updated ExtractionPipelineResponse objects.
+        """
+        return self._update(items, mode=mode)
+
+    def delete(self, items: Sequence[InternalOrExternalId], ignore_unknown_ids: bool = False) -> None:
+        """Delete extraction pipelines from CDF.
+
+        Args:
+            items: List of InternalOrExternalId objects to delete.
+            ignore_unknown_ids: Whether to ignore unknown IDs.
+        """
+        self._request_no_response(items, "delete", extra_body={"ignoreUnknownIds": ignore_unknown_ids})
+
+    def paginate(
+        self,
+        filter: ClassicFilter | None = None,
+        external_id_prefix: str | None = None,
+        limit: int = 100,
+        cursor: str | None = None,
+    ) -> PagedResponse[ExtractionPipelineResponse]:
+        """Iterate over all extraction pipelines in CDF.
+
+        Args:
+            filter: Filter by data set IDs.
+            external_id_prefix: Filter by external ID prefix.
+            limit: Maximum number of items to return.
+            cursor: Cursor for pagination.
+
+        Returns:
+            PagedResponse of ExtractionPipelineResponse objects.
+        """
+        filter_body: dict[str, Any] = filter.dump() if filter else {}
+        if external_id_prefix is not None:
+            filter_body["externalIdPrefix"] = external_id_prefix
+
+        return self._paginate(
+            cursor=cursor,
+            limit=limit,
+            body={"filter": filter_body} if filter_body else None,
+        )
+
+    def iterate(
+        self,
+        filter: ClassicFilter | None = None,
+        external_id_prefix: str | None = None,
+        limit: int = 100,
+    ) -> Iterable[list[ExtractionPipelineResponse]]:
+        """Iterate over all extraction pipelines in CDF.
+
+        Args:
+            filter: Filter by data set IDs.
+            external_id_prefix: Filter by external ID prefix.
+            limit: Maximum number of items to return per page.
+
+        Returns:
+            Iterable of lists of ExtractionPipelineResponse objects.
+        """
+        filter_body: dict[str, Any] = filter.dump() if filter else {}
+        if external_id_prefix is not None:
+            filter_body["externalIdPrefix"] = external_id_prefix
+
+        return self._iterate(
+            limit=limit,
+            body={"filter": filter_body} if filter_body else None,
+        )
+
+    def list(
+        self,
+        limit: int | None = 100,
+    ) -> list[ExtractionPipelineResponse]:
+        """List all extraction pipelines in CDF.
+
+        Returns:
+            List of ExtractionPipelineResponse objects.
+        """
+        return self._list(limit=limit)

cognite_toolkit/_cdf_tk/client/api/filemetadata.py

@@ -1,16 +1,17 @@
-from collections.abc import Sequence
+from collections.abc import Iterable, Sequence
 from typing import Any, Literal
 
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, PagedResponse, ResponseItems
 from cognite_toolkit._cdf_tk.client.cdf_client.api import Endpoint
-from cognite_toolkit._cdf_tk.client.data_classes.filemetadata import FileMetadataRequest, FileMetadataResponse
-from cognite_toolkit._cdf_tk.client.data_classes.identifiers import InternalOrExternalId
 from cognite_toolkit._cdf_tk.client.http_client import (
     HTTPClient,
     ItemsSuccessResponse2,
     RequestMessage2,
     SuccessResponse2,
 )
+from cognite_toolkit._cdf_tk.client.request_classes.filters import ClassicFilter
+from cognite_toolkit._cdf_tk.client.resource_classes.filemetadata import FileMetadataRequest, FileMetadataResponse
+from cognite_toolkit._cdf_tk.client.resource_classes.identifiers import InternalOrExternalId
 
 
 class FileMetadataAPI(CDFResourceAPI[InternalOrExternalId, FileMetadataRequest, FileMetadataResponse]):
@@ -26,7 +27,9 @@ class FileMetadataAPI(CDFResourceAPI[InternalOrExternalId, FileMetadataRequest,
             },
         )
 
-    def _page_response(self, response: SuccessResponse2 | ItemsSuccessResponse2) -> PagedResponse[FileMetadataResponse]:
+    def _validate_page_response(
+        self, response: SuccessResponse2 | ItemsSuccessResponse2
+    ) -> PagedResponse[FileMetadataResponse]:
         return PagedResponse[FileMetadataResponse].model_validate_json(response.body)
 
     def _reference_response(self, response: SuccessResponse2) -> ResponseItems[InternalOrExternalId]:
@@ -56,7 +59,7 @@ class FileMetadataAPI(CDFResourceAPI[InternalOrExternalId, FileMetadataRequest,
             )
             response = self._http_client.request_single_retries(request)
             result = response.get_success_or_raise()
-            results.extend(self._page_response(result).items)
+            results.append(FileMetadataResponse.model_validate_json(result.body))
         return results
 
     def retrieve(
@@ -97,10 +100,9 @@ class FileMetadataAPI(CDFResourceAPI[InternalOrExternalId, FileMetadataRequest,
         """
         self._request_no_response(items, "delete", extra_body={"ignoreUnknownIds": ignore_unknown_ids})
 
-    def iterate(
+    def paginate(
         self,
-        data_set_external_ids: list[str] | None = None,
-        asset_subtree_external_ids: list[str] | None = None,
+        filter: ClassicFilter | None = None,
         directory_prefix: str | None = None,
         uploaded: bool | None = None,
         limit: int = 100,
@@ -109,8 +111,7 @@ class FileMetadataAPI(CDFResourceAPI[InternalOrExternalId, FileMetadataRequest,
         """Iterate over file metadata in CDF.
 
         Args:
-            data_set_external_ids: Filter by data set external IDs.
-            asset_subtree_external_ids: Filter by asset subtree external IDs.
+            filter: Filter by data set IDs and/or asset subtree IDs.
             directory_prefix: Filter by directory prefix.
             uploaded: Filter by upload status.
             limit: Maximum number of items to return per page.
@@ -119,22 +120,47 @@ class FileMetadataAPI(CDFResourceAPI[InternalOrExternalId, FileMetadataRequest,
         Returns:
             PagedResponse of FileMetadataResponse objects.
         """
-        filter_: dict[str, Any] = {}
-        if asset_subtree_external_ids:
-            filter_["assetSubtreeIds"] = [{"externalId": ext_id} for ext_id in asset_subtree_external_ids]
-        if data_set_external_ids:
-            filter_["dataSetIds"] = [{"externalId": ds_id} for ds_id in data_set_external_ids]
+        filter_: dict[str, Any] = filter.dump() if filter else {}
         if directory_prefix is not None:
             filter_["directoryPrefix"] = directory_prefix
         if uploaded is not None:
             filter_["uploaded"] = uploaded
 
-        return self._iterate(
+        return self._paginate(
             cursor=cursor,
             limit=limit,
             body={"filter": filter_ or None},
         )
 
+    def iterate(
+        self,
+        filter: ClassicFilter | None = None,
+        directory_prefix: str | None = None,
+        uploaded: bool | None = None,
+        limit: int | None = 100,
+    ) -> Iterable[list[FileMetadataResponse]]:
+        """Iterate over file metadata in CDF.
+
+        Args:
+            filter: Filter by data set IDs and/or asset subtree IDs.
+            directory_prefix: Filter by directory prefix.
+            uploaded: Filter by upload status.
+            limit: Maximum number of items to return per page.
+
+        Returns:
+            Iterable of lists of FileMetadataResponse objects.
+        """
+        filter_: dict[str, Any] = filter.dump() if filter else {}
+        if directory_prefix is not None:
+            filter_["directoryPrefix"] = directory_prefix
+        if uploaded is not None:
+            filter_["uploaded"] = uploaded
+
+        return self._iterate(
+            limit=limit,
+            body={"filter": filter_ or None},
+        )
+
     def list(
         self,
         limit: int | None = 100,