modal 0.73.26__py3-none-any.whl → 0.73.28__py3-none-any.whl

modal/_container_entrypoint.py

@@ -24,6 +24,10 @@ from typing import TYPE_CHECKING, Any, Callable, Optional
 from google.protobuf.message import Message
 
 from modal._clustered_functions import initialize_clustered_function
+from modal._partial_function import (
+    _find_callables_for_obj,
+    _PartialFunctionFlags,
+)
 from modal._proxy_tunnel import proxy_tunnel
 from modal._serialization import deserialize_params
 from modal._utils.async_utils import TaskContext, synchronizer
@@ -34,10 +38,6 @@ from modal.app import App, _App
 from modal.client import Client, _Client
 from modal.config import logger
 from modal.exception import ExecutionError, InputCancellation, InvalidError
-from modal.partial_function import (
-    _find_callables_for_obj,
-    _PartialFunctionFlags,
-)
 from modal.running_app import RunningApp, running_app_from_layout
 from modal_proto import api_pb2
 
@@ -322,6 +322,16 @@ def call_function(
             user_code_event_loop.run(run_concurrent_inputs())
     else:
         for io_context in container_io_manager.run_inputs_outputs(finalized_functions, batch_max_size, batch_wait_ms):
+            # This goes to a registered signal handler for sync Modal functions, or to the
+            # `UserCodeEventLoop` for async functions.
+            #
+            # We only send this signal on functions that do not have concurrent inputs enabled.
+            # This allows us to do fine-grained input cancellation. On sync functions, the
+            # SIGUSR1 signal should interrupt the main thread where user code is running,
+            # raising an InputCancellation() exception. On async functions, the signal should
+            # reach a handler in UserCodeEventLoop, which cancels the task.
+            io_context.set_cancel_callback(lambda: os.kill(os.getpid(), signal.SIGUSR1))
+
             if io_context.finalized_function.is_async:
                 user_code_event_loop.run(run_input_async(io_context))
             else:

modal/_functions.py

@@ -86,6 +86,7 @@ from .secret import _Secret
 from .volume import _Volume
 
 if TYPE_CHECKING:
+    import modal._partial_function
     import modal.app
     import modal.cls
     import modal.partial_function
@@ -405,7 +406,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         self,
         user_cls,
         method_name: str,
-        partial_function: "modal.partial_function._PartialFunction",
+        partial_function: "modal._partial_function._PartialFunction",
     ):
         """mdmd:hidden
 
@@ -480,7 +481,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
     ) -> "_Function":
         """mdmd:hidden"""
         # Needed to avoid circular imports
-        from .partial_function import _find_partial_methods_for_user_cls, _PartialFunctionFlags
+        from ._partial_function import _find_partial_methods_for_user_cls, _PartialFunctionFlags
 
         tag = info.get_tag()