hatchet-sdk 1.14.0__py3-none-any.whl → 1.14.1__py3-none-any.whl

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/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/{waits.py → 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/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/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/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.dist-info → hatchet_sdk-1.14.1.dist-info}/METADATA

@@ -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.dist-info → hatchet_sdk-1.14.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
-hatchet_sdk/__init__.py,sha256=PR-MvXgk-NVy-dgFg4uvXJe_1WSlJjzVb6cS4RKE3i0,10635
+hatchet_sdk/__init__.py,sha256=3iVKyZ4OnGxZWU0YtXQG9imlljPNBdPARqqCm6Ft03o,10640
 hatchet_sdk/client.py,sha256=OXb2hOJ5p7pY5QMlM4cydb4aGyf6bDdbyWQjPMVCe64,2413
 hatchet_sdk/clients/admin.py,sha256=t8GXhjMiFp9iL0ofISNxSOKlfwaOTX2iQbZfz1G0pHU,16936
 hatchet_sdk/clients/dispatcher/action_listener.py,sha256=tFknXH9iSP0OFYYVcKeDZVrcDNIz00ZQVTxSbHpbKhI,13863
 hatchet_sdk/clients/dispatcher/dispatcher.py,sha256=5qyvLqiCJeW0n9rzqGUNasW95ATywcq5dJrT_ePKmUw,8114
 hatchet_sdk/clients/event_ts.py,sha256=d9NTfjWVk84QMB5XTWkDZ2UfsIIn5ytAEn6S5fhpxss,2121
 hatchet_sdk/clients/events.py,sha256=wE36_Wyb8BLywpuc8epRj7ZZDN9UCmztn6g3wdgRivM,8849
-hatchet_sdk/clients/listeners/durable_event_listener.py,sha256=0sc9DaGBS_cH2mvXLz13EEKO6I0Fq0lhRsTM4E6qKgs,4176
+hatchet_sdk/clients/listeners/durable_event_listener.py,sha256=55WbVQpm65ccVSQtqz-Z_4EI8Gig-7MzH5F9Arh-rb0,4166
 hatchet_sdk/clients/listeners/pooled_listener.py,sha256=m0OwZhMVRyGCmw7XYvh_5R5Mpeg-TrJyPnQ3-d5NnJg,8514
 hatchet_sdk/clients/listeners/run_event_listener.py,sha256=CNXG5a_MUoYnNVmfrXkW1w3v6UnImyeUFXHQ96n4ULM,10222
 hatchet_sdk/clients/listeners/workflow_listener.py,sha256=u7qkr_uqnk3Pq_dARM3ah0nd1KtL3D_UQwbZ5IdcnjE,2283
@@ -230,10 +230,11 @@ hatchet_sdk/clients/rest/models/workflow_workers_count.py,sha256=qhzqfvjjIDyARki
 hatchet_sdk/clients/rest/rest.py,sha256=zZHTzgl-NBdcK6XhG23m_s9RKRONGPPItzGe407s7GA,9262
 hatchet_sdk/clients/rest/tenacity_utils.py,sha256=SQuy4x9scgBpqygRrGdjP7dJz4u4VVAEbjnieid4KcU,1029
 hatchet_sdk/clients/v1/api_client.py,sha256=mJQUZ3cOxlFJiwWKK5F8jBxcpNZ7A2292HucrBqurbg,1205
+hatchet_sdk/conditions.py,sha256=CnhpkXgVXM3wc0kAX8KZQA6tp8NFAbdzAN2xFbw7Hb0,4522
 hatchet_sdk/config.py,sha256=DKOSCyOhFMx9d3Rvu5z9aImbOgZgwdNSg3XVzyVHn3g,5185
 hatchet_sdk/connection.py,sha256=oRxLs_lBRgHfE4jGLZJimr25ymlEJnK1ZXlh-CasjPo,2696
 hatchet_sdk/context/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hatchet_sdk/context/context.py,sha256=gGQ_H_eUEPWGn6ac62sAFUnsS0pRtm9UibxPy8PJUT8,14309
+hatchet_sdk/context/context.py,sha256=I5XfQ_m-Mn33G2no2x5ahd9S-jxMMsEnynhh5Q4JJx8,14411
 hatchet_sdk/context/worker_context.py,sha256=3lGkOYmDixeuSmqxXbsYav2gErcjP8cDa2m0t0iomjI,884
 hatchet_sdk/contracts/dispatcher_pb2.py,sha256=W9aGh-wctZhLjUXUdeQTxH4qArsw6D0kIAWM9SVCX5o,14786
 hatchet_sdk/contracts/dispatcher_pb2.pyi,sha256=9Qoz88G-btdlTuxvk4knqfnYdcIXy3oR9DTh6MwIdP4,18923
@@ -273,9 +274,9 @@ hatchet_sdk/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hatchet_sdk/rate_limit.py,sha256=TwbCuggiZaWpYuo4mjVLlE-z1OfQ2mRBiVvCSaG3lv4,3919
 hatchet_sdk/runnables/action.py,sha256=zrVHpyzIQ9XZgWwY69b_6uhZd53An4trRoLd9b3os5E,4384
 hatchet_sdk/runnables/contextvars.py,sha256=T2LWiXhcSyQYJY_-pfqMjDNjf6PdtDwyXyCZ6zIyWK0,929
-hatchet_sdk/runnables/task.py,sha256=YjAKjL5stGd0JLwsg-rTMQOZ0ZXI0TQg8pIPZ_PgMls,7212
+hatchet_sdk/runnables/task.py,sha256=VEYabAl38U9L_igSDgZSzUL7-c-sX6YFRP0wsqGTadU,6714
 hatchet_sdk/runnables/types.py,sha256=QFayOJ_Oi8tOYI6Sjl9bwjftM96QZh9XIlfFnSNgEXI,4359
-hatchet_sdk/runnables/workflow.py,sha256=cGRbNMvlxZeuySXVgQ3eitTYY-78W7tGPOwFSFIfTFE,49322
+hatchet_sdk/runnables/workflow.py,sha256=AVYMg_QTN9YkddFuOBa8iq9oQinRPdHo9UJsgI2TWHQ,49327
 hatchet_sdk/token.py,sha256=KjIiInwG5Kqd_FO4BSW1x_5Uc7PFbnzIVJqr50-ZldE,779
 hatchet_sdk/utils/backoff.py,sha256=6B5Rb5nLKw_TqqgpJMYjIBV1PTTtbOMRZCveisVhg_I,353
 hatchet_sdk/utils/opentelemetry.py,sha256=64TVwCLrUzEmcL2BUNPV_QubfiR5jajOZtVeGYLnEEA,1226
@@ -503,7 +504,6 @@ hatchet_sdk/v0/worker/runner/utils/error_with_traceback.py,sha256=Iih_s8JNqrinXE
 hatchet_sdk/v0/worker/worker.py,sha256=QtkabDUSAnNExi2sTY5VLSAJak_X0DQNGjei8GtYSR4,13021
 hatchet_sdk/v0/workflow.py,sha256=txhAZC0ohjhRrviIKn1yCR-ybqoQJ4jCrTc7vIkfO3g,9381
 hatchet_sdk/v0/workflow_run.py,sha256=jsEZprXshrSV7i_TtL5uoCL03D18zQ3NeJCq7mp97Dg,1752
-hatchet_sdk/waits.py,sha256=yJm5U2VfiVHfLLj0SwG6RDnpLH3F4VL3rZ2iiY_IwMY,4073
 hatchet_sdk/worker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hatchet_sdk/worker/action_listener_process.py,sha256=Xzzn1dDFJrqnC9HBsh3fYI8lfpOD4Ecze47qmm_XUWE,12923
 hatchet_sdk/worker/runner/run_loop_manager.py,sha256=GeILClNXaDbsjXCQb0bBdgeyAwZGem2JdaH0t6wz__I,4053
@@ -511,7 +511,7 @@ hatchet_sdk/worker/runner/runner.py,sha256=5dOLFJIEWHed2sQxSeWmqMFWVViYTnfvk70n1
 hatchet_sdk/worker/runner/utils/capture_logs.py,sha256=DKw6boqVsSCM1XvBWYuc833MZxCdSpMxg3l4aAqKPyw,3465
 hatchet_sdk/worker/worker.py,sha256=nDuRo_LishRuOCTnDonc7G7qeOoW93nRHGd-fQOE_bs,16541
 hatchet_sdk/workflow_run.py,sha256=KcylcqRwKADtnzOTjoiVr1vdr7qTZFtDeD5aRS6A4Y8,2823
-hatchet_sdk-1.14.0.dist-info/METADATA,sha256=x3QO_B5tvFv5v4FQEr4BAFLsZvEQN1z7Unk36scw8T0,3636
-hatchet_sdk-1.14.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-hatchet_sdk-1.14.0.dist-info/entry_points.txt,sha256=Un_76pcLse-ZGBlwebhQpnTPyQrripeHW8J7qmEpGOk,1400
-hatchet_sdk-1.14.0.dist-info/RECORD,,
+hatchet_sdk-1.14.1.dist-info/METADATA,sha256=Eygcnag5XEsRLK-kC1LDbF5L3YJmLIazhyLFTOZeLBY,3636
+hatchet_sdk-1.14.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+hatchet_sdk-1.14.1.dist-info/entry_points.txt,sha256=Un_76pcLse-ZGBlwebhQpnTPyQrripeHW8J7qmEpGOk,1400
+hatchet_sdk-1.14.1.dist-info/RECORD,,