Skip to content

Commit 303d6c3

Browse files
committed
* Rename latest_bundle_version to bundle_version
* Fix the list_dags function, to filter the dags by bundle name
1 parent 509cbf8 commit 303d6c3

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

airflow/api_connexion/schemas/dag_schema.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class Meta:
5252
dag_id = auto_field(dump_only=True)
5353
dag_display_name = fields.String(attribute="dag_display_name", dump_only=True)
5454
bundle_name = auto_field(dump_only=True)
55-
latest_bundle_version = auto_field(dump_only=True)
55+
bundle_version = auto_field(dump_only=True)
5656
is_paused = auto_field()
5757
is_active = auto_field(dump_only=True)
5858
last_parsed_time = auto_field(dump_only=True)

airflow/cli/cli_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,7 @@ def string_lower_type(val):
931931
("--columns",),
932932
type=string_list_type,
933933
help="List of columns to render. (default: ['dag_id', 'fileloc', 'owner', 'is_paused'])",
934-
default=("dag_id", "fileloc", "owners", "is_paused", "bundle_name", "latest_bundle_version"),
934+
default=("dag_id", "fileloc", "owners", "is_paused", "bundle_name", "bundle_version"),
935935
)
936936

937937
ARG_ASSET_LIST_COLUMNS = Arg(

airflow/cli/commands/remote_commands/dag_command.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17+
1718
"""Dag sub-commands."""
1819

1920
from __future__ import annotations
@@ -315,7 +316,7 @@ def print_execution_interval(interval: DataInterval | None):
315316
@suppress_logs_and_warning
316317
@providers_configuration_loaded
317318
@provide_session
318-
def dag_list_dags(args, session=NEW_SESSION) -> None:
319+
def dag_list_dags(args, session: Session = NEW_SESSION) -> None:
319320
"""Display dags with or without stats at the command line."""
320321
cols = args.columns if args.columns else []
321322
invalid_cols = [c for c in cols if c not in dag_schema.fields]
@@ -350,8 +351,14 @@ def get_dag_detail(dag: DAG) -> dict:
350351
dag_detail = _get_dagbag_dag_details(dag)
351352
return {col: dag_detail[col] for col in valid_cols}
352353

354+
def filter_dags_by_bundle():
355+
"""Filter DAGs based on the specified bundle name, if provided."""
356+
if args.bundle_name:
357+
return [dag for dag in dagbag.dags.values() if dag.get_bundle_name() == args.bundle_name]
358+
return dagbag.dags.values()
359+
353360
AirflowConsole().print_as(
354-
data=sorted(dagbag.dags.values(), key=operator.attrgetter("dag_id")),
361+
data=sorted(filter_dags_by_bundle(), key=operator.attrgetter("dag_id")),
355362
output=args.output,
356363
mapper=get_dag_detail,
357364
)
@@ -361,7 +368,7 @@ def get_dag_detail(dag: DAG) -> dict:
361368
@suppress_logs_and_warning
362369
@providers_configuration_loaded
363370
@provide_session
364-
def dag_details(args, session=NEW_SESSION):
371+
def dag_details(args, session: Session = NEW_SESSION):
365372
"""Get DAG details given a DAG id."""
366373
dag = DagModel.get_dagmodel(args.dag_id, session=session)
367374
if not dag:

0 commit comments

Comments
 (0)