Eliminate base serialization context class

Author: dandavison

temporalio/converter.py

@@ -93,16 +93,7 @@ class SerializationContext(ABC):
 
 
 @dataclass(frozen=True)
-class BaseWorkflowSerializationContext(SerializationContext):
-    """Base serialization context shared by workflow and activity serialization contexts."""
-
-    namespace: str
-    workflow_id: Optional[str]
-    """Workflow ID."""
-
-
-@dataclass(frozen=True)
-class WorkflowSerializationContext(BaseWorkflowSerializationContext):
+class WorkflowSerializationContext(SerializationContext):
     """Serialization context for workflows.
 
     See :py:class:`SerializationContext` for more details.
@@ -115,40 +106,51 @@ class WorkflowSerializationContext(BaseWorkflowSerializationContext):
             when the workflow is created by the schedule.
     """
 
-    pass
+    namespace: str
+    """Namespace."""
+
+    workflow_id: Optional[str]
+    """Workflow ID."""
 
 
 @dataclass(frozen=True)
-class ActivitySerializationContext(BaseWorkflowSerializationContext):
+class ActivitySerializationContext(SerializationContext):
     """Serialization context for activities.
 
     See :py:class:`SerializationContext` for more details.
 
     Attributes:
         namespace: Workflow/activity namespace.
-        workflow_id: Workflow ID. Note, when creating/describing schedules,
+        activity_id: Activity ID. Optional if this is an activity started from a workflow.
+        activity_type: Activity type.
+        activity_task_queue: Activity task queue.
+        workflow_id: Workflow ID. Only set if this is an activity started from a workflow. Note, when creating/describing schedules,
             this may be the workflow ID prefix as configured, not the final workflow ID when the
             workflow is created by the schedule.
-        workflow_type: Workflow Type.
-        activity_type: Activity Type.
-        activity_task_queue: Activity task queue.
-        is_local: Whether the activity is a local activity.
+        workflow_type: Workflow Type. Only set if this is an activity started from a workflow.
+        is_local: Whether the activity is a local activity. False if this is a standalone activity started directly by a client.
     """
 
-    workflow_type: Optional[str]
-    """Workflow type."""
+    namespace: str
+    """Namespace."""
+
+    activity_id: Optional[str]
+    """Activity ID. Optional if this is an activity started from a workflow."""
 
     activity_type: str
     """Activity type."""
 
-    activity_id: Optional[str]
-    """Activity ID."""
-
     activity_task_queue: str
     """Activity task queue."""
 
+    workflow_id: Optional[str]
+    """Workflow ID if this is an activity started from a workflow."""
+
+    workflow_type: Optional[str]
+    """Workflow type if this is an activity started from a workflow."""
+
     is_local: bool
-    """Whether the activity is a local activity."""
+    """Whether the activity is a local activity started from a workflow."""
 
 
 class WithSerializationContext(ABC):

tests/test_serialization_context.py

@@ -510,7 +510,7 @@ async def test_local_activity_payload_conversion(client: Client):
 
 
 @workflow.defn
-class EventWorkflow:
+class WaitForSignalWorkflow:
     # Like a global asyncio.Event()
 
     def __init__(self) -> None:
@@ -527,10 +527,11 @@ def signal(self) -> None:
 
 @activity.defn
 async def async_activity() -> TraceData:
+    # Notify test that the activity has started and is ready to be completed manually
     await (
         activity.client()
         .get_workflow_handle("activity-started-wf-id")
-        .signal(EventWorkflow.signal)
+        .signal(WaitForSignalWorkflow.signal)
     )
     activity.raise_complete_async()
 
@@ -564,7 +565,7 @@ async def test_async_activity_completion_payload_conversion(
         task_queue=task_queue,
         workflows=[
             AsyncActivityCompletionSerializationContextTestWorkflow,
-            EventWorkflow,
+            WaitForSignalWorkflow,
         ],
         activities=[async_activity],
         workflow_runner=UnsandboxedWorkflowRunner(),  # so that we can use isinstance
@@ -584,7 +585,7 @@ async def test_async_activity_completion_payload_conversion(
         )
 
         act_started_wf_handle = await client.start_workflow(
-            EventWorkflow.run,
+            WaitForSignalWorkflow.run,
             id="activity-started-wf-id",
             task_queue=task_queue,
         )