apache-airflow-task-sdk 1.2.0rc2__tar.gz → 1.2.1__tar.gz

{apache_airflow_task_sdk-1.2.0rc2 → apache_airflow_task_sdk-1.2.1}/.pre-commit-config.yaml

@@ -56,17 +56,9 @@ repos:
         pass_filenames: false
         files: ^src/airflow/sdk/definitions/dag\.py$|^src/airflow/sdk/definitions/decorators/task_group\.py$
       - id: mypy-task-sdk
-        stages: ['pre-push']
         name: Run mypy for task-sdk
         language: python
-        entry: ../scripts/ci/prek/mypy.py
-        files: ^.*\.py$
-        require_serial: true
-      - id: mypy-task-sdk
-        stages: ['manual']
-        name: Run mypy for task-sdk (manual)
-        language: python
-        entry: ../scripts/ci/prek/mypy_folder.py task-sdk
+        entry: ../scripts/ci/prek/mypy_local_folder.py task-sdk
         pass_filenames: false
         files: ^.*\.py$
         require_serial: true

{apache_airflow_task_sdk-1.2.0rc2 → apache_airflow_task_sdk-1.2.1}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: apache-airflow-task-sdk
-Version: 1.2.0rc2
+Version: 1.2.1
 Summary: Python Task SDK for Apache Airflow DAG Authors
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Documentation, https://airflow.staged.apache.org/docs/
-Project-URL: Homepage, https://airflow.staged.apache.org/
+Project-URL: Documentation, https://airflow.apache.org/docs/
+Project-URL: Homepage, https://airflow.apache.org/
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
 Project-URL: Mastodon, https://fosstodon.org/@airflow
@@ -29,7 +29,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: System :: Monitoring
 Requires-Python: !=3.15,>=3.10
-Requires-Dist: apache-airflow-core<3.3.0,>=3.2.0rc1
+Requires-Dist: apache-airflow-core<3.3.0,>=3.2.0
 Requires-Dist: asgiref>=2.3.0; python_version < '3.14'
 Requires-Dist: asgiref>=3.11.1; python_version >= '3.14'
 Requires-Dist: attrs!=25.2.0,>=24.2.0

{apache_airflow_task_sdk-1.2.0rc2 → apache_airflow_task_sdk-1.2.1}/pyproject.toml

@@ -48,7 +48,7 @@ classifiers = [
     "Topic :: System :: Monitoring",
 ]
 dependencies = [
-    "apache-airflow-core<3.3.0,>=3.2.0rc1",
+    "apache-airflow-core<3.3.0,>=3.2.0",
     "asgiref>=2.3.0; python_version < '3.14'",
     "asgiref>=3.11.1; python_version >= '3.14'",
     "attrs>=24.2.0, !=25.2.0",
@@ -108,8 +108,8 @@ dependencies = [
 
 [project.urls]
 "Bug Tracker" = "https://github.com/apache/airflow/issues"
-Documentation = "https://airflow.staged.apache.org/docs/"
-Homepage = "https://airflow.staged.apache.org/"
+Documentation = "https://airflow.apache.org/docs/"
+Homepage = "https://airflow.apache.org/"
 "Slack Chat" = "https://s.apache.org/airflow-slack"
 "Source Code" = "https://github.com/apache/airflow"
 Mastodon = "https://fosstodon.org/@airflow"
@@ -120,7 +120,7 @@ YouTube = "https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/"
 [build-system]
 requires = [
     "hatchling==1.29.0",
-    "packaging==26.0",
+    "packaging==26.1",
     "pathspec==1.0.4",
     "pluggy==1.6.0",
     "tomli==2.4.1; python_version < '3.11'",

{apache_airflow_task_sdk-1.2.0rc2 → apache_airflow_task_sdk-1.2.1}/src/airflow/sdk/__init__.py

@@ -93,7 +93,7 @@ __all__ = [
     "teardown",
 ]
 
-__version__ = "1.2.0rc2"
+__version__ = "1.2.1"
 
 if TYPE_CHECKING:
     from airflow.sdk.api.datamodels._generated import DagRunState, TaskInstanceState, TriggerRule, WeightRule

{apache_airflow_task_sdk-1.2.0rc2 → apache_airflow_task_sdk-1.2.1}/src/airflow/sdk/_shared/configuration/parser.py

@@ -257,6 +257,7 @@ class AirflowConfigParser(ConfigParser):
         ("scheduler", "ti_metrics_interval"): ("scheduler", "running_metrics_interval", "3.2.0"),
         ("api", "fallback_page_limit"): ("api", "page_size", "3.2.0"),
         ("workers", "missing_dag_retries"): ("workers", "missing_dag_retires", "3.1.8"),
+        ("database", "sql_alchemy_conn"): ("core", "sql_alchemy_conn", "3.0"),
     }
 
     # A mapping of new section -> (old section, since_version).

{apache_airflow_task_sdk-1.2.0rc2 → apache_airflow_task_sdk-1.2.1}/src/airflow/sdk/_shared/logging/structlog.py

@@ -95,10 +95,15 @@ def _make_airflow_structlogger(min_level):
             if not args:
                 return self._proxy_to_logger(name, event, **kw)
 
-            # See https://github.com/python/cpython/blob/3.13/Lib/logging/__init__.py#L307-L326 for reason
-            if args and len(args) == 1 and isinstance(args[0], Mapping) and args[0]:
-                return self._proxy_to_logger(name, event % args[0], **kw)
-            return self._proxy_to_logger(name, event % args, **kw)
+            # Match CPython's stdlib logging behavior: try positional formatting first,
+            # fall back to named substitution only if that fails.
+            # See https://github.com/python/cpython/blob/3.13/Lib/logging/__init__.py#L307-L326
+            try:
+                return self._proxy_to_logger(name, event % args, **kw)
+            except (TypeError, KeyError):
+                if len(args) == 1 and isinstance(args[0], Mapping) and args[0]:
+                    return self._proxy_to_logger(name, event % args[0], **kw)
+                raise
 
         meth.__name__ = name
         return meth
@@ -216,6 +221,30 @@ def drop_positional_args(logger: Any, method_name: Any, event_dict: EventDict) -
     return event_dict
 
 
+def positional_arguments_formatter(logger: Any, method_name: Any, event_dict: EventDict) -> EventDict:
+    """
+    Format positional arguments matching CPython's stdlib logging behavior.
+
+    Replaces structlog's built-in PositionalArgumentsFormatter to correctly handle the case
+    where a single dict is passed as a positional argument (e.g. ``log.warning('%s', {'a': 1})``).
+
+    CPython tries positional formatting first (``msg % args``), and only falls back to named
+    substitution (``msg % args[0]``) if that raises TypeError or KeyError. structlog's built-in
+    formatter does it the other way around, causing TypeError for ``%s`` format specifiers.
+    """
+    args = event_dict.get("positional_args")
+    if args:
+        try:
+            event_dict["event"] = event_dict["event"] % args
+        except (TypeError, KeyError):
+            if len(args) == 1 and isinstance(args[0], Mapping) and args[0]:
+                event_dict["event"] = event_dict["event"] % args[0]
+            else:
+                raise
+        del event_dict["positional_args"]
+    return event_dict
+
+
 # This is a placeholder fn, that is "edited" in place via the `suppress_logs_and_warning` decorator
 # The reason we need to do it this way is that structlog caches loggers on first use, and those include the
 # configured processors, so we can't get away with changing the config as it won't have any effect once the
@@ -268,7 +297,7 @@ def structlog_processors(
         timestamper,
         structlog.contextvars.merge_contextvars,
         structlog.processors.add_log_level,
-        structlog.stdlib.PositionalArgumentsFormatter(),
+        positional_arguments_formatter,
         logger_name,
         redact_jwt,
         structlog.processors.StackInfoRenderer(),

{apache_airflow_task_sdk-1.2.0rc2 → apache_airflow_task_sdk-1.2.1}/src/airflow/sdk/_shared/observability/metrics/otel_logger.py

@@ -433,6 +433,22 @@ def get_otel_logger(
         )
         readers.append(export_to_console)
 
+    # Reset the OTel SDK's Once() guard so set_meter_provider() can succeed.
+    # This is necessary when get_otel_logger() is called after a process fork:
+    # the parent's _METER_PROVIDER_SET_ONCE._done = True is inherited by the child,
+    # causing set_meter_provider() to silently fail with "Overriding of current
+    # MeterProvider is not allowed". The child then uses the parent's stale provider
+    # whose PeriodicExportingMetricReader thread is dead after fork.
+    # On first call (no fork), _done is already False so this is a no-op.
+    # See: https://github.com/apache/airflow/issues/64690
+    try:
+        import opentelemetry.metrics._internal as _metrics_internal
+
+        _metrics_internal._METER_PROVIDER_SET_ONCE._done = False
+        _metrics_internal._METER_PROVIDER = None
+    except (ImportError, AttributeError):
+        pass
+
     metrics.set_meter_provider(
         MeterProvider(
             resource=resource,

{apache_airflow_task_sdk-1.2.0rc2 → apache_airflow_task_sdk-1.2.1}/src/airflow/sdk/bases/decorator.py

@@ -30,6 +30,7 @@ import typing_extensions
 
 from airflow.sdk import TriggerRule, timezone
 from airflow.sdk.bases.operator import (
+    BASEOPERATOR_ARGS_EXPECTED_TYPES,
     BaseOperator,
     coerce_resources,
     coerce_timedelta,
@@ -498,6 +499,13 @@ class _TaskDecorator(ExpandableFactory, Generic[FParams, FReturn, OperatorSubcla
         if "self" in self.function_signature.parameters:
             raise TypeError(f"@{self.decorator_name} does not support methods")
         self.kwargs.setdefault("task_id", self.function.__name__)
+        for arg_name, expected_type in BASEOPERATOR_ARGS_EXPECTED_TYPES.items():
+            if arg_name in self.kwargs:
+                value = self.kwargs[arg_name]
+                if value is not None and not isinstance(value, expected_type):
+                    raise TypeError(
+                        f"Expected {arg_name!r} to be {expected_type}, got {type(value).__name__}: {value!r}"
+                    )
         update_wrapper(self, self.function)
 
     def __call__(self, *args: FParams.args, **kwargs: FParams.kwargs) -> XComArg:

{apache_airflow_task_sdk-1.2.0rc2 → apache_airflow_task_sdk-1.2.1}/src/airflow/sdk/configuration.py

@@ -30,6 +30,7 @@ from airflow.sdk import yaml
 from airflow.sdk._shared.configuration.parser import (
     AirflowConfigParser as _SharedAirflowConfigParser,
     configure_parser_from_configuration_description,
+    expand_env_var,
 )
 from airflow.sdk.execution_time.secrets import _SERVER_DEFAULT_SECRETS_SEARCH_PATH
 
@@ -99,7 +100,7 @@ def get_sdk_expansion_variables() -> dict[str, Any]:
     SDK only needs AIRFLOW_HOME for expansion. Core specific variables
     (FERNET_KEY, JWT_SECRET_KEY, etc.) are not needed in the SDK.
     """
-    airflow_home = os.environ.get("AIRFLOW_HOME", os.path.expanduser("~/airflow"))
+    airflow_home = expand_env_var(os.environ.get("AIRFLOW_HOME", os.path.expanduser("~/airflow")))
     return {
         "AIRFLOW_HOME": airflow_home,
     }
@@ -107,8 +108,11 @@ def get_sdk_expansion_variables() -> dict[str, Any]:
 
 def get_airflow_config() -> str:
     """Get path to airflow.cfg file."""
-    airflow_home = os.environ.get("AIRFLOW_HOME", os.path.expanduser("~/airflow"))
-    return os.path.join(airflow_home, "airflow.cfg")
+    airflow_config_var = os.environ.get("AIRFLOW_CONFIG")
+    if airflow_config_var is None:
+        airflow_home: str = os.environ.get("AIRFLOW_HOME", os.path.expanduser("~/airflow"))
+        return os.path.join(expand_env_var(airflow_home), "airflow.cfg")
+    return expand_env_var(airflow_config_var)
 
 
 class AirflowSDKConfigParser(_SharedAirflowConfigParser):

{apache_airflow_task_sdk-1.2.0rc2 → apache_airflow_task_sdk-1.2.1}/src/airflow/sdk/execution_time/comms.py

@@ -216,7 +216,7 @@ class CommsDecoder(Generic[ReceiveMsgType, SendMsgType]):
                 # always be in the return type union
                 return resp  # type: ignore[return-value]
 
-        return self._get_response()
+            return self._get_response()
 
     async def asend(self, msg: SendMsgType) -> ReceiveMsgType | None:
         """

{apache_airflow_task_sdk-1.2.0rc2 → apache_airflow_task_sdk-1.2.1}/src/airflow/sdk/execution_time/supervisor.py

@@ -1184,7 +1184,7 @@ class ActivitySubprocess(WatchedSubprocess):
             # Reset the counter on success
             self.failed_heartbeats = 0
         except ServerResponseError as e:
-            if e.response.status_code in {HTTPStatus.NOT_FOUND, HTTPStatus.CONFLICT}:
+            if e.response.status_code in {HTTPStatus.NOT_FOUND, HTTPStatus.GONE, HTTPStatus.CONFLICT}:
                 log.error(
                     "Server indicated the task shouldn't be running anymore",
                     detail=e.detail,

{apache_airflow_task_sdk-1.2.0rc2 → apache_airflow_task_sdk-1.2.1}/src/airflow/sdk/plugins_manager.py

@@ -27,7 +27,7 @@ from airflow import settings
 from airflow.sdk._shared.module_loading import import_string
 from airflow.sdk._shared.observability.metrics.stats import Stats
 from airflow.sdk._shared.plugins_manager import (
-    AirflowPlugin,
+    AirflowPlugin as AirflowPlugin,
     _load_entrypoint_plugins,
     _load_plugins_from_plugin_directory,
     integrate_listener_plugins as _integrate_listener_plugins,

{apache_airflow_task_sdk-1.2.0rc2 → apache_airflow_task_sdk-1.2.1}/tests/task_sdk/bases/test_decorator.py

@@ -197,6 +197,39 @@ class TestDefaultFillingLogic:
 
         assert make_op(dummy_task, op_kwargs={"a": 1, "kw_required": "x"}) is not None
 
+    @pytest.mark.parametrize(
+        ("kwargs", "match"),
+        [
+            pytest.param(
+                {"task_id": "fetch_{}".format},
+                "Expected 'task_id' to be .*, got builtin_function_or_method",
+                id="task_id_bound_method",
+            ),
+            pytest.param(
+                {"retries": "three"},
+                "Expected 'retries' to be .*, got str",
+                id="retries_string",
+            ),
+            pytest.param(
+                {"queue": 42},
+                "Expected 'queue' to be .*, got int",
+                id="queue_int",
+            ),
+            pytest.param(
+                {"priority_weight": 1.5},
+                "Expected 'priority_weight' to be .*, got float",
+                id="priority_weight_float",
+            ),
+        ],
+    )
+    def test_wrong_arg_type_raises_type_error_at_decoration_time(self, kwargs, match):
+        """Non-matching types for operator kwargs raise TypeError at decoration time."""
+        with pytest.raises(TypeError, match=match):
+
+            @task(**kwargs)
+            def my_task():
+                return 1
+
 
 def make_op(func, op_args=None, op_kwargs=None, **kwargs):
     return DummyDecoratedOperator(

{apache_airflow_task_sdk-1.2.0rc2 → apache_airflow_task_sdk-1.2.1}/tests/task_sdk/execution_time/test_comms.py

@@ -23,10 +23,17 @@ from socket import socketpair
 
 import msgspec
 import pytest
+import structlog
 
 from airflow.sdk import timezone
-from airflow.sdk.execution_time.comms import BundleInfo, MaskSecret, StartupDetails, _ResponseFrame
-from airflow.sdk.execution_time.task_runner import CommsDecoder
+from airflow.sdk.execution_time.comms import (
+    BundleInfo,
+    CommsDecoder,
+    MaskSecret,
+    StartupDetails,
+    VariableResult,
+    _ResponseFrame,
+)
 
 
 class TestCommsModels:
@@ -148,3 +155,41 @@ class TestCommsDecoder:
         # It actually failed to read at all for large values, but lets just make sure we get it all
         assert len(msg.value) == 10 * 1024 * 1024 + 1
         assert msg.value[-1] == "b"
+
+    def test_send_thread_safety(self):
+        r, w = socketpair()
+        decoder = CommsDecoder(socket=r, log=structlog.get_logger())
+        num_threads = 5
+        results = [None] * num_threads
+        errors = [None] * num_threads
+        request_sent = [threading.Event() for _ in range(num_threads)]
+
+        def send_and_store(idx):
+            request_sent[idx].set()  # Signal that this thread is about to send
+            try:
+                msg = VariableResult(key=f"key{idx}", value=f"value{idx}", type="VariableResult")
+                results[idx] = decoder.send(msg)
+            except Exception as e:
+                errors[idx] = e
+
+        threads = [threading.Thread(target=send_and_store, args=(i,)) for i in range(num_threads)]
+        for t in threads:
+            t.start()
+
+        # For each thread, wait until it signals it's ready, then send the response
+        for idx in range(num_threads):
+            request_sent[idx].wait()
+            resp = {"type": "VariableResult", "key": f"key{idx}", "value": f"value{idx}"}
+            frame = _ResponseFrame(idx, resp, None)
+            data = msgspec.msgpack.encode(frame)
+            w.sendall(len(data).to_bytes(4, byteorder="big") + data)
+
+        for t in threads:
+            t.join(timeout=5)
+        for idx, t in enumerate(threads):
+            assert not t.is_alive(), f"Thread {idx} did not finish (possible deadlock or hang in send method)"
+
+        for idx in range(num_threads):
+            assert errors[idx] is None, f"Thread {idx} error: {errors[idx]}"
+            assert results[idx].key == f"key{idx}", f"Out-of-order or missing response for thread {idx}"
+            assert results[idx].value == f"value{idx}", f"Incorrect value for thread {idx}"

{apache_airflow_task_sdk-1.2.0rc2 → apache_airflow_task_sdk-1.2.1}/tests/task_sdk/test_configuration.py

@@ -23,7 +23,7 @@ from unittest import mock
 import pytest
 
 from airflow.sdk._shared.configuration.exceptions import AirflowConfigException
-from airflow.sdk.configuration import conf
+from airflow.sdk.configuration import conf, get_airflow_config
 from airflow.sdk.providers_manager_runtime import ProvidersManagerTaskRuntime
 
 from tests_common.test_utils.config import (
@@ -156,3 +156,31 @@ class TestSDKProviderConfigPriority:
         custom_value = "my_custom.celery_executor"
         with conf_vars({("celery", "celery_app_name"): custom_value}):
             assert conf.get("celery", "celery_app_name") == custom_value
+
+
+class TestGetAirflowConfig:
+    """Tests for get_airflow_config respecting AIRFLOW_CONFIG env var."""
+
+    def test_returns_airflow_config_env_var(self):
+        """get_airflow_config returns AIRFLOW_CONFIG when set."""
+        with mock.patch.dict("os.environ", {"AIRFLOW_CONFIG": "/custom/path/airflow.cfg"}):
+            assert get_airflow_config() == "/custom/path/airflow.cfg"
+
+    def test_expands_env_var_in_airflow_config(self):
+        """get_airflow_config expands env vars in AIRFLOW_CONFIG."""
+        with mock.patch.dict(
+            "os.environ", {"AIRFLOW_CONFIG": "$CUSTOM_DIR/airflow.cfg", "CUSTOM_DIR": "/resolved"}
+        ):
+            assert get_airflow_config() == "/resolved/airflow.cfg"
+
+    def test_default_fallback_when_airflow_config_not_set(self):
+        """get_airflow_config returns {AIRFLOW_HOME}/airflow.cfg when AIRFLOW_CONFIG is absent."""
+        env = {"AIRFLOW_HOME": "/custom/home"}
+        with mock.patch.dict("os.environ", env, clear=True):
+            assert get_airflow_config() == "/custom/home/airflow.cfg"
+
+    def test_expands_env_var_in_airflow_home_fallback(self):
+        """get_airflow_config expands env vars in AIRFLOW_HOME when AIRFLOW_CONFIG is absent."""
+        env = {"AIRFLOW_HOME": "$CUSTOM_DIR/airflow", "CUSTOM_DIR": "/resolved"}
+        with mock.patch.dict("os.environ", env, clear=True):
+            assert get_airflow_config() == "/resolved/airflow/airflow.cfg"