[ui]: Run cancelled events include an error that should be displayed

dagster-io · Aug 6, 2024 · 165363b · 165363b
1 parent c137304
commit 165363b
Show file tree

Hide file tree

Showing 11 changed files with 85 additions and 5 deletions.
diff --git a/js_modules/dagster-ui/packages/ui-core/src/graphql/possibleTypes.generated.json b/js_modules/dagster-ui/packages/ui-core/src/graphql/possibleTypes.generated.json
diff --git a/js_modules/dagster-ui/packages/ui-core/src/graphql/schema.graphql b/js_modules/dagster-ui/packages/ui-core/src/graphql/schema.graphql
diff --git a/js_modules/dagster-ui/packages/ui-core/src/graphql/types.ts b/js_modules/dagster-ui/packages/ui-core/src/graphql/types.ts
diff --git a/js_modules/dagster-ui/packages/ui-core/src/runs/LogsRowStructuredContent.tsx b/js_modules/dagster-ui/packages/ui-core/src/runs/LogsRowStructuredContent.tsx
@@ -184,6 +184,7 @@ export const LogsRowStructuredContent = ({node, metadata}: IStructuredContentPro
     case 'AlertFailureEvent':
       return <DefaultContent eventType={eventType} message={node.message} eventIntent="warning" />;
     case 'ResourceInitFailureEvent':
+    case 'RunCanceledEvent':
     case 'RunFailureEvent':
       if (node.error) {
         return <FailureContent message={node.message} error={node.error} eventType={eventType} />;

diff --git a/js_modules/dagster-ui/packages/ui-core/src/runs/types/LogsProvider.types.ts b/js_modules/dagster-ui/packages/ui-core/src/runs/types/LogsProvider.types.ts
diff --git a/js_modules/dagster-ui/packages/ui-core/src/runs/types/LogsRow.types.ts b/js_modules/dagster-ui/packages/ui-core/src/runs/types/LogsRow.types.ts
diff --git a/...les/dagster-ui/packages/ui-core/src/runs/types/LogsScrollingTableMessageFragment.types.ts b/...les/dagster-ui/packages/ui-core/src/runs/types/LogsScrollingTableMessageFragment.types.ts
diff --git a/js_modules/dagster-ui/packages/ui-core/src/runs/types/RunFragments.types.ts b/js_modules/dagster-ui/packages/ui-core/src/runs/types/RunFragments.types.ts
diff --git a/python_modules/dagster-graphql/dagster_graphql/implementation/events.py b/python_modules/dagster-graphql/dagster_graphql/implementation/events.py
@@ -341,7 +341,12 @@ def from_dagster_event_record(event_record: EventLogEntry, pipeline_name: str) -
         DagsterEventType.RUN_CANCELED,
         DagsterEventType.PIPELINE_CANCELED,
     ):
-        return GrapheneRunCanceledEvent(pipelineName=pipeline_name, **basic_params)
+        data = dagster_event.job_canceled_data
+        return GrapheneRunCanceledEvent(
+            pipelineName=pipeline_name,
+            error=GraphenePythonError(data.error) if (data and data.error) else None,
+            **basic_params
+        )
     elif dagster_event.event_type in (
         DagsterEventType.RUN_START,
         DagsterEventType.PIPELINE_START,

diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/logs/events.py b/python_modules/dagster-graphql/dagster_graphql/schema/logs/events.py
@@ -106,7 +106,7 @@ class Meta:
 
 class GrapheneRunCanceledEvent(graphene.ObjectType):
     class Meta:
-        interfaces = (GrapheneMessageEvent, GrapheneRunEvent)
+        interfaces = (GrapheneMessageEvent, GrapheneRunEvent, GrapheneErrorEvent)
         name = "RunCanceledEvent"
 
 

diff --git a/python_modules/dagster/dagster/_core/events/__init__.py b/python_modules/dagster/dagster/_core/events/__init__.py
@@ -825,6 +825,11 @@ def job_failure_data(self) -> "JobFailureData":
         _assert_type("job_failure_data", DagsterEventType.RUN_FAILURE, self.event_type)
         return cast(JobFailureData, self.event_specific_data)
 
+    @property
+    def job_canceled_data(self) -> "JobCanceledData":
+        _assert_type("job_canceled_data", DagsterEventType.RUN_CANCELED, self.event_type)
+        return cast(JobCanceledData, self.event_specific_data)
+
     @property
     def engine_event_data(self) -> "EngineEventData":
         _assert_type(