hatchet-sdk 0.47.1__py3-none-any.whl → 1.0.0a1__py3-none-any.whl

hatchet_sdk/__init__.py

@@ -1,3 +1,10 @@
+from hatchet_sdk.clients.admin import (
+    DedupeViolationErr,
+    ScheduleTriggerWorkflowOptions,
+    TriggerWorkflowOptions,
+)
+from hatchet_sdk.clients.durable_event_listener import RegisterDurableEventRequest
+from hatchet_sdk.clients.events import PushEventOptions
 from hatchet_sdk.clients.rest.models.accept_invite_request import AcceptInviteRequest
 
 # import models into sdk package
@@ -68,7 +75,6 @@ from hatchet_sdk.clients.rest.models.pull_request_state import PullRequestState
 from hatchet_sdk.clients.rest.models.reject_invite_request import RejectInviteRequest
 from hatchet_sdk.clients.rest.models.replay_event_request import ReplayEventRequest
 from hatchet_sdk.clients.rest.models.rerun_step_run_request import RerunStepRunRequest
-from hatchet_sdk.clients.rest.models.step import Step
 from hatchet_sdk.clients.rest.models.step_run import StepRun
 from hatchet_sdk.clients.rest.models.step_run_diff import StepRunDiff
 from hatchet_sdk.clients.rest.models.step_run_status import StepRunStatus
@@ -117,29 +123,37 @@ 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.clients.run_event_listener import (
+    StepRunEventType,
+    WorkflowRunEventType,
+)
+from hatchet_sdk.config import ClientConfig
+from hatchet_sdk.context.context import Context, DurableContext
+from hatchet_sdk.context.worker_context import WorkerContext
 from hatchet_sdk.contracts.workflows_pb2 import (
-    ConcurrencyLimitStrategy,
     CreateWorkflowVersionOpts,
     RateLimitDuration,
-    StickyStrategy,
     WorkerLabelComparator,
 )
-from hatchet_sdk.utils.aio_utils import sync_to_async
-
-from .client import new_client
-from .clients.admin import (
-    ChildTriggerWorkflowOptions,
-    DedupeViolationErr,
-    ScheduleTriggerWorkflowOptions,
-    TriggerWorkflowOptions,
+from hatchet_sdk.hatchet import Hatchet
+from hatchet_sdk.runnables.task import Task
+from hatchet_sdk.runnables.types import (
+    ConcurrencyExpression,
+    ConcurrencyLimitStrategy,
+    EmptyModel,
+    StickyStrategy,
+    TaskDefaults,
+    WorkflowConfig,
+)
+from hatchet_sdk.waits import (
+    Condition,
+    OrGroup,
+    ParentCondition,
+    SleepCondition,
+    UserEventCondition,
+    or_,
 )
-from .clients.events import PushEventOptions
-from .clients.run_event_listener import StepRunEventType, WorkflowRunEventType
-from .context.context import Context
-from .context.worker_context import WorkerContext
-from .hatchet import ClientConfig, Hatchet, concurrency, on_failure_step, step, workflow
-from .worker import Worker, WorkerStartOptions, WorkerStatus
-from .workflow import ConcurrencyExpression
+from hatchet_sdk.worker.worker import Worker, WorkerStartOptions, WorkerStatus
 
 __all__ = [
     "AcceptInviteRequest",
@@ -184,11 +198,9 @@ __all__ = [
     "RejectInviteRequest",
     "ReplayEventRequest",
     "RerunStepRunRequest",
-    "Step",
     "StepRun",
     "StepRunDiff",
     "StepRunStatus",
-    "sync_to_async",
     "Tenant",
     "TenantInvite",
     "TenantInviteList",
@@ -224,8 +236,6 @@ __all__ = [
     "CreateWorkflowVersionOpts",
     "RateLimitDuration",
     "StickyStrategy",
-    "new_client",
-    "ChildTriggerWorkflowOptions",
     "DedupeViolationErr",
     "ScheduleTriggerWorkflowOptions",
     "TriggerWorkflowOptions",
@@ -236,12 +246,22 @@ __all__ = [
     "WorkerContext",
     "ClientConfig",
     "Hatchet",
-    "concurrency",
-    "on_failure_step",
-    "step",
     "workflow",
     "Worker",
     "WorkerStartOptions",
     "WorkerStatus",
     "ConcurrencyExpression",
+    "Workflow",
+    "WorkflowConfig",
+    "Task",
+    "EmptyModel",
+    "Condition",
+    "OrGroup",
+    "or_",
+    "SleepCondition",
+    "UserEventCondition",
+    "ParentCondition",
+    "DurableContext",
+    "RegisterDurableEventRequest",
+    "TaskDefaults",
 ]

hatchet_sdk/client.py

@@ -1,93 +1,26 @@
 import asyncio
-from logging import Logger
-from typing import Callable
 
 import grpc
 
+from hatchet_sdk.clients.admin import AdminClient
+from hatchet_sdk.clients.dispatcher.dispatcher import DispatcherClient
+from hatchet_sdk.clients.events import EventClient, new_event
+from hatchet_sdk.clients.rest_client import RestApi
 from hatchet_sdk.clients.run_event_listener import RunEventListenerClient
 from hatchet_sdk.clients.workflow_listener import PooledWorkflowRunListener
+from hatchet_sdk.config import ClientConfig
 from hatchet_sdk.connection import new_conn
 
-from .clients.admin import AdminClient, new_admin
-from .clients.dispatcher.dispatcher import DispatcherClient, new_dispatcher
-from .clients.events import EventClient, new_event
-from .clients.rest_client import RestApi
-from .loader import ClientConfig, ConfigLoader
-
 
 class Client:
-    admin: AdminClient
-    dispatcher: DispatcherClient
-    event: EventClient
-    rest: RestApi
-    workflow_listener: PooledWorkflowRunListener
-    logInterceptor: Logger
-    debug: bool = False
-
-    @classmethod
-    def from_environment(
-        cls,
-        defaults: ClientConfig = ClientConfig(),
-        debug: bool = False,
-        *opts_functions: Callable[[ClientConfig], None],
-    ):
-        try:
-            loop = asyncio.get_running_loop()
-        except RuntimeError:
-            loop = asyncio.new_event_loop()
-            asyncio.set_event_loop(loop)
-
-        config: ClientConfig = ConfigLoader(".").load_client_config(defaults)
-        for opt_function in opts_functions:
-            opt_function(config)
-
-        return cls.from_config(config, debug)
-
-    @classmethod
-    def from_config(
-        cls,
-        config: ClientConfig = ClientConfig(),
-        debug: bool = False,
-    ):
-        try:
-            loop = asyncio.get_running_loop()
-        except RuntimeError:
-            loop = asyncio.new_event_loop()
-            asyncio.set_event_loop(loop)
-
-        if config.tls_config is None:
-            raise ValueError("TLS config is required")
-
-        if config.host_port is None:
-            raise ValueError("Host and port are required")
-
-        conn: grpc.Channel = new_conn(config)
-
-        # Instantiate clients
-        event_client = new_event(conn, config)
-        admin_client = new_admin(config)
-        dispatcher_client = new_dispatcher(config)
-        rest_client = RestApi(config.server_url, config.token, config.tenant_id)
-        workflow_listener = None  # Initialize this if needed
-
-        return cls(
-            event_client,
-            admin_client,
-            dispatcher_client,
-            workflow_listener,
-            rest_client,
-            config,
-            debug,
-        )
-
     def __init__(
         self,
-        event_client: EventClient,
-        admin_client: AdminClient,
-        dispatcher_client: DispatcherClient,
-        workflow_listener: PooledWorkflowRunListener,
-        rest_client: RestApi,
         config: ClientConfig,
+        event_client: EventClient | None = None,
+        admin_client: AdminClient | None = None,
+        dispatcher_client: DispatcherClient | None = None,
+        workflow_listener: PooledWorkflowRunListener | None | None = None,
+        rest_client: RestApi | None = None,
         debug: bool = False,
     ):
         try:
@@ -96,24 +29,16 @@ class Client:
             loop = asyncio.new_event_loop()
             asyncio.set_event_loop(loop)
 
-        self.admin = admin_client
-        self.dispatcher = dispatcher_client
-        self.event = event_client
-        self.rest = rest_client
+        conn: grpc.Channel = new_conn(config, False)
+
         self.config = config
+        self.admin = admin_client or AdminClient(config)
+        self.dispatcher = dispatcher_client or DispatcherClient(config)
+        self.event = event_client or new_event(conn, config)
+        self.rest = rest_client or RestApi(
+            config.server_url, config.token, config.tenant_id
+        )
         self.listener = RunEventListenerClient(config)
         self.workflow_listener = workflow_listener
-        self.logInterceptor = config.logInterceptor
+        self.logInterceptor = config.logger
         self.debug = debug
-
-
-def with_host_port(host: str, port: int):
-    def with_host_port_impl(config: ClientConfig):
-        config.host = host
-        config.port = port
-
-    return with_host_port_impl
-
-
-new_client = Client.from_environment
-new_client_raw = Client.from_config