modal 1.3.1.dev8__tar.gz → 1.3.1.dev10__tar.gz

{modal-1.3.1.dev8 → modal-1.3.1.dev10}/PKG-INFO

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

{modal-1.3.1.dev8 → modal-1.3.1.dev10}/modal/_partial_function.py

@@ -19,7 +19,7 @@ from ._functions import _Function
 from ._utils.async_utils import synchronizer
 from ._utils.deprecation import deprecation_warning
 from ._utils.function_utils import callable_has_non_self_params
-from .config import config, logger
+from .config import config
 from .exception import InvalidError
 
 MAX_MAX_BATCH_SIZE = 1000
@@ -125,7 +125,6 @@ class _PartialFunction(typing.Generic[P, ReturnType, OriginalReturnType]):
     user_cls: Optional[type] = None  # class
     flags: _PartialFunctionFlags
     params: _PartialFunctionParams
-    registered: bool
 
     def __init__(
         self,
@@ -141,7 +140,6 @@ class _PartialFunction(typing.Generic[P, ReturnType, OriginalReturnType]):
             self.user_cls = None
         self.flags = flags
         self.params = params
-        self.registered = False
         self.validate_flag_composition()
 
     def stack(self, flags: _PartialFunctionFlags, params: _PartialFunctionParams) -> typing_extensions.Self:
@@ -156,13 +154,11 @@ class _PartialFunction(typing.Generic[P, ReturnType, OriginalReturnType]):
         uses_interface_flags = self.flags & _PartialFunctionFlags.interface_flags()
         uses_lifecycle_flags = self.flags & _PartialFunctionFlags.lifecycle_flags()
         if uses_interface_flags and uses_lifecycle_flags:
-            self.registered = True  # Hacky, avoid false-positive warning
             raise InvalidError("Interface decorators cannot be combined with lifecycle decorators.")
 
         has_web_interface = self.flags & _PartialFunctionFlags.WEB_INTERFACE
         has_callable_interface = self.flags & _PartialFunctionFlags.CALLABLE_INTERFACE
         if has_web_interface and has_callable_interface:
-            self.registered = True  # Hacky, avoid false-positive warning
             raise InvalidError("Callable decorators cannot be combined with web interface decorators.")
 
     def validate_obj_compatibility(
@@ -174,20 +170,17 @@ class _PartialFunction(typing.Generic[P, ReturnType, OriginalReturnType]):
         uses_lifecycle_flags = self.flags & _PartialFunctionFlags.lifecycle_flags()
         uses_interface_flags = self.flags & _PartialFunctionFlags.interface_flags()
         if self.user_cls is not None and (uses_lifecycle_flags or uses_interface_flags):
-            self.registered = True  # Hacky, avoid false-positive warning
             raise InvalidError(
                 f"Cannot apply `@modal.{decorator_name}` to a class. Hint: consider applying to a method instead."
             )
 
         wrapped_object = self.raw_f or self.user_cls
         if isinstance(wrapped_object, _Function):
-            self.registered = True  # Hacky, avoid false-positive warning
             raise InvalidError(
                 f"Cannot stack `@modal.{decorator_name}` on top of `@app.function`."
                 " Hint: swap the order of the decorators."
             )
         elif isinstance(wrapped_object, _Cls):
-            self.registered = True  # Hacky, avoid false-positive warning
             raise InvalidError(
                 f"Cannot stack `@modal.{decorator_name}` on top of `@app.cls()`."
                 " Hint: swap the order of the decorators."
@@ -196,15 +189,12 @@ class _PartialFunction(typing.Generic[P, ReturnType, OriginalReturnType]):
         # Run some assertions about a callable wrappee defined by the specific decorator used
         if self.raw_f is not None:
             if not callable(self.raw_f):
-                self.registered = True  # Hacky, avoid false-positive warning
                 raise InvalidError(f"The object wrapped by `@modal.{decorator_name}` must be callable.")
 
             if require_sync and inspect.iscoroutinefunction(self.raw_f):
-                self.registered = True  # Hacky, avoid false-positive warning
                 raise InvalidError(f"The `@modal.{decorator_name}` decorator can't be applied to an async function.")
 
             if require_nullary and callable_has_non_self_params(self.raw_f):
-                self.registered = True  # Hacky, avoid false-positive warning
                 raise InvalidError(f"Functions decorated by `@modal.{decorator_name}` can't have parameters.")
 
     def _get_raw_f(self) -> Callable[P, ReturnType]:
@@ -244,17 +234,6 @@ class _PartialFunction(typing.Generic[P, ReturnType, OriginalReturnType]):
             # to let it be bound to a variable and become a Function later on
             return self  # type: ignore  # this returns a PartialFunction in a special internal case
 
-    def __del__(self):
-        if self.registered is False:
-            if self.raw_f is not None:
-                name, object_type, suggestion = self.raw_f.__name__, "function", "@app.function or @app.cls"
-            elif self.user_cls is not None:
-                name, object_type, suggestion = self.user_cls.__name__, "class", "@app.cls"
-            logger.warning(
-                f"The `{name}` {object_type} was never registered with the App."
-                f" Did you forget an {suggestion} decorator?"
-            )
-
 
 def _find_partial_methods_for_user_cls(user_cls: type[Any], flags: int) -> dict[str, _PartialFunction]:
     """Grabs all method on a user class, and returns partials. Includes legacy methods."""

{modal-1.3.1.dev8 → modal-1.3.1.dev10}/modal/app.py

@@ -813,7 +813,6 @@ class _App:
 
             if isinstance(f, _PartialFunction):
                 # typically for @function-wrapped @web_endpoint, @asgi_app, or @batched
-                f.registered = True
 
                 # but we don't support @app.function wrapping a method.
                 if is_method_fn(f.raw_f.__qualname__):
@@ -1052,7 +1051,6 @@ class _App:
             # Check if the decorated object is a class
             http_config = None
             if isinstance(wrapped_cls, _PartialFunction):
-                wrapped_cls.registered = True
                 user_cls = wrapped_cls.user_cls
                 if wrapped_cls.flags & _PartialFunctionFlags.HTTP_WEB_INTERFACE:
                     http_config = wrapped_cls.params.http_config
@@ -1110,7 +1108,6 @@ class _App:
                 raise InvalidError("A class must have `enable_memory_snapshot=True` to use `snap=True` on its methods.")
 
             for method in _find_partial_methods_for_user_cls(user_cls, _PartialFunctionFlags.CONCURRENT).values():
-                method.registered = True  # Avoid warning about not registering the method (hacky!)
                 raise InvalidError(
                     "The `@modal.concurrent` decorator cannot be used on methods; decorate the class instead."
                 )
@@ -1118,7 +1115,6 @@ class _App:
             for method in _find_partial_methods_for_user_cls(
                 user_cls, _PartialFunctionFlags.HTTP_WEB_INTERFACE
             ).values():
-                method.registered = True  # Avoid warning about not registering the method (hacky!)
                 raise InvalidError(
                     "The `@modal.http_server` decorator cannot be used on methods; decorate the class instead."
                 )
@@ -1127,7 +1123,6 @@ class _App:
                 for method in _find_partial_methods_for_user_cls(
                     user_cls, _PartialFunctionFlags.CALLABLE_INTERFACE
                 ).values():
-                    method.registered = True  # Avoid warning about not registering the method (hacky!)
                     raise InvalidError("Callable decorators cannot be combined with web interface decorators.")
 
             info = FunctionInfo(None, serialized=serialized, user_cls=user_cls)
@@ -1182,7 +1177,6 @@ class _App:
                 if partial_function.params.webhook_config is not None:
                     full_name = f"{user_cls.__name__}.{method_name}"
                     local_state.web_endpoints.append(full_name)
-                partial_function.registered = True
 
             tag: str = user_cls.__name__
             self._add_class(tag, cls)

{modal-1.3.1.dev8 → modal-1.3.1.dev10}/modal/client.pyi

@@ -33,7 +33,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.3.1.dev8",
+        version: str = "1.3.1.dev10",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -163,7 +163,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.3.1.dev8",
+        version: str = "1.3.1.dev10",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.3.1.dev8 → modal-1.3.1.dev10}/modal/cls.py

@@ -579,12 +579,9 @@ More information on class parameterization can be found here: https://modal.com/
         # validate signature
         _Cls.validate_construction_mechanism(user_cls)
 
-        # Disable the warning that lifecycle methods are not wrapped
         lifecycle_method_partials = _find_partial_methods_for_user_cls(
             user_cls, ~_PartialFunctionFlags.interface_flags()
         )
-        for partial_function in lifecycle_method_partials.values():
-            partial_function.registered = True
 
         method_partials = _find_partial_methods_for_user_cls(user_cls, _PartialFunctionFlags.interface_flags())
 

{modal-1.3.1.dev8 → modal-1.3.1.dev10}/modal/functions.pyi

@@ -407,7 +407,7 @@ class Function(
 
     _call_generator: ___call_generator_spec
 
-    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_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."""
             ...
@@ -416,7 +416,7 @@ class Function(
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
 
-    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P]
+    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType]
 
     class __remote_gen_spec(typing_extensions.Protocol):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -443,7 +443,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_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.
 
@@ -466,7 +466,7 @@ class Function(
             """
             ...
 
-    _experimental_spawn: ___experimental_spawn_spec[modal._functions.ReturnType, modal._functions.P]
+    _experimental_spawn: ___experimental_spawn_spec[modal._functions.P, modal._functions.ReturnType]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> None: ...
@@ -474,7 +474,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P]
 
-    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_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.
 
@@ -495,7 +495,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P]
+    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function."""

{modal-1.3.1.dev8 → modal-1.3.1.dev10}/modal/partial_function.pyi

@@ -18,7 +18,6 @@ class PartialFunction(
     user_cls: typing.Optional[type]
     flags: modal._partial_function._PartialFunctionFlags
     params: modal._partial_function._PartialFunctionParams
-    registered: bool
 
     def __init__(
         self,

{modal-1.3.1.dev8 → modal-1.3.1.dev10}/modal.egg-info/PKG-INFO

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

{modal-1.3.1.dev8 → modal-1.3.1.dev10}/modal_proto/api.proto

@@ -2679,6 +2679,19 @@ message RateLimit {
   RateLimitInterval interval = 2;
 }
 
+message ResourceInfo {
+    message ResourceValue {
+      uint32 value = 1;
+      bool is_default = 2;
+    }
+    ResourceValue memory_mb = 1; // MiB
+    ResourceValue milli_cpu = 2; // milli CPU cores
+    string gpu_type = 3;
+    uint32 memory_mb_max = 4  ; // MiB
+    uint32 ephemeral_disk_mb = 5;  // MiB
+    uint32 milli_cpu_max = 6; // milli CPU cores
+}
+
 message Resources {
   uint32 memory_mb = 2; // MiB
   uint32 milli_cpu = 3; // milli CPU cores
@@ -2887,9 +2900,12 @@ message SandboxInfo {
   repeated SandboxTag tags = 6; // TODO: Not yet exposed in client library.
   string name = 7;
   string image_id = 8;
+  ResourceInfo resource_info = 9;
+  repeated string regions = 10;
   reserved 2; // modal.client.Sandbox definition
 }
 
+
 message SandboxListRequest {
   string app_id = 1;
   double before_timestamp = 2;