Update to match changes in functions SDK

Author: andystaples

durabletask-azurefunctions/durabletask/azurefunctions/decorators/durable_app.py

@@ -3,6 +3,8 @@
 
 from functools import wraps
 
+from durabletask import task
+
 from .metadata import OrchestrationTrigger, ActivityTrigger, EntityTrigger, \
     DurableClient
 from typing import Callable, Optional
@@ -54,7 +56,7 @@ def _configure_orchestrator_callable(self, wrap) -> Callable:
             The function to construct an Orchestrator class from the user-defined Function,
             wrapped by the next decorator in the sequence.
         """
-        def decorator(orchestrator_func):
+        def decorator(orchestrator_func: task.Orchestrator):
             # Construct an orchestrator based on the end-user code
 
             def handle(context) -> str:
@@ -82,7 +84,7 @@ def _configure_entity_callable(self, wrap) -> Callable:
             The function to construct an Entity class from the user-defined Function,
             wrapped by the next decorator in the sequence.
         """
-        def decorator(entity_func):
+        def decorator(entity_func: task.Entity):
             # Construct an orchestrator based on the end-user code
 
             # TODO: Because this handle method is the one actually exposed to the Functions SDK decorator,
@@ -177,7 +179,8 @@ def decorator():
 
         return wrap
 
-    def entity_trigger(self, context_name: str,
+    def entity_trigger(self,
+                       context_name: str,
                        entity_name: Optional[str] = None):
         """Register an Entity Function.
 
@@ -228,7 +231,7 @@ def durable_client_input(self,
         @self._configure_function_builder
         def wrap(fb):
             def decorator():
-                self._add_rich_client(fb, client_name, DurableFunctionsClient)
+                # self._add_rich_client(fb, client_name, DurableFunctionsClient)
 
                 fb.add_binding(
                     binding=DurableClient(name=client_name,

durabletask-azurefunctions/durabletask/azurefunctions/worker.py

@@ -4,6 +4,7 @@
 import base64
 from threading import Event
 from typing import Optional
+from durabletask import task
 from durabletask.internal.orchestrator_service_pb2 import EntityBatchRequest, EntityBatchResult, OrchestratorRequest, OrchestratorResponse
 from durabletask.worker import _Registry, ConcurrencyOptions
 from durabletask.internal import shared
@@ -33,10 +34,10 @@ def __init__(self):
 
         self._interceptors = None
 
-    def add_named_orchestrator(self, name: str, func):
+    def add_named_orchestrator(self, name: str, func: task.Orchestrator):
         self._registry.add_named_orchestrator(name, func)
 
-    def _execute_orchestrator(self, func, context) -> str:
+    def _execute_orchestrator(self, func: task.Orchestrator, context) -> str:
         context_body = getattr(context, "body", None)
         if context_body is None:
             context_body = context
@@ -67,9 +68,9 @@ def stub_complete(stub_response):
         if response is None:
             raise Exception("Orchestrator execution did not produce a response.")
         # The Python worker returns the input as type "json", so double-encoding is necessary
-        return '"' + base64.b64encode(response.SerializeToString()).decode('utf-8') + '"'
+        return base64.b64encode(response.SerializeToString()).decode('utf-8')
 
-    def _execute_entity_batch(self, func, context) -> str:
+    def _execute_entity_batch(self, func: task.Entity, context) -> str:
         context_body = getattr(context, "body", None)
         if context_body is None:
             context_body = context
@@ -90,4 +91,4 @@ def stub_complete(stub_response: EntityBatchResult):
         if response is None:
             raise Exception("Entity execution did not produce a response.")
         # The Python worker returns the input as type "json", so double-encoding is necessary
-        return '"' + base64.b64encode(response.SerializeToString()).decode('utf-8') + '"'
+        return base64.b64encode(response.SerializeToString()).decode('utf-8')

durabletask-azurefunctions/pyproject.toml

@@ -29,7 +29,7 @@ readme = "README.md"
 dependencies = [
     "durabletask>=1.2.0dev0",
     "azure-identity>=1.19.0",
-    "azure-functions>=1.11.0"
+    "azure-functions>=1.25.0b3.dev1"
 ]
 
 [project.urls]