Refactor datetime_range_filter_factory: coalesce only start_date and end_date filters

sunank200 · sunank200 · commit 15d473e7e197 · 2025-06-23T21:07:14.000+05:45
diff --git a/airflow-core/src/airflow/api_fastapi/common/parameters.py b/airflow-core/src/airflow/api_fastapi/common/parameters.py
@@ -37,7 +37,7 @@
 from fastapi import Depends, HTTPException, Query, status
 from pendulum.parsing.exceptions import ParserError
 from pydantic import AfterValidator, BaseModel, NonNegativeInt
-from sqlalchemy import Column, and_, case, or_
+from sqlalchemy import Column, and_, case, func, or_
 from sqlalchemy.inspection import inspect
 
 from airflow.api_fastapi.core_api.base import OrmClause
@@ -493,9 +493,12 @@ def depends_datetime(
         lower_bound: datetime | None = Query(alias=f"{filter_name}_gte", default=None),
         upper_bound: datetime | None = Query(alias=f"{filter_name}_lte", default=None),
     ) -> RangeFilter:
+        attr = getattr(model, attribute_name or filter_name)
+        if filter_name in ("start_date", "end_date"):
+            attr = func.coalesce(attr, func.now())
         return RangeFilter(
             Range(lower_bound=lower_bound, upper_bound=upper_bound),
-            getattr(model, attribute_name or filter_name),
+            attr,
         )
 
     return depends_datetime
diff --git a/airflow-core/src/airflow/api_fastapi/core_api/routes/public/task_instances.py b/airflow-core/src/airflow/api_fastapi/core_api/routes/public/task_instances.py
@@ -22,7 +22,7 @@
 
 import structlog
 from fastapi import Depends, HTTPException, Query, status
-from sqlalchemy import func, or_, select
+from sqlalchemy import or_, select
 from sqlalchemy.orm import joinedload
 from sqlalchemy.sql.selectable import Select
 
@@ -209,10 +209,6 @@ def get_mapped_task_instances(
         executor,
         version_number,
     ]
-    if state.value is not None and None in state.value:
-        current_time = func.now()
-        for f in (start_date_range, end_date_range):
-            f.attribute = func.coalesce(f.attribute, current_time)
     task_instance_select, total_entries = paginated_select(
         statement=query,
         filters=cast("Sequence[OrmClause[Any]]", filters),
@@ -480,10 +476,6 @@ def get_task_instances(
         executor,
         version_number,
     ]
-    if state.value is not None and None in state.value:
-        current_time = func.now()
-        for f in (start_date_range, end_date_range):
-            f.attribute = func.coalesce(f.attribute, current_time)
     task_instance_select, total_entries = paginated_select(
         statement=query,
         filters=cast("Sequence[OrmClause[Any]]", filters),
