modAL 1.3.1.dev24__tar.gz → 1.3.1.dev26__tar.gz

{modal-1.3.1.dev24 → modal-1.3.1.dev26}/PKG-INFO

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

{modal-1.3.1.dev24 → modal-1.3.1.dev26}/modal/cli/run.py

@@ -49,6 +49,26 @@ class AnyParamType(click.ParamType):
         return value
 
 
+class LiteralIntParamType(click.Choice):
+    """A ParamType for Literal types containing only integers."""
+
+    def __init__(self, literal_values: tuple[int, ...]):
+        self.int_values = {str(v): v for v in literal_values}
+        super().__init__(list(self.int_values.keys()))
+
+    def convert(self, value, param, ctx):
+        # If value is already an int (e.g., from a default), validate and return it
+        # Exclude bools since they're a subclass of int but we don't support them
+        if isinstance(value, int) and not isinstance(value, bool):
+            if value in self.int_values.values():
+                return value
+            # Invalid int - convert to string so Choice can generate a nice error message
+            value = str(value)
+        # Use Choice's validation for string inputs, then convert back to int
+        str_value = super().convert(value, param, ctx)
+        return self.int_values[str_value]
+
+
 option_parsers = {
     "str": str,
     "int": int,
@@ -99,6 +119,20 @@ def _get_cli_runnable_signature(sig: inspect.Signature, type_hints: dict[str, ty
     return CliRunnableSignature(signature, has_variadic_args)
 
 
+def _get_literal_values(type_hint: Any) -> Optional[tuple[Any, ...]]:
+    """Extract values from a Literal type annotation.
+
+    Returns None if not a Literal type, otherwise returns tuple of literal values.
+    """
+    try:
+        origin = typing.get_origin(type_hint)
+        if origin is typing.Literal:
+            return typing.get_args(type_hint)
+    except Exception:
+        pass
+    return None
+
+
 def _get_param_type_as_str(annot: Any) -> str:
     """Return annotation as a string, handling various spellings for optional types."""
     annot_str = str(annot)
@@ -121,16 +155,28 @@ def _add_click_options(func, parameters: dict[str, ParameterMetadata]):
     Kind of like typer, but using options instead of positional arguments
     """
     for param in parameters.values():
-        param_type_str = _get_param_type_as_str(param["type_hint"])
         param_name = param["name"].replace("_", "-")
         cli_name = "--" + param_name
-        if param_type_str == "bool":
-            cli_name += "/--no-" + param_name
 
-        parser = option_parsers.get(param_type_str)
-        if parser is None:
-            msg = f"Parameter `{param_name}` has unparseable annotation: {param['annotation']}"
-            raise NoParserAvailable(msg)
+        parser: Any
+        if (literal_values := _get_literal_values(param["type_hint"])) is not None:
+            if all(isinstance(v, str) for v in literal_values):
+                parser = click.Choice(list(literal_values))
+            elif all(isinstance(v, int) and not isinstance(v, bool) for v in literal_values):
+                parser = LiteralIntParamType(literal_values)
+            else:
+                # Mixed types, booleans, or other unsupported types
+                msg = f"Parameter `{param_name}` has unparseable annotation: {param['annotation']}"
+                raise NoParserAvailable(msg)
+        else:
+            param_type_str = _get_param_type_as_str(param["type_hint"])
+            if param_type_str == "bool":
+                cli_name += "/--no-" + param_name
+
+            parser = option_parsers.get(param_type_str)
+            if parser is None:
+                msg = f"Parameter `{param_name}` has unparseable annotation: {param['annotation']}"
+                raise NoParserAvailable(msg)
         kwargs: Any = {
             "type": parser,
         }

{modal-1.3.1.dev24 → modal-1.3.1.dev26}/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.dev24",
+        version: str = "1.3.1.dev26",
     ):
         """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.dev24",
+        version: str = "1.3.1.dev26",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.3.1.dev24 → modal-1.3.1.dev26}/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.dev24 → modal-1.3.1.dev26}/modal.egg-info/PKG-INFO

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

{modal-1.3.1.dev24 → modal-1.3.1.dev26}/modal_proto/api.proto

@@ -1561,6 +1561,7 @@ message Function {
 
   bool single_use_containers = 91; // When True, containers will shut down after handling a single input
 
+  bool is_server = 92; // When True, the function is a server-side function.
 }
 
 message FunctionAsyncInvokeRequest {
@@ -1744,6 +1745,8 @@ message FunctionData {
   // Attribute on the module with the implementation, which may differ from function_name
   // when the user provided a custom name= for the Function inside the Application namespace
   string implementation_name = 40;
+
+  bool is_server = 41; // When True, the function is a server-side function.
 }
 
 message FunctionExtended {