modal 0.73.164__tar.gz → 0.73.165__tar.gz

{modal-0.73.164 → modal-0.73.165}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 0.73.164
+Version: 0.73.165
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License: Apache-2.0

{modal-0.73.164 → modal-0.73.165}/modal/_container_entrypoint.py

@@ -46,13 +46,13 @@ from modal.exception import ExecutionError, InputCancellation, InvalidError
 from modal.running_app import RunningApp, running_app_from_layout
 from modal_proto import api_pb2
 
+from ._runtime import execution_context
 from ._runtime.container_io_manager import (
     ContainerIOManager,
     IOContext,
     UserException,
     _ContainerIOManager,
 )
-from ._runtime.execution_context import _set_current_context_ids
 
 if TYPE_CHECKING:
     import modal._object
@@ -190,7 +190,7 @@ def call_function(
     async def run_input_async(io_context: IOContext) -> None:
         started_at = time.time()
         input_ids, function_call_ids = io_context.input_ids, io_context.function_call_ids
-        reset_context = _set_current_context_ids(input_ids, function_call_ids)
+        reset_context = execution_context._set_current_context_ids(input_ids, function_call_ids)
         async with container_io_manager.handle_input_exception.aio(io_context, started_at):
             res = io_context.call_finalized_function()
             # TODO(erikbern): any exception below shouldn't be considered a user exception
@@ -240,7 +240,7 @@ def call_function(
     def run_input_sync(io_context: IOContext) -> None:
         started_at = time.time()
         input_ids, function_call_ids = io_context.input_ids, io_context.function_call_ids
-        reset_context = _set_current_context_ids(input_ids, function_call_ids)
+        reset_context = execution_context._set_current_context_ids(input_ids, function_call_ids)
         with container_io_manager.handle_input_exception(io_context, started_at):
             res = io_context.call_finalized_function()
 
@@ -407,33 +407,34 @@ def main(container_args: api_pb2.ContainerArguments, client: Client):
                 param_args = ()
                 param_kwargs = {}
 
-            if function_def.is_class:
-                # this is a bit ugly - match the function and class based on function name to get metadata
-                # This metadata is required in order to hydrate the class in case it's not globally
-                # decorated (or serialized)
-                service_base_function_id = container_args.app_layout.function_ids[function_def.function_name]
-                service_function_hydration_data = [
-                    o for o in container_args.app_layout.objects if o.object_id == service_base_function_id
-                ][0]
-                class_id = container_args.app_layout.class_ids[function_def.function_name.removesuffix(".*")]
-
-                service = import_class_service(
-                    function_def,
-                    service_function_hydration_data,
-                    class_id,
-                    client,
-                    ser_usr_cls,
-                    param_args,
-                    param_kwargs,
-                )
-            else:
-                service = import_single_function_service(
-                    function_def,
-                    ser_usr_cls,
-                    ser_fun,
-                    param_args,
-                    param_kwargs,
-                )
+            with execution_context._import_context():
+                if function_def.is_class:
+                    # this is a bit ugly - match the function and class based on function name to get metadata
+                    # This metadata is required in order to hydrate the class in case it's not globally
+                    # decorated (or serialized)
+                    service_base_function_id = container_args.app_layout.function_ids[function_def.function_name]
+                    service_function_hydration_data = [
+                        o for o in container_args.app_layout.objects if o.object_id == service_base_function_id
+                    ][0]
+                    class_id = container_args.app_layout.class_ids[function_def.function_name.removesuffix(".*")]
+
+                    service = import_class_service(
+                        function_def,
+                        service_function_hydration_data,
+                        class_id,
+                        client,
+                        ser_usr_cls,
+                        param_args,
+                        param_kwargs,
+                    )
+                else:
+                    service = import_single_function_service(
+                        function_def,
+                        ser_usr_cls,
+                        ser_fun,
+                        param_args,
+                        param_kwargs,
+                    )
 
             # If the cls/function decorator was applied in local scope, but the app is global, we can look it up
             if service.app is not None:

{modal-0.73.164 → modal-0.73.165}/modal/_runtime/execution_context.py

@@ -1,4 +1,5 @@
 # Copyright Modal Labs 2024
+from contextlib import contextmanager
 from contextvars import ContextVar
 from typing import Callable, Optional
 
@@ -87,3 +88,15 @@ def _set_current_context_ids(input_ids: list[str], function_call_ids: list[str])
 
 _current_input_id: ContextVar = ContextVar("_current_input_id")
 _current_function_call_id: ContextVar = ContextVar("_current_function_call_id")
+
+_is_currently_importing = False  # we set this to True while a container is importing user code
+
+
+@contextmanager
+def _import_context():
+    global _is_currently_importing
+    _is_currently_importing = True
+    try:
+        yield
+    finally:
+        _is_currently_importing = False

{modal-0.73.164 → modal-0.73.165}/modal/_runtime/execution_context.pyi

@@ -17,6 +17,7 @@ def current_function_call_id() -> typing.Optional[str]: ...
 def _set_current_context_ids(
     input_ids: list[str], function_call_ids: list[str]
 ) -> collections.abc.Callable[[], None]: ...
+def _import_context(): ...
 
 _current_input_id: contextvars.ContextVar
 

{modal-0.73.164 → modal-0.73.165}/modal/client.pyi

@@ -31,7 +31,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "0.73.164",
+        version: str = "0.73.165",
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -93,7 +93,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "0.73.164",
+        version: str = "0.73.165",
     ): ...
     def is_closed(self) -> bool: ...
     @property

{modal-0.73.164 → modal-0.73.165}/modal/functions.pyi

@@ -200,11 +200,11 @@ class Function(
 
     _call_generator_nowait: ___call_generator_nowait_spec[typing_extensions.Self]
 
-    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
         def __call__(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER: ...
         async def aio(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER: ...
 
-    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
+    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
 
     class __remote_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, *args, **kwargs) -> typing.Generator[typing.Any, None, None]: ...
@@ -219,19 +219,19 @@ class Function(
         self, *args: modal._functions.P.args, **kwargs: modal._functions.P.kwargs
     ) -> modal._functions.OriginalReturnType: ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
         def __call__(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
         async def aio(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
 
     _experimental_spawn: ___experimental_spawn_spec[
-        modal._functions.ReturnType, modal._functions.P, typing_extensions.Self
+        modal._functions.P, modal._functions.ReturnType, typing_extensions.Self
     ]
 
-    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
         def __call__(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
         async def aio(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
 
-    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
+    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]: ...
 

{modal-0.73.164 → modal-0.73.165}/modal/mount.py

@@ -655,8 +655,6 @@ class _Mount(_Object, type_prefix="mo"):
         condition: Optional[Callable[[str], bool]] = None,
         ignore: Optional[Union[Sequence[str], Callable[[Path], bool]]] = None,
     ) -> "_Mount":
-        # Don't re-run inside container.
-
         if condition is not None:
             if ignore is not None:
                 raise InvalidError("Cannot specify both `ignore` and `condition`")
@@ -669,10 +667,6 @@ class _Mount(_Object, type_prefix="mo"):
             ignore = FilePatternMatcher(*ignore)
 
         mount = _Mount._new()
-        from ._runtime.execution_context import is_local
-
-        if not is_local():
-            return mount  # empty/non-mountable mount in case it's used from within a container
         for module_name in module_names:
             mount = mount._extend(_MountedPythonModule(module_name, remote_dir, ignore))
         return mount

{modal-0.73.164 → modal-0.73.165}/modal/runner.py

@@ -12,6 +12,7 @@ from typing import TYPE_CHECKING, Any, Optional, TypeVar
 from grpclib import GRPCError, Status
 from synchronicity.async_wrap import asynccontextmanager
 
+import modal._runtime.execution_context
 import modal_proto.api_pb2
 from modal_proto import api_pb2
 
@@ -19,7 +20,6 @@ from ._functions import _Function
 from ._object import _get_environment_name, _Object
 from ._pty import get_pty_info
 from ._resolver import Resolver
-from ._runtime.execution_context import is_local
 from ._traceback import print_server_warnings, traceback_contains_remote_call
 from ._utils.async_utils import TaskContext, gather_cancel_on_exc, synchronize_api
 from ._utils.deprecation import deprecation_error
@@ -266,12 +266,9 @@ async def _run_app(
     if environment_name is None:
         environment_name = typing.cast(str, config.get("environment"))
 
-    if not is_local():
-        raise InvalidError(
-            "Can not run an app from within a container."
-            " Are you calling app.run() directly?"
-            " Consider using the `modal run` shell command."
-        )
+    if modal._runtime.execution_context._is_currently_importing:
+        raise InvalidError("Can not run an app in global scope within a container")
+
     if app._running_app:
         raise InvalidError(
             "App is already running and can't be started again.\n"

{modal-0.73.164 → modal-0.73.165}/modal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 0.73.164
+Version: 0.73.165
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License: Apache-2.0

{modal-0.73.164 → modal-0.73.165}/modal_version/_version_generated.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 
 # Note: Reset this value to -1 whenever you make a minor `0.X` release of the client.
-build_number = 164  # git: 9d8e6de
+build_number = 165  # git: 063c3c2