pierrejeambrun commented on code in PR #42320:
URL: https://github.com/apache/airflow/pull/42320#discussion_r1768699784
##########
airflow/api_fastapi/views/public/dags.py:
##########
@@ -35,39 +42,29 @@
@dags_router.get("/dags")
async def get_dags(
*,
- limit: int = 100,
- offset: int = 0,
- tags: Annotated[list[str] | None, Query()] = None,
- dag_id_pattern: str | None = None,
- only_active: bool = True,
- paused: bool | None = None,
- order_by: str = "dag_id",
+ limit: QueryLimit,
+ offset: QueryOffset,
+ tags: QueryTagsFilter,
+ dag_id_pattern: QueryDagIdPatternSearch,
+ only_active: QueryOnlyActiveFilter,
+ paused: QueryPausedFilter,
+ order_by: Annotated[SortParam, Depends(SortParam(["dag_id"]))],
session: Annotated[Session, Depends(get_session)],
) -> DAGCollectionResponse:
"""Get all DAGs."""
- allowed_sorting_attrs = ["dag_id"]
dags_query = select(DagModel)
- if only_active:
- dags_query = dags_query.where(DagModel.is_active)
- if paused is not None:
- if paused:
- dags_query = dags_query.where(DagModel.is_paused)
- else:
- dags_query = dags_query.where(~DagModel.is_paused)
- if dag_id_pattern:
- dags_query =
dags_query.where(DagModel.dag_id.ilike(f"%{dag_id_pattern}%"))
+
+ dags_query = apply_filters_to_query(dags_query, [only_active, paused,
dag_id_pattern, tags])
# TODO: Re-enable when permissions are handled.
# readable_dags = get_auth_manager().get_permitted_dag_ids(user=g.user)
# dags_query = dags_query.where(DagModel.dag_id.in_(readable_dags))
- if tags:
- cond = [DagModel.tags.any(DagTag.name == tag) for tag in tags]
- dags_query = dags_query.where(or_(*cond))
-
total_entries = get_query_count(dags_query, session=session)
- dags_query = apply_sorting(dags_query, order_by, {}, allowed_sorting_attrs)
- dags = session.scalars(dags_query.offset(offset).limit(limit)).all()
+
+ dags_query = apply_filters_to_query(dags_query, [order_by, offset, limit])
+
+ dags = session.scalars(dags_query).all()
Review Comment:
Do you happen do have found a good documentation on SQLAlchemy internal
types and how to type annotate sqlalchemy expressions (columns, selectables,
filters, cte, etc...) I can't put my hand on that in their doc. I remember
having the same issue with 1.x version.
--
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]
