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

cognite_toolkit/_cdf_tk/client/api/agents.py

@@ -9,7 +9,7 @@ Note: This is an alpha API and may change in future releases.
 from collections.abc import Iterable, Sequence
 
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, Endpoint, PagedResponse
-from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse2, SuccessResponse2
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse, SuccessResponse
 from cognite_toolkit._cdf_tk.client.resource_classes.agent import AgentRequest, AgentResponse
 from cognite_toolkit._cdf_tk.client.resource_classes.identifiers import ExternalId
 
@@ -31,9 +31,7 @@ class AgentsAPI(CDFResourceAPI[ExternalId, AgentRequest, AgentResponse]):
             },
         )
 
-    def _validate_page_response(
-        self, response: SuccessResponse2 | ItemsSuccessResponse2
-    ) -> PagedResponse[AgentResponse]:
+    def _validate_page_response(self, response: SuccessResponse | ItemsSuccessResponse) -> PagedResponse[AgentResponse]:
         return PagedResponse[AgentResponse].model_validate_json(response.body)
 
     def create(self, items: Sequence[AgentRequest]) -> list[AgentResponse]:

cognite_toolkit/_cdf_tk/client/api/annotations.py

@@ -8,7 +8,7 @@ from collections.abc import Iterable, Sequence
 from typing import Literal
 
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, Endpoint, PagedResponse
-from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse2, SuccessResponse2
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse, SuccessResponse
 from cognite_toolkit._cdf_tk.client.request_classes.filters import AnnotationFilter
 from cognite_toolkit._cdf_tk.client.resource_classes.annotation import AnnotationRequest, AnnotationResponse
 from cognite_toolkit._cdf_tk.client.resource_classes.identifiers import InternalId
@@ -30,7 +30,7 @@ class AnnotationsAPI(CDFResourceAPI[InternalId, AnnotationRequest, AnnotationRes
         )
 
     def _validate_page_response(
-        self, response: SuccessResponse2 | ItemsSuccessResponse2
+        self, response: SuccessResponse | ItemsSuccessResponse
     ) -> PagedResponse[AnnotationResponse]:
         return PagedResponse[AnnotationResponse].model_validate_json(response.body)
 

cognite_toolkit/_cdf_tk/client/api/assets.py

@@ -3,7 +3,7 @@ from typing import Literal
 
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, PagedResponse, ResponseItems
 from cognite_toolkit._cdf_tk.client.cdf_client.api import Endpoint
-from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse2, SuccessResponse2
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse, SuccessResponse
 from cognite_toolkit._cdf_tk.client.request_classes.filters import ClassicFilter
 from cognite_toolkit._cdf_tk.client.resource_classes.asset import AssetRequest, AssetResponse
 from cognite_toolkit._cdf_tk.client.resource_classes.identifiers import InternalOrExternalId
@@ -22,12 +22,10 @@ class AssetsAPI(CDFResourceAPI[InternalOrExternalId, AssetRequest, AssetResponse
             },
         )
 
-    def _validate_page_response(
-        self, response: SuccessResponse2 | ItemsSuccessResponse2
-    ) -> PagedResponse[AssetResponse]:
+    def _validate_page_response(self, response: SuccessResponse | ItemsSuccessResponse) -> PagedResponse[AssetResponse]:
         return PagedResponse[AssetResponse].model_validate_json(response.body)
 
-    def _reference_response(self, response: SuccessResponse2) -> ResponseItems[InternalOrExternalId]:
+    def _reference_response(self, response: SuccessResponse) -> ResponseItems[InternalOrExternalId]:
         return ResponseItems[InternalOrExternalId].model_validate_json(response.body)
 
     def create(self, items: Sequence[AssetRequest]) -> list[AssetResponse]:

cognite_toolkit/_cdf_tk/client/api/containers.py

@@ -7,7 +7,7 @@ https://api-docs.cognite.com/20230101/tag/Containers/operation/ApplyContainers
 from collections.abc import Iterable, Sequence
 
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, Endpoint, PagedResponse
-from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse2, SuccessResponse2
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse, SuccessResponse
 from cognite_toolkit._cdf_tk.client.request_classes.filters import ContainerFilter
 from cognite_toolkit._cdf_tk.client.resource_classes.data_modeling import (
     ContainerReference,
@@ -34,7 +34,7 @@ class ContainersAPI(CDFResourceAPI[ContainerReference, ContainerRequest, Contain
         )
 
     def _validate_page_response(
-        self, response: SuccessResponse2 | ItemsSuccessResponse2
+        self, response: SuccessResponse | ItemsSuccessResponse
     ) -> PagedResponse[ContainerResponse]:
         return PagedResponse[ContainerResponse].model_validate_json(response.body)
 

cognite_toolkit/_cdf_tk/client/api/data_models.py

@@ -7,7 +7,7 @@ https://api-docs.cognite.com/20230101/tag/Data-models/operation/createDataModels
 from collections.abc import Iterable, Sequence
 
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, Endpoint, PagedResponse
-from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse2, SuccessResponse2
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse, SuccessResponse
 from cognite_toolkit._cdf_tk.client.request_classes.filters import DataModelFilter
 from cognite_toolkit._cdf_tk.client.resource_classes.data_modeling import (
     DataModelReference,
@@ -34,7 +34,7 @@ class DataModelsAPI(CDFResourceAPI[DataModelReference, DataModelRequest, DataMod
         )
 
     def _validate_page_response(
-        self, response: SuccessResponse2 | ItemsSuccessResponse2
+        self, response: SuccessResponse | ItemsSuccessResponse
     ) -> PagedResponse[DataModelResponse]:
         return PagedResponse[DataModelResponse].model_validate_json(response.body)
 

cognite_toolkit/_cdf_tk/client/api/datasets.py

@@ -3,7 +3,7 @@ from typing import Any, Literal
 
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, PagedResponse, ResponseItems
 from cognite_toolkit._cdf_tk.client.cdf_client.api import Endpoint
-from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse2, SuccessResponse2
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse, SuccessResponse
 from cognite_toolkit._cdf_tk.client.resource_classes.dataset import DataSetRequest, DataSetResponse
 from cognite_toolkit._cdf_tk.client.resource_classes.identifiers import InternalOrExternalId
 
@@ -21,11 +21,11 @@ class DataSetsAPI(CDFResourceAPI[InternalOrExternalId, DataSetRequest, DataSetRe
         )
 
     def _validate_page_response(
-        self, response: SuccessResponse2 | ItemsSuccessResponse2
+        self, response: SuccessResponse | ItemsSuccessResponse
     ) -> PagedResponse[DataSetResponse]:
         return PagedResponse[DataSetResponse].model_validate_json(response.body)
 
-    def _reference_response(self, response: SuccessResponse2) -> ResponseItems[InternalOrExternalId]:
+    def _reference_response(self, response: SuccessResponse) -> ResponseItems[InternalOrExternalId]:
         return ResponseItems[InternalOrExternalId].model_validate_json(response.body)
 
     def create(self, items: Sequence[DataSetRequest]) -> list[DataSetResponse]:

cognite_toolkit/_cdf_tk/client/api/events.py

@@ -3,7 +3,7 @@ from typing import Literal
 
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, PagedResponse, ResponseItems
 from cognite_toolkit._cdf_tk.client.cdf_client.api import Endpoint
-from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse2, SuccessResponse2
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse, SuccessResponse
 from cognite_toolkit._cdf_tk.client.request_classes.filters import ClassicFilter
 from cognite_toolkit._cdf_tk.client.resource_classes.event import EventRequest, EventResponse
 from cognite_toolkit._cdf_tk.client.resource_classes.identifiers import InternalOrExternalId
@@ -22,12 +22,10 @@ class EventsAPI(CDFResourceAPI[InternalOrExternalId, EventRequest, EventResponse
             },
         )
 
-    def _validate_page_response(
-        self, response: SuccessResponse2 | ItemsSuccessResponse2
-    ) -> PagedResponse[EventResponse]:
+    def _validate_page_response(self, response: SuccessResponse | ItemsSuccessResponse) -> PagedResponse[EventResponse]:
         return PagedResponse[EventResponse].model_validate_json(response.body)
 
-    def _reference_response(self, response: SuccessResponse2) -> ResponseItems[InternalOrExternalId]:
+    def _reference_response(self, response: SuccessResponse) -> ResponseItems[InternalOrExternalId]:
         return ResponseItems[InternalOrExternalId].model_validate_json(response.body)
 
     def create(self, items: Sequence[EventRequest]) -> list[EventResponse]:

cognite_toolkit/_cdf_tk/client/api/extraction_pipelines.py

@@ -3,7 +3,7 @@ from typing import Any, Literal
 
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, PagedResponse, ResponseItems
 from cognite_toolkit._cdf_tk.client.cdf_client.api import Endpoint
-from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse2, SuccessResponse2
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse, SuccessResponse
 from cognite_toolkit._cdf_tk.client.request_classes.filters import ClassicFilter
 from cognite_toolkit._cdf_tk.client.resource_classes.extraction_pipeline import (
     ExtractionPipelineRequest,
@@ -28,11 +28,11 @@ class ExtractionPipelinesAPI(
         )
 
     def _validate_page_response(
-        self, response: SuccessResponse2 | ItemsSuccessResponse2
+        self, response: SuccessResponse | ItemsSuccessResponse
     ) -> PagedResponse[ExtractionPipelineResponse]:
         return PagedResponse[ExtractionPipelineResponse].model_validate_json(response.body)
 
-    def _reference_response(self, response: SuccessResponse2) -> ResponseItems[InternalOrExternalId]:
+    def _reference_response(self, response: SuccessResponse) -> ResponseItems[InternalOrExternalId]:
         return ResponseItems[InternalOrExternalId].model_validate_json(response.body)
 
     def create(self, items: Sequence[ExtractionPipelineRequest]) -> list[ExtractionPipelineResponse]:

cognite_toolkit/_cdf_tk/client/api/filemetadata.py

@@ -5,9 +5,9 @@ from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, PagedRespo
 from cognite_toolkit._cdf_tk.client.cdf_client.api import Endpoint
 from cognite_toolkit._cdf_tk.client.http_client import (
     HTTPClient,
-    ItemsSuccessResponse2,
-    RequestMessage2,
-    SuccessResponse2,
+    ItemsSuccessResponse,
+    RequestMessage,
+    SuccessResponse,
 )
 from cognite_toolkit._cdf_tk.client.request_classes.filters import ClassicFilter
 from cognite_toolkit._cdf_tk.client.resource_classes.filemetadata import FileMetadataRequest, FileMetadataResponse
@@ -28,11 +28,11 @@ class FileMetadataAPI(CDFResourceAPI[InternalOrExternalId, FileMetadataRequest,
         )
 
     def _validate_page_response(
-        self, response: SuccessResponse2 | ItemsSuccessResponse2
+        self, response: SuccessResponse | ItemsSuccessResponse
     ) -> PagedResponse[FileMetadataResponse]:
         return PagedResponse[FileMetadataResponse].model_validate_json(response.body)
 
-    def _reference_response(self, response: SuccessResponse2) -> ResponseItems[InternalOrExternalId]:
+    def _reference_response(self, response: SuccessResponse) -> ResponseItems[InternalOrExternalId]:
         return ResponseItems[InternalOrExternalId].model_validate_json(response.body)
 
     def create(self, items: Sequence[FileMetadataRequest], overwrite: bool = False) -> list[FileMetadataResponse]:
@@ -51,7 +51,7 @@ class FileMetadataAPI(CDFResourceAPI[InternalOrExternalId, FileMetadataRequest,
         endpoint = self._method_endpoint_map["create"]
         results: list[FileMetadataResponse] = []
         for item in items:
-            request = RequestMessage2(
+            request = RequestMessage(
                 endpoint_url=self._make_url(endpoint.path),
                 method=endpoint.method,
                 body_content=item.dump(),

cognite_toolkit/_cdf_tk/client/api/function_schedules.py

@@ -7,7 +7,7 @@ https://api-docs.cognite.com/20230101/tag/Function-schedules/operation/postFunct
 from collections.abc import Iterable, Sequence
 
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, Endpoint, PagedResponse
-from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse2, SuccessResponse2
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse, SuccessResponse
 from cognite_toolkit._cdf_tk.client.resource_classes.function_schedule import (
     FunctionScheduleRequest,
     FunctionScheduleResponse,
@@ -33,7 +33,7 @@ class FunctionSchedulesAPI(CDFResourceAPI[InternalId, FunctionScheduleRequest, F
         )
 
     def _validate_page_response(
-        self, response: SuccessResponse2 | ItemsSuccessResponse2
+        self, response: SuccessResponse | ItemsSuccessResponse
     ) -> PagedResponse[FunctionScheduleResponse]:
         return PagedResponse[FunctionScheduleResponse].model_validate_json(response.body)
 

cognite_toolkit/_cdf_tk/client/api/functions.py

@@ -7,7 +7,7 @@ https://api-docs.cognite.com/20230101/tag/Functions/operation/postFunctions
 from collections.abc import Iterable, Sequence
 
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, Endpoint, PagedResponse
-from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse2, SuccessResponse2
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse, SuccessResponse
 from cognite_toolkit._cdf_tk.client.resource_classes.function import FunctionRequest, FunctionResponse
 from cognite_toolkit._cdf_tk.client.resource_classes.identifiers import InternalId
 
@@ -30,7 +30,7 @@ class FunctionsAPI(CDFResourceAPI[InternalId, FunctionRequest, FunctionResponse]
         )
 
     def _validate_page_response(
-        self, response: SuccessResponse2 | ItemsSuccessResponse2
+        self, response: SuccessResponse | ItemsSuccessResponse
     ) -> PagedResponse[FunctionResponse]:
         return PagedResponse[FunctionResponse].model_validate_json(response.body)
 

cognite_toolkit/_cdf_tk/client/api/graphql_data_models.py

@@ -10,9 +10,9 @@ from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, Endpoint,
 from cognite_toolkit._cdf_tk.client.cdf_client.responses import GraphQLUpsertResponse
 from cognite_toolkit._cdf_tk.client.http_client import (
     HTTPClient,
-    ItemsSuccessResponse2,
-    RequestMessage2,
-    SuccessResponse2,
+    ItemsSuccessResponse,
+    RequestMessage,
+    SuccessResponse,
     ToolkitAPIError,
 )
 from cognite_toolkit._cdf_tk.client.request_classes.filters import DataModelFilter
@@ -41,13 +41,13 @@ class GraphQLDataModelsAPI(CDFResourceAPI[DataModelReference, GraphQLDataModelRe
         )
 
     def _validate_page_response(
-        self, response: SuccessResponse2 | ItemsSuccessResponse2
+        self, response: SuccessResponse | ItemsSuccessResponse
     ) -> PagedResponse[GraphQLDataModelResponse]:
         return PagedResponse[GraphQLDataModelResponse].model_validate_json(response.body)
 
     def _post_graphql(self, payload: dict[str, Any]) -> GraphQLUpsertResponse:
         """Execute a GraphQL query against the DML endpoint."""
-        request = RequestMessage2(
+        request = RequestMessage(
             endpoint_url=self._make_url("/dml/graphql"),
             method="POST",
             body_content=payload,

cognite_toolkit/_cdf_tk/client/api/groups.py

@@ -9,9 +9,9 @@ from collections.abc import Iterable, Sequence
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, Endpoint, PagedResponse
 from cognite_toolkit._cdf_tk.client.http_client import (
     HTTPClient,
-    ItemsSuccessResponse2,
-    RequestMessage2,
-    SuccessResponse2,
+    ItemsSuccessResponse,
+    RequestMessage,
+    SuccessResponse,
 )
 from cognite_toolkit._cdf_tk.client.resource_classes.group import GroupRequest, GroupResponse
 from cognite_toolkit._cdf_tk.client.resource_classes.identifiers import InternalId
@@ -34,9 +34,7 @@ class GroupsAPI(CDFResourceAPI[InternalId, GroupRequest, GroupResponse]):
             },
         )
 
-    def _validate_page_response(
-        self, response: SuccessResponse2 | ItemsSuccessResponse2
-    ) -> PagedResponse[GroupResponse]:
+    def _validate_page_response(self, response: SuccessResponse | ItemsSuccessResponse) -> PagedResponse[GroupResponse]:
         return PagedResponse[GroupResponse].model_validate_json(response.body)
 
     def create(self, items: Sequence[GroupRequest]) -> list[GroupResponse]:
@@ -59,7 +57,7 @@ class GroupsAPI(CDFResourceAPI[InternalId, GroupRequest, GroupResponse]):
         # Custom implementation since delete does not wrap the items in a {"id": ...} structure
         endpoint = self._method_endpoint_map["delete"]
         for chunk in chunker_sequence(items, endpoint.item_limit):
-            request = RequestMessage2(
+            request = RequestMessage(
                 endpoint_url=self._make_url(endpoint.path),
                 method=endpoint.method,
                 body_content={"items": [item.id for item in chunk]},

cognite_toolkit/_cdf_tk/client/api/hosted_extractor_destinations.py

@@ -3,7 +3,7 @@ from typing import Any, Literal
 
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, PagedResponse, ResponseItems
 from cognite_toolkit._cdf_tk.client.cdf_client.api import Endpoint
-from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse2, SuccessResponse2
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse, SuccessResponse
 from cognite_toolkit._cdf_tk.client.resource_classes.hosted_extractor_destination import (
     HostedExtractorDestinationRequest,
     HostedExtractorDestinationResponse,
@@ -27,11 +27,11 @@ class HostedExtractorDestinationsAPI(
         )
 
     def _validate_page_response(
-        self, response: SuccessResponse2 | ItemsSuccessResponse2
+        self, response: SuccessResponse | ItemsSuccessResponse
     ) -> PagedResponse[HostedExtractorDestinationResponse]:
         return PagedResponse[HostedExtractorDestinationResponse].model_validate_json(response.body)
 
-    def _reference_response(self, response: SuccessResponse2) -> ResponseItems[ExternalId]:
+    def _reference_response(self, response: SuccessResponse) -> ResponseItems[ExternalId]:
         return ResponseItems[ExternalId].model_validate_json(response.body)
 
     def create(self, items: Sequence[HostedExtractorDestinationRequest]) -> list[HostedExtractorDestinationResponse]:

cognite_toolkit/_cdf_tk/client/api/hosted_extractor_jobs.py

@@ -3,7 +3,7 @@ from typing import Literal
 
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, PagedResponse, ResponseItems
 from cognite_toolkit._cdf_tk.client.cdf_client.api import Endpoint
-from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse2, SuccessResponse2
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse, SuccessResponse
 from cognite_toolkit._cdf_tk.client.resource_classes.hosted_extractor_job import (
     HostedExtractorJobRequest,
     HostedExtractorJobResponse,
@@ -25,11 +25,11 @@ class HostedExtractorJobsAPI(CDFResourceAPI[ExternalId, HostedExtractorJobReques
         )
 
     def _validate_page_response(
-        self, response: SuccessResponse2 | ItemsSuccessResponse2
+        self, response: SuccessResponse | ItemsSuccessResponse
     ) -> PagedResponse[HostedExtractorJobResponse]:
         return PagedResponse[HostedExtractorJobResponse].model_validate_json(response.body)
 
-    def _reference_response(self, response: SuccessResponse2) -> ResponseItems[ExternalId]:
+    def _reference_response(self, response: SuccessResponse) -> ResponseItems[ExternalId]:
         return ResponseItems[ExternalId].model_validate_json(response.body)
 
     def create(self, items: Sequence[HostedExtractorJobRequest]) -> list[HostedExtractorJobResponse]:

cognite_toolkit/_cdf_tk/client/api/hosted_extractor_mappings.py

@@ -3,7 +3,7 @@ from typing import Any, Literal
 
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, PagedResponse, ResponseItems
 from cognite_toolkit._cdf_tk.client.cdf_client.api import Endpoint
-from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse2, SuccessResponse2
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse, SuccessResponse
 from cognite_toolkit._cdf_tk.client.resource_classes.hosted_extractor_mapping import (
     HostedExtractorMappingRequest,
     HostedExtractorMappingResponse,
@@ -27,11 +27,11 @@ class HostedExtractorMappingsAPI(
         )
 
     def _validate_page_response(
-        self, response: SuccessResponse2 | ItemsSuccessResponse2
+        self, response: SuccessResponse | ItemsSuccessResponse
     ) -> PagedResponse[HostedExtractorMappingResponse]:
         return PagedResponse[HostedExtractorMappingResponse].model_validate_json(response.body)
 
-    def _reference_response(self, response: SuccessResponse2) -> ResponseItems[ExternalId]:
+    def _reference_response(self, response: SuccessResponse) -> ResponseItems[ExternalId]:
         return ResponseItems[ExternalId].model_validate_json(response.body)
 
     def create(self, items: Sequence[HostedExtractorMappingRequest]) -> list[HostedExtractorMappingResponse]:

cognite_toolkit/_cdf_tk/client/api/hosted_extractor_sources.py

@@ -5,7 +5,7 @@ from pydantic import JsonValue, TypeAdapter
 
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, PagedResponse, ResponseItems
 from cognite_toolkit._cdf_tk.client.cdf_client.api import Endpoint
-from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse2, SuccessResponse2
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse, SuccessResponse
 from cognite_toolkit._cdf_tk.client.resource_classes.hosted_extractor_source import (
     HostedExtractorSourceRequestUnion,
     HostedExtractorSourceResponse,
@@ -30,16 +30,16 @@ class HostedExtractorSourcesAPI(
         )
 
     def _validate_page_response(
-        self, response: SuccessResponse2 | ItemsSuccessResponse2
+        self, response: SuccessResponse | ItemsSuccessResponse
     ) -> PagedResponse[HostedExtractorSourceResponseUnion]:
-        if isinstance(response, SuccessResponse2):
+        if isinstance(response, SuccessResponse):
             data = response.body_json
         else:
             data = TypeAdapter(dict[str, JsonValue]).validate_json(response.body)
         items = [HostedExtractorSourceResponse.validate_python(item) for item in data.get("items", [])]
         return PagedResponse[HostedExtractorSourceResponseUnion](items=items, nextCursor=data.get("nextCursor"))
 
-    def _reference_response(self, response: SuccessResponse2) -> ResponseItems[ExternalId]:
+    def _reference_response(self, response: SuccessResponse) -> ResponseItems[ExternalId]:
         return ResponseItems[ExternalId].model_validate_json(response.body)
 
     def create(self, items: Sequence[HostedExtractorSourceRequestUnion]) -> list[HostedExtractorSourceResponseUnion]:

cognite_toolkit/_cdf_tk/client/api/infield.py

@@ -7,8 +7,8 @@ from rich.console import Console
 from cognite_toolkit._cdf_tk.client.cdf_client.responses import QueryResponse
 from cognite_toolkit._cdf_tk.client.http_client import (
     HTTPClient,
-    ItemsRequest2,
-    RequestMessage2,
+    ItemsRequest,
+    RequestMessage,
 )
 from cognite_toolkit._cdf_tk.client.resource_classes.infield import (
     DataExplorationConfig,
@@ -46,7 +46,7 @@ class InfieldConfigAPI:
             for item in items
         )
         responses = self._http_client.request_items_retries(
-            ItemsRequest2(
+            ItemsRequest(
                 endpoint_url=self._config.create_api_url(self.ENDPOINT),
                 method="POST",
                 items=[item for sublist in request_items for item in sublist],
@@ -61,7 +61,7 @@ class InfieldConfigAPI:
         if not items:
             return []
         response = self._http_client.request_single_retries(
-            RequestMessage2(
+            RequestMessage(
                 # We use the query endpoint to be able to retrieve linked DataExplorationConfig items
                 endpoint_url=self._config.create_api_url(f"{self.ENDPOINT}/query"),
                 method="POST",
@@ -83,7 +83,7 @@ class InfieldConfigAPI:
             for item in items
         )
         responses = self._http_client.request_items_retries(
-            ItemsRequest2(
+            ItemsRequest(
                 endpoint_url=self._config.create_api_url(f"{self.ENDPOINT}/delete"),
                 method="POST",
                 items=[identifier for sublist in identifiers for identifier in sublist],
@@ -174,7 +174,7 @@ class InFieldCDMConfigAPI:
 
         request_items = [item.as_request_item() for item in items]
         results = self._http_client.request_items_retries(
-            ItemsRequest2(
+            ItemsRequest(
                 endpoint_url=self._config.create_api_url(self.ENDPOINT),
                 method="POST",
                 items=request_items,
@@ -189,7 +189,7 @@ class InFieldCDMConfigAPI:
         if not items:
             return []
         result = self._http_client.request_single_retries(
-            RequestMessage2(
+            RequestMessage(
                 endpoint_url=self._config.create_api_url(f"{self.ENDPOINT}/query"),
                 method="POST",
                 body_content=self._retrieve_query(items),
@@ -205,7 +205,7 @@ class InFieldCDMConfigAPI:
 
         identifiers = [item.as_id() for item in items]
         responses = self._http_client.request_items_retries(
-            ItemsRequest2(
+            ItemsRequest(
                 endpoint_url=self._config.create_api_url(f"{self.ENDPOINT}/delete"),
                 method="POST",
                 items=identifiers,

cognite_toolkit/_cdf_tk/client/api/instances.py

@@ -3,7 +3,7 @@ from typing import Any, Literal
 
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, PagedResponse, ResponseItems
 from cognite_toolkit._cdf_tk.client.cdf_client.api import Endpoint
-from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse2, SuccessResponse2
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse, SuccessResponse
 from cognite_toolkit._cdf_tk.client.request_classes.filters import InstanceFilter
 from cognite_toolkit._cdf_tk.client.resource_classes.data_modeling import (
     InstanceRequest,
@@ -26,11 +26,11 @@ class InstancesAPI(CDFResourceAPI[TypedInstanceIdentifier, InstanceRequest, Inst
         )
 
     def _validate_page_response(
-        self, response: SuccessResponse2 | ItemsSuccessResponse2
+        self, response: SuccessResponse | ItemsSuccessResponse
     ) -> PagedResponse[InstanceResponse]:
         return PagedResponse[InstanceResponse].model_validate_json(response.body)
 
-    def _validate_response(self, response: SuccessResponse2) -> ResponseItems[TypedInstanceIdentifier]:
+    def _validate_response(self, response: SuccessResponse) -> ResponseItems[TypedInstanceIdentifier]:
         return ResponseItems[TypedInstanceIdentifier].model_validate_json(response.body)
 
     def create(self, items: Sequence[InstanceRequest]) -> list[InstanceResponse]:

cognite_toolkit/_cdf_tk/client/api/labels.py

@@ -3,7 +3,7 @@ from typing import Any
 
 from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, PagedResponse, ResponseItems
 from cognite_toolkit._cdf_tk.client.cdf_client.api import Endpoint
-from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse2, SuccessResponse2
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, ItemsSuccessResponse, SuccessResponse
 from cognite_toolkit._cdf_tk.client.request_classes.filters import ClassicFilter
 from cognite_toolkit._cdf_tk.client.resource_classes.identifiers import ExternalId
 from cognite_toolkit._cdf_tk.client.resource_classes.label import LabelRequest, LabelResponse
@@ -21,12 +21,10 @@ class LabelsAPI(CDFResourceAPI[ExternalId, LabelRequest, LabelResponse]):
             },
         )
 
-    def _validate_page_response(
-        self, response: SuccessResponse2 | ItemsSuccessResponse2
-    ) -> PagedResponse[LabelResponse]:
+    def _validate_page_response(self, response: SuccessResponse | ItemsSuccessResponse) -> PagedResponse[LabelResponse]:
         return PagedResponse[LabelResponse].model_validate_json(response.body)
 
-    def _reference_response(self, response: SuccessResponse2) -> ResponseItems[ExternalId]:
+    def _reference_response(self, response: SuccessResponse) -> ResponseItems[ExternalId]:
         return ResponseItems[ExternalId].model_validate_json(response.body)
 
     def create(self, items: Sequence[LabelRequest]) -> list[LabelResponse]:

cognite_toolkit/_cdf_tk/client/api/legacy/extended_functions.py

@@ -6,7 +6,7 @@ from cognite.client.utils.useful_types import SequenceNotStr
 from rich.console import Console
 
 from cognite_toolkit._cdf_tk.client.config import ToolkitClientConfig
-from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, RequestMessage2
+from cognite_toolkit._cdf_tk.client.http_client import HTTPClient, RequestMessage
 from cognite_toolkit._cdf_tk.utils.collection import chunker
 from cognite_toolkit._cdf_tk.utils.useful_types import JsonVal
 
@@ -39,7 +39,7 @@ class ExtendedFunctionsAPI(FunctionsAPI):
             Function: The created function object.
         """
         result = self._toolkit_http_client.request_single_retries(
-            message=RequestMessage2(
+            message=RequestMessage(
                 endpoint_url=self._toolkit_config.create_api_url("/functions"),
                 method="POST",
                 body_content={"items": [function.dump(camel_case=True)]},
@@ -70,7 +70,7 @@ class ExtendedFunctionsAPI(FunctionsAPI):
             if ignore_unknown_ids:
                 body_content["ignoreUnknownIds"] = True
             result = self._toolkit_http_client.request_single_retries(
-                message=RequestMessage2(
+                message=RequestMessage(
                     endpoint_url=self._toolkit_config.create_api_url("/functions/delete"),
                     method="POST",
                     body_content=body_content,

cognite_toolkit/_cdf_tk/client/api/location_filters.py

@@ -4,9 +4,9 @@ from cognite_toolkit._cdf_tk.client.cdf_client import CDFResourceAPI, PagedRespo
 from cognite_toolkit._cdf_tk.client.cdf_client.api import Endpoint
 from cognite_toolkit._cdf_tk.client.http_client import (
     HTTPClient,
-    ItemsSuccessResponse2,
-    RequestMessage2,
-    SuccessResponse2,
+    ItemsSuccessResponse,
+    RequestMessage,
+    SuccessResponse,
 )
 from cognite_toolkit._cdf_tk.client.resource_classes.identifiers import InternalId
 from cognite_toolkit._cdf_tk.client.resource_classes.location_filter import (
@@ -42,7 +42,7 @@ class LocationFiltersAPI(CDFResourceAPI[InternalId, LocationFilterRequest, Locat
         return self._http_client.config.create_app_url(path)
 
     def _validate_page_response(
-        self, response: SuccessResponse2 | ItemsSuccessResponse2
+        self, response: SuccessResponse | ItemsSuccessResponse
     ) -> PagedResponse[LocationFilterResponse]:
         return PagedResponse[LocationFilterResponse].model_validate_json(response.body)
 
@@ -58,7 +58,7 @@ class LocationFiltersAPI(CDFResourceAPI[InternalId, LocationFilterRequest, Locat
         endpoint = self._method_endpoint_map["create"]
         results: list[LocationFilterResponse] = []
         for item in items:
-            request = RequestMessage2(
+            request = RequestMessage(
                 endpoint_url=self._make_url(endpoint.path),
                 method=endpoint.method,
                 body_content=item.model_dump(mode="json", by_alias=True),
@@ -80,7 +80,7 @@ class LocationFiltersAPI(CDFResourceAPI[InternalId, LocationFilterRequest, Locat
         endpoint = self._method_endpoint_map["retrieve"]
         results: list[LocationFilterResponse] = []
         for chunk in chunker_sequence(items, endpoint.item_limit):
-            request = RequestMessage2(
+            request = RequestMessage(
                 endpoint_url=self._make_url(endpoint.path),
                 method=endpoint.method,
                 body_content={"ids": [item.id for item in chunk]},
@@ -104,7 +104,7 @@ class LocationFiltersAPI(CDFResourceAPI[InternalId, LocationFilterRequest, Locat
         for item in items:
             if item.id is None:
                 raise ValueError("Item must have an ID for update operation.")
-            request = RequestMessage2(
+            request = RequestMessage(
                 endpoint_url=self._make_url(endpoint.path.format(id=item.id)),
                 method=endpoint.method,
                 body_content=item.model_dump(mode="json", by_alias=True),
@@ -128,7 +128,7 @@ class LocationFiltersAPI(CDFResourceAPI[InternalId, LocationFilterRequest, Locat
         endpoint = self._method_endpoint_map["delete"]
         results: list[LocationFilterResponse] = []
         for item in items:
-            request = RequestMessage2(
+            request = RequestMessage(
                 endpoint_url=self._make_url(endpoint.path.format(id=item.id)),
                 method=endpoint.method,
             )