cognite-toolkit 0.7.56__py3-none-any.whl → 0.7.58__py3-none-any.whl

cognite_toolkit/_cdf_tk/commands/_base.py

@@ -5,6 +5,8 @@ from typing import Any
 from rich import print
 from rich.console import Console
 
+from cognite_toolkit._cdf_tk.client import ToolkitClient
+from cognite_toolkit._cdf_tk.client.http_client import ToolkitAPIError
 from cognite_toolkit._cdf_tk.data_classes import CommandTrackingInfo
 from cognite_toolkit._cdf_tk.tk_warnings import (
     ToolkitWarning,
@@ -16,12 +18,27 @@ _HAS_PRINTED_COLLECT_MESSAGE = False
 
 
 class ToolkitCommand:
-    def __init__(self, print_warning: bool = True, skip_tracking: bool = False, silent: bool = False):
+    def __init__(
+        self,
+        print_warning: bool = True,
+        skip_tracking: bool = False,
+        silent: bool = False,
+        client: ToolkitClient | None = None,
+    ):
         self._print_warning = print_warning
         self.silent = silent
         self.warning_list = WarningList[ToolkitWarning]()
         self.tracker = Tracker(skip_tracking)
         self._additional_tracking_info = CommandTrackingInfo()
+        if client is not None:
+            self._additional_tracking_info.cluster = client.config.cdf_cluster
+            try:
+                result = client.project.organization()
+            except (ToolkitAPIError, ValueError):
+                self._additional_tracking_info.project = client.config.project
+            else:
+                self._additional_tracking_info.organization = result.organization
+                self._additional_tracking_info.project = result.name
 
     @property
     def print_warning(self) -> bool:

cognite_toolkit/_cdf_tk/commands/_import_cmd.py

@@ -21,8 +21,10 @@ class ImportTransformationCLI(ToolkitCommand):
         get_client: Callable[[], ToolkitClient] | None = None,
         print_warning: bool = True,
         skip_tracking: bool = False,
+        silent: bool = False,
+        client: ToolkitClient | None = None,
     ):
-        super().__init__(print_warning, skip_tracking)
+        super().__init__(print_warning, skip_tracking, silent, get_client() if get_client is not None else client)
         self._dataset_external_id_by_id: dict[int, str] = {}
         # We only initialize the client if we need to look up dataset ids.
         self._client: ToolkitClient | None = None

cognite_toolkit/_cdf_tk/commands/_migrate/command.py

@@ -10,9 +10,9 @@ from rich.table import Table
 from cognite_toolkit._cdf_tk.client import ToolkitClient
 from cognite_toolkit._cdf_tk.client.http_client import (
     HTTPClient,
-    ItemsFailedRequest2,
-    ItemsFailedResponse2,
-    ItemsSuccessResponse2,
+    ItemsFailedRequest,
+    ItemsFailedResponse,
+    ItemsSuccessResponse,
 )
 from cognite_toolkit._cdf_tk.commands._base import ToolkitCommand
 from cognite_toolkit._cdf_tk.commands._migrate.creators import MigrationCreator
@@ -187,20 +187,20 @@ class MigrationCommand(ToolkitCommand):
             # Todo: Move logging into the UploadableStorageIO class
             issues: list[WriteIssue] = []
             for item in responses:
-                if isinstance(item, ItemsSuccessResponse2):
+                if isinstance(item, ItemsSuccessResponse):
                     target.logger.tracker.finalize_item(item.ids, "success")
                     continue
-                if isinstance(item, ItemsFailedResponse2):
+                if isinstance(item, ItemsFailedResponse):
                     error = item.error
                     for id_ in item.ids:
                         issue = WriteIssue(id=str(id_), status_code=error.code, message=error.message)
                         issues.append(issue)
-                elif isinstance(item, ItemsFailedRequest2):
+                elif isinstance(item, ItemsFailedRequest):
                     for id_ in item.ids:
                         issue = WriteIssue(id=str(id_), status_code=0, message=item.error_message)
                         issues.append(issue)
 
-                if isinstance(item, ItemsFailedResponse2 | ItemsFailedRequest2):
+                if isinstance(item, ItemsFailedResponse | ItemsFailedRequest):
                     target.logger.tracker.finalize_item(item.ids, "failure")
             if issues:
                 target.logger.log(issues)

cognite_toolkit/_cdf_tk/commands/_migrate/migration_io.py

@@ -7,14 +7,14 @@ from cognite.client.data_classes.data_modeling import EdgeId, InstanceApply, Nod
 from cognite_toolkit._cdf_tk.client import ToolkitClient
 from cognite_toolkit._cdf_tk.client.http_client import (
     HTTPClient,
-    RequestMessage2,
+    RequestMessage,
     ToolkitAPIError,
 )
 from cognite_toolkit._cdf_tk.client.http_client._item_classes import (
-    ItemsFailedResponse2,
-    ItemsRequest2,
+    ItemsFailedResponse,
+    ItemsRequest,
     ItemsResultList,
-    ItemsSuccessResponse2,
+    ItemsSuccessResponse,
 )
 from cognite_toolkit._cdf_tk.client.resource_classes.legacy.pending_instances_ids import PendingInstanceId
 from cognite_toolkit._cdf_tk.client.resource_classes.three_d import (
@@ -200,7 +200,7 @@ class AssetCentricMigrationIO(
         successful_linked: set[str] = set()
         for batch in chunker_sequence(data_chunk, cls.CHUNK_SIZE):
             batch_results = http_client.request_items_retries(
-                message=ItemsRequest2(
+                message=ItemsRequest(
                     endpoint_url=config.create_api_url(pending_instance_id_endpoint),
                     method="POST",
                     api_version="alpha",
@@ -211,7 +211,7 @@ class AssetCentricMigrationIO(
                 )
             )
             for res in batch_results:
-                if isinstance(res, ItemsSuccessResponse2):
+                if isinstance(res, ItemsSuccessResponse):
                     successful_linked.update(res.ids)
         to_upload = [item for item in data_chunk if item.source_id in successful_linked]
         return to_upload
@@ -450,24 +450,24 @@ class ThreeDMigrationIO(UploadableStorageIO[ThreeDSelector, ThreeDModelResponse,
 
         results = ItemsResultList()
         responses = http_client.request_items_retries(
-            message=ItemsRequest2(
+            message=ItemsRequest(
                 endpoint_url=self.client.config.create_api_url(self.UPLOAD_ENDPOINT),
                 method="POST",
                 items=data_chunk,
             )
         )
         if (
-            failed_response := next((res for res in responses if isinstance(res, ItemsFailedResponse2)), None)
+            failed_response := next((res for res in responses if isinstance(res, ItemsFailedResponse)), None)
         ) and failed_response.status_code == 400:
             raise ToolkitAPIError("3D model migration failed. You need to enable the 3D migration alpha feature flag.")
 
         results.extend(responses)
-        success_ids = {id for res in responses if isinstance(res, ItemsSuccessResponse2) for id in res.ids}
+        success_ids = {id for res in responses if isinstance(res, ItemsSuccessResponse) for id in res.ids}
         for data in data_chunk:
             if data.source_id not in success_ids:
                 continue
             revision = http_client.request_single_retries(
-                message=RequestMessage2(
+                message=RequestMessage(
                     endpoint_url=self.client.config.create_api_url(self.REVISION_ENDPOINT),
                     method="POST",
                     body_content={"items": [data.item.revision.dump(camel_case=True)]},
@@ -548,7 +548,7 @@ class ThreeDAssetMappingMigrationIO(
         revision_id = first.item.revision_id
         endpoint = self.UPLOAD_ENDPOINT.format(modelId=model_id, revisionId=revision_id)
         return http_client.request_items_retries(
-            ItemsRequest2(
+            ItemsRequest(
                 endpoint_url=self.client.config.create_api_url(endpoint),
                 method="POST",
                 items=data_chunk,

cognite_toolkit/_cdf_tk/commands/_profile.py

@@ -71,8 +71,9 @@ class ProfileCommand(ToolkitCommand, ABC, Generic[T_Index]):
         print_warning: bool = True,
         skip_tracking: bool = False,
         silent: bool = False,
+        client: ToolkitClient | None = None,
     ) -> None:
-        super().__init__(print_warning, skip_tracking, silent)
+        super().__init__(print_warning, skip_tracking, silent, client)
         self.table_title = self.__class__.__name__.removesuffix("Command")
         self.output_spreadsheet: Path | None = output_spreadsheet
         if output_spreadsheet is not None:
@@ -347,8 +348,9 @@ class ProfileAssetCommand(ProfileCommand[AssetIndex]):
         print_warning: bool = True,
         skip_tracking: bool = False,
         silent: bool = False,
+        client: ToolkitClient | None = None,
     ) -> None:
-        super().__init__(output_spreadsheet, print_warning, skip_tracking, silent)
+        super().__init__(output_spreadsheet, print_warning, skip_tracking, silent, client)
         self.table_title = "Asset Profile for Hierarchy"
         self.hierarchy: str | None = None
         self.aggregators: dict[str, MetadataAggregator] = {}
@@ -641,8 +643,9 @@ class ProfileAssetCentricCommand(ProfileCommand[str]):
         print_warning: bool = True,
         skip_tracking: bool = False,
         silent: bool = False,
+        client: ToolkitClient | None = None,
     ) -> None:
-        super().__init__(output_spreadsheet, print_warning, skip_tracking, silent)
+        super().__init__(output_spreadsheet, print_warning, skip_tracking, silent, client)
         self.hierarchy: str | None = None
         self.table_title = "Asset Centric Profile"
         self.aggregators: dict[str, AssetCentricAggregator] = {}
@@ -742,8 +745,9 @@ class ProfileTransformationCommand(ProfileCommand[str]):
         print_warning: bool = True,
         skip_tracking: bool = False,
         silent: bool = False,
+        client: ToolkitClient | None = None,
     ) -> None:
-        super().__init__(output_spreadsheet, print_warning, skip_tracking, silent)
+        super().__init__(output_spreadsheet, print_warning, skip_tracking, silent, client)
         self.table_title = "Transformation Profile"
         self.destination_type: AssetCentricDestinationType | None = None
 
@@ -826,8 +830,9 @@ class ProfileRawCommand(ProfileCommand[RawProfileIndex]):
         print_warning: bool = True,
         skip_tracking: bool = False,
         silent: bool = False,
+        client: ToolkitClient | None = None,
     ) -> None:
-        super().__init__(output_spreadsheet, print_warning, skip_tracking, silent)
+        super().__init__(output_spreadsheet, print_warning, skip_tracking, silent, client)
         self.table_title = "RAW Profile"
         self.destination_type: AssetCentricDestinationType | None = None
         self.client: ToolkitClient | None = None

cognite_toolkit/_cdf_tk/commands/_purge.py

@@ -20,8 +20,8 @@ from cognite_toolkit._cdf_tk.client import ToolkitClient
 from cognite_toolkit._cdf_tk.client._resource_base import RequestItem
 from cognite_toolkit._cdf_tk.client.http_client import (
     HTTPClient,
-    ItemsRequest2,
-    ItemsSuccessResponse2,
+    ItemsRequest,
+    ItemsSuccessResponse,
 )
 from cognite_toolkit._cdf_tk.client.resource_classes.instance_api import TypedInstanceIdentifier
 from cognite_toolkit._cdf_tk.cruds import (
@@ -221,7 +221,7 @@ class PurgeCommand(ToolkitCommand):
         if not dry_run and not auto_yes:
             confirm = questionary.confirm(
                 f"Are you really sure you want to purge the {selected_space!r} space?", default=False
-            ).unsafe_ask()
+            ).ask()
             if not confirm:
                 return DeployResults([], "purge", dry_run=dry_run)
 
@@ -372,7 +372,7 @@ class PurgeCommand(ToolkitCommand):
 
         def process(items: list[JsonVal]) -> None:
             responses = delete_client.request_items_retries(
-                ItemsRequest2(
+                ItemsRequest(
                     endpoint_url=delete_url,
                     method="POST",
                     items=[DeleteItem(item=item, as_id_fun=as_id) for item in items],
@@ -380,7 +380,7 @@ class PurgeCommand(ToolkitCommand):
                 )
             )
             for response in responses:
-                if isinstance(response, ItemsSuccessResponse2):
+                if isinstance(response, ItemsSuccessResponse):
                     result.deleted += len(response.ids)
                 else:
                     result.unchanged += len(response.ids)
@@ -422,7 +422,7 @@ class PurgeCommand(ToolkitCommand):
         if not dry_run and not auto_yes:
             confirm = questionary.confirm(
                 f"Are you really sure you want to purge the {selected_data_set_external_id!r} dataSet?", default=False
-            ).unsafe_ask()
+            ).ask()
             if not confirm:
                 return DeployResults([], "purge", dry_run=dry_run)
 
@@ -594,7 +594,7 @@ class PurgeCommand(ToolkitCommand):
                 confirm = questionary.confirm(
                     f"Are you really sure you want to purge all {total:,} instances in {selector!s}?",
                     default=False,
-                ).unsafe_ask()
+                ).ask()
                 if not confirm:
                     return DeleteResults()
 
@@ -715,14 +715,14 @@ class PurgeCommand(ToolkitCommand):
             return
 
         responses = delete_client.request_items_retries(
-            ItemsRequest2(
+            ItemsRequest(
                 endpoint_url=delete_client.config.create_api_url("/models/instances/delete"),
                 method="POST",
                 items=[TypedInstanceIdentifier._load(item) for item in items],
             )
         )
         for response in responses:
-            if isinstance(response, ItemsSuccessResponse2):
+            if isinstance(response, ItemsSuccessResponse):
                 results.deleted += len(response.ids)
             else:
                 results.failed += len(response.ids)
@@ -734,17 +734,13 @@ class PurgeCommand(ToolkitCommand):
         node_ids = [instance for instance in instances if isinstance(instance, NodeId)]
         if node_ids:
             timeseries = client.time_series.retrieve_multiple(instance_ids=node_ids, ignore_unknown_ids=True)
-            migrated_timeseries_ids = [
-                ts.id
-                for ts in timeseries
-                if ts.instance_id and ts.pending_instance_id  # type: ignore[attr-defined]
-            ]
             if not dry_run and timeseries:
+                migrated_timeseries_ids = [ts.id for ts in timeseries if ts.instance_id and ts.pending_instance_id]  # type: ignore[attr-defined]
                 client.time_series.unlink_instance_ids(id=migrated_timeseries_ids)
                 if verbose:
                     console.print(f"Unlinked {len(migrated_timeseries_ids)} timeseries from datapoints.")
             elif verbose and timeseries:
-                console.print(f"Would have unlinked {len(migrated_timeseries_ids)} timeseries from datapoints.")
+                console.print(f"Would have unlinked {len(timeseries)} timeseries from datapoints.")
         return instances
 
     @staticmethod
@@ -754,15 +750,15 @@ class PurgeCommand(ToolkitCommand):
         file_ids = [instance for instance in instances if isinstance(instance, NodeId)]
         if file_ids:
             files = client.files.retrieve_multiple(instance_ids=file_ids, ignore_unknown_ids=True)
-            migrated_file_ids = [
-                file.id
-                for file in files
-                if file.instance_id and file.pending_instance_id and file.id is not None  # type: ignore[attr-defined]
-            ]
             if not dry_run and files:
+                migrated_file_ids = [
+                    file.id
+                    for file in files
+                    if file.instance_id and file.pending_instance_id and file.id is not None  # type: ignore[attr-defined]
+                ]
                 client.files.unlink_instance_ids(id=migrated_file_ids)
                 if verbose:
                     console.print(f"Unlinked {len(migrated_file_ids)} files from nodes.")
             elif verbose and files:
-                console.print(f"Would have unlinked {len(migrated_file_ids)} files from their blob content.")
+                console.print(f"Would have unlinked {len(files)} files from their blob content.")
         return instances

cognite_toolkit/_cdf_tk/commands/_upload.py

@@ -7,7 +7,7 @@ from cognite.client.data_classes.data_modeling import ViewId
 from rich.console import Console
 
 from cognite_toolkit._cdf_tk.client import ToolkitClient
-from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsResultMessage2, ItemsSuccessResponse2
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsResultMessage, ItemsSuccessResponse
 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
@@ -277,10 +277,10 @@ class UploadCommand(ToolkitCommand):
             return
         results = io.upload_items(data_chunk, upload_client, selector)
         for message in results:
-            if isinstance(message, ItemsSuccessResponse2):
+            if isinstance(message, ItemsSuccessResponse):
                 for id_ in message.ids:
                     tracker.set_progress(id_, step=cls._UPLOAD, status="success")
-            elif isinstance(message, ItemsResultMessage2):
+            elif isinstance(message, ItemsResultMessage):
                 for id_ in message.ids:
                     tracker.set_progress(id_, step=cls._UPLOAD, status="failed")
             else:

cognite_toolkit/_cdf_tk/commands/build_cmd.py

@@ -99,8 +99,9 @@ class BuildCommand(ToolkitCommand):
         print_warning: bool = True,
         skip_tracking: bool = False,
         silent: bool = False,
+        client: ToolkitClient | None = None,
     ) -> None:
-        super().__init__(print_warning, skip_tracking, silent)
+        super().__init__(print_warning, skip_tracking, silent, client)
         self.existing_resources_by_loader: dict[type[ResourceCRUD], set[Hashable]] = defaultdict(set)
         self.instantiated_loaders: dict[type[ResourceCRUD], ResourceCRUD] = {}
 

cognite_toolkit/_cdf_tk/commands/build_v2/build_cmd.py

@@ -21,8 +21,14 @@ from cognite_toolkit._version import __version__
 
 
 class BuildCommand(ToolkitCommand):
-    def __init__(self, print_warning: bool = True, skip_tracking: bool = False, silent: bool = False) -> None:
-        super().__init__(print_warning, skip_tracking, silent)
+    def __init__(
+        self,
+        print_warning: bool = True,
+        skip_tracking: bool = False,
+        silent: bool = False,
+        client: ToolkitClient | None = None,
+    ) -> None:
+        super().__init__(print_warning, skip_tracking, silent, client)
         self.issues = IssueList()
 
     def execute(

cognite_toolkit/_cdf_tk/commands/deploy.py

@@ -62,8 +62,14 @@ from ._utils import _print_ids_or_length
 
 
 class DeployCommand(ToolkitCommand):
-    def __init__(self, print_warning: bool = True, skip_tracking: bool = False, silent: bool = False) -> None:
-        super().__init__(print_warning, skip_tracking, silent)
+    def __init__(
+        self,
+        print_warning: bool = True,
+        skip_tracking: bool = False,
+        silent: bool = False,
+        client: ToolkitClient | None = None,
+    ) -> None:
+        super().__init__(print_warning, skip_tracking, silent, client)
         self._clean_command = CleanCommand(print_warning, skip_tracking=True)
 
     def deploy_build_directory(

cognite_toolkit/_cdf_tk/commands/init.py

@@ -13,6 +13,7 @@ from rich import print
 from rich.panel import Panel
 
 from cognite_toolkit._cdf_tk.cdf_toml import CDFToml
+from cognite_toolkit._cdf_tk.client import ToolkitClient
 from cognite_toolkit._cdf_tk.commands._base import ToolkitCommand
 from cognite_toolkit._cdf_tk.commands.auth import AuthCommand
 from cognite_toolkit._cdf_tk.commands.collect import CollectCommand
@@ -54,8 +55,14 @@ class InitChecklistItem:
 class InitCommand(ToolkitCommand):
     organization_dir: Path | None
 
-    def __init__(self, print_warning: bool = True, skip_tracking: bool = False, silent: bool = False) -> None:
-        super().__init__(print_warning, skip_tracking, silent)
+    def __init__(
+        self,
+        print_warning: bool = True,
+        skip_tracking: bool = False,
+        silent: bool = False,
+        client: ToolkitClient | None = None,
+    ) -> None:
+        super().__init__(print_warning, skip_tracking, silent, client)
         self.organization_dir = None
 
     def execute(self, dry_run: bool = False) -> None:

cognite_toolkit/_cdf_tk/commands/modules.py

@@ -23,6 +23,7 @@ from rich.table import Table
 from rich.tree import Tree
 
 from cognite_toolkit._cdf_tk.cdf_toml import CDFToml, Library
+from cognite_toolkit._cdf_tk.client import ToolkitClient
 from cognite_toolkit._cdf_tk.commands import _cli_commands as CLICommands
 from cognite_toolkit._cdf_tk.commands._base import ToolkitCommand
 from cognite_toolkit._cdf_tk.commands._changes import (
@@ -81,10 +82,11 @@ class ModulesCommand(ToolkitCommand):
         print_warning: bool = True,
         skip_tracking: bool = False,
         silent: bool = False,
+        client: ToolkitClient | None = None,
         temp_dir_suffix: str | None = None,
         module_source_dir: Path | None = None,
     ):
-        super().__init__(print_warning, skip_tracking, silent)
+        super().__init__(print_warning, skip_tracking, silent, client)
         self._module_source_dir: Path | None = module_source_dir
         # Use suffix to make temp directory unique (useful for parallel test execution)
         modules_dir_name = f"{MODULES}.{temp_dir_suffix}" if temp_dir_suffix else MODULES

cognite_toolkit/_cdf_tk/commands/pull.py

@@ -411,8 +411,14 @@ class TextFileDifference(UserList):
 
 
 class PullCommand(ToolkitCommand):
-    def __init__(self, print_warning: bool = True, skip_tracking: bool = False, silent: bool = False) -> None:
-        super().__init__(print_warning, skip_tracking, silent)
+    def __init__(
+        self,
+        print_warning: bool = True,
+        skip_tracking: bool = False,
+        silent: bool = False,
+        client: ToolkitClient | None = None,
+    ) -> None:
+        super().__init__(print_warning, skip_tracking, silent, client)
         self._clean_command = CleanCommand(print_warning, skip_tracking=True)
 
     def pull_module(

cognite_toolkit/_cdf_tk/commands/repo.py

@@ -5,6 +5,7 @@ from pathlib import Path
 import questionary
 
 import cognite_toolkit
+from cognite_toolkit._cdf_tk.client import ToolkitClient
 from cognite_toolkit._cdf_tk.constants import REPO_FILES_DIR
 from cognite_toolkit._cdf_tk.exceptions import ToolkitValueError
 from cognite_toolkit._cdf_tk.tk_warnings import LowSeverityWarning, MediumSeverityWarning
@@ -27,8 +28,9 @@ class RepoCommand(ToolkitCommand):
         skip_tracking: bool = False,
         silent: bool = False,
         skip_git_verify: bool = False,
+        client: ToolkitClient | None = None,
     ) -> None:
-        super().__init__(print_warning=print_warning, skip_tracking=skip_tracking, silent=silent)
+        super().__init__(print_warning=print_warning, skip_tracking=skip_tracking, silent=silent, client=client)
         self._repo_files = Path(resources.files(cognite_toolkit.__name__)) / REPO_FILES_DIR  # type: ignore [arg-type]
         self.skip_git_verify = skip_git_verify
 

cognite_toolkit/_cdf_tk/commands/resources.py

@@ -17,9 +17,6 @@ from cognite_toolkit._cdf_tk.utils.file import yaml_safe_dump
 
 
 class ResourcesCommand(ToolkitCommand):
-    def __init__(self, print_warning: bool = True, skip_tracking: bool = False, silent: bool = False) -> None:
-        super().__init__(print_warning, skip_tracking, silent)
-
     def _get_or_prompt_module_path(self, module: str | None, organization_dir: Path, verbose: bool) -> Path:
         """
         Check if the module exists in the organization directory and return the module path.

cognite_toolkit/_cdf_tk/data_classes/_tracking_info.py

@@ -25,6 +25,7 @@ class CommandTrackingInfo(BaseModel):
 
     project: str | None = Field(default=None)
     cluster: str | None = Field(default=None)
+    organization: str | None = Field(default=None)
     module_ids: set[str] = Field(default_factory=set, alias="moduleIds")
     package_ids: set[str] = Field(default_factory=set, alias="packageIds")
     installed_module_ids: set[str] = Field(default_factory=set, alias="installedModuleIds")

cognite_toolkit/_cdf_tk/storageio/_applications.py

@@ -7,9 +7,9 @@ from pydantic import JsonValue
 from cognite_toolkit._cdf_tk.client import ToolkitClient
 from cognite_toolkit._cdf_tk.client.http_client import (
     HTTPClient,
-    HTTPResult2,
-    RequestMessage2,
-    SuccessResponse2,
+    HTTPResult,
+    RequestMessage,
+    SuccessResponse,
 )
 from cognite_toolkit._cdf_tk.client.http_client._item_classes import ItemsResultList
 from cognite_toolkit._cdf_tk.client.resource_classes.legacy.canvas import (
@@ -217,7 +217,7 @@ class CanvasIO(UploadableStorageIO[CanvasSelector, IndustrialCanvas, IndustrialC
             else:
                 to_delete = []
 
-            last_response: HTTPResult2 | None = None
+            last_response: HTTPResult | None = None
             for upsert_chunk, delete_chunk in zip_longest(
                 chunker_sequence(upsert_items, 1000), chunker_sequence(to_delete, 1000), fillvalue=None
             ):
@@ -229,13 +229,13 @@ class CanvasIO(UploadableStorageIO[CanvasSelector, IndustrialCanvas, IndustrialC
                     body_content["delete"] = delete_chunk
 
                 response = http_client.request_single_retries(
-                    message=RequestMessage2(
+                    message=RequestMessage(
                         endpoint_url=config.create_api_url("/models/instances"),
                         method="POST",
                         body_content=body_content,
                     )
                 )
-                if not isinstance(response, SuccessResponse2):
+                if not isinstance(response, SuccessResponse):
                     results.append(response.as_item_response(item.source_id))
                 last_response = response
             if last_response is not None:

cognite_toolkit/_cdf_tk/storageio/_base.py

@@ -8,7 +8,7 @@ from pydantic import ConfigDict
 from cognite_toolkit._cdf_tk.client import ToolkitClient
 from cognite_toolkit._cdf_tk.client._resource_base import RequestItem
 from cognite_toolkit._cdf_tk.client.http_client import HTTPClient
-from cognite_toolkit._cdf_tk.client.http_client._item_classes import ItemsRequest2, ItemsResultList
+from cognite_toolkit._cdf_tk.client.http_client._item_classes import ItemsRequest, ItemsResultList
 from cognite_toolkit._cdf_tk.exceptions import ToolkitNotImplementedError
 from cognite_toolkit._cdf_tk.protocols import T_ResourceRequest, T_ResourceResponse
 from cognite_toolkit._cdf_tk.utils.collection import chunker
@@ -185,7 +185,7 @@ class UploadableStorageIO(
             raise ToolkitNotImplementedError(f"Unsupported UPLOAD_ENDPOINT_TYPE {self.UPLOAD_ENDPOINT_TYPE!r}.")
 
         return http_client.request_items_retries(
-            message=ItemsRequest2(
+            message=ItemsRequest(
                 endpoint_url=url,
                 method=self.UPLOAD_ENDPOINT_METHOD,
                 items=data_chunk,

cognite_toolkit/_cdf_tk/storageio/_datapoints.py

@@ -19,8 +19,8 @@ from cognite_toolkit._cdf_tk.client import ToolkitClient
 from cognite_toolkit._cdf_tk.client._resource_base import Identifier, RequestResource
 from cognite_toolkit._cdf_tk.client.http_client import (
     HTTPClient,
-    RequestMessage2,
-    SuccessResponse2,
+    RequestMessage,
+    SuccessResponse,
 )
 from cognite_toolkit._cdf_tk.client.http_client._item_classes import ItemsResultList
 from cognite_toolkit._cdf_tk.exceptions import ToolkitNotImplementedError
@@ -132,7 +132,7 @@ class DatapointsIO(
                 for ts in timeseries
             ]
             response = self.client.http_client.request_single_retries(
-                RequestMessage2(
+                RequestMessage(
                     endpoint_url=config.create_api_url("/timeseries/data/list"),
                     method="POST",
                     accept="application/protobuf",
@@ -140,7 +140,7 @@ class DatapointsIO(
                     body_content={"items": items},  # type: ignore[dict-item]
                 )
             )
-            if not isinstance(response, SuccessResponse2):
+            if not isinstance(response, SuccessResponse):
                 continue
             aggregate_response: DataPointListResponse = DataPointListResponse.FromString(response.content)
             timeseries_ids_with_data: dict[int, int] = {}
@@ -190,7 +190,7 @@ class DatapointsIO(
 
     def _fetch_datapoints_batch(self, batch: list[dict[str, Any]], config: Any) -> Page[DataPointListResponse] | None:
         response = self.client.http_client.request_single_retries(
-            RequestMessage2(
+            RequestMessage(
                 endpoint_url=config.create_api_url("/timeseries/data/list"),
                 method="POST",
                 accept="application/protobuf",
@@ -198,7 +198,7 @@ class DatapointsIO(
                 body_content={"items": batch},  # type: ignore[dict-item]
             )
         )
-        if not isinstance(response, SuccessResponse2):
+        if not isinstance(response, SuccessResponse):
             return None
         data_response: DataPointListResponse = DataPointListResponse.FromString(response.content)
         return Page("Main", [data_response])
@@ -257,7 +257,7 @@ class DatapointsIO(
         results = ItemsResultList()
         for item in data_chunk:
             response = http_client.request_single_retries(
-                RequestMessage2(
+                RequestMessage(
                     endpoint_url=http_client.config.create_api_url(self.UPLOAD_ENDPOINT),
                     method="POST",
                     content_type="application/protobuf",