hatchet-sdk 1.3.1__py3-none-any.whl → 1.3.2__py3-none-any.whl

hatchet_sdk/context/context.py

@@ -19,7 +19,7 @@ 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, WorkflowValidator
+from hatchet_sdk.utils.typing import JSONSerializableMapping
 from hatchet_sdk.waits import SleepCondition, UserEventCondition
 
 if TYPE_CHECKING:
@@ -37,10 +37,8 @@ class Context:
         durable_event_listener: DurableEventListener | None,
         worker: WorkerContext,
         runs_client: RunsClient,
-        validator_registry: dict[str, WorkflowValidator] = {},
     ):
         self.worker = worker
-        self.validator_registry = validator_registry
 
         self.data = action.action_payload
 
@@ -74,27 +72,12 @@ class Context:
         if self.was_skipped(task):
             raise ValueError("{task.name} was skipped")
 
-        action_prefix = self.action.action_id.split(":")[0]
-
-        workflow_validator = next(
-            (
-                v
-                for k, v in self.validator_registry.items()
-                if k == f"{action_prefix}:{task.name}"
-            ),
-            None,
-        )
-
         try:
             parent_step_data = cast(R, self.data.parents[task.name])
         except KeyError:
             raise ValueError(f"Step output for '{task.name}' not found")
 
-        if (
-            parent_step_data
-            and workflow_validator
-            and (v := workflow_validator.step_output)
-        ):
+        if parent_step_data and (v := task.validators.step_output):
             return cast(R, v.model_validate(parent_step_data))
 
         return parent_step_data

hatchet_sdk/runnables/task.py

@@ -7,6 +7,7 @@ from typing import (
     TypeVar,
     Union,
     cast,
+    get_type_hints,
 )
 
 from hatchet_sdk.context.context import Context, DurableContext
@@ -28,6 +29,7 @@ from hatchet_sdk.runnables.types import (
     is_sync_fn,
 )
 from hatchet_sdk.utils.timedelta_to_expression import Duration, timedelta_to_expr
+from hatchet_sdk.utils.typing import TaskIOValidator, is_basemodel_subclass
 from hatchet_sdk.waits import (
     Action,
     Condition,
@@ -106,6 +108,13 @@ class Task(Generic[TWorkflowInput, R]):
         self.skip_if = self._flatten_conditions(skip_if)
         self.cancel_if = self._flatten_conditions(cancel_if)
 
+        return_type = get_type_hints(_fn).get("return")
+
+        self.validators: TaskIOValidator = TaskIOValidator(
+            workflow_input=workflow.config.input_validator,
+            step_output=return_type if is_basemodel_subclass(return_type) else None,
+        )
+
     def _flatten_conditions(
         self, conditions: list[Condition | OrGroup]
     ) -> list[Condition]:

hatchet_sdk/utils/typing.py

@@ -1,9 +1,7 @@
-from typing import Any, Mapping, Type, TypeGuard, TypeVar
+from typing import Any, Mapping, Type, TypeGuard
 
 from pydantic import BaseModel
 
-T = TypeVar("T", bound=BaseModel)
-
 
 def is_basemodel_subclass(model: Any) -> TypeGuard[Type[BaseModel]]:
     try:
@@ -12,7 +10,7 @@ def is_basemodel_subclass(model: Any) -> TypeGuard[Type[BaseModel]]:
         return False
 
 
-class WorkflowValidator(BaseModel):
+class TaskIOValidator(BaseModel):
     workflow_input: Type[BaseModel] | None = None
     step_output: Type[BaseModel] | None = None
 

hatchet_sdk/worker/runner/run_loop_manager.py

@@ -8,7 +8,6 @@ from hatchet_sdk.clients.dispatcher.action_listener import Action
 from hatchet_sdk.config import ClientConfig
 from hatchet_sdk.logger import logger
 from hatchet_sdk.runnables.task import Task
-from hatchet_sdk.utils.typing import WorkflowValidator
 from hatchet_sdk.worker.action_listener_process import ActionEvent
 from hatchet_sdk.worker.runner.runner import Runner
 from hatchet_sdk.worker.runner.utils.capture_logs import capture_logs
@@ -24,7 +23,6 @@ class WorkerActionRunLoopManager:
         self,
         name: str,
         action_registry: dict[str, Task[Any, Any]],
-        validator_registry: dict[str, WorkflowValidator],
         slots: int | None,
         config: ClientConfig,
         action_queue: "Queue[Action | STOP_LOOP_TYPE]",
@@ -36,7 +34,6 @@ class WorkerActionRunLoopManager:
     ) -> None:
         self.name = name
         self.action_registry = action_registry
-        self.validator_registry = validator_registry
         self.slots = slots
         self.config = config
         self.action_queue = action_queue
@@ -88,7 +85,6 @@ class WorkerActionRunLoopManager:
             self.slots,
             self.handle_kill,
             self.action_registry,
-            self.validator_registry,
             self.labels,
         )
 

hatchet_sdk/worker/runner/runner.py

@@ -43,7 +43,6 @@ from hatchet_sdk.runnables.contextvars import (
 )
 from hatchet_sdk.runnables.task import Task
 from hatchet_sdk.runnables.types import R, TWorkflowInput
-from hatchet_sdk.utils.typing import WorkflowValidator
 from hatchet_sdk.worker.action_listener_process import ActionEvent
 from hatchet_sdk.worker.runner.utils.capture_logs import copy_context_vars
 
@@ -63,7 +62,6 @@ class Runner:
         slots: int | None = None,
         handle_kill: bool = True,
         action_registry: dict[str, Task[TWorkflowInput, R]] = {},
-        validator_registry: dict[str, WorkflowValidator] = {},
         labels: dict[str, str | int] = {},
     ):
         # We store the config so we can dynamically create clients for the dispatcher client.
@@ -73,7 +71,6 @@ class Runner:
         self.tasks: dict[str, asyncio.Task[Any]] = {}  # Store run ids and futures
         self.contexts: dict[str, Context] = {}  # Store run ids and contexts
         self.action_registry = action_registry
-        self.validator_registry = validator_registry
 
         self.event_queue = event_queue
 
@@ -305,7 +302,6 @@ class Runner:
             event_client=self.event_client,
             durable_event_listener=self.durable_event_listener,
             worker=self.worker_context,
-            validator_registry=self.validator_registry,
             runs_client=self.runs_client,
         )
 

hatchet_sdk/worker/worker.py

@@ -10,7 +10,7 @@ from enum import Enum
 from multiprocessing import Queue
 from multiprocessing.process import BaseProcess
 from types import FrameType
-from typing import Any, TypeVar, get_type_hints
+from typing import Any, TypeVar
 from warnings import warn
 
 from aiohttp import web
@@ -26,7 +26,6 @@ from hatchet_sdk.contracts.v1.workflows_pb2 import CreateWorkflowVersionRequest
 from hatchet_sdk.logger import logger
 from hatchet_sdk.runnables.task import Task
 from hatchet_sdk.runnables.workflow import BaseWorkflow
-from hatchet_sdk.utils.typing import WorkflowValidator, is_basemodel_subclass
 from hatchet_sdk.worker.action_listener_process import (
     ActionEvent,
     worker_action_listener_process,
@@ -87,8 +86,6 @@ class Worker:
         self.action_registry: dict[str, Task[Any, Any]] = {}
         self.durable_action_registry: dict[str, Task[Any, Any]] = {}
 
-        self.validator_registry: dict[str, WorkflowValidator] = {}
-
         self.killing: bool = False
         self._status: WorkerStatus
 
@@ -153,13 +150,6 @@ class Worker:
                 self.has_any_non_durable = True
                 self.action_registry[action_name] = step
 
-            return_type = get_type_hints(step.fn).get("return")
-
-            self.validator_registry[action_name] = WorkflowValidator(
-                workflow_input=workflow.config.input_validator,
-                step_output=return_type if is_basemodel_subclass(return_type) else None,
-            )
-
     def register_workflows(self, workflows: list[BaseWorkflow[Any]]) -> None:
         for workflow in workflows:
             self.register_workflow(workflow)
@@ -285,7 +275,6 @@ class Worker:
             return WorkerActionRunLoopManager(
                 self.name + ("_durable" if is_durable else ""),
                 self.durable_action_registry if is_durable else self.action_registry,
-                self.validator_registry,
                 1_000 if is_durable else self.slots,
                 self.config,
                 self.durable_action_queue if is_durable else self.action_queue,

{hatchet_sdk-1.3.1.dist-info → hatchet_sdk-1.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hatchet-sdk
-Version: 1.3.1
+Version: 1.3.2
 Summary: 
 Author: Alexander Belanger
 Author-email: alexander@hatchet.run

{hatchet_sdk-1.3.1.dist-info → hatchet_sdk-1.3.2.dist-info}/RECORD

@@ -221,7 +221,7 @@ hatchet_sdk/clients/v1/api_client.py,sha256=mJQUZ3cOxlFJiwWKK5F8jBxcpNZ7A2292Huc
 hatchet_sdk/config.py,sha256=jJA76BOvVdfOQHy6TKclAvr2qyblcM-Pz5J-hVAdpQ4,3588
 hatchet_sdk/connection.py,sha256=B5gT5NL9BBB5-l9U_cN6pMlraQk880rEYMnqaK_dgL0,2590
 hatchet_sdk/context/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hatchet_sdk/context/context.py,sha256=FUClTuxFETBAljI0gknOdqkCEgkY2EX1lOx2xib2xzk,9659
+hatchet_sdk/context/context.py,sha256=povQ0iO-QOi_lzntSWUiZPGbtpNTq-1m80b3zjIX74A,9163
 hatchet_sdk/context/worker_context.py,sha256=OVcEWvdT_Kpd0nlg61VAPUgIPSFzSLs0aSrXWj-1GX4,974
 hatchet_sdk/contracts/dispatcher_pb2.py,sha256=SN4CIKeQwYkrbfRGhdhZo2uBn4nGzjUWIC1vvXdDeOQ,14503
 hatchet_sdk/contracts/dispatcher_pb2.pyi,sha256=ZSGio5eYxkw-QuQx2C5ASTNcKzeMQn5JTnWaRiThafM,18455
@@ -259,14 +259,14 @@ hatchet_sdk/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hatchet_sdk/rate_limit.py,sha256=TwbCuggiZaWpYuo4mjVLlE-z1OfQ2mRBiVvCSaG3lv4,3919
 hatchet_sdk/runnables/contextvars.py,sha256=6MDocAMmlyiRW37oQ1jyx10tAlJs-xgDjR3xPoPz05g,426
 hatchet_sdk/runnables/standalone.py,sha256=KyKA3UeuyU_IK0t-c0Q56Lm-W4rewILkfHlenjos474,6276
-hatchet_sdk/runnables/task.py,sha256=R7QpxHsMKQSp6V84NeQ8oFdTNLPY77Ocx0MM1Q3xX40,7164
+hatchet_sdk/runnables/task.py,sha256=nZPclBbNaYRMlCLOYi91YU503MiTcGSp92Unh3_nKvs,7533
 hatchet_sdk/runnables/types.py,sha256=1Y2mS7bDVY86rE7SSMzt9KKcF8qGiaiEmQ85jR8DMT4,4500
 hatchet_sdk/runnables/workflow.py,sha256=FcmN7-cmI32GnnkKGKhUL2xV3z7vfBK43LmJVuKKiyo,27771
 hatchet_sdk/token.py,sha256=KjIiInwG5Kqd_FO4BSW1x_5Uc7PFbnzIVJqr50-ZldE,779
 hatchet_sdk/utils/backoff.py,sha256=6B5Rb5nLKw_TqqgpJMYjIBV1PTTtbOMRZCveisVhg_I,353
 hatchet_sdk/utils/proto_enums.py,sha256=0UybwE3s7TcqmzoQSO8YnhgAKOS8WZXsyPchB8-eksw,1247
 hatchet_sdk/utils/timedelta_to_expression.py,sha256=n5jIxlcswN9GwFPjktuMceedekzWWT6X7U6gbsZciIQ,455
-hatchet_sdk/utils/typing.py,sha256=ohzSvBciQKiFwY-rCWdpodEZb4iAilQ87rjOBakY4MQ,473
+hatchet_sdk/utils/typing.py,sha256=huflXWR7fvRfIFYdqQIrQmn9jtukzOWoTpW3AXGk5c0,427
 hatchet_sdk/v0/__init__.py,sha256=YNh-0rPHS0rcphmykJ1N2NMfgvERF4oJpBtx3IH_E_M,9657
 hatchet_sdk/v0/client.py,sha256=G1RDZln9Og7tRQulogXkZw8TsVlx7f0VvmtFI_VAe6E,3495
 hatchet_sdk/v0/clients/admin.py,sha256=l6fW21p_3pROz8mVB2QOXX0Pg5poeLXcBNEm6Uids30,18071
@@ -501,12 +501,12 @@ hatchet_sdk/v0/workflow_run.py,sha256=jsEZprXshrSV7i_TtL5uoCL03D18zQ3NeJCq7mp97D
 hatchet_sdk/waits.py,sha256=dTrelK8Lk0W5anq3TlpJwAK5z8TJ0FW7XgoSg8bf8fA,3351
 hatchet_sdk/worker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hatchet_sdk/worker/action_listener_process.py,sha256=KxS7-wBpfKnsq0LNSvk-MG442Lh60iQMy3VpD1FW3mU,11703
-hatchet_sdk/worker/runner/run_loop_manager.py,sha256=P0iyKSfAb0IW5LDUnwzUOgCp0lPpAAKXCkeTXGQq8oY,3893
-hatchet_sdk/worker/runner/runner.py,sha256=mfEsR2EDcKPkEIylkz3FLsMC33OqTs4r5zpxCIjitoc,17446
+hatchet_sdk/worker/runner/run_loop_manager.py,sha256=QrhhAMnQmyThDMgohZwFw-0AVPHvhT4seK2FVCzvC7c,3690
+hatchet_sdk/worker/runner/runner.py,sha256=t8U4QK2GYNjgxGHFmD9RW12e3vungu_bvBSBBdIb_cs,17219
 hatchet_sdk/worker/runner/utils/capture_logs.py,sha256=nHRPSiDBqzhObM7i2X7t03OupVFnE7kQBdR2Ckgg-2w,2709
-hatchet_sdk/worker/worker.py,sha256=dcJEMeogodhLEi_5a0ldJLZ5EEN7DNcr8aiFLknTb18,14667
+hatchet_sdk/worker/worker.py,sha256=5DfmNNjGuYtn-n9Qce1B2XCLKjnIXzNwF8VLW-wtI5Y,14161
 hatchet_sdk/workflow_run.py,sha256=ZwH0HLFGFVXz6jbiqSv4w0Om2XuR52Tzzw6LH4y65jQ,2765
-hatchet_sdk-1.3.1.dist-info/METADATA,sha256=sS8Lrxkr6HvdjuhsP0vmjACIGE_pXxfGBH6uyzvgF1M,3571
-hatchet_sdk-1.3.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-hatchet_sdk-1.3.1.dist-info/entry_points.txt,sha256=5mTp_AsCWK5raiVxP_MU9eBCgkRGl4OsN6chpHcvm7o,1235
-hatchet_sdk-1.3.1.dist-info/RECORD,,
+hatchet_sdk-1.3.2.dist-info/METADATA,sha256=tWsWj0cUquv41Ih8O3mIM3Pwk6jl3mp0rIBWExejSI0,3571
+hatchet_sdk-1.3.2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+hatchet_sdk-1.3.2.dist-info/entry_points.txt,sha256=5mTp_AsCWK5raiVxP_MU9eBCgkRGl4OsN6chpHcvm7o,1235
+hatchet_sdk-1.3.2.dist-info/RECORD,,