Cleanup

Author: dandavison

temporalio/client.py

@@ -6511,9 +6511,9 @@ async def fail_async_activity(self, input: FailAsyncActivityInput) -> None:
         failure = temporalio.api.failure.v1.Failure()
         await data_converter.encode_failure(input.error, failure)
         last_heartbeat_details = (
-            None
-            if not input.last_heartbeat_details
-            else await data_converter.encode_wrapper(input.last_heartbeat_details)
+            await data_converter.encode_wrapper(input.last_heartbeat_details)
+            if input.last_heartbeat_details
+            else None
         )
         if isinstance(input.id_or_token, AsyncActivityIDReference):
             await self._client.workflow_service.respond_activity_task_failed_by_id(

temporalio/converter.py

@@ -72,21 +72,17 @@ class SerializationContext(ABC):
     Provides contextual information during serialization and deserialization operations.
 
     Examples:
-
     - In client code, when starting a workflow, or sending a signal/update/query to a workflow, or
       receiving the result of an update/query, or handling an exception from a workflow, the context
       type is :py:class:`WorkflowSerializationContext` and the workflow ID set of the target
       workflow will be set in the context.
-
     - In workflow code, when operating on a payload being sent/received to/from a child workflow, or
       handling an exception from a child workflow, the context type is
       :py:class:`WorkflowSerializationContext` and the workflow ID is that of the child workflow,
       not of the currently executing (i.e. parent) workflow.
-
     - In workflow code, when operating on a payload to be sent/received to/from an activity, the
       context type is :py:class:`ActivitySerializationContext` and the workflow ID is that of the
       currently-executing workflow. ActivitySerializationContext is also set on operations
-
     """
 
     pass

tests/test_serialization_context.py

@@ -2,18 +2,18 @@
 
 import asyncio
 import dataclasses
-import inspect
 import uuid
 from collections import defaultdict
 from dataclasses import dataclass, field
 from datetime import timedelta
 from itertools import zip_longest
 from pprint import pformat
-from typing import Any, List, Literal, Never, Optional, Sequence, Type, cast
+from typing import Any, List, Literal, Optional, Sequence, Type, cast
 from warnings import warn
 
 import pytest
 from pydantic import BaseModel
+from typing_extensions import Never
 
 from temporalio import activity, workflow
 from temporalio.api.common.v1 import Payload
@@ -53,7 +53,6 @@ class TraceItem:
     ]
     context: dict[str, Any]
     in_workflow: bool
-    caller_location: list[str] = field(default_factory=list)
 
     def __eq__(self, other: object) -> bool:
         if not isinstance(other, TraceItem):
@@ -131,7 +130,6 @@ def to_payload(self, value: Any) -> Optional[Payload]:
                     in_workflow=workflow.in_workflow(),
                     method="to_payload",
                     context=dataclasses.asdict(self.context),
-                    caller_location=get_caller_location(),
                 )
             )
         elif isinstance(self.context, ActivitySerializationContext):
@@ -141,7 +139,6 @@ def to_payload(self, value: Any) -> Optional[Payload]:
                     in_workflow=workflow.in_workflow(),
                     method="to_payload",
                     context=dataclasses.asdict(self.context),
-                    caller_location=get_caller_location(),
                 )
             )
         else:
@@ -164,7 +161,6 @@ def from_payload(self, payload: Payload, type_hint: Optional[Type] = None) -> An
                     in_workflow=workflow.in_workflow(),
                     method="from_payload",
                     context=dataclasses.asdict(self.context),
-                    caller_location=get_caller_location(),
                 )
             )
         elif isinstance(self.context, ActivitySerializationContext):
@@ -174,7 +170,6 @@ def from_payload(self, payload: Payload, type_hint: Optional[Type] = None) -> An
                     in_workflow=workflow.in_workflow(),
                     method="from_payload",
                     context=dataclasses.asdict(self.context),
-                    caller_location=get_caller_location(),
                 )
             )
         else:
@@ -1302,46 +1297,11 @@ def assert_trace(trace: list[TraceItem], expected: list[TraceItem]):
     history: list[str] = []
     for item, expected_item in zip_longest(trace, expected):
         if item is None:
-            raise AssertionError(
-                f"Fewer items in trace than expected.\n\n History:\n{'\n'.join(history)}"
-            )
+            raise AssertionError("Fewer items in trace than expected.")
         if expected_item is None:
-            raise AssertionError(
-                f"More items in trace than expected.\n\n History:\n{'\n'.join(history)}"
-            )
+            raise AssertionError("More items in trace than expected.")
         if item != expected_item:
             raise AssertionError(
-                f"Item:\n{pformat(item)}\n\ndoes not match expected:\n\n {pformat(expected_item)}.\n\n History:\n{'\n'.join(history)}"
+                f"Item:\n{pformat(item)}\n\ndoes not match expected:\n\n {pformat(expected_item)}."
             )
         history.append(f"{item.context_type} {item.method}")
-
-
-def get_caller_location() -> list[str]:
-    """Get 3 stack frames starting from the first that's not in test_serialization_context.py or temporalio/converter.py."""
-    frame = inspect.currentframe()
-    result: list[str] = []
-    found_first = False
-
-    # Walk up the stack
-    while frame and len(result) < 3:
-        frame = frame.f_back
-        if not frame:
-            break
-
-        file_path = frame.f_code.co_filename
-
-        # Skip frames from test file and converter.py until we find the first one
-        if not found_first:
-            if "test_serialization_context.py" in file_path:
-                continue
-            if file_path.endswith("temporalio/converter.py"):
-                continue
-            found_first = True
-
-        result.append(f"{file_path}:{frame.f_lineno}")
-
-    # Pad with "unknown:0" if we didn't get 3 frames
-    while len(result) < 3:
-        result.append("unknown:0")
-
-    return result