modAL 1.3.1.dev24__tar.gz → 1.3.1.dev25__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.3.1.dev24
+Version: 1.3.1.dev25
 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.dev25}/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.dev25}/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.dev25",
     ):
         """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.dev25",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.3.1.dev24 → modal-1.3.1.dev25}/modal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.3.1.dev24
+Version: 1.3.1.dev25
 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.dev25}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.3.1.dev24"
+__version__ = "1.3.1.dev25"