apache-airflow-providers-standard 1.8.0__tar.gz → 1.9.0rc1__tar.gz

{apache_airflow_providers_standard-1.8.0 → apache_airflow_providers_standard-1.9.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-standard
-Version: 1.8.0
+Version: 1.9.0rc1
 Summary: Provider package apache-airflow-providers-standard for Apache Airflow
 Keywords: airflow-provider,standard,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
@@ -20,10 +20,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.0
+Requires-Dist: apache-airflow>=2.10.0rc1
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-standard/1.8.0/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-standard/1.8.0
+Project-URL: Changelog, https://airflow.staged.apache.org/docs/apache-airflow-providers-standard/1.9.0/changelog.html
+Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-standard/1.9.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
@@ -54,7 +54,7 @@ Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
 
 Package ``apache-airflow-providers-standard``
 
-Release: ``1.8.0``
+Release: ``1.9.0``
 
 
 Airflow Standard Provider
@@ -67,7 +67,7 @@ This is a provider package for ``standard`` provider. All classes for this provi
 are in ``airflow.providers.standard`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.8.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.9.0/>`_.
 
 Installation
 ------------
@@ -88,5 +88,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-standard/1.8.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.9.0/changelog.html>`_.
 

{apache_airflow_providers_standard-1.8.0 → apache_airflow_providers_standard-1.9.0rc1}/README.rst

@@ -23,7 +23,7 @@
 
 Package ``apache-airflow-providers-standard``
 
-Release: ``1.8.0``
+Release: ``1.9.0``
 
 
 Airflow Standard Provider
@@ -36,7 +36,7 @@ This is a provider package for ``standard`` provider. All classes for this provi
 are in ``airflow.providers.standard`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.8.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.9.0/>`_.
 
 Installation
 ------------
@@ -57,4 +57,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-standard/1.8.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.9.0/changelog.html>`_.

{apache_airflow_providers_standard-1.8.0 → apache_airflow_providers_standard-1.9.0rc1}/docs/changelog.rst

@@ -35,6 +35,24 @@
 Changelog
 ---------
 
+1.9.0
+.....
+
+Features
+~~~~~~~~
+
+* ``Add a '@task.stub' to allow tasks in other languages to be defined in dags (#56055)``
+
+Misc
+~~~~
+
+* ``Move DagBag to airflow/dag_processing (#55139)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+   * ``Fix 'example_bash_decorator' DAG (#56020)``
+   * ``Enable pt011 rule 2 (#55749)``
+
 1.8.0
 .....
 

{apache_airflow_providers_standard-1.8.0 → apache_airflow_providers_standard-1.9.0rc1}/docs/index.rst

@@ -66,7 +66,7 @@ apache-airflow-providers-standard package
 Airflow Standard Provider
 
 
-Release: 1.8.0
+Release: 1.9.0
 
 Provider package
 ----------------

{apache_airflow_providers_standard-1.8.0 → apache_airflow_providers_standard-1.9.0rc1}/provider.yaml

@@ -21,12 +21,13 @@ name: Standard
 description: |
     Airflow Standard Provider
 state: ready
-source-date-epoch: 1757951068
+source-date-epoch: 1758734916
 # 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.9.0
   - 1.8.0
   - 1.7.0
   - 1.6.0
@@ -141,3 +142,5 @@ task-decorators:
     name: sensor
   - class-name: airflow.providers.standard.decorators.short_circuit.short_circuit_task
     name: short_circuit
+  - class-name: airflow.providers.standard.decorators.stub.stub
+    name: stub

{apache_airflow_providers_standard-1.8.0 → apache_airflow_providers_standard-1.9.0rc1}/pyproject.toml

@@ -25,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-standard"
-version = "1.8.0"
+version = "1.9.0rc1"
 description = "Provider package apache-airflow-providers-standard for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -57,7 +57,7 @@ requires-python = ">=3.10"
 # 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.0",
+    "apache-airflow>=2.10.0rc1",
 ]
 
 [dependency-groups]
@@ -95,8 +95,8 @@ apache-airflow-providers-common-sql = {workspace = true}
 apache-airflow-providers-standard = {workspace = true}
 
 [project.urls]
-"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-standard/1.8.0"
-"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-standard/1.8.0/changelog.html"
+"Documentation" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-standard/1.9.0"
+"Changelog" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-standard/1.9.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_standard-1.8.0 → apache_airflow_providers_standard-1.9.0rc1}/src/airflow/providers/standard/__init__.py

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

apache_airflow_providers_standard-1.9.0rc1/src/airflow/providers/standard/decorators/stub.py

@@ -0,0 +1,102 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from __future__ import annotations
+
+import ast
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from airflow.sdk.bases.decorator import DecoratedOperator, TaskDecorator, task_decorator_factory
+else:
+    try:
+        from airflow.sdk.bases.decorator import DecoratedOperator, TaskDecorator, task_decorator_factory
+    except ModuleNotFoundError:
+        from airflow.decorators.base import (
+            DecoratedOperator,
+            TaskDecorator,
+            task_decorator_factory,
+        )
+
+if TYPE_CHECKING:
+    from airflow.sdk.definitions.context import Context
+
+
+class _StubOperator(DecoratedOperator):
+    custom_operator_name: str = "@task.stub"
+
+    def __init__(
+        self,
+        *,
+        python_callable: Callable,
+        task_id: str,
+        **kwargs,
+    ) -> None:
+        super().__init__(
+            python_callable=python_callable,
+            task_id=task_id,
+            **kwargs,
+        )
+        # Validate python callable
+        module = ast.parse(self.get_python_source())
+
+        if len(module.body) != 1:
+            raise RuntimeError("Expected a single statement")
+        fn = module.body[0]
+        if not isinstance(fn, ast.FunctionDef):
+            raise RuntimeError("Expected a single sync function")
+        for stmt in fn.body:
+            if isinstance(stmt, ast.Pass):
+                continue
+            if isinstance(stmt, ast.Expr):
+                if isinstance(stmt.value, ast.Constant) and isinstance(stmt.value.value, (str, type(...))):
+                    continue
+
+            raise ValueError(
+                f"Functions passed to @task.stub must be an empty function (`pass`, or `...` only) (got {stmt})"
+            )
+
+        ...
+
+    def execute(self, context: Context) -> Any:
+        raise RuntimeError(
+            "@task.stub should not be executed directly -- we expected this to go to a remote worker. "
+            "Check your pool and worker configs"
+        )
+
+
+def stub(
+    python_callable: Callable | None = None,
+    queue: str | None = None,
+    executor: str | None = None,
+    **kwargs,
+) -> TaskDecorator:
+    """
+    Define a stub task in the DAG.
+
+    Stub tasks exist in the Dag graph only, but the execution must happen in an external
+    environment via the Task Execution Interface.
+
+    """
+    return task_decorator_factory(
+        decorated_operator_class=_StubOperator,
+        python_callable=python_callable,
+        queue=queue,
+        executor=executor,
+        **kwargs,
+    )

{apache_airflow_providers_standard-1.8.0 → apache_airflow_providers_standard-1.9.0rc1}/src/airflow/providers/standard/example_dags/example_bash_decorator.py

@@ -92,21 +92,14 @@ def example_bash_decorator():
     # [END howto_decorator_bash_parametrize]
 
     # [START howto_decorator_bash_build_cmd]
-    def _get_files_in_cwd() -> list[str]:
-        from pathlib import Path
-
-        dir_contents = Path.cwd().glob("airflow-core/src/airflow/example_dags/*.py")
-        files = [str(elem) for elem in dir_contents if elem.is_file()]
-
-        return files
-
     @task.bash
     def get_file_stats() -> str:
+        from pathlib import Path
         from shlex import join
 
-        files = _get_files_in_cwd()
-        files = files if files else ["."]
-        cmd = join(["stat", *files])
+        # Get stats of the current DAG file itself
+        current_file = str(Path(__file__))
+        cmd = join(["stat", current_file])
 
         return cmd
 

{apache_airflow_providers_standard-1.8.0 → apache_airflow_providers_standard-1.9.0rc1}/src/airflow/providers/standard/get_provider_info.py

@@ -144,5 +144,6 @@ def get_provider_info():
                 "class-name": "airflow.providers.standard.decorators.short_circuit.short_circuit_task",
                 "name": "short_circuit",
             },
+            {"class-name": "airflow.providers.standard.decorators.stub.stub", "name": "stub"},
         ],
     }

{apache_airflow_providers_standard-1.8.0 → apache_airflow_providers_standard-1.9.0rc1}/src/airflow/providers/standard/sensors/external_task.py

@@ -25,7 +25,6 @@ from typing import TYPE_CHECKING, Any, ClassVar
 from airflow.configuration import conf
 from airflow.exceptions import AirflowSkipException
 from airflow.models.dag import DagModel
-from airflow.models.dagbag import DagBag
 from airflow.providers.standard.exceptions import (
     DuplicateStateError,
     ExternalDagDeletedError,
@@ -41,6 +40,7 @@ from airflow.providers.standard.triggers.external_task import WorkflowTrigger
 from airflow.providers.standard.utils.sensor_helper import _get_count, _get_external_task_group_task_ids
 from airflow.providers.standard.version_compat import (
     AIRFLOW_V_3_0_PLUS,
+    AIRFLOW_V_3_1_PLUS,
     BaseOperator,
     BaseOperatorLink,
     BaseSensorOperator,
@@ -51,6 +51,11 @@ from airflow.utils.state import State, TaskInstanceState
 if not AIRFLOW_V_3_0_PLUS:
     from airflow.utils.session import NEW_SESSION, provide_session
 
+if AIRFLOW_V_3_1_PLUS:
+    from airflow.dag_processing.dagbag import DagBag
+else:
+    from airflow.models.dagbag import DagBag  # type: ignore[attr-defined, no-redef]
+
 if TYPE_CHECKING:
     from sqlalchemy.orm import Session
 

{apache_airflow_providers_standard-1.8.0 → apache_airflow_providers_standard-1.9.0rc1}/tests/unit/standard/decorators/test_python.py

@@ -680,13 +680,11 @@ def test_mapped_decorator_shadow_context() -> None:
     def print_info(message: str, run_id: str = "") -> None:
         print(f"{run_id}: {message}")
 
-    with pytest.raises(ValueError) as ctx:
+    with pytest.raises(ValueError, match=r"cannot call partial\(\) on task context variable 'run_id'"):
         print_info.partial(run_id="hi")
-    assert str(ctx.value) == "cannot call partial() on task context variable 'run_id'"
 
-    with pytest.raises(ValueError) as ctx:
+    with pytest.raises(ValueError, match=r"cannot call expand\(\) on task context variable 'run_id'"):
         print_info.expand(run_id=["hi", "there"])
-    assert str(ctx.value) == "cannot call expand() on task context variable 'run_id'"
 
 
 def test_mapped_decorator_wrong_argument() -> None:
@@ -702,9 +700,10 @@ def test_mapped_decorator_wrong_argument() -> None:
         print_info.expand(wrong_name=["hi", "there"])
     assert str(ct.value) == "expand() got an unexpected keyword argument 'wrong_name'"
 
-    with pytest.raises(ValueError) as cv:
+    with pytest.raises(
+        ValueError, match=r"expand\(\) got an unexpected type 'str' for keyword argument 'message'"
+    ):
         print_info.expand(message="hi")
-    assert str(cv.value) == "expand() got an unexpected type 'str' for keyword argument 'message'"
 
 
 def test_mapped_decorator():

apache_airflow_providers_standard-1.9.0rc1/tests/unit/standard/decorators/test_stub.py

@@ -0,0 +1,57 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from __future__ import annotations
+
+import contextlib
+
+import pytest
+
+from airflow.providers.standard.decorators.stub import stub
+
+
+def fn_ellipsis(): ...
+
+
+def fn_pass(): ...
+
+
+def fn_doc():
+    """Some string"""
+
+
+def fn_doc_pass():
+    """Some string"""
+    pass
+
+
+def fn_code():
+    return None
+
+
+@pytest.mark.parametrize(
+    ("fn", "error"),
+    [
+        pytest.param(fn_ellipsis, contextlib.nullcontext(), id="ellipsis"),
+        pytest.param(fn_pass, contextlib.nullcontext(), id="pass"),
+        pytest.param(fn_doc, contextlib.nullcontext(), id="doc"),
+        pytest.param(fn_doc_pass, contextlib.nullcontext(), id="doc-and-pass"),
+        pytest.param(fn_code, pytest.raises(ValueError, match="must be an empty function"), id="not-empty"),
+    ],
+)
+def test_stub_signature(fn, error):
+    with error:
+        stub(fn)()

{apache_airflow_providers_standard-1.8.0 → apache_airflow_providers_standard-1.9.0rc1}/tests/unit/standard/operators/test_hitl.py

@@ -316,7 +316,7 @@ class TestHITLOperator:
             params={"input": 1},
         )
 
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="not exists"):
             hitl_op.execute_complete(
                 context={},
                 event={
@@ -335,7 +335,7 @@ class TestHITLOperator:
             params={"input": 1},
         )
 
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="no such key"):
             hitl_op.execute_complete(
                 context={},
                 event={
@@ -442,7 +442,7 @@ class TestHITLOperator:
 
 class TestApprovalOperator:
     def test_init_with_options(self) -> None:
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="Passing options to ApprovalOperator is not allowed."):
             ApprovalOperator(
                 task_id="hitl_test",
                 subject="This is subject",

{apache_airflow_providers_standard-1.8.0 → apache_airflow_providers_standard-1.9.0rc1}/tests/unit/standard/operators/test_python.py

@@ -985,9 +985,10 @@ class BaseTestPythonVirtualenvOperator(BasePythonTest):
         assert task.execute_callable() is False
 
     def test_lambda(self):
-        with pytest.raises(ValueError) as info:
+        with pytest.raises(
+            ValueError, match="PythonVirtualenvOperator only supports functions for python_callable arg"
+        ):
             PythonVirtualenvOperator(python_callable=lambda x: 4, task_id=self.task_id)
-        assert str(info.value) == "PythonVirtualenvOperator only supports functions for python_callable arg"
 
     def test_nonimported_as_arg(self):
         def f(_):
@@ -1689,13 +1690,10 @@ class TestPythonVirtualenvOperator(BaseTestPythonVirtualenvOperator):
             system_site_packages=False,
         )
 
-        with pytest.raises(ValueError) as exc_info:
+        with pytest.raises(ValueError, match=rf"Invalid requirement '{invalid_requirement}'"):
             # Consume the generator to trigger parsing
             list(op._iter_serializable_context_keys())
 
-        msg = str(exc_info.value)
-        assert f"Invalid requirement '{invalid_requirement}'" in msg
-
     @mock.patch("airflow.providers.standard.operators.python.PythonVirtualenvOperator._prepare_venv")
     @mock.patch(
         "airflow.providers.standard.operators.python.PythonVirtualenvOperator._execute_python_callable_in_subprocess"

{apache_airflow_providers_standard-1.8.0 → apache_airflow_providers_standard-1.9.0rc1}/tests/unit/standard/sensors/test_external_task_sensor.py

@@ -27,7 +27,7 @@ import pytest
 
 from airflow import settings
 from airflow.exceptions import AirflowException, AirflowSensorTimeout, AirflowSkipException, TaskDeferred
-from airflow.models import DagBag, DagRun, TaskInstance
+from airflow.models import DagRun, TaskInstance
 from airflow.models.dag import DAG
 from airflow.models.serialized_dag import SerializedDagModel
 from airflow.models.xcom_arg import XComArg
@@ -67,9 +67,11 @@ else:
     from airflow.models import BaseOperator  # type: ignore[assignment,no-redef]
 
 if AIRFLOW_V_3_1_PLUS:
+    from airflow.dag_processing.dagbag import DagBag
     from airflow.sdk import TaskGroup
     from airflow.sdk.timezone import coerce_datetime, datetime
 else:
+    from airflow.models.dagbag import DagBag  # type: ignore[attr-defined, no-redef]
     from airflow.utils.task_group import TaskGroup  # type: ignore[no-redef]
     from airflow.utils.timezone import coerce_datetime, datetime  # type: ignore[attr-defined,no-redef]
 
@@ -86,6 +88,8 @@ DEV_NULL = "/dev/null"
 TASK_ID = "external_task_sensor_check"
 EXTERNAL_DAG_ID = "child_dag"  # DAG the external task sensor is waiting on
 EXTERNAL_TASK_ID = "child_task"  # Task the external task sensor is waiting on
+EXTERNAL_ID_AND_IDS_PROVIDE_ERROR = "Only one of `external_task_id` or `external_task_ids` may be provided to ExternalTaskSensor; use external_task_id or external_task_ids or external_task_group_id."
+EXTERNAL_IDS_AND_TASK_GROUP_ID_PROVIDE_ERROR = "Only one of `external_task_group_id` or `external_task_ids` may be provided to ExternalTaskSensor; use external_task_id or external_task_ids or external_task_group_id."
 
 
 @pytest.fixture(autouse=True)
@@ -203,7 +207,10 @@ class TestExternalTaskSensorV2:
         op.run(start_date=DEFAULT_DATE, end_date=DEFAULT_DATE, ignore_ti_state=True)
 
     def test_raise_with_external_task_sensor_task_id_and_task_ids(self):
-        with pytest.raises(ValueError) as ctx:
+        with pytest.raises(
+            ValueError,
+            match=EXTERNAL_ID_AND_IDS_PROVIDE_ERROR,
+        ):
             ExternalTaskSensor(
                 task_id="test_external_task_sensor_task_id_with_task_ids_failed_status",
                 external_dag_id=TEST_DAG_ID,
@@ -211,14 +218,9 @@ class TestExternalTaskSensorV2:
                 external_task_ids=TEST_TASK_ID,
                 dag=self.dag,
             )
-        assert (
-            str(ctx.value) == "Only one of `external_task_id` or `external_task_ids` may "
-            "be provided to ExternalTaskSensor; "
-            "use external_task_id or external_task_ids or external_task_group_id."
-        )
 
     def test_raise_with_external_task_sensor_task_group_and_task_id(self):
-        with pytest.raises(ValueError) as ctx:
+        with pytest.raises(ValueError, match=EXTERNAL_IDS_AND_TASK_GROUP_ID_PROVIDE_ERROR):
             ExternalTaskSensor(
                 task_id="test_external_task_sensor_task_group_with_task_id_failed_status",
                 external_dag_id=TEST_DAG_ID,
@@ -226,14 +228,9 @@ class TestExternalTaskSensorV2:
                 external_task_group_id=TEST_TASK_GROUP_ID,
                 dag=self.dag,
             )
-        assert (
-            str(ctx.value) == "Only one of `external_task_group_id` or `external_task_ids` may "
-            "be provided to ExternalTaskSensor; "
-            "use external_task_id or external_task_ids or external_task_group_id."
-        )
 
     def test_raise_with_external_task_sensor_task_group_and_task_ids(self):
-        with pytest.raises(ValueError) as ctx:
+        with pytest.raises(ValueError, match=EXTERNAL_IDS_AND_TASK_GROUP_ID_PROVIDE_ERROR):
             ExternalTaskSensor(
                 task_id="test_external_task_sensor_task_group_with_task_ids_failed_status",
                 external_dag_id=TEST_DAG_ID,
@@ -241,11 +238,6 @@ class TestExternalTaskSensorV2:
                 external_task_group_id=TEST_TASK_GROUP_ID,
                 dag=self.dag,
             )
-        assert (
-            str(ctx.value) == "Only one of `external_task_group_id` or `external_task_ids` may "
-            "be provided to ExternalTaskSensor; "
-            "use external_task_id or external_task_ids or external_task_group_id."
-        )
 
     # by default i.e. check_existence=False, if task_group doesn't exist, the sensor will run till timeout,
     # this behaviour is similar to external_task_id doesn't exists
@@ -304,7 +296,10 @@ class TestExternalTaskSensorV2:
             )
 
     def test_external_task_sensor_wrong_failed_states(self):
-        with pytest.raises(ValueError):
+        with pytest.raises(
+            ValueError,
+            match="Valid values for `allowed_states`, `skipped_states` and `failed_states` when `external_task_id` or `external_task_ids` or `external_task_group_id` is not `None`",
+        ):
             ExternalTaskSensor(
                 task_id="test_external_task_sensor_check",
                 external_dag_id=TEST_DAG_ID,
@@ -666,7 +661,10 @@ exit 0
     def test_external_task_sensor_error_delta_and_fn(self):
         self.add_time_sensor()
         # Test that providing execution_delta and a function raises an error
-        with pytest.raises(ValueError):
+        with pytest.raises(
+            ValueError,
+            match="Only one of `execution_delta` or `execution_date_fn` may be provided to ExternalTaskSensor; not both.",
+        ):
             ExternalTaskSensor(
                 task_id="test_external_task_sensor_check_delta",
                 external_dag_id=TEST_DAG_ID,
@@ -680,7 +678,10 @@ exit 0
     def test_external_task_sensor_error_task_id_and_task_ids(self):
         self.add_time_sensor()
         # Test that providing execution_delta and a function raises an error
-        with pytest.raises(ValueError):
+        with pytest.raises(
+            ValueError,
+            match=EXTERNAL_ID_AND_IDS_PROVIDE_ERROR,
+        ):
             ExternalTaskSensor(
                 task_id="test_external_task_sensor_task_id_and_task_ids",
                 external_dag_id=TEST_DAG_ID,
@@ -711,7 +712,7 @@ exit 0
             allowed_states=["success"],
             dag=self.dag,
         )
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="Duplicate task_ids"):
             op1.run(start_date=DEFAULT_DATE, end_date=DEFAULT_DATE)
 
     def test_catch_duplicate_task_ids_with_xcom_arg(self):
@@ -731,7 +732,7 @@ exit 0
             dag=self.dag,
         )
         op1.run(start_date=DEFAULT_DATE, end_date=DEFAULT_DATE)
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="Duplicate task_ids"):
             op2.run(start_date=DEFAULT_DATE, end_date=DEFAULT_DATE)
 
     def test_catch_duplicate_task_ids_with_multiple_xcom_args(self):
@@ -752,11 +753,14 @@ exit 0
             dag=self.dag,
         )
         op1.run(start_date=DEFAULT_DATE, end_date=DEFAULT_DATE)
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="Duplicate task_ids"):
             op2.run(start_date=DEFAULT_DATE, end_date=DEFAULT_DATE)
 
     def test_catch_invalid_allowed_states(self):
-        with pytest.raises(ValueError):
+        with pytest.raises(
+            ValueError,
+            match="Valid values for `allowed_states`, `skipped_states` and `failed_states`",
+        ):
             ExternalTaskSensor(
                 task_id="test_external_task_sensor_check_1",
                 external_dag_id=TEST_DAG_ID,
@@ -765,7 +769,10 @@ exit 0
                 dag=self.dag,
             )
 
-        with pytest.raises(ValueError):
+        with pytest.raises(
+            ValueError,
+            match="Valid values for `allowed_states`, `skipped_states` and `failed_states`",
+        ):
             ExternalTaskSensor(
                 task_id="test_external_task_sensor_check_2",
                 external_dag_id=TEST_DAG_ID,
@@ -1185,7 +1192,10 @@ class TestExternalTaskSensorV3:
 
     def test_external_task_sensor_invalid_combination(self, dag_maker):
         """Test that the sensor raises an error with invalid parameter combinations."""
-        with pytest.raises(ValueError):
+        with pytest.raises(
+            ValueError,
+            match=EXTERNAL_ID_AND_IDS_PROVIDE_ERROR,
+        ):
             with dag_maker("test_external_task_sensor_invalid_combination"):
                 ExternalTaskSensor(
                     task_id="test_external_task_sensor_check",
@@ -1195,7 +1205,10 @@ class TestExternalTaskSensorV3:
                 )
 
     def test_external_task_sensor_invalid_state(self, dag_maker):
-        with pytest.raises(ValueError):
+        with pytest.raises(
+            ValueError,
+            match="Valid values for `allowed_states`, `skipped_states` and `failed_states` when `external_task_id` or `external_task_ids` or `external_task_group_id` is not `None",
+        ):
             with dag_maker("test_external_task_sensor_invalid_state"):
                 ExternalTaskSensor(
                     task_id="test_external_task_sensor_check",