modal 1.5.3.dev12__tar.gz → 1.5.3.dev13__tar.gz

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/PKG-INFO

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

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/_environments.py

@@ -591,4 +591,4 @@ def ensure_env(environment_name: str | None = None) -> str:
     if environment_name is not None:
         config.override_locally("environment", environment_name)
 
-    return config.get("environment")
+    return config.get("environment") or ""

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/_grpc_client.py

@@ -54,7 +54,7 @@ class grpc_error_converter:
         with suppress_tb_frame():
             if isinstance(exc, GRPCError):
                 modal_exc = _STATUS_TO_EXCEPTION[exc.status](exc.message)
-                modal_exc._grpc_message = exc.message
+                modal_exc._grpc_message = exc.message or ""
                 modal_exc._grpc_status = exc.status
                 modal_exc._grpc_details = exc.details
                 if use_full_traceback:

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/_object.py

@@ -23,19 +23,20 @@ EPHEMERAL_OBJECT_HEARTBEAT_SLEEP: int = 300
 
 def _get_environment_name(
     environment_name: str | None = None,
-) -> str | None:
+) -> str:
     """Get environment name from various sources.
 
     Args:
-        environment_name: Explicitly provided environment name (highest priority)
+        environment_name: Explicitly provided environment name (highest priority).
 
     Returns:
-        Environment name from first available source, or config default
+        Environment name from as passed in, from config, or as a null string
+        (which implies workspace-level default).
     """
     if environment_name:
         return environment_name
     else:
-        return config.get("environment")
+        return config.get("environment") or ""
 
 
 def live_method(method):

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/_output/rich.py

@@ -81,11 +81,11 @@ class FunctionQueuingColumn(ProgressColumn):
         super().__init__()
 
     def render(self, task) -> Text:
-        self.lag = max(task.completed - task.elapsed, self.lag)
+        self.lag = max(task.completed - (task.elapsed or 0), self.lag)
         if task.finished:
-            elapsed = max(task.finished_time, task.completed)
+            elapsed = max(task.finished_time or 0, task.completed)
         else:
-            elapsed = task.elapsed + self.lag
+            elapsed = (task.elapsed or 0) + self.lag
         delta = timedelta(seconds=int(elapsed))
         return Text(str(delta), style="progress.elapsed")
 

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/_resources.py

@@ -26,10 +26,10 @@ def convert_fn_config_to_resources_config(
             raise InvalidError(f"Cannot specify a CPU limit lower than request: {milli_cpu_max} < {milli_cpu}")
     elif cpu and isinstance(cpu, (float, int)):
         milli_cpu = int(1000 * cpu)
-        milli_cpu_max = None
+        milli_cpu_max = 0
     else:
-        milli_cpu = None
-        milli_cpu_max = None
+        milli_cpu = 0
+        milli_cpu_max = 0
 
     if memory and isinstance(memory, int):
         memory_mb = memory
@@ -47,6 +47,6 @@ def convert_fn_config_to_resources_config(
         gpu_config=parse_gpu_config(gpu),
         memory_mb=memory_mb,
         memory_mb_max=memory_mb_max,
-        ephemeral_disk_mb=ephemeral_disk,
+        ephemeral_disk_mb=ephemeral_disk or 0,
         rdma=rdma or False,
     )

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/_runtime/user_code_imports.py

@@ -549,7 +549,8 @@ def _get_cls_or_user_cls(
     else:
         # Load the module dynamically for non-serialized class.
         module = importlib.import_module(function_def.module_name)
-        qual_name: str = function_def.function_name
+        # Always use implementation_name to find the class, default to function_name if implementation_name not set.
+        qual_name: str = function_def.implementation_name or function_def.function_name
 
         if not is_global_object(qual_name):
             raise LocalFunctionError("Attempted to load a class defined in a function scope")

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/_traceback.py

@@ -75,7 +75,7 @@ def append_modal_tb(exc: BaseException, tb_dict: TBDictType, line_cache: LineCac
     setattr(exc, "__line_cache__", line_cache)
 
 
-def reduce_traceback_to_user_code(tb: TracebackType | None, user_source: str) -> TracebackType:
+def reduce_traceback_to_user_code(tb: TracebackType | None, user_source: str) -> TracebackType | None:
     """Return a traceback that does not contain modal entrypoint or synchronicity frames."""
 
     # Step forward all the way through the traceback and drop any "Modal support" frames

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/_utils/async_utils.py

@@ -1266,3 +1266,8 @@ def deprecate_aio_usage(deprecation_date: tuple[int, int, int], readable_sync_ca
         return MethodWithAio(sync_implementation, _async_proxy, synchronizer, is_classmethod=is_classmethod)
 
     return deco
+
+
+async def async_generator_from_sync(lst: Iterable[T]) -> AsyncGenerator[T, None]:
+    for item in lst:
+        yield item

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/_utils/blob_utils.py

@@ -444,6 +444,7 @@ class FileUploadSpec:
     mode: int  # file permission bits (last 12 bits of st_mode)
     size: int
     content: bytes | None = None  # Set for very small files to avoid double-read
+    exists_in_store: bool | None = None  # set after existence check
 
     def read_content(self) -> bytes:
         """Read content from source."""

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/_utils/bytes_io_segment_payload.py

@@ -45,7 +45,8 @@ class BytesIOSegmentPayload(Payload):
         self.segment_length = segment_length
         # seek to start of file segment we are interested in, in order to make .size() evaluate correctly
         self._value.seek(self.initial_seek_pos + segment_start)
-        assert self.segment_length <= super().size
+        base_size = super().size
+        assert base_size is not None and self.segment_length <= base_size
         self.chunk_size = chunk_size
         self.progress_report_cb = progress_report_cb or (lambda *_, **__: None)
         self.reset_state()

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/_utils/pattern_utils.py

@@ -143,12 +143,12 @@ class Pattern:
             else:
                 return False
         elif self.match_type == MatchType.REGEXP:
-            return self.regexp.match(path) is not None
+            return self.regexp is not None and self.regexp.match(path) is not None
         else:
             return False
 
 
-def read_ignorefile(reader: TextIO) -> list[str]:
+def read_ignorefile(reader: TextIO | None) -> list[str]:
     """Read an ignore file from a reader and return the list of file patterns to
     ignore, applying the following rules:
 

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/_utils/time_utils.py

@@ -294,7 +294,9 @@ def relative_timestamp(dt: datetime) -> str:
 
 
 def locale_tz() -> tzinfo:
-    return datetime.now().astimezone().tzinfo
+    tz = datetime.now().astimezone().tzinfo
+    assert tz is not None
+    return tz
 
 
 def as_timestamp(arg: datetime | str | None) -> float:

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/app.py

@@ -1295,6 +1295,7 @@ class _App:
         scaleup_window: int | None = None,  # Stabilization window (seconds) of sustained demand before scaling up
         scaledown_window: int | None = None,  # Max idle time before scaling down (seconds)
         startup_timeout: int = 30,  # Maximum container startup time in seconds
+        name: str | None = None,  # Name of the server
         port: int = 8000,  # Port the HTTP server listens on
         unauthenticated: bool = False,  # Whether the endpoint requires proxy authentication, required by default.
         h2_enabled: bool = False,  # Enable HTTP/2
@@ -1341,6 +1342,7 @@ class _App:
             scaleup_window: Seconds of sustained demand required before scaling up new containers.
             scaledown_window: Maximum duration (in seconds) idle containers wait before scaling down.
             startup_timeout: Maximum container startup time in seconds.
+            name: Sets the Modal name of the function within the app, defaults to class name.
             port: Port the HTTP server listens on.
             unauthenticated: Whether the endpoint requires proxy authentication; required by default.
             h2_enabled: Enable HTTP/2.
@@ -1423,7 +1425,7 @@ class _App:
             local_state = self._local_state
 
             # Create the FunctionInfo for the server, note we treat FunctionInfo as a class for servers
-            info = FunctionInfo(None, serialized=serialized, user_cls=user_cls, name_override=user_cls.__name__)
+            info = FunctionInfo(None, serialized=serialized, user_cls=user_cls, name_override=name or user_cls.__name__)
             # Create the service function
             service_function = _Function.from_local(
                 info,

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/app.pyi

@@ -751,6 +751,7 @@ class _App:
         scaleup_window: typing.Optional[int] = None,
         scaledown_window: typing.Optional[int] = None,
         startup_timeout: int = 30,
+        name: typing.Optional[str] = None,
         port: int = 8000,
         unauthenticated: bool = False,
         h2_enabled: bool = False,
@@ -797,6 +798,7 @@ class _App:
             scaleup_window: Seconds of sustained demand required before scaling up new containers.
             scaledown_window: Maximum duration (in seconds) idle containers wait before scaling down.
             startup_timeout: Maximum container startup time in seconds.
+            name: Sets the Modal name of the function within the app, defaults to class name.
             port: Port the HTTP server listens on.
             unauthenticated: Whether the endpoint requires proxy authentication; required by default.
             h2_enabled: Enable HTTP/2.
@@ -1755,6 +1757,7 @@ class App:
         scaleup_window: typing.Optional[int] = None,
         scaledown_window: typing.Optional[int] = None,
         startup_timeout: int = 30,
+        name: typing.Optional[str] = None,
         port: int = 8000,
         unauthenticated: bool = False,
         h2_enabled: bool = False,
@@ -1799,6 +1802,7 @@ class App:
             scaleup_window: Seconds of sustained demand required before scaling up new containers.
             scaledown_window: Maximum duration (in seconds) idle containers wait before scaling down.
             startup_timeout: Maximum container startup time in seconds.
+            name: Sets the Modal name of the function within the app, defaults to class name.
             port: Port the HTTP server listens on.
             unauthenticated: Whether the endpoint requires proxy authentication; required by default.
             h2_enabled: Enable HTTP/2.

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/cli/cluster.py

@@ -51,7 +51,7 @@ async def list_(env: str | None = None, json: bool = False):
             [
                 c.cluster_id,
                 c.app_id,
-                timestamp_to_localized_str(c.started_at, json) if c.started_at else "Pending",
+                timestamp_to_localized_str(c.started_at, json) or "Pending",
                 str(len(c.task_ids)),
             ]
         )

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/cli/dashboard.py

@@ -21,7 +21,7 @@ async def dashboard(
     if object_id:
         url = f"https://modal.com/id/{object_id}"
     else:
-        env = config.get("environment")
+        env = config.get("environment") or ""
         request = api_pb2.WorkspaceDashboardUrlRequest(environment_name=env)
         client = await _Client.from_env()
         response = await client.stub.WorkspaceDashboardUrlGet(request)

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/cli/endpoint.py

@@ -207,7 +207,7 @@ async def create(
         raise click.UsageError("--custom-volume-path requires --custom-volume-name.")
 
     env_name = ensure_env(env)
-    environment_name = _get_environment_name(env_name) or ""
+    environment_name = _get_environment_name(env_name)
     client = await _Client.from_env()
 
     compute_region_spec = api_pb2.EndpointComputeRegionSpec()
@@ -271,7 +271,7 @@ async def create(
 async def list_(*, json: bool = False, env: Optional[str] = None):
     """List Endpoints that are provisioning or running in an environment."""
     env_name = ensure_env(env)
-    environment_name = _get_environment_name(env_name) or ""
+    environment_name = _get_environment_name(env_name)
     client = await _Client.from_env()
 
     items: list[api_pb2.EndpointListItem] = []

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/cli/environment.py

@@ -53,7 +53,7 @@ def list_(json: bool = False):
 
     # determine which environment is currently active, prioritizing the local default
     # over the server default
-    active_env = config.get("environment")
+    active_env = config.get("environment") or ""
     for env in envs:
         if env.default is True and active_env is None:
             active_env = env.name

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/cli/launch.py

@@ -52,7 +52,7 @@ def _launch_program(
             else:
                 func()
         except Exception as exc:
-            raise _CliUserExecutionError(inspect.getsourcefile(func)) from exc
+            raise _CliUserExecutionError(inspect.getsourcefile(func) or "<unknown>") from exc
 
 
 @launch_cli.command("jupyter", help="Start Jupyter Lab on Modal.")

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/cli/network_file_system.py

@@ -29,7 +29,7 @@ nfs_cli = ModalGroup(name="nfs", help="Read and edit `modal.NetworkFileSystem` f
 @env_option
 @click.option("--json", is_flag=True, default=False)
 @synchronizer.create_blocking
-async def list_(env: str | None = None, json: bool | None = False):
+async def list_(env: str | None = None, json: bool = False):
     env = ensure_env(env)
 
     client = await _Client.from_env()

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/cli/profile.py

@@ -71,7 +71,7 @@ async def list_(json: bool | None = False):
             # Catch-all for other exceptions, like incorrect server url
             workspace = "Unknown (profile misconfigured)"
         else:
-            assert hasattr(resp, "username")
+            assert not isinstance(resp, BaseException)
             workspace = resp.username
         content = ["•" if active else "", profile, workspace]
         rows.append((active, content))
@@ -81,8 +81,8 @@ async def list_(json: bool | None = False):
         try:
             env_based_resp = await _lookup_workspace(
                 config.get("server_url", profile=_profile),
-                os.environ.get("MODAL_TOKEN_ID"),
-                os.environ.get("MODAL_TOKEN_SECRET"),
+                os.environ["MODAL_TOKEN_ID"],
+                os.environ.get("MODAL_TOKEN_SECRET", ""),
             )
             env_based_workspace = env_based_resp.username
         except AuthError:

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/cli/shell.py

@@ -48,7 +48,7 @@ def _passed_forbidden_args(
     passed_forbidden: list[str] = []
     for param in params:
         name = param.name
-        if name is None or allowed(name):
+        if not name or allowed(name):
             continue
         default = param.process_value(ctx, param.get_default(ctx))
         if passed_args.get(name) != default:
@@ -150,7 +150,7 @@ def _start_shell_in_running_container(ref: str, cmd: str, pty: bool) -> None:
 
     assert _is_valid_modal_id(ref, "ta-")
     try:
-        _exec_impl(container_id=ref, command=shlex.split(cmd), pty=pty, object_id_for_v2=object_id_for_v2)
+        _ = _exec_impl(container_id=ref, command=tuple(shlex.split(cmd)), pty=pty, object_id_for_v2=object_id_for_v2)
     except NotFoundError:
         raise ClickException(f"Container '{ref}' not found (is it still running?)")
     except Exception as e:

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/client.pyi

@@ -37,7 +37,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.3.dev12",
+        version: str = "1.5.3.dev13",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -207,7 +207,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.3.dev12",
+        version: str = "1.5.3.dev13",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/cloud_bucket_mount.py

@@ -134,9 +134,10 @@ def cloud_bucket_mounts_to_proto(
         # crude mapping from mount arguments to type.
         if mount.bucket_endpoint_url:
             parse_result = urlparse(mount.bucket_endpoint_url)
-            if parse_result.hostname.endswith("r2.cloudflarestorage.com"):
+            hostname = parse_result.hostname or ""
+            if hostname.endswith("r2.cloudflarestorage.com"):
                 bucket_type = api_pb2.CloudBucketMount.BucketType.R2
-            elif parse_result.hostname.endswith("storage.googleapis.com"):
+            elif hostname.endswith("storage.googleapis.com"):
                 bucket_type = api_pb2.CloudBucketMount.BucketType.GCP
             else:
                 logger.info(

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/experimental/__init__.py

@@ -141,6 +141,7 @@ async def stop_app(name: str, *, environment_name: str | None = None, client: _C
     """
     client_ = client or await _Client.from_env()
     app = await _App.lookup(name, environment_name=environment_name, client=client_)
+    assert app.app_id
     req = api_pb2.AppStopRequest(app_id=app.app_id, source=api_pb2.APP_STOP_SOURCE_PYTHON_CLIENT)
     await client_.stub.AppStop(req)
 
@@ -174,6 +175,7 @@ async def get_app_objects(
         client = await _Client.from_env()
 
     app = await _App.lookup(app_name, environment_name=environment_name, client=client)
+    assert app.app_id
     req = api_pb2.AppGetLayoutRequest(app_id=app.app_id)
     app_layout_resp = await client.stub.AppGetLayout(req)
 

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/file_pattern_matcher.py

@@ -201,7 +201,7 @@ class FilePatternMatcher(_AbstractPatternMatcher):
             pattern_strings = Path(self._file_path).read_text("utf8").splitlines()
         else:
             # Use patterns provided in __init__
-            pattern_strings = list(self._pattern_strings)
+            pattern_strings = list(self._pattern_strings or [])
 
         return self._parse_patterns(pattern_strings)
 

{modal-1.5.3.dev12 → modal-1.5.3.dev13}/modal/functions.pyi

@@ -516,7 +516,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.
 
@@ -541,7 +541,7 @@ class Function(
             """
             ...
 
-    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]:
@@ -591,7 +591,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.
 
@@ -624,7 +624,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: ...
@@ -632,7 +632,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.
 
@@ -665,7 +665,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.