modal 1.5.1.dev5__tar.gz → 1.5.1.dev7__tar.gz

{modal-1.5.1.dev5 → modal-1.5.1.dev7}/PKG-INFO

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

{modal-1.5.1.dev5 → modal-1.5.1.dev7}/modal/__init__.py

@@ -43,6 +43,7 @@ try:
     from .schedule import Cron, Period
     from .scheduler_placement import SchedulerPlacement
     from .secret import Secret
+    from .server import Server
     from .snapshot import SandboxSnapshot
     from .volume import Volume
     from .workspace import Workspace
@@ -80,6 +81,7 @@ __all__ = [
     "SandboxSnapshot",
     "SchedulerPlacement",
     "Secret",
+    "Server",
     "Tunnel",
     "Volume",
     "Workspace",

{modal-1.5.1.dev5 → modal-1.5.1.dev7}/modal/_server.py

@@ -23,7 +23,7 @@ def validate_http_server_config(
     proxy_regions: list[str],  # The regions to proxy the HTTP server to.
     startup_timeout: int,  # Maximum number of seconds to wait for the HTTP server to start.
     exit_grace_period: int | None,  # The time to wait for the HTTP server to exit gracefully.
-    is_server: bool = False,  # Whether this validates a `_experimental_server` config.
+    is_server: bool = False,  # Whether this validates a `server` config.
 ):
     if not isinstance(port, int) or port < 1 or port > 65535:
         raise InvalidError("Port must be a positive integer between 1 and 65535.")
@@ -49,10 +49,10 @@ class _Server:
     See [lifecycle hooks](https://modal.com/docs/guide/lifecycle-functions) for more information.
 
     Generally, you will not construct a Server directly.
-    Instead, use the [`@app._experimental_server()`](https://modal.com/docs/reference/modal.App#server) decorator.
+    Instead, use the [`@app.server()`](https://modal.com/docs/reference/modal.App#server) decorator.
 
     ```python notest
-    @app._experimental_server(port=8000, routing_region="us-east")
+    @app.server(port=8000, routing_region="us-east")
     class MyServer:
         @modal.enter()
         def start_server(self):
@@ -158,7 +158,7 @@ class _Server:
     ) -> "_Server":
         """Create a Server from a local class definition."""
 
-        # Note: Validation should be done by the caller (app._experimental_server()) BEFORE creating the Server.
+        # Note: Validation should be done by the caller (app.server()) BEFORE creating the Server.
         # Extract the underlying class if wrapped in a _PartialFunction (e.g., from @modal.clustered())
         user_cls = _Server._extract_user_cls(wrapped_user_cls)
 
@@ -211,7 +211,7 @@ class _Server:
         user_cls = _Server._extract_user_cls(wrapped_user_cls)
 
         if not inspect.isclass(user_cls):
-            raise TypeError("The @app._experimental_server() decorator must be used on a class.")
+            raise TypeError("The @app.server() decorator must be used on a class.")
 
         # Check for modal.parameter() - not allowed on server classes
         params = {k: v for k, v in user_cls.__dict__.items() if is_parameter(v)}

{modal-1.5.1.dev5 → modal-1.5.1.dev7}/modal/app.py

@@ -1266,7 +1266,10 @@ class _App:
 
         return wrapper
 
-    def _experimental_server(
+    def _experimental_server(self, **kwargs):
+        return self.server(**kwargs)
+
+    def server(
         self,
         _warn_parentheses_missing=None,  # mdmd:line-hidden
         *,
@@ -1334,7 +1337,7 @@ class _App:
             startup_timeout: Maximum startup time in seconds.
             exit_grace_period: Grace period for in-flight requests on shutdown.
             routing_region: Region to route Server requests through.
-            h2_enabled: Enable HTTP/2.
+            h2_enabled: Enable HTTP/2 in the container.
             target_concurrency: Target concurrency for the server; 0 disables autoscaling.
             cloud: Cloud provider (aws, gcp, oci, auto).
             region: Region(s) to run on.
@@ -1346,7 +1349,7 @@ class _App:
 
         Examples:
             ```python
-            @app._experimental_server(port=8000, routing_region="us-east")
+            @app.server(port=8000, routing_region="us-east")
             class MyServer:
                 @modal.enter()
                 def start(self):
@@ -1358,7 +1361,7 @@ class _App:
             ```
         """
         if _warn_parentheses_missing:
-            raise InvalidError("Did you forget parentheses? Suggestion: `@app._experimental_server()`.")
+            raise InvalidError("Did you forget parentheses? Suggestion: `@app.server()`.")
 
         # Validate HTTP server config
         validate_http_server_config(

{modal-1.5.1.dev5 → modal-1.5.1.dev7}/modal/app.pyi

@@ -728,7 +728,8 @@ class _App:
         """
         ...
 
-    def _experimental_server(
+    def _experimental_server(self, **kwargs): ...
+    def server(
         self,
         _warn_parentheses_missing=None,
         *,
@@ -797,7 +798,7 @@ class _App:
             startup_timeout: Maximum startup time in seconds.
             exit_grace_period: Grace period for in-flight requests on shutdown.
             routing_region: Region to route Server requests through.
-            h2_enabled: Enable HTTP/2.
+            h2_enabled: Enable HTTP/2 in the container.
             target_concurrency: Target concurrency for the server; 0 disables autoscaling.
             cloud: Cloud provider (aws, gcp, oci, auto).
             region: Region(s) to run on.
@@ -809,7 +810,7 @@ class _App:
 
         Examples:
             ```python
-            @app._experimental_server(port=8000, routing_region="us-east")
+            @app.server(port=8000, routing_region="us-east")
             class MyServer:
                 @modal.enter()
                 def start(self):
@@ -1728,7 +1729,8 @@ class App:
         """
         ...
 
-    def _experimental_server(
+    def _experimental_server(self, **kwargs): ...
+    def server(
         self,
         _warn_parentheses_missing=None,
         *,
@@ -1795,7 +1797,7 @@ class App:
             startup_timeout: Maximum startup time in seconds.
             exit_grace_period: Grace period for in-flight requests on shutdown.
             routing_region: Region to route Server requests through.
-            h2_enabled: Enable HTTP/2.
+            h2_enabled: Enable HTTP/2 in the container.
             target_concurrency: Target concurrency for the server; 0 disables autoscaling.
             cloud: Cloud provider (aws, gcp, oci, auto).
             region: Region(s) to run on.
@@ -1807,7 +1809,7 @@ class App:
 
         Examples:
             ```python
-            @app._experimental_server(port=8000, routing_region="us-east")
+            @app.server(port=8000, routing_region="us-east")
             class MyServer:
                 @modal.enter()
                 def start(self):

{modal-1.5.1.dev5 → modal-1.5.1.dev7}/modal/client.pyi

@@ -35,7 +35,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.1.dev5",
+        version: str = "1.5.1.dev7",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -205,7 +205,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.1.dev5",
+        version: str = "1.5.1.dev7",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.5.1.dev5 → modal-1.5.1.dev7}/modal/functions.pyi

@@ -490,7 +490,7 @@ class Function(
 
     _call_generator: ___call_generator_spec
 
-    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER:
             """Calls the function remotely, executing it with the given arguments and returning the execution's result.
 
@@ -515,7 +515,7 @@ class Function(
             """
             ...
 
-    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType]
+    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P]
 
     class __remote_gen_spec(typing_extensions.Protocol):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -565,7 +565,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """[Experimental] Calls the function with the given arguments, without waiting for the results.
 
@@ -598,7 +598,7 @@ class Function(
             """
             ...
 
-    _experimental_spawn: ___experimental_spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    _experimental_spawn: ___experimental_spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> None: ...
@@ -606,7 +606,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P]
 
-    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """Calls the function with the given arguments, without waiting for the results.
 
@@ -639,7 +639,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function.

{modal-1.5.1.dev5 → modal-1.5.1.dev7}/modal/sandbox_fs.py

@@ -180,29 +180,66 @@ class _SandboxFilesystem:
                 process = await self._container.exec(_SANDBOX_FS_TOOLS_PATH, make_write_file_command(remote_path))
                 try:
                     while True:
+                        logger.debug(
+                            f"sandbox copy_from_local('{local_path}', '{remote_path}'): reading "
+                            f"{TASK_COMMAND_ROUTER_MAX_BUFFER_SIZE} bytes from {local_path} at offset {total_bytes}"
+                        )
                         # TODO(saltzm): If this fails, the ContainerProcess will remain alive indefinitely since
                         # stdin will remain open. Unfortunately we can't just call write_eof either, since that
                         # would lead to a partially written file being persisted. We should catch exceptions
                         # from this and kill the ContainerProcess when we have a way to do this.
                         chunk = file_obj.read(TASK_COMMAND_ROUTER_MAX_BUFFER_SIZE)
                         if not chunk:
+                            logger.debug(
+                                f"sandbox copy_from_local('{local_path}', '{remote_path}'): read no data from "
+                                f"{local_path}, finished reading file"
+                            )
                             break
                         total_bytes += len(chunk)
+                        logger.debug(
+                            f"sandbox copy_from_local('{local_path}', '{remote_path}'): writing {len(chunk)} bytes "
+                            f"from {local_path} to remote {remote_path}"
+                        )
                         process.stdin.write(chunk)
                         await process.stdin.drain()
+                        logger.debug(
+                            f"sandbox copy_from_local('{local_path}', '{remote_path}'): finished writing "
+                            f"{len(chunk)} bytes from {local_path} to remote {remote_path}"
+                        )
+                    logger.debug(
+                        f"sandbox copy_from_local('{local_path}', '{remote_path}'): writing eof to remote {remote_path}"
+                    )
                     process.stdin.write_eof()
                     await process.stdin.drain()
+                    logger.debug(
+                        f"sandbox copy_from_local('{local_path}', '{remote_path}'): finished writing eof to remote "
+                        f"{remote_path}"
+                    )
                 # When the FS tools binary exits early on an error, the worker
                 # reports the dropped stdin write as ConflictError.
                 except ConflictError:
                     pass
-                stderr, returncode = await asyncio.gather(process.stderr.read(), process.wait())
+
+                async def read_stderr():
+                    stderr = await process.stderr.read()
+                    logger.debug(f"sandbox copy_from_local('{local_path}', '{remote_path}'): finished reading stderr")
+                    return stderr
+
+                async def wait_for_process_completion():
+                    returncode = await process.wait()
+                    logger.debug(
+                        f"sandbox copy_from_local('{local_path}', '{remote_path}'): finished waiting for process "
+                        "completion"
+                    )
+                    return returncode
+
+                stderr, returncode = await asyncio.gather(read_stderr(), wait_for_process_completion())
 
             if returncode != 0:
                 raise_write_file_error(returncode, stderr, remote_path)
 
         dur_s = max(time.monotonic() - t0, 0.001)
-        _log_throughput(f"copy_from_local {local_path} -> {remote_path}", total_bytes, dur_s)
+        _log_throughput(f"copy_from_local('{local_path}', '{remote_path}')", total_bytes, dur_s)
 
     async def copy_to_local(self, remote_path: str, local_path: str | os.PathLike) -> None:
         """Copy a file from the Sandbox to a local path.

{modal-1.5.1.dev5 → modal-1.5.1.dev7}/modal/server.pyi

@@ -11,10 +11,10 @@ class Server:
     See [lifecycle hooks](https://modal.com/docs/guide/lifecycle-functions) for more information.
 
     Generally, you will not construct a Server directly.
-    Instead, use the [`@app._experimental_server()`](https://modal.com/docs/reference/modal.App#server) decorator.
+    Instead, use the [`@app.server()`](https://modal.com/docs/reference/modal.App#server) decorator.
 
     ```python notest
-    @app._experimental_server(port=8000, routing_region="us-east")
+    @app.server(port=8000, routing_region="us-east")
     class MyServer:
         @modal.enter()
         def start_server(self):

{modal-1.5.1.dev5 → modal-1.5.1.dev7}/modal.egg-info/PKG-INFO

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

{modal-1.5.1.dev5 → modal-1.5.1.dev7}/modal_proto/api_grpc.py

@@ -279,6 +279,10 @@ class ModalClientBase(abc.ABC):
     async def EnvironmentDelete(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EnvironmentDeleteRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def EnvironmentGetBudget(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EnvironmentGetBudgetRequest, modal_proto.api_pb2.EnvironmentGetBudgetResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def EnvironmentGetManaged(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EnvironmentGetManagedRequest, modal_proto.api_pb2.EnvironmentGetManagedResponse]') -> None:
         pass
@@ -295,6 +299,10 @@ class ModalClientBase(abc.ABC):
     async def EnvironmentRoleSet(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EnvironmentRoleSetRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def EnvironmentSetBudget(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EnvironmentSetBudgetRequest, google.protobuf.empty_pb2.Empty]') -> None:
+        pass
+
     @abc.abstractmethod
     async def EnvironmentSetManaged(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EnvironmentSetManagedRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
@@ -1235,6 +1243,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.EnvironmentDeleteRequest,
                 google.protobuf.empty_pb2.Empty,
             ),
+            '/modal.client.ModalClient/EnvironmentGetBudget': grpclib.const.Handler(
+                self.EnvironmentGetBudget,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.EnvironmentGetBudgetRequest,
+                modal_proto.api_pb2.EnvironmentGetBudgetResponse,
+            ),
             '/modal.client.ModalClient/EnvironmentGetManaged': grpclib.const.Handler(
                 self.EnvironmentGetManaged,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -1259,6 +1273,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.EnvironmentRoleSetRequest,
                 google.protobuf.empty_pb2.Empty,
             ),
+            '/modal.client.ModalClient/EnvironmentSetBudget': grpclib.const.Handler(
+                self.EnvironmentSetBudget,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.EnvironmentSetBudgetRequest,
+                google.protobuf.empty_pb2.Empty,
+            ),
             '/modal.client.ModalClient/EnvironmentSetManaged': grpclib.const.Handler(
                 self.EnvironmentSetManaged,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -2477,6 +2497,12 @@ class ModalClientStub:
             modal_proto.api_pb2.EnvironmentDeleteRequest,
             google.protobuf.empty_pb2.Empty,
         )
+        self.EnvironmentGetBudget = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/EnvironmentGetBudget',
+            modal_proto.api_pb2.EnvironmentGetBudgetRequest,
+            modal_proto.api_pb2.EnvironmentGetBudgetResponse,
+        )
         self.EnvironmentGetManaged = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/EnvironmentGetManaged',
@@ -2501,6 +2527,12 @@ class ModalClientStub:
             modal_proto.api_pb2.EnvironmentRoleSetRequest,
             google.protobuf.empty_pb2.Empty,
         )
+        self.EnvironmentSetBudget = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/EnvironmentSetBudget',
+            modal_proto.api_pb2.EnvironmentSetBudgetRequest,
+            google.protobuf.empty_pb2.Empty,
+        )
         self.EnvironmentSetManaged = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/EnvironmentSetManaged',