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

cognite_toolkit/_cdf_tk/client/api/robotics_capabilities.py

@@ -53,7 +53,7 @@ class CapabilitiesAPI(CDFResourceAPI[ExternalId, RobotCapabilityRequest, RobotCa
         """
         return self._request_item_response(items, "create")
 
-    def retrieve(self, items: Sequence[ExternalId]) -> list[RobotCapabilityResponse]:
+    def retrieve(self, items: Sequence[ExternalId], ignore_unknown_ids: bool = False) -> list[RobotCapabilityResponse]:
         """Retrieve capabilities from CDF.
 
         Args:
@@ -61,6 +61,8 @@ class CapabilitiesAPI(CDFResourceAPI[ExternalId, RobotCapabilityRequest, RobotCa
         Returns:
             List of retrieved RobotCapabilityResponse objects.
         """
+        if ignore_unknown_ids:
+            return self._request_item_split_retries(items, method="retrieve")
         return self._request_item_response(items, method="retrieve")
 
     def update(
@@ -77,13 +79,17 @@ class CapabilitiesAPI(CDFResourceAPI[ExternalId, RobotCapabilityRequest, RobotCa
         """
         return self._update(items, mode=mode)
 
-    def delete(self, items: Sequence[ExternalId]) -> None:
+    def delete(self, items: Sequence[ExternalId], ignore_unknown_ids: bool = False) -> None:
         """Delete capabilities from CDF.
 
         Args:
             items: List of ExternalId objects to delete.
+            ignore_unknown_ids: If True, ignores unknown IDs during deletion.
         """
-        self._request_no_response(items, "delete")
+        if ignore_unknown_ids:
+            self._request_item_split_retries_no_response(items, "delete")
+        else:
+            self._request_no_response(items, "delete")
 
     def paginate(
         self,

cognite_toolkit/_cdf_tk/client/api/robotics_data_postprocessing.py

@@ -64,14 +64,19 @@ class DataPostProcessingAPI(
         """
         return self._request_item_response(items, "create")
 
-    def retrieve(self, items: Sequence[ExternalId]) -> list[RobotDataPostProcessingResponse]:
+    def retrieve(
+        self, items: Sequence[ExternalId], ignore_unknown_ids: bool = False
+    ) -> list[RobotDataPostProcessingResponse]:
         """Retrieve data post-processing configurations from CDF.
 
         Args:
             items: List of ExternalId objects to retrieve.
+            ignore_unknown_ids: If True, ignores unknown IDs during retrieval.
         Returns:
             List of retrieved RobotDataPostProcessingResponse objects.
         """
+        if ignore_unknown_ids:
+            return self._request_item_split_retries(items, method="retrieve")
         return self._request_item_response(items, method="retrieve")
 
     def update(
@@ -88,13 +93,17 @@ class DataPostProcessingAPI(
         """
         return self._update(items, mode=mode)
 
-    def delete(self, items: Sequence[ExternalId]) -> None:
+    def delete(self, items: Sequence[ExternalId], ignore_unknown_ids: bool = False) -> None:
         """Delete data post-processing configurations from CDF.
 
         Args:
             items: List of ExternalId objects to delete.
+            ignore_unknown_ids: If True, ignores unknown IDs during deletion.
         """
-        self._request_no_response(items, "delete")
+        if ignore_unknown_ids:
+            self._request_item_split_retries_no_response(items, "delete")
+        else:
+            self._request_no_response(items, "delete")
 
     def paginate(
         self,

cognite_toolkit/_cdf_tk/client/api/robotics_frames.py

@@ -48,14 +48,17 @@ class FramesAPI(CDFResourceAPI[ExternalId, RobotFrameRequest, RobotFrameResponse
         """
         return self._request_item_response(items, "create")
 
-    def retrieve(self, items: Sequence[ExternalId]) -> list[RobotFrameResponse]:
+    def retrieve(self, items: Sequence[ExternalId], ignore_unknown_ids: bool = False) -> list[RobotFrameResponse]:
         """Retrieve frames from CDF.
 
         Args:
             items: List of ExternalId objects to retrieve.
+            ignore_unknown_ids: If True, ignores unknown IDs during retrieval.
         Returns:
             List of retrieved RobotFrameResponse objects.
         """
+        if ignore_unknown_ids:
+            return self._request_item_split_retries(items, method="retrieve")
         return self._request_item_response(items, method="retrieve")
 
     def update(
@@ -72,13 +75,17 @@ class FramesAPI(CDFResourceAPI[ExternalId, RobotFrameRequest, RobotFrameResponse
         """
         return self._update(items, mode=mode)
 
-    def delete(self, items: Sequence[ExternalId]) -> None:
+    def delete(self, items: Sequence[ExternalId], ignore_unknown_ids: bool = False) -> None:
         """Delete frames from CDF.
 
         Args:
             items: List of ExternalId objects to delete.
+            ignore_unknown_ids: If True, ignores unknown IDs during deletion.
         """
-        self._request_no_response(items, "delete")
+        if ignore_unknown_ids:
+            self._request_item_split_retries_no_response(items, "delete")
+        else:
+            self._request_no_response(items, "delete")
 
     def paginate(
         self,

cognite_toolkit/_cdf_tk/client/api/robotics_locations.py

@@ -53,14 +53,17 @@ class LocationsAPI(CDFResourceAPI[ExternalId, RobotLocationRequest, RobotLocatio
         """
         return self._request_item_response(items, "create")
 
-    def retrieve(self, items: Sequence[ExternalId]) -> list[RobotLocationResponse]:
+    def retrieve(self, items: Sequence[ExternalId], ignore_unknown_ids: bool = False) -> list[RobotLocationResponse]:
         """Retrieve locations from CDF.
 
         Args:
             items: List of ExternalId objects to retrieve.
+            ignore_unknown_ids: If True, ignores unknown IDs during retrieval.
         Returns:
             List of retrieved RobotLocationResponse objects.
         """
+        if ignore_unknown_ids:
+            return self._request_item_split_retries(items, method="retrieve")
         return self._request_item_response(items, method="retrieve")
 
     def update(
@@ -77,13 +80,17 @@ class LocationsAPI(CDFResourceAPI[ExternalId, RobotLocationRequest, RobotLocatio
         """
         return self._update(items, mode=mode)
 
-    def delete(self, items: Sequence[ExternalId]) -> None:
+    def delete(self, items: Sequence[ExternalId], ignore_unknown_ids: bool = False) -> None:
         """Delete locations from CDF.
 
         Args:
             items: List of ExternalId objects to delete.
+            ignore_unknown_ids: If True, ignores unknown IDs during deletion.
         """
-        self._request_no_response(items, "delete")
+        if ignore_unknown_ids:
+            self._request_item_split_retries_no_response(items, "delete")
+        else:
+            self._request_no_response(items, "delete")
 
     def paginate(
         self,

cognite_toolkit/_cdf_tk/client/api/robotics_maps.py

@@ -48,14 +48,17 @@ class MapsAPI(CDFResourceAPI[ExternalId, RobotMapRequest, RobotMapResponse]):
         """
         return self._request_item_response(items, "create")
 
-    def retrieve(self, items: Sequence[ExternalId]) -> list[RobotMapResponse]:
+    def retrieve(self, items: Sequence[ExternalId], ignore_unknown_ids: bool = False) -> list[RobotMapResponse]:
         """Retrieve maps from CDF.
 
         Args:
             items: List of ExternalId objects to retrieve.
+            ignore_unknown_ids: If True, ignores unknown IDs during retrieval.
         Returns:
             List of retrieved RobotMapResponse objects.
         """
+        if ignore_unknown_ids:
+            return self._request_item_split_retries(items, method="retrieve")
         return self._request_item_response(items, method="retrieve")
 
     def update(
@@ -72,13 +75,17 @@ class MapsAPI(CDFResourceAPI[ExternalId, RobotMapRequest, RobotMapResponse]):
         """
         return self._update(items, mode=mode)
 
-    def delete(self, items: Sequence[ExternalId]) -> None:
+    def delete(self, items: Sequence[ExternalId], ignore_unknown_ids: bool = False) -> None:
         """Delete maps from CDF.
 
         Args:
             items: List of ExternalId objects to delete.
+            ignore_unknown_ids: If True, ignores unknown IDs during deletion.
         """
-        self._request_no_response(items, "delete")
+        if ignore_unknown_ids:
+            self._request_item_split_retries_no_response(items, "delete")
+        else:
+            self._request_no_response(items, "delete")
 
     def paginate(
         self,

cognite_toolkit/_cdf_tk/client/api/robotics_robots.py

@@ -46,14 +46,17 @@ class RobotsAPI(CDFResourceAPI[DataSetId, RobotRequest, RobotResponse]):
         """
         return self._request_item_response(items, "create")
 
-    def retrieve(self, items: Sequence[DataSetId]) -> list[RobotResponse]:
+    def retrieve(self, items: Sequence[DataSetId], ignore_unknown_ids: bool = False) -> list[RobotResponse]:
         """Retrieve robots from CDF.
 
         Args:
             items: List of DataSetId objects to retrieve.
+            ignore_unknown_ids: If True, ignores unknown IDs during retrieval.
         Returns:
             List of retrieved RobotResponse objects.
         """
+        if ignore_unknown_ids:
+            return self._request_item_split_retries(items, method="retrieve")
         return self._request_item_response(items, method="retrieve")
 
     def update(
@@ -70,13 +73,17 @@ class RobotsAPI(CDFResourceAPI[DataSetId, RobotRequest, RobotResponse]):
         """
         return self._update(items, mode=mode)
 
-    def delete(self, items: Sequence[DataSetId]) -> None:
+    def delete(self, items: Sequence[DataSetId], ignore_unknown_ids: bool = False) -> None:
         """Delete robots from CDF.
 
         Args:
             items: List of DataSetId objects to delete.
+            ignore_unknown_ids: If True, ignores unknown IDs during deletion.
         """
-        self._request_no_response(items, "delete")
+        if ignore_unknown_ids:
+            self._request_item_split_retries_no_response(items, "delete")
+        else:
+            self._request_no_response(items, "delete")
 
     def paginate(
         self,

cognite_toolkit/_cdf_tk/client/cdf_client/responses.py

@@ -1,4 +1,4 @@
-from typing import Generic, TypeVar
+from typing import Any, Generic, TypeVar
 
 from pydantic import BaseModel, Field, JsonValue
 
@@ -22,8 +22,8 @@ class PagedResponse(BaseModel, Generic[T]):
     next_cursor: str | None = Field(None, alias="nextCursor")
 
 
-class QueryResponse(BaseModel, Generic[T]):
-    items: dict[str, list[T]]
+class QueryResponse(BaseModel):
+    items: dict[str, list[dict[str, Any]]]
     typing: dict[str, JsonValue] | None = None
     next_cursor: dict[str, str] = Field(alias="nextCursor")
     debug: dict[str, JsonValue] | None = None

cognite_toolkit/_cdf_tk/client/http_client/_client.py

@@ -65,7 +65,7 @@ class HTTPClient:
         pool_connections: int = 10,
         pool_maxsize: int = 20,
         retry_status_codes: Set[int] = frozenset({408, 429, 502, 503, 504}),
-        split_items_status_codes: Set[int] = frozenset({400, 408, 409, 422, 502, 503, 504}),
+        split_items_status_codes: Set[int] = frozenset({400, 404, 408, 409, 422, 502, 503, 504}),
         console: Console | None = None,
     ):
         self.config = config

cognite_toolkit/_cdf_tk/client/resource_classes/infield.py

@@ -1,35 +1,38 @@
-import sys
 from typing import Any, ClassVar, Literal
 
-from pydantic import JsonValue, field_validator
-from pydantic_core.core_schema import ValidationInfo
+from pydantic import JsonValue, model_validator
 
-from cognite_toolkit._cdf_tk.client._resource_base import BaseResourceList, ResponseResource
-from cognite_toolkit._cdf_tk.protocols import (
-    ResourceRequestListProtocol,
-    ResourceResponseListProtocol,
-)
+from cognite_toolkit._cdf_tk.client._resource_base import BaseModelObject
 from cognite_toolkit._cdf_tk.utils.text import sanitize_instance_external_id
 
-from .instance_api import InstanceRequestResource, ViewReference
-
-if sys.version_info >= (3, 11):
-    from typing import Self
-else:
-    from typing_extensions import Self
+from .instance_api import (
+    TypedInstanceIdentifier,
+    TypedNodeIdentifier,
+    TypedViewReference,
+    WrappedInstanceListRequest,
+    WrappedInstanceListResponse,
+    WrappedInstanceRequest,
+    WrappedInstanceResponse,
+    move_properties,
+)
 
-INFIELD_LOCATION_CONFIG_VIEW_ID = ViewReference(space="cdf_infield", external_id="InFieldLocationConfig", version="v1")
-INFIELD_CDM_LOCATION_CONFIG_VIEW_ID = ViewReference(
+INFIELD_LOCATION_CONFIG_VIEW_ID = TypedViewReference(
+    space="cdf_infield", external_id="InFieldLocationConfig", version="v1"
+)
+INFIELD_CDM_LOCATION_CONFIG_VIEW_ID = TypedViewReference(
     space="infield_cdm_source_desc_sche_asset_file_ts", external_id="InFieldCDMLocationConfig", version="v1"
 )
-DATA_EXPLORATION_CONFIG_VIEW_ID = ViewReference(space="cdf_infield", external_id="DataExplorationConfig", version="v1")
+DATA_EXPLORATION_CONFIG_VIEW_ID = TypedViewReference(
+    space="cdf_infield", external_id="DataExplorationConfig", version="v1"
+)
 
 
-class DataExplorationConfig(InstanceRequestResource):
+class DataExplorationConfig(BaseModelObject):
     """Data Exploration Configuration resource class."""
 
-    VIEW_ID: ClassVar[ViewReference] = DATA_EXPLORATION_CONFIG_VIEW_ID
-    instance_type: Literal["node"] = "node"
+    VIEW_ID: ClassVar[TypedViewReference] = DATA_EXPLORATION_CONFIG_VIEW_ID
+    space: str | None = None
+    external_id: str | None = None
 
     observations: dict[str, JsonValue] | None = None
     activities: dict[str, JsonValue] | None = None
@@ -37,19 +40,19 @@ class DataExplorationConfig(InstanceRequestResource):
     notifications: dict[str, JsonValue] | None = None
     assets: dict[str, JsonValue] | None = None
 
+    @model_validator(mode="before")
+    @classmethod
+    def move_properties(cls, data: dict[str, Any]) -> dict[str, Any]:
+        return move_properties(data, cls.VIEW_ID)
 
-class InfieldLocationConfig(
-    ResponseResource["InfieldLocationConfig"],
-    InstanceRequestResource,
-):
+
+class InFieldLocationConfig(BaseModelObject):
     """Infield Location Configuration resource class.
 
     This class is used for both the response and request resource for Infield Location Configuration nodes.
     """
 
-    VIEW_ID: ClassVar[ViewReference] = INFIELD_LOCATION_CONFIG_VIEW_ID
-    instance_type: Literal["node"] = "node"
-
+    VIEW_ID: ClassVar[TypedViewReference] = INFIELD_LOCATION_CONFIG_VIEW_ID
     root_location_external_id: str | None = None
     feature_toggles: dict[str, JsonValue] | None = None
     app_instance_space: str | None = None
@@ -57,48 +60,94 @@ class InfieldLocationConfig(
     data_filters: dict[str, JsonValue] | None = None
     data_exploration_config: DataExplorationConfig | None = None
 
-    def as_request_resource(self) -> "InfieldLocationConfig":
-        return self
-
-    def as_write(self) -> Self:
-        return self
-
-    @field_validator("data_exploration_config", mode="before")
-    @classmethod
-    def generate_identifier_if_missing(cls, value: Any, info: ValidationInfo) -> Any:
-        """We do not require the user to specify the space and externalId for the data exploration config."""
-        if isinstance(value, dict):
-            if value.get("space") is None:
-                value["space"] = info.data["space"]
-            if value.get("externalId") is None:
-                external_id = info.data["external_id"]
-                candidate = f"{external_id}_data_exploration_config"
-                value["externalId"] = sanitize_instance_external_id(candidate)
-        return value
-
-
-class InfieldLocationConfigList(
-    BaseResourceList[InfieldLocationConfig],
-    ResourceResponseListProtocol,
-    ResourceRequestListProtocol,
-):
-    """A list of InfieldLocationConfig objects."""
-
-    _RESOURCE = InfieldLocationConfig
-
-    def as_write(self) -> Self:
-        return self
-
-
-class InFieldCDMLocationConfig(ResponseResource["InFieldCDMLocationConfig"], InstanceRequestResource):
-    """InField CDM Location Configuration resource class.
-
-    This class is used for both the response and request resource for InField CDM Location Configuration nodes.
-    """
-
-    VIEW_ID: ClassVar[ViewReference] = INFIELD_CDM_LOCATION_CONFIG_VIEW_ID
-    instance_type: Literal["node"] = "node"
 
+class InFieldLocationConfigRequest(WrappedInstanceListRequest, InFieldLocationConfig):
+    def dump_instances(self) -> list[dict[str, Any]]:
+        space: str | None = None
+        external_id: str | None = None
+        if self.data_exploration_config:
+            space = self.data_exploration_config.space or self.space
+            if self.data_exploration_config.external_id:
+                external_id = self.data_exploration_config.external_id
+            else:
+                candidate = f"{self.external_id}_data_exploration_config"
+                external_id = sanitize_instance_external_id(candidate)
+
+        properties = self.model_dump(
+            by_alias=True,
+            exclude_unset=True,
+            exclude={"data_exploration_config", "instance_type", "space", "external_id"},
+        )
+        if space and external_id:
+            properties["dataExplorationConfig"] = {"space": space, "externalId": external_id}
+        output: list[dict[str, Any]] = [
+            {
+                "instanceType": self.instance_type,
+                "space": self.space,
+                "externalId": self.external_id,
+                "sources": [
+                    {
+                        "source": self.VIEW_ID.dump(),
+                        "properties": properties,
+                    }
+                ],
+            }
+        ]
+        if space and external_id and self.data_exploration_config:
+            output.append(
+                {
+                    "instanceType": "node",
+                    "space": space,
+                    "externalId": external_id,
+                    "sources": [
+                        {
+                            "source": DataExplorationConfig.VIEW_ID.dump(),
+                            "properties": self.data_exploration_config.model_dump(
+                                by_alias=True, exclude_unset=True, exclude={"space", "external_id"}
+                            ),
+                        }
+                    ],
+                }
+            )
+        return output
+
+    def as_ids(self) -> list[TypedInstanceIdentifier]:
+        output: list[TypedInstanceIdentifier] = [self.as_id()]
+        if (
+            self.data_exploration_config
+            and self.data_exploration_config.space
+            and self.data_exploration_config.external_id
+        ):
+            output.append(
+                TypedNodeIdentifier(
+                    space=self.data_exploration_config.space,
+                    external_id=self.data_exploration_config.external_id,
+                )
+            )
+        return output
+
+
+class InFieldLocationConfigResponse(WrappedInstanceListResponse, InFieldLocationConfig):
+    def as_request_resource(self) -> InFieldLocationConfigRequest:
+        return InFieldLocationConfigRequest.model_validate(self.dump(), extra="ignore")
+
+    def as_ids(self) -> list[TypedInstanceIdentifier]:
+        output: list[TypedInstanceIdentifier] = [TypedNodeIdentifier(space=self.space, external_id=self.external_id)]
+        if (
+            self.data_exploration_config
+            and self.data_exploration_config.space
+            and self.data_exploration_config.external_id
+        ):
+            output.append(
+                TypedNodeIdentifier(
+                    space=self.data_exploration_config.space,
+                    external_id=self.data_exploration_config.external_id,
+                )
+            )
+        return output
+
+
+class InFieldCDMLocationConfig(BaseModelObject):
     name: str | None = None
     description: str | None = None
     feature_toggles: dict[str, JsonValue] | None = None
@@ -109,8 +158,20 @@ class InFieldCDMLocationConfig(ResponseResource["InFieldCDMLocationConfig"], Ins
     disciplines: list[dict[str, JsonValue]] | None = None
     data_exploration_config: dict[str, JsonValue] | None = None
 
-    def as_request_resource(self) -> "InFieldCDMLocationConfig":
-        return self
 
-    def as_write(self) -> Self:
-        return self
+class InFieldCDMLocationConfigRequest(WrappedInstanceRequest, InFieldCDMLocationConfig):
+    VIEW_ID: ClassVar[TypedViewReference] = INFIELD_CDM_LOCATION_CONFIG_VIEW_ID
+    instance_type: Literal["node"] = "node"
+
+    def as_id(self) -> TypedNodeIdentifier:
+        return TypedNodeIdentifier(space=self.space, external_id=self.external_id)
+
+
+class InFieldCDMLocationConfigResponse(
+    WrappedInstanceResponse[InFieldCDMLocationConfigRequest], InFieldCDMLocationConfig
+):
+    VIEW_ID: ClassVar[TypedViewReference] = INFIELD_CDM_LOCATION_CONFIG_VIEW_ID
+    instance_type: Literal["node"] = "node"
+
+    def as_request_resource(self) -> InFieldCDMLocationConfigRequest:
+        return InFieldCDMLocationConfigRequest.model_validate(self.dump(), extra="ignore")