hatchet-sdk 1.14.0__tar.gz → 1.14.1__tar.gz

{hatchet_sdk-1.14.0 → hatchet_sdk-1.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hatchet-sdk
-Version: 1.14.0
+Version: 1.14.1
 Summary: 
 License: MIT
 Author: Alexander Belanger

{hatchet_sdk-1.14.0 → hatchet_sdk-1.14.1}/hatchet_sdk/__init__.py

@@ -130,6 +130,14 @@ from hatchet_sdk.clients.rest.models.workflow_version_definition import (
     WorkflowVersionDefinition,
 )
 from hatchet_sdk.clients.rest.models.workflow_version_meta import WorkflowVersionMeta
+from hatchet_sdk.conditions import (
+    Condition,
+    OrGroup,
+    ParentCondition,
+    SleepCondition,
+    UserEventCondition,
+    or_,
+)
 from hatchet_sdk.config import ClientConfig, ClientTLSConfig, OpenTelemetryConfig
 from hatchet_sdk.context.context import Context, DurableContext
 from hatchet_sdk.context.worker_context import WorkerContext
@@ -158,14 +166,6 @@ from hatchet_sdk.runnables.types import (
 )
 from hatchet_sdk.runnables.workflow import TaskRunRef
 from hatchet_sdk.utils.opentelemetry import OTelAttribute
-from hatchet_sdk.waits import (
-    Condition,
-    OrGroup,
-    ParentCondition,
-    SleepCondition,
-    UserEventCondition,
-    or_,
-)
 from hatchet_sdk.worker.worker import Worker, WorkerStartOptions, WorkerStatus
 from hatchet_sdk.workflow_run import WorkflowRunRef
 

{hatchet_sdk-1.14.0 → hatchet_sdk-1.14.1}/hatchet_sdk/clients/listeners/durable_event_listener.py

@@ -8,6 +8,7 @@ from pydantic import BaseModel, ConfigDict
 
 from hatchet_sdk.clients.listeners.pooled_listener import PooledListener
 from hatchet_sdk.clients.rest.tenacity_utils import tenacity_retry
+from hatchet_sdk.conditions import Condition, SleepCondition, UserEventCondition
 from hatchet_sdk.config import ClientConfig
 from hatchet_sdk.connection import new_conn
 from hatchet_sdk.contracts.v1.dispatcher_pb2 import (
@@ -20,7 +21,6 @@ from hatchet_sdk.contracts.v1.dispatcher_pb2 import (
 from hatchet_sdk.contracts.v1.dispatcher_pb2_grpc import V1DispatcherStub
 from hatchet_sdk.contracts.v1.shared.condition_pb2 import DurableEventListenerConditions
 from hatchet_sdk.metadata import get_metadata
-from hatchet_sdk.waits import SleepCondition, UserEventCondition
 
 DEFAULT_DURABLE_EVENT_LISTENER_RETRY_INTERVAL = 3  # seconds
 DEFAULT_DURABLE_EVENT_LISTENER_RETRY_COUNT = 5
@@ -32,7 +32,7 @@ class RegisterDurableEventRequest(BaseModel):
 
     task_id: str
     signal_key: str
-    conditions: list[SleepCondition | UserEventCondition]
+    conditions: list[Condition]
     config: ClientConfig
 
     def to_proto(self) -> RegisterDurableEventRequestProto:

hatchet_sdk-1.14.0/hatchet_sdk/waits.py → hatchet_sdk-1.14.1/hatchet_sdk/conditions.py

@@ -140,3 +140,18 @@ class OrGroup:
 
 def or_(*conditions: Condition) -> OrGroup:
     return OrGroup(conditions=list(conditions))
+
+
+def flatten_conditions(conditions: list[Condition | OrGroup]) -> list[Condition]:
+    flattened: list[Condition] = []
+
+    for condition in conditions:
+        if isinstance(condition, OrGroup):
+            for or_condition in condition.conditions:
+                or_condition.base.or_group_id = condition.or_group_id
+
+            flattened.extend(condition.conditions)
+        else:
+            flattened.append(condition)
+
+    return flattened

{hatchet_sdk-1.14.0 → hatchet_sdk-1.14.1}/hatchet_sdk/context/context.py

@@ -14,12 +14,17 @@ from hatchet_sdk.clients.listeners.durable_event_listener import (
     DurableEventListener,
     RegisterDurableEventRequest,
 )
+from hatchet_sdk.conditions import (
+    OrGroup,
+    SleepCondition,
+    UserEventCondition,
+    flatten_conditions,
+)
 from hatchet_sdk.context.worker_context import WorkerContext
 from hatchet_sdk.features.runs import RunsClient
 from hatchet_sdk.logger import logger
 from hatchet_sdk.utils.timedelta_to_expression import Duration, timedelta_to_expr
 from hatchet_sdk.utils.typing import JSONSerializableMapping
-from hatchet_sdk.waits import SleepCondition, UserEventCondition
 from hatchet_sdk.worker.runner.utils.capture_logs import AsyncLogSender, LogRecord
 
 if TYPE_CHECKING:
@@ -367,7 +372,9 @@ class Context:
 
 class DurableContext(Context):
     async def aio_wait_for(
-        self, signal_key: str, *conditions: SleepCondition | UserEventCondition
+        self,
+        signal_key: str,
+        *conditions: SleepCondition | UserEventCondition | OrGroup,
     ) -> dict[str, Any]:
         """
         Durably wait for either a sleep or an event.
@@ -386,7 +393,7 @@ class DurableContext(Context):
         request = RegisterDurableEventRequest(
             task_id=task_id,
             signal_key=signal_key,
-            conditions=list(conditions),
+            conditions=flatten_conditions(list(conditions)),
             config=self.runs_client.client_config,
         )
 

{hatchet_sdk-1.14.0 → hatchet_sdk-1.14.1}/hatchet_sdk/runnables/task.py

@@ -1,6 +1,15 @@
 from collections.abc import Callable
 from typing import TYPE_CHECKING, Any, Generic, cast, get_type_hints
 
+from hatchet_sdk.conditions import (
+    Action,
+    Condition,
+    OrGroup,
+    ParentCondition,
+    SleepCondition,
+    UserEventCondition,
+    flatten_conditions,
+)
 from hatchet_sdk.context.context import Context, DurableContext
 from hatchet_sdk.contracts.v1.shared.condition_pb2 import TaskConditions
 from hatchet_sdk.contracts.v1.workflows_pb2 import (
@@ -24,14 +33,6 @@ from hatchet_sdk.utils.typing import (
     TaskIOValidator,
     is_basemodel_subclass,
 )
-from hatchet_sdk.waits import (
-    Action,
-    Condition,
-    OrGroup,
-    ParentCondition,
-    SleepCondition,
-    UserEventCondition,
-)
 
 if TYPE_CHECKING:
     from hatchet_sdk.runnables.workflow import Workflow
@@ -84,9 +85,9 @@ class Task(Generic[TWorkflowInput, R]):
         self.backoff_max_seconds = backoff_max_seconds
         self.concurrency = concurrency or []
 
-        self.wait_for = self._flatten_conditions(wait_for or [])
-        self.skip_if = self._flatten_conditions(skip_if or [])
-        self.cancel_if = self._flatten_conditions(cancel_if or [])
+        self.wait_for = flatten_conditions(wait_for or [])
+        self.skip_if = flatten_conditions(skip_if or [])
+        self.cancel_if = flatten_conditions(cancel_if or [])
 
         return_type = get_type_hints(_fn).get("return")
 
@@ -95,22 +96,6 @@ class Task(Generic[TWorkflowInput, R]):
             step_output=return_type if is_basemodel_subclass(return_type) else None,
         )
 
-    def _flatten_conditions(
-        self, conditions: list[Condition | OrGroup]
-    ) -> list[Condition]:
-        flattened: list[Condition] = []
-
-        for condition in conditions:
-            if isinstance(condition, OrGroup):
-                for or_condition in condition.conditions:
-                    or_condition.base.or_group_id = condition.or_group_id
-
-                flattened.extend(condition.conditions)
-            else:
-                flattened.append(condition)
-
-        return flattened
-
     def call(self, ctx: Context | DurableContext) -> R:
         if self.is_async_function:
             raise TypeError(f"{self.name} is not a sync function. Use `acall` instead.")

{hatchet_sdk-1.14.0 → hatchet_sdk-1.14.1}/hatchet_sdk/runnables/workflow.py

@@ -17,6 +17,7 @@ from hatchet_sdk.clients.rest.models.cron_workflows import CronWorkflows
 from hatchet_sdk.clients.rest.models.v1_filter import V1Filter
 from hatchet_sdk.clients.rest.models.v1_task_status import V1TaskStatus
 from hatchet_sdk.clients.rest.models.v1_task_summary import V1TaskSummary
+from hatchet_sdk.conditions import Condition, OrGroup
 from hatchet_sdk.context.context import Context, DurableContext
 from hatchet_sdk.contracts.v1.workflows_pb2 import (
     CreateWorkflowVersionRequest,
@@ -43,7 +44,6 @@ from hatchet_sdk.utils.typing import (
     JSONSerializableMapping,
     is_basemodel_subclass,
 )
-from hatchet_sdk.waits import Condition, OrGroup
 from hatchet_sdk.workflow_run import WorkflowRunRef
 
 if TYPE_CHECKING:

{hatchet_sdk-1.14.0 → hatchet_sdk-1.14.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hatchet-sdk"
-version = "1.14.0"
+version = "1.14.1"
 description = ""
 authors = ["Alexander Belanger <alexander@hatchet.run>"]
 readme = "README.md"