cognite-toolkit 0.7.39__py3-none-any.whl → 0.7.41__py3-none-any.whl

cognite_toolkit/_cdf_tk/client/data_classes/three_d.py

@@ -1,14 +1,16 @@
-from collections.abc import Hashable
+import sys
 from typing import Literal
 
 from pydantic import Field
 
-from .base import BaseModelObject, RequestResource, ResponseResource
+from .base import BaseModelObject, Identifier, RequestResource, ResponseResource
+from .identifiers import NameId
+from .instance_api import NodeReference
 
-
-class NodeReference(BaseModelObject):
-    space: str
-    external_id: str
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
 
 
 class RevisionStatus(BaseModelObject):
@@ -22,17 +24,14 @@ class RevisionStatus(BaseModelObject):
 class ThreeDModelRequest(RequestResource):
     name: str
 
-    def as_id(self) -> str:
-        return self.name
+    def as_id(self) -> NameId:
+        return NameId(name=self.name)
 
 
 class ThreeDModelClassicRequest(ThreeDModelRequest):
     data_set_id: int | None = None
     metadata: dict[str, str] | None = None
 
-    def as_id(self) -> str:
-        return self.name
-
 
 class ThreeDModelDMSRequest(ThreeDModelRequest):
     space: str
@@ -56,24 +55,21 @@ class ThreeDModelResponse(ResponseResource[ThreeDModelRequest]):
             return ThreeDModelDMSRequest._load(self.dump())
 
 
-class AssetMappingDMRequest(RequestResource):
+class AssetMappingDMRequest(RequestResource, Identifier):
     node_id: int
     asset_instance_id: NodeReference
     # These fields are part of the path request and not the body schema.
     model_id: int = Field(exclude=True)
     revision_id: int = Field(exclude=True)
 
-    def as_id(self) -> Hashable:
-        return (
-            self.model_id,
-            self.revision_id,
-            self.node_id,
-            self.asset_instance_id.space,
-            self.asset_instance_id.external_id,
-        )
+    def as_id(self) -> Self:
+        return self
 
+    def __str__(self) -> str:
+        return f"{self.model_id}_{self.revision_id}_{self.node_id}_{self.asset_instance_id.space}_{self.asset_instance_id.external_id}"
 
-class AssetMappingClassicRequest(RequestResource):
+
+class AssetMappingClassicRequest(RequestResource, Identifier):
     node_id: int
     asset_id: int | None = None
     asset_instance_id: NodeReference | None = None
@@ -81,19 +77,18 @@ class AssetMappingClassicRequest(RequestResource):
     model_id: int = Field(exclude=True)
     revision_id: int = Field(exclude=True)
 
-    def as_id(self) -> Hashable:
-        if self.asset_id:
-            return self.model_id, self.revision_id, self.node_id, self.asset_id
-        elif self.asset_instance_id:
-            return (
-                self.model_id,
-                self.revision_id,
-                self.node_id,
-                self.asset_instance_id.space,
-                self.asset_instance_id.external_id,
-            )
-        else:
-            raise AttributeError("asset_id or asset_instance_id is required")
+    def as_id(self) -> Self:
+        return self
+
+    def __str__(self) -> str:
+        asset_part = (
+            f"assetId:{self.asset_id}"
+            if self.asset_id is not None
+            else f"assetInstance:{self.asset_instance_id.space}_{self.asset_instance_id.external_id}"
+            if self.asset_instance_id is not None
+            else "noAsset"
+        )
+        return f"{self.model_id}_{self.revision_id}_{self.node_id}_{asset_part}"
 
 
 class AssetMappingResponse(ResponseResource[AssetMappingClassicRequest]):

cognite_toolkit/_cdf_tk/client/data_classes/timeseries.py

@@ -0,0 +1,55 @@
+from typing import Any, ClassVar, Literal
+
+from cognite_toolkit._cdf_tk.client.data_classes.base import RequestUpdateable, ResponseResource
+
+from .identifiers import ExternalId, InternalOrExternalId
+from .instance_api import NodeReference
+
+
+class TimeSeriesRequest(RequestUpdateable):
+    container_fields: ClassVar[frozenset[str]] = frozenset({"metadata", "security_categories"})
+    non_nullable_fields: ClassVar[frozenset[str]] = frozenset({"is_step"})
+    external_id: str | None = None
+    name: str | None = None
+    is_string: bool = False
+    metadata: dict[str, str] | None = None
+    unit: str | None = None
+    unit_external_id: str | None = None
+    asset_id: int | None = None
+    is_step: bool = False
+    description: str | None = None
+    security_categories: list[int] | None = None
+    data_set_id: int | None = None
+
+    def as_id(self) -> InternalOrExternalId:
+        if self.external_id is None:
+            raise ValueError("Cannot convert TimeSeriesRequest to ExternalId when external_id is None")
+        return ExternalId(external_id=self.external_id)
+
+    def as_update(self, mode: Literal["patch", "replace"]) -> dict[str, Any]:
+        dumped = super().as_update(mode)
+        # isString is immutable in CDF, so we remove it from update payloads
+        dumped.pop("isString", None)
+        return dumped
+
+
+class TimeSeriesResponse(ResponseResource[TimeSeriesRequest]):
+    id: int
+    instance_id: NodeReference | None = None
+    external_id: str | None = None
+    name: str | None = None
+    is_string: bool
+    metadata: dict[str, str] | None = None
+    unit: str | None = None
+    type: str
+    unit_external_id: str | None = None
+    asset_id: int | None = None
+    is_step: bool
+    description: str | None = None
+    security_categories: list[int] | None = None
+    data_set_id: int | None = None
+    created_time: int
+    last_updated_time: int
+
+    def as_request_resource(self) -> TimeSeriesRequest:
+        return TimeSeriesRequest.model_validate(self.dump())

cognite_toolkit/_cdf_tk/{utils → client}/http_client/__init__.py

@@ -1,5 +1,6 @@
 from ._client import HTTPClient
 from ._data_classes import (
+    T_COVARIANT_ID,
     DataBodyRequest,
     ErrorDetails,
     FailedRequestItems,
@@ -10,6 +11,7 @@ from ._data_classes import (
     ItemMessage,
     ItemsRequest,
     ParamRequest,
+    RequestItem,
     RequestMessage,
     ResponseList,
     ResponseMessage,
@@ -18,7 +20,6 @@ from ._data_classes import (
     SuccessResponseItems,
 )
 from ._data_classes2 import (
-    BaseModelObject,
     ErrorDetails2,
     FailedRequest2,
     FailedResponse2,
@@ -29,13 +30,12 @@ from ._data_classes2 import (
     ItemsResultMessage2,
     ItemsSuccessResponse2,
     RequestMessage2,
-    RequestResource,
     SuccessResponse2,
 )
 from ._exception import ToolkitAPIError
 
 __all__ = [
-    "BaseModelObject",
+    "T_COVARIANT_ID",
     "DataBodyRequest",
     "ErrorDetails",
     "ErrorDetails2",
@@ -56,9 +56,9 @@ __all__ = [
     "ItemsResultMessage2",
     "ItemsSuccessResponse2",
     "ParamRequest",
+    "RequestItem",
     "RequestMessage",
     "RequestMessage2",
-    "RequestResource",
     "ResponseList",
     "ResponseMessage",
     "SimpleBodyRequest",

cognite_toolkit/_cdf_tk/{utils → client}/http_client/_client.py

@@ -10,9 +10,7 @@ import httpx
 from cognite.client import global_config
 from rich.console import Console
 
-from cognite_toolkit._cdf_tk.tk_warnings import HighSeverityWarning
-from cognite_toolkit._cdf_tk.utils.auxiliary import get_current_toolkit_version, get_user_agent
-from cognite_toolkit._cdf_tk.utils.http_client._data_classes import (
+from cognite_toolkit._cdf_tk.client.http_client._data_classes import (
     BodyRequest,
     DataBodyRequest,
     FailedRequestMessage,
@@ -23,7 +21,7 @@ from cognite_toolkit._cdf_tk.utils.http_client._data_classes import (
     ResponseList,
     ResponseMessage,
 )
-from cognite_toolkit._cdf_tk.utils.http_client._data_classes2 import (
+from cognite_toolkit._cdf_tk.client.http_client._data_classes2 import (
     BaseRequestMessage,
     ErrorDetails2,
     FailedRequest2,
@@ -38,6 +36,8 @@ from cognite_toolkit._cdf_tk.utils.http_client._data_classes2 import (
     RequestMessage2,
     SuccessResponse2,
 )
+from cognite_toolkit._cdf_tk.tk_warnings import HighSeverityWarning
+from cognite_toolkit._cdf_tk.utils.auxiliary import get_current_toolkit_version, get_user_agent
 from cognite_toolkit._cdf_tk.utils.useful_types import PrimitiveType
 
 if sys.version_info >= (3, 11):
@@ -414,7 +414,7 @@ class HTTPClient:
         if message.tracker and message.tracker.limit_reached():
             return [
                 ItemsFailedRequest2(
-                    ids=[item.as_id() for item in message.items],
+                    ids=[str(item) for item in message.items],
                     error_message=f"Aborting further splitting of requests after {message.tracker.failed_split_count} failed attempts.",
                 )
             ]
@@ -464,7 +464,7 @@ class HTTPClient:
         if 200 <= response.status_code < 300:
             return [
                 ItemsSuccessResponse2(
-                    ids=[item.as_id() for item in request.items],
+                    ids=[str(item) for item in request.items],
                     status_code=response.status_code,
                     body=response.text,
                     content=response.content,
@@ -480,7 +480,7 @@ class HTTPClient:
             if splits[0].tracker and splits[0].tracker.limit_reached():
                 return [
                     ItemsFailedResponse2(
-                        ids=[item.as_id() for item in request.items],
+                        ids=[str(item) for item in request.items],
                         status_code=response.status_code,
                         body=response.text,
                         error=ErrorDetails2.from_response(response),
@@ -494,7 +494,7 @@ class HTTPClient:
             # Permanent failure
             return [
                 ItemsFailedResponse2(
-                    ids=[item.as_id() for item in request.items],
+                    ids=[str(item) for item in request.items],
                     status_code=response.status_code,
                     body=response.text,
                     error=ErrorDetails2.from_response(response),
@@ -516,7 +516,7 @@ class HTTPClient:
             error_msg = f"Unexpected exception: {e!s}"
             return [
                 ItemsFailedRequest2(
-                    ids=[item.as_id() for item in request.items],
+                    ids=[str(item) for item in request.items],
                     error_message=error_msg,
                 )
             ]
@@ -530,7 +530,7 @@ class HTTPClient:
 
             return [
                 ItemsFailedRequest2(
-                    ids=[item.as_id() for item in request.items],
+                    ids=[str(item) for item in request.items],
                     error_message=error_msg,
                 )
             ]

cognite_toolkit/_cdf_tk/{utils → client}/http_client/_data_classes.py

@@ -7,8 +7,8 @@ from typing import Generic, Literal, Protocol, TypeAlias, TypeVar
 import httpx
 from cognite.client.utils import _json
 
-from cognite_toolkit._cdf_tk.utils.http_client._exception import ToolkitAPIError
-from cognite_toolkit._cdf_tk.utils.http_client._tracker import ItemsRequestTracker
+from cognite_toolkit._cdf_tk.client.http_client._exception import ToolkitAPIError
+from cognite_toolkit._cdf_tk.client.http_client._tracker import ItemsRequestTracker
 from cognite_toolkit._cdf_tk.utils.useful_types import JsonVal, PrimitiveType
 
 StatusCode: TypeAlias = int

cognite_toolkit/_cdf_tk/{utils → client}/http_client/_data_classes2.py

@@ -2,22 +2,21 @@ import gzip
 import sys
 from abc import ABC, abstractmethod
 from collections import UserList
-from collections.abc import Hashable, Sequence
+from collections.abc import Sequence
 from typing import Any, Literal
 
 import httpx
 from cognite.client import global_config
 from pydantic import BaseModel, ConfigDict, Field, JsonValue, TypeAdapter, model_validator
-from pydantic.alias_generators import to_camel
 
-from cognite_toolkit._cdf_tk.utils.http_client._exception import ToolkitAPIError
-from cognite_toolkit._cdf_tk.utils.http_client._tracker import ItemsRequestTracker
+from cognite_toolkit._cdf_tk.client.http_client._exception import ToolkitAPIError
+from cognite_toolkit._cdf_tk.client.http_client._tracker import ItemsRequestTracker
 from cognite_toolkit._cdf_tk.utils.useful_types import PrimitiveType
 
 if sys.version_info >= (3, 11):
-    from typing import Self
+    pass
 else:
-    from typing_extensions import Self
+    pass
 
 
 class HTTPResult2(BaseModel):
@@ -124,7 +123,7 @@ _BODY_SERIALIZER = TypeAdapter(dict[str, JsonValue])
 
 
 class ItemsResultMessage2(BaseModel):
-    ids: list[Hashable]
+    ids: list[str]
 
 
 class ItemsFailedRequest2(ItemsResultMessage2):
@@ -143,30 +142,6 @@ class ItemsFailedResponse2(ItemsResultMessage2):
     body: str
 
 
-class BaseModelObject(BaseModel):
-    """Base class for all object. This includes resources and nested objects."""
-
-    # We allow extra fields to support forward compatibility.
-    model_config = ConfigDict(alias_generator=to_camel, extra="allow")
-
-    def dump(self, camel_case: bool = True) -> dict[str, Any]:
-        """Dump the resource to a dictionary.
-
-        This is the default serialization method for request resources.
-        """
-        return self.model_dump(mode="json", by_alias=camel_case, exclude_unset=True)
-
-    @classmethod
-    def _load(cls, resource: dict[str, Any]) -> "Self":
-        """Load method to match CogniteResource signature."""
-        return cls.model_validate(resource)
-
-
-class RequestResource(BaseModelObject, ABC):
-    @abstractmethod
-    def as_id(self) -> Hashable: ...
-
-
 def _set_default_tracker(data: dict[str, Any]) -> ItemsRequestTracker:
     if "tracker" not in data or data["tracker"] is None:
         return ItemsRequestTracker(data.get("max_failures_before_abort", 50))
@@ -175,14 +150,16 @@ def _set_default_tracker(data: dict[str, Any]) -> ItemsRequestTracker:
 
 class ItemsRequest2(BaseRequestMessage):
     model_config = ConfigDict(arbitrary_types_allowed=True)
-    items: Sequence[RequestResource]
+    items: Sequence[BaseModel]
     extra_body_fields: dict[str, JsonValue] | None = None
     max_failures_before_abort: int = 50
     tracker: ItemsRequestTracker = Field(init=False, default_factory=_set_default_tracker, exclude=True)
 
     @property
     def content(self) -> str | bytes | None:
-        body: dict[str, JsonValue] = {"items": [item.dump() for item in self.items]}
+        body: dict[str, JsonValue] = {
+            "items": [item.model_dump(mode="json", by_alias=True, exclude_unset=True) for item in self.items]
+        }
         if self.extra_body_fields:
             body.update(self.extra_body_fields)
         res = _BODY_SERIALIZER.dump_json(body)

cognite_toolkit/_cdf_tk/client/testing.py

@@ -12,6 +12,7 @@ from cognite.client.testing import CogniteClientMock
 from rich.console import Console
 
 from cognite_toolkit._cdf_tk.client._toolkit_client import ToolkitClient
+from cognite_toolkit._cdf_tk.client.api.assets import AssetsAPI
 from cognite_toolkit._cdf_tk.client.api.legacy.canvas import CanvasAPI, IndustrialCanvasAPI
 from cognite_toolkit._cdf_tk.client.api.legacy.charts import ChartsAPI
 from cognite_toolkit._cdf_tk.client.api.legacy.dml import DMLAPI
@@ -32,6 +33,7 @@ from cognite_toolkit._cdf_tk.client.api.legacy.robotics import LocationsAPI as R
 from cognite_toolkit._cdf_tk.client.api.legacy.search_config import SearchConfigurationsAPI
 
 from ._toolkit_client import ToolAPI
+from .api.events import EventsAPI
 from .api.infield import InfieldAPI, InFieldCDMConfigAPI, InfieldConfigAPI
 from .api.lookup import (
     AssetLookUpAPI,
@@ -57,6 +59,7 @@ from .api.project import ProjectAPI
 from .api.search import SearchAPI
 from .api.streams import StreamsAPI
 from .api.three_d import ThreeDAPI, ThreeDModelAPI
+from .api.timeseries import TimeSeriesAPI
 from .api.token import TokenAPI
 from .api.verify import VerifyAPI
 
@@ -138,6 +141,9 @@ class ToolkitClientMock(CogniteClientMock):
         self.tool = MagicMock(spec=ToolAPI)
         self.tool.three_d = MagicMock(spec=ThreeDAPI)
         self.tool.three_d.models = MagicMock(spec_set=ThreeDModelAPI)
+        self.tool.assets = MagicMock(spec_set=AssetsAPI)
+        self.tool.time_series = MagicMock(spec_set=TimeSeriesAPI)
+        self.tool.events = MagicMock(spec_set=EventsAPI)
 
         self.streams = MagicMock(spec=StreamsAPI)
 

cognite_toolkit/_cdf_tk/commands/_migrate/command.py

@@ -7,6 +7,7 @@ from rich.console import Console
 from rich.table import Table
 
 from cognite_toolkit._cdf_tk.client import ToolkitClient
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, HTTPMessage, ItemMessage, SuccessResponseItems
 from cognite_toolkit._cdf_tk.commands._base import ToolkitCommand
 from cognite_toolkit._cdf_tk.commands._migrate.creators import MigrationCreator
 from cognite_toolkit._cdf_tk.commands._migrate.data_mapper import DataMapper
@@ -24,7 +25,6 @@ from cognite_toolkit._cdf_tk.storageio import T_Selector, UploadableStorageIO, U
 from cognite_toolkit._cdf_tk.utils import humanize_collection, safe_write, sanitize_filename
 from cognite_toolkit._cdf_tk.utils.file import yaml_safe_dump
 from cognite_toolkit._cdf_tk.utils.fileio import Chunk, CSVWriter, NDJsonWriter, SchemaColumn, Uncompressed
-from cognite_toolkit._cdf_tk.utils.http_client import HTTPClient, HTTPMessage, ItemMessage, SuccessResponseItems
 from cognite_toolkit._cdf_tk.utils.producer_worker import ProducerWorkerExecutor
 from cognite_toolkit._cdf_tk.utils.progress_tracker import AVAILABLE_STATUS, ProgressTracker, Status
 

cognite_toolkit/_cdf_tk/commands/_migrate/conversion.py

@@ -1,7 +1,7 @@
 from collections.abc import Iterable, Mapping, Set
 from typing import Any, ClassVar, cast
 
-from cognite.client.data_classes import Annotation, Asset, Event, FileMetadata, TimeSeries
+from cognite.client.data_classes import Annotation, Event, FileMetadata, TimeSeries
 from cognite.client.data_classes.data_modeling import (
     DirectRelation,
     DirectRelationReference,
@@ -16,6 +16,7 @@ from cognite.client.data_classes.data_modeling.views import ViewProperty
 from cognite.client.utils._identifier import InstanceId
 
 from cognite_toolkit._cdf_tk.client import ToolkitClient
+from cognite_toolkit._cdf_tk.client.data_classes.asset import AssetResponse
 from cognite_toolkit._cdf_tk.client.data_classes.legacy.migration import (
     AssetCentricId,
     ResourceViewMappingApply,
@@ -25,10 +26,8 @@ from cognite_toolkit._cdf_tk.utils.dtype_conversion import (
     asset_centric_convert_to_primary_property,
     convert_to_primary_property,
 )
-from cognite_toolkit._cdf_tk.utils.useful_types import (
-    AssetCentricResourceExtended,
-    AssetCentricTypeExtended,
-)
+from cognite_toolkit._cdf_tk.utils.useful_types import AssetCentricTypeExtended
+from cognite_toolkit._cdf_tk.utils.useful_types2 import AssetCentricResourceExtended
 
 from .data_model import COGNITE_MIGRATION_SPACE_ID, INSTANCE_SOURCE_VIEW_ID
 from .issues import ConversionIssue, FailedConversion, InvalidPropertyDataType
@@ -111,7 +110,7 @@ class DirectRelationCache:
                         file_ids.add(file_id)
                     if isinstance(file_external_id := file_ref.get("externalId"), str):
                         file_external_ids.add(file_external_id)
-            elif isinstance(resource, Asset):
+            elif isinstance(resource, AssetResponse):
                 if resource.source:
                     source_ids.add(resource.source)
                 if resource.parent_id is not None:
@@ -245,7 +244,7 @@ def asset_centric_to_dm(
 
 
 def _lookup_resource_type(resource_type: AssetCentricResourceExtended) -> AssetCentricTypeExtended:
-    if isinstance(resource_type, Asset):
+    if isinstance(resource_type, AssetResponse):
         return "asset"
     elif isinstance(resource_type, FileMetadata):
         return "file"

cognite_toolkit/_cdf_tk/commands/_migrate/data_classes.py

@@ -12,6 +12,7 @@ from cognite.client.utils._text import to_camel_case
 from pydantic import BaseModel, BeforeValidator, Field, field_validator, model_validator
 
 from cognite_toolkit._cdf_tk.client.data_classes.base import BaseModelObject, RequestResource
+from cognite_toolkit._cdf_tk.client.data_classes.identifiers import InternalId
 from cognite_toolkit._cdf_tk.client.data_classes.instance_api import InstanceIdentifier
 from cognite_toolkit._cdf_tk.client.data_classes.legacy.instances import InstanceApplyList
 from cognite_toolkit._cdf_tk.client.data_classes.legacy.migration import AssetCentricId
@@ -26,8 +27,8 @@ from cognite_toolkit._cdf_tk.storageio._data_classes import ModelList
 from cognite_toolkit._cdf_tk.utils.useful_types import (
     AssetCentricKindExtended,
     JsonVal,
-    T_AssetCentricResourceExtended,
 )
+from cognite_toolkit._cdf_tk.utils.useful_types2 import T_AssetCentricResourceExtended
 
 
 class MigrationMapping(BaseModel, alias_generator=to_camel_case, extra="ignore", populate_by_name=True):
@@ -279,8 +280,8 @@ class ThreeDRevisionMigrationRequest(RequestResource):
     revision_id: int
     model: Model
 
-    def as_id(self) -> int:
-        return self.revision_id
+    def as_id(self) -> InternalId:
+        return InternalId(id=self.revision_id)
 
 
 class ThreeDMigrationRequest(RequestResource):
@@ -290,5 +291,5 @@ class ThreeDMigrationRequest(RequestResource):
     thumbnail: Thumbnail | None = None
     revision: ThreeDRevisionMigrationRequest = Field(exclude=True)
 
-    def as_id(self) -> int:
-        return self.model_id
+    def as_id(self) -> InternalId:
+        return InternalId(id=self.model_id)

cognite_toolkit/_cdf_tk/commands/_migrate/data_mapper.py

@@ -20,7 +20,7 @@ from cognite_toolkit._cdf_tk.client.data_classes.charts_data import (
     ChartSource,
     ChartTimeseries,
 )
-from cognite_toolkit._cdf_tk.client.data_classes.instance_api import InstanceIdentifier
+from cognite_toolkit._cdf_tk.client.data_classes.instance_api import InstanceIdentifier, NodeReference
 from cognite_toolkit._cdf_tk.client.data_classes.legacy.canvas import (
     ContainerReferenceApply,
     FdmInstanceContainerReferenceApply,
@@ -32,7 +32,6 @@ from cognite_toolkit._cdf_tk.client.data_classes.legacy.migration import Resourc
 from cognite_toolkit._cdf_tk.client.data_classes.three_d import (
     AssetMappingDMRequest,
     AssetMappingResponse,
-    NodeReference,
     RevisionStatus,
     ThreeDModelResponse,
 )
@@ -56,7 +55,7 @@ from cognite_toolkit._cdf_tk.protocols import T_ResourceRequest, T_ResourceRespo
 from cognite_toolkit._cdf_tk.storageio._base import T_Selector
 from cognite_toolkit._cdf_tk.storageio.selectors import CanvasSelector, ChartSelector, ThreeDSelector
 from cognite_toolkit._cdf_tk.utils import humanize_collection
-from cognite_toolkit._cdf_tk.utils.useful_types import T_AssetCentricResourceExtended
+from cognite_toolkit._cdf_tk.utils.useful_types2 import T_AssetCentricResourceExtended
 
 from .data_classes import AssetCentricMapping
 from .selectors import AssetCentricMigrationSelector
@@ -515,6 +514,9 @@ class ThreeDAssetMapper(DataMapper[ThreeDSelector, AssetMappingResponse, AssetMa
             issue.error_message.append("Neither assetInstanceId nor assetId provided for mapping.")
             return None, issue
         mapped_request = AssetMappingDMRequest(
-            modelId=item.model_id, revisionId=item.revision_id, nodeId=item.node_id, assetInstanceId=asset_instance_id
+            model_id=item.model_id,
+            revision_id=item.revision_id,
+            node_id=item.node_id,
+            asset_instance_id=asset_instance_id,
         )
         return mapped_request, issue

cognite_toolkit/_cdf_tk/commands/_migrate/migration_io.py

@@ -11,6 +11,15 @@ from cognite_toolkit._cdf_tk.client.data_classes.three_d import (
     AssetMappingResponse,
     ThreeDModelResponse,
 )
+from cognite_toolkit._cdf_tk.client.http_client import (
+    FailedResponse,
+    HTTPClient,
+    HTTPMessage,
+    ItemsRequest,
+    SimpleBodyRequest,
+    SuccessResponseItems,
+    ToolkitAPIError,
+)
 from cognite_toolkit._cdf_tk.commands._migrate.data_classes import ThreeDMigrationRequest
 from cognite_toolkit._cdf_tk.constants import MISSING_EXTERNAL_ID, MISSING_INSTANCE_SPACE
 from cognite_toolkit._cdf_tk.exceptions import ToolkitNotImplementedError, ToolkitValueError
@@ -29,21 +38,12 @@ from cognite_toolkit._cdf_tk.storageio.selectors import (
 )
 from cognite_toolkit._cdf_tk.tk_warnings import MediumSeverityWarning
 from cognite_toolkit._cdf_tk.utils.collection import chunker_sequence
-from cognite_toolkit._cdf_tk.utils.http_client import (
-    FailedResponse,
-    HTTPClient,
-    HTTPMessage,
-    ItemsRequest,
-    SimpleBodyRequest,
-    SuccessResponseItems,
-    ToolkitAPIError,
-)
 from cognite_toolkit._cdf_tk.utils.useful_types import (
     AssetCentricKindExtended,
     AssetCentricType,
     JsonVal,
-    T_AssetCentricResource,
 )
+from cognite_toolkit._cdf_tk.utils.useful_types2 import T_AssetCentricResource
 
 from .data_classes import (
     AnnotationMapping,

cognite_toolkit/_cdf_tk/commands/_purge.py

@@ -17,6 +17,13 @@ from rich.panel import Panel
 
 from cognite_toolkit._cdf_tk.client import ToolkitClient
 from cognite_toolkit._cdf_tk.client.data_classes.instance_api import TypedInstanceIdentifier
+from cognite_toolkit._cdf_tk.client.http_client import (
+    HTTPClient,
+    ItemsRequest,
+    ItemsRequest2,
+    ItemsSuccessResponse2,
+    SuccessResponseItems,
+)
 from cognite_toolkit._cdf_tk.cruds import (
     AssetCRUD,
     ContainerCRUD,
@@ -59,13 +66,6 @@ from cognite_toolkit._cdf_tk.utils.aggregators import (
     SequenceAggregator,
     TimeSeriesAggregator,
 )
-from cognite_toolkit._cdf_tk.utils.http_client import (
-    HTTPClient,
-    ItemsRequest,
-    ItemsRequest2,
-    ItemsSuccessResponse2,
-    SuccessResponseItems,
-)
 from cognite_toolkit._cdf_tk.utils.producer_worker import ProducerWorkerExecutor
 from cognite_toolkit._cdf_tk.utils.useful_types import JsonVal
 from cognite_toolkit._cdf_tk.utils.validate_access import ValidateAccess

cognite_toolkit/_cdf_tk/commands/_upload.py

@@ -9,6 +9,7 @@ from cognite.client.data_classes.data_modeling import (
 from rich.console import Console
 
 from cognite_toolkit._cdf_tk.client import ToolkitClient
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemMessage, SuccessResponseItems
 from cognite_toolkit._cdf_tk.constants import DATA_MANIFEST_SUFFIX, DATA_RESOURCE_DIR
 from cognite_toolkit._cdf_tk.cruds import ViewCRUD
 from cognite_toolkit._cdf_tk.exceptions import ToolkitValueError
@@ -24,7 +25,6 @@ from cognite_toolkit._cdf_tk.storageio.selectors._instances import InstanceSpace
 from cognite_toolkit._cdf_tk.tk_warnings import HighSeverityWarning, MediumSeverityWarning, ToolkitWarning
 from cognite_toolkit._cdf_tk.utils.auth import EnvironmentVariables
 from cognite_toolkit._cdf_tk.utils.fileio import MultiFileReader
-from cognite_toolkit._cdf_tk.utils.http_client import HTTPClient, ItemMessage, SuccessResponseItems
 from cognite_toolkit._cdf_tk.utils.producer_worker import ProducerWorkerExecutor
 from cognite_toolkit._cdf_tk.utils.progress_tracker import ProgressTracker
 from cognite_toolkit._cdf_tk.utils.useful_types import JsonVal