Sync sandbox proto hash and simplify activity hooks

Author: YunchuWang

durabletask-azuremanaged/durabletask/azuremanaged/internal/SANDBOX_PROTO_SOURCE_COMMIT_HASH

@@ -1 +1 @@
-24df6525803b4da812bae4ecff82b589365c9691
+67a2f1d3b9ea8a210eb86addb636a5d8a6484dbc

durabletask-azuremanaged/durabletask/azuremanaged/preview/sandboxes/worker.py

@@ -90,11 +90,11 @@ def stop(self) -> None:
         self._stop_sandbox_registration()
         super().stop()
 
-    def _durabletask_on_activity_execution_started(self, req: worker_pb.ActivityRequest) -> None:
+    def _on_activity_execution_started(self, req: worker_pb.ActivityRequest) -> None:
         with self._sandbox_active_activities_lock:
             self._sandbox_active_activities += 1
 
-    def _durabletask_on_activity_execution_completed(self, req: worker_pb.ActivityRequest) -> None:
+    def _on_activity_execution_completed(self, req: worker_pb.ActivityRequest) -> None:
         with self._sandbox_active_activities_lock:
             self._sandbox_active_activities = max(0, self._sandbox_active_activities - 1)
 

durabletask/worker.py

@@ -1217,10 +1217,10 @@ def _cancel_orchestrator(
         )
         self._logger.info(f"Cancelled orchestration task for invocation ID: {req.instanceId}")
 
-    def _durabletask_on_activity_execution_started(self, req: pb.ActivityRequest) -> None:
+    def _on_activity_execution_started(self, req: pb.ActivityRequest) -> None:
         pass
 
-    def _durabletask_on_activity_execution_completed(self, req: pb.ActivityRequest) -> None:
+    def _on_activity_execution_completed(self, req: pb.ActivityRequest) -> None:
         pass
 
     def _execute_activity(
@@ -1230,7 +1230,7 @@ def _execute_activity(
             completionToken: Any,
     ) -> None:
         instance_id = req.orchestrationInstance.instanceId
-        self._durabletask_on_activity_execution_started(req)
+        self._on_activity_execution_started(req)
         try:
             # De-externalize any large-payload tokens in the incoming request
             if self._payload_store is not None:
@@ -1281,7 +1281,7 @@ def _execute_activity(
                     f"Failed to deliver activity response for '{req.name}#{req.taskId}' of orchestration ID '{instance_id}' to sidecar: {ex}"
                 )
         finally:
-            self._durabletask_on_activity_execution_completed(req)
+            self._on_activity_execution_completed(req)
 
     def _cancel_activity(
             self,

tests/durabletask-azuremanaged/test_sandboxes_extension.py

@@ -527,13 +527,13 @@ def test_sandbox_worker_tracks_active_activity_count_with_hooks(monkeypatch) ->
 
     worker = SandboxWorker()
 
-    worker._durabletask_on_activity_execution_started(object())
+    worker._on_activity_execution_started(object())
     assert worker._sandbox_active_activities == 1
 
-    worker._durabletask_on_activity_execution_completed(object())
+    worker._on_activity_execution_completed(object())
     assert worker._sandbox_active_activities == 0
 
-    worker._durabletask_on_activity_execution_completed(object())
+    worker._on_activity_execution_completed(object())
     assert worker._sandbox_active_activities == 0
 
 

tests/durabletask/test_worker_activity_hooks.py

@@ -20,10 +20,10 @@ def __init__(self):
         super().__init__()
         self.events = []
 
-    def _durabletask_on_activity_execution_started(self, req):
+    def _on_activity_execution_started(self, req):
         self.events.append(("started", req.name))
 
-    def _durabletask_on_activity_execution_completed(self, req):
+    def _on_activity_execution_completed(self, req):
         self.events.append(("completed", req.name))