apache-airflow-providers-http 5.3.1rc1__tar.gz → 5.3.2rc1__tar.gz

{apache_airflow_providers_http-5.3.1rc1 → apache_airflow_providers_http-5.3.2rc1}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-http
-Version: 5.3.1rc1
+Version: 5.3.2rc1
 Summary: Provider package apache-airflow-providers-http for Apache Airflow
 Keywords: airflow-provider,http,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
 Maintainer-email: Apache Software Foundation <dev@airflow.apache.org>
-Requires-Python: ~=3.9
+Requires-Python: ~=3.10
 Description-Content-Type: text/x-rst
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -15,7 +15,6 @@ Classifier: Intended Audience :: System Administrators
 Classifier: Framework :: Apache Airflow
 Classifier: Framework :: Apache Airflow :: Provider
 Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -26,8 +25,8 @@ Requires-Dist: requests-toolbelt>=1.0.0
 Requires-Dist: aiohttp>=3.9.2,!=3.11.0
 Requires-Dist: asgiref>=2.3.0
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.staged.apache.org/docs/apache-airflow-providers-http/5.3.1/changelog.html
-Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-http/5.3.1
+Project-URL: Changelog, https://airflow.staged.apache.org/docs/apache-airflow-providers-http/5.3.2/changelog.html
+Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-http/5.3.2
 Project-URL: Mastodon, https://fosstodon.org/@airflow
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
@@ -58,7 +57,7 @@ Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
 
 Package ``apache-airflow-providers-http``
 
-Release: ``5.3.1``
+Release: ``5.3.2``
 
 
 `Hypertext Transfer Protocol (HTTP) <https://www.w3.org/Protocols/>`__
@@ -71,7 +70,7 @@ This is a provider package for ``http`` provider. All classes for this provider
 are in ``airflow.providers.http`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-http/5.3.1/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-http/5.3.2/>`_.
 
 Installation
 ------------
@@ -80,7 +79,7 @@ You can install this package on top of an existing Airflow 2 installation (see `
 for the minimum Airflow version supported) via
 ``pip install apache-airflow-providers-http``
 
-The package supports the following python versions: 3.9,3.10,3.11,3.12
+The package supports the following python versions: 3.10,3.11,3.12
 
 Requirements
 ------------
@@ -96,5 +95,5 @@ PIP package            Version required
 =====================  ====================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-http/5.3.1/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-http/5.3.2/changelog.html>`_.
 

{apache_airflow_providers_http-5.3.1rc1 → apache_airflow_providers_http-5.3.2rc1}/README.rst

@@ -23,7 +23,7 @@
 
 Package ``apache-airflow-providers-http``
 
-Release: ``5.3.1``
+Release: ``5.3.2``
 
 
 `Hypertext Transfer Protocol (HTTP) <https://www.w3.org/Protocols/>`__
@@ -36,7 +36,7 @@ This is a provider package for ``http`` provider. All classes for this provider
 are in ``airflow.providers.http`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-http/5.3.1/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-http/5.3.2/>`_.
 
 Installation
 ------------
@@ -45,7 +45,7 @@ You can install this package on top of an existing Airflow 2 installation (see `
 for the minimum Airflow version supported) via
 ``pip install apache-airflow-providers-http``
 
-The package supports the following python versions: 3.9,3.10,3.11,3.12
+The package supports the following python versions: 3.10,3.11,3.12
 
 Requirements
 ------------
@@ -61,4 +61,4 @@ PIP package            Version required
 =====================  ====================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-http/5.3.1/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-http/5.3.2/changelog.html>`_.

{apache_airflow_providers_http-5.3.1rc1 → apache_airflow_providers_http-5.3.2rc1}/docs/changelog.rst

@@ -27,6 +27,31 @@
 Changelog
 ---------
 
+5.3.2
+.....
+
+Bug Fixes
+~~~~~~~~~
+
+* ``Ensure  'HttpHook.run()' does not alter 'extra_options' passed to it (#51893)``
+* ``Fix HttpOperator(deferrable=True) crash when connection has login / password (#52050)``
+* ``Enable extra_options even when extra not defined for HttpHook.run (#51746)``
+
+Misc
+~~~~
+
+* ``Move 'BaseHook' implementation to task SDK (#51873)``
+* ``Provider Migration: Replace 'BaseOperator' to Task SDK for 'apache/http' (#52528)``
+* ``Drop support for Python 3.9 (#52072)``
+* ``Use BaseSensorOperator from task sdk in providers (#52296)``
+* ``Add deprecation to 'airflow/sensors/base.py' (#52249)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+   * ``Revert "Replace models.BaseOperator to Task SDK for http (#52506)" (#52515)``
+   * ``Replace models.BaseOperator to Task SDK for http (#52506)``
+   * ``Remove db usage from http provider tests (#52227)``
+
 5.3.1
 .....
 

{apache_airflow_providers_http-5.3.1rc1 → apache_airflow_providers_http-5.3.2rc1}/docs/index.rst

@@ -77,7 +77,7 @@ apache-airflow-providers-http package
 `Hypertext Transfer Protocol (HTTP) <https://www.w3.org/Protocols/>`__
 
 
-Release: 5.3.1
+Release: 5.3.2
 
 Provider package
 ----------------

{apache_airflow_providers_http-5.3.1rc1 → apache_airflow_providers_http-5.3.2rc1}/provider.yaml

@@ -22,12 +22,13 @@ description: |
     `Hypertext Transfer Protocol (HTTP) <https://www.w3.org/Protocols/>`__
 
 state: ready
-source-date-epoch: 1749913240
+source-date-epoch: 1751473576
 # Note that those versions are maintained by release manager - do not update them manually
 # with the exception of case where other provider in sources has >= new provider version.
 # In such case adding >= NEW_VERSION and bumping to NEW_VERSION in a provider have
 # to be done in the same PR
 versions:
+  - 5.3.2
   - 5.3.1
   - 5.3.0
   - 5.2.2

{apache_airflow_providers_http-5.3.1rc1 → apache_airflow_providers_http-5.3.2rc1}/pyproject.toml

@@ -25,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-http"
-version = "5.3.1rc1"
+version = "5.3.2rc1"
 description = "Provider package apache-airflow-providers-http for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -44,13 +44,12 @@ classifiers = [
     "Framework :: Apache Airflow",
     "Framework :: Apache Airflow :: Provider",
     "License :: OSI Approved :: Apache Software License",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Topic :: System :: Monitoring",
 ]
-requires-python = "~=3.9"
+requires-python = "~=3.10"
 
 # The dependencies should be modified in place in the generated file.
 # Any change in the dependencies is preserved when the file is regenerated
@@ -101,8 +100,8 @@ apache-airflow-providers-common-sql = {workspace = true}
 apache-airflow-providers-standard = {workspace = true}
 
 [project.urls]
-"Documentation" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-http/5.3.1"
-"Changelog" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-http/5.3.1/changelog.html"
+"Documentation" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-http/5.3.2"
+"Changelog" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-http/5.3.2/changelog.html"
 "Bug Tracker" = "https://github.com/apache/airflow/issues"
 "Source Code" = "https://github.com/apache/airflow"
 "Slack Chat" = "https://s.apache.org/airflow-slack"

{apache_airflow_providers_http-5.3.1rc1 → apache_airflow_providers_http-5.3.2rc1}/src/airflow/providers/http/__init__.py

@@ -29,7 +29,7 @@ from airflow import __version__ as airflow_version
 
 __all__ = ["__version__"]
 
-__version__ = "5.3.1"
+__version__ = "5.3.2"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
     "2.10.0"

{apache_airflow_providers_http-5.3.1rc1 → apache_airflow_providers_http-5.3.2rc1}/src/airflow/providers/http/hooks/http.py

@@ -17,7 +17,9 @@
 # under the License.
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable
+import copy
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any
 from urllib.parse import urlparse
 
 import aiohttp
@@ -31,9 +33,13 @@ from requests.models import DEFAULT_REDIRECT_LIMIT
 from requests_toolbelt.adapters.socket_options import TCPKeepAliveAdapter
 
 from airflow.exceptions import AirflowException
-from airflow.hooks.base import BaseHook
 from airflow.providers.http.exceptions import HttpErrorException, HttpMethodException
 
+try:
+    from airflow.sdk import BaseHook
+except ImportError:
+    from airflow.hooks.base import BaseHook as BaseHook  # type: ignore
+
 if TYPE_CHECKING:
     from aiohttp.client_reqrep import ClientResponse
     from requests.adapters import HTTPAdapter
@@ -48,37 +54,50 @@ def _url_from_endpoint(base_url: str | None, endpoint: str | None) -> str:
     return (base_url or "") + (endpoint or "")
 
 
-def _process_extra_options_from_connection(conn: Connection, extra_options: dict[str, Any]) -> dict:
-    extra = conn.extra_dejson
-    stream = extra.pop("stream", None)
-    cert = extra.pop("cert", None)
-    proxies = extra.pop("proxies", extra.pop("proxy", None))
-    timeout = extra.pop("timeout", None)
-    verify_ssl = extra.pop("verify", extra.pop("verify_ssl", None))
-    allow_redirects = extra.pop("allow_redirects", None)
-    max_redirects = extra.pop("max_redirects", None)
-    trust_env = extra.pop("trust_env", None)
-    check_response = extra.pop("check_response", None)
-
-    if stream is not None and "stream" not in extra_options:
-        extra_options["stream"] = stream
-    if cert is not None and "cert" not in extra_options:
-        extra_options["cert"] = cert
-    if proxies is not None and "proxy" not in extra_options:
-        extra_options["proxy"] = proxies
-    if timeout is not None and "timeout" not in extra_options:
-        extra_options["timeout"] = timeout
-    if verify_ssl is not None and "verify_ssl" not in extra_options:
-        extra_options["verify_ssl"] = verify_ssl
-    if allow_redirects is not None and "allow_redirects" not in extra_options:
-        extra_options["allow_redirects"] = allow_redirects
-    if max_redirects is not None and "max_redirects" not in extra_options:
-        extra_options["max_redirects"] = max_redirects
-    if trust_env is not None and "trust_env" not in extra_options:
-        extra_options["trust_env"] = trust_env
-    if check_response is not None and "check_response" not in extra_options:
-        extra_options["check_response"] = check_response
-    return extra
+def _process_extra_options_from_connection(
+    conn, extra_options: dict[str, Any]
+) -> tuple[dict[str, Any], dict[str, Any]]:
+    """
+    Return the updated extra options from the connection, as well as those passed.
+
+    :param conn: The HTTP Connection object passed to the Hook
+    :param extra_options: Use-defined extra options
+    :return: (tuple)
+    """
+    # Copy, to prevent changing conn.extra_dejson and extra_options
+    conn_extra_options: dict = copy.copy(conn.extra_dejson)
+    passed_extra_options: dict = copy.copy(extra_options)
+
+    stream = conn_extra_options.pop("stream", None)
+    cert = conn_extra_options.pop("cert", None)
+    proxies = conn_extra_options.pop("proxies", conn_extra_options.pop("proxy", None))
+    timeout = conn_extra_options.pop("timeout", None)
+    verify_ssl = conn_extra_options.pop("verify", conn_extra_options.pop("verify_ssl", None))
+    allow_redirects = conn_extra_options.pop("allow_redirects", None)
+    max_redirects = conn_extra_options.pop("max_redirects", None)
+    trust_env = conn_extra_options.pop("trust_env", None)
+    check_response = conn_extra_options.pop("check_response", None)
+
+    if stream is not None and "stream" not in passed_extra_options:
+        passed_extra_options["stream"] = stream
+    if cert is not None and "cert" not in passed_extra_options:
+        passed_extra_options["cert"] = cert
+    if proxies is not None and "proxy" not in passed_extra_options:
+        passed_extra_options["proxy"] = proxies
+    if timeout is not None and "timeout" not in passed_extra_options:
+        passed_extra_options["timeout"] = timeout
+    if verify_ssl is not None and "verify_ssl" not in passed_extra_options:
+        passed_extra_options["verify_ssl"] = verify_ssl
+    if allow_redirects is not None and "allow_redirects" not in passed_extra_options:
+        passed_extra_options["allow_redirects"] = allow_redirects
+    if max_redirects is not None and "max_redirects" not in passed_extra_options:
+        passed_extra_options["max_redirects"] = max_redirects
+    if trust_env is not None and "trust_env" not in passed_extra_options:
+        passed_extra_options["trust_env"] = trust_env
+    if check_response is not None and "check_response" not in passed_extra_options:
+        passed_extra_options["check_response"] = check_response
+
+    return conn_extra_options, passed_extra_options
 
 
 class HttpHook(BaseHook):
@@ -96,7 +115,6 @@ class HttpHook(BaseHook):
     :param tcp_keep_alive_count: The TCP Keep Alive count parameter (corresponds to ``socket.TCP_KEEPCNT``)
     :param tcp_keep_alive_interval: The TCP Keep Alive interval parameter (corresponds to
         ``socket.TCP_KEEPINTVL``)
-    :param auth_args: extra arguments used to initialize the auth_type if different than default HTTPBasicAuth
     """
 
     conn_name_attr = "http_conn_id"
@@ -135,6 +153,8 @@ class HttpHook(BaseHook):
         else:
             self.keep_alive_adapter = None
 
+        self.merged_extra: dict = {}
+
     @property
     def auth_type(self):
         return self._auth_type or HTTPBasicAuth
@@ -158,9 +178,15 @@ class HttpHook(BaseHook):
         session = Session()
         connection = self.get_connection(self.http_conn_id)
         self._set_base_url(connection)
-        session = self._configure_session_from_auth(session, connection)
-        if connection.extra:
+        session = self._configure_session_from_auth(session, connection)  # type: ignore[arg-type]
+
+        # Since get_conn can be called outside of run, we'll check this again
+        extra_options = extra_options or {}
+
+        if connection.extra or extra_options:
+            # These are being passed from to _configure_session_from_extra, no manipulation has been done yet
             session = self._configure_session_from_extra(session, connection, extra_options)
+
         session = self._configure_session_from_mount_adapters(session)
         if self.default_headers:
             session.headers.update(self.default_headers)
@@ -168,7 +194,7 @@ class HttpHook(BaseHook):
             session.headers.update(headers)
         return session
 
-    def _set_base_url(self, connection: Connection) -> None:
+    def _set_base_url(self, connection) -> None:
         host = connection.host or self.default_host
         schema = connection.schema or "http"
         # RFC 3986 (https://www.rfc-editor.org/rfc/rfc3986.html#page-16)
@@ -194,21 +220,33 @@ class HttpHook(BaseHook):
         return None
 
     def _configure_session_from_extra(
-        self, session: Session, connection: Connection, extra_options: dict[str, Any] | None = None
+        self, session: Session, connection, extra_options: dict[str, Any]
     ) -> Session:
-        if extra_options is None:
-            extra_options = {}
-        headers = _process_extra_options_from_connection(connection, extra_options)
-        session.proxies = extra_options.pop("proxies", extra_options.pop("proxy", {}))
-        session.stream = extra_options.pop("stream", False)
-        session.verify = extra_options.pop("verify", extra_options.pop("verify_ssl", True))
-        session.cert = extra_options.pop("cert", None)
-        session.max_redirects = extra_options.pop("max_redirects", DEFAULT_REDIRECT_LIMIT)
-        session.trust_env = extra_options.pop("trust_env", True)
+        """
+        Configure the session using both the extra field from the Connection and passed in extra_options.
+
+        :param session: (Session)
+        :param connection: HTTP Connection passed into Hook
+        :param extra_options: (dict)
+        :return: (Session)
+        """
+        # This is going to update self.merged_extra, which will be used below
+        conn_extra_options, self.merged_extra = _process_extra_options_from_connection(
+            connection, extra_options
+        )
+
+        session.proxies = self.merged_extra.get("proxies", self.merged_extra.get("proxy", {}))
+        session.stream = self.merged_extra.get("stream", False)
+        session.verify = self.merged_extra.get("verify", self.merged_extra.get("verify_ssl", True))
+        session.cert = self.merged_extra.get("cert", None)
+        session.max_redirects = self.merged_extra.get("max_redirects", DEFAULT_REDIRECT_LIMIT)
+        session.trust_env = self.merged_extra.get("trust_env", True)
+
         try:
-            session.headers.update(headers)
+            session.headers.update(conn_extra_options)
         except TypeError:
             self.log.warning("Connection to %s has invalid extra field.", connection.host)
+
         return session
 
     def _configure_session_from_mount_adapters(self, session: Session) -> Session:
@@ -245,9 +283,7 @@ class HttpHook(BaseHook):
             For example, ``run(json=obj)`` is passed as ``requests.Request(json=obj)``
         """
         extra_options = extra_options or {}
-
-        session = self.get_conn(headers, extra_options)
-
+        session = self.get_conn(headers, extra_options)  # This sets self.merged_extra, which is used later
         url = self.url_from_endpoint(endpoint)
 
         if self.method == "GET":
@@ -262,7 +298,9 @@ class HttpHook(BaseHook):
 
         prepped_request = session.prepare_request(req)
         self.log.debug("Sending '%s' to url: %s", self.method, url)
-        return self.run_and_check(session, prepped_request, extra_options)
+
+        # This is referencing self.merged_extra, which is update by _process ...
+        return self.run_and_check(session, prepped_request, self.merged_extra)
 
     def check_response(self, response: Response) -> None:
         """
@@ -294,14 +332,12 @@ class HttpHook(BaseHook):
             i.e. ``{'check_response': False}`` to avoid checking raising exceptions on non 2XX
             or 3XX status codes
         """
-        extra_options = extra_options or {}
-
         settings = session.merge_environment_settings(
             prepped_request.url,
-            proxies=extra_options.get("proxies", {}),
-            stream=extra_options.get("stream", False),
-            verify=extra_options.get("verify"),
-            cert=extra_options.get("cert"),
+            proxies=session.proxies,
+            stream=session.stream,
+            verify=session.verify,
+            cert=session.cert,
         )
 
         # Send the request.
@@ -439,10 +475,12 @@ class HttpAsyncHook(BaseHook):
             if conn.login:
                 auth = self.auth_type(conn.login, conn.password)
             if conn.extra:
-                extra = _process_extra_options_from_connection(conn=conn, extra_options=extra_options)
+                conn_extra_options, extra_options = _process_extra_options_from_connection(
+                    conn=conn, extra_options=extra_options
+                )
 
                 try:
-                    _headers.update(extra)
+                    _headers.update(conn_extra_options)
                 except TypeError:
                     self.log.warning("Connection to %s has invalid extra field.", conn.host)
         if headers:

{apache_airflow_providers_http-5.3.1rc1 → apache_airflow_providers_http-5.3.2rc1}/src/airflow/providers/http/operators/http.py

@@ -19,16 +19,21 @@ from __future__ import annotations
 
 import base64
 import pickle
-from collections.abc import Sequence
-from typing import TYPE_CHECKING, Any, Callable
+from collections.abc import Callable, Sequence
+from typing import TYPE_CHECKING, Any
 
+from aiohttp import BasicAuth
 from requests import Response
 
 from airflow.configuration import conf
 from airflow.exceptions import AirflowException
-from airflow.hooks.base import BaseHook
-from airflow.models import BaseOperator
-from airflow.providers.http.triggers.http import HttpTrigger
+
+try:
+    from airflow.sdk import BaseHook
+except ImportError:
+    from airflow.hooks.base import BaseHook  # type: ignore[attr-defined,no-redef]
+from airflow.providers.http.triggers.http import HttpTrigger, serialize_auth_type
+from airflow.providers.http.version_compat import BaseOperator
 from airflow.utils.helpers import merge_dicts
 
 if TYPE_CHECKING:
@@ -122,7 +127,7 @@ class HttpOperator(BaseOperator):
         request_kwargs: dict[str, Any] | None = None,
         http_conn_id: str = "http_default",
         log_response: bool = False,
-        auth_type: type[AuthBase] | None = None,
+        auth_type: type[AuthBase] | type[BasicAuth] | None = None,
         tcp_keep_alive: bool = True,
         tcp_keep_alive_idle: int = 120,
         tcp_keep_alive_count: int = 20,
@@ -221,7 +226,7 @@ class HttpOperator(BaseOperator):
         self.defer(
             trigger=HttpTrigger(
                 http_conn_id=self.http_conn_id,
-                auth_type=self.auth_type,
+                auth_type=serialize_auth_type(self._resolve_auth_type()),
                 method=self.method,
                 endpoint=self.endpoint,
                 headers=self.headers,
@@ -231,6 +236,27 @@ class HttpOperator(BaseOperator):
             method_name="execute_complete",
         )
 
+    def _resolve_auth_type(self) -> type[AuthBase] | type[BasicAuth] | None:
+        """
+        Resolve the authentication type for the HTTP request.
+
+        If auth_type is not explicitly set, attempt to infer it from the connection configuration.
+        For connections with login/password, default to BasicAuth.
+
+        :return: The resolved authentication type class, or None if no auth is needed.
+        """
+        if self.auth_type is not None:
+            return self.auth_type
+
+        try:
+            conn = BaseHook.get_connection(self.http_conn_id)
+            if conn.login or conn.password:
+                return BasicAuth
+        except Exception as e:
+            self.log.warning("Failed to resolve auth type from connection: %s", e)
+
+        return None
+
     def process_response(self, context: Context, response: Response | list[Response]) -> Any:
         """Process the response."""
         from airflow.utils.operator_helpers import determine_kwargs
@@ -291,7 +317,7 @@ class HttpOperator(BaseOperator):
             self.defer(
                 trigger=HttpTrigger(
                     http_conn_id=self.http_conn_id,
-                    auth_type=self.auth_type,
+                    auth_type=serialize_auth_type(self._resolve_auth_type()),
                     method=self.method,
                     **self._merge_next_page_parameters(next_page_params),
                 ),

{apache_airflow_providers_http-5.3.1rc1 → apache_airflow_providers_http-5.3.2rc1}/src/airflow/providers/http/sensors/http.py

@@ -17,20 +17,24 @@
 # under the License.
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 from datetime import timedelta
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
 
 from airflow.configuration import conf
 from airflow.exceptions import AirflowException
 from airflow.providers.http.hooks.http import HttpHook
 from airflow.providers.http.triggers.http import HttpSensorTrigger
-from airflow.sensors.base import BaseSensorOperator
+from airflow.providers.http.version_compat import AIRFLOW_V_3_0_PLUS, BaseSensorOperator
 
 if TYPE_CHECKING:
     try:
         from airflow.sdk.definitions.context import Context
-        from airflow.sensors.base import PokeReturnValue
+
+        if AIRFLOW_V_3_0_PLUS:
+            from airflow.sdk import PokeReturnValue
+        else:
+            from airflow.sensors.base import PokeReturnValue  # type: ignore[no-redef]
     except ImportError:
         # TODO: Remove once provider drops support for Airflow 2
         from airflow.utils.context import Context

{apache_airflow_providers_http-5.3.1rc1 → apache_airflow_providers_http-5.3.2rc1}/src/airflow/providers/http/triggers/http.py

@@ -20,6 +20,7 @@ import asyncio
 import base64
 import pickle
 from collections.abc import AsyncIterator
+from importlib import import_module
 from typing import TYPE_CHECKING, Any
 
 import aiohttp
@@ -35,6 +36,21 @@ if TYPE_CHECKING:
     from aiohttp.client_reqrep import ClientResponse
 
 
+def serialize_auth_type(auth: str | type | None) -> str | None:
+    if auth is None:
+        return None
+    if isinstance(auth, str):
+        return auth
+    return f"{auth.__module__}.{auth.__qualname__}"
+
+
+def deserialize_auth_type(path: str | None) -> type | None:
+    if path is None:
+        return None
+    module_path, cls_name = path.rsplit(".", 1)
+    return getattr(import_module(module_path), cls_name)
+
+
 class HttpTrigger(BaseTrigger):
     """
     HttpTrigger run on the trigger worker.
@@ -56,7 +72,7 @@ class HttpTrigger(BaseTrigger):
     def __init__(
         self,
         http_conn_id: str = "http_default",
-        auth_type: Any = None,
+        auth_type: str | None = None,
         method: str = "POST",
         endpoint: str | None = None,
         headers: dict[str, str] | None = None,
@@ -66,7 +82,7 @@ class HttpTrigger(BaseTrigger):
         super().__init__()
         self.http_conn_id = http_conn_id
         self.method = method
-        self.auth_type = auth_type
+        self.auth_type = deserialize_auth_type(auth_type)
         self.endpoint = endpoint
         self.headers = headers
         self.data = data
@@ -79,7 +95,7 @@ class HttpTrigger(BaseTrigger):
             {
                 "http_conn_id": self.http_conn_id,
                 "method": self.method,
-                "auth_type": self.auth_type,
+                "auth_type": serialize_auth_type(self.auth_type),
                 "endpoint": self.endpoint,
                 "headers": self.headers,
                 "data": self.data,
@@ -126,7 +142,7 @@ class HttpTrigger(BaseTrigger):
         response.reason = str(client_response.reason)
         cookies = RequestsCookieJar()
         for k, v in client_response.cookies.items():
-            cookies.set(k, v)
+            cookies.set(k, str(v))  # Convert Morsel to string
         response.cookies = cookies
         return response