apache-airflow-providers-edge3 1.1.1rc1__tar.gz → 1.1.2__tar.gz

{apache_airflow_providers_edge3-1.1.1rc1 → apache_airflow_providers_edge3-1.1.2}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-edge3
-Version: 1.1.1rc1
+Version: 1.1.2
 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>
 Maintainer-email: Apache Software Foundation <dev@airflow.apache.org>
-Requires-Python: ~=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -15,18 +15,17 @@ Classifier: Intended Audience :: System Administrators
 Classifier: Framework :: Apache Airflow
 Classifier: Framework :: Apache Airflow :: Provider
 Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: System :: Monitoring
-Requires-Dist: apache-airflow>=2.10.0rc1
-Requires-Dist: apache-airflow-providers-fab>=1.5.3rc1
+Requires-Dist: apache-airflow>=2.10.0
 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.1/changelog.html
-Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-edge3/1.1.1
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-edge3/1.1.2/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-edge3/1.1.2
 Project-URL: Mastodon, https://fosstodon.org/@airflow
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
@@ -57,8 +56,9 @@ Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
 
 Package ``apache-airflow-providers-edge3``
 
-Release: ``1.1.1``
+Release: ``1.1.2``
 
+Release Date: ``|PypiReleaseDate|``
 
 Handle edge workers on remote sites via HTTP(s) connection and orchestrates work over distributed sites.
 
@@ -82,7 +82,7 @@ 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.1/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-edge3/1.1.2/>`_.
 
 Installation
 ------------
@@ -91,39 +91,19 @@ You can install this package on top of an existing Airflow 2 installation (see `
 for the minimum Airflow version supported) via
 ``pip install apache-airflow-providers-edge3``
 
-The package supports the following python versions: 3.9,3.10,3.11,3.12
+The package supports the following python versions: 3.10,3.11,3.12,3.13
 
 Requirements
 ------------
 
-================================  ===================
-PIP package                       Version required
-================================  ===================
-``apache-airflow``                ``>=2.10.0``
-``apache-airflow-providers-fab``  ``>=1.5.3``
-``pydantic``                      ``>=2.11.0``
-``retryhttp``                     ``>=1.2.0,!=1.3.0``
-================================  ===================
-
-Cross provider package dependencies
------------------------------------
-
-Those are dependencies that might be needed in order to use all the features of the package.
-You need to install the specified providers in order to use them.
-
-You can install such cross-provider dependencies when installing from PyPI. For example:
-
-.. code-block:: bash
-
-    pip install apache-airflow-providers-edge3[fab]
-
-
-==============================================================================================  =======
-Dependent package                                                                               Extra
-==============================================================================================  =======
-`apache-airflow-providers-fab <https://airflow.apache.org/docs/apache-airflow-providers-fab>`_  ``fab``
-==============================================================================================  =======
+==================  ===================
+PIP package         Version required
+==================  ===================
+``apache-airflow``  ``>=2.10.0``
+``pydantic``        ``>=2.11.0``
+``retryhttp``       ``>=1.2.0,!=1.3.0``
+==================  ===================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-edge3/1.1.1/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-edge3/1.1.2/changelog.html>`_.
 

{apache_airflow_providers_edge3-1.1.1rc1 → apache_airflow_providers_edge3-1.1.2}/README.rst

@@ -23,8 +23,9 @@
 
 Package ``apache-airflow-providers-edge3``
 
-Release: ``1.1.1``
+Release: ``1.1.2``
 
+Release Date: ``|PypiReleaseDate|``
 
 Handle edge workers on remote sites via HTTP(s) connection and orchestrates work over distributed sites.
 
@@ -48,7 +49,7 @@ 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.1/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-edge3/1.1.2/>`_.
 
 Installation
 ------------
@@ -57,38 +58,18 @@ You can install this package on top of an existing Airflow 2 installation (see `
 for the minimum Airflow version supported) via
 ``pip install apache-airflow-providers-edge3``
 
-The package supports the following python versions: 3.9,3.10,3.11,3.12
+The package supports the following python versions: 3.10,3.11,3.12,3.13
 
 Requirements
 ------------
 
-================================  ===================
-PIP package                       Version required
-================================  ===================
-``apache-airflow``                ``>=2.10.0``
-``apache-airflow-providers-fab``  ``>=1.5.3``
-``pydantic``                      ``>=2.11.0``
-``retryhttp``                     ``>=1.2.0,!=1.3.0``
-================================  ===================
-
-Cross provider package dependencies
------------------------------------
-
-Those are dependencies that might be needed in order to use all the features of the package.
-You need to install the specified providers in order to use them.
-
-You can install such cross-provider dependencies when installing from PyPI. For example:
-
-.. code-block:: bash
-
-    pip install apache-airflow-providers-edge3[fab]
-
-
-==============================================================================================  =======
-Dependent package                                                                               Extra
-==============================================================================================  =======
-`apache-airflow-providers-fab <https://airflow.apache.org/docs/apache-airflow-providers-fab>`_  ``fab``
-==============================================================================================  =======
+==================  ===================
+PIP package         Version required
+==================  ===================
+``apache-airflow``  ``>=2.10.0``
+``pydantic``        ``>=2.11.0``
+``retryhttp``       ``>=1.2.0,!=1.3.0``
+==================  ===================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-edge3/1.1.1/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-edge3/1.1.2/changelog.html>`_.

{apache_airflow_providers_edge3-1.1.1rc1 → apache_airflow_providers_edge3-1.1.2}/docs/architecture.rst

@@ -141,7 +141,7 @@ The following states are used to track the worker:
       TERMINATING->OFFLINE[label="on clean shutdown if running tasks = 0"];
    }
 
-See also https://github.com/apache/airflow/blob/main/providers/edge3/src/airflow/providers/edge3/models/edge_worker.py#L45
+See also :py:class:`airflow.providers.edge3.models.edge_worker.EdgeWorkerState`
 for a documentation of details of all states of the Edge Worker.
 
 Feature Backlog Edge Provider
@@ -171,7 +171,7 @@ The following features are known missing and will be implemented in increments:
 
 - Tests
 
-  - System tests in Github, test the deployment of the worker with a Dag execution
+  - System tests in GitHub, test the deployment of the worker with a Dag execution
   - Test/Support on Windows for Edge Worker
 
 - Scaling test - Check and define boundaries of workers/jobs. Today it is known to

{apache_airflow_providers_edge3-1.1.1rc1 → apache_airflow_providers_edge3-1.1.2}/docs/changelog.rst

@@ -27,6 +27,56 @@
 Changelog
 ---------
 
+1.1.2
+.....
+
+Bug Fixes
+~~~~~~~~~
+
+* ``Fix UnboundLocalError for 'edge_job_command_len' (#52328)``
+* ``Extend run detection to dev-mode to load plugin (#53576)``
+* ``Add queue and remove queue cli commands for EdgeExecutor (#53505)``
+* ``Ensure Edge Plugin for API endpoint is only loaded on API-Server and AF2 Webserver (#52952)``
+* ``Fix unreachable code mypy warnings in edge3 provider (#53430)``
+* ``Make edge3 provider compatible with mypy 1.16.1 (#53104)``
+* ``Fix task configuration defaults for AbstractOperator (#52871)``
+
+Misc
+~~~~
+
+* ``Remove upper-binding for "python-requires" (#52980)``
+* ``Temporarily switch to use >=,< pattern instead of '~=' (#52967)``
+* ``Deprecate decorators from Core (#53629)``
+* ``Add Python 3.13 support for Airflow. (#46891)``
+* ``Cleanup type ignores in edge3 provider where possible (#53248)``
+* ``Remove type ignore across codebase after mypy upgrade (#53243)``
+* ``Remove deprecation in Edge for DEFAULT_QUEUE (#52954)``
+* ``Move 'BaseHook' implementation to task SDK (#51873)``
+* ``Force the definition of 'execution_api_server_url' based on 'api_url' (#52184)``
+* ``Drop support for Python 3.9 (#52072)``
+* ``Remove FAB dependency from Edge3 Provider (#51995)``
+
+Doc-only
+~~~~~~~~
+
+* ``Clean some leftovers of Python 3.9 removal - All the rest (#52432)``
+* ``Update documentation for forcing core execution_api_server_url (#52447)``
+* ``Fix spelling in edge provider (#52169)``
+* ``Add docs for edge execution_api_server_url (#52082)``
+* ``Include docs for Windows (#52004)``
+* ``Document EdgeExecutor migration from 'internal_api_secret_key' to 'jwt_secret' (#51905)``
+* ``Fix Edge State Model Link (#51860)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+   * ``Revert "Revert "Remove FAB dependency from Edge3 Provider (#51995)"" (#52000)``
+   * ``Revert "Remove FAB dependency from Edge3 Provider (#51995)" (#51998)``
+   * ``Make dag_version_id in TI non-nullable (#50825)``
+   * ``Fix spelling of GitHub brand name (#53735)``
+   * ``Replace mock.patch("utcnow") with time_machine in Edge Executor (#53670)``
+   * ``Prepare release for July 2025 1st provider wave (#52727)``
+
+
 1.1.1
 .....
 

{apache_airflow_providers_edge3-1.1.1rc1 → apache_airflow_providers_edge3-1.1.2}/docs/deployment.rst

@@ -44,12 +44,19 @@ Here are a few imperative requirements for your workers:
 
 Minimum Airflow configuration settings for the Edge Worker to make it running is:
 
+- Section ``[api_auth]``
+
+  - ``jwt_secret``: A matching secret to that on the api-server (starting from version 3.0.0).
+
 - Section ``[core]``
 
+  - ``execution_api_server_url``: If not set, the base URL from ``edge.api_url`` will be used. For example,
+    when ``edge.api_url`` is set to ``https://your-hostname-and-port/edge_worker/v1/rpcapi``, it will
+    default to ``https://your-hostname-and-port/execution/``.
   - ``executor``: Executor must be set or added to be ``airflow.providers.edge3.executors.EdgeExecutor``
   - ``internal_api_secret_key``: An encryption key must be set on api-server and Edge Worker component as
     shared secret to authenticate traffic. It should be a random string like the fernet key
-    (but preferably not the same).
+    (for versions earlier than 3.0.0).
 
 - Section ``[edge]``
 
@@ -183,3 +190,5 @@ instance. The commands are:
 - ``airflow edge remote-edge-worker-exit-maintenance``: Request a remote edge worker to exit maintenance mode
 - ``airflow edge shutdown-remote-edge-worker``: Shuts down a remote edge worker gracefully
 - ``airflow edge remove-remote-edge-worker``: Remove a worker instance from the cluster
+- ``airflow edge add-worker-queues``: Add queues to an edge worker
+- ``airflow edge remove-worker-queues``: Remove queues from an edge worker

{apache_airflow_providers_edge3-1.1.1rc1 → apache_airflow_providers_edge3-1.1.2}/docs/index.rst

@@ -90,7 +90,9 @@ Additional REST API endpoints are provided to distribute tasks and manage the ed
 are provided by the API server.
 
 
-Release: 1.1.1
+Release: 1.1.2
+
+Release Date: ``|PypiReleaseDate|``
 
 Provider package
 ----------------
@@ -110,39 +112,10 @@ Requirements
 
 The minimum Apache Airflow version supported by this provider distribution is ``2.10.0``.
 
-================================  ===================
-PIP package                       Version required
-================================  ===================
-``apache-airflow``                ``>=2.10.0``
-``apache-airflow-providers-fab``  ``>=1.5.3``
-``pydantic``                      ``>=2.11.0``
-``retryhttp``                     ``>=1.2.0,!=1.3.0``
-================================  ===================
-
-Cross provider package dependencies
------------------------------------
-
-Those are dependencies that might be needed in order to use all the features of the package.
-You need to install the specified provider distributions in order to use them.
-
-You can install such cross-provider dependencies when installing from PyPI. For example:
-
-.. code-block:: bash
-
-    pip install apache-airflow-providers-edge3[fab]
-
-
-==============================================================================================  =======
-Dependent package                                                                               Extra
-==============================================================================================  =======
-`apache-airflow-providers-fab <https://airflow.apache.org/docs/apache-airflow-providers-fab>`_  ``fab``
-==============================================================================================  =======
-
-Downloading official packages
------------------------------
-
-You can download officially released packages and verify their checksums and signatures from the
-`Official Apache Download site <https://downloads.apache.org/airflow/providers/>`_
-
-* `The apache-airflow-providers-edge3 1.1.1 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_edge3-1.1.1.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_edge3-1.1.1.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_edge3-1.1.1.tar.gz.sha512>`__)
-* `The apache-airflow-providers-edge3 1.1.1 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_edge3-1.1.1-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_edge3-1.1.1-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_edge3-1.1.1-py3-none-any.whl.sha512>`__)
+==================  ===================
+PIP package         Version required
+==================  ===================
+``apache-airflow``  ``>=2.10.0``
+``pydantic``        ``>=2.11.0``
+``retryhttp``       ``>=1.2.0,!=1.3.0``
+==================  ===================

{apache_airflow_providers_edge3-1.1.1rc1 → apache_airflow_providers_edge3-1.1.2}/docs/install_on_windows.rst

@@ -29,7 +29,7 @@ Install Edge Worker on Windows
 The setup was tested on Windows 10 with Python 3.12.8, 64-bit. Backend for tests was Airflow 2.10.5.
 To setup a instance of Edge Worker on Windows, you need to follow the steps below:
 
-1. Install Python 3.9 or higher.
+1. Install Python 3.10 or higher.
 2. Create an empty folder as base to start with. In our example it is ``C:\Airflow``.
 3. Start Shell/Command Line in ``C:\Airflow`` and create a new virtual environment via: ``python -m venv venv``
 4. Activate the virtual environment via: ``venv\Scripts\activate.bat``
@@ -39,8 +39,8 @@ To setup a instance of Edge Worker on Windows, you need to follow the steps belo
    (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
   - ``edge`` / ``api_url``: The HTTP(s) endpoint where the Edge Worker connects to
-  - ``core`` / ``internal_api_secret_key``: The shared secret key between the api-server and the Edge Worker
   - Any proxy details if applicable for your environment.
 
 8. Create a worker start script to prevent repeated typing. Create a new file ``start_worker.bat`` in
@@ -49,11 +49,16 @@ To setup a instance of Edge Worker on Windows, you need to follow the steps belo
 .. code-block:: bash
 
     @echo off
+    REM For versions 3.0.0 or later
+    set AIRFLOW__API_AUTH__JWT_SECRET=<matching the api-server...>
+    REM for versions earlier than 3.0.0
+    set AIRFLOW__CORE__INTERNAL_API_SECRET_KEY=<use this as configured centrally in api-server...>
+
+    REM For all versions
     set AIRFLOW__CORE__DAGS_FOLDER=dags
     set AIRFLOW__LOGGING__BASE_LOG_FOLDER=edge_logs
     set AIRFLOW__EDGE__API_URL=https://your-hostname-and-port/edge_worker/v1/rpcapi
     set AIRFLOW__CORE__EXECUTOR=airflow.providers.edge3.executors.edge_executor.EdgeExecutor
-    set AIRFLOW__CORE__INTERNAL_API_SECRET_KEY=<use this as configured centrally in api-server...>
     set AIRFLOW__CORE__LOAD_EXAMPLES=False
     set AIRFLOW_ENABLE_AIP_44=true
     @REM Add if needed: set http_proxy=http://my-company-proxy.com:3128

{apache_airflow_providers_edge3-1.1.1rc1 → apache_airflow_providers_edge3-1.1.2}/provider.yaml

@@ -33,13 +33,14 @@ description: |
   are provided by the API server.
 
 state: ready
-source-date-epoch: 1749896427
+source-date-epoch: 1751473321
 
 # 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.1.2
   - 1.1.1
   - 1.1.0
   - 1.0.0

{apache_airflow_providers_edge3-1.1.1rc1 → apache_airflow_providers_edge3-1.1.2}/pyproject.toml

@@ -25,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-edge3"
-version = "1.1.1rc1"
+version = "1.1.2"
 description = "Provider package apache-airflow-providers-edge3 for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -44,21 +44,20 @@ classifiers = [
     "Framework :: Apache Airflow",
     "Framework :: Apache Airflow :: Provider",
     "License :: OSI Approved :: Apache Software License",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: System :: Monitoring",
 ]
-requires-python = "~=3.9"
+requires-python = ">=3.10"
 
 # The dependencies should be modified in place in the generated file.
 # Any change in the dependencies is preserved when the file is regenerated
 # Make sure to run ``breeze static-checks --type 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",
-    "apache-airflow-providers-fab>=1.5.3rc1",
+    "apache-airflow>=2.10.0",
     "pydantic>=2.11.0",
     "retryhttp>=1.2.0,!=1.3.0",
 ]
@@ -68,7 +67,6 @@ dev = [
     "apache-airflow",
     "apache-airflow-task-sdk",
     "apache-airflow-devel-common",
-    "apache-airflow-providers-fab",
     # Additional devel dependencies (do not remove this line and add extra development dependencies)
 ]
 
@@ -98,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.1"
-"Changelog" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-edge3/1.1.1/changelog.html"
+"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-edge3/1.1.2"
+"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-edge3/1.1.2/changelog.html"
 "Bug Tracker" = "https://github.com/apache/airflow/issues"
 "Source Code" = "https://github.com/apache/airflow"
 "Slack Chat" = "https://s.apache.org/airflow-slack"

{apache_airflow_providers_edge3-1.1.1rc1 → apache_airflow_providers_edge3-1.1.2}/src/airflow/__init__.py

@@ -14,4 +14,4 @@
 # 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
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)

{apache_airflow_providers_edge3-1.1.1rc1/tests/unit → apache_airflow_providers_edge3-1.1.2/src/airflow/providers}/__init__.py

@@ -14,4 +14,4 @@
 # 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
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)

{apache_airflow_providers_edge3-1.1.1rc1 → apache_airflow_providers_edge3-1.1.2}/src/airflow/providers/edge3/__init__.py

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

{apache_airflow_providers_edge3-1.1.1rc1 → apache_airflow_providers_edge3-1.1.2}/src/airflow/providers/edge3/cli/edge_command.py

@@ -64,7 +64,7 @@ EDGE_WORKER_HEADER = "\n".join(
 @providers_configuration_loaded
 def force_use_internal_api_on_edge_worker():
     """
-    Ensure that the environment is configured for the internal API without needing to declare it outside.
+    Ensure the environment is configured for the internal API without explicit declaration.
 
     This is only required for an Edge worker and must to be done before the Click CLI wrapper is initiated.
     That is because the CLI wrapper will attempt to establish a DB connection, which will fail before the
@@ -351,6 +351,48 @@ def remote_worker_request_shutdown(args) -> None:
     logger.info("Requested shutdown of Edge Worker host %s by %s.", args.edge_hostname, getuser())
 
 
+@cli_utils.action_cli(check_db=False)
+@providers_configuration_loaded
+def add_worker_queues(args) -> None:
+    """Add queues to an edge worker."""
+    _check_valid_db_connection()
+    _check_if_registered_edge_host(hostname=args.edge_hostname)
+    from airflow.providers.edge3.models.edge_worker import add_worker_queues
+
+    queues = args.queues.split(",") if args.queues else []
+    if not queues:
+        raise SystemExit("Error: No queues specified to add.")
+
+    try:
+        add_worker_queues(args.edge_hostname, queues)
+        logger.info("Added queues %s to Edge Worker host %s by %s.", queues, args.edge_hostname, getuser())
+    except TypeError as e:
+        logger.error(str(e))
+        raise SystemExit
+
+
+@cli_utils.action_cli(check_db=False)
+@providers_configuration_loaded
+def remove_worker_queues(args) -> None:
+    """Remove queues from an edge worker."""
+    _check_valid_db_connection()
+    _check_if_registered_edge_host(hostname=args.edge_hostname)
+    from airflow.providers.edge3.models.edge_worker import remove_worker_queues
+
+    queues = args.queues.split(",") if args.queues else []
+    if not queues:
+        raise SystemExit("Error: No queues specified to remove.")
+
+    try:
+        remove_worker_queues(args.edge_hostname, queues)
+        logger.info(
+            "Removed queues %s from Edge Worker host %s by %s.", queues, args.edge_hostname, getuser()
+        )
+    except TypeError as e:
+        logger.error(str(e))
+        raise SystemExit
+
+
 ARG_CONCURRENCY = Arg(
     ("-c", "--concurrency"),
     type=int,
@@ -380,6 +422,11 @@ ARG_REQUIRED_MAINTENANCE_COMMENT = Arg(
     help="Maintenance comments to report reason. Required if enabling maintenance",
     required=True,
 )
+ARG_QUEUES_MANAGE = Arg(
+    ("-q", "--queues"),
+    help="Comma delimited list of queues to add or remove.",
+    required=True,
+)
 ARG_WAIT_MAINT = Arg(
     ("-w", "--wait"),
     default=False,
@@ -516,4 +563,22 @@ EDGE_COMMANDS: list[ActionCommand] = [
         func=remote_worker_request_shutdown,
         args=(ARG_REQUIRED_EDGE_HOSTNAME,),
     ),
+    ActionCommand(
+        name="add-worker-queues",
+        help=add_worker_queues.__doc__,
+        func=add_worker_queues,
+        args=(
+            ARG_REQUIRED_EDGE_HOSTNAME,
+            ARG_QUEUES_MANAGE,
+        ),
+    ),
+    ActionCommand(
+        name="remove-worker-queues",
+        help=remove_worker_queues.__doc__,
+        func=remove_worker_queues,
+        args=(
+            ARG_REQUIRED_EDGE_HOSTNAME,
+            ARG_QUEUES_MANAGE,
+        ),
+    ),
 ]

{apache_airflow_providers_edge3-1.1.1rc1 → apache_airflow_providers_edge3-1.1.2}/src/airflow/providers/edge3/cli/worker.py

@@ -26,6 +26,7 @@ from pathlib import Path
 from subprocess import Popen
 from time import sleep
 from typing import TYPE_CHECKING
+from urllib.parse import urlparse
 
 from lockfile.pidlockfile import remove_existing_pidfile
 from requests import HTTPError
@@ -186,11 +187,13 @@ class EdgeWorker:
             setproctitle(f"airflow edge worker: {workload.ti.key}")
 
             try:
-                base_url = conf.get("api", "base_url", fallback="/")
-                # If it's a relative URL, use localhost:8080 as the default
-                if base_url.startswith("/"):
-                    base_url = f"http://localhost:8080{base_url}"
-                default_execution_api_server = f"{base_url.rstrip('/')}/execution/"
+                api_url = conf.get("edge", "api_url")
+                execution_api_server_url = conf.get("core", "execution_api_server_url", fallback="")
+                if not execution_api_server_url:
+                    parsed = urlparse(api_url)
+                    execution_api_server_url = f"{parsed.scheme}://{parsed.netloc}/execution/"
+
+                logger.info("Worker starting up server=execution_api_server_url=%s", execution_api_server_url)
 
                 supervise(
                     # This is the "wrong" ti type, but it duck types the same. TODO: Create a protocol for this.
@@ -199,9 +202,7 @@ class EdgeWorker:
                     dag_rel_path=workload.dag_rel_path,
                     bundle_info=workload.bundle_info,
                     token=workload.token,
-                    server=conf.get(
-                        "core", "execution_api_server_url", fallback=default_execution_api_server
-                    ),
+                    server=execution_api_server_url,
                     log_path=workload.log_path,
                 )
                 return 0

{apache_airflow_providers_edge3-1.1.1rc1 → apache_airflow_providers_edge3-1.1.2}/src/airflow/providers/edge3/example_dags/integration_test.py

@@ -27,7 +27,11 @@ from datetime import datetime
 from time import sleep
 
 from airflow.exceptions import AirflowNotFoundException
-from airflow.hooks.base import BaseHook
+
+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:
@@ -37,13 +41,13 @@ try:
     from airflow.sdk import DAG, Param, Variable, task, task_group
 except ImportError:
     # Airflow 2.10 compat
-    from airflow.decorators import task, task_group  # type: ignore[no-redef,attr-defined]
-    from airflow.models.dag import DAG  # type: ignore[no-redef,attr-defined,assignment]
-    from airflow.models.param import Param  # type: ignore[no-redef,attr-defined]
-    from airflow.models.variable import Variable  # type: ignore[no-redef,attr-defined]
-    from airflow.operators.bash import BashOperator  # type: ignore[no-redef,attr-defined]
-    from airflow.operators.empty import EmptyOperator  # type: ignore[no-redef,attr-defined]
-    from airflow.operators.python import PythonOperator  # type: ignore[no-redef,attr-defined]
+    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.param import Param  # type: ignore[no-redef]
+    from airflow.models.variable import Variable
+    from airflow.operators.bash import BashOperator  # type: ignore[no-redef]
+    from airflow.operators.empty import EmptyOperator  # type: ignore[no-redef]
+    from airflow.operators.python import PythonOperator  # type: ignore[no-redef]
 
 with DAG(
     dag_id="integration_test",