diff --git a/airflow-core/src/airflow/api_fastapi/core_api/datamodels/ui/grid.py b/airflow-core/src/airflow/api_fastapi/core_api/datamodels/ui/grid.py index 822eb6f3e1a89..f46c4601640ec 100644 --- a/airflow-core/src/airflow/api_fastapi/core_api/datamodels/ui/grid.py +++ b/airflow-core/src/airflow/api_fastapi/core_api/datamodels/ui/grid.py @@ -37,7 +37,6 @@ class GridTaskInstanceSummary(BaseModel): child_states: dict[str, int] | None task_count: int state: TaskInstanceState | None - note: str | None class GridDAGRunwithTIs(BaseModel): diff --git a/airflow-core/src/airflow/api_fastapi/core_api/openapi/_private_ui.yaml b/airflow-core/src/airflow/api_fastapi/core_api/openapi/_private_ui.yaml index d6f35c2cde30d..7886309cdea5d 100644 --- a/airflow-core/src/airflow/api_fastapi/core_api/openapi/_private_ui.yaml +++ b/airflow-core/src/airflow/api_fastapi/core_api/openapi/_private_ui.yaml @@ -1478,11 +1478,6 @@ components: anyOf: - $ref: '#/components/schemas/TaskInstanceState' - type: 'null' - note: - anyOf: - - type: string - - type: 'null' - title: Note type: object required: - task_id @@ -1493,7 +1488,6 @@ components: - child_states - task_count - state - - note title: GridTaskInstanceSummary description: Task Instance Summary model for the Grid UI. HTTPExceptionResponse: diff --git a/airflow-core/src/airflow/api_fastapi/core_api/routes/ui/grid.py b/airflow-core/src/airflow/api_fastapi/core_api/routes/ui/grid.py index 8d01710e780a6..cce1f61a193e8 100644 --- a/airflow-core/src/airflow/api_fastapi/core_api/routes/ui/grid.py +++ b/airflow-core/src/airflow/api_fastapi/core_api/routes/ui/grid.py @@ -133,7 +133,6 @@ def grid_data( # Retrieve, sort and encode the Task Instances tis_of_dag_runs, _ = paginated_select( statement=select(TaskInstance) - .join(TaskInstance.task_instance_note, isouter=True) .where(TaskInstance.dag_id == dag.dag_id) .where(TaskInstance.run_id.in_([dag_run.run_id for dag_run in dag_runs])), filters=[], diff --git a/airflow-core/src/airflow/api_fastapi/core_api/services/ui/grid.py b/airflow-core/src/airflow/api_fastapi/core_api/services/ui/grid.py index 346676e14cd48..19c1204f4d6cd 100644 --- a/airflow-core/src/airflow/api_fastapi/core_api/services/ui/grid.py +++ b/airflow-core/src/airflow/api_fastapi/core_api/services/ui/grid.py @@ -185,7 +185,6 @@ def fill_task_instance_summaries( ti_start_date = min([ti.start_date for ti in tis if ti.start_date], default=None) ti_end_date = max([ti.end_date for ti in tis if ti.end_date], default=None) ti_queued_dttm = min([ti.queued_dttm for ti in tis if ti.queued_dttm], default=None) - ti_note = min([ti.note for ti in tis if ti.note], default=None) # Calculate the child states for the task # Initialize the child states with 0 @@ -242,7 +241,6 @@ def fill_task_instance_summaries( state=TaskInstanceState[overall_ti_state.upper()] if overall_ti_state != "no_status" else None, - note=ti_note, ) ) diff --git a/airflow-core/src/airflow/ui/openapi-gen/requests/schemas.gen.ts b/airflow-core/src/airflow/ui/openapi-gen/requests/schemas.gen.ts index 7ffda75f42628..90e4949a6a435 100644 --- a/airflow-core/src/airflow/ui/openapi-gen/requests/schemas.gen.ts +++ b/airflow-core/src/airflow/ui/openapi-gen/requests/schemas.gen.ts @@ -7078,17 +7078,6 @@ export const $GridTaskInstanceSummary = { }, ], }, - note: { - anyOf: [ - { - type: "string", - }, - { - type: "null", - }, - ], - title: "Note", - }, }, type: "object", required: [ @@ -7100,7 +7089,6 @@ export const $GridTaskInstanceSummary = { "child_states", "task_count", "state", - "note", ], title: "GridTaskInstanceSummary", description: "Task Instance Summary model for the Grid UI.", diff --git a/airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts b/airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts index fe91ba69aed61..d5aa36759acfe 100644 --- a/airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts +++ b/airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts @@ -1742,7 +1742,6 @@ export type GridTaskInstanceSummary = { } | null; task_count: number; state: TaskInstanceState | null; - note: string | null; }; /** diff --git a/airflow-core/tests/unit/api_fastapi/core_api/routes/ui/test_grid.py b/airflow-core/tests/unit/api_fastapi/core_api/routes/ui/test_grid.py index 181d64b3a1716..913f4580a8078 100644 --- a/airflow-core/tests/unit/api_fastapi/core_api/routes/ui/test_grid.py +++ b/airflow-core/tests/unit/api_fastapi/core_api/routes/ui/test_grid.py @@ -83,7 +83,6 @@ "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": "success", @@ -108,7 +107,6 @@ "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": "success", @@ -133,7 +131,6 @@ "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": "success", @@ -158,7 +155,6 @@ "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": "success", @@ -183,7 +179,6 @@ "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": "success", @@ -208,7 +203,6 @@ "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": "success", @@ -233,7 +227,6 @@ "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": "success", @@ -258,7 +251,6 @@ "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": "success", @@ -299,7 +291,6 @@ "upstream_failed": 0, }, "end_date": "2024-12-30T01:02:03Z", - "note": None, "queued_dttm": None, "start_date": "2024-12-30T01:00:00Z", "state": "running", @@ -324,7 +315,6 @@ "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": None, @@ -349,7 +339,6 @@ "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": None, @@ -374,7 +363,6 @@ "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": None, @@ -399,7 +387,6 @@ "upstream_failed": 0, }, "end_date": "2024-12-30T01:02:03Z", - "note": None, "queued_dttm": None, "start_date": "2024-12-30T01:00:00Z", "state": "running", @@ -424,7 +411,6 @@ "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": "success", @@ -449,7 +435,6 @@ "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": None, @@ -474,7 +459,6 @@ "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": None, @@ -797,7 +781,6 @@ def test_should_response_200_order_by(self, test_client, order_by, expected): "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": "success", @@ -822,7 +805,6 @@ def test_should_response_200_order_by(self, test_client, order_by, expected): "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": "success", @@ -852,7 +834,6 @@ def test_should_response_200_order_by(self, test_client, order_by, expected): "upstream_failed": 0, }, "end_date": "2024-12-30T01:02:03Z", - "note": None, "queued_dttm": None, "start_date": "2024-12-30T01:00:00Z", "state": "running", @@ -877,7 +858,6 @@ def test_should_response_200_order_by(self, test_client, order_by, expected): "upstream_failed": 0, }, "end_date": "2024-12-30T01:02:03Z", - "note": None, "queued_dttm": None, "start_date": "2024-12-30T01:00:00Z", "state": "running", @@ -916,7 +896,6 @@ def test_should_response_200_order_by(self, test_client, order_by, expected): "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": "success", @@ -941,7 +920,6 @@ def test_should_response_200_order_by(self, test_client, order_by, expected): "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": "success", @@ -971,7 +949,6 @@ def test_should_response_200_order_by(self, test_client, order_by, expected): "upstream_failed": 0, }, "end_date": "2024-12-30T01:02:03Z", - "note": None, "queued_dttm": None, "start_date": "2024-12-30T01:00:00Z", "state": "running", @@ -996,7 +973,6 @@ def test_should_response_200_order_by(self, test_client, order_by, expected): "upstream_failed": 0, }, "end_date": "2024-12-30T01:02:03Z", - "note": None, "queued_dttm": None, "start_date": "2024-12-30T01:00:00Z", "state": "running", @@ -1306,7 +1282,6 @@ def test_should_response_200_with_deleted_task_and_taskgroup(self, session, test "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": "success", @@ -1331,7 +1306,6 @@ def test_should_response_200_with_deleted_task_and_taskgroup(self, session, test "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": "success", @@ -1356,7 +1330,6 @@ def test_should_response_200_with_deleted_task_and_taskgroup(self, session, test "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": "success", @@ -1396,7 +1369,6 @@ def test_should_response_200_with_deleted_task_and_taskgroup(self, session, test "upstream_failed": 0, }, "end_date": None, - "note": None, "queued_dttm": None, "start_date": None, "state": "success",