bugraoz93 commented on code in PR #44332: URL: https://github.com/apache/airflow/pull/44332#discussion_r1876867323
########## airflow/api_fastapi/core_api/routes/ui/grid.py: ########## @@ -0,0 +1,210 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +from __future__ import annotations + +import collections +import itertools + +from fastapi import HTTPException, Request, status +from sqlalchemy import func, select + +from airflow import DAG +from airflow.api_fastapi.common.db.common import SessionDep, paginated_select +from airflow.api_fastapi.common.parameters import ( + OptionalDateTimeQuery, + QueryDagRunRunTypesFilter, + QueryDagRunStateFilter, + QueryIncludeDownstream, + QueryIncludeUpstream, + QueryLimit, + QueryOffset, + SortParam, +) +from airflow.api_fastapi.common.router import AirflowRouter +from airflow.api_fastapi.core_api.datamodels.ui.grid import ( + GridDAGRunwithTIs, + GridResponse, +) +from airflow.api_fastapi.core_api.openapi.exceptions import create_openapi_http_exception_doc +from airflow.api_fastapi.core_api.services.ui.grid import ( + fill_task_instance_summaries, + get_dag_run_sort_param, + get_task_group_map, +) +from airflow.models import DagRun, TaskInstance +from airflow.models.dagrun import DagRunNote +from airflow.models.taskinstance import TaskInstanceNote +from airflow.utils import timezone + +grid_router = AirflowRouter(prefix="/grid", tags=["Grid"]) + + +@grid_router.get( + "/{dag_id}", + include_in_schema=False, + responses=create_openapi_http_exception_doc([status.HTTP_400_BAD_REQUEST, status.HTTP_404_NOT_FOUND]), +) +def grid_data( + dag_id: str, + run_types: QueryDagRunRunTypesFilter, + run_states: QueryDagRunStateFilter, + session: SessionDep, + offset: QueryOffset, + request: Request, + num_runs: QueryLimit, + include_upstream: QueryIncludeUpstream = False, + include_downstream: QueryIncludeDownstream = False, + base_date: OptionalDateTimeQuery = None, + root: str | None = None, +) -> GridResponse: + """Return grid data.""" + dag: DAG = request.app.state.dag_bag.get_dag(dag_id) + if not dag: + raise HTTPException(status.HTTP_404_NOT_FOUND, f"Dag with id {dag_id} was not found") + + current_time = timezone.utcnow() + # Retrieve, sort and encode the previous DAG Runs + base_query = ( + select( + DagRun.run_id, + DagRun.queued_at, + DagRun.start_date, + DagRun.end_date, + DagRun.state, + DagRun.run_type, + DagRun.data_interval_start, + DagRun.data_interval_end, + DagRun.dag_version_id.label("version_number"), + DagRunNote.content.label("note"), + ) + .join(DagRun.dag_run_note, isouter=True) + .select_from(DagRun) + .where(DagRun.dag_id == dag.dag_id, DagRun.logical_date <= func.coalesce(base_date, current_time)) + ) + + dag_runs_select_filter, _ = paginated_select( + statement=base_query, + filters=[ + run_types, + run_states, + ], + order_by=get_dag_run_sort_param(dag=dag), Review Comment: Included as a parameter, if it isn't supplied default logic working, I have included a unit test for `order_by` too. Please let me know if this works -- 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: commits-unsubscr...@airflow.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
