Skip to content

[v3-1-test] Simplify _version_from_dag_run (#63362) #63529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pierrejeambrun wants to merge 1 commit into from
Closed

[v3-1-test] Simplify _version_from_dag_run (#63362) #63529

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 7 additions & 14 deletions airflow-core/src/airflow/models/dagbag.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@
from pathlib import Path
from typing import TYPE_CHECKING, NamedTuple

from sqlalchemy import Column, String, inspect, select
from sqlalchemy import Column, String, select
from sqlalchemy.orm import joinedload
from sqlalchemy.orm.attributes import NO_VALUE
from tabulate import tabulate

from airflow import settings
Expand Down Expand Up @@ -73,6 +72,7 @@

if TYPE_CHECKING:
from collections.abc import Generator
from uuid import UUID

from sqlalchemy.orm import Session

Expand Down Expand Up @@ -746,23 +746,16 @@ def _get_dag(self, version_id: str, session: Session) -> SerializedDAG | None:
return self._read_dag(serdag)

@staticmethod
def _version_from_dag_run(dag_run: DagRun, *, session: Session) -> DagVersion:
def _version_from_dag_run(dag_run: DagRun, *, session: Session) -> UUID | None:
if not dag_run.bundle_version:
if dag_version := DagVersion.get_latest_version(dag_id=dag_run.dag_id, session=session):
return dag_version
return dag_version.id

# Check if created_dag_version relationship is already loaded to avoid DetachedInstanceError
info = inspect(dag_run)
if info.attrs.created_dag_version.loaded_value is not NO_VALUE:
# Relationship is already loaded, safe to access
return dag_run.created_dag_version

# Relationship not loaded, fetch it explicitly from current session
return session.get(DagVersion, dag_run.created_dag_version_id)
return dag_run.created_dag_version_id

def get_dag_for_run(self, dag_run: DagRun, session: Session) -> SerializedDAG | None:
if version := self._version_from_dag_run(dag_run=dag_run, session=session):
return self._get_dag(version_id=version.id, session=session)
if version_id := self._version_from_dag_run(dag_run=dag_run, session=session):
return self._get_dag(version_id=version_id, session=session)
return None

def iter_all_latest_version_dags(self, *, session: Session) -> Generator[SerializedDAG, None, None]:
Expand Down
Loading