Implement the rest of the spec

Author: dandavison

cross-sdk-design.md

@@ -23,7 +23,6 @@
     TYPE_CHECKING,
     Any,
     NoReturn,
-    Type,
     overload,
 )
 
@@ -106,25 +105,24 @@ class Info:
     heartbeat_timeout: timedelta | None
     is_local: bool
     namespace: str
-    """Namespace the activity is running in."""
     schedule_to_close_timeout: timedelta | None
     scheduled_time: datetime
     start_to_close_timeout: timedelta | None
     started_time: datetime
     task_queue: str
     task_token: bytes
     workflow_id: str | None
-    """ID of the workflow that started this activity. None for standalone activities."""
+    """ID of the workflow. None if the activity was not started by a workflow."""
     workflow_namespace: str | None
-    """Namespace of the workflow that started this activity. None for standalone activities.
+    """Namespace of the workflow. None if the activity was not started by a workflow.
 
     .. deprecated::
         Use :py:attr:`namespace` instead.
     """
     workflow_run_id: str | None
-    """Run ID of the workflow that started this activity. None for standalone activities."""
+    """Run ID of the workflow. None if the activity was not started by a workflow."""
     workflow_type: str | None
-    """Type of the workflow that started this activity. None for standalone activities."""
+    """Type of the workflow. None if the activity was not started by a workflow."""
     priority: temporalio.common.Priority
     retry_policy: temporalio.common.RetryPolicy | None
     """The retry policy of this activity.
@@ -134,11 +132,11 @@ class Info:
     version), but it may still be defined server-side."""
 
     activity_run_id: str | None = None
-    """Run ID of this standalone activity. None for workflow activities."""
+    """Run ID of this activity. None for workflow activities."""
 
     @property
     def in_workflow(self) -> bool:
-        """Whether this activity was started by a workflow (vs. standalone)."""
+        """Was this activity started by a workflow?"""
         return self.workflow_id is not None
 
     # TODO(cretz): Consider putting identity on here for "worker_id" for logger?
@@ -599,7 +597,7 @@ def must_from_callable(fn: Callable) -> _Definition:
     @classmethod
     def get_name_and_result_type(
         cls, name_or_run_fn: str | Callable[..., Any]
-    ) -> tuple[str, Type | None]:
+    ) -> tuple[str, type | None]:
         if isinstance(name_or_run_fn, str):
             return name_or_run_fn, None
         elif callable(name_or_run_fn):
@@ -608,7 +606,7 @@ def get_name_and_result_type(
                 raise ValueError(f"Activity {name_or_run_fn} definition has no name")
             return defn.name, defn.ret_type
         else:
-            raise TypeError("Activity must be a string or callable")
+            raise TypeError("Activity must be a string or callable")  # type:ignore[reportUnreachable]
 
     @staticmethod
     def _apply_to_callable(

temporalio/activity.py

@@ -190,25 +190,39 @@ class ActivityIDConflictPolicy(IntEnum):
 
 
 class ActivityExecutionStatus(IntEnum):
-    """Status of a standalone activity execution.
+    """Status of an activity execution.
 
     .. warning::
        This API is experimental.
 
     See :py:class:`temporalio.api.enums.v1.ActivityExecutionStatus`.
     """
 
-    UNSPECIFIED = 0  # ACTIVITY_EXECUTION_STATUS_UNSPECIFIED
-    RUNNING = 1  # ACTIVITY_EXECUTION_STATUS_RUNNING
-    COMPLETED = 2  # ACTIVITY_EXECUTION_STATUS_COMPLETED
-    FAILED = 3  # ACTIVITY_EXECUTION_STATUS_FAILED
-    CANCELED = 4  # ACTIVITY_EXECUTION_STATUS_CANCELED
-    TERMINATED = 5  # ACTIVITY_EXECUTION_STATUS_TERMINATED
-    TIMED_OUT = 6  # ACTIVITY_EXECUTION_STATUS_TIMED_OUT
+    UNSPECIFIED = int(
+        temporalio.api.enums.v1.ActivityExecutionStatus.ACTIVITY_EXECUTION_STATUS_UNSPECIFIED
+    )
+    RUNNING = int(
+        temporalio.api.enums.v1.ActivityExecutionStatus.ACTIVITY_EXECUTION_STATUS_RUNNING
+    )
+    COMPLETED = int(
+        temporalio.api.enums.v1.ActivityExecutionStatus.ACTIVITY_EXECUTION_STATUS_COMPLETED
+    )
+    FAILED = int(
+        temporalio.api.enums.v1.ActivityExecutionStatus.ACTIVITY_EXECUTION_STATUS_FAILED
+    )
+    CANCELED = int(
+        temporalio.api.enums.v1.ActivityExecutionStatus.ACTIVITY_EXECUTION_STATUS_CANCELED
+    )
+    TERMINATED = int(
+        temporalio.api.enums.v1.ActivityExecutionStatus.ACTIVITY_EXECUTION_STATUS_TERMINATED
+    )
+    TIMED_OUT = int(
+        temporalio.api.enums.v1.ActivityExecutionStatus.ACTIVITY_EXECUTION_STATUS_TIMED_OUT
+    )
 
 
 class PendingActivityState(IntEnum):
-    """State of a pending activity.
+    """Detailed state of an activity execution that is in ACTIVITY_EXECUTION_STATUS_RUNNING.
 
     .. warning::
        This API is experimental.

temporalio/client.py

@@ -98,7 +98,7 @@ class WorkflowSerializationContext(SerializationContext):
     namespace: str
     """Namespace."""
 
-    workflow_id: Optional[str]
+    workflow_id: str | None
     """Workflow ID."""
 
 
@@ -117,13 +117,13 @@ class ActivitySerializationContext(SerializationContext):
             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. 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.
+        is_local: Whether the activity is a local activity. False if the activity was not started by a workflow.
     """
 
     namespace: str
     """Namespace."""
 
-    activity_id: Optional[str]
+    activity_id: str | None
     """Activity ID. Optional if this is an activity started from a workflow."""
 
     activity_type: str
@@ -132,10 +132,10 @@ class ActivitySerializationContext(SerializationContext):
     activity_task_queue: str
     """Activity task queue."""
 
-    workflow_id: Optional[str]
+    workflow_id: str | None
     """Workflow ID if this is an activity started from a workflow."""
 
-    workflow_type: Optional[str]
+    workflow_type: str | None
     """Workflow type if this is an activity started from a workflow."""
 
     is_local: bool

temporalio/common.py

@@ -248,9 +248,9 @@ class RetryState(IntEnum):
 
 
 # TODO: This error class has required history event fields. I propose we retain it as
-# workflow-specific and introduce client.ActivityFailureError for an error in a standalone activity.
-# We could deprecate this name and introduce WorkflowActivityError as a preferred-going-forwards
-# alias.
+# workflow-specific and introduce client.ActivityFailedError for an error in an activity not
+# started by a workflow. We could deprecate this name and introduce WorkflowActivityError as a
+# preferred-going-forwards alias.
 class ActivityError(FailureError):
     """Error raised on activity failure."""
 

temporalio/converter.py

@@ -303,7 +303,7 @@ async def _handle_start_activity_task(
         )
         # Create serialization context for the activity
         context = temporalio.converter.ActivitySerializationContext(
-            namespace=start.workflow_namespace,
+            namespace=start.workflow_namespace or self._client.namespace,
             workflow_id=start.workflow_execution.workflow_id,
             workflow_type=start.workflow_type,
             activity_type=start.activity_type,
@@ -547,8 +547,7 @@ async def _execute_activity(
             ) from err
 
         # Build info
-        # Determine if this is a standalone activity
-        is_standalone = not start.workflow_execution.workflow_id
+        started_by_workflow = bool(start.workflow_execution.workflow_id)
         info = temporalio.activity.Info(
             activity_id=start.activity_id,
             activity_type=start.activity_type,
@@ -584,7 +583,9 @@ async def _execute_activity(
             retry_policy=temporalio.common.RetryPolicy.from_proto(start.retry_policy)
             if start.HasField("retry_policy")
             else None,
-            activity_run_id=getattr(start, "run_id", None) if is_standalone else None,
+            activity_run_id=getattr(start, "run_id", None)
+            if not started_by_workflow
+            else None,
         )
 
         if self._encode_headers and data_converter.payload_codec is not None: