apache-airflow-providers-edge3 1.1.3rc1__tar.gz → 1.2.0rc1__tar.gz

{apache_airflow_providers_edge3-1.1.3rc1 → apache_airflow_providers_edge3-1.2.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-edge3
-Version: 1.1.3rc1
+Version: 1.2.0rc1
 Summary: Provider package apache-airflow-providers-edge3 for Apache Airflow
 Keywords: airflow-provider,edge3,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
@@ -24,8 +24,8 @@ Requires-Dist: apache-airflow>=2.10.0rc1
 Requires-Dist: pydantic>=2.11.0
 Requires-Dist: retryhttp>=1.2.0,!=1.3.0
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.staged.apache.org/docs/apache-airflow-providers-edge3/1.1.3/changelog.html
-Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-edge3/1.1.3
+Project-URL: Changelog, https://airflow.staged.apache.org/docs/apache-airflow-providers-edge3/1.2.0/changelog.html
+Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-edge3/1.2.0
 Project-URL: Mastodon, https://fosstodon.org/@airflow
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
@@ -56,9 +56,8 @@ Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
 
 Package ``apache-airflow-providers-edge3``
 
-Release: ``1.1.3``
+Release: ``1.2.0``
 
-Release Date: ``|PypiReleaseDate|``
 
 Handle edge workers on remote sites via HTTP(s) connection and orchestrates work over distributed sites.
 
@@ -82,12 +81,12 @@ This is a provider package for ``edge3`` provider. All classes for this provider
 are in ``airflow.providers.edge3`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-edge3/1.1.3/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-edge3/1.2.0/>`_.
 
 Installation
 ------------
 
-You can install this package on top of an existing Airflow 2 installation (see ``Requirements`` below
+You can install this package on top of an existing Airflow installation (see ``Requirements`` below
 for the minimum Airflow version supported) via
 ``pip install apache-airflow-providers-edge3``
 
@@ -105,5 +104,5 @@ PIP package         Version required
 ==================  ===================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-edge3/1.1.3/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-edge3/1.2.0/changelog.html>`_.
 

{apache_airflow_providers_edge3-1.1.3rc1 → apache_airflow_providers_edge3-1.2.0rc1}/README.rst

@@ -23,9 +23,8 @@
 
 Package ``apache-airflow-providers-edge3``
 
-Release: ``1.1.3``
+Release: ``1.2.0``
 
-Release Date: ``|PypiReleaseDate|``
 
 Handle edge workers on remote sites via HTTP(s) connection and orchestrates work over distributed sites.
 
@@ -49,12 +48,12 @@ This is a provider package for ``edge3`` provider. All classes for this provider
 are in ``airflow.providers.edge3`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-edge3/1.1.3/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-edge3/1.2.0/>`_.
 
 Installation
 ------------
 
-You can install this package on top of an existing Airflow 2 installation (see ``Requirements`` below
+You can install this package on top of an existing Airflow installation (see ``Requirements`` below
 for the minimum Airflow version supported) via
 ``pip install apache-airflow-providers-edge3``
 
@@ -72,4 +71,4 @@ PIP package         Version required
 ==================  ===================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-edge3/1.1.3/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-edge3/1.2.0/changelog.html>`_.

{apache_airflow_providers_edge3-1.1.3rc1 → apache_airflow_providers_edge3-1.2.0rc1}/docs/architecture.rst

@@ -37,7 +37,7 @@ deployed outside of the central Airflow cluster is connected via HTTP(s) to the
             scheduler[label="Scheduler"]
             api[label="API server"]
             database[label="Database"]
-            dag[label="DAG files"]
+            dag[label="Dag files"]
 
             api->workers
             api->database
@@ -52,7 +52,7 @@ deployed outside of the central Airflow cluster is connected via HTTP(s) to the
             label="Edge site";
             {rank = same; edge_worker; edge_dag}
             edge_worker[label="Edge Worker"]
-            edge_dag[label="DAG files (Remote copy)"]
+            edge_dag[label="Dag files (Remote copy)"]
 
             edge_worker->edge_dag
         }
@@ -63,7 +63,7 @@ deployed outside of the central Airflow cluster is connected via HTTP(s) to the
 * **Workers** - Execute the assigned tasks - most standard setup has local or centralized workers, e.g. via Celery
 * **Edge Workers** - Special workers which pull tasks via HTTP(s) as provided as feature via this provider package
 * **Scheduler** - Responsible for adding the necessary tasks to the queue. The EdgeExecutor is running as a module inside the scheduler.
-* **API server** - HTTP REST API Server provides access to DAG/task status information. The required end-points are
+* **API server** - HTTP REST API Server provides access to Dag/task status information. The required end-points are
   provided by the Edge provider plugin. The Edge Worker uses this API to pull tasks and send back the results.
 * **Database** - Contains information about the status of tasks, Dags, Variables, connections, etc.
 

{apache_airflow_providers_edge3-1.1.3rc1 → apache_airflow_providers_edge3-1.2.0rc1}/docs/changelog.rst

@@ -27,6 +27,36 @@
 Changelog
 ---------
 
+1.2.0
+.....
+
+Release Date: ``|PypiReleaseDate|``
+
+Features
+~~~~~~~~
+
+* ``Provide React UI for Edge (#53563)``
+* ``Feature/add auto refresh to edge react UI (#54994)``
+* ``Feature/add state badge to edge react UI (#54993)``
+
+Bug Fixes
+~~~~~~~~~
+
+* ``Fix setproctitle usage on macos (#53122)``
+
+Doc-only
+~~~~~~~~
+
+* ``Make term Dag consistent in providers docs (#55101)``
+* ``Add a note to edgeexecutor doc regarding multiple executors (#54077)``
+* ``Fix Airflow 2 reference in README/index of providers (#55240)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+   * ``Remove airflow.models.DAG (#54383)``
+   * ``Move trigger_rule utils from 'airflow/utils'  to 'airflow.task'and integrate with Execution API spec (#53389)``
+   * ``Switch pre-commit to prek (#54258)``
+
 1.1.3
 .....
 

{apache_airflow_providers_edge3-1.1.3rc1 → apache_airflow_providers_edge3-1.2.0rc1}/docs/edge_executor.rst

@@ -50,6 +50,11 @@ could take thousands of tasks without a problem), or from an environment
 perspective (you want a worker running from a specific location where required
 infrastructure is available).
 
+When using EdgeExecutor in addition to other executors and EdgeExecutor not being the default executor
+(that is to say the first one in the list of executors), be reminded to also define EdgeExecutor
+as the executor at task or Dag level in addition to the queues you are targeting.
+For more details on multiple executors please see :ref:`apache-airflow:using-multiple-executors-concurrently`.
+
 .. _edge_executor:concurrency_slots:
 
 Concurrency slot handling
@@ -75,12 +80,12 @@ Here is an example setting pool_slots for a task:
 
     import pendulum
 
-    from airflow import DAG
+    from airflow import Dag
     from airflow.decorators import task
     from airflow.example_dags.libs.helper import print_stuff
     from airflow.settings import AIRFLOW_HOME
 
-    with DAG(
+    with Dag(
         dag_id="example_edge_pool_slots",
         schedule=None,
         start_date=pendulum.datetime(2021, 1, 1, tz="UTC"),

{apache_airflow_providers_edge3-1.1.3rc1 → apache_airflow_providers_edge3-1.2.0rc1}/docs/index.rst

@@ -57,7 +57,7 @@
     :maxdepth: 1
     :caption: Resources
 
-    Example DAGs <_api/airflow/providers/edge3/example_dags/index>
+    Example Dags <_api/airflow/providers/edge3/example_dags/index>
     PyPI Repository <https://pypi.org/project/apache-airflow-providers-edge3/>
     Installing from sources <installing-providers-from-sources>
 
@@ -90,9 +90,7 @@ Additional REST API endpoints are provided to distribute tasks and manage the ed
 are provided by the API server.
 
 
-Release: 1.1.3
-
-Release Date: ``|PypiReleaseDate|``
+Release: 1.2.0
 
 Provider package
 ----------------
@@ -103,7 +101,7 @@ All classes for this package are included in the ``airflow.providers.edge3`` pyt
 Installation
 ------------
 
-You can install this package on top of an existing Airflow 2 installation via
+You can install this package on top of an existing Airflow installation via
 ``pip install apache-airflow-providers-edge3``.
 For the minimum Airflow version supported, see ``Requirements`` below.
 

{apache_airflow_providers_edge3-1.1.3rc1 → apache_airflow_providers_edge3-1.2.0rc1}/docs/install_on_windows.rst

@@ -35,8 +35,8 @@ To setup a instance of Edge Worker on Windows, you need to follow the steps belo
 4. Activate the virtual environment via: ``venv\Scripts\activate.bat``
 5. Install Edge provider using the Airflow constraints as of your Airflow version via
    ``pip install apache-airflow-providers-edge3 --constraint https://raw.githubusercontent.com/apache/airflow/constraints-2.10.5/constraints-3.12.txt``.
-6. Create a new folder ``dags`` in ``C:\Airflow`` and copy the relevant DAG files in it.
-   (At least the DAG files which should be executed on the edge alongside the dependencies.)
+6. Create a new folder ``dags`` in ``C:\Airflow`` and copy the relevant Dag files in it.
+   (At least the Dag files which should be executed on the edge alongside the dependencies.)
 7. Collect needed parameters from your running Airflow backend, at least the following:
 
   - ``api_auth`` / ``jwt_token``: The shared secret key between the api-server and the Edge Worker
@@ -65,7 +65,7 @@ To setup a instance of Edge Worker on Windows, you need to follow the steps belo
     @REM Add if needed: set https_proxy=http://my-company-proxy.com:3128
     airflow edge worker --concurrency 4 --queues windows
 
-9. Note on logs: Per default the DAG Run ID is used as path in the log structure and per default the date and time
+9. Note on logs: Per default the Dag Run ID is used as path in the log structure and per default the date and time
    is contained in the Run ID. Windows fails with a colon (":") in a file or folder name and this also
    the Edge Worker fails.
    Therefore you might consider changing the config ``AIRFLOW__LOGGING__LOG_FILENAME_TEMPLATE`` to avoid the colon.
@@ -73,7 +73,7 @@ To setup a instance of Edge Worker on Windows, you need to follow the steps belo
    Note that the log filename template is resolved on server side and not on the worker side. So you need to make
    this as a global change.
    Alternatively for testing purposes only you must use Run IDs without a colon, e.g. set the Run ID manually when
-   starting a DAG run.
+   starting a Dag run.
 10. Start the worker via: ``start_worker.bat``
     Watch the console for errors.
-11. Run a DAG as test and see if the result is as expected.
+11. Run a Dag as test and see if the result is as expected.

{apache_airflow_providers_edge3-1.1.3rc1 → apache_airflow_providers_edge3-1.2.0rc1}/docs/ui_plugin.rst

@@ -30,13 +30,13 @@ REST API endpoints
 
 The Edge provider adds the following REST API endpoints to the Airflow API:
 
-- ``/api/v1/edge/health``: Check that the API endpoint is deployed and active
-- ``/api/v1/edge/jobs``: Endpoints to fetch jobs for workers and report state
-- ``/api/v1/edge/logs``: Endpoint to push log chunks from workers to the Airflow cluster
-- ``/api/v1/edge/workers``: Endpoints to register and manage workers, report heartbeat
+- ``/edge_worker/v1/jobs``: Endpoints to fetch jobs for workers and report state
+- ``/edge_worker/v1/logs``: Endpoint to push log chunks from workers to the Airflow cluster
+- ``/edge_worker/v1/workers``: Endpoints to register and manage workers, report heartbeat
+- ``/edge_worker/v1/health``: Check that the API endpoint is deployed and active
 
 To see full documentation of the API endpoints open the Airflow web UI and navigate to
-the sub-path ``/edge_worker/v1/docs`` (Airflow 3.0) or ``/edge_worker/v1/ui`` (Airflow 2.10).
+the sub-path ``/edge_worker/docs`` (Airflow 3.0) or ``/edge_worker/v1/ui`` (Airflow 2.10).
 
 Web UI Plugin (Airflow 2.10 only)
 ---------------------------------

{apache_airflow_providers_edge3-1.1.3rc1 → apache_airflow_providers_edge3-1.2.0rc1}/provider.yaml

@@ -33,13 +33,14 @@ description: |
   are provided by the API server.
 
 state: ready
-source-date-epoch: 1754503142
+source-date-epoch: 1756876811
 
 # Note that those versions are maintained by release manager - do not update them manually
 # with the exception of case where other provider in sources has >= new provider version.
 # In such case adding >= NEW_VERSION and bumping to NEW_VERSION in a provider have
 # to be done in the same PR
 versions:
+  - 1.2.0
   - 1.1.3
   - 1.1.2
   - 1.1.1

{apache_airflow_providers_edge3-1.1.3rc1 → apache_airflow_providers_edge3-1.2.0rc1}/pyproject.toml

@@ -25,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-edge3"
-version = "1.1.3rc1"
+version = "1.2.0rc1"
 description = "Provider package apache-airflow-providers-edge3 for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -54,7 +54,7 @@ requires-python = ">=3.10"
 
 # The dependencies should be modified in place in the generated file.
 # Any change in the dependencies is preserved when the file is regenerated
-# Make sure to run ``breeze static-checks --type update-providers-dependencies --all-files``
+# Make sure to run ``prek update-providers-dependencies --all-files``
 # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build``
 dependencies = [
     "apache-airflow>=2.10.0rc1",
@@ -96,8 +96,8 @@ apache-airflow-providers-common-sql = {workspace = true}
 apache-airflow-providers-standard = {workspace = true}
 
 [project.urls]
-"Documentation" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-edge3/1.1.3"
-"Changelog" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-edge3/1.1.3/changelog.html"
+"Documentation" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-edge3/1.2.0"
+"Changelog" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-edge3/1.2.0/changelog.html"
 "Bug Tracker" = "https://github.com/apache/airflow/issues"
 "Source Code" = "https://github.com/apache/airflow"
 "Slack Chat" = "https://s.apache.org/airflow-slack"

{apache_airflow_providers_edge3-1.1.3rc1 → apache_airflow_providers_edge3-1.2.0rc1}/src/airflow/providers/edge3/__init__.py

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

{apache_airflow_providers_edge3-1.1.3rc1 → apache_airflow_providers_edge3-1.2.0rc1}/src/airflow/providers/edge3/cli/worker.py

@@ -19,6 +19,7 @@ from __future__ import annotations
 import logging
 import os
 import signal
+import sys
 from datetime import datetime
 from http import HTTPStatus
 from multiprocessing import Process
@@ -60,6 +61,11 @@ if TYPE_CHECKING:
 
 logger = logging.getLogger(__name__)
 
+if sys.platform == "darwin":
+    setproctitle = lambda title: logger.debug("Mac OS detected, skipping setproctitle")
+else:
+    from setproctitle import setproctitle
+
 
 def _edge_hostname() -> str:
     """Get the hostname of the edge worker that should be reported by tasks."""
@@ -176,8 +182,6 @@ class EdgeWorker:
         def _run_job_via_supervisor(
             workload: ExecuteTask,
         ) -> int:
-            from setproctitle import setproctitle
-
             from airflow.sdk.execution_time.supervisor import supervise
 
             # Ignore ctrl-c in this process -- we don't want to kill _this_ one. we let tasks run to completion

{apache_airflow_providers_edge3-1.1.3rc1 → apache_airflow_providers_edge3-1.2.0rc1}/src/airflow/providers/edge3/example_dags/integration_test.py

@@ -32,7 +32,11 @@ try:
     from airflow.sdk import BaseHook
 except ImportError:
     from airflow.hooks.base import BaseHook  # type: ignore[attr-defined,no-redef]
-from airflow.utils.trigger_rule import TriggerRule
+try:
+    from airflow.sdk import TriggerRule
+except ImportError:
+    # Compatibility for Airflow < 3.1
+    from airflow.utils.trigger_rule import TriggerRule  # type: ignore[no-redef,attr-defined]
 
 try:
     from airflow.providers.standard.operators.bash import BashOperator
@@ -42,7 +46,7 @@ try:
 except ImportError:
     # Airflow 2.10 compat
     from airflow.decorators import task, task_group  # type: ignore[attr-defined,no-redef]
-    from airflow.models.dag import DAG  # type: ignore[assignment]
+    from airflow.models.dag import DAG  # type: ignore[no-redef]
     from airflow.models.param import Param  # type: ignore[no-redef]
     from airflow.models.variable import Variable
     from airflow.operators.bash import BashOperator  # type: ignore[no-redef]

{apache_airflow_providers_edge3-1.1.3rc1 → apache_airflow_providers_edge3-1.2.0rc1}/src/airflow/providers/edge3/example_dags/win_test.py

@@ -48,8 +48,13 @@ try:
 except ImportError:
     from airflow.hooks.base import BaseHook  # type: ignore[attr-defined,no-redef]
 from airflow.sdk import Param
+
+try:
+    from airflow.sdk import TriggerRule
+except ImportError:
+    # Compatibility for Airflow < 3.1
+    from airflow.utils.trigger_rule import TriggerRule  # type: ignore[no-redef,attr-defined]
 from airflow.sdk.execution_time.context import context_to_airflow_vars
-from airflow.utils.trigger_rule import TriggerRule
 from airflow.utils.types import ArgNotSet
 
 if TYPE_CHECKING: