diff --git a/.github/boring-cyborg.yml b/.github/boring-cyborg.yml index 3bf2fa0fc2551..e1f541dd90b26 100644 --- a/.github/boring-cyborg.yml +++ b/.github/boring-cyborg.yml @@ -232,10 +232,7 @@ labelPRBasedOnFilePath: - providers/hashicorp/** provider:http: - - providers/src/airflow/providers/http/**/* - - docs/apache-airflow-providers-http/**/* - - providers/tests/http/**/* - - providers/tests/system/http/**/* + - providers/http/** provider:imap: - providers/imap/** diff --git a/dev/breeze/tests/test_run_test_args.py b/dev/breeze/tests/test_run_test_args.py index 890fea14b20eb..42df2f83958f2 100644 --- a/dev/breeze/tests/test_run_test_args.py +++ b/dev/breeze/tests/test_run_test_args.py @@ -102,48 +102,16 @@ def test_irregular_provider_with_extra_ignore_should_be_valid_cmd(mock_run_comma assert match_pattern.search(arg_str), arg_str -def test_primary_test_arg_is_excluded_by_extra_pytest_arg(mock_run_command): - test_provider = "http" # "Providers[]" scans the source tree so we need to use a real provider id - test_provider_not_skipped = "ftp" - _run_test( - shell_params=ShellParams( - test_group=GroupOfTests.PROVIDERS, - test_type=f"Providers[{test_provider},{test_provider_not_skipped}]", - ), - extra_pytest_args=(f"--ignore=providers/tests/{test_provider}",), - python_version="3.9", - output=None, - test_timeout=60, - skip_docker_compose_down=True, - ) - - assert mock_run_command.call_count > 1 - run_cmd_call = mock_run_command.call_args_list[1] - arg_str = " ".join(run_cmd_call.args[0]) - - # The command pattern we look for is " --verbosity=0 \ - # <*other args we don't care about*> --ignore=providers/tests/" - # The providers/tests/http argument has been eliminated by the code that preps the args; this is a bug, - # bc without a directory or module arg, pytest tests everything (which we don't want!) - # We check "--verbosity=0" to ensure nothing is between the airflow container id and the verbosity arg, - # IOW that the primary test arg is removed - match_pattern = re.compile( - f"airflow providers/tests/{test_provider_not_skipped} --verbosity=0 .+ --ignore=providers/tests/{test_provider}" - ) - - assert match_pattern.search(arg_str) - - def test_test_is_skipped_if_all_are_ignored(mock_run_command): test_providers = [ "http", - "ftp", + "standard", ] # "Providers[]" scans the source tree so we need to use a real provider id _run_test( shell_params=ShellParams( test_group=GroupOfTests.PROVIDERS, test_type=f"Providers[{','.join(test_providers)}]" ), - extra_pytest_args=tuple(f"--ignore=providers/tests/{provider}" for provider in test_providers), + extra_pytest_args=tuple(f"--ignore=providers/{provider}/tests" for provider in test_providers), python_version="3.9", output=None, test_timeout=60, diff --git a/dev/breeze/tests/test_selective_checks.py b/dev/breeze/tests/test_selective_checks.py index 268675d256d5f..ce594f950f36a 100644 --- a/dev/breeze/tests/test_selective_checks.py +++ b/dev/breeze/tests/test_selective_checks.py @@ -568,7 +568,7 @@ def assert_outputs_are_printed(expected_outputs: dict[str, str], stderr: str): ( "INTHEWILD.md", "chart/aaaa.txt", - "providers/tests/http/file.py", + "providers/http/tests/file.py", ), { "selected-providers-list-as-string": "amazon apache.livy " diff --git a/docs/.gitignore b/docs/.gitignore index 5fd793ac92f87..a7494e9302811 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -17,6 +17,7 @@ apache-airflow-providers-datadog apache-airflow-providers-edge apache-airflow-providers-exasol apache-airflow-providers-facebook +apache-airflow-providers-http apache-airflow-providers-openlineage apache-airflow-providers-hashicorp apache-airflow-providers-imap diff --git a/docs/apache-airflow-providers-http/changelog.rst b/docs/apache-airflow-providers-http/changelog.rst deleted file mode 100644 index 631df66a668d6..0000000000000 --- a/docs/apache-airflow-providers-http/changelog.rst +++ /dev/null @@ -1,25 +0,0 @@ - - .. 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. - - .. NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE - OVERWRITTEN WHEN PREPARING PACKAGES. - - .. IF YOU WANT TO MODIFY THIS FILE, YOU SHOULD MODIFY THE TEMPLATE - `PROVIDER_CHANGELOG_TEMPLATE.rst.jinja2` IN the `dev/breeze/src/airflow_breeze/templates` DIRECTORY - -.. include:: ../../providers/src/airflow/providers/http/CHANGELOG.rst diff --git a/providers/http/README.rst b/providers/http/README.rst new file mode 100644 index 0000000000000..20f30f019ae17 --- /dev/null +++ b/providers/http/README.rst @@ -0,0 +1,65 @@ + + .. 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. + + .. 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 + + +Package ``apache-airflow-providers-http`` + +Release: ``5.0.0`` + + +`Hypertext Transfer Protocol (HTTP) `__ + + +Provider package +---------------- + +This is a provider package for ``http`` provider. All classes for this provider package +are in ``airflow.providers.http`` python package. + +You can find package information and changelog for the provider +in the `documentation `_. + +Installation +------------ + +You can install this package on top of an existing Airflow 2 installation (see ``Requirements`` below +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 + +Requirements +------------ + +===================== ==================== +PIP package Version required +===================== ==================== +``apache-airflow`` ``>=2.9.0`` +``requests`` ``>=2.27.0,<3`` +``requests-toolbelt`` ``>=0.4.0`` +``aiohttp`` ``!=3.11.0,>=3.9.2`` +``asgiref`` ``>=2.3.0`` +===================== ==================== + +The changelog for the provider package can be found in the +`changelog `_. diff --git a/providers/src/airflow/providers/http/.latest-doc-only-change.txt b/providers/http/docs/.latest-doc-only-change.txt similarity index 100% rename from providers/src/airflow/providers/http/.latest-doc-only-change.txt rename to providers/http/docs/.latest-doc-only-change.txt diff --git a/providers/src/airflow/providers/http/CHANGELOG.rst b/providers/http/docs/changelog.rst similarity index 99% rename from providers/src/airflow/providers/http/CHANGELOG.rst rename to providers/http/docs/changelog.rst index 1ed3f9cafa3ad..1e2d2e6ae0565 100644 --- a/providers/src/airflow/providers/http/CHANGELOG.rst +++ b/providers/http/docs/changelog.rst @@ -277,7 +277,7 @@ Bug Fixes ~~~~~~~~~ * ``Fix json data for async PUTs (#35405)`` -* ``Fix: Paginate on lastest Response (#35560)`` +* ``Fix: Paginate on latest Response (#35560)`` .. Below changes are excluded from the changelog. Move them to appropriate section above if needed. Do not delete the lines(!): diff --git a/docs/apache-airflow-providers-http/commits.rst b/providers/http/docs/commits.rst similarity index 100% rename from docs/apache-airflow-providers-http/commits.rst rename to providers/http/docs/commits.rst diff --git a/docs/apache-airflow-providers-http/connections/http.rst b/providers/http/docs/connections/http.rst similarity index 100% rename from docs/apache-airflow-providers-http/connections/http.rst rename to providers/http/docs/connections/http.rst diff --git a/docs/apache-airflow-providers-http/index.rst b/providers/http/docs/index.rst similarity index 100% rename from docs/apache-airflow-providers-http/index.rst rename to providers/http/docs/index.rst diff --git a/docs/apache-airflow-providers-http/installing-providers-from-sources.rst b/providers/http/docs/installing-providers-from-sources.rst similarity index 100% rename from docs/apache-airflow-providers-http/installing-providers-from-sources.rst rename to providers/http/docs/installing-providers-from-sources.rst diff --git a/docs/integration-logos/http/HTTP.png b/providers/http/docs/integration-logos/HTTP.png similarity index 100% rename from docs/integration-logos/http/HTTP.png rename to providers/http/docs/integration-logos/HTTP.png diff --git a/docs/apache-airflow-providers-http/operators.rst b/providers/http/docs/operators.rst similarity index 90% rename from docs/apache-airflow-providers-http/operators.rst rename to providers/http/docs/operators.rst index 87473dc48086a..f4b566ca8369b 100644 --- a/docs/apache-airflow-providers-http/operators.rst +++ b/providers/http/docs/operators.rst @@ -32,14 +32,14 @@ to ``true``. Here we are poking until httpbin gives us a response text containing ``httpbin``. -.. exampleinclude:: /../../providers/tests/system/http/example_http.py +.. exampleinclude:: /../../providers/http/tests/system/http/example_http.py :language: python :start-after: [START howto_operator_http_http_sensor_check] :end-before: [END howto_operator_http_http_sensor_check] This sensor can also be used in deferrable mode -.. exampleinclude:: /../../providers/tests/system/http/example_http.py +.. exampleinclude:: /../../providers/http/tests/system/http/example_http.py :language: python :start-after: [START howto_operator_http_http_sensor_check_deferrable] :end-before: [END howto_operator_http_http_sensor_check_deferrable] @@ -76,14 +76,14 @@ the response text back. In the first example we are calling a ``POST`` with json data and succeed when we get the same json data back otherwise the task will fail. -.. exampleinclude:: /../../providers/tests/system/http/example_http.py +.. exampleinclude:: /../../providers/http/tests/system/http/example_http.py :language: python :start-after: [START howto_operator_http_task_post_op] :end-before: [END howto_operator_http_task_post_op] Here we are calling a ``GET`` request and pass params to it. The task will succeed regardless of the response text. -.. exampleinclude:: /../../providers/tests/system/http/example_http.py +.. exampleinclude:: /../../providers/http/tests/system/http/example_http.py :language: python :start-after: [START howto_operator_http_task_get_op] :end-before: [END howto_operator_http_task_get_op] @@ -98,7 +98,7 @@ it on the next task downstream use ``response_filter``. This is useful if: Below is an example of retrieving data from a REST API and only returning a nested property instead of the full response body. -.. exampleinclude:: /../../providers/tests/system/http/example_http.py +.. exampleinclude:: /../../providers/http/tests/system/http/example_http.py :language: python :start-after: [START howto_operator_http_task_get_op_response_filter] :end-before: [END howto_operator_http_task_get_op_response_filter] @@ -106,7 +106,7 @@ response body. In the third example we are performing a ``PUT`` operation to put / set data according to the data that is being provided to the request. -.. exampleinclude:: /../../providers/tests/system/http/example_http.py +.. exampleinclude:: /../../providers/http/tests/system/http/example_http.py :language: python :start-after: [START howto_operator_http_task_put_op] :end-before: [END howto_operator_http_task_put_op] @@ -114,14 +114,14 @@ provided to the request. In this example we call a ``DELETE`` operation to the ``delete`` endpoint. This time we are passing form data to the request. -.. exampleinclude:: /../../providers/tests/system/http/example_http.py +.. exampleinclude:: /../../providers/http/tests/system/http/example_http.py :language: python :start-after: [START howto_operator_http_task_del_op] :end-before: [END howto_operator_http_task_del_op] Here we pass form data to a ``POST`` operation which is equal to a usual form submit. -.. exampleinclude:: /../../providers/tests/system/http/example_http.py +.. exampleinclude:: /../../providers/http/tests/system/http/example_http.py :language: python :start-after: [START howto_operator_http_task_post_op_formenc] :end-before: [END howto_operator_http_task_post_op_formenc] @@ -140,7 +140,7 @@ You can write a ``pagination_function`` that will receive the raw ``request.Resp generate new request parameters (as ``dict``) based on this cursor. The HttpOperator will repeat calls to the API until the function stop returning anything. -.. exampleinclude:: /../../providers/tests/system/http/example_http.py +.. exampleinclude:: /../../providers/http/tests/system/http/example_http.py :language: python :start-after: [START howto_operator_http_pagination_function] :end-before: [END howto_operator_http_pagination_function] diff --git a/docs/apache-airflow-providers-http/security.rst b/providers/http/docs/security.rst similarity index 100% rename from docs/apache-airflow-providers-http/security.rst rename to providers/http/docs/security.rst diff --git a/providers/src/airflow/providers/http/provider.yaml b/providers/http/provider.yaml similarity index 84% rename from providers/src/airflow/providers/http/provider.yaml rename to providers/http/provider.yaml index 09ab1113fa4ca..dee0796c04891 100644 --- a/providers/src/airflow/providers/http/provider.yaml +++ b/providers/http/provider.yaml @@ -63,22 +63,12 @@ versions: - 1.1.0 - 1.0.0 -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 - - 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] operators: diff --git a/providers/http/pyproject.toml b/providers/http/pyproject.toml new file mode 100644 index 0000000000000..648119cbe43bb --- /dev/null +++ b/providers/http/pyproject.toml @@ -0,0 +1,84 @@ +# 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. + +# NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE OVERWRITTEN! + +# 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"] +build-backend = "flit_core.buildapi" + +[project] +name = "apache-airflow-providers-http" +version = "5.0.0" +description = "Provider package apache-airflow-providers-http for Apache Airflow" +readme = "README.rst" +authors = [ + {name="Apache Software Foundation", email="dev@airflow.apache.org"}, +] +maintainers = [ + {name="Apache Software Foundation", email="dev@airflow.apache.org"}, +] +keywords = [ "airflow-provider", "http", "airflow", "integration" ] +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Environment :: Console", + "Environment :: Web Environment", + "Intended Audience :: Developers", + "Intended Audience :: System Administrators", + "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" + +# 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", + "asgiref>=2.3.0", +] + +[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" +"Bug Tracker" = "https://github.com/apache/airflow/issues" +"Source Code" = "https://github.com/apache/airflow" +"Slack Chat" = "https://s.apache.org/airflow-slack" +"Twitter" = "https://x.com/ApacheAirflow" +"YouTube" = "https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/" + +[project.entry-points."apache_airflow_provider"] +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/" diff --git a/providers/http/src/airflow/providers/http/LICENSE b/providers/http/src/airflow/providers/http/LICENSE new file mode 100644 index 0000000000000..11069edd79019 --- /dev/null +++ b/providers/http/src/airflow/providers/http/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed 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. diff --git a/providers/src/airflow/providers/http/__init__.py b/providers/http/src/airflow/providers/http/__init__.py similarity index 100% rename from providers/src/airflow/providers/http/__init__.py rename to providers/http/src/airflow/providers/http/__init__.py diff --git a/providers/src/airflow/providers/http/exceptions.py b/providers/http/src/airflow/providers/http/exceptions.py similarity index 100% rename from providers/src/airflow/providers/http/exceptions.py rename to providers/http/src/airflow/providers/http/exceptions.py diff --git a/providers/http/src/airflow/providers/http/get_provider_info.py b/providers/http/src/airflow/providers/http/get_provider_info.py new file mode 100644 index 0000000000000..f0f387c63ec88 --- /dev/null +++ b/providers/http/src/airflow/providers/http/get_provider_info.py @@ -0,0 +1,113 @@ +# 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. + +# 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 + + +def get_provider_info(): + return { + "package-name": "apache-airflow-providers-http", + "name": "Hypertext Transfer Protocol (HTTP)", + "description": "`Hypertext Transfer Protocol (HTTP) `__\n", + "state": "ready", + "source-date-epoch": 1734534857, + "versions": [ + "5.0.0", + "4.13.3", + "4.13.2", + "4.13.1", + "4.13.0", + "4.12.0", + "4.11.1", + "4.11.0", + "4.10.1", + "4.10.0", + "4.9.1", + "4.9.0", + "4.8.0", + "4.7.0", + "4.6.0", + "4.5.2", + "4.5.1", + "4.5.0", + "4.4.2", + "4.4.1", + "4.4.0", + "4.3.0", + "4.2.0", + "4.1.1", + "4.1.0", + "4.0.0", + "3.0.0", + "2.1.2", + "2.1.1", + "2.1.0", + "2.0.3", + "2.0.2", + "2.0.1", + "2.0.0", + "1.1.1", + "1.1.0", + "1.0.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": "/docs/integration-logos/HTTP.png", + "tags": ["protocol"], + } + ], + "operators": [ + { + "integration-name": "Hypertext Transfer Protocol (HTTP)", + "python-modules": ["airflow.providers.http.operators.http"], + } + ], + "sensors": [ + { + "integration-name": "Hypertext Transfer Protocol (HTTP)", + "python-modules": ["airflow.providers.http.sensors.http"], + } + ], + "hooks": [ + { + "integration-name": "Hypertext Transfer Protocol (HTTP)", + "python-modules": ["airflow.providers.http.hooks.http"], + } + ], + "triggers": [ + { + "integration-name": "Hypertext Transfer Protocol (HTTP)", + "python-modules": ["airflow.providers.http.triggers.http"], + } + ], + "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", + ], + } diff --git a/providers/src/airflow/providers/http/hooks/__init__.py b/providers/http/src/airflow/providers/http/hooks/__init__.py similarity index 100% rename from providers/src/airflow/providers/http/hooks/__init__.py rename to providers/http/src/airflow/providers/http/hooks/__init__.py diff --git a/providers/src/airflow/providers/http/hooks/http.py b/providers/http/src/airflow/providers/http/hooks/http.py similarity index 100% rename from providers/src/airflow/providers/http/hooks/http.py rename to providers/http/src/airflow/providers/http/hooks/http.py diff --git a/providers/src/airflow/providers/http/operators/__init__.py b/providers/http/src/airflow/providers/http/operators/__init__.py similarity index 100% rename from providers/src/airflow/providers/http/operators/__init__.py rename to providers/http/src/airflow/providers/http/operators/__init__.py diff --git a/providers/src/airflow/providers/http/operators/http.py b/providers/http/src/airflow/providers/http/operators/http.py similarity index 100% rename from providers/src/airflow/providers/http/operators/http.py rename to providers/http/src/airflow/providers/http/operators/http.py diff --git a/providers/src/airflow/providers/http/sensors/__init__.py b/providers/http/src/airflow/providers/http/sensors/__init__.py similarity index 100% rename from providers/src/airflow/providers/http/sensors/__init__.py rename to providers/http/src/airflow/providers/http/sensors/__init__.py diff --git a/providers/src/airflow/providers/http/sensors/http.py b/providers/http/src/airflow/providers/http/sensors/http.py similarity index 100% rename from providers/src/airflow/providers/http/sensors/http.py rename to providers/http/src/airflow/providers/http/sensors/http.py diff --git a/providers/src/airflow/providers/http/triggers/__init__.py b/providers/http/src/airflow/providers/http/triggers/__init__.py similarity index 100% rename from providers/src/airflow/providers/http/triggers/__init__.py rename to providers/http/src/airflow/providers/http/triggers/__init__.py diff --git a/providers/src/airflow/providers/http/triggers/http.py b/providers/http/src/airflow/providers/http/triggers/http.py similarity index 100% rename from providers/src/airflow/providers/http/triggers/http.py rename to providers/http/src/airflow/providers/http/triggers/http.py diff --git a/providers/http/tests/conftest.py b/providers/http/tests/conftest.py new file mode 100644 index 0000000000000..068fe6bbf5ae9 --- /dev/null +++ b/providers/http/tests/conftest.py @@ -0,0 +1,32 @@ +# 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 + +import pathlib + +import pytest + +pytest_plugins = "tests_common.pytest_plugin" + + +@pytest.hookimpl(tryfirst=True) +def pytest_configure(config: pytest.Config) -> None: + deprecations_ignore_path = pathlib.Path(__file__).parent.joinpath("deprecations_ignore.yml") + dep_path = [deprecations_ignore_path] if deprecations_ignore_path.exists() else [] + config.inicfg["airflow_deprecations_ignore"] = ( + config.inicfg.get("airflow_deprecations_ignore", []) + dep_path # type: ignore[assignment,operator] + ) diff --git a/providers/http/tests/provider_tests/__init__.py b/providers/http/tests/provider_tests/__init__.py new file mode 100644 index 0000000000000..e8fd22856438c --- /dev/null +++ b/providers/http/tests/provider_tests/__init__.py @@ -0,0 +1,17 @@ +# 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. +__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/providers/tests/http/__init__.py b/providers/http/tests/provider_tests/http/__init__.py similarity index 100% rename from providers/tests/http/__init__.py rename to providers/http/tests/provider_tests/http/__init__.py diff --git a/providers/tests/http/hooks/__init__.py b/providers/http/tests/provider_tests/http/hooks/__init__.py similarity index 100% rename from providers/tests/http/hooks/__init__.py rename to providers/http/tests/provider_tests/http/hooks/__init__.py diff --git a/providers/tests/http/hooks/test_http.py b/providers/http/tests/provider_tests/http/hooks/test_http.py similarity index 100% rename from providers/tests/http/hooks/test_http.py rename to providers/http/tests/provider_tests/http/hooks/test_http.py diff --git a/providers/tests/http/operators/__init__.py b/providers/http/tests/provider_tests/http/operators/__init__.py similarity index 100% rename from providers/tests/http/operators/__init__.py rename to providers/http/tests/provider_tests/http/operators/__init__.py diff --git a/providers/tests/http/operators/test_http.py b/providers/http/tests/provider_tests/http/operators/test_http.py similarity index 100% rename from providers/tests/http/operators/test_http.py rename to providers/http/tests/provider_tests/http/operators/test_http.py diff --git a/providers/tests/http/sensors/__init__.py b/providers/http/tests/provider_tests/http/sensors/__init__.py similarity index 100% rename from providers/tests/http/sensors/__init__.py rename to providers/http/tests/provider_tests/http/sensors/__init__.py diff --git a/providers/tests/http/sensors/test_http.py b/providers/http/tests/provider_tests/http/sensors/test_http.py similarity index 100% rename from providers/tests/http/sensors/test_http.py rename to providers/http/tests/provider_tests/http/sensors/test_http.py diff --git a/providers/tests/http/triggers/__init__.py b/providers/http/tests/provider_tests/http/triggers/__init__.py similarity index 100% rename from providers/tests/http/triggers/__init__.py rename to providers/http/tests/provider_tests/http/triggers/__init__.py diff --git a/providers/tests/http/triggers/test_http.py b/providers/http/tests/provider_tests/http/triggers/test_http.py similarity index 100% rename from providers/tests/http/triggers/test_http.py rename to providers/http/tests/provider_tests/http/triggers/test_http.py diff --git a/providers/tests/system/http/__init__.py b/providers/http/tests/system/http/__init__.py similarity index 100% rename from providers/tests/system/http/__init__.py rename to providers/http/tests/system/http/__init__.py diff --git a/providers/tests/system/http/example_http.py b/providers/http/tests/system/http/example_http.py similarity index 100% rename from providers/tests/system/http/example_http.py rename to providers/http/tests/system/http/example_http.py diff --git a/pyproject.toml b/pyproject.toml index a1028c7cfa4d6..340f43d382b9f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -638,6 +638,7 @@ dev = [ "apache-airflow-providers-edge", "apache-airflow-providers-exasol", "apache-airflow-providers-facebook", + "apache-airflow-providers-http", "apache-airflow-providers-openlineage", "apache-airflow-providers-hashicorp", "apache-airflow-providers-imap", @@ -692,6 +693,7 @@ apache-airflow-providers-datadog = { workspace = true } apache-airflow-providers-edge = {workspace = true} apache-airflow-providers-exasol = { workspace = true } apache-airflow-providers-facebook = { workspace = true } +apache-airflow-providers-http = { workspace = true } apache-airflow-providers-openlineage = { workspace = true } apache-airflow-providers-hashicorp = { workspace = true } apache-airflow-providers-imap = { workspace = true } @@ -745,6 +747,7 @@ members = [ "providers/exasol", "providers/facebook", "providers/hashicorp", + "providers/http", "providers/imap", "providers/jenkins", "providers/mysql", diff --git a/scripts/ci/docker-compose/remove-sources.yml b/scripts/ci/docker-compose/remove-sources.yml index 09f3744dcf2db..8ae7897b5cb21 100644 --- a/scripts/ci/docker-compose/remove-sources.yml +++ b/scripts/ci/docker-compose/remove-sources.yml @@ -50,6 +50,7 @@ services: - ../../../empty:/opt/airflow/providers/exasol/src - ../../../empty:/opt/airflow/providers/facebook/src - ../../../empty:/opt/airflow/providers/hashicorp/src + - ../../../empty:/opt/airflow/providers/http/src - ../../../empty:/opt/airflow/providers/imap/src - ../../../empty:/opt/airflow/providers/jenkins/src - ../../../empty:/opt/airflow/providers/mysql/src diff --git a/scripts/ci/docker-compose/tests-sources.yml b/scripts/ci/docker-compose/tests-sources.yml index 38008a1e7a9a9..ea4f0d1617ac0 100644 --- a/scripts/ci/docker-compose/tests-sources.yml +++ b/scripts/ci/docker-compose/tests-sources.yml @@ -57,6 +57,7 @@ services: - ../../../providers/exasol/tests:/opt/airflow/providers/exasol/tests - ../../../providers/facebook/tests:/opt/airflow/providers/facebook/tests - ../../../providers/hashicorp/tests:/opt/airflow/providers/hashicorp/tests + - ../../../providers/http/tests:/opt/airflow/providers/http/tests - ../../../providers/imap/tests:/opt/airflow/providers/imap/tests - ../../../providers/jenkins/tests:/opt/airflow/providers/jenkins/tests - ../../../providers/mysql/tests:/opt/airflow/providers/mysql/tests diff --git a/scripts/in_container/run_generate_constraints.py b/scripts/in_container/run_generate_constraints.py index d5553e7a3e2db..a63a97e4754b1 100755 --- a/scripts/in_container/run_generate_constraints.py +++ b/scripts/in_container/run_generate_constraints.py @@ -20,6 +20,7 @@ import json import os import sys +from contextlib import contextmanager from dataclasses import dataclass from datetime import datetime from functools import cached_property @@ -29,6 +30,7 @@ import requests from click import Choice from in_container_utils import click, console, run_command +from rich.syntax import Syntax AIRFLOW_SOURCE_DIR = Path(__file__).resolve().parents[2] @@ -141,14 +143,14 @@ def get_freeze_command(self) -> list[str]: @cached_property def get_install_command(self) -> list[str]: if self.use_uv: - return ["uv", "pip", "install", "--python", sys.executable] + return ["uv", "pip", "install", "--system"] else: return ["pip", "install"] @cached_property def get_uninstall_command(self) -> list[str]: if self.use_uv: - return ["uv", "pip", "uninstall", "--python", sys.executable] + return ["uv", "pip", "uninstall", "--system"] else: return ["pip", "uninstall"] @@ -334,6 +336,36 @@ def generate_constraints_source_providers(config_params: ConfigParams) -> None: diff_constraints(config_params) +@contextmanager +def remove_providers_from_workspace_for_pyproject_toml(): + pyproject_toml = AIRFLOW_SOURCE_DIR / "pyproject.toml" + old_content = pyproject_toml.read_text() + new_content_lines = [] + console.print( + "[yellow]Removing providers from workspace for pyproject.toml (workaround uv missing " + "--no-workspace feature of uv pip install" + ) + # Temporarily remove providers from workspace - this is needed until + # https://github.com/astral-sh/uv/issues/10991 is resolved in uv + for line in old_content.split("\n"): + if ( + line.strip().startswith("apache-airflow-providers-") + or line.strip().startswith('"apache-airflow-providers-') + or line.strip().startswith('"providers/') + ): + continue + new_content_lines.append(line) + new_content = "\n".join(new_content_lines) + "\n" + pyproject_toml.write_text(new_content) + if os.environ.get("VERBOSE", "false").lower() == "true": + console.print("[bright_blue]New content of pyproject.toml:\n") + console.print(Syntax(new_content, "toml", theme="ansi_dark")) + try: + yield + finally: + pyproject_toml.write_text(old_content) + + def generate_constraints_pypi_providers(config_params: ConfigParams) -> None: """ Generates constraints with provider installed from PyPI. This is the default constraints file @@ -375,29 +407,37 @@ def generate_constraints_pypi_providers(config_params: ConfigParams) -> None: # Skip checking if chicken egg provider is available in PyPI - it does not have to be there continue console.print(f"[bright_blue]Checking if {provider_package} is available in PyPI: ... ", end="") - r = requests.head(f"https://pypi.org/pypi/{provider_package}/json", timeout=60) + r = requests.get(f"https://pypi.org/pypi/{provider_package}/json", timeout=60) if r.status_code == 200: + version = r.json()["info"]["version"] console.print("[green]OK") - packages_to_install.append(provider_package) + # TODO: In the future we might make it a bit more sophisticated and allow to install + # earlier versions of providers here - but for now we just install the latest version + # But in practice latest version does not have to be supported by current version of airflow + # This should be a very rare case though - such provider packages should only be released + # in pre-release mode + packages_to_install.append(f"{provider_package}=={version}") else: console.print("[yellow]NOK. Skipping.") - run_command( - cmd=[ - *config_params.get_install_command, - ".[all-core]", - *packages_to_install, - *config_params.eager_upgrade_additional_requirements_list, - *config_params.get_resolution_highest_args, - ], - github_actions=config_params.github_actions, - check=True, - ) - console.print("[success]Installed airflow with PyPI providers with eager upgrade.") - with config_params.current_constraints_file.open("w") as constraints_file: - constraints_file.write(PYPI_PROVIDERS_CONSTRAINTS_PREFIX) - freeze_packages_to_file(config_params, constraints_file) - download_latest_constraint_file(config_params) - diff_constraints(config_params) + with remove_providers_from_workspace_for_pyproject_toml(): + run_command( + cmd=[ + *config_params.get_install_command, + ".[all-core]", + "--reinstall", # We need to pull the provider packages from PyPI - not use the local ones + *packages_to_install, + *config_params.eager_upgrade_additional_requirements_list, + *config_params.get_resolution_highest_args, + ], + github_actions=config_params.github_actions, + check=True, + ) + console.print("[success]Installed airflow with PyPI providers with eager upgrade.") + with config_params.current_constraints_file.open("w") as constraints_file: + constraints_file.write(PYPI_PROVIDERS_CONSTRAINTS_PREFIX) + freeze_packages_to_file(config_params, constraints_file) + download_latest_constraint_file(config_params) + diff_constraints(config_params) def generate_constraints_no_providers(config_params: ConfigParams) -> None: @@ -405,16 +445,17 @@ def generate_constraints_no_providers(config_params: ConfigParams) -> None: Generates constraints without any provider dependencies. This is used mostly to generate SBOM files - where we generate list of dependencies for Airflow without any provider installed. """ - uninstall_all_packages(config_params) - console.print( - "[bright_blue]Installing airflow with `all-core` extras only with eager upgrade in " - "installable mode." - ) - install_local_airflow_with_eager_upgrade(config_params) - console.print("[success]Installed airflow with [all-core] extras only with eager upgrade.") - with config_params.current_constraints_file.open("w") as constraints_file: - constraints_file.write(NO_PROVIDERS_CONSTRAINTS_PREFIX) - freeze_packages_to_file(config_params, constraints_file) + with remove_providers_from_workspace_for_pyproject_toml(): + uninstall_all_packages(config_params) + console.print( + "[bright_blue]Installing airflow with `all-core` extras only with eager upgrade in " + "installable mode." + ) + install_local_airflow_with_eager_upgrade(config_params) + console.print("[success]Installed airflow with [all-core] extras only with eager upgrade.") + with config_params.current_constraints_file.open("w") as constraints_file: + constraints_file.write(NO_PROVIDERS_CONSTRAINTS_PREFIX) + freeze_packages_to_file(config_params, constraints_file) download_latest_constraint_file(config_params) diff_constraints(config_params)