cognite-toolkit 0.7.27__tar.gz → 0.7.29__tar.gz

{cognite_toolkit-0.7.27 → cognite_toolkit-0.7.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite_toolkit
-Version: 0.7.27
+Version: 0.7.29
 Summary: Official Cognite Data Fusion tool for project templates and configuration deployment
 Author: Cognite AS
 Author-email: Cognite AS <support@cognite.com>

{cognite_toolkit-0.7.27 → cognite_toolkit-0.7.29}/cognite_toolkit/_cdf_tk/client/_toolkit_client.py

@@ -35,19 +35,26 @@ class ToolAPI:
 
 
 class ToolkitClient(CogniteClient):
-    def __init__(self, config: ToolkitClientConfig | None = None, enable_set_pending_ids: bool = False) -> None:
+    def __init__(
+        self,
+        config: ToolkitClientConfig | None = None,
+        enable_set_pending_ids: bool = False,
+        console: Console | None = None,
+    ) -> None:
         super().__init__(config=config)
         http_client = HTTPClient(self.config)
         self.http_client = http_client
         toolkit_config = ToolkitClientConfig.from_client_config(self.config)
-        self.console = Console()
+        self.console = console or Console()
         self.tool = ToolAPI(http_client, self.console)
         self.search = SearchAPI(self._config, self._API_VERSION, self)
         self.robotics = RoboticsAPI(self._config, self._API_VERSION, self)
         self.dml = DMLAPI(self._config, self._API_VERSION, self)
         self.verify = VerifyAPI(self._config, self._API_VERSION, self)
         self.lookup = LookUpGroup(self._config, self._API_VERSION, self, self.console)
-        self.functions: ExtendedFunctionsAPI = ExtendedFunctionsAPI(toolkit_config, self._API_VERSION, self)
+        self.functions: ExtendedFunctionsAPI = ExtendedFunctionsAPI(
+            toolkit_config, self._API_VERSION, self, self.console
+        )
         self.data_modeling: ExtendedDataModelingAPI = ExtendedDataModelingAPI(self._config, self._API_VERSION, self)
         if enable_set_pending_ids:
             self.time_series: ExtendedTimeSeriesAPI = ExtendedTimeSeriesAPI(self._config, self._API_VERSION, self)

{cognite_toolkit-0.7.27 → cognite_toolkit-0.7.29}/cognite_toolkit/_cdf_tk/client/api/extended_functions.py

@@ -17,15 +17,16 @@ class ExtendedFunctionsAPI(FunctionsAPI):
         config: ToolkitClientConfig,
         api_version: str | None,
         cognite_client: CogniteClient,
+        console: Console | None = None,
     ) -> None:
         """
         Extended Functions API to include custom headers and payload preparation.
         """
         super().__init__(config, api_version, cognite_client)
         self._toolkit_config = config
-        self._toolkit_http_client = HTTPClient(config, max_retries=global_config.max_retries)
+        self._toolkit_http_client = HTTPClient(config, max_retries=global_config.max_retries, console=console)
 
-    def create_with_429_retry(self, function: FunctionWrite, console: Console | None = None) -> Function:
+    def create_with_429_retry(self, function: FunctionWrite) -> Function:
         """Create a function with manual retry handling for 429 Too Many Requests responses.
 
         This method is a workaround for scenarios where the function creation API is temporarily unavailable
@@ -43,16 +44,13 @@ class ExtendedFunctionsAPI(FunctionsAPI):
                 endpoint_url=self._toolkit_config.create_api_url("/functions"),
                 method="POST",
                 body_content={"items": [function.dump(camel_case=True)]},
-            ),
-            console=console,
+            )
         )
         result.raise_for_status()
         # 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]
 
-    def delete_with_429_retry(
-        self, external_id: SequenceNotStr[str], ignore_unknown_ids: bool = False, console: Console | None = None
-    ) -> None:
+    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.
 
         This method is an improvement over the standard delete method in the FunctionsAPI.
@@ -77,7 +75,6 @@ class ExtendedFunctionsAPI(FunctionsAPI):
                     endpoint_url=self._toolkit_config.create_api_url("/functions/delete"),
                     method="POST",
                     body_content=body_content,
-                ),
-                console=console,
+                )
             ).raise_for_status()
         return None

{cognite_toolkit-0.7.27 → cognite_toolkit-0.7.29}/cognite_toolkit/_cdf_tk/client/data_classes/charts.py

@@ -36,7 +36,7 @@ class ChartCore(WriteableCogniteResource["ChartWrite"], ABC):
     def dump(self, camel_case: bool = True) -> dict[str, Any]:
         """Convert the chart to a dictionary representation."""
         output = super().dump(camel_case=camel_case)
-        output["data"] = self.data.dump(camel_case=camel_case)
+        output["data"] = self.data.model_dump(mode="json", by_alias=camel_case, exclude_unset=True)
         return output
 
 
@@ -58,7 +58,7 @@ class ChartWrite(ChartCore):
         return cls(
             external_id=resource["externalId"],
             visibility=resource["visibility"],
-            data=ChartData._load(resource["data"], cognite_client=cognite_client),
+            data=ChartData._load(resource["data"]),
         )
 
 
@@ -98,7 +98,7 @@ class Chart(ChartCore):
             created_time=resource["createdTime"],
             last_updated_time=resource["lastUpdatedTime"],
             visibility=resource["visibility"],
-            data=ChartData._load(resource["data"], cognite_client=cognite_client),
+            data=ChartData._load(resource["data"]),
             owner_id=resource["ownerId"],
         )
 

cognite_toolkit-0.7.29/cognite_toolkit/_cdf_tk/client/data_classes/charts_data.py

@@ -0,0 +1,184 @@
+from typing import Any
+
+from cognite.client.data_classes.data_modeling import NodeId, ViewId
+from pydantic import JsonValue, field_serializer, field_validator
+
+from .base import BaseModelObject
+
+
+class UserInfo(BaseModelObject):
+    id: str | None = None
+    email: str | None = None
+    display_name: str | None = None
+
+
+class ChartSettings(BaseModelObject):
+    show_y_axis: bool = True
+    show_min_max: bool = True
+    show_gridlines: bool = True
+    merge_units: bool = False
+
+
+class ThresholdFilter(BaseModelObject):
+    min_unit: str | None = None
+    max_unit: str | None = None
+
+
+class ChartCall(BaseModelObject):
+    id: str | None = None
+    hash: int | None = None
+    call_id: str | None = None
+    call_date: int | None = None
+    status: str | None = None
+
+
+class SubSetting(BaseModelObject):
+    auto_align: bool | None = None
+
+
+class ChartPosition(BaseModelObject):
+    x: float | None = None
+    y: float | None = None
+
+
+class FlowElement(BaseModelObject):
+    id: str | None = None
+    type: str | None = None
+    position: ChartPosition | None = None
+    data: JsonValue | None = None
+    source: str | None = None
+    target: str | None = None
+    source_handle: str | None = None
+    target_handle: str | None = None
+
+
+class Flow(BaseModelObject):
+    zoom: float | None = None
+    elements: list[FlowElement] | None = None
+    position: tuple[float | None, float | None] | None = None
+
+
+class ChartElement(BaseModelObject):
+    id: str | None = None
+    type: str | None = None
+
+
+class ChartSource(ChartElement): ...
+
+
+class ChartCoreTimeseries(ChartElement):
+    node_reference: NodeId | None = None
+    view_reference: ViewId | None = None
+    display_mode: str | None = None
+    color: str | None = None
+    created_at: int | None = None
+    enabled: bool | None = None
+    interpolation: str | None = None
+    line_style: str | None = None
+    line_weight: float | None = None
+    name: str | None = None
+    preferred_unit: str | None = None
+    range: list[float | None] | None = None
+
+    @field_serializer("node_reference", when_used="always")
+    def serialize_node_reference(self, node_reference: NodeId | None) -> dict[str, Any] | None:
+        if node_reference:
+            return node_reference.dump(include_instance_type=False)
+        return None
+
+    @field_serializer("view_reference", when_used="always")
+    def serialize_view_reference(self, view_reference: ViewId | None) -> dict[str, Any] | None:
+        if view_reference:
+            return view_reference.dump(include_type=False)
+        return None
+
+    @field_validator("node_reference", mode="before")
+    @classmethod
+    def validate_node_reference(cls, value: Any) -> NodeId | None:
+        if value is None or isinstance(value, NodeId):
+            return value
+        return NodeId.load(value)
+
+    @field_validator("view_reference", mode="before")
+    @classmethod
+    def validate_view_reference(cls, value: Any) -> ViewId | None:
+        if value is None or isinstance(value, ViewId):
+            return value
+        return ViewId.load(value)
+
+
+class ChartTimeseries(ChartElement):
+    color: str | None = None
+    created_at: int | None = None
+    enabled: bool | None = None
+    interpolation: str | None = None
+    line_style: str | None = None
+    line_weight: float | None = None
+    name: str | None = None
+    preferred_unit: str | None = None
+    range: list[float | None] | None = None
+    unit: str | None = None
+    ts_id: int | None = None
+    ts_external_id: str | None = None
+    display_mode: str | None = None
+    original_unit: str | None = None
+    description: str | None = None
+
+
+class ChartWorkflow(ChartElement):
+    version: str | None = None
+    name: str | None = None
+    color: str | None = None
+    enabled: bool | None = None
+    line_weight: float | None = None
+    line_style: str | None = None
+    interpolation: str | None = None
+    unit: str | None = None
+    preferred_unit: str | None = None
+    range: list[float | None] | None = None
+    created_at: int | None = None
+    settings: SubSetting | None = None
+    flow: Flow | None = None
+    calls: list[ChartCall] | None = None
+
+
+class ChartThreshold(ChartElement):
+    visible: bool | None = None
+    name: str | None = None
+    source_id: str | None = None
+    upper_limit: float | None = None
+    filter: ThresholdFilter | None = None
+    calls: list[ChartCall] | None = None
+
+
+class ChartScheduledCalculation(ChartElement):
+    color: str | None = None
+    created_at: int | None = None
+    description: str | None = None
+    enabled: bool | None = None
+    interpolation: str | None = None
+    line_style: str | None = None
+    line_weight: float | None = None
+    name: str | None = None
+    preferred_unit: str | None = None
+    range: list[float | None] | None = None
+    unit: str | None = None
+    version: str | None = None
+    settings: SubSetting | None = None
+    flow: Flow | None = None
+
+
+class ChartData(BaseModelObject):
+    version: int | None = None
+    name: str | None = None
+    date_from: str | None = None
+    date_to: str | None = None
+    user_info: UserInfo | None = None
+    live_mode: bool | None = None
+    time_series_collection: list[ChartTimeseries] | None = None
+    core_timeseries_collection: list[ChartCoreTimeseries] | None = None
+    workflow_collection: list[ChartWorkflow] | None = None
+    source_collection: list[ChartSource] | None = None
+    threshold_collection: list[ChartThreshold] | None = None
+    scheduled_calculation_collection: list[ChartScheduledCalculation] | None = None
+    settings: ChartSettings | None = None

{cognite_toolkit-0.7.27 → cognite_toolkit-0.7.29}/cognite_toolkit/_cdf_tk/commands/_migrate/data_mapper.py

@@ -210,16 +210,14 @@ class ChartMapper(DataMapper[ChartSelector, Chart, ChartWrite]):
     def _create_new_timeseries_core(
         self, ts_item: ChartTimeseries, node_id: NodeId, consumer_view_id: ViewId | None
     ) -> ChartCoreTimeseries:
-        dumped = ts_item.dump(camel_case=True)
-        for asset_centric_key in ["tsId", "tsExternalId", "originalUnit"]:
-            dumped.pop(asset_centric_key, None)
-
+        dumped = ts_item.model_dump(mode="json", by_alias=True, exclude_unset=True)
         dumped["nodeReference"] = node_id
         dumped["viewReference"] = consumer_view_id
         new_uuid = str(uuid4())
         dumped["id"] = new_uuid
         dumped["type"] = "coreTimeseries"
-        core_timeseries = ChartCoreTimeseries._load(dumped)
+        # We ignore extra here to only include the fields that are shared between ChartTimeseries and ChartCoreTimeseries
+        core_timeseries = ChartCoreTimeseries.model_validate(dumped, extra="ignore")
         return core_timeseries
 
     def _get_node_id_consumer_view_id(self, ts_item: ChartTimeseries) -> tuple[NodeId | None, ViewId | None]:

{cognite_toolkit-0.7.27 → cognite_toolkit-0.7.29}/cognite_toolkit/_cdf_tk/commands/_migrate/migration_io.py

@@ -231,6 +231,8 @@ class AnnotationMigrationIO(
     CHUNK_SIZE = 1000
     UPLOAD_ENDPOINT = InstanceIO.UPLOAD_ENDPOINT
 
+    SUPPORTED_ANNOTATION_TYPES = frozenset({"diagrams.AssetLink", "diagrams.FileLink"})
+
     def __init__(
         self,
         client: ToolkitClient,
@@ -272,6 +274,10 @@ class AnnotationMigrationIO(
         for data_chunk in self.annotation_io.stream_data(asset_centric_selector, limit):
             mapping_list = AssetCentricMappingList[Annotation]([])
             for resource in data_chunk.items:
+                if resource.annotation_type not in self.SUPPORTED_ANNOTATION_TYPES:
+                    # This should not happen, as the annotation_io should already filter these out.
+                    # This is just in case.
+                    continue
                 mapping = AnnotationMapping(
                     instance_id=EdgeId(space=self.instance_space, external_id=f"annotation_{resource.id!r}"),
                     id=resource.id,
@@ -294,11 +300,15 @@ class AnnotationMigrationIO(
             resources = self.client.annotations.retrieve_multiple(current_batch.get_ids())
             resources_by_id = {resource.id: resource for resource in resources}
             not_found = 0
+            incorrect_type_count = 0
             for mapping in current_batch:
                 resource = resources_by_id.get(mapping.id)
                 if resource is None:
                     not_found += 1
                     continue
+                if resource.annotation_type not in self.SUPPORTED_ANNOTATION_TYPES:
+                    incorrect_type_count += 1
+                    continue
                 mapping.ingestion_view = self._get_mapping(mapping.ingestion_view, resource)
                 chunk.append(AssetCentricMapping(mapping=mapping, resource=resource))
             if chunk:
@@ -308,6 +318,11 @@ class AnnotationMigrationIO(
                 MediumSeverityWarning(
                     f"Could not find {not_found} annotations referenced in the CSV file. They will be skipped during migration."
                 ).print_warning(include_timestamp=True, console=self.client.console)
+            if incorrect_type_count:
+                MediumSeverityWarning(
+                    f"Found {incorrect_type_count} annotations with unsupported types. Only 'diagrams.AssetLink' and "
+                    "'diagrams.FileLink' are supported. These annotations will be skipped during migration."
+                ).print_warning(include_timestamp=True, console=self.client.console)
 
     def _get_mapping(self, current_mapping: str | None, resource: Annotation) -> str:
         try:

{cognite_toolkit-0.7.27 → cognite_toolkit-0.7.29}/cognite_toolkit/_cdf_tk/cruds/_resource_cruds/function.py

@@ -320,7 +320,7 @@ class FunctionCRUD(ResourceCRUD[str, FunctionWrite, Function]):
                     " problem persists, please contact Cognite support."
                 )
             item.file_id = file_id
-            created_item = self.client.functions.create_with_429_retry(item, console=self.console)
+            created_item = self.client.functions.create_with_429_retry(item)
             self._warn_if_cpu_or_memory_changed(created_item, item)
             created.append(created_item)
         return created
@@ -404,7 +404,7 @@ class FunctionCRUD(ResourceCRUD[str, FunctionWrite, Function]):
     def delete(self, ids: SequenceNotStr[str]) -> int:
         functions = self.retrieve(ids)
 
-        self.client.functions.delete_with_429_retry(external_id=ids, ignore_unknown_ids=True, console=self.console)
+        self.client.functions.delete_with_429_retry(external_id=ids, ignore_unknown_ids=True)
         file_ids = {func.file_id for func in functions if func.file_id}
         self.client.files.delete(id=list(file_ids), ignore_unknown_ids=True)
         return len(ids)

{cognite_toolkit-0.7.27 → cognite_toolkit-0.7.29}/cognite_toolkit/_cdf_tk/storageio/_annotations.py

@@ -33,7 +33,8 @@ class AnnotationIO(StorageIO[AssetCentricSelector, Annotation]):
                         annotated_resource_type="file",
                         annotated_resource_ids=[{"id": file_metadata.id} for file_metadata in file_chunk.items],
                         annotation_type=annotation_type,
-                    )
+                    ),
+                    limit=-1,
                 )
                 if limit is not None and total + len(results) > limit:
                     results = results[: limit - total]

{cognite_toolkit-0.7.27 → cognite_toolkit-0.7.29}/cognite_toolkit/_cdf_tk/utils/http_client/_client.py

@@ -23,6 +23,15 @@ from cognite_toolkit._cdf_tk.utils.http_client._data_classes import (
     ResponseList,
     ResponseMessage,
 )
+from cognite_toolkit._cdf_tk.utils.http_client._data_classes2 import (
+    BaseRequestMessage,
+    ErrorDetails2,
+    FailedRequest2,
+    FailedResponse2,
+    HTTPResult2,
+    RequestMessage2,
+    SuccessResponse2,
+)
 from cognite_toolkit._cdf_tk.utils.useful_types import PrimitiveType
 
 if sys.version_info >= (3, 11):
@@ -48,6 +57,7 @@ class HTTPClient:
             Default is {408, 429, 502, 503, 504}.
         split_items_status_codes (frozenset[int]): In the case of ItemRequest with multiple
             items, these status codes will trigger splitting the request into smaller batches.
+        console (Console | None): Optional Rich Console for printing warnings.
 
     """
 
@@ -59,6 +69,7 @@ class HTTPClient:
         pool_maxsize: int = 20,
         retry_status_codes: Set[int] = frozenset({408, 429, 502, 503, 504}),
         split_items_status_codes: Set[int] = frozenset({400, 408, 409, 422, 502, 503, 504}),
+        console: Console | None = None,
     ):
         self.config = config
         self._max_retries = max_retries
@@ -66,6 +77,7 @@ class HTTPClient:
         self._pool_maxsize = pool_maxsize
         self._retry_status_codes = retry_status_codes
         self._split_items_status_codes = split_items_status_codes
+        self._console = console
 
         # Thread-safe session for connection pooling
         self.session = self._create_thread_safe_session()
@@ -80,12 +92,11 @@ class HTTPClient:
         self.session.close()
         return False  # Do not suppress exceptions
 
-    def request(self, message: RequestMessage, console: Console | None = None) -> Sequence[HTTPMessage]:
+    def request(self, message: RequestMessage) -> Sequence[HTTPMessage]:
         """Send an HTTP request and return the response.
 
         Args:
             message (RequestMessage): The request message to send.
-            console (Console | None): The rich console to use for printing warnings.
 
         Returns:
             Sequence[HTTPMessage]: The response message(s). This can also
@@ -98,12 +109,12 @@ class HTTPClient:
             return message.create_failed_request(error_msg)
         try:
             response = self._make_request(message)
-            results = self._handle_response(response, message, console)
+            results = self._handle_response(response, message)
         except Exception as e:
             results = self._handle_error(e, message)
         return results
 
-    def request_with_retries(self, message: RequestMessage, console: Console | None = None) -> ResponseList:
+    def request_with_retries(self, message: RequestMessage) -> ResponseList:
         """Send an HTTP request and handle retries.
 
         This method will keep retrying the request until it either succeeds or
@@ -114,7 +125,6 @@ class HTTPClient:
 
         Args:
             message (RequestMessage): The request message to send.
-            console (Console | None): The rich console to use for printing warnings.
 
         Returns:
             Sequence[ResponseMessage | FailedRequestMessage]: The final response
@@ -127,7 +137,7 @@ class HTTPClient:
         final_responses = ResponseList([])
         while pending_requests:
             current_request = pending_requests.popleft()
-            results = self.request(current_request, console)
+            results = self.request(current_request)
 
             for result in results:
                 if isinstance(result, RequestMessage):
@@ -194,9 +204,7 @@ class HTTPClient:
             follow_redirects=False,
         )
 
-    def _handle_response(
-        self, response: httpx.Response, request: RequestMessage, console: Console | None = None
-    ) -> Sequence[HTTPMessage]:
+    def _handle_response(self, response: httpx.Response, request: RequestMessage) -> Sequence[HTTPMessage]:
         if 200 <= response.status_code < 300:
             return request.create_success_response(response)
         elif (
@@ -216,11 +224,11 @@ class HTTPClient:
 
         retry_after = self._get_retry_after_in_header(response)
         if retry_after is not None and response.status_code == 429 and request.status_attempt < self._max_retries:
-            if console is not None:
+            if self._console is not None:
                 short_url = request.endpoint_url.removeprefix(self.config.base_api_url)
                 HighSeverityWarning(
                     f"Rate limit exceeded for the {short_url!r} endpoint. Retrying after {retry_after} seconds."
-                ).print_warning(console=console)
+                ).print_warning(console=self._console)
             request.status_attempt += 1
             time.sleep(retry_after)
             return [request]
@@ -273,3 +281,110 @@ class HTTPClient:
             error_msg = f"RequestException after {request.total_attempts - 1} attempts ({error_type} error): {e!s}"
 
             return request.create_failed_request(error_msg)
+
+    def request_single(self, message: RequestMessage2) -> RequestMessage2 | HTTPResult2:
+        """Send an HTTP request and return the response.
+
+        Args:
+            message (RequestMessage2): The request message to send.
+        Returns:
+            HTTPMessage: The response message.
+        """
+        try:
+            response = self._make_request2(message)
+            result = self._handle_response_single(response, message)
+        except Exception as e:
+            result = self._handle_error_single(e, message)
+        return result
+
+    def request_single_retries(self, message: RequestMessage2) -> HTTPResult2:
+        """Send an HTTP request and handle retries.
+
+        This method will keep retrying the request until it either succeeds or
+        exhausts the maximum number of retries.
+
+        Note this method will use the current thread to process all request, thus
+        it is blocking.
+
+        Args:
+            message (RequestMessage2): The request message to send.
+        Returns:
+            HTTPMessage2: The final response message, which can be either successful response or failed request.
+        """
+        if message.total_attempts > 0:
+            raise RuntimeError(f"RequestMessage has already been attempted {message.total_attempts} times.")
+        current_request = message
+        while True:
+            result = self.request_single(current_request)
+            if isinstance(result, RequestMessage2):
+                current_request = result
+            elif isinstance(result, HTTPResult2):
+                return result
+            else:
+                raise TypeError(f"Unexpected result type: {type(result)}")
+
+    def _make_request2(self, message: BaseRequestMessage) -> httpx.Response:
+        headers = self._create_headers(message.api_version, message.content_type, message.accept)
+        return self.session.request(
+            method=message.method,
+            url=message.endpoint_url,
+            content=message.content,
+            headers=headers,
+            params=message.parameters,
+            timeout=self.config.timeout,
+            follow_redirects=False,
+        )
+
+    def _handle_response_single(
+        self, response: httpx.Response, request: RequestMessage2
+    ) -> RequestMessage2 | HTTPResult2:
+        if 200 <= response.status_code < 300:
+            return SuccessResponse2(
+                status_code=response.status_code,
+                body=response.text,
+                content=response.content,
+            )
+        retry_after = self._get_retry_after_in_header(response)
+        if retry_after is not None and response.status_code == 429 and request.status_attempt < self._max_retries:
+            if self._console is not None:
+                short_url = request.endpoint_url.removeprefix(self.config.base_api_url)
+                HighSeverityWarning(
+                    f"Rate limit exceeded for the {short_url!r} endpoint. Retrying after {retry_after} seconds."
+                ).print_warning(console=self._console)
+            request.status_attempt += 1
+            time.sleep(retry_after)
+            return request
+
+        if request.status_attempt < self._max_retries and response.status_code in self._retry_status_codes:
+            request.status_attempt += 1
+            time.sleep(self._backoff_time(request.total_attempts))
+            return request
+        else:
+            # Permanent failure
+            return FailedResponse2(
+                status_code=response.status_code,
+                body=response.text,
+                error=ErrorDetails2.from_response(response),
+            )
+
+    def _handle_error_single(self, e: Exception, request: RequestMessage2) -> RequestMessage2 | HTTPResult2:
+        if isinstance(e, httpx.ReadTimeout | httpx.TimeoutException):
+            error_type = "read"
+            request.read_attempt += 1
+            attempts = request.read_attempt
+        elif isinstance(e, ConnectionError | httpx.ConnectError | httpx.ConnectTimeout):
+            error_type = "connect"
+            request.connect_attempt += 1
+            attempts = request.connect_attempt
+        else:
+            error_msg = f"Unexpected exception: {e!s}"
+            return FailedRequest2(error=error_msg)
+
+        if attempts <= self._max_retries:
+            time.sleep(self._backoff_time(request.total_attempts))
+            return request
+        else:
+            # We have already incremented the attempt count, so we subtract 1 here
+            error_msg = f"RequestException after {request.total_attempts - 1} attempts ({error_type} error): {e!s}"
+
+            return FailedRequest2(error=error_msg)