durabletask 0.0.0.dev22__tar.gz → 0.0.0.dev23__tar.gz

{durabletask-0.0.0.dev22 → durabletask-0.0.0.dev23}/PKG-INFO

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

{durabletask-0.0.0.dev22 → durabletask-0.0.0.dev23}/durabletask/client.py

@@ -11,7 +11,8 @@ from typing import Any, Optional, Sequence, TypeVar, Union
 import grpc
 from google.protobuf import wrappers_pb2
 
-from durabletask.entities import EntityInstanceId, EntityMetadata
+from durabletask.entities import EntityInstanceId
+from durabletask.entities.entity_metadata import EntityMetadata
 import durabletask.internal.helpers as helpers
 import durabletask.internal.orchestrator_service_pb2 as pb
 import durabletask.internal.orchestrator_service_pb2_grpc as stubs
@@ -229,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[TInput, TOutput],
-                      operation_name: str,
-                      input: Optional[TInput] = 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,
@@ -246,7 +244,7 @@ class TaskHubGrpcClient:
         self._stub.SignalEntity(req, None)  # TODO: Cancellation timeout?
 
     def get_entity(self,
-                   entity_instance_id: EntityInstanceId[Any, Any],
+                   entity_instance_id: EntityInstanceId,
                    include_state: bool = True
                    ) -> Optional[EntityMetadata]:
         req = pb.GetEntityRequest(instanceId=str(entity_instance_id), includeState=include_state)

{durabletask-0.0.0.dev22 → durabletask-0.0.0.dev23}/durabletask/entities/durable_entity.py

@@ -4,7 +4,6 @@ from durabletask.entities.entity_context import EntityContext
 from durabletask.entities.entity_instance_id import EntityInstanceId
 
 TState = TypeVar("TState")
-TInput = TypeVar("TInput")
 
 
 class DurableEntity:
@@ -50,10 +49,7 @@ class DurableEntity:
         """
         self.entity_context.set_state(state)
 
-    def signal_entity(self,
-                      entity_instance_id: EntityInstanceId[TInput, Any],
-                      operation: str,
-                      input: Optional[TInput] = None) -> None:
+    def signal_entity(self, entity_instance_id: EntityInstanceId, operation: str, input: Optional[Any] = None) -> None:
         """Signal another entity to perform an operation.
 
         Parameters

{durabletask-0.0.0.dev22 → durabletask-0.0.0.dev23}/durabletask/entities/entity_context.py

@@ -7,7 +7,6 @@ from durabletask.internal.entity_state_shim import StateShim
 import durabletask.internal.orchestrator_service_pb2 as pb
 
 TState = TypeVar("TState")
-TInput = TypeVar("TInput")
 
 
 class EntityContext:
@@ -82,7 +81,7 @@ class EntityContext:
         """
         self._state.set_state(new_state)
 
-    def signal_entity(self, entity_instance_id: EntityInstanceId[TInput, Any], operation: str, input: Optional[TInput] = None) -> None:
+    def signal_entity(self, entity_instance_id: EntityInstanceId, operation: str, input: Optional[Any] = None) -> None:
         """Signal another entity to perform an operation.
 
         Parameters

durabletask-0.0.0.dev23/durabletask/entities/entity_instance_id.py

@@ -0,0 +1,42 @@
+class EntityInstanceId:
+    def __init__(self, entity: str, key: str):
+        self.entity = entity
+        self.key = key
+
+    def __str__(self) -> str:
+        return f"@{self.entity}@{self.key}"
+
+    def __eq__(self, other):
+        if not isinstance(other, EntityInstanceId):
+            return False
+        return self.entity == other.entity and self.key == other.key
+
+    def __lt__(self, other):
+        if not isinstance(other, EntityInstanceId):
+            return self < other
+        return str(self) < str(other)
+
+    @staticmethod
+    def parse(entity_id: str) -> "EntityInstanceId":
+        """Parse a string representation of an entity ID into an EntityInstanceId object.
+
+        Parameters
+        ----------
+        entity_id : str
+            The string representation of the entity ID, in the format '@entity@key'.
+
+        Returns
+        -------
+        EntityInstanceId
+            The parsed EntityInstanceId object.
+
+        Raises
+        ------
+        ValueError
+            If the input string is not in the correct format.
+        """
+        try:
+            _, entity, key = entity_id.split("@", 2)
+            return EntityInstanceId(entity=entity, key=key)
+        except ValueError as ex:
+            raise ValueError(f"Invalid entity ID format: {entity_id}", ex)

{durabletask-0.0.0.dev22 → durabletask-0.0.0.dev23}/durabletask/entities/entity_metadata.py

@@ -24,7 +24,7 @@ class EntityMetadata:
     """
 
     def __init__(self,
-                 id: EntityInstanceId[Any, Any],
+                 id: EntityInstanceId,
                  last_modified: datetime,
                  backlog_queue_size: int,
                  locked_by: str,

{durabletask-0.0.0.dev22 → durabletask-0.0.0.dev23}/durabletask/task.py

@@ -140,14 +140,14 @@ class OrchestrationContext(ABC):
 
     @abstractmethod
     def call_entity(self,
-                    entity: EntityInstanceId[TInput, TOutput],
+                    entity: EntityInstanceId,
                     operation: str,
-                    input: Optional[TInput] = None) -> CompletableTask[TOutput]:
+                    input: Optional[TInput] = None) -> CompletableTask:
         """Schedule entity function for execution.
 
         Parameters
         ----------
-        entity: EntityInstanceId[TInput, TOutput]
+        entity: EntityInstanceId
             The ID of the entity instance to call.
         operation: str
             The name of the operation to invoke on the entity.
@@ -164,7 +164,7 @@ class OrchestrationContext(ABC):
     @abstractmethod
     def signal_entity(
             self,
-            entity_id: EntityInstanceId[TInput, TOutput],
+            entity_id: EntityInstanceId,
             operation_name: str,
             input: Optional[TInput] = None
     ) -> None:
@@ -172,7 +172,7 @@ class OrchestrationContext(ABC):
 
         Parameters
         ----------
-        entity_id: EntityInstanceId[TInput, TOutput]
+        entity_id: EntityInstanceId
             The ID of the entity instance to signal.
         operation_name: str
             The name of the operation to invoke on the entity.
@@ -182,7 +182,7 @@ class OrchestrationContext(ABC):
         pass
 
     @abstractmethod
-    def lock_entities(self, entities: list[EntityInstanceId[Any, Any]]) -> CompletableTask[EntityLock]:
+    def lock_entities(self, entities: list[EntityInstanceId]) -> CompletableTask[EntityLock]:
         """Creates a Task object that locks the specified entity instances.
 
         The locks will be acquired the next time the orchestrator yields.
@@ -191,7 +191,7 @@ class OrchestrationContext(ABC):
 
         Parameters
         ----------
-        entities: list[EntityInstanceId[Any, Any]]
+        entities: list[EntityInstanceId]
             The list of entity instance IDs to lock.
 
         Returns
@@ -615,14 +615,6 @@ 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.dev22 → durabletask-0.0.0.dev23}/durabletask/worker.py

@@ -169,7 +169,7 @@ class _Registry:
     def get_orchestrator(self, name: str) -> Optional[task.Orchestrator[Any, Any]]:
         return self.orchestrators.get(name)
 
-    def add_activity(self, fn: task.Activity) -> str:
+    def add_activity(self, fn: task.Activity[TInput, TOutput]) -> 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) -> None:
+    def add_named_activity(self, name: str, fn: task.Activity[TInput, TOutput]) -> None:
         if not name:
             raise ValueError("A non-empty activity name is required.")
         if name in self.activities:
@@ -185,16 +185,19 @@ class _Registry:
 
         self.activities[name] = fn
 
-    def get_activity(self, name: str) -> Optional[task.Activity]:
+    def get_activity(self, name: str) -> Optional[task.Activity[Any, Any]]:
         return self.activities.get(name)
 
-    def add_entity(self, fn: task.Entity, name: Optional[str] = None) -> str:
+    def add_entity(self, fn: task.Entity) -> str:
         if fn is None:
             raise ValueError("An entity function argument is required.")
 
-        if name is None:
-            name = task.get_entity_name(fn)
-        self.add_named_entity(name, fn)
+        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)
         return name
 
     def add_named_entity(self, name: str, fn: task.Entity) -> None:
@@ -204,7 +207,6 @@ class _Registry:
             raise ValueError(f"A '{name}' entity already exists.")
 
         self.entities[name] = fn
-        setattr(fn, "__durable_entity_name__", name)
 
     def get_entity(self, name: str) -> Optional[task.Entity]:
         return self.entities.get(name)
@@ -376,13 +378,13 @@ class TaskHubGrpcWorker:
             )
         return self._registry.add_activity(fn)
 
-    def add_entity(self, fn: task.Entity, name: Optional[str] = None) -> str:
+    def add_entity(self, fn: task.Entity) -> 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, name)
+        return self._registry.add_entity(fn)
 
     def use_versioning(self, version: VersioningOptions) -> None:
         """Initializes versioning options for sub-orchestrators and activities."""
@@ -1042,21 +1044,21 @@ class _RuntimeOrchestrationContext(task.OrchestrationContext):
 
     def call_entity(
             self,
-            entity: EntityInstanceId[TInput, TOutput],
+            entity: EntityInstanceId,
             operation: str,
             input: Optional[TInput] = None,
-    ) -> task.CompletableTask[TOutput]:
+    ) -> task.CompletableTask:
         id = self.next_sequence_number()
 
         self.call_entity_function_helper(
             id, entity, operation, input=input
         )
 
-        return self._pending_tasks.get(id, task.CompletableTask[TOutput]())
+        return self._pending_tasks.get(id, task.CompletableTask())
 
     def signal_entity(
             self,
-            entity_id: EntityInstanceId[TInput, TOutput],
+            entity_id: EntityInstanceId,
             operation_name: str,
             input: Optional[TInput] = None
     ) -> None:
@@ -1066,7 +1068,7 @@ class _RuntimeOrchestrationContext(task.OrchestrationContext):
             id, entity_id, operation_name, input
         )
 
-    def lock_entities(self, entities: list[EntityInstanceId[Any, Any]]) -> task.CompletableTask[EntityLock]:
+    def lock_entities(self, entities: list[EntityInstanceId]) -> task.CompletableTask[EntityLock]:
         id = self.next_sequence_number()
 
         self.lock_entities_function_helper(
@@ -1156,11 +1158,11 @@ class _RuntimeOrchestrationContext(task.OrchestrationContext):
     def call_entity_function_helper(
             self,
             id: Optional[int],
-            entity_id: EntityInstanceId[TInput, TOutput],
+            entity_id: EntityInstanceId,
             operation: str,
             *,
             input: Optional[TInput] = None,
-    ) -> None:
+    ):
         if id is None:
             id = self.next_sequence_number()
 
@@ -1178,7 +1180,7 @@ class _RuntimeOrchestrationContext(task.OrchestrationContext):
     def signal_entity_function_helper(
             self,
             id: Optional[int],
-            entity_id: EntityInstanceId[TInput, TOutput],
+            entity_id: EntityInstanceId,
             operation: str,
             input: Optional[TInput]
     ) -> None:
@@ -1195,7 +1197,7 @@ class _RuntimeOrchestrationContext(task.OrchestrationContext):
         action = ph.new_signal_entity_action(id, entity_id, operation, encoded_input, self.new_uuid())
         self._pending_actions[id] = action
 
-    def lock_entities_function_helper(self, id: int, entities: list[EntityInstanceId[Any, Any]]) -> None:
+    def lock_entities_function_helper(self, id: int, entities: list[EntityInstanceId]) -> None:
         if id is None:
             id = self.next_sequence_number()
 
@@ -1790,7 +1792,7 @@ class _OrchestrationExecutor:
             # The orchestrator generator function completed
             ctx.set_complete(generatorStopped.value, pb.ORCHESTRATION_STATUS_COMPLETED)
 
-    def _parse_entity_event_sent_input(self, event: pb.HistoryEvent) -> Tuple[EntityInstanceId[Any, Any], str]:
+    def _parse_entity_event_sent_input(self, event: pb.HistoryEvent) -> Tuple[EntityInstanceId, str]:
         try:
             entity_id = EntityInstanceId.parse(event.eventSent.instanceId)
         except ValueError:
@@ -1804,7 +1806,7 @@ class _OrchestrationExecutor:
     def _handle_entity_event_raised(self,
                                     ctx: _RuntimeOrchestrationContext,
                                     event: pb.HistoryEvent,
-                                    entity_id: Optional[EntityInstanceId[Any, Any]],
+                                    entity_id: Optional[EntityInstanceId],
                                     task_id: Optional[int],
                                     is_lock_event: bool):
         # This eventRaised represents the result of an entity operation after being translated to the old
@@ -1917,7 +1919,7 @@ class _EntityExecutor:
     def execute(
             self,
             orchestration_id: str,
-            entity_id: EntityInstanceId[TInput, TOutput],
+            entity_id: EntityInstanceId,
             operation: str,
             state: StateShim,
             encoded_input: Optional[str],

{durabletask-0.0.0.dev22 → durabletask-0.0.0.dev23}/durabletask.egg-info/PKG-INFO

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

{durabletask-0.0.0.dev22 → durabletask-0.0.0.dev23}/pyproject.toml

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

durabletask-0.0.0.dev22/durabletask/entities/entity_instance_id.py

@@ -1,89 +0,0 @@
-from typing import Any, Callable, TypeVar, Union, overload, TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from durabletask import task
-    from durabletask.entities.durable_entity import DurableEntity
-    from durabletask.entities.entity_context import EntityContext
-
-
-TInput = TypeVar('TInput')
-TOutput = TypeVar('TOutput')
-
-
-class EntityInstanceId[TInput, TOutput]:
-    @overload
-    def __new__(
-        cls,
-        entity: Callable[[EntityContext, TInput], TOutput],
-        key: str
-    ) -> "EntityInstanceId[TInput, TOutput]": ...
-
-    @overload
-    def __new__(
-        cls,
-        entity: type[DurableEntity],
-        key: str
-    ) -> "EntityInstanceId[Any, Any]": ...
-
-    @overload
-    def __new__(
-        cls,
-        entity: str,
-        key: str
-    ) -> "EntityInstanceId[Any, Any]": ...
-
-    def __new__(
-        cls,
-        entity: Union[task.Entity[TInput, TOutput], str],
-        key: str
-    ) -> "EntityInstanceId[Any, Any]":
-        return super().__new__(cls)
-
-    def __init__(
-        self,
-        entity: Union[task.Entity[TInput, TOutput], str],
-        key: str
-    ):
-        if not isinstance(entity, str):
-            from durabletask import task
-            entity = task.get_entity_name(entity)
-        self.entity: str = entity
-        self.key: str = key
-
-    def __str__(self) -> str:
-        return f"@{self.entity}@{self.key}"
-
-    def __eq__(self, other):
-        if not isinstance(other, EntityInstanceId):
-            return False
-        return self.entity == other.entity and self.key == other.key
-
-    def __lt__(self, other):
-        if not isinstance(other, EntityInstanceId):
-            return self < other
-        return str(self) < str(other)
-
-    @staticmethod
-    def parse(entity_id: str) -> "EntityInstanceId[Any, Any]":
-        """Parse a string representation of an entity ID into an EntityInstanceId object.
-
-        Parameters
-        ----------
-        entity_id : str
-            The string representation of the entity ID, in the format '@entity@key'.
-
-        Returns
-        -------
-        EntityInstanceId
-            The parsed EntityInstanceId object.
-
-        Raises
-        ------
-        ValueError
-            If the input string is not in the correct format.
-        """
-        try:
-            _, entity, key = entity_id.split("@", 2)
-            return EntityInstanceId(entity=entity, key=key)
-        except ValueError as ex:
-            raise ValueError(f"Invalid entity ID format: {entity_id}", ex)