hatchet-sdk 0.46.1__py3-none-any.whl → 1.0.0__py3-none-any.whl

hatchet_sdk/__init__.py

@@ -1,3 +1,11 @@
+from hatchet_sdk.client import new_client
+from hatchet_sdk.clients.admin import (
+    ChildTriggerWorkflowOptions,
+    DedupeViolationErr,
+    ScheduleTriggerWorkflowOptions,
+    TriggerWorkflowOptions,
+)
+from hatchet_sdk.clients.events import PushEventOptions
 from hatchet_sdk.clients.rest.models.accept_invite_request import AcceptInviteRequest
 
 # import models into sdk package
@@ -117,29 +125,28 @@ 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
+from hatchet_sdk.context.worker_context import WorkerContext
 from hatchet_sdk.contracts.workflows_pb2 import (
-    ConcurrencyLimitStrategy,
     CreateWorkflowVersionOpts,
     RateLimitDuration,
-    StickyStrategy,
     WorkerLabelComparator,
 )
+from hatchet_sdk.hatchet import Hatchet
 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.worker.worker import Worker, WorkerStartOptions, WorkerStatus
+from hatchet_sdk.workflow import (
+    BaseWorkflow,
+    ConcurrencyExpression,
+    ConcurrencyLimitStrategy,
+    StickyStrategy,
+    WorkflowConfig,
 )
-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
 
 __all__ = [
     "AcceptInviteRequest",
@@ -244,4 +251,6 @@ __all__ = [
     "WorkerStartOptions",
     "WorkerStatus",
     "ConcurrencyExpression",
+    "BaseWorkflow",
+    "WorkflowConfig",
 ]

hatchet_sdk/client.py

@@ -1,72 +1,55 @@
 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],
-    ):
+    ) -> "Client":
         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)
+            opt_function(defaults)
 
-        return cls.from_config(config, debug)
+        return cls.from_config(defaults, debug)
 
     @classmethod
     def from_config(
         cls,
         config: ClientConfig = ClientConfig(),
         debug: bool = False,
-    ):
+    ) -> "Client":
         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)
+        conn: grpc.Channel = new_conn(config, False)
 
         # Instantiate clients
         event_client = new_event(conn, config)
-        admin_client = new_admin(config)
-        dispatcher_client = new_dispatcher(config)
+        admin_client = AdminClient(config)
+        dispatcher_client = DispatcherClient(config)
         rest_client = RestApi(config.server_url, config.token, config.tenant_id)
         workflow_listener = None  # Initialize this if needed
 
@@ -85,7 +68,7 @@ class Client:
         event_client: EventClient,
         admin_client: AdminClient,
         dispatcher_client: DispatcherClient,
-        workflow_listener: PooledWorkflowRunListener,
+        workflow_listener: PooledWorkflowRunListener | None,
         rest_client: RestApi,
         config: ClientConfig,
         debug: bool = False,
@@ -103,17 +86,9 @@ class Client:
         self.config = config
         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