uranusjr commented on code in PR #70805:
URL: https://github.com/apache/airflow/pull/70805#discussion_r3732712950
##########
task-sdk/src/airflow/sdk/coordinators/_subprocess.py:
##########
@@ -385,23 +400,148 @@ class SubprocessCoordinator(BaseCoordinator):
:param task_startup_timeout: Maximum time the coordinator waits for the
subprocess to connect to both servers, in seconds. The default is 10
seconds.
+ :param dag_bundle_name: Locate artifacts through a configured Dag bundle
rather
+ than an explicit root. Mutually exclusive with the subclass's explicit
root;
+ if neither is set, the task's own bundle is used. A named bundle
resolves to
+ its latest version; the task's own bundle is pinned to the run's
version.
"""
task_startup_timeout: float = 10.0
+ dag_bundle_name: str | None = None
+
+ # Name of the subclass's explicit-root kwarg, used only in error messages.
+ # Subclasses that expose an explicit root set this and override
+ # :meth:`_explicit_artifact_roots`; a subclass that does neither lands on
the
+ # task-bundle default instead of failing at execute time.
+ _root_kwarg: ClassVar[str] = "root"
+
+ # Classified once at construction by :meth:`_classify_artifact_source` and
+ # dispatched on by :meth:`_init_root_source` at execute time.
+ _artifact_source: _ArtifactSource | None = attrs.field(init=False,
default=None)
+ # The subclass's explicit root, recorded at construction so the base can
+ # resolve roots without knowing the subclass field name.
+ _configured_roots: list[pathlib.Path] = attrs.field(init=False,
factory=list)
+ # The task's own bundle, bound for the duration of a single
:meth:`execute_task`
+ # call by :meth:`_set_current_bundle` so :meth:`_init_root_source` can
resolve
+ # co-located artifacts.
+ _active_bundle_info: BundleInfo | None = attrs.field(init=False,
default=None)
+
+ @property
+ def _explicit_artifact_roots(self) -> Sequence[pathlib.Path]:
+ """Subclass's explicit artifact roots; empty (the default) selects
task-bundle mode."""
+ return []
+
+ def __attrs_post_init__(self) -> None:
+ self._classify_artifact_source(self._explicit_artifact_roots,
root_kwarg=self._root_kwarg)
+
+ def _classify_artifact_source(self, configured: Sequence[pathlib.Path], *,
root_kwarg: str) -> None:
+ """
+ Classify and validate how this coordinator locates artifacts
(construction time).
- def _build_execute_task_command(self, *, what: TaskInstance) ->
tuple[list[str], str | None]:
+ Called from :meth:`__attrs_post_init__` with the subclass's explicit
+ roots. It rejects setting both an explicit root and
``dag_bundle_name``,
+ fails fast when ``dag_bundle_name`` names a bundle that is not
configured,
+ and records the resulting :class:`_ArtifactSource` and explicit root.
+ """
+ if configured and self.dag_bundle_name is not None:
+ raise ValueError(
+ f"Set at most one of {root_kwarg!r} or 'dag_bundle_name':
{root_kwarg!r} for an "
+ f"explicit path, 'dag_bundle_name' for a configured Dag
bundle, or leave both "
+ f"unset to scan the task's own bundle."
+ )
+ if configured:
+ source = _ArtifactSource.EXPLICIT_ROOT
+ self._configured_roots = list(configured)
+ elif self.dag_bundle_name is not None:
+ source = _ArtifactSource.NAMED_BUNDLE
+ from airflow.dag_processing.bundles.manager import
DagBundlesManager # noqa: SDK002
+
+ if not
DagBundlesManager.is_bundle_configured(self.dag_bundle_name):
+ raise ValueError(
+ f"Coordinator 'dag_bundle_name' references unconfigured
Dag bundle "
+ f"{self.dag_bundle_name!r}."
+ )
+ else:
+ source = _ArtifactSource.TASK_BUNDLE
+
+ self._artifact_source = source
+ details: dict[str, str | list[str]] = {"mode": source.name}
+ if self.dag_bundle_name is not None:
+ details["dag_bundle_name"] = self.dag_bundle_name
+ if self._configured_roots:
+ details["configured_roots"] = [str(root) for root in
self._configured_roots]
+ log.debug("Coordinator artifact source selected", **details)
Review Comment:
```suggestion
log.debug(
"Coordinator artifact source selected",
mode=source.name,
dag_bundle_name=self.dag_bundle_name,
configured_roots=[str(root) for root in self._configured_roots],
)
```
This is just a debug logging message, there’s no need to make it complicated.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
