This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new e2da4c7a0ad Move Edge to new provider structure (#45783)
e2da4c7a0ad is described below
commit e2da4c7a0ad5688f54c0fbcfa8075eff8bbf514e
Author: Jens Scheffler <[email protected]>
AuthorDate: Sun Jan 19 13:29:04 2025 +0100
Move Edge to new provider structure (#45783)
---
.github/boring-cyborg.yml | 4 +-
.../airflow_breeze/commands/testing_commands.py | 12 +-
.../prepare_providers/provider_documentation.py | 6 +-
.../tests/test_pytest_args_for_test_types.py | 15 +-
docs/.gitignore | 1 +
docs/apache-airflow-providers-edge/changelog.rst | 25 --
providers/edge/README.rst | 63 +++++
.../edge/CHANGELOG.rst => edge/docs/changelog.rst} | 2 +-
.../edge/docs}/cli-ref.rst | 0
.../edge/docs}/commits.rst | 0
.../edge/docs}/configurations-ref.rst | 0
.../edge/docs}/edge_executor.rst | 0
.../edge/docs}/index.rst | 0
.../edge/docs}/install_on_windows.rst | 0
.../docs}/installing-providers-from-sources.rst | 0
.../edge/docs}/security.rst | 0
.../{src/airflow/providers => }/edge/provider.yaml | 5 -
providers/edge/pyproject.toml | 76 +++++++
providers/edge/src/airflow/providers/edge/LICENSE | 253 +++++++++++++++++++++
.../src/airflow/providers/edge/__init__.py | 0
.../src/airflow/providers/edge/cli/__init__.py | 0
.../src/airflow/providers/edge/cli/api_client.py | 0
.../src/airflow/providers/edge/cli/edge_command.py | 0
.../providers/edge/example_dags/__init__.py | 0
.../edge/example_dags/integration_test.py | 2 +-
.../providers/edge/example_dags/win_notepad.py | 0
.../providers/edge/example_dags/win_test.py | 0
.../airflow/providers/edge/executors/__init__.py | 0
.../providers/edge/executors/edge_executor.py | 0
.../airflow/providers/edge/get_provider_info.py | 103 +++++++++
.../src/airflow/providers/edge/models/__init__.py | 0
.../src/airflow/providers/edge/models/edge_job.py | 0
.../src/airflow/providers/edge/models/edge_logs.py | 0
.../airflow/providers/edge/models/edge_worker.py | 0
.../src/airflow/providers/edge/openapi/__init__.py | 0
.../providers/edge/openapi/edge_worker_api_v1.yaml | 0
.../src/airflow/providers/edge/plugins/__init__.py | 0
.../providers/edge/plugins/edge_executor_plugin.py | 0
.../edge/plugins/templates/edge_worker_hosts.html | 0
.../edge/plugins/templates/edge_worker_jobs.html | 0
.../src/airflow/providers/edge/version_compat.py | 0
.../airflow/providers/edge/worker_api/__init__.py | 0
.../src/airflow/providers/edge/worker_api/app.py | 0
.../src/airflow/providers/edge/worker_api/auth.py | 0
.../providers/edge/worker_api/datamodels.py | 0
.../providers/edge/worker_api/routes/__init__.py | 0
.../providers/edge/worker_api/routes/_v2_compat.py | 0
.../providers/edge/worker_api/routes/_v2_routes.py | 0
.../providers/edge/worker_api/routes/health.py | 0
.../providers/edge/worker_api/routes/jobs.py | 0
.../providers/edge/worker_api/routes/logs.py | 0
.../providers/edge/worker_api/routes/worker.py | 0
.../routes/health.py => edge/tests/conftest.py} | 18 +-
.../tests/providers}/edge/__init__.py | 0
.../tests/providers}/edge/cli/__init__.py | 0
.../tests/providers}/edge/cli/test_api_client.py | 0
.../tests/providers}/edge/cli/test_edge_command.py | 22 +-
.../tests/providers}/edge/executors/__init__.py | 0
.../edge/executors/test_edge_executor.py | 18 +-
.../tests/providers}/edge/models/__init__.py | 0
.../tests/providers}/edge/plugins/__init__.py | 0
.../edge/plugins/test_edge_executor_plugin.py | 0
.../tests/providers}/edge/worker_api/__init__.py | 0
.../providers}/edge/worker_api/routes/__init__.py | 0
.../edge/worker_api/routes/test_health.py | 0
.../providers}/edge/worker_api/routes/test_logs.py | 0
.../edge/worker_api/routes/test_worker.py | 2 +-
pyproject.toml | 5 +-
68 files changed, 563 insertions(+), 69 deletions(-)
diff --git a/.github/boring-cyborg.yml b/.github/boring-cyborg.yml
index 075147746ef..2f14b5e7977 100644
--- a/.github/boring-cyborg.yml
+++ b/.github/boring-cyborg.yml
@@ -225,9 +225,7 @@ labelPRBasedOnFilePath:
- providers/tests/system/docker/**/*
provider:edge:
- - providers/src/airflow/providers/edge/**/*
- - docs/apache-airflow-providers-edge/**/*
- - providers/tests/edge/**/*
+ - providers/edge/**
provider:elasticsearch:
- providers/src/airflow/providers/elasticsearch/**/*
diff --git a/dev/breeze/src/airflow_breeze/commands/testing_commands.py
b/dev/breeze/src/airflow_breeze/commands/testing_commands.py
index 52a3bc8fbfa..39d2eb024c8 100644
--- a/dev/breeze/src/airflow_breeze/commands/testing_commands.py
+++ b/dev/breeze/src/airflow_breeze/commands/testing_commands.py
@@ -1217,8 +1217,16 @@ def _run_test_command(
perform_environment_checks()
if skip_providers:
ignored_path_list = [
- f"--ignore=providers/tests/{provider_id.replace('.','/')}"
- for provider_id in skip_providers.split(" ")
+ # TODO(potiuk): remove the old ways once we migrate all providers
to the new structure
+ *[
+ f"--ignore=providers/tests/{provider_id.replace('.','/')}"
+ for provider_id in skip_providers.split(" ")
+ ],
+ # New structure
+ *[
+ f"--ignore=providers/{provider_id.replace('.','/')}/tests"
+ for provider_id in skip_providers.split(" ")
+ ],
]
extra_pytest_args = (*extra_pytest_args, *ignored_path_list)
if run_in_parallel:
diff --git
a/dev/breeze/src/airflow_breeze/prepare_providers/provider_documentation.py
b/dev/breeze/src/airflow_breeze/prepare_providers/provider_documentation.py
index 5e024ca4265..7082999c117 100644
--- a/dev/breeze/src/airflow_breeze/prepare_providers/provider_documentation.py
+++ b/dev/breeze/src/airflow_breeze/prepare_providers/provider_documentation.py
@@ -556,7 +556,11 @@ def _update_source_date_epoch_in_provider_yaml(
def _verify_changelog_exists(package: str) -> Path:
provider_details = get_provider_details(package)
- changelog_path = Path(provider_details.root_provider_path) /
"CHANGELOG.rst"
+ changelog_path = (
+ Path(provider_details.root_provider_path) / "docs" / "changelog.rst"
+ if provider_details.is_new_structure
+ else Path(provider_details.root_provider_path) / "CHANGELOG.rst"
+ )
if not os.path.isfile(changelog_path):
get_console().print(f"\n[error]ERROR: Missing {changelog_path}[/]\n")
get_console().print("[info]Please add the file with initial content:")
diff --git a/dev/breeze/tests/test_pytest_args_for_test_types.py
b/dev/breeze/tests/test_pytest_args_for_test_types.py
index 1afadcfc064..13d117ab67d 100644
--- a/dev/breeze/tests/test_pytest_args_for_test_types.py
+++ b/dev/breeze/tests/test_pytest_args_for_test_types.py
@@ -66,7 +66,7 @@ from airflow_breeze.utils.run_tests import
convert_parallel_types_to_folders, co
(
GroupOfTests.PROVIDERS,
"Providers",
- ["providers/airbyte/tests", "providers/tests"],
+ ["providers/airbyte/tests", "providers/edge/tests",
"providers/tests"],
),
(
GroupOfTests.PROVIDERS,
@@ -88,6 +88,7 @@ from airflow_breeze.utils.run_tests import
convert_parallel_types_to_folders, co
"Providers[-amazon,google,microsoft.azure]",
[
"providers/airbyte/tests",
+ "providers/edge/tests",
"providers/tests",
"--ignore=providers/tests/amazon",
"--ignore=providers/amazon",
@@ -105,7 +106,14 @@ from airflow_breeze.utils.run_tests import
convert_parallel_types_to_folders, co
(
GroupOfTests.PROVIDERS,
"All-Quarantined",
- ["providers/airbyte/tests", "providers/tests", "-m",
"quarantined", "--include-quarantined"],
+ [
+ "providers/airbyte/tests",
+ "providers/edge/tests",
+ "providers/tests",
+ "-m",
+ "quarantined",
+ "--include-quarantined",
+ ],
),
(
GroupOfTests.CORE,
@@ -204,6 +212,7 @@ def test_pytest_args_for_missing_provider():
"Providers",
[
"providers/airbyte/tests",
+ "providers/edge/tests",
"providers/tests",
],
),
@@ -227,6 +236,7 @@ def test_pytest_args_for_missing_provider():
"Providers[-amazon,google]",
[
"providers/airbyte/tests",
+ "providers/edge/tests",
"providers/tests",
],
),
@@ -235,6 +245,7 @@ def test_pytest_args_for_missing_provider():
"Providers[-amazon,google] Providers[amazon] Providers[google]",
[
"providers/airbyte/tests",
+ "providers/edge/tests",
"providers/tests",
],
),
diff --git a/docs/.gitignore b/docs/.gitignore
index db54b7da0d2..8d41d702989 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,3 +1,4 @@
# TODO(potiuk): change it to apache-airflow-providers-* after all providers
are migrated to the new structure
# Eventually when we swtich to individually build docs for each provider, we
should remove this altogether
apache-airflow-providers-airbyte
+apache-airflow-providers-edge
diff --git a/docs/apache-airflow-providers-edge/changelog.rst
b/docs/apache-airflow-providers-edge/changelog.rst
deleted file mode 100644
index 46bd53ed4cc..00000000000
--- a/docs/apache-airflow-providers-edge/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/edge/CHANGELOG.rst
diff --git a/providers/edge/README.rst b/providers/edge/README.rst
new file mode 100644
index 00000000000..d088fd11708
--- /dev/null
+++ b/providers/edge/README.rst
@@ -0,0 +1,63 @@
+
+ .. 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-edge``
+
+Release: ``0.10.1pre0``
+
+
+Handle edge workers on remote sites via HTTP(s) connection and orchestrates
work over distributed sites
+
+
+Provider package
+----------------
+
+This is a provider package for ``edge`` provider. All classes for this
provider package
+are in ``airflow.providers.edge`` python package.
+
+You can find package information and changelog for the provider
+in the `documentation
<https://airflow.apache.org/docs/apache-airflow-providers-edge/0.10.1pre0/>`_.
+
+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-edge``
+
+The package supports the following python versions: 3.9,3.10,3.11,3.12
+
+Requirements
+------------
+
+================== ==================
+PIP package Version required
+================== ==================
+``apache-airflow`` ``>=2.10.0``
+``pydantic`` ``>=2.10.2``
+``retryhttp`` ``>=1.2.0``
+================== ==================
+
+The changelog for the provider package can be found in the
+`changelog
<https://airflow.apache.org/docs/apache-airflow-providers-edge/0.10.1pre0/changelog.html>`_.
diff --git a/providers/src/airflow/providers/edge/CHANGELOG.rst
b/providers/edge/docs/changelog.rst
similarity index 98%
rename from providers/src/airflow/providers/edge/CHANGELOG.rst
rename to providers/edge/docs/changelog.rst
index fe403abcfb4..8ef261b4f85 100644
--- a/providers/src/airflow/providers/edge/CHANGELOG.rst
+++ b/providers/edge/docs/changelog.rst
@@ -146,7 +146,7 @@ Misc
Misc
~~~~
-* ``Edge worker supports concurrency slots feature so that jobs which need
more concurrency blocking other jobs beeing executed on the same worker in
parallel.``
+* ``Edge worker supports concurrency slots feature so that jobs which need
more concurrency blocking other jobs being executed on the same worker in
parallel.``
0.6.2pre0
.........
diff --git a/docs/apache-airflow-providers-edge/cli-ref.rst
b/providers/edge/docs/cli-ref.rst
similarity index 100%
rename from docs/apache-airflow-providers-edge/cli-ref.rst
rename to providers/edge/docs/cli-ref.rst
diff --git a/docs/apache-airflow-providers-edge/commits.rst
b/providers/edge/docs/commits.rst
similarity index 100%
rename from docs/apache-airflow-providers-edge/commits.rst
rename to providers/edge/docs/commits.rst
diff --git a/docs/apache-airflow-providers-edge/configurations-ref.rst
b/providers/edge/docs/configurations-ref.rst
similarity index 100%
rename from docs/apache-airflow-providers-edge/configurations-ref.rst
rename to providers/edge/docs/configurations-ref.rst
diff --git a/docs/apache-airflow-providers-edge/edge_executor.rst
b/providers/edge/docs/edge_executor.rst
similarity index 100%
rename from docs/apache-airflow-providers-edge/edge_executor.rst
rename to providers/edge/docs/edge_executor.rst
diff --git a/docs/apache-airflow-providers-edge/index.rst
b/providers/edge/docs/index.rst
similarity index 100%
rename from docs/apache-airflow-providers-edge/index.rst
rename to providers/edge/docs/index.rst
diff --git a/docs/apache-airflow-providers-edge/install_on_windows.rst
b/providers/edge/docs/install_on_windows.rst
similarity index 100%
rename from docs/apache-airflow-providers-edge/install_on_windows.rst
rename to providers/edge/docs/install_on_windows.rst
diff --git
a/docs/apache-airflow-providers-edge/installing-providers-from-sources.rst
b/providers/edge/docs/installing-providers-from-sources.rst
similarity index 100%
rename from
docs/apache-airflow-providers-edge/installing-providers-from-sources.rst
rename to providers/edge/docs/installing-providers-from-sources.rst
diff --git a/docs/apache-airflow-providers-edge/security.rst
b/providers/edge/docs/security.rst
similarity index 100%
rename from docs/apache-airflow-providers-edge/security.rst
rename to providers/edge/docs/security.rst
diff --git a/providers/src/airflow/providers/edge/provider.yaml
b/providers/edge/provider.yaml
similarity index 98%
rename from providers/src/airflow/providers/edge/provider.yaml
rename to providers/edge/provider.yaml
index b161f835348..4b36732e039 100644
--- a/providers/src/airflow/providers/edge/provider.yaml
+++ b/providers/edge/provider.yaml
@@ -27,11 +27,6 @@ source-date-epoch: 1729683247
versions:
- 0.10.1pre0
-dependencies:
- - apache-airflow>=2.10.0
- - pydantic>=2.10.2
- - retryhttp>=1.2.0
-
plugins:
- name: edge_executor
plugin-class:
airflow.providers.edge.plugins.edge_executor_plugin.EdgeExecutorPlugin
diff --git a/providers/edge/pyproject.toml b/providers/edge/pyproject.toml
new file mode 100644
index 00000000000..da11c7e78fb
--- /dev/null
+++ b/providers/edge/pyproject.toml
@@ -0,0 +1,76 @@
+
+# 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
+# `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-edge"
+version = "0.10.1pre0"
+description = "Provider package apache-airflow-providers-edge for Apache
Airflow"
+readme = "README.rst"
+authors = [
+ {name="Apache Software Foundation", email="[email protected]"},
+]
+maintainers = [
+ {name="Apache Software Foundation", email="[email protected]"},
+]
+keywords = [ "airflow-provider", "edge", "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"
+dependencies = [
+ "apache-airflow>=2.10.0",
+ "pydantic>=2.10.2",
+ "retryhttp>=1.2.0",
+]
+
+[project.urls]
+"Documentation" =
"https://airflow.apache.org/docs/apache-airflow-providers-edge/0.10.1pre0";
+"Changelog" =
"https://airflow.apache.org/docs/apache-airflow-providers-edge/0.10.1pre0/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.edge.get_provider_info:get_provider_info"
+[project.entry-points."airflow.plugins"]
+edge_executor =
"airflow.providers.edge.plugins.edge_executor_plugin:EdgeExecutorPlugin"
+
+[tool.flit.module]
+name = "airflow.providers.edge"
diff --git a/providers/edge/src/airflow/providers/edge/LICENSE
b/providers/edge/src/airflow/providers/edge/LICENSE
new file mode 100644
index 00000000000..405dcfe69d7
--- /dev/null
+++ b/providers/edge/src/airflow/providers/edge/LICENSE
@@ -0,0 +1,253 @@
+ 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.
+
+============================================================================
+ 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`
diff --git a/providers/src/airflow/providers/edge/__init__.py
b/providers/edge/src/airflow/providers/edge/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/edge/__init__.py
rename to providers/edge/src/airflow/providers/edge/__init__.py
diff --git a/providers/src/airflow/providers/edge/cli/__init__.py
b/providers/edge/src/airflow/providers/edge/cli/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/edge/cli/__init__.py
rename to providers/edge/src/airflow/providers/edge/cli/__init__.py
diff --git a/providers/src/airflow/providers/edge/cli/api_client.py
b/providers/edge/src/airflow/providers/edge/cli/api_client.py
similarity index 100%
rename from providers/src/airflow/providers/edge/cli/api_client.py
rename to providers/edge/src/airflow/providers/edge/cli/api_client.py
diff --git a/providers/src/airflow/providers/edge/cli/edge_command.py
b/providers/edge/src/airflow/providers/edge/cli/edge_command.py
similarity index 100%
rename from providers/src/airflow/providers/edge/cli/edge_command.py
rename to providers/edge/src/airflow/providers/edge/cli/edge_command.py
diff --git a/providers/src/airflow/providers/edge/example_dags/__init__.py
b/providers/edge/src/airflow/providers/edge/example_dags/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/edge/example_dags/__init__.py
rename to providers/edge/src/airflow/providers/edge/example_dags/__init__.py
diff --git
a/providers/src/airflow/providers/edge/example_dags/integration_test.py
b/providers/edge/src/airflow/providers/edge/example_dags/integration_test.py
similarity index 98%
rename from
providers/src/airflow/providers/edge/example_dags/integration_test.py
rename to
providers/edge/src/airflow/providers/edge/example_dags/integration_test.py
index ba42665ddf7..41816483257 100644
--- a/providers/src/airflow/providers/edge/example_dags/integration_test.py
+++ b/providers/edge/src/airflow/providers/edge/example_dags/integration_test.py
@@ -99,7 +99,7 @@ with DAG(
@task
def variable():
Variable.set("integration_test_key", "value")
- assert Variable.get("integration_test_key") == "value" # noqa: S101
+ assert Variable.get("integration_test_key") == "value"
Variable.delete("integration_test_key")
@task
diff --git a/providers/src/airflow/providers/edge/example_dags/win_notepad.py
b/providers/edge/src/airflow/providers/edge/example_dags/win_notepad.py
similarity index 100%
rename from providers/src/airflow/providers/edge/example_dags/win_notepad.py
rename to providers/edge/src/airflow/providers/edge/example_dags/win_notepad.py
diff --git a/providers/src/airflow/providers/edge/example_dags/win_test.py
b/providers/edge/src/airflow/providers/edge/example_dags/win_test.py
similarity index 100%
rename from providers/src/airflow/providers/edge/example_dags/win_test.py
rename to providers/edge/src/airflow/providers/edge/example_dags/win_test.py
diff --git a/providers/src/airflow/providers/edge/executors/__init__.py
b/providers/edge/src/airflow/providers/edge/executors/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/edge/executors/__init__.py
rename to providers/edge/src/airflow/providers/edge/executors/__init__.py
diff --git a/providers/src/airflow/providers/edge/executors/edge_executor.py
b/providers/edge/src/airflow/providers/edge/executors/edge_executor.py
similarity index 100%
rename from providers/src/airflow/providers/edge/executors/edge_executor.py
rename to providers/edge/src/airflow/providers/edge/executors/edge_executor.py
diff --git a/providers/edge/src/airflow/providers/edge/get_provider_info.py
b/providers/edge/src/airflow/providers/edge/get_provider_info.py
new file mode 100644
index 00000000000..2b17305d4f7
--- /dev/null
+++ b/providers/edge/src/airflow/providers/edge/get_provider_info.py
@@ -0,0 +1,103 @@
+# 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-edge",
+ "name": "Edge Executor",
+ "description": "Handle edge workers on remote sites via HTTP(s)
connection and orchestrates work over distributed sites\n",
+ "state": "not-ready",
+ "source-date-epoch": 1729683247,
+ "versions": ["0.10.1pre0"],
+ "plugins": [
+ {
+ "name": "edge_executor",
+ "plugin-class":
"airflow.providers.edge.plugins.edge_executor_plugin.EdgeExecutorPlugin",
+ }
+ ],
+ "executors": ["airflow.providers.edge.executors.EdgeExecutor"],
+ "config": {
+ "edge": {
+ "description": "This section only applies if you are using the
EdgeExecutor in\n``[core]`` section above\n",
+ "options": {
+ "api_enabled": {
+ "description": "Flag if the plugin endpoint is enabled
to serve Edge Workers.\n",
+ "version_added": None,
+ "type": "boolean",
+ "example": "True",
+ "default": "False",
+ },
+ "api_url": {
+ "description": "URL endpoint on which the Airflow code
edge API is accessible from edge worker.\n",
+ "version_added": None,
+ "type": "string",
+ "example":
"https://airflow.hosting.org/edge_worker/v1/rpcapi";,
+ "default": None,
+ },
+ "job_poll_interval": {
+ "description": "Edge Worker currently polls for new
jobs via HTTP. This parameter defines the number\nof seconds it should sleep
between polls for new jobs.\nJob polling only happens if the Edge Worker seeks
for new work. Not if busy.\n",
+ "version_added": None,
+ "type": "integer",
+ "example": "5",
+ "default": "5",
+ },
+ "heartbeat_interval": {
+ "description": "Edge Worker continuously reports
status to the central site. This parameter defines\nhow often a status with
heartbeat should be sent.\nDuring heartbeat status is reported as well as it is
checked if a running task is to be terminated.\n",
+ "version_added": None,
+ "type": "integer",
+ "example": "10",
+ "default": "30",
+ },
+ "worker_concurrency": {
+ "description": "The concurrency defines the default
max parallel running task instances and can also be set during\nstart of worker
with the ``airflow edge worker`` command parameter. The size of the
workers\nand the resources must support the nature of your tasks. The
parameter\nworks together with the concurrency_slots parameter of a task.\n",
+ "version_added": None,
+ "type": "integer",
+ "example": None,
+ "default": "8",
+ },
+ "job_success_purge": {
+ "description": "Minutes after which successful jobs
for EdgeExecutor are purged from database\n",
+ "version_added": None,
+ "type": "integer",
+ "example": None,
+ "default": "5",
+ },
+ "job_fail_purge": {
+ "description": "Minutes after which failed jobs for
EdgeExecutor are purged from database\n",
+ "version_added": None,
+ "type": "integer",
+ "example": None,
+ "default": "60",
+ },
+ "push_log_chunk_size": {
+ "description": "Edge Worker uploads log files in
chunks. If the log file part which is uploaded\nexceeds the chunk size it
creates a new request. The application gateway can\nlimit the max body size
see:\nhttps://nginx.org/en/docs/http/ngx_http_core_module.html#client_max_body_size\nA
HTTP 413 issue can point to this value to fix the issue.\nThis value must be
defined in Bytes.\n",
+ "version_added": None,
+ "type": "integer",
+ "example": None,
+ "default": "524288",
+ },
+ },
+ }
+ },
+ "dependencies": ["apache-airflow>=2.10.0", "pydantic>=2.10.2",
"retryhttp>=1.2.0"],
+ }
diff --git a/providers/src/airflow/providers/edge/models/__init__.py
b/providers/edge/src/airflow/providers/edge/models/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/edge/models/__init__.py
rename to providers/edge/src/airflow/providers/edge/models/__init__.py
diff --git a/providers/src/airflow/providers/edge/models/edge_job.py
b/providers/edge/src/airflow/providers/edge/models/edge_job.py
similarity index 100%
rename from providers/src/airflow/providers/edge/models/edge_job.py
rename to providers/edge/src/airflow/providers/edge/models/edge_job.py
diff --git a/providers/src/airflow/providers/edge/models/edge_logs.py
b/providers/edge/src/airflow/providers/edge/models/edge_logs.py
similarity index 100%
rename from providers/src/airflow/providers/edge/models/edge_logs.py
rename to providers/edge/src/airflow/providers/edge/models/edge_logs.py
diff --git a/providers/src/airflow/providers/edge/models/edge_worker.py
b/providers/edge/src/airflow/providers/edge/models/edge_worker.py
similarity index 100%
rename from providers/src/airflow/providers/edge/models/edge_worker.py
rename to providers/edge/src/airflow/providers/edge/models/edge_worker.py
diff --git a/providers/src/airflow/providers/edge/openapi/__init__.py
b/providers/edge/src/airflow/providers/edge/openapi/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/edge/openapi/__init__.py
rename to providers/edge/src/airflow/providers/edge/openapi/__init__.py
diff --git
a/providers/src/airflow/providers/edge/openapi/edge_worker_api_v1.yaml
b/providers/edge/src/airflow/providers/edge/openapi/edge_worker_api_v1.yaml
similarity index 100%
rename from providers/src/airflow/providers/edge/openapi/edge_worker_api_v1.yaml
rename to
providers/edge/src/airflow/providers/edge/openapi/edge_worker_api_v1.yaml
diff --git a/providers/src/airflow/providers/edge/plugins/__init__.py
b/providers/edge/src/airflow/providers/edge/plugins/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/edge/plugins/__init__.py
rename to providers/edge/src/airflow/providers/edge/plugins/__init__.py
diff --git
a/providers/src/airflow/providers/edge/plugins/edge_executor_plugin.py
b/providers/edge/src/airflow/providers/edge/plugins/edge_executor_plugin.py
similarity index 100%
rename from providers/src/airflow/providers/edge/plugins/edge_executor_plugin.py
rename to
providers/edge/src/airflow/providers/edge/plugins/edge_executor_plugin.py
diff --git
a/providers/src/airflow/providers/edge/plugins/templates/edge_worker_hosts.html
b/providers/edge/src/airflow/providers/edge/plugins/templates/edge_worker_hosts.html
similarity index 100%
rename from
providers/src/airflow/providers/edge/plugins/templates/edge_worker_hosts.html
rename to
providers/edge/src/airflow/providers/edge/plugins/templates/edge_worker_hosts.html
diff --git
a/providers/src/airflow/providers/edge/plugins/templates/edge_worker_jobs.html
b/providers/edge/src/airflow/providers/edge/plugins/templates/edge_worker_jobs.html
similarity index 100%
rename from
providers/src/airflow/providers/edge/plugins/templates/edge_worker_jobs.html
rename to
providers/edge/src/airflow/providers/edge/plugins/templates/edge_worker_jobs.html
diff --git a/providers/src/airflow/providers/edge/version_compat.py
b/providers/edge/src/airflow/providers/edge/version_compat.py
similarity index 100%
rename from providers/src/airflow/providers/edge/version_compat.py
rename to providers/edge/src/airflow/providers/edge/version_compat.py
diff --git a/providers/src/airflow/providers/edge/worker_api/__init__.py
b/providers/edge/src/airflow/providers/edge/worker_api/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/edge/worker_api/__init__.py
rename to providers/edge/src/airflow/providers/edge/worker_api/__init__.py
diff --git a/providers/src/airflow/providers/edge/worker_api/app.py
b/providers/edge/src/airflow/providers/edge/worker_api/app.py
similarity index 100%
rename from providers/src/airflow/providers/edge/worker_api/app.py
rename to providers/edge/src/airflow/providers/edge/worker_api/app.py
diff --git a/providers/src/airflow/providers/edge/worker_api/auth.py
b/providers/edge/src/airflow/providers/edge/worker_api/auth.py
similarity index 100%
rename from providers/src/airflow/providers/edge/worker_api/auth.py
rename to providers/edge/src/airflow/providers/edge/worker_api/auth.py
diff --git a/providers/src/airflow/providers/edge/worker_api/datamodels.py
b/providers/edge/src/airflow/providers/edge/worker_api/datamodels.py
similarity index 100%
rename from providers/src/airflow/providers/edge/worker_api/datamodels.py
rename to providers/edge/src/airflow/providers/edge/worker_api/datamodels.py
diff --git a/providers/src/airflow/providers/edge/worker_api/routes/__init__.py
b/providers/edge/src/airflow/providers/edge/worker_api/routes/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/edge/worker_api/routes/__init__.py
rename to
providers/edge/src/airflow/providers/edge/worker_api/routes/__init__.py
diff --git
a/providers/src/airflow/providers/edge/worker_api/routes/_v2_compat.py
b/providers/edge/src/airflow/providers/edge/worker_api/routes/_v2_compat.py
similarity index 100%
rename from providers/src/airflow/providers/edge/worker_api/routes/_v2_compat.py
rename to
providers/edge/src/airflow/providers/edge/worker_api/routes/_v2_compat.py
diff --git
a/providers/src/airflow/providers/edge/worker_api/routes/_v2_routes.py
b/providers/edge/src/airflow/providers/edge/worker_api/routes/_v2_routes.py
similarity index 100%
rename from providers/src/airflow/providers/edge/worker_api/routes/_v2_routes.py
rename to
providers/edge/src/airflow/providers/edge/worker_api/routes/_v2_routes.py
diff --git a/providers/src/airflow/providers/edge/worker_api/routes/health.py
b/providers/edge/src/airflow/providers/edge/worker_api/routes/health.py
similarity index 100%
copy from providers/src/airflow/providers/edge/worker_api/routes/health.py
copy to providers/edge/src/airflow/providers/edge/worker_api/routes/health.py
diff --git a/providers/src/airflow/providers/edge/worker_api/routes/jobs.py
b/providers/edge/src/airflow/providers/edge/worker_api/routes/jobs.py
similarity index 100%
rename from providers/src/airflow/providers/edge/worker_api/routes/jobs.py
rename to providers/edge/src/airflow/providers/edge/worker_api/routes/jobs.py
diff --git a/providers/src/airflow/providers/edge/worker_api/routes/logs.py
b/providers/edge/src/airflow/providers/edge/worker_api/routes/logs.py
similarity index 100%
rename from providers/src/airflow/providers/edge/worker_api/routes/logs.py
rename to providers/edge/src/airflow/providers/edge/worker_api/routes/logs.py
diff --git a/providers/src/airflow/providers/edge/worker_api/routes/worker.py
b/providers/edge/src/airflow/providers/edge/worker_api/routes/worker.py
similarity index 100%
rename from providers/src/airflow/providers/edge/worker_api/routes/worker.py
rename to providers/edge/src/airflow/providers/edge/worker_api/routes/worker.py
diff --git a/providers/src/airflow/providers/edge/worker_api/routes/health.py
b/providers/edge/tests/conftest.py
similarity index 61%
rename from providers/src/airflow/providers/edge/worker_api/routes/health.py
rename to providers/edge/tests/conftest.py
index 8de96ca93e6..068fe6bbf5a 100644
--- a/providers/src/airflow/providers/edge/worker_api/routes/health.py
+++ b/providers/edge/tests/conftest.py
@@ -14,15 +14,19 @@
# 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.providers.edge.worker_api.routes._v2_compat import AirflowRouter
+import pathlib
+
+import pytest
-health_router = AirflowRouter(tags=["Health"])
+pytest_plugins = "tests_common.pytest_plugin"
-@health_router.get("/health")
-def health() -> dict[str, str]:
- """Report API Health."""
- return {"status": "healthy"}
[email protected](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/tests/edge/__init__.py
b/providers/edge/tests/providers/edge/__init__.py
similarity index 100%
rename from providers/tests/edge/__init__.py
rename to providers/edge/tests/providers/edge/__init__.py
diff --git a/providers/tests/edge/cli/__init__.py
b/providers/edge/tests/providers/edge/cli/__init__.py
similarity index 100%
rename from providers/tests/edge/cli/__init__.py
rename to providers/edge/tests/providers/edge/cli/__init__.py
diff --git a/providers/tests/edge/cli/test_api_client.py
b/providers/edge/tests/providers/edge/cli/test_api_client.py
similarity index 100%
rename from providers/tests/edge/cli/test_api_client.py
rename to providers/edge/tests/providers/edge/cli/test_api_client.py
diff --git a/providers/tests/edge/cli/test_edge_command.py
b/providers/edge/tests/providers/edge/cli/test_edge_command.py
similarity index 96%
rename from providers/tests/edge/cli/test_edge_command.py
rename to providers/edge/tests/providers/edge/cli/test_edge_command.py
index b1b719444ba..42e6d7ec3e8 100644
--- a/providers/tests/edge/cli/test_edge_command.py
+++ b/providers/edge/tests/providers/edge/cli/test_edge_command.py
@@ -41,19 +41,19 @@ pytest.importorskip("pydantic", minversion="2.0.0")
MOCK_COMMAND = (
{
- "token": "dummy",
+ "token": "mock",
"ti": {
"id": "4d828a62-a417-4936-a7a6-2b3fabacecab",
- "task_id": "dummy",
- "dag_id": "dummy",
- "run_id": "dummy",
+ "task_id": "mock",
+ "dag_id": "mock",
+ "run_id": "mock",
"try_number": 1,
"pool_slots": 1,
"queue": "default",
"priority_weight": 1,
},
- "dag_rel_path": "dummy.py",
- "log_path": "dummy.log",
+ "dag_rel_path": "mock.py",
+ "log_path": "mock.log",
"bundle_info": {"name": "hello", "version": "abc"},
}
if AIRFLOW_V_3_0_PLUS
@@ -112,7 +112,7 @@ class _MockPopen(Popen):
class TestEdgeWorkerCli:
@pytest.fixture
- def dummy_joblist(self, tmp_path: Path) -> list[_Job]:
+ def mock_joblist(self, tmp_path: Path) -> list[_Job]:
logfile = tmp_path / "file.log"
logfile.touch()
@@ -134,9 +134,9 @@ class TestEdgeWorkerCli:
]
@pytest.fixture
- def worker_with_job(self, tmp_path: Path, dummy_joblist: list[_Job]) ->
_EdgeWorkerCli:
- test_worker = _EdgeWorkerCli(str(tmp_path / "dummy.pid"), "dummy",
None, 8, 5, 5)
- test_worker.jobs = dummy_joblist
+ def worker_with_job(self, tmp_path: Path, mock_joblist: list[_Job]) ->
_EdgeWorkerCli:
+ test_worker = _EdgeWorkerCli(str(tmp_path / "mock.pid"), "mock", None,
8, 5, 5)
+ test_worker.jobs = mock_joblist
return test_worker
@patch("airflow.providers.edge.cli.edge_command.Process")
@@ -198,7 +198,7 @@ class TestEdgeWorkerCli:
):
logfile_path_call_count, set_state_call_count = expected_calls
mock_reserve_task.side_effect = [reserve_result]
- mock_popen.side_effect = ["dummy"]
+ mock_popen.side_effect = ["mock"]
with conf_vars({("edge", "api_url"):
"https://invalid-api-test-endpoint"}):
got_job = worker_with_job.fetch_job()
mock_reserve_task.assert_called_once()
diff --git a/providers/tests/edge/executors/__init__.py
b/providers/edge/tests/providers/edge/executors/__init__.py
similarity index 100%
rename from providers/tests/edge/executors/__init__.py
rename to providers/edge/tests/providers/edge/executors/__init__.py
diff --git a/providers/tests/edge/executors/test_edge_executor.py
b/providers/edge/tests/providers/edge/executors/test_edge_executor.py
similarity index 97%
rename from providers/tests/edge/executors/test_edge_executor.py
rename to providers/edge/tests/providers/edge/executors/test_edge_executor.py
index 3a5e6b18d69..6b34f3a3650 100644
--- a/providers/tests/edge/executors/test_edge_executor.py
+++ b/providers/edge/tests/providers/edge/executors/test_edge_executor.py
@@ -107,7 +107,7 @@ class TestEdgeExecutor:
try_number=1,
state=state,
queue="default",
- command="dummy",
+ command="mock",
concurrency_slots=1,
last_update=last_update,
)
@@ -153,7 +153,7 @@ class TestEdgeExecutor:
state=state,
queue="default",
concurrency_slots=1,
- command="dummy",
+ command="mock",
last_update=last_update,
)
)
@@ -195,7 +195,7 @@ class TestEdgeExecutor:
state=state,
concurrency_slots=1,
queue="default",
- command="dummy",
+ command="mock",
last_update=timezone.utcnow(),
)
)
@@ -290,19 +290,19 @@ class TestEdgeExecutor:
executor.queue_workload(command=["airflow", "tasks", "run",
"hello", "world"])
workload = ExecuteTask(
- token="dummy",
+ token="mock",
ti=TaskInstance(
id="4d828a62-a417-4936-a7a6-2b3fabacecab",
- task_id="dummy",
- dag_id="dummy",
- run_id="dummy",
+ task_id="mock",
+ dag_id="mock",
+ run_id="mock",
try_number=1,
pool_slots=1,
queue="default",
priority_weight=1,
),
- dag_rel_path="dummy.py",
- log_path="dummy.log",
+ dag_rel_path="mock.py",
+ log_path="mock.log",
bundle_info={"name": "n/a", "version": "no matter"},
)
executor.queue_workload(workload=workload)
diff --git a/providers/tests/edge/models/__init__.py
b/providers/edge/tests/providers/edge/models/__init__.py
similarity index 100%
rename from providers/tests/edge/models/__init__.py
rename to providers/edge/tests/providers/edge/models/__init__.py
diff --git a/providers/tests/edge/plugins/__init__.py
b/providers/edge/tests/providers/edge/plugins/__init__.py
similarity index 100%
rename from providers/tests/edge/plugins/__init__.py
rename to providers/edge/tests/providers/edge/plugins/__init__.py
diff --git a/providers/tests/edge/plugins/test_edge_executor_plugin.py
b/providers/edge/tests/providers/edge/plugins/test_edge_executor_plugin.py
similarity index 100%
rename from providers/tests/edge/plugins/test_edge_executor_plugin.py
rename to
providers/edge/tests/providers/edge/plugins/test_edge_executor_plugin.py
diff --git a/providers/tests/edge/worker_api/__init__.py
b/providers/edge/tests/providers/edge/worker_api/__init__.py
similarity index 100%
rename from providers/tests/edge/worker_api/__init__.py
rename to providers/edge/tests/providers/edge/worker_api/__init__.py
diff --git a/providers/tests/edge/worker_api/routes/__init__.py
b/providers/edge/tests/providers/edge/worker_api/routes/__init__.py
similarity index 100%
rename from providers/tests/edge/worker_api/routes/__init__.py
rename to providers/edge/tests/providers/edge/worker_api/routes/__init__.py
diff --git a/providers/tests/edge/worker_api/routes/test_health.py
b/providers/edge/tests/providers/edge/worker_api/routes/test_health.py
similarity index 100%
rename from providers/tests/edge/worker_api/routes/test_health.py
rename to providers/edge/tests/providers/edge/worker_api/routes/test_health.py
diff --git a/providers/tests/edge/worker_api/routes/test_logs.py
b/providers/edge/tests/providers/edge/worker_api/routes/test_logs.py
similarity index 100%
rename from providers/tests/edge/worker_api/routes/test_logs.py
rename to providers/edge/tests/providers/edge/worker_api/routes/test_logs.py
diff --git a/providers/tests/edge/worker_api/routes/test_worker.py
b/providers/edge/tests/providers/edge/worker_api/routes/test_worker.py
similarity index 98%
rename from providers/tests/edge/worker_api/routes/test_worker.py
rename to providers/edge/tests/providers/edge/worker_api/routes/test_worker.py
index e05a94c5f87..e9442c4c038 100644
--- a/providers/tests/edge/worker_api/routes/test_worker.py
+++ b/providers/edge/tests/providers/edge/worker_api/routes/test_worker.py
@@ -42,7 +42,7 @@ pytestmark = pytest.mark.db_test
class TestWorkerApiRoutes:
@pytest.fixture
def cli_worker(self, tmp_path: Path) -> _EdgeWorkerCli:
- test_worker = _EdgeWorkerCli(str(tmp_path / "dummy.pid"), "dummy",
None, 8, 5, 5)
+ test_worker = _EdgeWorkerCli(str(tmp_path / "mock.pid"), "mock", None,
8, 5, 5)
return test_worker
@pytest.fixture(autouse=True)
diff --git a/pyproject.toml b/pyproject.toml
index c67587ec9ab..b0cb0793afe 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -566,6 +566,7 @@ mypy_path = [
"$MYPY_CONFIG_FILE_DIR/providers/src",
"$MYPY_CONFIG_FILE_DIR/task_sdk/src",
"$MYPY_CONFIG_FILE_DIR/providers/airbyte/src",
+ "$MYPY_CONFIG_FILE_DIR/providers/edge/src",
]
[[tool.mypy.overrides]]
@@ -605,6 +606,7 @@ dev = [
"local-providers",
"apache-airflow-task-sdk",
"apache-airflow-providers-airbyte",
+ "apache-airflow-providers-edge",
]
[tool.uv.sources]
@@ -613,6 +615,7 @@ dev = [
local-providers = { workspace = true }
apache-airflow-task-sdk = { workspace = true }
apache-airflow-providers-airbyte = {workspace = true}
+apache-airflow-providers-edge = {workspace = true}
[tool.uv.workspace]
-members = ["providers", "task_sdk", "providers/airbyte" ]
+members = ["providers", "task_sdk", "providers/airbyte", "providers/edge" ]
