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

cognite_toolkit/_cdf_tk/commands/dump_resource.py

@@ -136,7 +136,9 @@ class DataModelFinder(ResourceFinder[DataModelId]):
         if len(available_spaces) == 1:
             selected_space = available_spaces[0]
         else:
-            selected_space = questionary.select("In which space is your data model located?", available_spaces).ask()
+            selected_space = questionary.select(
+                "In which space is your data model located?", available_spaces
+            ).unsafe_ask()
         data_model_ids = sorted(
             [model for model in data_model_ids if model.space == selected_space], key=lambda model: model.as_tuple()
         )
@@ -147,7 +149,7 @@ class DataModelFinder(ResourceFinder[DataModelId]):
                 Choice(f"{model_id!r}", value=model_id)
                 for model_id in sorted(data_model_ids, key=lambda model: model.as_tuple())
             ],
-        ).ask()
+        ).unsafe_ask()
 
         retrieved_models = self.client.data_modeling.data_models.retrieve(
             (selected_data_model.space, selected_data_model.external_id), inline_views=False
@@ -165,7 +167,7 @@ class DataModelFinder(ResourceFinder[DataModelId]):
         if not questionary.confirm(
             f"Would you like to select a different version than {selected_data_model.version} of the data model",
             default=False,
-        ).ask():
+        ).unsafe_ask():
             self.data_model = models_by_version[cast(str, selected_data_model.version)]
             return selected_data_model
 
@@ -175,7 +177,7 @@ class DataModelFinder(ResourceFinder[DataModelId]):
                 Choice(f"{version} ({len(model.views)} views)", value=version)
                 for version, model in models_by_version.items()
             ],
-        ).ask()
+        ).unsafe_ask()
         self.data_model = models_by_version[selected_model]
         return self.data_model.as_id()
 
@@ -240,7 +242,7 @@ class WorkflowFinder(ResourceFinder[WorkflowVersionId]):
         selected_workflow_id: str = questionary.select(
             "Which workflow would you like to dump?",
             [Choice(workflow_id, value=workflow_id) for workflow_id in workflows.as_external_ids()],
-        ).ask()
+        ).unsafe_ask()
         for workflow in workflows:
             if workflow.external_id == selected_workflow_id:
                 self._workflow = workflow
@@ -256,7 +258,7 @@ class WorkflowFinder(ResourceFinder[WorkflowVersionId]):
         selected_version: WorkflowVersionId = questionary.select(
             "Which version would you like to dump?",
             [Choice(f"{version!r}", value=version) for version in versions.as_ids()],
-        ).ask()
+        ).unsafe_ask()
         for version in versions:
             if version.version == selected_version.version:
                 self._workflow_version = version
@@ -309,7 +311,8 @@ class TransformationFinder(ResourceFinder[tuple[str, ...]]):
         selected_transformation_ids: tuple[str, ...] | None = questionary.checkbox(
             "Which transformation(s) would you like to dump?",
             choices=choices,
-        ).ask()
+            validate=lambda choices: True if choices else "You must select at least one transformation.",
+        ).unsafe_ask()
         if not selected_transformation_ids:
             raise ToolkitValueError(f"No transformations selected for dumping.{_INTERACTIVE_SELECT_HELPER_TEXT}")
         return tuple(selected_transformation_ids)
@@ -354,7 +357,8 @@ class GroupFinder(ResourceFinder[tuple[str, ...]]):
                 Choice(f"{group_name} ({len(group_list)} group{'s' if len(group_list) > 1 else ''})", value=group_list)
                 for group_name, group_list in sorted(groups_by_name.items())
             ],
-        ).ask()
+            validate=lambda choices: True if choices else "You must select at least one group.",
+        ).unsafe_ask()
         if not selected_groups:
             raise ToolkitValueError(f"No group selected for dumping.{_INTERACTIVE_SELECT_HELPER_TEXT}")
         self.groups = [group for group_list in selected_groups for group in group_list]
@@ -387,7 +391,8 @@ class AgentFinder(ResourceFinder[tuple[str, ...]]):
         selected_agent_ids: list[str] | None = questionary.checkbox(
             "Which agent(s) would you like to dump?",
             choices=choices,
-        ).ask()
+            validate=lambda choices: True if choices else "You must select at least one agent.",
+        ).unsafe_ask()
         if not selected_agent_ids:
             raise ToolkitValueError(f"No agents selected for dumping.{_INTERACTIVE_SELECT_HELPER_TEXT}")
         return tuple(selected_agent_ids)
@@ -418,7 +423,7 @@ class NodeFinder(ResourceFinder[dm.ViewId]):
             raise ToolkitMissingResourceError("No spaces found")
         selected_space: str = questionary.select(
             "In which space is your node property view located?", [space.space for space in spaces]
-        ).ask()
+        ).unsafe_ask()
 
         views = self.client.data_modeling.views.list(space=selected_space, limit=-1, all_versions=False)
         if not views:
@@ -428,7 +433,7 @@ class NodeFinder(ResourceFinder[dm.ViewId]):
         selected_view_id: dm.ViewId = questionary.select(
             "Which node property view would you like to dump?",
             [Choice(repr(view), value=view) for view in views.as_ids()],
-        ).ask()
+        ).unsafe_ask()
         return selected_view_id
 
     def __iter__(self) -> Iterator[tuple[list[Hashable], CogniteResourceList | None, ResourceCRUD, None | str]]:
@@ -444,7 +449,7 @@ class NodeFinder(ResourceFinder[dm.ViewId]):
                 if not questionary.confirm(
                     f"Are you sure you want to dump {count} nodes? This may take a while.",
                     default=False,
-                ).ask():
+                ).unsafe_ask():
                     typer.Exit(0)
         nodes = dm.NodeList[dm.Node](list(loader.iterate()))
         yield [], nodes, loader, None
@@ -463,7 +468,8 @@ class LocationFilterFinder(ResourceFinder[tuple[str, ...]]):
         selected_filter_ids: tuple[str, ...] | None = questionary.checkbox(
             "Which filters would you like to dump?",
             choices=[Choice(name, value=id_) for name, id_ in id_by_display_name.items()],
-        ).ask()
+            validate=lambda choices: True if choices else "You must select at least one filter.",
+        ).unsafe_ask()
         if not selected_filter_ids:
             raise ToolkitValueError(f"No filters selected for dumping.{_INTERACTIVE_SELECT_HELPER_TEXT}")
         return tuple(selected_filter_ids)
@@ -499,7 +505,8 @@ class ExtractionPipelineFinder(ResourceFinder[tuple[str, ...]]):
         selected_pipeline_ids: tuple[str, ...] | None = questionary.checkbox(
             "Which extraction pipeline(s) would you like to dump?",
             choices=choices,
-        ).ask()
+            validate=lambda choices: True if choices else "You must select at least one pipeline.",
+        ).unsafe_ask()
         if not selected_pipeline_ids:
             raise ToolkitValueError(f"No extraction pipelines selected for dumping.{_INTERACTIVE_SELECT_HELPER_TEXT}")
         return tuple(selected_pipeline_ids)
@@ -538,7 +545,8 @@ class DataSetFinder(ResourceFinder[tuple[str, ...]]):
         selected_dataset_ids: tuple[str, ...] | None = questionary.checkbox(
             "Which dataset(s) would you like to dump?",
             choices=choices,
-        ).ask()
+            validate=lambda choices: True if choices else "You must select at least one dataset.",
+        ).unsafe_ask()
         if not selected_dataset_ids:
             raise ToolkitValueError(f"No datasets selected for dumping.{_INTERACTIVE_SELECT_HELPER_TEXT}")
         return tuple(selected_dataset_ids)
@@ -574,7 +582,8 @@ class FunctionFinder(ResourceFinder[tuple[str, ...]]):
         selected_function_ids: tuple[str, ...] | None = questionary.checkbox(
             "Which function(s) would you like to dump?",
             choices=choices,
-        ).ask()
+            validate=lambda choices: True if choices else "You must select at least one function.",
+        ).unsafe_ask()
         if not selected_function_ids:
             raise ToolkitValueError(f"No functions selected for dumping.{_INTERACTIVE_SELECT_HELPER_TEXT}")
         return tuple(selected_function_ids)
@@ -635,7 +644,7 @@ class StreamlitFinder(ResourceFinder[tuple[str, ...]]):
                 Choice(f"{item.value} ({item.count})", value=item.value)
                 for item in sorted(result, key=lambda r: (r.count, str(r.value) or ""))
             ],
-        ).ask()
+        ).unsafe_ask()
         files = self.client.files.list(
             limit=-1, directory_prefix="/streamlit-apps/", metadata={"creator": str(selected_creator)}
         )
@@ -653,7 +662,8 @@ class StreamlitFinder(ResourceFinder[tuple[str, ...]]):
                 )
                 for app in sorted(self.apps, key=lambda a: a.name)
             ],
-        ).ask()
+            validate=lambda choices: True if choices else "You must select at least one Streamlit app.",
+        ).unsafe_ask()
         if not selected_ids:
             raise ToolkitValueError(f"No Streamlit app selected for dumping.{_INTERACTIVE_SELECT_HELPER_TEXT}")
         return tuple(selected_ids)
@@ -772,7 +782,8 @@ class SearchConfigFinder(ResourceFinder[tuple[SearchConfigViewId, ...]]):
         selected_view_ids: list[SearchConfigViewId] | None = questionary.checkbox(
             "For which view would you like to dump the search configuration?",
             choices=choices,
-        ).ask()
+            validate=lambda choices: True if choices else "You must select at least one view.",
+        ).unsafe_ask()
         if not selected_view_ids:
             raise ToolkitValueError("No view selected for dumping the search configuration.")
         return tuple(selected_view_ids)

cognite_toolkit/_cdf_tk/commands/init.py

@@ -129,7 +129,7 @@ class InitCommand(ToolkitCommand):
                 "Select a task:",
                 choices=choices,
                 default=default_value,
-            ).ask()
+            ).unsafe_ask()
 
             # User cancelled (Ctrl+C or similar)
             if selected is None:
@@ -161,7 +161,7 @@ class InitCommand(ToolkitCommand):
                 confirm = questionary.confirm(
                     f"'{selected_item.description}' was already run {status_text}",
                     default=False,
-                ).ask()
+                ).unsafe_ask()
                 if not confirm:
                     continue
 
@@ -218,7 +218,7 @@ class InitCommand(ToolkitCommand):
         opt_in = questionary.confirm(
             "Do you want to opt in to collect usage statistics? This will help us improve the Toolkit.",
             default=True,
-        ).ask()
+        ).unsafe_ask()
         if dry_run:
             print("Would opt in to collect data" if opt_in else "Would not opt in to collect data")
             return

cognite_toolkit/_cdf_tk/commands/modules.py

@@ -181,7 +181,7 @@ class ModulesCommand(ToolkitCommand):
                     if questionary.confirm(
                         f"{INDENT}Module {module.name} already exists in folder {target_dir}. Would you like to overwrite?",
                         default=False,
-                    ).ask():
+                    ).unsafe_ask():
                         safe_rmtree(target_dir)
                     else:
                         continue
@@ -351,7 +351,10 @@ class ModulesCommand(ToolkitCommand):
                 # Need to rerun the mode as bootcamp has a hardcoded organization directory
                 mode = self._verify_clean(bootcamp_org / MODULES, clean)
             # We only ask to verify if the user has not already selected overwrite in the _verify_clean method
-            if mode == "clean" or questionary.confirm("Would you like to continue with creation?", default=True).ask():
+            if (
+                mode == "clean"
+                or questionary.confirm("Would you like to continue with creation?", default=True).unsafe_ask()
+            ):
                 self._create(
                     organization_dir=bootcamp_org,
                     selected_packages=selected,
@@ -363,7 +366,7 @@ class ModulesCommand(ToolkitCommand):
 
         if (
             not is_interactive
-            and not questionary.confirm("Would you like to continue with creation?", default=True).ask()
+            and not questionary.confirm("Would you like to continue with creation?", default=True).unsafe_ask()
         ):
             print("Exiting...")
             raise typer.Exit()
@@ -380,7 +383,8 @@ class ModulesCommand(ToolkitCommand):
                 qmark=INDENT,
                 pointer=POINTER,
                 style=custom_style_fancy,
-            ).ask()
+                validate=lambda choices: True if choices else "You must select at least one environment.",
+            ).unsafe_ask()
         else:
             environments = user_environments
 
@@ -425,7 +429,7 @@ class ModulesCommand(ToolkitCommand):
             )
         )
 
-        organization_dir_raw = questionary.text(message="", default="").ask()
+        organization_dir_raw = questionary.text(message="", default="").unsafe_ask()
         return Path(organization_dir_raw.strip())
 
     @staticmethod
@@ -438,7 +442,7 @@ class ModulesCommand(ToolkitCommand):
             download_data = questionary.confirm(
                 f"The modules {humanize_collection(example_data)} has example data. Would you like to download it?",
                 default=True,
-            ).ask()
+            ).unsafe_ask()
         return download_data
 
     def _select_modules_in_package(self, package: Package) -> list[ModuleLocation]:
@@ -467,7 +471,8 @@ class ModulesCommand(ToolkitCommand):
             qmark=INDENT,
             pointer=POINTER,
             style=custom_style_fancy,
-        ).ask()
+            validate=lambda choices: True if choices else "You must select at least one module.",
+        ).unsafe_ask()
 
     def _select_packages(self, packages: Packages, existing_module_names: list[str] | None = None) -> Packages:
         adding_to_existing = False
@@ -488,7 +493,9 @@ class ModulesCommand(ToolkitCommand):
                 print(Padding.indent(tree, 5))
                 print("\n")
 
-                if not questionary.confirm("Would you like to make changes to the selection?", default=False).ask():
+                if not questionary.confirm(
+                    "Would you like to make changes to the selection?", default=False
+                ).unsafe_ask():
                     break
 
             if not any([len(package.modules) > 0 for package in packages.values()]):
@@ -510,7 +517,7 @@ class ModulesCommand(ToolkitCommand):
                 choices=choices,
                 pointer=POINTER,
                 style=custom_style_fancy,
-            ).ask()
+            ).unsafe_ask()
 
             if package is None:
                 raise typer.Exit(code=0)
@@ -545,7 +552,7 @@ class ModulesCommand(ToolkitCommand):
             pointer=POINTER,
             style=custom_style_fancy,
             instruction="use arrow up/down and " + "⮐ " + " to save",
-        ).ask()
+        ).unsafe_ask()
         if user_selection == "abort":
             print("Aborting...")
             raise typer.Exit()

cognite_toolkit/_cdf_tk/commands/pull.py

@@ -436,7 +436,7 @@ class PullCommand(ToolkitCommand):
             selected = questionary.select(
                 "Select a module to pull",
                 choices=[Choice(title=module.name, value=module.name) for module in modules],
-            ).ask()
+            ).unsafe_ask()
         else:
             selected = parse_user_selected_modules([module_name_or_path])[0]
         build_module: str | Path
@@ -629,7 +629,7 @@ class PullCommand(ToolkitCommand):
             return questionary.select(
                 f"Select a {loader.display_name} to pull",
                 choices=[Choice(title=f"{r.identifier!r} - ({r.module_name})", value=r) for r in local_resources],
-            ).ask()
+            ).unsafe_ask()
         if id_ not in local_resources.identifiers:
             raise ToolkitMissingResourceError(
                 f"No {loader.display_name} with external id {id_} found in the current configuration in {organization_dir}."

cognite_toolkit/_cdf_tk/commands/repo.py

@@ -52,7 +52,7 @@ class RepoCommand(ToolkitCommand):
                 )
 
         if host is None:
-            repo_host = questionary.select("Where do are you hosting the repository?", REPOSITORY_HOSTING).ask()
+            repo_host = questionary.select("Where do are you hosting the repository?", REPOSITORY_HOSTING).unsafe_ask()
         else:
             repo_host = next(
                 (provider for provider in REPOSITORY_HOSTING if provider.casefold() == host.casefold()), "Other"

cognite_toolkit/_cdf_tk/commands/resources.py

@@ -32,7 +32,7 @@ class ResourcesCommand(ToolkitCommand):
                 if mod.name.casefold() == module.casefold():
                     return mod.dir
 
-            if questionary.confirm(f"{module} module not found. Do you want to create a new one?").ask():
+            if questionary.confirm(f"{module} module not found. Do you want to create a new one?").unsafe_ask():
                 return organization_dir / MODULES / module
 
             if verbose:
@@ -44,10 +44,10 @@ class ResourcesCommand(ToolkitCommand):
         choices = [Choice(title=mod.name, value=mod.dir) for mod in present_modules]
         choices.append(Choice(title="<Create new module>", value="NEW"))
 
-        selected = questionary.select("Select a module:", choices=choices).ask()
+        selected = questionary.select("Select a module:", choices=choices).unsafe_ask()
 
         if selected == "NEW":
-            new_module_name = questionary.text("Enter name for new module:").ask()
+            new_module_name = questionary.text("Enter name for new module:").unsafe_ask()
             if not new_module_name:
                 print("[red]No module name provided. Aborting...[/red]")
                 raise typer.Exit()
@@ -69,7 +69,7 @@ class ResourcesCommand(ToolkitCommand):
             sorted_cruds = sorted(RESOURCE_CRUD_LIST, key=lambda x: x.kind)
             choices = [Choice(title=crud.kind, value=crud) for crud in sorted_cruds]
 
-            selected = questionary.select("Select resource type:", choices=choices).ask()
+            selected = questionary.select("Select resource type:", choices=choices).unsafe_ask()
             if not selected:
                 print("[red]No resource type selected. Aborting...[/red]")
                 raise typer.Exit()
@@ -142,7 +142,10 @@ class ResourcesCommand(ToolkitCommand):
         file_name = f"{final_prefix}.{resource_crud.kind}.yaml"
         file_path: Path = resource_dir / file_name
 
-        if file_path.exists() and not questionary.confirm(f"{file_path.name} file already exists. Overwrite?").ask():
+        if (
+            file_path.exists()
+            and not questionary.confirm(f"{file_path.name} file already exists. Overwrite?").unsafe_ask()
+        ):
             print("[red]Skipping...[/red]")
             return
 

cognite_toolkit/_cdf_tk/commands/run.py

@@ -153,7 +153,7 @@ if __name__ == "__main__":
             )
 
         if is_interactive:
-            wait = questionary.confirm("Do you want to wait for the function to complete?").ask()
+            wait = questionary.confirm("Do you want to wait for the function to complete?").unsafe_ask()
 
         # Todo: Get one shot token using the call_args.authentication
         session = client.iam.sessions.create(session_type="ONESHOT_TOKEN_EXCHANGE")
@@ -220,7 +220,7 @@ if __name__ == "__main__":
             # Interactive mode
             external_id = questionary.select(
                 "Select function to run", choices=list(function_builds_by_identifier.keys())
-            ).ask()
+            ).unsafe_ask()
         elif external_id not in function_builds_by_identifier.keys():
             raise ToolkitMissingResourceError(f"Could not find function with external id {external_id}")
         return function_builds_by_identifier[external_id]
@@ -235,7 +235,8 @@ if __name__ == "__main__":
         is_interactive: bool,
     ) -> FunctionCallArgs:
         if data_source is None and (
-            not is_interactive or not questionary.confirm("Do you want to provide input data for the function?").ask()
+            not is_interactive
+            or not questionary.confirm("Do you want to provide input data for the function?").unsafe_ask()
         ):
             return FunctionCallArgs()
         if is_interactive:
@@ -315,7 +316,7 @@ if __name__ == "__main__":
         if len(options) == 0:
             print(f"No schedules or workflows found for this {function_external_id} function.")
             return {}, None
-        selected_name: str = questionary.select("Select schedule to run", choices=options).ask()  # type: ignore[arg-type]
+        selected_name: str = questionary.select("Select schedule to run", choices=options).unsafe_ask()  # type: ignore[arg-type]
         selected = options[selected_name]
         if isinstance(selected, BuiltResourceFull):
             # Schedule
@@ -689,7 +690,7 @@ class RunWorkflowCommand(ToolkitCommand):
         if external_id is None:
             # Interactive mode
             choices = [questionary.Choice(title=f"{build.identifier!r}", value=build) for build in workflows]
-            selected = questionary.select("Select workflow to run", choices=choices).ask()
+            selected = questionary.select("Select workflow to run", choices=choices).unsafe_ask()
         else:
             selected_ = next(
                 (
@@ -719,7 +720,7 @@ class RunWorkflowCommand(ToolkitCommand):
                     is_interactive
                     and not questionary.confirm(
                         "Do you want to use input data and authentication from this trigger?"
-                    ).ask()
+                    ).unsafe_ask()
                 ):
                     break
                 credentials = (
@@ -750,7 +751,7 @@ class RunWorkflowCommand(ToolkitCommand):
             raise AuthorizationError(f"Could not create oneshot session for workflow {id_!r}: {e!s}") from e
 
         if is_interactive:
-            wait = questionary.confirm("Do you want to wait for the workflow to complete?").ask()
+            wait = questionary.confirm("Do you want to wait for the workflow to complete?").unsafe_ask()
         if id_.version is None:
             raise ToolkitValueError("Version is required for workflow.")
         execution = client.workflows.executions.run(

cognite_toolkit/_cdf_tk/protocols.py

@@ -1,6 +1,6 @@
 import sys
 from collections.abc import Collection, Iterator
-from typing import Any, Generic, Protocol, TypeVar
+from typing import Any, Generic, Protocol, TypeVar, runtime_checkable
 
 from cognite.client import CogniteClient
 
@@ -10,6 +10,7 @@ else:
     from typing_extensions import Self
 
 
+@runtime_checkable
 class ResourceRequestProtocol(Protocol):
     @classmethod
     def _load(cls, data: dict[str, Any]) -> Self: ...
@@ -17,6 +18,7 @@ class ResourceRequestProtocol(Protocol):
     def dump(self, camel_case: bool = True) -> dict[str, Any]: ...
 
 
+@runtime_checkable
 class ResourceResponseProtocol(Protocol):
     def as_write(self) -> ResourceRequestProtocol: ...
 

cognite_toolkit/_cdf_tk/storageio/_applications.py

@@ -7,11 +7,11 @@ from pydantic import JsonValue
 from cognite_toolkit._cdf_tk.client import ToolkitClient
 from cognite_toolkit._cdf_tk.client.http_client import (
     HTTPClient,
-    HTTPMessage,
     HTTPResult2,
     RequestMessage2,
     SuccessResponse2,
 )
+from cognite_toolkit._cdf_tk.client.http_client._item_classes import ItemsResultList
 from cognite_toolkit._cdf_tk.client.resource_classes.legacy.canvas import (
     IndustrialCanvas,
     IndustrialCanvasApply,
@@ -189,9 +189,9 @@ class CanvasIO(UploadableStorageIO[CanvasSelector, IndustrialCanvas, IndustrialC
         data_chunk: Sequence[UploadItem[IndustrialCanvasApply]],
         http_client: HTTPClient,
         selector: CanvasSelector | None = None,
-    ) -> Sequence[HTTPMessage]:
+    ) -> ItemsResultList:
         config = http_client.config
-        results: list[HTTPMessage] = []
+        results = ItemsResultList()
         for item in data_chunk:
             instances = item.item.as_instances()
             upsert_items: list[dict[str, JsonValue]] = []

cognite_toolkit/_cdf_tk/storageio/_base.py

@@ -1,10 +1,14 @@
 from abc import ABC, abstractmethod
 from collections.abc import Iterable, Mapping, Sequence, Sized
 from dataclasses import dataclass
-from typing import ClassVar, Generic, Literal, TypeVar
+from typing import Any, ClassVar, Generic, Literal, TypeVar
+
+from pydantic import ConfigDict
 
 from cognite_toolkit._cdf_tk.client import ToolkitClient
-from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, HTTPMessage, ItemsRequest
+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.exceptions import ToolkitNotImplementedError
 from cognite_toolkit._cdf_tk.protocols import T_ResourceRequest, T_ResourceResponse
 from cognite_toolkit._cdf_tk.utils.collection import chunker
@@ -36,8 +40,7 @@ class Page(Generic[T_ResourceResponse], Sized):
         return len(self.items)
 
 
-@dataclass
-class UploadItem(Generic[T_ResourceRequest]):
+class UploadItem(RequestItem, Generic[T_ResourceRequest]):
     """An item to be uploaded to CDF, consisting of a source ID and the writable Cognite resource.
 
     Attributes:
@@ -45,14 +48,16 @@ class UploadItem(Generic[T_ResourceRequest]):
         item: The writable Cognite resource to be uploaded.
     """
 
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
     source_id: str
     item: T_ResourceRequest
 
-    def as_id(self) -> str:
+    def __str__(self) -> str:
         return self.source_id
 
-    def dump(self) -> JsonVal:
-        return self.item.dump(camel_case=True)
+    def dump(self, camel_case: bool = True, exclude_extra: bool = False) -> dict[str, Any]:
+        return self.item.dump(camel_case=camel_case)
 
 
 class StorageIO(ABC, Generic[T_Selector, T_ResourceResponse]):
@@ -155,7 +160,7 @@ class UploadableStorageIO(
         data_chunk: Sequence[UploadItem[T_ResourceRequest]],
         http_client: HTTPClient,
         selector: T_Selector | None = None,
-    ) -> Sequence[HTTPMessage]:
+    ) -> ItemsResultList:
         """Upload a chunk of data to the storage using a custom HTTP client.
         This ensures that even if one item in the chunk fails, the rest will still be uploaded.
 
@@ -179,11 +184,11 @@ class UploadableStorageIO(
         else:
             raise ToolkitNotImplementedError(f"Unsupported UPLOAD_ENDPOINT_TYPE {self.UPLOAD_ENDPOINT_TYPE!r}.")
 
-        return http_client.request_with_retries(
-            message=ItemsRequest(
+        return http_client.request_items_retries(
+            message=ItemsRequest2(
                 endpoint_url=url,
                 method=self.UPLOAD_ENDPOINT_METHOD,
-                items=list(data_chunk),
+                items=data_chunk,
                 extra_body_fields=dict(self.UPLOAD_EXTRA_ARGS or {}),
             )
         )