PyPI - airbyte-cdk - Versions diffs - 6.57.3.post7.dev16093585744__tar.gz → 6.58.0.post2.dev16210284097__tar.gz - Mend

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: airbyte-cdk
-Version: 6.57.3.post7.dev16093585744
+Version: 6.58.0.post2.dev16210284097
 Summary: A framework for writing Airbyte Connectors.
 Home-page: https://airbyte.com
 License: MIT

@@ -2043,9 +2043,15 @@ definitions:
           - "$ref": "#/definitions/NoAuth"
           - "$ref": "#/definitions/LegacySessionTokenAuthenticator"
       fetch_properties_from_endpoint:
+        deprecated: true
+        deprecation_message: "Use `query_properties` field instead."
         title: Fetch Properties from Endpoint
         description: Allows for retrieving a dynamic set of properties from an API endpoint which can be injected into outbound request using the stream_partition.extra_fields.
         "$ref": "#/definitions/PropertiesFromEndpoint"
+      query_properties:
+        title: Query Properties
+        description: For APIs that require explicit specification of the properties to query for, this component will take a static or dynamic set of properties (which can be optionally split into chunks) and allow them to be injected into an outbound request by accessing stream_partition.extra_fields.
+        "$ref": "#/definitions/QueryProperties"
       request_parameters:
         title: Query Parameters
         description: Specifies the query parameters that should be set on an outgoing HTTP request given the inputs.

@@ -2543,9 +2543,16 @@ class HttpRequester(BaseModelWithDeprecations):
     )
     fetch_properties_from_endpoint: Optional[PropertiesFromEndpoint] = Field(
         None,
+        deprecated=True,
+        deprecation_message="Use `query_properties` field instead.",
         description="Allows for retrieving a dynamic set of properties from an API endpoint which can be injected into outbound request using the stream_partition.extra_fields.",
         title="Fetch Properties from Endpoint",
     )
+    query_properties: Optional[QueryProperties] = Field(
+        None,
+        description="For APIs that require explicit specification of the properties to query for, this component will take a static or dynamic set of properties (which can be optionally split into chunks) and allow them to be injected into an outbound request by accessing stream_partition.extra_fields.",
+        title="Query Properties",
+    )
     request_parameters: Optional[Union[Dict[str, Union[str, QueryProperties]], str]] = Field(
         None,
         description="Specifies the query parameters that should be set on an outgoing HTTP request given the inputs.",

@@ -2801,6 +2801,7 @@ class ModelToComponentFactory:
                 ).eval(config),
                 scopes=model.scopes,
                 token_expiry_date_format=model.token_expiry_date_format,
+                token_expiry_is_time_of_expiration=bool(model.token_expiry_date_format),
                 message_repository=self._message_repository,
                 refresh_token_error_status_codes=model.refresh_token_updater.refresh_token_error_status_codes,
                 refresh_token_error_key=model.refresh_token_updater.refresh_token_error_key,
@@ -3220,6 +3221,7 @@ class ModelToComponentFactory:
             hasattr(model.requester, "fetch_properties_from_endpoint")
             and model.requester.fetch_properties_from_endpoint
         ):
+            # todo: Deprecate this condition once dependent connectors migrate to query_properties
             query_properties_definition = QueryPropertiesModel(
                 type="QueryProperties",
                 property_list=model.requester.fetch_properties_from_endpoint,
@@ -3231,6 +3233,11 @@ class ModelToComponentFactory:
                 model=query_properties_definition,
                 config=config,
             )
+        elif hasattr(model.requester, "query_properties") and model.requester.query_properties:
+            query_properties = self.create_query_properties(
+                model=model.requester.query_properties,
+                config=config,
+            )
         requester = self._create_component_from_model(
             model=model.requester,

@@ -473,7 +473,6 @@ class HttpRequester(Requester):
             dedupe_query_params=True,
             log_formatter=log_formatter,
             exit_on_rate_limit=self._exit_on_rate_limit,
-            stream_slice=stream_slice,
         )
         return response

@@ -546,7 +546,6 @@ class HttpStream(Stream, CheckpointMixin, ABC):
             dedupe_query_params=True,
             log_formatter=self.get_log_formatter(),
             exit_on_rate_limit=self.exit_on_rate_limit,
-            stream_slice=stream_slice,
         )
         return request, response

@@ -243,7 +243,6 @@ class HttpClient:
         request_kwargs: Mapping[str, Any],
         log_formatter: Optional[Callable[[requests.Response], Any]] = None,
         exit_on_rate_limit: Optional[bool] = False,
-        stream_slice: Optional[Mapping[str, Any]] = None,
     ) -> requests.Response:
         """
         Sends a request with retry logic.
@@ -260,9 +259,9 @@ class HttpClient:
         max_tries = max(0, max_retries) + 1
         max_time = self._max_time
-        user_backoff_handler = user_defined_backoff_handler(
-            max_tries=max_tries, max_time=max_time, stream_slice=stream_slice
-        )(self._send)
+        user_backoff_handler = user_defined_backoff_handler(max_tries=max_tries, max_time=max_time)(
+            self._send
+        )
         rate_limit_backoff_handler = rate_limit_default_backoff_handler(max_tries=max_tries)
         backoff_handler = http_client_default_backoff_handler(
             max_tries=max_tries, max_time=max_time
@@ -507,7 +506,6 @@ class HttpClient:
         dedupe_query_params: bool = False,
         log_formatter: Optional[Callable[[requests.Response], Any]] = None,
         exit_on_rate_limit: Optional[bool] = False,
-        stream_slice: Optional[Mapping[str, Any]] = None,
     ) -> Tuple[requests.PreparedRequest, requests.Response]:
         """
         Prepares and sends request and return request and response objects.
@@ -528,7 +526,6 @@ class HttpClient:
             request_kwargs=request_kwargs,
             log_formatter=log_formatter,
             exit_on_rate_limit=exit_on_rate_limit,
-            stream_slice=stream_slice,
         )
         return request, response

@@ -101,10 +101,7 @@ def http_client_default_backoff_handler(
 def user_defined_backoff_handler(
-    max_tries: Optional[int],
-    max_time: Optional[int] = None,
-    stream_slice: Optional[Mapping[str, Any]] = None,
-    **kwargs: Any,
+    max_tries: Optional[int], max_time: Optional[int] = None, **kwargs: Any
 ) -> Callable[[SendRequestCallableType], SendRequestCallableType]:
     def sleep_on_ratelimit(details: Mapping[str, Any]) -> None:
         _, exc, _ = sys.exc_info()
@@ -114,11 +111,7 @@ def user_defined_backoff_handler(
                     f"Status code: {exc.response.status_code!r}, Response Content: {exc.response.content!r}"
                 )
             retry_after = exc.backoff
-            # include logging og the current time to help with debugging
-            logging_message = f"Retrying. Sleeping for {retry_after} seconds at {time.strftime('%Y-%m-%d %H:%M:%S')}"
-            if stream_slice:
-                logging_message += f" for slice: {stream_slice}"
-            logger.info(logging_message)
+            logger.info(f"Retrying. Sleeping for {retry_after} seconds")
             time.sleep(retry_after + 1)  # extra second to cover any fractions of second
     def log_give_up(details: Mapping[str, Any]) -> None:

@@ -217,10 +217,26 @@ class AbstractOauth2Authenticator(AuthBase):
                 data=self.build_refresh_request_body(),
                 headers=self.build_refresh_request_headers(),
             )
-            # log the response even if the request failed for troubleshooting purposes
+            if not response.ok:
+                # log the response even if the request failed for troubleshooting purposes
+                self._log_response(response)
+                response.raise_for_status()
+            response_json = response.json()
+            try:
+                # extract the access token and add to secrets to avoid logging the raw value
+                access_key = self._extract_access_token(response_json)
+                if access_key:
+                    add_to_secrets(access_key)
+            except ResponseKeysMaxRecurtionReached as e:
+                # could not find the access token in the response, so do nothing
+                pass
             self._log_response(response)
-            response.raise_for_status()
-            return response.json()
+            return response_json
         except requests.exceptions.RequestException as e:
             if e.response is not None:
                 if e.response.status_code == 429 or e.response.status_code >= 500:
@@ -240,9 +256,7 @@ class AbstractOauth2Authenticator(AuthBase):
         This method attempts to extract the access token from the provided response data.
         If the access token is not found, it raises an exception indicating that the token
-        refresh API response was missing the access token. If the access token is found,
-        it adds the token to the list of secrets to ensure it is replaced before logging
-        the response.
+        refresh API response was missing the access token.
         Args:
             response_data (Mapping[str, Any]): The response data from which to extract the access token.
@@ -257,9 +271,6 @@ class AbstractOauth2Authenticator(AuthBase):
                 raise Exception(
                     f"Token refresh API response was missing access token {self.get_access_token_name()}"
                 )
-            # Add the access token to the list of secrets so it is replaced before logging the response
-            # An argument could be made to remove the prevous access key from the list of secrets, but unmasking values seems like a security incident waiting to happen...
-            add_to_secrets(access_key)
         except ResponseKeysMaxRecurtionReached as e:
             raise e

@@ -23,7 +23,7 @@ classifiers = [
 keywords = ["airbyte", "connector-development-kit", "cdk"]
 # Python CDK uses dynamic versioning: https://github.com/mtkennerly/poetry-dynamic-versioning
-version = "6.57.3.post7.dev16093585744"  # Version will be calculated dynamically.
+version = "6.58.0.post2.dev16210284097"  # Version will be calculated dynamically.
 [tool.poetry-dynamic-versioning]
 enable = false

airbyte-cdk 6.57.3.post7.dev16093585744__tar.gz → 6.58.0.post2.dev16210284097__tar.gz

airbyte-cdk 6.57.3.post7.dev16093585744tar.gz → 6.58.0.post2.dev16210284097tar.gz