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

cognite_toolkit/_cdf_tk/client/api/{extended_files.py → legacy/extended_files.py}

@@ -9,11 +9,11 @@ from cognite.client.utils._concurrency import execute_tasks
 from cognite.client.utils._identifier import IdentifierSequence
 from cognite.client.utils.useful_types import SequenceNotStr
 
-from cognite_toolkit._cdf_tk.client.data_classes.extended_filemetadata import (
+from cognite_toolkit._cdf_tk.client.data_classes.legacy.extended_filemetadata import (
     ExtendedFileMetadata,
     ExtendedFileMetadataList,
 )
-from cognite_toolkit._cdf_tk.client.data_classes.pending_instances_ids import PendingInstanceId
+from cognite_toolkit._cdf_tk.client.data_classes.legacy.pending_instances_ids import PendingInstanceId
 
 
 class ExtendedFileMetadataAPI(FilesAPI):

cognite_toolkit/_cdf_tk/client/api/{extended_functions.py → legacy/extended_functions.py}

@@ -7,7 +7,7 @@ from rich.console import Console
 
 from cognite_toolkit._cdf_tk.client.config import ToolkitClientConfig
 from cognite_toolkit._cdf_tk.utils.collection import chunker
-from cognite_toolkit._cdf_tk.utils.http_client import HTTPClient, SimpleBodyRequest
+from cognite_toolkit._cdf_tk.utils.http_client import HTTPClient, RequestMessage2
 from cognite_toolkit._cdf_tk.utils.useful_types import JsonVal
 
 
@@ -34,21 +34,20 @@ class ExtendedFunctionsAPI(FunctionsAPI):
 
         Args:
             function (FunctionWrite): The function to create.
-            console (Console | None): The rich console to use for printing warnings.
 
         Returns:
             Function: The created function object.
         """
-        result = self._toolkit_http_client.request_with_retries(
-            message=SimpleBodyRequest(
+        result = self._toolkit_http_client.request_single_retries(
+            message=RequestMessage2(
                 endpoint_url=self._toolkit_config.create_api_url("/functions"),
                 method="POST",
                 body_content={"items": [function.dump(camel_case=True)]},
             )
         )
-        result.raise_for_status()
+        success = result.get_success_or_raise()
         # We assume the API response is one item on a successful creation
-        return Function._load(result.get_first_body()["items"][0], cognite_client=self._cognite_client)  # type: ignore[arg-type,index]
+        return Function._load(success.body_json["items"][0], cognite_client=self._cognite_client)
 
     def delete_with_429_retry(self, external_id: SequenceNotStr[str], ignore_unknown_ids: bool = False) -> None:
         """Delete one or more functions with retry handling for 429 Too Many Requests responses.
@@ -70,11 +69,12 @@ class ExtendedFunctionsAPI(FunctionsAPI):
             }
             if ignore_unknown_ids:
                 body_content["ignoreUnknownIds"] = True
-            self._toolkit_http_client.request_with_retries(
-                message=SimpleBodyRequest(
+            result = self._toolkit_http_client.request_single_retries(
+                message=RequestMessage2(
                     endpoint_url=self._toolkit_config.create_api_url("/functions/delete"),
                     method="POST",
                     body_content=body_content,
                 )
-            ).raise_for_status()
+            )
+            result.get_success_or_raise()
         return None

cognite_toolkit/_cdf_tk/client/api/{extended_raw.py → legacy/extended_raw.py}

@@ -1,6 +1,6 @@
 from cognite.client._api.raw import RawAPI
 
-from cognite_toolkit._cdf_tk.client.data_classes.raw import RawProfileResults, RawTable
+from cognite_toolkit._cdf_tk.client.data_classes.legacy.raw import RawProfileResults, RawTable
 
 
 class ExtendedRawAPI(RawAPI):

cognite_toolkit/_cdf_tk/client/api/{extended_timeseries.py → legacy/extended_timeseries.py}

@@ -13,8 +13,11 @@ from cognite.client.utils._identifier import IdentifierSequence
 from cognite.client.utils._validation import prepare_filter_sort, process_asset_subtree_ids, process_data_set_ids
 from cognite.client.utils.useful_types import SequenceNotStr
 
-from cognite_toolkit._cdf_tk.client.data_classes.extended_timeseries import ExtendedTimeSeries, ExtendedTimeSeriesList
-from cognite_toolkit._cdf_tk.client.data_classes.pending_instances_ids import PendingInstanceId
+from cognite_toolkit._cdf_tk.client.data_classes.legacy.extended_timeseries import (
+    ExtendedTimeSeries,
+    ExtendedTimeSeriesList,
+)
+from cognite_toolkit._cdf_tk.client.data_classes.legacy.pending_instances_ids import PendingInstanceId
 
 
 class ExtendedTimeSeriesAPI(TimeSeriesAPI):

cognite_toolkit/_cdf_tk/client/api/{location_filters.py → legacy/location_filters.py}

@@ -6,7 +6,7 @@ from cognite.client._api_client import APIClient
 from cognite.client.config import ClientConfig
 from cognite.client.utils._identifier import IdentifierSequence
 
-from cognite_toolkit._cdf_tk.client.data_classes.location_filters import (
+from cognite_toolkit._cdf_tk.client.data_classes.legacy.location_filters import (
     LocationFilter,
     LocationFilterList,
     LocationFilterWrite,

cognite_toolkit/_cdf_tk/client/api/legacy/robotics/__init__.py

@@ -0,0 +1,8 @@
+from .api import RoboticsAPI
+from .capabilities import CapabilitiesAPI
+from .data_postprocessing import DataPostProcessingAPI
+from .frames import FramesAPI
+from .locations import LocationsAPI
+from .maps import MapsAPI
+
+__all__ = ["CapabilitiesAPI", "DataPostProcessingAPI", "FramesAPI", "LocationsAPI", "MapsAPI", "RoboticsAPI"]

cognite_toolkit/_cdf_tk/client/api/{robotics → legacy/robotics}/capabilities.py

@@ -5,7 +5,7 @@ from cognite.client._api_client import APIClient
 from cognite.client.utils._identifier import IdentifierSequence
 from cognite.client.utils.useful_types import SequenceNotStr
 
-from cognite_toolkit._cdf_tk.client.data_classes.robotics import (
+from cognite_toolkit._cdf_tk.client.data_classes.legacy.robotics import (
     RobotCapability,
     RobotCapabilityList,
     RobotCapabilityWrite,

cognite_toolkit/_cdf_tk/client/api/{robotics → legacy/robotics}/data_postprocessing.py

@@ -5,7 +5,7 @@ from cognite.client._api_client import APIClient
 from cognite.client.utils._identifier import IdentifierSequence
 from cognite.client.utils.useful_types import SequenceNotStr
 
-from cognite_toolkit._cdf_tk.client.data_classes.robotics import (
+from cognite_toolkit._cdf_tk.client.data_classes.legacy.robotics import (
     DataPostProcessing,
     DataPostProcessingList,
     DataPostProcessingWrite,

cognite_toolkit/_cdf_tk/client/api/{robotics → legacy/robotics}/frames.py

@@ -5,7 +5,7 @@ from cognite.client._api_client import APIClient
 from cognite.client.utils._identifier import IdentifierSequence
 from cognite.client.utils.useful_types import SequenceNotStr
 
-from cognite_toolkit._cdf_tk.client.data_classes.robotics import (
+from cognite_toolkit._cdf_tk.client.data_classes.legacy.robotics import (
     Frame,
     FrameList,
     FrameWrite,

cognite_toolkit/_cdf_tk/client/api/{robotics → legacy/robotics}/locations.py

@@ -5,7 +5,7 @@ from cognite.client._api_client import APIClient
 from cognite.client.utils._identifier import IdentifierSequence
 from cognite.client.utils.useful_types import SequenceNotStr
 
-from cognite_toolkit._cdf_tk.client.data_classes.robotics import (
+from cognite_toolkit._cdf_tk.client.data_classes.legacy.robotics import (
     Location,
     LocationList,
     LocationWrite,

cognite_toolkit/_cdf_tk/client/api/{robotics → legacy/robotics}/maps.py

@@ -5,7 +5,7 @@ from cognite.client._api_client import APIClient
 from cognite.client.utils._identifier import IdentifierSequence
 from cognite.client.utils.useful_types import SequenceNotStr
 
-from cognite_toolkit._cdf_tk.client.data_classes.robotics import (
+from cognite_toolkit._cdf_tk.client.data_classes.legacy.robotics import (
     Map,
     MapList,
     MapWrite,

cognite_toolkit/_cdf_tk/client/api/{robotics → legacy/robotics}/robots.py

@@ -3,8 +3,8 @@ from typing import overload
 
 from cognite.client._api_client import APIClient
 
-from cognite_toolkit._cdf_tk.client.api.robotics.utlis import tmp_disable_gzip
-from cognite_toolkit._cdf_tk.client.data_classes.robotics import Robot, RobotList, RobotWrite, _RobotUpdate
+from cognite_toolkit._cdf_tk.client.api.legacy.robotics.utlis import tmp_disable_gzip
+from cognite_toolkit._cdf_tk.client.data_classes.legacy.robotics import Robot, RobotList, RobotWrite, _RobotUpdate
 
 
 class RobotsAPI(APIClient):

cognite_toolkit/_cdf_tk/client/api/{search_config.py → legacy/search_config.py}

@@ -4,7 +4,11 @@ from cognite.client import CogniteClient
 from cognite.client._api_client import APIClient
 from cognite.client.config import ClientConfig
 
-from cognite_toolkit._cdf_tk.client.data_classes.search_config import SearchConfig, SearchConfigList, SearchConfigWrite
+from cognite_toolkit._cdf_tk.client.data_classes.legacy.search_config import (
+    SearchConfig,
+    SearchConfigList,
+    SearchConfigWrite,
+)
 
 
 class SearchConfigurationsAPI(APIClient):

cognite_toolkit/_cdf_tk/client/api/migration.py

@@ -16,7 +16,8 @@ from cognite.client.data_classes.data_modeling import (
 )
 from cognite.client.utils.useful_types import SequenceNotStr
 
-from cognite_toolkit._cdf_tk.client.data_classes.migration import (
+from cognite_toolkit._cdf_tk.client.api.legacy.extended_data_modeling import ExtendedInstancesAPI
+from cognite_toolkit._cdf_tk.client.data_classes.legacy.migration import (
     AssetCentricId,
     CreatedSourceSystem,
     InstanceSource,
@@ -29,8 +30,6 @@ from cognite_toolkit._cdf_tk.tk_warnings import HighSeverityWarning
 from cognite_toolkit._cdf_tk.utils.collection import chunker_sequence
 from cognite_toolkit._cdf_tk.utils.useful_types import AssetCentricType
 
-from .extended_data_modeling import ExtendedInstancesAPI
-
 
 class InstanceSourceAPI:
     def __init__(self, instance_api: ExtendedInstancesAPI) -> None:

cognite_toolkit/_cdf_tk/client/api/project.py

@@ -1,8 +1,8 @@
 from cognite.client import CogniteClient
 
 from cognite_toolkit._cdf_tk.client.config import ToolkitClientConfig
-from cognite_toolkit._cdf_tk.client.data_classes.project import ProjectStatusList
-from cognite_toolkit._cdf_tk.utils.http_client import HTTPClient, ParamRequest
+from cognite_toolkit._cdf_tk.client.data_classes.legacy.project import ProjectStatusList
+from cognite_toolkit._cdf_tk.utils.http_client import HTTPClient, RequestMessage2
 
 
 class ProjectAPI:
@@ -13,11 +13,12 @@ class ProjectAPI:
 
     def status(self) -> ProjectStatusList:
         """Retrieve information about the current project."""
-        response = self._http_client.request_with_retries(
-            ParamRequest(
-                endpoint_url=f"{self._config.base_url}/api/v1/projects?withDataModelingStatus=true", method="GET"
+        response = self._http_client.request_single_retries(
+            RequestMessage2(
+                endpoint_url=f"{self._config.base_url}/api/v1/projects",
+                method="GET",
+                parameters={"withDataModelingStatus": True},
             )
         )
-        response.raise_for_status()
-        body = response.get_first_body()
-        return ProjectStatusList._load(body["items"], cognite_client=self._cognite_client)  # type: ignore[arg-type]
+        success = response.get_success_or_raise()
+        return ProjectStatusList._load(success.body_json["items"], cognite_client=self._cognite_client)

cognite_toolkit/_cdf_tk/client/api/search.py

@@ -2,8 +2,8 @@ from cognite.client import CogniteClient
 from cognite.client._api_client import APIClient
 from cognite.client.config import ClientConfig
 
-from .location_filters import LocationFiltersAPI
-from .search_config import SearchConfigurationsAPI
+from cognite_toolkit._cdf_tk.client.api.legacy.location_filters import LocationFiltersAPI
+from cognite_toolkit._cdf_tk.client.api.legacy.search_config import SearchConfigurationsAPI
 
 
 class SearchAPI(APIClient):

cognite_toolkit/_cdf_tk/client/api/streams.py

@@ -1,10 +1,15 @@
 from collections.abc import Sequence
 
+from pydantic import TypeAdapter
 from rich.console import Console
 
 from cognite_toolkit._cdf_tk.client.data_classes.api_classes import PagedResponse
 from cognite_toolkit._cdf_tk.client.data_classes.streams import StreamRequest, StreamResponse
-from cognite_toolkit._cdf_tk.utils.http_client import HTTPClient, ItemsRequest, ParamRequest
+from cognite_toolkit._cdf_tk.utils.http_client import (
+    HTTPClient,
+    ItemsRequest2,
+    RequestMessage2,
+)
 
 
 class StreamsAPI:
@@ -24,15 +29,15 @@ class StreamsAPI:
         Returns:
             List of created StreamResponse items.
         """
-        responses = self._http_client.request_with_retries(
-            ItemsRequest(
+        responses = self._http_client.request_items_retries(
+            ItemsRequest2(
                 endpoint_url=self._config.create_api_url(self.ENDPOINT),
                 method="POST",
-                items=list(items),
+                items=items,
             )
         )
         responses.raise_for_status()
-        return PagedResponse[StreamResponse].model_validate(responses.get_first_body()).items
+        return TypeAdapter(list[StreamResponse]).validate_python(responses.get_items())
 
     def delete(self, external_id: str) -> None:
         """Delete stream using its external ID.
@@ -40,13 +45,13 @@ class StreamsAPI:
         Args:
             external_id: External ID of the stream to delete.
         """
-        responses = self._http_client.request_with_retries(
-            ParamRequest(
+        response = self._http_client.request_single_retries(
+            RequestMessage2(
                 endpoint_url=self._config.create_api_url(f"{self.ENDPOINT}/{external_id}"),
                 method="DELETE",
             )
         )
-        responses.raise_for_status()
+        _ = response.get_success_or_raise()
 
     def list(self) -> list[StreamResponse]:
         """List streams.
@@ -54,14 +59,14 @@ class StreamsAPI:
         Returns:
             StreamResponseList containing the listed streams.
         """
-        responses = self._http_client.request_with_retries(
-            ParamRequest(
+        response = self._http_client.request_single_retries(
+            RequestMessage2(
                 endpoint_url=self._config.create_api_url(self.ENDPOINT),
                 method="GET",
             )
         )
-        responses.raise_for_status()
-        return PagedResponse[StreamResponse].model_validate(responses.get_first_body()).items
+        success = response.get_success_or_raise()
+        return PagedResponse[StreamResponse].model_validate(success.body_json).items
 
     def retrieve(self, external_id: str, include_statistics: bool = True) -> StreamResponse:
         """Retrieve a stream by its external ID.
@@ -72,13 +77,12 @@ class StreamsAPI:
         Returns:
             StreamResponse item.
         """
-        responses = self._http_client.request_with_retries(
-            ParamRequest(
+        response = self._http_client.request_single_retries(
+            RequestMessage2(
                 endpoint_url=self._config.create_api_url(f"{self.ENDPOINT}/{external_id}"),
                 method="GET",
                 parameters={"includeStatistics": include_statistics},
             )
         )
-        responses.raise_for_status()
-        response_body = responses.get_first_body()
-        return StreamResponse.model_validate(response_body)
+        success = response.get_success_or_raise()
+        return StreamResponse.model_validate(success.body_json)