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 @@ -27,6 +27,7 @@ class LightGridTaskInstanceSummary(BaseModel):
"""Task Instance Summary model for the Grid UI."""

task_id: str
task_display_name: str
state: TaskInstanceState | None
child_states: dict[TaskInstanceState | None, int] | None
min_start_date: datetime | None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2331,6 +2331,9 @@ components:
task_id:
type: string
title: Task Id
task_display_name:
type: string
title: Task Display Name
state:
anyOf:
- $ref: '#/components/schemas/TaskInstanceState'
Expand All @@ -2357,6 +2360,7 @@ components:
type: object
required:
- task_id
- task_display_name
- state
- child_states
- min_start_date
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,7 @@ def get_node_sumaries():
agg = _get_aggs_for_node(detail)
yield {
"task_id": task_id,
"task_display_name": task_id,
"type": "task",
"parent_id": None,
**agg,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ def _find_aggregates(
mapped_details = details or [{"state": None, "start_date": None, "end_date": None}]
yield {
"task_id": node_id,
"task_display_name": node.task_display_name,
"type": "mapped_task",
"parent_id": parent_id,
**_get_aggs_for_node(mapped_details),
Expand All @@ -114,6 +115,7 @@ def _find_aggregates(
if node_id:
yield {
"task_id": node_id,
"task_display_name": node_id,
"type": "group",
"parent_id": parent_id,
**_get_aggs_for_node(children_details),
Expand All @@ -123,6 +125,7 @@ def _find_aggregates(
if isinstance(node, SerializedBaseOperator):
yield {
"task_id": node_id,
"task_display_name": node.task_display_name,
"type": "task",
"parent_id": parent_id,
**_get_aggs_for_node(details),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8070,6 +8070,10 @@ export const $LightGridTaskInstanceSummary = {
type: 'string',
title: 'Task Id'
},
task_display_name: {
type: 'string',
title: 'Task Display Name'
},
state: {
anyOf: [
{
Expand Down Expand Up @@ -8120,7 +8124,7 @@ export const $LightGridTaskInstanceSummary = {
}
},
type: 'object',
required: ['task_id', 'state', 'child_states', 'min_start_date', 'max_end_date'],
required: ['task_id', 'task_display_name', 'state', 'child_states', 'min_start_date', 'max_end_date'],
title: 'LightGridTaskInstanceSummary',
description: 'Task Instance Summary model for the Grid UI.'
} as const;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1995,6 +1995,7 @@ export type HistoricalMetricDataResponse = {
*/
export type LightGridTaskInstanceSummary = {
task_id: string;
task_display_name: string;
state: TaskInstanceState | null;
child_states: {
[key: string]: (number);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export const Header = ({ taskInstance }: { readonly taskInstance: LightGridTaskI
state={taskInstance.state}
stats={stats}
subTitle={<Time datetime={taskInstance.min_start_date} />}
title={taskInstance.task_id}
title={taskInstance.task_display_name}
/>
</Box>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export const Header = ({ taskInstance }: { readonly taskInstance: LightGridTaskI
state={taskInstance.state}
stats={stats}
subTitle={<Time datetime={taskInstance.min_start_date} />}
title={`${taskInstance.task_id} [${taskCount}]`}
title={`${taskInstance.task_display_name} [${taskCount}]`}
/>
</Box>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -695,20 +695,23 @@ def test_grid_ti_summaries_group(self, session, test_client):
{
"state": "success",
"task_id": "t1",
"task_display_name": "t1",
"child_states": None,
"max_end_date": None,
"min_start_date": None,
},
{
"state": "success",
"task_id": "t2",
"task_display_name": "t2",
"child_states": None,
"max_end_date": None,
"min_start_date": None,
},
{
"state": "success",
"task_id": "t7",
"task_display_name": "t7",
"child_states": None,
"max_end_date": None,
"min_start_date": None,
Expand All @@ -719,10 +722,12 @@ def test_grid_ti_summaries_group(self, session, test_client):
"min_start_date": "2025-03-02T00:00:04Z",
"state": "success",
"task_id": "task_group-1",
"task_display_name": "task_group-1",
},
{
"state": "success",
"task_id": "task_group-1.t6",
"task_display_name": "task_group-1.t6",
"child_states": None,
"max_end_date": None,
"min_start_date": None,
Expand All @@ -733,24 +738,28 @@ def test_grid_ti_summaries_group(self, session, test_client):
"min_start_date": "2025-03-02T00:00:06Z",
"state": "success",
"task_id": "task_group-1.task_group-2",
"task_display_name": "task_group-1.task_group-2",
},
{
"state": "success",
"task_id": "task_group-1.task_group-2.t3",
"task_display_name": "task_group-1.task_group-2.t3",
"child_states": None,
"max_end_date": None,
"min_start_date": None,
},
{
"state": "success",
"task_id": "task_group-1.task_group-2.t4",
"task_display_name": "task_group-1.task_group-2.t4",
"child_states": None,
"max_end_date": None,
"min_start_date": None,
},
{
"state": "success",
"task_id": "task_group-1.task_group-2.t5",
"task_display_name": "task_group-1.task_group-2.t5",
"child_states": None,
"max_end_date": None,
"min_start_date": None,
Expand Down Expand Up @@ -784,6 +793,7 @@ def sort_dict(in_dict):
{
"child_states": {"None": 1},
"task_id": "mapped_task_2",
"task_display_name": "mapped_task_2",
"max_end_date": None,
"min_start_date": None,
"state": None,
Expand All @@ -794,45 +804,52 @@ def sort_dict(in_dict):
"min_start_date": "2024-12-30T01:00:00Z",
"state": "running",
"task_id": "mapped_task_group",
"task_display_name": "mapped_task_group",
},
{
"state": "running",
"task_id": "mapped_task_group.subtask",
"task_display_name": "mapped_task_group.subtask",
"child_states": None,
"max_end_date": None,
"min_start_date": None,
},
{
"state": "success",
"task_id": "task",
"task_display_name": "A Beautiful Task Name \U0001f680",
"child_states": None,
"max_end_date": None,
"min_start_date": None,
},
{
"child_states": {"None": 6},
"task_id": "task_group",
"task_display_name": "task_group",
"max_end_date": None,
"min_start_date": None,
"state": None,
},
{
"child_states": {"None": 2},
"task_id": "task_group.inner_task_group",
"task_display_name": "task_group.inner_task_group",
"max_end_date": None,
"min_start_date": None,
"state": None,
},
{
"child_states": {"None": 2},
"task_id": "task_group.inner_task_group.inner_task_group_sub_task",
"task_display_name": "Inner Task Group Sub Task Label",
"max_end_date": None,
"min_start_date": None,
"state": None,
},
{
"child_states": {"None": 4},
"task_id": "task_group.mapped_task",
"task_display_name": "task_group.mapped_task",
"max_end_date": None,
"min_start_date": None,
"state": None,
Expand Down
Loading