Merge branch 'main' into signal-workflow

Author: timl3136

cadence/_internal/workflow/context.py

@@ -1,40 +1,34 @@
+from contextlib import contextmanager
 from datetime import timedelta
 from math import ceil
-from typing import Optional, Any, Unpack, Type, cast
+from typing import Iterator, Optional, Any, Unpack, Type, cast
 
 from cadence._internal.workflow.statemachine.decision_manager import DecisionManager
 from cadence._internal.workflow.decisions_helper import DecisionsHelper
 from cadence.api.v1.common_pb2 import ActivityType
 from cadence.api.v1.decision_pb2 import ScheduleActivityTaskDecisionAttributes
 from cadence.api.v1.tasklist_pb2 import TaskList, TaskListKind
-from cadence.client import Client
 from cadence.data_converter import DataConverter
 from cadence.workflow import WorkflowContext, WorkflowInfo, ResultType, ActivityOptions
 
 
 class Context(WorkflowContext):
     def __init__(
         self,
-        client: Client,
         info: WorkflowInfo,
-        decision_helper: DecisionsHelper,
         decision_manager: DecisionManager,
     ):
-        self._client = client
         self._info = info
         self._replay_mode = True
         self._replay_current_time_milliseconds: Optional[int] = None
-        self._decision_helper = decision_helper
+        self._decision_helper = DecisionsHelper()
         self._decision_manager = decision_manager
 
     def info(self) -> WorkflowInfo:
         return self._info
 
-    def client(self) -> Client:
-        return self._client
-
     def data_converter(self) -> DataConverter:
-        return self._client.data_converter
+        return self.info().data_converter
 
     async def execute_activity(
         self,
@@ -80,7 +74,7 @@ async def execute_activity(
         schedule_attributes = ScheduleActivityTaskDecisionAttributes(
             activity_id=activity_id,
             activity_type=ActivityType(name=activity),
-            domain=self._client.domain,
+            domain=self.info().workflow_domain,
             task_list=TaskList(kind=TaskListKind.TASK_LIST_KIND_NORMAL, name=task_list),
             input=activity_input,
             schedule_to_close_timeout=_round_to_nearest_second(schedule_to_close),
@@ -116,6 +110,12 @@ def get_replay_current_time_milliseconds(self) -> Optional[int]:
         """Get the current replay time in milliseconds."""
         return self._replay_current_time_milliseconds
 
+    @contextmanager
+    def _activate(self) -> Iterator["Context"]:
+        token = WorkflowContext._var.set(self)
+        yield self
+        WorkflowContext._var.reset(token)
+
 
 def _round_to_nearest_second(delta: timedelta) -> timedelta:
     return timedelta(seconds=ceil(delta.total_seconds()))