Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,12 @@ def get_mapped_task_instances(
dag_bag: DagBagDep,
run_after_range: Annotated[RangeFilter, Depends(datetime_range_filter_factory("run_after", TI))],
logical_date_range: Annotated[RangeFilter, Depends(datetime_range_filter_factory("logical_date", TI))],
start_date_range: Annotated[RangeFilter, Depends(datetime_range_filter_factory("start_date", TI))],
start_date_range: Annotated[
RangeFilter,
Depends(
datetime_range_filter_factory("start_date", TI, null_lower_bound_clause=TI.end_date.is_(None))
),
],
end_date_range: Annotated[RangeFilter, Depends(datetime_range_filter_factory("end_date", TI))],
update_at_range: Annotated[RangeFilter, Depends(datetime_range_filter_factory("updated_at", TI))],
duration_range: Annotated[RangeFilter, Depends(float_range_filter_factory("duration", TI))],
Expand Down Expand Up @@ -560,7 +565,12 @@ def get_task_instances(
task_id: Annotated[FilterParam[str | None], Depends(filter_param_factory(TI.task_id, str | None))],
run_after_range: Annotated[RangeFilter, Depends(datetime_range_filter_factory("run_after", TI))],
logical_date_range: Annotated[RangeFilter, Depends(datetime_range_filter_factory("logical_date", TI))],
start_date_range: Annotated[RangeFilter, Depends(datetime_range_filter_factory("start_date", TI))],
start_date_range: Annotated[
RangeFilter,
Depends(
datetime_range_filter_factory("start_date", TI, null_lower_bound_clause=TI.end_date.is_(None))
),
],
end_date_range: Annotated[RangeFilter, Depends(datetime_range_filter_factory("end_date", TI))],
update_at_range: Annotated[RangeFilter, Depends(datetime_range_filter_factory("updated_at", TI))],
duration_range: Annotated[RangeFilter, Depends(float_range_filter_factory("duration", TI))],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1361,6 +1361,25 @@ def test_with_date(self, test_client, one_task_with_mapped_tis):
assert body["total_entries"] == 0
assert body["task_instances"] == []

def test_start_date_lower_bound_excludes_finished_tis_with_null_start_date(
self, test_client, one_task_with_mapped_tis, session
):
session.execute(
update(TaskInstance)
.where(TaskInstance.task_id == "task_2", TaskInstance.map_index == 0)
.values(start_date=None, end_date=DEFAULT_DATETIME_2, state=TaskInstanceState.FAILED)
)
session.commit()

response = test_client.get(
"/dags/mapped_tis/dagRuns/run_mapped_tis/taskInstances/task_2/listMapped",
params={"start_date_gte": DEFAULT_DATETIME_1},
)
assert response.status_code == 200
body = response.json()
assert body["total_entries"] == 2
assert [ti["map_index"] for ti in body["task_instances"]] == [1, 2]

def test_with_logical_date(self, test_client, one_task_with_mapped_tis):
response = test_client.get(
"/dags/mapped_tis/dagRuns/run_mapped_tis/taskInstances/task_2/listMapped",
Expand Down Expand Up @@ -1702,6 +1721,15 @@ def test_region_index_requires_region_id(self, test_client):
8,
id="test start_date coalesce with null",
),
pytest.param(
[{"start_date": None, "end_date": DEFAULT_DATETIME_1}],
True,
"/dags/example_python_operator/dagRuns/TEST_DAG_RUN_ID/taskInstances",
{"start_date_gte": DEFAULT_DATETIME_STR_1},
0,
7,
id="test start_date lower bound excludes finished with null start_date",
),
pytest.param(
[
{"pool": "test_pool_1"},
Expand Down
Loading