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

hatchet_sdk/runnables/workflow.py

@@ -1,7 +1,8 @@
 import asyncio
+from collections.abc import Callable
 from datetime import datetime, timedelta, timezone
 from functools import cached_property
-from typing import TYPE_CHECKING, Any, Callable, Generic, TypeVar, cast, get_type_hints
+from typing import TYPE_CHECKING, Any, Generic, TypeVar, cast, get_type_hints
 
 from google.protobuf import timestamp_pb2
 from pydantic import BaseModel, model_validator
@@ -11,6 +12,7 @@ from hatchet_sdk.clients.admin import (
     TriggerWorkflowOptions,
     WorkflowRunTriggerConfig,
 )
+from hatchet_sdk.clients.listeners.run_event_listener import RunEventListener
 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
@@ -371,7 +373,7 @@ class BaseWorkflow(Generic[TWorkflowInput]):
         self,
         expression: str,
         scope: str,
-        payload: JSONSerializableMapping = {},
+        payload: JSONSerializableMapping | None = None,
     ) -> V1Filter:
         """
         Create a new filter.
@@ -393,7 +395,7 @@ class BaseWorkflow(Generic[TWorkflowInput]):
         self,
         expression: str,
         scope: str,
-        payload: JSONSerializableMapping = {},
+        payload: JSONSerializableMapping | None = None,
     ) -> V1Filter:
         """
         Create a new filter.
@@ -458,7 +460,7 @@ class BaseWorkflow(Generic[TWorkflowInput]):
         cron_name: str,
         expression: str,
         input: TWorkflowInput = cast(TWorkflowInput, EmptyModel()),
-        additional_metadata: JSONSerializableMapping = {},
+        additional_metadata: JSONSerializableMapping | None = None,
         priority: int | None = None,
     ) -> CronWorkflows:
         """
@@ -477,7 +479,7 @@ class BaseWorkflow(Generic[TWorkflowInput]):
             cron_name=cron_name,
             expression=expression,
             input=self._serialize_input(input),
-            additional_metadata=additional_metadata,
+            additional_metadata=additional_metadata or {},
             priority=priority,
         )
 
@@ -486,7 +488,7 @@ class BaseWorkflow(Generic[TWorkflowInput]):
         cron_name: str,
         expression: str,
         input: TWorkflowInput = cast(TWorkflowInput, EmptyModel()),
-        additional_metadata: JSONSerializableMapping = {},
+        additional_metadata: JSONSerializableMapping | None = None,
         priority: int | None = None,
     ) -> CronWorkflows:
         """
@@ -505,7 +507,7 @@ class BaseWorkflow(Generic[TWorkflowInput]):
             cron_name=cron_name,
             expression=expression,
             input=self._serialize_input(input),
-            additional_metadata=additional_metadata,
+            additional_metadata=additional_metadata or {},
             priority=priority,
         )
 
@@ -620,7 +622,7 @@ class Workflow(BaseWorkflow[TWorkflowInput]):
         """
         Run the workflow asynchronously and wait for it to complete.
 
-        This method triggers a workflow run, blocks until completion, and returns the final result.
+        This method triggers a workflow run, awaits until completion, and returns the final result.
 
         :param input: The input data for the workflow, must match the workflow's input type.
         :param options: Additional options for workflow execution like metadata and parent workflow ID.
@@ -716,16 +718,16 @@ class Workflow(BaseWorkflow[TWorkflowInput]):
         name: str | None = None,
         schedule_timeout: Duration = timedelta(minutes=5),
         execution_timeout: Duration = timedelta(seconds=60),
-        parents: list[Task[TWorkflowInput, Any]] = [],
+        parents: list[Task[TWorkflowInput, Any]] | None = None,
         retries: int = 0,
-        rate_limits: list[RateLimit] = [],
-        desired_worker_labels: dict[str, DesiredWorkerLabel] = {},
+        rate_limits: list[RateLimit] | None = None,
+        desired_worker_labels: dict[str, DesiredWorkerLabel] | None = None,
         backoff_factor: float | None = None,
         backoff_max_seconds: int | None = None,
-        concurrency: list[ConcurrencyExpression] = [],
-        wait_for: list[Condition | OrGroup] = [],
-        skip_if: list[Condition | OrGroup] = [],
-        cancel_if: list[Condition | OrGroup] = [],
+        concurrency: list[ConcurrencyExpression] | None = None,
+        wait_for: list[Condition | OrGroup] | None = None,
+        skip_if: list[Condition | OrGroup] | None = None,
+        cancel_if: list[Condition | OrGroup] | None = None,
     ) -> Callable[
         [Callable[[TWorkflowInput, Context], R | CoroutineLike[R]]],
         Task[TWorkflowInput, R],
@@ -784,10 +786,10 @@ class Workflow(BaseWorkflow[TWorkflowInput]):
                 schedule_timeout=computed_params.schedule_timeout,
                 parents=parents,
                 retries=computed_params.retries,
-                rate_limits=[r.to_proto() for r in rate_limits],
+                rate_limits=[r.to_proto() for r in rate_limits or []],
                 desired_worker_labels={
                     key: transform_desired_worker_label(d)
-                    for key, d in desired_worker_labels.items()
+                    for key, d in (desired_worker_labels or {}).items()
                 },
                 backoff_factor=computed_params.backoff_factor,
                 backoff_max_seconds=computed_params.backoff_max_seconds,
@@ -808,16 +810,16 @@ class Workflow(BaseWorkflow[TWorkflowInput]):
         name: str | None = None,
         schedule_timeout: Duration = timedelta(minutes=5),
         execution_timeout: Duration = timedelta(seconds=60),
-        parents: list[Task[TWorkflowInput, Any]] = [],
+        parents: list[Task[TWorkflowInput, Any]] | None = None,
         retries: int = 0,
-        rate_limits: list[RateLimit] = [],
-        desired_worker_labels: dict[str, DesiredWorkerLabel] = {},
+        rate_limits: list[RateLimit] | None = None,
+        desired_worker_labels: dict[str, DesiredWorkerLabel] | None = None,
         backoff_factor: float | None = None,
         backoff_max_seconds: int | None = None,
-        concurrency: list[ConcurrencyExpression] = [],
-        wait_for: list[Condition | OrGroup] = [],
-        skip_if: list[Condition | OrGroup] = [],
-        cancel_if: list[Condition | OrGroup] = [],
+        concurrency: list[ConcurrencyExpression] | None = None,
+        wait_for: list[Condition | OrGroup] | None = None,
+        skip_if: list[Condition | OrGroup] | None = None,
+        cancel_if: list[Condition | OrGroup] | None = None,
     ) -> Callable[
         [Callable[[TWorkflowInput, DurableContext], R | CoroutineLike[R]]],
         Task[TWorkflowInput, R],
@@ -880,10 +882,10 @@ class Workflow(BaseWorkflow[TWorkflowInput]):
                 schedule_timeout=computed_params.schedule_timeout,
                 parents=parents,
                 retries=computed_params.retries,
-                rate_limits=[r.to_proto() for r in rate_limits],
+                rate_limits=[r.to_proto() for r in rate_limits or []],
                 desired_worker_labels={
                     key: transform_desired_worker_label(d)
-                    for key, d in desired_worker_labels.items()
+                    for key, d in (desired_worker_labels or {}).items()
                 },
                 backoff_factor=computed_params.backoff_factor,
                 backoff_max_seconds=computed_params.backoff_max_seconds,
@@ -905,10 +907,10 @@ class Workflow(BaseWorkflow[TWorkflowInput]):
         schedule_timeout: Duration = timedelta(minutes=5),
         execution_timeout: Duration = timedelta(seconds=60),
         retries: int = 0,
-        rate_limits: list[RateLimit] = [],
+        rate_limits: list[RateLimit] | None = None,
         backoff_factor: float | None = None,
         backoff_max_seconds: int | None = None,
-        concurrency: list[ConcurrencyExpression] = [],
+        concurrency: list[ConcurrencyExpression] | None = None,
     ) -> Callable[
         [Callable[[TWorkflowInput, Context], R | CoroutineLike[R]]],
         Task[TWorkflowInput, R],
@@ -947,10 +949,15 @@ class Workflow(BaseWorkflow[TWorkflowInput]):
                 execution_timeout=execution_timeout,
                 schedule_timeout=schedule_timeout,
                 retries=retries,
-                rate_limits=[r.to_proto() for r in rate_limits],
+                rate_limits=[r.to_proto() for r in rate_limits or []],
                 backoff_factor=backoff_factor,
                 backoff_max_seconds=backoff_max_seconds,
                 concurrency=concurrency,
+                desired_worker_labels=None,
+                parents=None,
+                wait_for=None,
+                skip_if=None,
+                cancel_if=None,
             )
 
             if self._on_failure_task:
@@ -968,10 +975,10 @@ class Workflow(BaseWorkflow[TWorkflowInput]):
         schedule_timeout: Duration = timedelta(minutes=5),
         execution_timeout: Duration = timedelta(seconds=60),
         retries: int = 0,
-        rate_limits: list[RateLimit] = [],
+        rate_limits: list[RateLimit] | None = None,
         backoff_factor: float | None = None,
         backoff_max_seconds: int | None = None,
-        concurrency: list[ConcurrencyExpression] = [],
+        concurrency: list[ConcurrencyExpression] | None = None,
     ) -> Callable[
         [Callable[[TWorkflowInput, Context], R | CoroutineLike[R]]],
         Task[TWorkflowInput, R],
@@ -1010,11 +1017,15 @@ class Workflow(BaseWorkflow[TWorkflowInput]):
                 execution_timeout=execution_timeout,
                 schedule_timeout=schedule_timeout,
                 retries=retries,
-                rate_limits=[r.to_proto() for r in rate_limits],
+                rate_limits=[r.to_proto() for r in rate_limits or []],
                 backoff_factor=backoff_factor,
                 backoff_max_seconds=backoff_max_seconds,
                 concurrency=concurrency,
-                parents=[],
+                parents=None,
+                desired_worker_labels=None,
+                wait_for=None,
+                skip_if=None,
+                cancel_if=None,
             )
 
             if self._on_success_task:
@@ -1087,6 +1098,9 @@ class TaskRunRef(Generic[TWorkflowInput, R]):
 
         return self._s._extract_result(result)
 
+    def stream(self) -> RunEventListener:
+        return self._wrr.stream()
+
 
 class Standalone(BaseWorkflow[TWorkflowInput], Generic[TWorkflowInput, R]):
     def __init__(
@@ -1123,13 +1137,14 @@ class Standalone(BaseWorkflow[TWorkflowInput], Generic[TWorkflowInput, R]):
         options: TriggerWorkflowOptions = TriggerWorkflowOptions(),
     ) -> R:
         """
-        Synchronously trigger a workflow run without waiting for it to complete.
-        This method is useful for starting a workflow run and immediately returning a reference to the run without blocking while the workflow runs.
+        Run the workflow synchronously and wait for it to complete.
+
+        This method triggers a workflow run, blocks until completion, and returns the extracted result.
 
         :param input: The input data for the workflow.
         :param options: Additional options for workflow execution.
 
-        :returns: A `WorkflowRunRef` object representing the reference to the workflow run.
+        :returns: The extracted result of the workflow execution.
         """
         return self._extract_result(self._workflow.run(input, options))
 
@@ -1141,12 +1156,12 @@ class Standalone(BaseWorkflow[TWorkflowInput], Generic[TWorkflowInput, R]):
         """
         Run the workflow asynchronously and wait for it to complete.
 
-        This method triggers a workflow run, blocks until completion, and returns the final result.
+        This method triggers a workflow run, awaits until completion, and returns the extracted result.
 
         :param input: The input data for the workflow, must match the workflow's input type.
         :param options: Additional options for workflow execution like metadata and parent workflow ID.
 
-        :returns: The result of the workflow execution as a dictionary.
+        :returns: The extracted result of the workflow execution.
         """
         result = await self._workflow.aio_run(input, options)
         return self._extract_result(result)
@@ -1157,14 +1172,14 @@ class Standalone(BaseWorkflow[TWorkflowInput], Generic[TWorkflowInput, R]):
         options: TriggerWorkflowOptions = TriggerWorkflowOptions(),
     ) -> TaskRunRef[TWorkflowInput, R]:
         """
-        Run the workflow synchronously and wait for it to complete.
+        Trigger a workflow run without waiting for it to complete.
 
-        This method triggers a workflow run, blocks until completion, and returns the final result.
+        This method triggers a workflow run and immediately returns a reference to the run without blocking while the workflow runs.
 
         :param input: The input data for the workflow, must match the workflow's input type.
         :param options: Additional options for workflow execution like metadata and parent workflow ID.
 
-        :returns: The result of the workflow execution as a dictionary.
+        :returns: A `TaskRunRef` object representing the reference to the workflow run.
         """
         ref = self._workflow.run_no_wait(input, options)
 
@@ -1182,7 +1197,7 @@ class Standalone(BaseWorkflow[TWorkflowInput], Generic[TWorkflowInput, R]):
         :param input: The input data for the workflow.
         :param options: Additional options for workflow execution.
 
-        :returns: A `WorkflowRunRef` object representing the reference to the workflow run.
+        :returns: A `TaskRunRef` object representing the reference to the workflow run.
         """
         ref = await self._workflow.aio_run_no_wait(input, options)
 

hatchet_sdk/utils/proto_enums.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import Type, TypeVar, overload
+from typing import TypeVar, overload
 
 from google.protobuf.internal.enum_type_wrapper import EnumTypeWrapper
 
@@ -26,19 +26,19 @@ def convert_python_enum_to_proto(
 
 @overload
 def convert_proto_enum_to_python(
-    value: TProtoEnumValue, python_enum_class: Type[TPythonEnum], proto_enum: TProtoEnum
+    value: TProtoEnumValue, python_enum_class: type[TPythonEnum], proto_enum: TProtoEnum
 ) -> TPythonEnum: ...
 
 
 @overload
 def convert_proto_enum_to_python(
-    value: None, python_enum_class: Type[TPythonEnum], proto_enum: TProtoEnum
+    value: None, python_enum_class: type[TPythonEnum], proto_enum: TProtoEnum
 ) -> None: ...
 
 
 def convert_proto_enum_to_python(
     value: TProtoEnumValue | None,
-    python_enum_class: Type[TPythonEnum],
+    python_enum_class: type[TPythonEnum],
     proto_enum: TProtoEnum,
 ) -> TPythonEnum | None:
     if value is None:

hatchet_sdk/utils/timedelta_to_expression.py

@@ -18,7 +18,6 @@ def timedelta_to_expr(td: Duration) -> str:
     ## IMPORTANT: We only support hours, minutes, and seconds on the engine
     if seconds % HOUR == 0:
         return f"{seconds // HOUR}h"
-    elif seconds % MINUTE == 0:
+    if seconds % MINUTE == 0:
         return f"{seconds // MINUTE}m"
-    else:
-        return f"{seconds}s"
+    return f"{seconds}s"

hatchet_sdk/utils/typing.py

@@ -1,20 +1,11 @@
 import sys
-from typing import (
-    Any,
-    Awaitable,
-    Coroutine,
-    Generator,
-    Mapping,
-    Type,
-    TypeAlias,
-    TypeGuard,
-    TypeVar,
-)
+from collections.abc import Awaitable, Coroutine, Generator
+from typing import Any, Literal, TypeAlias, TypeGuard, TypeVar
 
 from pydantic import BaseModel
 
 
-def is_basemodel_subclass(model: Any) -> TypeGuard[Type[BaseModel]]:
+def is_basemodel_subclass(model: Any) -> TypeGuard[type[BaseModel]]:
     try:
         return issubclass(model, BaseModel)
     except TypeError:
@@ -22,18 +13,21 @@ def is_basemodel_subclass(model: Any) -> TypeGuard[Type[BaseModel]]:
 
 
 class TaskIOValidator(BaseModel):
-    workflow_input: Type[BaseModel] | None = None
-    step_output: Type[BaseModel] | None = None
+    workflow_input: type[BaseModel] | None = None
+    step_output: type[BaseModel] | None = None
 
 
-JSONSerializableMapping = Mapping[str, Any]
+JSONSerializableMapping = dict[str, Any]
 
 
 _T_co = TypeVar("_T_co", covariant=True)
 
 if sys.version_info >= (3, 12):
-    AwaitableLike: TypeAlias = Awaitable[_T_co]  # noqa: Y047
-    CoroutineLike: TypeAlias = Coroutine[Any, Any, _T_co]  # noqa: Y047
+    AwaitableLike: TypeAlias = Awaitable[_T_co]
+    CoroutineLike: TypeAlias = Coroutine[Any, Any, _T_co]
 else:
     AwaitableLike: TypeAlias = Generator[Any, None, _T_co] | Awaitable[_T_co]
     CoroutineLike: TypeAlias = Generator[Any, None, _T_co] | Coroutine[Any, Any, _T_co]
+
+STOP_LOOP_TYPE = Literal["STOP_LOOP"]
+STOP_LOOP: STOP_LOOP_TYPE = "STOP_LOOP"  # Sentinel object to stop the loop

hatchet_sdk/v0/__init__.py

@@ -1,3 +1,10 @@
+from hatchet_sdk.contracts.workflows_pb2 import (
+    ConcurrencyLimitStrategy,
+    CreateWorkflowVersionOpts,
+    RateLimitDuration,
+    StickyStrategy,
+    WorkerLabelComparator,
+)
 from hatchet_sdk.v0.clients.rest.models.accept_invite_request import AcceptInviteRequest
 
 # import models into sdk package
@@ -121,13 +128,6 @@ from hatchet_sdk.v0.clients.rest.models.workflow_version_definition import (
     WorkflowVersionDefinition,
 )
 from hatchet_sdk.v0.clients.rest.models.workflow_version_meta import WorkflowVersionMeta
-from hatchet_sdk.v0.contracts.workflows_pb2 import (
-    ConcurrencyLimitStrategy,
-    CreateWorkflowVersionOpts,
-    RateLimitDuration,
-    StickyStrategy,
-    WorkerLabelComparator,
-)
 from hatchet_sdk.v0.utils.aio_utils import sync_to_async
 
 from .client import new_client

hatchet_sdk/v0/clients/admin.py

@@ -5,12 +5,7 @@ from typing import Any, Callable, Dict, List, Optional, TypedDict, TypeVar, Unio
 import grpc
 from google.protobuf import timestamp_pb2
 
-from hatchet_sdk.v0.clients.rest.models.workflow_run import WorkflowRun
-from hatchet_sdk.v0.clients.rest.tenacity_utils import tenacity_retry
-from hatchet_sdk.v0.clients.run_event_listener import new_listener
-from hatchet_sdk.v0.clients.workflow_listener import PooledWorkflowRunListener
-from hatchet_sdk.v0.connection import new_conn
-from hatchet_sdk.v0.contracts.workflows_pb2 import (
+from hatchet_sdk.contracts.workflows_pb2 import (
     BulkTriggerWorkflowRequest,
     BulkTriggerWorkflowResponse,
     CreateWorkflowVersionOpts,
@@ -22,7 +17,12 @@ from hatchet_sdk.v0.contracts.workflows_pb2 import (
     TriggerWorkflowResponse,
     WorkflowVersion,
 )
-from hatchet_sdk.v0.contracts.workflows_pb2_grpc import WorkflowServiceStub
+from hatchet_sdk.contracts.workflows_pb2_grpc import WorkflowServiceStub
+from hatchet_sdk.v0.clients.rest.models.workflow_run import WorkflowRun
+from hatchet_sdk.v0.clients.rest.tenacity_utils import tenacity_retry
+from hatchet_sdk.v0.clients.run_event_listener import new_listener
+from hatchet_sdk.v0.clients.workflow_listener import PooledWorkflowRunListener
+from hatchet_sdk.v0.connection import new_conn
 from hatchet_sdk.v0.workflow_run import RunRef, WorkflowRunRef
 
 from ..loader import ClientConfig

hatchet_sdk/v0/clients/dispatcher/action_listener.py

@@ -7,12 +7,7 @@ from typing import Any, AsyncGenerator, List, Optional
 import grpc
 from grpc._cython import cygrpc
 
-from hatchet_sdk.v0.clients.event_ts import ThreadSafeEvent, read_with_interrupt
-from hatchet_sdk.v0.clients.run_event_listener import (
-    DEFAULT_ACTION_LISTENER_RETRY_INTERVAL,
-)
-from hatchet_sdk.v0.connection import new_conn
-from hatchet_sdk.v0.contracts.dispatcher_pb2 import (
+from hatchet_sdk.contracts.dispatcher_pb2 import (
     ActionType,
     AssignedAction,
     HeartbeatRequest,
@@ -20,8 +15,13 @@ from hatchet_sdk.v0.contracts.dispatcher_pb2 import (
     WorkerListenRequest,
     WorkerUnsubscribeRequest,
 )
-from hatchet_sdk.v0.contracts.dispatcher_pb2_grpc import DispatcherStub
-from hatchet_sdk.v0.logger import logger
+from hatchet_sdk.contracts.dispatcher_pb2_grpc import DispatcherStub
+from hatchet_sdk.logger import logger
+from hatchet_sdk.v0.clients.event_ts import ThreadSafeEvent, read_with_interrupt
+from hatchet_sdk.v0.clients.run_event_listener import (
+    DEFAULT_ACTION_LISTENER_RETRY_INTERVAL,
+)
+from hatchet_sdk.v0.connection import new_conn
 from hatchet_sdk.v0.utils.backoff import exp_backoff_sleep
 
 from ...loader import ClientConfig

hatchet_sdk/v0/clients/dispatcher/dispatcher.py

@@ -2,14 +2,7 @@ from typing import Any, cast
 
 from google.protobuf.timestamp_pb2 import Timestamp
 
-from hatchet_sdk.v0.clients.dispatcher.action_listener import (
-    Action,
-    ActionListener,
-    GetActionListenerRequest,
-)
-from hatchet_sdk.v0.clients.rest.tenacity_utils import tenacity_retry
-from hatchet_sdk.v0.connection import new_conn
-from hatchet_sdk.v0.contracts.dispatcher_pb2 import (
+from hatchet_sdk.contracts.dispatcher_pb2 import (
     STEP_EVENT_TYPE_COMPLETED,
     STEP_EVENT_TYPE_FAILED,
     ActionEventResponse,
@@ -25,7 +18,14 @@ from hatchet_sdk.v0.contracts.dispatcher_pb2 import (
     WorkerRegisterRequest,
     WorkerRegisterResponse,
 )
-from hatchet_sdk.v0.contracts.dispatcher_pb2_grpc import DispatcherStub
+from hatchet_sdk.contracts.dispatcher_pb2_grpc import DispatcherStub
+from hatchet_sdk.v0.clients.dispatcher.action_listener import (
+    Action,
+    ActionListener,
+    GetActionListenerRequest,
+)
+from hatchet_sdk.v0.clients.rest.tenacity_utils import tenacity_retry
+from hatchet_sdk.v0.connection import new_conn
 
 from ...loader import ClientConfig
 from ...metadata import get_metadata

hatchet_sdk/v0/clients/events.py

@@ -7,15 +7,15 @@ from uuid import uuid4
 import grpc
 from google.protobuf import timestamp_pb2
 
-from hatchet_sdk.v0.clients.rest.tenacity_utils import tenacity_retry
-from hatchet_sdk.v0.contracts.events_pb2 import (
+from hatchet_sdk.contracts.events_pb2 import (
     BulkPushEventRequest,
     Event,
     PushEventRequest,
     PutLogRequest,
     PutStreamEventRequest,
 )
-from hatchet_sdk.v0.contracts.events_pb2_grpc import EventsServiceStub
+from hatchet_sdk.contracts.events_pb2_grpc import EventsServiceStub
+from hatchet_sdk.v0.clients.rest.tenacity_utils import tenacity_retry
 
 from ..loader import ClientConfig
 from ..metadata import get_metadata

hatchet_sdk/v0/clients/rest/tenacity_utils.py

@@ -3,7 +3,7 @@ from typing import Callable, ParamSpec, TypeVar
 import grpc
 import tenacity
 
-from hatchet_sdk.v0.logger import logger
+from hatchet_sdk.logger import logger
 
 P = ParamSpec("P")
 R = TypeVar("R")

hatchet_sdk/v0/clients/run_event_listener.py

@@ -4,15 +4,15 @@ from typing import AsyncGenerator
 
 import grpc
 
-from hatchet_sdk.v0.connection import new_conn
-from hatchet_sdk.v0.contracts.dispatcher_pb2 import (
+from hatchet_sdk.contracts.dispatcher_pb2 import (
     RESOURCE_TYPE_STEP_RUN,
     RESOURCE_TYPE_WORKFLOW_RUN,
     ResourceEventType,
     SubscribeToWorkflowEventsRequest,
     WorkflowEvent,
 )
-from hatchet_sdk.v0.contracts.dispatcher_pb2_grpc import DispatcherStub
+from hatchet_sdk.contracts.dispatcher_pb2_grpc import DispatcherStub
+from hatchet_sdk.v0.connection import new_conn
 
 from ..loader import ClientConfig
 from ..metadata import get_metadata

hatchet_sdk/v0/clients/workflow_listener.py

@@ -6,16 +6,16 @@ from typing import AsyncGenerator
 import grpc
 from grpc._cython import cygrpc
 
-from hatchet_sdk.v0.clients.event_ts import ThreadSafeEvent, read_with_interrupt
-from hatchet_sdk.v0.connection import new_conn
-from hatchet_sdk.v0.contracts.dispatcher_pb2 import (
+from hatchet_sdk.contracts.dispatcher_pb2 import (
     SubscribeToWorkflowRunsRequest,
     WorkflowRunEvent,
 )
-from hatchet_sdk.v0.contracts.dispatcher_pb2_grpc import DispatcherStub
+from hatchet_sdk.contracts.dispatcher_pb2_grpc import DispatcherStub
+from hatchet_sdk.v0.clients.event_ts import ThreadSafeEvent, read_with_interrupt
+from hatchet_sdk.v0.connection import new_conn
 
+from ...logger import logger
 from ..loader import ClientConfig
-from ..logger import logger
 from ..metadata import get_metadata
 
 DEFAULT_WORKFLOW_LISTENER_RETRY_INTERVAL = 3  # seconds

hatchet_sdk/v0/context/context.py

@@ -7,21 +7,22 @@ from warnings import warn
 
 from pydantic import BaseModel, StrictStr
 
+from hatchet_sdk.contracts.dispatcher_pb2 import OverridesData
+from hatchet_sdk.contracts.workflows_pb2 import (
+    BulkTriggerWorkflowRequest,
+    TriggerWorkflowRequest,
+)
 from hatchet_sdk.v0.clients.events import EventClient
 from hatchet_sdk.v0.clients.rest.tenacity_utils import tenacity_retry
 from hatchet_sdk.v0.clients.rest_client import RestApi
 from hatchet_sdk.v0.clients.run_event_listener import RunEventListenerClient
 from hatchet_sdk.v0.clients.workflow_listener import PooledWorkflowRunListener
 from hatchet_sdk.v0.context.worker_context import WorkerContext
-from hatchet_sdk.v0.contracts.dispatcher_pb2 import OverridesData
-from hatchet_sdk.v0.contracts.workflows_pb2 import (
-    BulkTriggerWorkflowRequest,
-    TriggerWorkflowRequest,
-)
 from hatchet_sdk.v0.utils.types import WorkflowValidator
 from hatchet_sdk.v0.utils.typing import is_basemodel_subclass
 from hatchet_sdk.v0.workflow_run import WorkflowRunRef
 
+from ...logger import logger
 from ..clients.admin import (
     AdminClient,
     ChildTriggerWorkflowOptions,
@@ -33,7 +34,6 @@ from ..clients.dispatcher.dispatcher import (  # type: ignore[attr-defined]
     Action,
     DispatcherClient,
 )
-from ..logger import logger
 
 DEFAULT_WORKFLOW_POLLING_INTERVAL = 5  # Seconds
 

hatchet_sdk/v0/hatchet.py

@@ -5,14 +5,14 @@ from typing import Any, Callable, Optional, ParamSpec, Type, TypeVar, Union
 from pydantic import BaseModel
 from typing_extensions import deprecated
 
-from hatchet_sdk.v0.clients.rest_client import RestApi
-from hatchet_sdk.v0.context.context import Context
-from hatchet_sdk.v0.contracts.workflows_pb2 import (
+from hatchet_sdk.contracts.workflows_pb2 import (
     ConcurrencyLimitStrategy,
     CreateStepRateLimit,
     DesiredWorkerLabels,
     StickyStrategy,
 )
+from hatchet_sdk.v0.clients.rest_client import RestApi
+from hatchet_sdk.v0.context.context import Context
 from hatchet_sdk.v0.features.cron import CronClient
 from hatchet_sdk.v0.features.scheduled import ScheduledClient
 from hatchet_sdk.v0.labels import DesiredWorkerLabel
@@ -20,12 +20,12 @@ from hatchet_sdk.v0.loader import ClientConfig, ConfigLoader
 from hatchet_sdk.v0.rate_limit import RateLimit
 from hatchet_sdk.v0.v2.callable import HatchetCallable
 
+from ..logger import logger
 from .client import Client, new_client, new_client_raw
 from .clients.admin import AdminClient
 from .clients.dispatcher.dispatcher import DispatcherClient
 from .clients.events import EventClient
 from .clients.run_event_listener import RunEventListenerClient
-from .logger import logger
 from .worker.worker import Worker
 from .workflow import (
     ConcurrencyExpression,

hatchet_sdk/v0/opentelemetry/instrumentor.py

@@ -25,6 +25,7 @@ except (RuntimeError, ImportError, ModuleNotFoundError):
     )
 
 import hatchet_sdk
+from hatchet_sdk.contracts.events_pb2 import Event
 from hatchet_sdk.v0.clients.admin import (
     AdminClient,
     TriggerWorkflowOptions,
@@ -36,7 +37,6 @@ from hatchet_sdk.v0.clients.events import (
     EventClient,
     PushEventOptions,
 )
-from hatchet_sdk.v0.contracts.events_pb2 import Event
 from hatchet_sdk.v0.worker.runner.runner import Runner
 from hatchet_sdk.v0.workflow_run import WorkflowRunRef
 

hatchet_sdk/v0/rate_limit.py

@@ -3,7 +3,7 @@ from typing import Union
 
 from celpy import CELEvalError, Environment
 
-from hatchet_sdk.v0.contracts.workflows_pb2 import CreateStepRateLimit
+from hatchet_sdk.contracts.workflows_pb2 import CreateStepRateLimit
 
 
 def validate_cel_expression(expr: str) -> bool: