airbyte-cdk 6.7.1rc3__py3-none-any.whl → 6.7.1rc4__py3-none-any.whl

airbyte_cdk/sources/declarative/retrievers/simple_retriever.py

@@ -360,6 +360,9 @@ class SimpleRetriever(Retriever):
                 next_page_token = self._next_page_token(response)
                 if not next_page_token:
                     pagination_complete = True
+                # Closing the response to avoid memory issues. Note that this assumes the caller as completely consumed the response before
+                # iterating on another one
+                response.close()
 
         # Always return an empty generator just in case no records were ever yielded
         yield from []

airbyte_cdk/sources/streams/http/http_client.py

@@ -6,7 +6,7 @@ import logging
 import os
 import urllib
 from pathlib import Path
-from typing import Any, Callable, Dict, List, Mapping, Optional, Tuple, Union
+from typing import Any, Callable, List, Mapping, Optional, Tuple, Union
 
 import orjson
 import requests
@@ -43,6 +43,7 @@ from airbyte_cdk.sources.streams.http.rate_limiting import (
     rate_limit_default_backoff_handler,
     user_defined_backoff_handler,
 )
+from airbyte_cdk.utils.airbyte_secrets_utils import filter_secrets
 from airbyte_cdk.utils.constants import ENV_REQUEST_CACHE_PATH
 from airbyte_cdk.utils.stream_status_utils import (
     as_airbyte_message as stream_status_as_airbyte_message,
@@ -90,9 +91,11 @@ class HttpClient:
     ):
         self._name = name
         self._api_budget: APIBudget = api_budget or APIBudget(policies=[])
+        self._is_session_owner = False
         if session:
             self._session = session
         else:
+            self._is_session_owner = True
             self._use_cache = use_cache
             self._session = self._request_session()
             self._session.mount(
@@ -113,10 +116,13 @@ class HttpClient:
         else:
             self._backoff_strategies = [DefaultBackoffStrategy()]
         self._error_message_parser = error_message_parser or JsonErrorMessageParser()
-        self._request_attempt_count: Dict[requests.PreparedRequest, int] = {}
         self._disable_retries = disable_retries
         self._message_repository = message_repository
 
+    def __del__(self):
+        if self._is_session_owner:
+            self._session.close()
+
     @property
     def cache_filename(self) -> str:
         """
@@ -269,13 +275,6 @@ class HttpClient:
         log_formatter: Optional[Callable[[requests.Response], Any]] = None,
         exit_on_rate_limit: Optional[bool] = False,
     ) -> requests.Response:
-        if request not in self._request_attempt_count:
-            self._request_attempt_count[request] = 1
-        else:
-            self._request_attempt_count[request] += 1
-            if hasattr(self._session, "auth") and isinstance(self._session.auth, AuthBase):
-                self._session.auth(request)
-
         self._logger.debug(
             "Making outbound API request",
             extra={"headers": request.headers, "url": request.url, "request_body": request.body},
@@ -361,12 +360,13 @@ class HttpClient:
 
         if error_resolution.response_action == ResponseAction.FAIL:
             if response is not None:
-                error_message = f"'{request.method}' request to '{request.url}' failed with status code '{response.status_code}' and error message '{self._error_message_parser.parse_response_error_message(response)}'"
+                error_message = f"'{request.method}' request to '{request.url}' failed with status code '{response.status_code}' and error message '{response.content}'"
             else:
                 error_message = (
                     f"'{request.method}' request to '{request.url}' failed with exception: '{exc}'"
                 )
 
+            self._logger.warning(filter_secrets(error_message))
             raise MessageRepresentationAirbyteTracedErrors(
                 internal_message=error_message,
                 message=error_resolution.error_message or error_message,
@@ -390,7 +390,7 @@ class HttpClient:
             for backoff_strategy in self._backoff_strategies:
                 backoff_time = backoff_strategy.backoff_time(
                     response_or_exception=response if response is not None else exc,
-                    attempt_count=self._request_attempt_count[request],
+                    attempt_count=0,
                 )
                 if backoff_time:
                     user_defined_backoff_time = backoff_time

{airbyte_cdk-6.7.1rc3.dist-info → airbyte_cdk-6.7.1rc4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: airbyte-cdk
-Version: 6.7.1rc3
+Version: 6.7.1rc4
 Summary: A framework for writing Airbyte Connectors.
 Home-page: https://airbyte.com
 License: MIT

{airbyte_cdk-6.7.1rc3.dist-info → airbyte_cdk-6.7.1rc4.dist-info}/RECORD

@@ -155,7 +155,7 @@ airbyte_cdk/sources/declarative/requesters/requester.py,sha256=9LWbCkHpr7GWTkPvY
 airbyte_cdk/sources/declarative/retrievers/__init__.py,sha256=FVQpUGVwp2Gibk4gp07VmLKX5AafUlsZWFSrDpUDuJM,443
 airbyte_cdk/sources/declarative/retrievers/async_retriever.py,sha256=iNe8Ihrk4vClCNtnEjtMUjjUoNo0UceYUFV7yAcXCU0,4965
 airbyte_cdk/sources/declarative/retrievers/retriever.py,sha256=XPLs593Xv8c5cKMc37XzUAYmzlXd1a7eSsspM-CMuWA,1696
-airbyte_cdk/sources/declarative/retrievers/simple_retriever.py,sha256=j09j4ngVDGosEVVEQk_joejAXm6dBfr45ulElhz2ZoA,23931
+airbyte_cdk/sources/declarative/retrievers/simple_retriever.py,sha256=koRm-fZbogmUAw71hxQC6VDzk5i8ku8juQaiu-VeAUo,24147
 airbyte_cdk/sources/declarative/schema/__init__.py,sha256=ul8L9S0-__AMEdbCLHBq-PMEeA928NVp8BB83BMotfU,517
 airbyte_cdk/sources/declarative/schema/default_schema_loader.py,sha256=KTACrIE23a83wsm3Rd9Eb4K6-20lrGqYxTHNp9yxsso,1820
 airbyte_cdk/sources/declarative/schema/inline_schema_loader.py,sha256=bVETE10hRsatRJq3R3BeyRR0wIoK3gcP1gcpVRQ_P5U,464
@@ -274,7 +274,7 @@ airbyte_cdk/sources/streams/http/error_handlers/json_error_message_parser.py,sha
 airbyte_cdk/sources/streams/http/error_handlers/response_models.py,sha256=7AX6sm8hMfVtcZuUrCmGmNFsO5rDK9Ecg2Kzl6rQwrk,2235
 airbyte_cdk/sources/streams/http/exceptions.py,sha256=njC7MlMJoFYcSGz4mIp6-bqLFTr6vC8ej25X0oSeyjE,1824
 airbyte_cdk/sources/streams/http/http.py,sha256=XoUvIClYO96datz_lBPBBY6uWmCja2mUk_yERdjskQo,28466
-airbyte_cdk/sources/streams/http/http_client.py,sha256=EhB9An8wA9wkoNBxTPfHGwmL_-jJVLUl6uFgkY6Fcho,19125
+airbyte_cdk/sources/streams/http/http_client.py,sha256=Yi5uAhi8u4EXDk4QaiXGF__OF3M45cQ6UvouHHzEq_4,18949
 airbyte_cdk/sources/streams/http/rate_limiting.py,sha256=IwdjrHKUnU97XO4qONgYRv4YYW51xQ8SJm4WLafXDB8,6351
 airbyte_cdk/sources/streams/http/requests_native_auth/__init__.py,sha256=RN0D3nOX1xLgwEwKWu6pkGy3XqBFzKSNZ8Lf6umU2eY,413
 airbyte_cdk/sources/streams/http/requests_native_auth/abstract_oauth.py,sha256=r6KvG6V-bzhnCGwLqnxngrjGM0UrvD1dRo8knatuAH0,10320
@@ -331,8 +331,8 @@ airbyte_cdk/utils/slice_hasher.py,sha256=EemcgcQlI8-LPYOPlYv4Qkdjyho79XVLWaUHF5X
 airbyte_cdk/utils/spec_schema_transformations.py,sha256=LVc9KbtMeV_z99jWo0Ou8u4l6eBJ0BWNhxj4zrrGKRs,763
 airbyte_cdk/utils/stream_status_utils.py,sha256=ZmBoiy5HVbUEHAMrUONxZvxnvfV9CesmQJLDTAIWnWw,1171
 airbyte_cdk/utils/traced_exception.py,sha256=89TQdFuYZ1NJgmFpqLzY_T_T_64TpJYmVqs119Bp43g,6164
-airbyte_cdk-6.7.1rc3.dist-info/LICENSE.txt,sha256=Wfe61S4BaGPj404v8lrAbvhjYR68SHlkzeYrg3_bbuM,1051
-airbyte_cdk-6.7.1rc3.dist-info/METADATA,sha256=30Cxq3db7GZ-C8f9O_upnnu24ohOqsW5epbzvlvsJw0,13345
-airbyte_cdk-6.7.1rc3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-airbyte_cdk-6.7.1rc3.dist-info/entry_points.txt,sha256=fj-e3PAQvsxsQzyyq8UkG1k8spunWnD4BAH2AwlR6NM,95
-airbyte_cdk-6.7.1rc3.dist-info/RECORD,,
+airbyte_cdk-6.7.1rc4.dist-info/LICENSE.txt,sha256=Wfe61S4BaGPj404v8lrAbvhjYR68SHlkzeYrg3_bbuM,1051
+airbyte_cdk-6.7.1rc4.dist-info/METADATA,sha256=iS1Wng9dw5V52JIfeTLoumDUhZpZDXffvvM1CJSvCxw,13345
+airbyte_cdk-6.7.1rc4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+airbyte_cdk-6.7.1rc4.dist-info/entry_points.txt,sha256=fj-e3PAQvsxsQzyyq8UkG1k8spunWnD4BAH2AwlR6NM,95
+airbyte_cdk-6.7.1rc4.dist-info/RECORD,,