hatchet-sdk 1.16.2__tar.gz → 1.16.4__tar.gz

{hatchet_sdk-1.16.2 → hatchet_sdk-1.16.4}/PKG-INFO

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

{hatchet_sdk-1.16.2 → hatchet_sdk-1.16.4}/hatchet_sdk/clients/rest/tenacity_utils.py

@@ -33,5 +33,9 @@ def tenacity_should_retry(ex: BaseException) -> bool:
         return ex.code() not in [
             grpc.StatusCode.UNIMPLEMENTED,
             grpc.StatusCode.NOT_FOUND,
+            grpc.StatusCode.INVALID_ARGUMENT,
+            grpc.StatusCode.ALREADY_EXISTS,
+            grpc.StatusCode.UNAUTHENTICATED,
+            grpc.StatusCode.PERMISSION_DENIED,
         ]
     return False

{hatchet_sdk-1.16.2 → hatchet_sdk-1.16.4}/hatchet_sdk/config.py

@@ -83,6 +83,8 @@ class ClientConfig(BaseSettings):
     enable_thread_pool_monitoring: bool = False
 
     terminate_worker_after_num_tasks: int | None = None
+    disable_log_capture: bool = False
+    grpc_enable_fork_support: bool = False
 
     @model_validator(mode="after")
     def validate_token_and_tenant(self) -> "ClientConfig":

{hatchet_sdk-1.16.2 → hatchet_sdk-1.16.4}/hatchet_sdk/connection.py

@@ -60,7 +60,12 @@ def new_conn(config: ClientConfig, aio: bool) -> grpc.Channel | grpc.aio.Channel
 
     # Set environment variable to disable fork support. Reference: https://github.com/grpc/grpc/issues/28557
     # When steps execute via os.fork, we see `TSI_DATA_CORRUPTED` errors.
-    os.environ["GRPC_ENABLE_FORK_SUPPORT"] = "False"
+    # needs to be the string "True" or "False"
+    os.environ["GRPC_ENABLE_FORK_SUPPORT"] = str(config.grpc_enable_fork_support)
+
+    if config.grpc_enable_fork_support:
+        # See discussion: https://github.com/hatchet-dev/hatchet/pull/2057#discussion_r2243233357
+        os.environ["GRPC_POLL_STRATEGY"] = "poll"
 
     if config.tls_config.strategy == "none":
         conn = start.insecure_channel(

{hatchet_sdk-1.16.2 → hatchet_sdk-1.16.4}/hatchet_sdk/context/context.py

@@ -371,6 +371,42 @@ class Context:
 
 
 class DurableContext(Context):
+    def __init__(
+        self,
+        action: Action,
+        dispatcher_client: DispatcherClient,
+        admin_client: AdminClient,
+        event_client: EventClient,
+        durable_event_listener: DurableEventListener | None,
+        worker: WorkerContext,
+        runs_client: RunsClient,
+        lifespan_context: Any | None,
+        log_sender: AsyncLogSender,
+    ):
+        super().__init__(
+            action,
+            dispatcher_client,
+            admin_client,
+            event_client,
+            durable_event_listener,
+            worker,
+            runs_client,
+            lifespan_context,
+            log_sender,
+        )
+
+        self._wait_index = 0
+
+    @property
+    def wait_index(self) -> int:
+        return self._wait_index
+
+    def _increment_wait_index(self) -> int:
+        index = self._wait_index
+        self._wait_index += 1
+
+        return index
+
     async def aio_wait_for(
         self,
         signal_key: str,
@@ -411,6 +447,9 @@ class DurableContext(Context):
         For more complicated conditions, use `ctx.aio_wait_for` directly.
         """
 
+        wait_index = self._increment_wait_index()
+
         return await self.aio_wait_for(
-            f"sleep:{timedelta_to_expr(duration)}", SleepCondition(duration=duration)
+            f"sleep:{timedelta_to_expr(duration)}-{wait_index}",
+            SleepCondition(duration=duration),
         )

{hatchet_sdk-1.16.2 → hatchet_sdk-1.16.4}/hatchet_sdk/runnables/types.py

@@ -1,6 +1,6 @@
 import asyncio
 import json
-from collections.abc import Callable
+from collections.abc import Callable, Mapping
 from enum import Enum
 from typing import Any, ParamSpec, TypeGuard, TypeVar
 
@@ -12,7 +12,7 @@ from hatchet_sdk.contracts.v1.workflows_pb2 import DefaultFilter as DefaultFilte
 from hatchet_sdk.utils.timedelta_to_expression import Duration
 from hatchet_sdk.utils.typing import AwaitableLike, JSONSerializableMapping
 
-ValidTaskReturnType = BaseModel | JSONSerializableMapping | None
+ValidTaskReturnType = BaseModel | Mapping[str, Any] | None
 
 R = TypeVar("R", bound=ValidTaskReturnType)
 P = ParamSpec("P")

{hatchet_sdk-1.16.2 → hatchet_sdk-1.16.4}/hatchet_sdk/worker/runner/run_loop_manager.py

@@ -60,11 +60,14 @@ class WorkerActionRunLoopManager:
         self.start_loop_manager_task = self.loop.create_task(self.aio_start())
 
     async def aio_start(self, retry_count: int = 1) -> None:
-        await capture_logs(
-            self.client.log_interceptor,
-            self.log_sender,
-            self._async_start,
-        )()
+        if self.client.config.disable_log_capture:
+            await self._async_start()
+        else:
+            await capture_logs(
+                self.client.log_interceptor,
+                self.log_sender,
+                self._async_start,
+            )()
 
     async def _async_start(self) -> None:
         logger.info("starting runner...")

{hatchet_sdk-1.16.2 → hatchet_sdk-1.16.4}/hatchet_sdk/worker/runner/utils/capture_logs.py

@@ -122,7 +122,17 @@ def capture_logs(
     async def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
         log_stream = StringIO()
         custom_handler = CustomLogHandler(log_sender, log_stream)
-        custom_handler.setLevel(logging.INFO)
+        custom_handler.setLevel(logger.level)
+
+        if logger.handlers:
+            for handler in logger.handlers:
+                if handler.formatter:
+                    custom_handler.setFormatter(handler.formatter)
+                    break
+
+            for handler in logger.handlers:
+                for filter_obj in handler.filters:
+                    custom_handler.addFilter(filter_obj)
 
         if not any(h for h in logger.handlers if isinstance(h, CustomLogHandler)):
             logger.addHandler(custom_handler)

{hatchet_sdk-1.16.2 → hatchet_sdk-1.16.4}/pyproject.toml

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