apache-airflow-providers-http 5.0.0rc1__tar.gz → 5.2.0__tar.gz

{apache_airflow_providers_http-5.0.0rc1 → apache_airflow_providers_http-5.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: apache-airflow-providers-http
-Version: 5.0.0rc1
+Version: 5.2.0
 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>
@@ -20,37 +20,20 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: System :: Monitoring
+Requires-Dist: apache-airflow>=2.9.0
+Requires-Dist: requests>=2.27.0,<3
+Requires-Dist: requests-toolbelt>=0.4.0
 Requires-Dist: aiohttp>=3.9.2,!=3.11.0
-Requires-Dist: apache-airflow>=2.9.0rc0
 Requires-Dist: asgiref>=2.3.0
-Requires-Dist: requests-toolbelt>=0.4.0
-Requires-Dist: requests>=2.27.0,<3
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-http/5.0.0/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-http/5.0.0
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-http/5.2.0/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-http/5.2.0
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
 Project-URL: Twitter, https://x.com/ApacheAirflow
 Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
 
 
-.. Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-..   http://www.apache.org/licenses/LICENSE-2.0
-
-.. Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.
-
  .. Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
@@ -68,8 +51,7 @@ Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
     specific language governing permissions and limitations
     under the License.
 
- .. NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE
-    OVERWRITTEN WHEN PREPARING PACKAGES.
+ .. NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE OVERWRITTEN!
 
  .. IF YOU WANT TO MODIFY TEMPLATE FOR THIS FILE, YOU SHOULD MODIFY THE TEMPLATE
     `PROVIDER_README_TEMPLATE.rst.jinja2` IN the `dev/breeze/src/airflow_breeze/templates` DIRECTORY
@@ -77,7 +59,7 @@ Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
 
 Package ``apache-airflow-providers-http``
 
-Release: ``5.0.0.rc1``
+Release: ``5.2.0``
 
 
 `Hypertext Transfer Protocol (HTTP) <https://www.w3.org/Protocols/>`__
@@ -90,7 +72,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.0.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-http/5.2.0/>`_.
 
 Installation
 ------------
@@ -115,4 +97,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.0.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-http/5.2.0/changelog.html>`_.
+

{apache_airflow_providers_http-5.0.0rc1 → apache_airflow_providers_http-5.2.0}/README.rst

@@ -1,21 +1,4 @@
 
-.. Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-..   http://www.apache.org/licenses/LICENSE-2.0
-
-.. Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.
-
  .. Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
@@ -33,8 +16,7 @@
     specific language governing permissions and limitations
     under the License.
 
- .. NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE
-    OVERWRITTEN WHEN PREPARING PACKAGES.
+ .. NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE OVERWRITTEN!
 
  .. IF YOU WANT TO MODIFY TEMPLATE FOR THIS FILE, YOU SHOULD MODIFY THE TEMPLATE
     `PROVIDER_README_TEMPLATE.rst.jinja2` IN the `dev/breeze/src/airflow_breeze/templates` DIRECTORY
@@ -42,7 +24,7 @@
 
 Package ``apache-airflow-providers-http``
 
-Release: ``5.0.0.rc1``
+Release: ``5.2.0``
 
 
 `Hypertext Transfer Protocol (HTTP) <https://www.w3.org/Protocols/>`__
@@ -55,7 +37,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.0.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-http/5.2.0/>`_.
 
 Installation
 ------------
@@ -80,4 +62,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.0.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-http/5.2.0/changelog.html>`_.

{apache_airflow_providers_http-5.0.0rc1 → apache_airflow_providers_http-5.2.0}/pyproject.toml

@@ -1,4 +1,3 @@
-
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -16,10 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE
-# OVERWRITTEN WHEN PREPARING PACKAGES.
+# NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE OVERWRITTEN!
 
-# IF YOU WANT TO MODIFY THIS FILE, YOU SHOULD MODIFY THE TEMPLATE
+# IF YOU WANT TO MODIFY THIS FILE EXCEPT DEPENDENCIES, YOU SHOULD MODIFY THE TEMPLATE
 # `pyproject_TEMPLATE.toml.jinja2` IN the `dev/breeze/src/airflow_breeze/templates` DIRECTORY
 [build-system]
 requires = ["flit_core==3.10.1"]
@@ -27,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-http"
-version = "5.0.0.rc1"
+version = "5.2.0"
 description = "Provider package apache-airflow-providers-http for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -53,17 +51,23 @@ classifiers = [
     "Topic :: System :: Monitoring",
 ]
 requires-python = "~=3.9"
+
+# The dependencies should be modified in place in the generated file
+# Any change in the dependencies is preserved when the file is regenerated
 dependencies = [
+    "apache-airflow>=2.9.0",
+    # The 2.26.0 release of requests got rid of the chardet LGPL mandatory dependency, allowing us to
+    # release it as a requirement for airflow
+    "requests>=2.27.0,<3",
+    "requests-toolbelt>=0.4.0",
+    # aiohttp 3.11.0 had incompatible change: https://github.com/aio-libs/aiohttp/issues/9866
     "aiohttp>=3.9.2,!=3.11.0",
-    "apache-airflow>=2.9.0rc0",
     "asgiref>=2.3.0",
-    "requests-toolbelt>=0.4.0",
-    "requests>=2.27.0,<3",
 ]
 
 [project.urls]
-"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-http/5.0.0"
-"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-http/5.0.0/changelog.html"
+"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-http/5.2.0"
+"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-http/5.2.0/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"
@@ -75,3 +79,6 @@ provider_info = "airflow.providers.http.get_provider_info:get_provider_info"
 
 [tool.flit.module]
 name = "airflow.providers.http"
+
+[tool.pytest.ini_options]
+ignore = "tests/system/"

{apache_airflow_providers_http-5.0.0rc1 → apache_airflow_providers_http-5.2.0/src}/airflow/providers/http/LICENSE

@@ -199,55 +199,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-
-============================================================================
-   APACHE AIRFLOW SUBCOMPONENTS:
-
-   The Apache Airflow project contains subcomponents with separate copyright
-   notices and license terms. Your use of the source code for the these
-   subcomponents is subject to the terms and conditions of the following
-   licenses.
-
-
-========================================================================
-Third party Apache 2.0 licenses
-========================================================================
-
-The following components are provided under the Apache 2.0 License.
-See project link for details. The text of each license is also included
-at 3rd-party-licenses/LICENSE-[project].txt.
-
-    (ALv2 License) hue v4.3.0 (https://github.com/cloudera/hue/)
-    (ALv2 License) jqclock v2.3.0 (https://github.com/JohnRDOrazio/jQuery-Clock-Plugin)
-    (ALv2 License) bootstrap3-typeahead v4.0.2 (https://github.com/bassjobsen/Bootstrap-3-Typeahead)
-    (ALv2 License) connexion v2.7.0 (https://github.com/zalando/connexion)
-
-========================================================================
-MIT licenses
-========================================================================
-
-The following components are provided under the MIT License. See project link for details.
-The text of each license is also included at 3rd-party-licenses/LICENSE-[project].txt.
-
-    (MIT License) jquery v3.5.1 (https://jquery.org/license/)
-    (MIT License) dagre-d3 v0.6.4 (https://github.com/cpettitt/dagre-d3)
-    (MIT License) bootstrap v3.4.1 (https://github.com/twbs/bootstrap/)
-    (MIT License) d3-tip v0.9.1 (https://github.com/Caged/d3-tip)
-    (MIT License) dataTables v1.10.25 (https://datatables.net)
-    (MIT License) normalize.css v3.0.2 (http://necolas.github.io/normalize.css/)
-    (MIT License) ElasticMock v1.3.2 (https://github.com/vrcmarcos/elasticmock)
-    (MIT License) MomentJS v2.24.0 (http://momentjs.com/)
-    (MIT License) eonasdan-bootstrap-datetimepicker v4.17.49 (https://github.com/eonasdan/bootstrap-datetimepicker/)
-
-========================================================================
-BSD 3-Clause licenses
-========================================================================
-The following components are provided under the BSD 3-Clause license. See project links for details.
-The text of each license is also included at 3rd-party-licenses/LICENSE-[project].txt.
-
-    (BSD 3 License) d3 v5.16.0 (https://d3js.org)
-    (BSD 3 License) d3-shape v2.1.0 (https://github.com/d3/d3-shape)
-    (BSD 3 License) cgroupspy 0.2.1 (https://github.com/cloudsigma/cgroupspy)
-
-========================================================================
-See 3rd-party-licenses/LICENSES-ui.txt for packages used in `/airflow/www`

{apache_airflow_providers_http-5.0.0rc1 → apache_airflow_providers_http-5.2.0/src}/airflow/providers/http/__init__.py

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

apache_airflow_providers_http-5.2.0/src/airflow/providers/http/exceptions.py

@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from __future__ import annotations
+
+from airflow.exceptions import AirflowException
+
+
+class HttpErrorException(AirflowException):
+    """Exception raised for HTTP error in Http hook."""
+
+
+class HttpMethodException(AirflowException):
+    """Exception raised for invalid HTTP methods in Http hook."""

{apache_airflow_providers_http-5.0.0rc1 → apache_airflow_providers_http-5.2.0/src}/airflow/providers/http/get_provider_info.py

@@ -15,8 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE
-# OVERWRITTEN WHEN PREPARING PACKAGES.
+# NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE OVERWRITTEN!
 #
 # IF YOU WANT TO MODIFY THIS FILE, YOU SHOULD MODIFY THE TEMPLATE
 # `get_provider_info_TEMPLATE.py.jinja2` IN the `dev/breeze/src/airflow_breeze/templates` DIRECTORY
@@ -28,8 +27,9 @@ def get_provider_info():
         "name": "Hypertext Transfer Protocol (HTTP)",
         "description": "`Hypertext Transfer Protocol (HTTP) <https://www.w3.org/Protocols/>`__\n",
         "state": "ready",
-        "source-date-epoch": 1734534857,
+        "source-date-epoch": 1739963578,
         "versions": [
+            "5.2.0",
             "5.0.0",
             "4.13.3",
             "4.13.2",
@@ -68,19 +68,12 @@ def get_provider_info():
             "1.1.0",
             "1.0.0",
         ],
-        "dependencies": [
-            "apache-airflow>=2.9.0",
-            "requests>=2.27.0,<3",
-            "requests-toolbelt>=0.4.0",
-            "aiohttp>=3.9.2,!=3.11.0",
-            "asgiref>=2.3.0",
-        ],
         "integrations": [
             {
                 "integration-name": "Hypertext Transfer Protocol (HTTP)",
                 "external-doc-url": "https://www.w3.org/Protocols/",
                 "how-to-guide": ["/docs/apache-airflow-providers-http/operators.rst"],
-                "logo": "/integration-logos/http/HTTP.png",
+                "logo": "/docs/integration-logos/HTTP.png",
                 "tags": ["protocol"],
             }
         ],
@@ -111,4 +104,11 @@ def get_provider_info():
         "connection-types": [
             {"hook-class-name": "airflow.providers.http.hooks.http.HttpHook", "connection-type": "http"}
         ],
+        "dependencies": [
+            "apache-airflow>=2.9.0",
+            "requests>=2.27.0,<3",
+            "requests-toolbelt>=0.4.0",
+            "aiohttp>=3.9.2,!=3.11.0",
+            "asgiref>=2.3.0",
+        ],
     }

{apache_airflow_providers_http-5.0.0rc1 → apache_airflow_providers_http-5.2.0/src}/airflow/providers/http/hooks/http.py

@@ -17,21 +17,22 @@
 # under the License.
 from __future__ import annotations
 
-import asyncio
 from typing import TYPE_CHECKING, Any, Callable
 from urllib.parse import urlparse
 
 import aiohttp
-import requests
 import tenacity
 from aiohttp import ClientResponseError
 from asgiref.sync import sync_to_async
+from requests import PreparedRequest, Request, Response, Session
 from requests.auth import HTTPBasicAuth
+from requests.exceptions import ConnectionError, HTTPError
 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
 
 if TYPE_CHECKING:
     from aiohttp.client_reqrep import ClientResponse
@@ -47,6 +48,39 @@ 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
+
+
 class HttpHook(BaseHook):
     """
     Interact with HTTP servers.
@@ -69,6 +103,8 @@ class HttpHook(BaseHook):
     default_conn_name = "http_default"
     conn_type = "http"
     hook_name = "HTTP"
+    default_host = ""
+    default_headers: dict[str, str] = {}
 
     def __init__(
         self,
@@ -109,26 +145,31 @@ class HttpHook(BaseHook):
 
     # headers may be passed through directly or in the "extra" field in the connection
     # definition
-    def get_conn(self, headers: dict[Any, Any] | None = None) -> requests.Session:
+    def get_conn(
+        self, headers: dict[Any, Any] | None = None, extra_options: dict[str, Any] | None = None
+    ) -> Session:
         """
         Create a Requests HTTP session.
 
         :param headers: Additional headers to be passed through as a dictionary.
+        :param extra_options: additional options to be used when executing the request
         :return: A configured requests.Session object.
         """
-        session = requests.Session()
+        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_extra(session, connection)
+            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)
         if headers:
             session.headers.update(headers)
         return session
 
     def _set_base_url(self, connection: Connection) -> None:
-        host = connection.host or ""
+        host = connection.host or self.default_host
         schema = connection.schema or "http"
         # RFC 3986 (https://www.rfc-editor.org/rfc/rfc3986.html#page-16)
         if "://" in host:
@@ -141,9 +182,7 @@ class HttpHook(BaseHook):
         if not parsed.scheme:
             raise ValueError(f"Invalid base URL: Missing scheme in {self.base_url}")
 
-    def _configure_session_from_auth(
-        self, session: requests.Session, connection: Connection
-    ) -> requests.Session:
+    def _configure_session_from_auth(self, session: Session, connection: Connection) -> Session:
         session.auth = self._extract_auth(connection)
         return session
 
@@ -155,24 +194,24 @@ class HttpHook(BaseHook):
         return None
 
     def _configure_session_from_extra(
-        self, session: requests.Session, connection: Connection
-    ) -> requests.Session:
-        extra = connection.extra_dejson
-        extra.pop("timeout", None)
-        extra.pop("allow_redirects", None)
-        session.proxies = extra.pop("proxies", extra.pop("proxy", {}))
-        session.stream = extra.pop("stream", False)
-        session.verify = extra.pop("verify", extra.pop("verify_ssl", True))
-        session.cert = extra.pop("cert", None)
-        session.max_redirects = extra.pop("max_redirects", DEFAULT_REDIRECT_LIMIT)
-        session.trust_env = extra.pop("trust_env", True)
+        self, session: Session, connection: Connection, extra_options: dict[str, Any] | None = None
+    ) -> 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)
         try:
-            session.headers.update(extra)
+            session.headers.update(headers)
         except TypeError:
             self.log.warning("Connection to %s has invalid extra field.", connection.host)
         return session
 
-    def _configure_session_from_mount_adapters(self, session: requests.Session) -> requests.Session:
+    def _configure_session_from_mount_adapters(self, session: Session) -> Session:
         scheme = urlparse(self.base_url).scheme
         if not scheme:
             raise ValueError(
@@ -207,25 +246,25 @@ class HttpHook(BaseHook):
         """
         extra_options = extra_options or {}
 
-        session = self.get_conn(headers)
+        session = self.get_conn(headers, extra_options)
 
         url = self.url_from_endpoint(endpoint)
 
         if self.method == "GET":
             # GET uses params
-            req = requests.Request(self.method, url, params=data, headers=headers, **request_kwargs)
+            req = Request(self.method, url, params=data, headers=headers, **request_kwargs)
         elif self.method == "HEAD":
             # HEAD doesn't use params
-            req = requests.Request(self.method, url, headers=headers, **request_kwargs)
+            req = Request(self.method, url, headers=headers, **request_kwargs)
         else:
             # Others use data
-            req = requests.Request(self.method, url, data=data, headers=headers, **request_kwargs)
+            req = Request(self.method, url, data=data, headers=headers, **request_kwargs)
 
         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)
 
-    def check_response(self, response: requests.Response) -> None:
+    def check_response(self, response: Response) -> None:
         """
         Check the status code and raise on failure.
 
@@ -235,15 +274,15 @@ class HttpHook(BaseHook):
         """
         try:
             response.raise_for_status()
-        except requests.exceptions.HTTPError:
+        except HTTPError:
             self.log.error("HTTP error: %s", response.reason)
             self.log.error(response.text)
             raise AirflowException(str(response.status_code) + ":" + response.reason)
 
     def run_and_check(
         self,
-        session: requests.Session,
-        prepped_request: requests.PreparedRequest,
+        session: Session,
+        prepped_request: PreparedRequest,
         extra_options: dict[Any, Any],
     ) -> Any:
         """
@@ -279,7 +318,7 @@ class HttpHook(BaseHook):
                 self.check_response(response)
             return response
 
-        except requests.exceptions.ConnectionError as ex:
+        except ConnectionError as ex:
             self.log.warning("%s Tenacity will retry to execute the operation", ex)
             raise ex
 
@@ -359,6 +398,7 @@ class HttpAsyncHook(BaseHook):
 
     async def run(
         self,
+        session: aiohttp.ClientSession,
         endpoint: str | None = None,
         data: dict[str, Any] | str | None = None,
         json: dict[str, Any] | str | None = None,
@@ -399,7 +439,7 @@ class HttpAsyncHook(BaseHook):
             if conn.login:
                 auth = self.auth_type(conn.login, conn.password)
             if conn.extra:
-                extra = self._process_extra_options_from_connection(conn=conn, extra_options=extra_options)
+                extra = _process_extra_options_from_connection(conn=conn, extra_options=extra_options)
 
                 try:
                     _headers.update(extra)
@@ -410,80 +450,51 @@ class HttpAsyncHook(BaseHook):
 
         url = _url_from_endpoint(self.base_url, endpoint)
 
-        async with aiohttp.ClientSession() as session:
-            if self.method == "GET":
-                request_func = session.get
-            elif self.method == "POST":
-                request_func = session.post
-            elif self.method == "PATCH":
-                request_func = session.patch
-            elif self.method == "HEAD":
-                request_func = session.head
-            elif self.method == "PUT":
-                request_func = session.put
-            elif self.method == "DELETE":
-                request_func = session.delete
-            elif self.method == "OPTIONS":
-                request_func = session.options
-            else:
-                raise AirflowException(f"Unexpected HTTP Method: {self.method}")
-
-            for attempt in range(1, 1 + self.retry_limit):
-                response = await request_func(
+        if self.method == "GET":
+            request_func = session.get
+        elif self.method == "POST":
+            request_func = session.post
+        elif self.method == "PATCH":
+            request_func = session.patch
+        elif self.method == "HEAD":
+            request_func = session.head
+        elif self.method == "PUT":
+            request_func = session.put
+        elif self.method == "DELETE":
+            request_func = session.delete
+        elif self.method == "OPTIONS":
+            request_func = session.options
+        else:
+            raise HttpMethodException(f"Unexpected HTTP Method: {self.method}")
+
+        for attempt in range(1, 1 + self.retry_limit):
+            response = await request_func(
+                url,
+                params=data if self.method == "GET" else None,
+                data=data if self.method in ("POST", "PUT", "PATCH") else None,
+                json=json,
+                headers=_headers,
+                auth=auth,
+                **extra_options,
+            )
+            try:
+                response.raise_for_status()
+            except ClientResponseError as e:
+                self.log.warning(
+                    "[Try %d of %d] Request to %s failed.",
+                    attempt,
+                    self.retry_limit,
                     url,
-                    params=data if self.method == "GET" else None,
-                    data=data if self.method in ("POST", "PUT", "PATCH") else None,
-                    json=json,
-                    headers=_headers,
-                    auth=auth,
-                    **extra_options,
                 )
-                try:
-                    response.raise_for_status()
-                except ClientResponseError as e:
-                    self.log.warning(
-                        "[Try %d of %d] Request to %s failed.",
-                        attempt,
-                        self.retry_limit,
-                        url,
-                    )
-                    if not self._retryable_error_async(e) or attempt == self.retry_limit:
-                        self.log.exception("HTTP error with status: %s", e.status)
-                        # In this case, the user probably made a mistake.
-                        # Don't retry.
-                        raise AirflowException(f"{e.status}:{e.message}")
-                    else:
-                        await asyncio.sleep(self.retry_delay)
-                else:
-                    return response
+                if not self._retryable_error_async(e) or attempt == self.retry_limit:
+                    self.log.exception("HTTP error with status: %s", e.status)
+                    # In this case, the user probably made a mistake.
+                    # Don't retry.
+                    raise HttpErrorException(f"{e.status}:{e.message}")
             else:
-                raise NotImplementedError  # should not reach this, but makes mypy happy
-
-    @classmethod
-    def _process_extra_options_from_connection(cls, conn: Connection, extra_options: dict) -> dict:
-        extra = conn.extra_dejson
-        extra.pop("stream", None)
-        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)
-
-        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
-        return extra
+                return response
+
+        raise NotImplementedError  # should not reach this, but makes mypy happy
 
     def _retryable_error_async(self, exception: ClientResponseError) -> bool:
         """

{apache_airflow_providers_http-5.0.0rc1 → apache_airflow_providers_http-5.2.0/src}/airflow/providers/http/operators/http.py

@@ -35,7 +35,12 @@ if TYPE_CHECKING:
     from requests.auth import AuthBase
 
     from airflow.providers.http.hooks.http import HttpHook
-    from airflow.utils.context import Context
+
+    try:
+        from airflow.sdk.definitions.context import Context
+    except ImportError:
+        # TODO: Remove once provider drops support for Airflow 2
+        from airflow.utils.context import Context
 
 
 class HttpOperator(BaseOperator):

{apache_airflow_providers_http-5.0.0rc1 → apache_airflow_providers_http-5.2.0/src}/airflow/providers/http/sensors/http.py

@@ -28,7 +28,11 @@ from airflow.providers.http.triggers.http import HttpSensorTrigger
 from airflow.sensors.base import BaseSensorOperator
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
+    try:
+        from airflow.sdk.definitions.context import Context
+    except ImportError:
+        # TODO: Remove once provider drops support for Airflow 2
+        from airflow.utils.context import Context
 
 
 class HttpSensor(BaseSensorOperator):

{apache_airflow_providers_http-5.0.0rc1 → apache_airflow_providers_http-5.2.0/src}/airflow/providers/http/triggers/http.py

@@ -22,6 +22,7 @@ import pickle
 from collections.abc import AsyncIterator
 from typing import TYPE_CHECKING, Any
 
+import aiohttp
 import requests
 from requests.cookies import RequestsCookieJar
 from requests.structures import CaseInsensitiveDict
@@ -94,13 +95,15 @@ class HttpTrigger(BaseTrigger):
             auth_type=self.auth_type,
         )
         try:
-            client_response = await hook.run(
-                endpoint=self.endpoint,
-                data=self.data,
-                headers=self.headers,
-                extra_options=self.extra_options,
-            )
-            response = await self._convert_response(client_response)
+            async with aiohttp.ClientSession() as session:
+                client_response = await hook.run(
+                    session=session,
+                    endpoint=self.endpoint,
+                    data=self.data,
+                    headers=self.headers,
+                    extra_options=self.extra_options,
+                )
+                response = await self._convert_response(client_response)
             yield TriggerEvent(
                 {
                     "status": "success",
@@ -181,12 +184,14 @@ class HttpSensorTrigger(BaseTrigger):
         hook = self._get_async_hook()
         while True:
             try:
-                await hook.run(
-                    endpoint=self.endpoint,
-                    data=self.data,
-                    headers=self.headers,
-                    extra_options=self.extra_options,
-                )
+                async with aiohttp.ClientSession() as session:
+                    await hook.run(
+                        session=session,
+                        endpoint=self.endpoint,
+                        data=self.data,
+                        headers=self.headers,
+                        extra_options=self.extra_options,
+                    )
                 yield TriggerEvent(True)
                 return
             except AirflowException as exc: