durabletask 0.0.0.dev27__tar.gz → 0.0.0.dev28__tar.gz

{durabletask-0.0.0.dev27 → durabletask-0.0.0.dev28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: durabletask
-Version: 0.0.0.dev27
+Version: 0.0.0.dev28
 Summary: A Durable Task Client SDK for Python
 License:     MIT License
         

{durabletask-0.0.0.dev27 → durabletask-0.0.0.dev28}/durabletask/client.py

@@ -230,10 +230,7 @@ class TaskHubGrpcClient:
         self._logger.info(f"Purging instance '{instance_id}'.")
         self._stub.PurgeInstances(req)
 
-    def signal_entity(self,
-                      entity_instance_id: EntityInstanceId,
-                      operation_name: str,
-                      input: Optional[Any] = None) -> None:
+    def signal_entity(self, entity_instance_id: EntityInstanceId, operation_name: str, input: Optional[Any] = None):
         req = pb.SignalEntityRequest(
             instanceId=str(entity_instance_id),
             name=operation_name,

{durabletask-0.0.0.dev27 → durabletask-0.0.0.dev28}/durabletask/task.py

@@ -142,7 +142,7 @@ class OrchestrationContext(ABC):
     def call_entity(self,
                     entity: EntityInstanceId,
                     operation: str,
-                    input: Optional[TInput] = None) -> CompletableTask[Any]:
+                    input: Optional[TInput] = None) -> CompletableTask:
         """Schedule entity function for execution.
 
         Parameters
@@ -538,8 +538,8 @@ class ActivityContext:
         return self._task_id
 
 
-# Orchestrators are generators that yield tasks, receive any type, and return TOutput
-Orchestrator = Callable[[OrchestrationContext, TInput], Union[Generator[Task[Any], Any, TOutput], TOutput]]
+# Orchestrators are generators that yield tasks and receive/return any type
+Orchestrator = Callable[[OrchestrationContext, TInput], Union[Generator[Task, Any, Any], TOutput]]
 
 # Activities are simple functions that can be scheduled by orchestrators
 Activity = Callable[[ActivityContext, TInput], TOutput]
@@ -615,6 +615,14 @@ class RetryPolicy:
         return self._retry_timeout
 
 
+def get_entity_name(fn: Entity) -> str:
+    if hasattr(fn, "__durable_entity_name__"):
+        return getattr(fn, "__durable_entity_name__")
+    if isinstance(fn, type) and issubclass(fn, DurableEntity):
+        return fn.__name__
+    return get_name(fn)
+
+
 def get_name(fn: Callable) -> str:
     """Returns the name of the provided function"""
     name = fn.__name__

{durabletask-0.0.0.dev27 → durabletask-0.0.0.dev28}/durabletask/worker.py

@@ -150,7 +150,7 @@ class _Registry:
         self.entities = {}
         self.entity_instances = {}
 
-    def add_orchestrator(self, fn: task.Orchestrator[TInput, TOutput]) -> str:
+    def add_orchestrator(self, fn: task.Orchestrator) -> str:
         if fn is None:
             raise ValueError("An orchestrator function argument is required.")
 
@@ -158,7 +158,7 @@ class _Registry:
         self.add_named_orchestrator(name, fn)
         return name
 
-    def add_named_orchestrator(self, name: str, fn: task.Orchestrator[TInput, TOutput]) -> None:
+    def add_named_orchestrator(self, name: str, fn: task.Orchestrator) -> None:
         if not name:
             raise ValueError("A non-empty orchestrator name is required.")
         if name in self.orchestrators:
@@ -166,10 +166,10 @@ class _Registry:
 
         self.orchestrators[name] = fn
 
-    def get_orchestrator(self, name: str) -> Optional[task.Orchestrator[Any, Any]]:
+    def get_orchestrator(self, name: str) -> Optional[task.Orchestrator]:
         return self.orchestrators.get(name)
 
-    def add_activity(self, fn: task.Activity[TInput, TOutput]) -> str:
+    def add_activity(self, fn: task.Activity) -> str:
         if fn is None:
             raise ValueError("An activity function argument is required.")
 
@@ -177,7 +177,7 @@ class _Registry:
         self.add_named_activity(name, fn)
         return name
 
-    def add_named_activity(self, name: str, fn: task.Activity[TInput, TOutput]) -> None:
+    def add_named_activity(self, name: str, fn: task.Activity) -> None:
         if not name:
             raise ValueError("A non-empty activity name is required.")
         if name in self.activities:
@@ -185,19 +185,17 @@ class _Registry:
 
         self.activities[name] = fn
 
-    def get_activity(self, name: str) -> Optional[task.Activity[Any, Any]]:
+    def get_activity(self, name: str) -> Optional[task.Activity]:
         return self.activities.get(name)
 
-    def add_entity(self, fn: task.Entity) -> str:
+    def add_entity(self, fn: task.Entity, name: Optional[str] = None) -> str:
         if fn is None:
             raise ValueError("An entity function argument is required.")
 
-        if isinstance(fn, type) and issubclass(fn, DurableEntity):
-            name = fn.__name__
-            self.add_named_entity(name, fn)
-        else:
-            name = task.get_name(fn)
-            self.add_named_entity(name, fn)
+        if name is None:
+            name = task.get_entity_name(fn)
+
+        self.add_named_entity(name, fn)
         return name
 
     def add_named_entity(self, name: str, fn: task.Entity) -> None:
@@ -362,7 +360,7 @@ class TaskHubGrpcWorker:
     def __exit__(self, type, value, traceback):
         self.stop()
 
-    def add_orchestrator(self, fn: task.Orchestrator[TInput, TOutput]) -> str:
+    def add_orchestrator(self, fn: task.Orchestrator) -> str:
         """Registers an orchestrator function with the worker."""
         if self._is_running:
             raise RuntimeError(
@@ -378,13 +376,13 @@ class TaskHubGrpcWorker:
             )
         return self._registry.add_activity(fn)
 
-    def add_entity(self, fn: task.Entity) -> str:
+    def add_entity(self, fn: task.Entity, name: Optional[str] = None) -> str:
         """Registers an entity function with the worker."""
         if self._is_running:
             raise RuntimeError(
                 "Entities cannot be added while the worker is running."
             )
-        return self._registry.add_entity(fn)
+        return self._registry.add_entity(fn, name)
 
     def use_versioning(self, version: VersioningOptions) -> None:
         """Initializes versioning options for sub-orchestrators and activities."""
@@ -1047,7 +1045,7 @@ class _RuntimeOrchestrationContext(task.OrchestrationContext):
             entity: EntityInstanceId,
             operation: str,
             input: Optional[TInput] = None,
-    ) -> task.CompletableTask[Any]:
+    ) -> task.CompletableTask:
         id = self.next_sequence_number()
 
         self.call_entity_function_helper(

{durabletask-0.0.0.dev27 → durabletask-0.0.0.dev28}/durabletask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: durabletask
-Version: 0.0.0.dev27
+Version: 0.0.0.dev28
 Summary: A Durable Task Client SDK for Python
 License:     MIT License
         

{durabletask-0.0.0.dev27 → durabletask-0.0.0.dev28}/pyproject.toml

@@ -9,7 +9,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "durabletask"
-version = "0.0.0.dev27"
+version = "0.0.0.dev28"
 description = "A Durable Task Client SDK for Python"
 keywords = [
     "durable",