cognite-toolkit 0.5.44__py3-none-any.whl → 0.7.34__py3-none-any.whl

cognite_toolkit/_cdf_tk/{loaders/_resource_loaders/relationship_loader.py → cruds/_resource_cruds/relationship.py}

@@ -1,39 +1,34 @@
 from collections.abc import Hashable, Iterable, Sequence
-from functools import lru_cache
 from typing import Any, final
 
 from cognite.client.data_classes import (
     Relationship,
     RelationshipList,
     RelationshipWrite,
-    RelationshipWriteList,
     capabilities,
 )
 from cognite.client.data_classes.capabilities import Capability
 from cognite.client.exceptions import CogniteAPIError, CogniteNotFoundError
 from cognite.client.utils.useful_types import SequenceNotStr
 
-from cognite_toolkit._cdf_tk._parameters import ANY_INT, ParameterSpec, ParameterSpecSet
-from cognite_toolkit._cdf_tk.loaders._base_loaders import ResourceLoader
+from cognite_toolkit._cdf_tk.cruds._base_cruds import ResourceCRUD
+from cognite_toolkit._cdf_tk.resource_classes import RelationshipYAML
 
-from .classic_loaders import AssetLoader, EventLoader, SequenceLoader
-from .data_organization_loaders import DataSetsLoader, LabelLoader
-from .file_loader import FileMetadataLoader
-from .timeseries_loaders import TimeSeriesLoader
+from .classic import AssetCRUD, EventCRUD, SequenceCRUD
+from .data_organization import DataSetsCRUD, LabelCRUD
+from .file import FileMetadataCRUD
+from .timeseries import TimeSeriesCRUD
 
 
 @final
-class RelationshipLoader(ResourceLoader[str, RelationshipWrite, Relationship, RelationshipWriteList, RelationshipList]):
+class RelationshipCRUD(ResourceCRUD[str, RelationshipWrite, Relationship]):
     folder_name = "classic"
-    filename_pattern = r"^.*\.Relationship$"  # Matches all yaml files whose stem ends with '.Asset'.
-    filetypes = frozenset({"yaml", "yml"})
     resource_cls = Relationship
     resource_write_cls = RelationshipWrite
-    list_cls = RelationshipList
-    list_write_cls = RelationshipWriteList
     kind = "Relationship"
+    yaml_cls = RelationshipYAML
     dependencies = frozenset(
-        {DataSetsLoader, AssetLoader, EventLoader, SequenceLoader, FileMetadataLoader, TimeSeriesLoader, LabelLoader}
+        {DataSetsCRUD, AssetCRUD, EventCRUD, SequenceCRUD, FileMetadataCRUD, TimeSeriesCRUD, LabelCRUD}
     )
     _doc_url = "Relationships/operation/createRelationships"
 
@@ -73,18 +68,15 @@ class RelationshipLoader(ResourceLoader[str, RelationshipWrite, Relationship, Re
             if data_set_ids := {item.data_set_id for item in items if item.data_set_id}:
                 scope = capabilities.RelationshipsAcl.Scope.DataSet(list(data_set_ids))
 
-        return capabilities.RelationshipsAcl(
-            actions,
-            scope,  # type: ignore[arg-type]
-        )
+        return capabilities.RelationshipsAcl(actions, scope)
 
-    def create(self, items: RelationshipWriteList) -> RelationshipList:
+    def create(self, items: Sequence[RelationshipWrite]) -> RelationshipList:
         return self.client.relationships.create(items)
 
     def retrieve(self, ids: SequenceNotStr[str]) -> RelationshipList:
         return self.client.relationships.retrieve_multiple(external_ids=ids, ignore_unknown_ids=True)
 
-    def update(self, items: RelationshipWriteList) -> RelationshipList:
+    def update(self, items: Sequence[RelationshipWrite]) -> RelationshipList:
         return self.client.relationships.update(items)
 
     def delete(self, ids: SequenceNotStr[str]) -> int:
@@ -109,33 +101,19 @@ class RelationshipLoader(ResourceLoader[str, RelationshipWrite, Relationship, Re
         )
 
     @classmethod
-    @lru_cache(maxsize=1)
-    def get_write_cls_parameter_spec(cls) -> ParameterSpecSet:
-        spec = super().get_write_cls_parameter_spec()
-        # Added by toolkit
-        spec.add(ParameterSpec(("dataSetExternalId",), frozenset({"str"}), is_required=False, _is_nullable=False))
-        spec.discard(ParameterSpec(("dataSetId",), frozenset({"int"}), is_required=False, _is_nullable=False))
-
-        # Failure from generation of spec
-        spec.add(
-            ParameterSpec(("labels", ANY_INT, "externalId"), frozenset({"str"}), is_required=False, _is_nullable=False)
-        )
-        return spec
-
-    @classmethod
-    def get_dependent_items(cls, item: dict) -> Iterable[tuple[type[ResourceLoader], Hashable]]:
+    def get_dependent_items(cls, item: dict) -> Iterable[tuple[type[ResourceCRUD], Hashable]]:
         """Returns all items that this item requires.
 
         For example, a TimeSeries requires a DataSet, so this method would return the
         DatasetLoader and identifier of that dataset.
         """
         if "dataSetExternalId" in item:
-            yield DataSetsLoader, item["dataSetExternalId"]
+            yield DataSetsCRUD, item["dataSetExternalId"]
         for label in item.get("labels", []):
             if isinstance(label, dict):
-                yield LabelLoader, label["externalId"]
+                yield LabelCRUD, label["externalId"]
             elif isinstance(label, str):
-                yield LabelLoader, label
+                yield LabelCRUD, label
         for connection in ["source", "target"]:
             type_key = f"{connection}Type"
             id_key = f"{connection}ExternalId"
@@ -145,15 +123,15 @@ class RelationshipLoader(ResourceLoader[str, RelationshipWrite, Relationship, Re
                 if isinstance(id_value, str) and isinstance(type_value, str):
                     type_value = type_value.strip().casefold()
                     if type_value == "asset":
-                        yield AssetLoader, id_value
+                        yield AssetCRUD, id_value
                     elif type_value == "sequence":
-                        yield SequenceLoader, id_value
+                        yield SequenceCRUD, id_value
                     elif type_value == "timeseries":
-                        yield TimeSeriesLoader, id_value
+                        yield TimeSeriesCRUD, id_value
                     elif type_value == "file":
-                        yield FileMetadataLoader, id_value
+                        yield FileMetadataCRUD, id_value
                     elif type_value == "event":
-                        yield EventLoader, id_value
+                        yield EventCRUD, id_value
 
     def load_resource(self, resource: dict[str, Any], is_dry_run: bool = False) -> RelationshipWrite:
         if ds_external_id := resource.pop("dataSetExternalId", None):

cognite_toolkit/_cdf_tk/{loaders/_resource_loaders/robotics_loaders.py → cruds/_resource_cruds/robotics.py}

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import json
 from collections.abc import Callable, Hashable, Iterable, Sequence
 from contextlib import suppress
@@ -15,36 +13,36 @@ from cognite_toolkit._cdf_tk.client.data_classes.robotics import (
     DataPostProcessing,
     DataPostProcessingList,
     DataPostProcessingWrite,
-    DataPostProcessingWriteList,
     Frame,
     FrameList,
     FrameWrite,
-    FrameWriteList,
     Location,
     LocationList,
     LocationWrite,
-    LocationWriteList,
     Map,
     MapList,
     MapWrite,
-    MapWriteList,
     RobotCapability,
     RobotCapabilityList,
     RobotCapabilityWrite,
-    RobotCapabilityWriteList,
 )
-from cognite_toolkit._cdf_tk.loaders._base_loaders import ResourceLoader
+from cognite_toolkit._cdf_tk.cruds._base_cruds import ResourceCRUD
+from cognite_toolkit._cdf_tk.resource_classes import (
+    RobotCapabilityYAML,
+    RobotDataPostProcessingYAML,
+    RobotFrameYAML,
+    RobotLocationYAML,
+    RobotMapYAML,
+)
 from cognite_toolkit._cdf_tk.utils.diff_list import diff_list_hashable
 
 
-class RoboticFrameLoader(ResourceLoader[str, FrameWrite, Frame, FrameWriteList, FrameList]):
+class RoboticFrameCRUD(ResourceCRUD[str, FrameWrite, Frame]):
     folder_name = "robotics"
-    filename_pattern = r"^.*\.Frame$"  # Matches all yaml files whose stem ends with '.Frame'.
     resource_cls = Frame
     resource_write_cls = FrameWrite
-    list_cls = FrameList
-    list_write_cls = FrameWriteList
     kind = "Frame"
+    yaml_cls = RobotFrameYAML
     _doc_url = "Frames/operation/createFrames"
 
     @property
@@ -75,18 +73,17 @@ class RoboticFrameLoader(ResourceLoader[str, FrameWrite, Frame, FrameWriteList,
                 capabilities.RoboticsAcl.Action.Create,
                 capabilities.RoboticsAcl.Action.Delete,
                 capabilities.RoboticsAcl.Action.Update,
-                capabilities.RoboticsAcl.Action.Delete,
             ],
             capabilities.RoboticsAcl.Scope.All(),
         )
 
-    def create(self, items: FrameWriteList) -> FrameList:
+    def create(self, items: Sequence[FrameWrite]) -> FrameList:
         return self.client.robotics.frames.create(items)
 
     def retrieve(self, ids: SequenceNotStr[str]) -> FrameList:
         return _fallback_to_one_by_one(self.client.robotics.frames.retrieve, ids, FrameList)
 
-    def update(self, items: FrameWriteList) -> FrameList:
+    def update(self, items: Sequence[FrameWrite]) -> FrameList:
         return self.client.robotics.frames.update(items)
 
     def delete(self, ids: SequenceNotStr[str]) -> int:
@@ -105,14 +102,12 @@ class RoboticFrameLoader(ResourceLoader[str, FrameWrite, Frame, FrameWriteList,
         return iter(self.client.robotics.frames)
 
 
-class RoboticLocationLoader(ResourceLoader[str, LocationWrite, Location, LocationWriteList, LocationList]):
+class RoboticLocationCRUD(ResourceCRUD[str, LocationWrite, Location]):
     folder_name = "robotics"
-    filename_pattern = r"^.*\.Location$"  # Matches all yaml files whose stem ends with '.Location'.
     resource_cls = Location
     resource_write_cls = LocationWrite
-    list_cls = LocationList
-    list_write_cls = LocationWriteList
     kind = "Location"
+    yaml_cls = RobotLocationYAML
     _doc_url = "Locations/operation/createLocations"
 
     @property
@@ -147,19 +142,18 @@ class RoboticLocationLoader(ResourceLoader[str, LocationWrite, Location, Locatio
                 capabilities.RoboticsAcl.Action.Create,
                 capabilities.RoboticsAcl.Action.Delete,
                 capabilities.RoboticsAcl.Action.Update,
-                capabilities.RoboticsAcl.Action.Delete,
             ]
         )
 
         return capabilities.RoboticsAcl(actions, capabilities.RoboticsAcl.Scope.All())
 
-    def create(self, items: LocationWriteList) -> LocationList:
+    def create(self, items: Sequence[LocationWrite]) -> LocationList:
         return self.client.robotics.locations.create(items)
 
     def retrieve(self, ids: SequenceNotStr[str]) -> LocationList:
         return _fallback_to_one_by_one(self.client.robotics.locations.retrieve, ids, LocationList)
 
-    def update(self, items: LocationWriteList) -> LocationList:
+    def update(self, items: Sequence[LocationWrite]) -> LocationList:
         return self.client.robotics.locations.update(items)
 
     def delete(self, ids: SequenceNotStr[str]) -> int:
@@ -178,18 +172,12 @@ class RoboticLocationLoader(ResourceLoader[str, LocationWrite, Location, Locatio
         return iter(self.client.robotics.locations)
 
 
-class RoboticsDataPostProcessingLoader(
-    ResourceLoader[
-        str, DataPostProcessingWrite, DataPostProcessing, DataPostProcessingWriteList, DataPostProcessingList
-    ]
-):
+class RoboticsDataPostProcessingCRUD(ResourceCRUD[str, DataPostProcessingWrite, DataPostProcessing]):
     folder_name = "robotics"
-    filename_pattern = r"^.*\.DataPostProcessing$"  # Matches all yaml files whose stem ends with '.DataPostProcessing'.
     resource_cls = DataPostProcessing
     resource_write_cls = DataPostProcessingWrite
-    list_cls = DataPostProcessingList
-    list_write_cls = DataPostProcessingWriteList
     kind = "DataPostProcessing"
+    yaml_cls = RobotDataPostProcessingYAML
     _doc_url = "DataPostProcessing/operation/createDataPostProcessing"
 
     @property
@@ -224,19 +212,18 @@ class RoboticsDataPostProcessingLoader(
                 capabilities.RoboticsAcl.Action.Create,
                 capabilities.RoboticsAcl.Action.Delete,
                 capabilities.RoboticsAcl.Action.Update,
-                capabilities.RoboticsAcl.Action.Delete,
             ]
         )
 
         return capabilities.RoboticsAcl(actions, capabilities.RoboticsAcl.Scope.All())
 
-    def create(self, items: DataPostProcessingWriteList) -> DataPostProcessingList:
+    def create(self, items: Sequence[DataPostProcessingWrite]) -> DataPostProcessingList:
         return self.client.robotics.data_postprocessing.create(items)
 
     def retrieve(self, ids: SequenceNotStr[str]) -> DataPostProcessingList:
         return _fallback_to_one_by_one(self.client.robotics.data_postprocessing.retrieve, ids, DataPostProcessingList)
 
-    def update(self, items: DataPostProcessingWriteList) -> DataPostProcessingList:
+    def update(self, items: Sequence[DataPostProcessingWrite]) -> DataPostProcessingList:
         # There is a bug in the /update endpoint that requires the input_schema to be a string
         # and not an object. This is a workaround until the bug is fixed.
         # We do the serialization to avoid modifying the original object.
@@ -274,16 +261,12 @@ class RoboticsDataPostProcessingLoader(
         return super().diff_list(local, cdf, json_path)
 
 
-class RobotCapabilityLoader(
-    ResourceLoader[str, RobotCapabilityWrite, RobotCapability, RobotCapabilityWriteList, RobotCapabilityList]
-):
+class RobotCapabilityCRUD(ResourceCRUD[str, RobotCapabilityWrite, RobotCapability]):
     folder_name = "robotics"
-    filename_pattern = r"^.*\.RobotCapability$"  # Matches all yaml files whose stem ends with '.RobotCapability'.
     resource_cls = RobotCapability
     resource_write_cls = RobotCapabilityWrite
-    list_cls = RobotCapabilityList
-    list_write_cls = RobotCapabilityWriteList
     kind = "RobotCapability"
+    yaml_cls = RobotCapabilityYAML
     _doc_url = "RobotCapabilities/operation/createRobotCapabilities"
 
     @property
@@ -318,19 +301,18 @@ class RobotCapabilityLoader(
                 capabilities.RoboticsAcl.Action.Create,
                 capabilities.RoboticsAcl.Action.Delete,
                 capabilities.RoboticsAcl.Action.Update,
-                capabilities.RoboticsAcl.Action.Delete,
             ]
         )
 
         return capabilities.RoboticsAcl(actions, capabilities.RoboticsAcl.Scope.All())
 
-    def create(self, items: RobotCapabilityWriteList) -> RobotCapabilityList:
+    def create(self, items: Sequence[RobotCapabilityWrite]) -> RobotCapabilityList:
         return self.client.robotics.capabilities.create(items)
 
     def retrieve(self, ids: SequenceNotStr[str]) -> RobotCapabilityList:
         return _fallback_to_one_by_one(self.client.robotics.capabilities.retrieve, ids, RobotCapabilityList)
 
-    def update(self, items: RobotCapabilityWriteList) -> RobotCapabilityList:
+    def update(self, items: Sequence[RobotCapabilityWrite]) -> RobotCapabilityList:
         # There is a bug in the /update endpoint that requires the input_schema to be a string
         # and not an object. This is a workaround until the bug is fixed.
         # We do the serialization to avoid modifying the original object.
@@ -371,15 +353,13 @@ class RobotCapabilityLoader(
         return super().diff_list(local, cdf, json_path)
 
 
-class RoboticMapLoader(ResourceLoader[str, MapWrite, Map, MapWriteList, MapList]):
+class RoboticMapCRUD(ResourceCRUD[str, MapWrite, Map]):
     folder_name = "robotics"
-    filename_pattern = r"^.*\.Map$"  # Matches all yaml files whose stem ends with '.Map'.
     resource_cls = Map
     resource_write_cls = MapWrite
-    list_cls = MapList
-    list_write_cls = MapWriteList
     kind = "Map"
-    dependencies = frozenset({RoboticFrameLoader, RoboticLocationLoader})
+    dependencies = frozenset({RoboticFrameCRUD, RoboticLocationCRUD})
+    yaml_cls = RobotMapYAML
     _doc_url = "Maps/operation/createMaps"
 
     @property
@@ -415,7 +395,6 @@ class RoboticMapLoader(ResourceLoader[str, MapWrite, Map, MapWriteList, MapList]
                 capabilities.RoboticsAcl.Action.Create,
                 capabilities.RoboticsAcl.Action.Delete,
                 capabilities.RoboticsAcl.Action.Update,
-                capabilities.RoboticsAcl.Action.Delete,
             ]
         )
 
@@ -429,13 +408,13 @@ class RoboticMapLoader(ResourceLoader[str, MapWrite, Map, MapWriteList, MapList]
             del dump["scale"]
         return dump
 
-    def create(self, items: MapWriteList) -> MapList:
+    def create(self, items: Sequence[MapWrite]) -> MapList:
         return self.client.robotics.maps.create(items)
 
     def retrieve(self, ids: SequenceNotStr[str]) -> MapList:
         return _fallback_to_one_by_one(self.client.robotics.maps.retrieve, ids, MapList)
 
-    def update(self, items: MapWriteList) -> MapList:
+    def update(self, items: Sequence[MapWrite]) -> MapList:
         return self.client.robotics.maps.update(items)
 
     def delete(self, ids: SequenceNotStr[str]) -> int:

cognite_toolkit/_cdf_tk/cruds/_resource_cruds/streams.py

@@ -0,0 +1,94 @@
+from collections.abc import Hashable, Iterable, Sequence
+from typing import Any, final
+
+from cognite.client.data_classes.capabilities import Capability, StreamsAcl
+from cognite.client.utils.useful_types import SequenceNotStr
+
+from cognite_toolkit._cdf_tk.client.data_classes.streams import (
+    StreamRequest,
+    StreamResponse,
+    StreamResponseList,
+)
+from cognite_toolkit._cdf_tk.cruds._base_cruds import ResourceCRUD
+from cognite_toolkit._cdf_tk.resource_classes import StreamYAML
+from cognite_toolkit._cdf_tk.utils.http_client import ToolkitAPIError
+
+from .datamodel import ContainerCRUD
+
+
+@final
+class StreamCRUD(ResourceCRUD[str, StreamRequest, StreamResponse]):
+    folder_name = "streams"
+    resource_cls = StreamResponse
+    resource_write_cls = StreamRequest
+    kind = "Streams"
+    yaml_cls = StreamYAML
+    dependencies = frozenset({ContainerCRUD})
+    _doc_url = "Streams/operation/createStream"
+    support_update = False
+
+    @property
+    def display_name(self) -> str:
+        return "streams"
+
+    @classmethod
+    def get_id(cls, item: StreamRequest | StreamResponse | dict) -> str:
+        if isinstance(item, dict):
+            return item["externalId"]
+        return item.external_id
+
+    @classmethod
+    def dump_id(cls, id: str) -> dict[str, Any]:
+        return {"externalId": id}
+
+    @classmethod
+    def get_required_capability(
+        cls, items: Sequence[StreamRequest] | None, read_only: bool
+    ) -> Capability | list[Capability]:
+        if not items and items is not None:
+            return []
+
+        actions = (
+            [StreamsAcl.Action.Read]
+            if read_only
+            else [StreamsAcl.Action.Read, StreamsAcl.Action.Create, StreamsAcl.Action.Delete]
+        )
+        return StreamsAcl(actions, StreamsAcl.Scope.All())
+
+    def create(self, items: Sequence[StreamRequest]) -> StreamResponseList:
+        created = self.client.streams.create(list(items))
+        return StreamResponseList(created)
+
+    def retrieve(self, ids: SequenceNotStr[str]) -> StreamResponseList:
+        retrieved: list[StreamResponse] = []
+        for _id in ids:
+            try:
+                _resp = self.client.streams.retrieve(_id)
+            except ToolkitAPIError:
+                continue
+            if _resp is not None:
+                retrieved.append(_resp)
+        return StreamResponseList(retrieved)
+
+    def delete(self, ids: SequenceNotStr[str]) -> int:
+        count = 0
+        for _id in ids:
+            try:
+                self.client.streams.delete(_id)
+            except ToolkitAPIError:
+                continue
+            count += 1
+        return count
+
+    def _iterate(
+        self,
+        data_set_external_id: str | None = None,
+        space: str | None = None,
+        parent_ids: list[Hashable] | None = None,
+    ) -> Iterable[StreamResponse]:
+        if data_set_external_id or space or parent_ids:
+            # These filters are not supported for Streams
+            return iter([])
+
+        all_streams = self.client.streams.list()
+        return iter(all_streams)

cognite_toolkit/_cdf_tk/{loaders/_resource_loaders/three_d_model_loaders.py → cruds/_resource_cruds/three_d_model.py}

@@ -1,7 +1,4 @@
-from __future__ import annotations
-
 from collections.abc import Hashable, Iterable, Sequence
-from functools import lru_cache
 from typing import Any, final
 
 from cognite.client.data_classes import (
@@ -9,31 +6,26 @@ from cognite.client.data_classes import (
     ThreeDModelList,
     ThreeDModelUpdate,
     ThreeDModelWrite,
-    ThreeDModelWriteList,
     capabilities,
 )
 from cognite.client.data_classes.capabilities import Capability
 from cognite.client.utils.useful_types import SequenceNotStr
 
-from cognite_toolkit._cdf_tk._parameters import ParameterSpec, ParameterSpecSet
+from cognite_toolkit._cdf_tk.cruds._base_cruds import ResourceContainerCRUD, ResourceCRUD
 from cognite_toolkit._cdf_tk.exceptions import ToolkitMissingResourceError
-from cognite_toolkit._cdf_tk.loaders._base_loaders import ResourceContainerLoader, ResourceLoader
+from cognite_toolkit._cdf_tk.resource_classes import ThreeDModelYAML
 
-from .data_organization_loaders import DataSetsLoader
+from .data_organization import DataSetsCRUD
 
 
 @final
-class ThreeDModelLoader(
-    ResourceContainerLoader[str, ThreeDModelWrite, ThreeDModel, ThreeDModelWriteList, ThreeDModelList]
-):
+class ThreeDModelCRUD(ResourceContainerCRUD[str, ThreeDModelWrite, ThreeDModel]):
     folder_name = "3dmodels"
-    filename_pattern = r"^.*\.3DModel$"  # Matches all yaml files whose stem ends with '.3DModel'.
     resource_cls = ThreeDModel
     resource_write_cls = ThreeDModelWrite
-    list_cls = ThreeDModelList
-    list_write_cls = ThreeDModelWriteList
     kind = "3DModel"
-    dependencies = frozenset({DataSetsLoader})
+    yaml_cls = ThreeDModelYAML
+    dependencies = frozenset({DataSetsCRUD})
     _doc_url = "3D-Models/operation/create3DModels"
     item_name = "revisions"
 
@@ -85,12 +77,9 @@ class ThreeDModelLoader(
             ]
         )
 
-        return capabilities.ThreeDAcl(
-            actions,
-            scope,  # type: ignore[arg-type]
-        )
+        return capabilities.ThreeDAcl(actions, scope)
 
-    def create(self, items: ThreeDModelWriteList) -> ThreeDModelList:
+    def create(self, items: Sequence[ThreeDModelWrite]) -> ThreeDModelList:
         created = ThreeDModelList([])
         for item in items:
             new_item = self.client.three_d.models.create(**item.dump(camel_case=False))
@@ -112,7 +101,7 @@ class ThreeDModelLoader(
                     break
         return output
 
-    def update(self, items: ThreeDModelWriteList) -> ThreeDModelList:
+    def update(self, items: Sequence[ThreeDModelWrite]) -> ThreeDModelList:
         found = self.retrieve([item.name for item in items])
         id_by_name = {model.name: model.id for model in found}
         # 3D Model does not have an external identifier, only internal.
@@ -167,25 +156,14 @@ class ThreeDModelLoader(
         return count
 
     @classmethod
-    @lru_cache(maxsize=1)
-    def get_write_cls_parameter_spec(cls) -> ParameterSpecSet:
-        spec = super().get_write_cls_parameter_spec()
-        # Added by toolkit
-        spec.add(ParameterSpec(("dataSetExternalId",), frozenset({"str"}), is_required=False, _is_nullable=False))
-
-        # Should not be used, used for dataSetExternalId instead
-        spec.discard(ParameterSpec(("dataSetId",), frozenset({"int"}), is_required=False, _is_nullable=False))
-        return spec
-
-    @classmethod
-    def get_dependent_items(cls, item: dict) -> Iterable[tuple[type[ResourceLoader], Hashable]]:
+    def get_dependent_items(cls, item: dict) -> Iterable[tuple[type[ResourceCRUD], Hashable]]:
         """Returns all items that this item requires.
 
         For example, a TimeSeries requires a DataSet, so this method would return the
         DatasetLoader and identifier of that dataset.
         """
         if "dataSetExternalId" in item:
-            yield DataSetsLoader, item["dataSetExternalId"]
+            yield DataSetsCRUD, item["dataSetExternalId"]
 
     def load_resource(self, resource: dict[str, Any], is_dry_run: bool = False) -> ThreeDModelWrite:
         if ds_external_id := resource.pop("dataSetExternalId", None):