modal 1.0.0.dev14__tar.gz → 1.0.0.dev16__tar.gz

{modal-1.0.0.dev14 → modal-1.0.0.dev16}/PKG-INFO

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

{modal-1.0.0.dev14 → modal-1.0.0.dev16}/modal/__init__.py

@@ -11,7 +11,7 @@ from modal_version import __version__
 try:
     from ._runtime.execution_context import current_function_call_id, current_input_id, interact, is_local
     from ._tunnel import Tunnel, forward
-    from .app import App, Stub
+    from .app import App
     from .client import Client
     from .cloud_bucket_mount import CloudBucketMount
     from .cls import Cls, parameter
@@ -54,6 +54,7 @@ except Exception:
     print()
     raise
 
+
 __all__ = [
     "__version__",
     "App",
@@ -77,7 +78,6 @@ __all__ = [
     "SandboxSnapshot",
     "SchedulerPlacement",
     "Secret",
-    "Stub",
     "Tunnel",
     "Volume",
     "asgi_app",
@@ -99,3 +99,11 @@ __all__ = [
     "web_server",
     "wsgi_app",
 ]
+
+
+def __getattr__(name):
+    if name == "Stub":
+        raise AttributeError(
+            "Module 'modal' has no attribute 'Stub'. Use `modal.App` instead. This is a simple name change."
+        )
+    raise AttributeError(f"module 'modal' has no attribute '{name}'")

{modal-1.0.0.dev14 → modal-1.0.0.dev16}/modal/_functions.py

@@ -1508,20 +1508,6 @@ Use the `Function.get_web_url()` method instead.
         async for res in invocation.run_generator():
             yield res
 
-    @synchronizer.no_io_translation
-    async def _call_generator_nowait(self, args, kwargs):
-        deprecation_warning(
-            (2024, 12, 11),
-            "Calling spawn on a generator function is deprecated and will soon raise an exception.",
-        )
-        return await _Invocation.create(
-            self,
-            args,
-            kwargs,
-            client=self.client,
-            function_call_invocation_type=api_pb2.FUNCTION_CALL_INVOCATION_TYPE_ASYNC,
-        )
-
     @synchronizer.no_io_translation
     @live_method
     async def remote(self, *args: P.args, **kwargs: P.kwargs) -> ReturnType:
@@ -1634,7 +1620,7 @@ Use the `Function.get_web_url()` method instead.
         """
         self._check_no_web_url("_experimental_spawn")
         if self._is_generator:
-            invocation = await self._call_generator_nowait(args, kwargs)
+            raise InvalidError("Cannot `spawn` a generator function.")
         else:
             invocation = await self._call_function_nowait(
                 args, kwargs, function_call_invocation_type=api_pb2.FUNCTION_CALL_INVOCATION_TYPE_ASYNC
@@ -1666,14 +1652,13 @@ Use the `Function.get_web_url()` method instead.
         """
         self._check_no_web_url("spawn")
         if self._is_generator:
-            invocation = await self._call_generator_nowait(args, kwargs)
+            raise InvalidError("Cannot `spawn` a generator function.")
         else:
             invocation = await self._call_function_nowait(args, kwargs, api_pb2.FUNCTION_CALL_INVOCATION_TYPE_ASYNC)
 
         fc: _FunctionCall[ReturnType] = _FunctionCall._new_hydrated(
             invocation.function_call_id, invocation.client, None
         )
-        fc._is_generator = self._is_generator if self._is_generator else False
         return fc
 
     def get_raw_f(self) -> Callable[..., Any]:
@@ -1732,22 +1717,8 @@ class _FunctionCall(typing.Generic[ReturnType], _Object, type_prefix="fc"):
 
         The returned coroutine is not cancellation-safe.
         """
-
-        if self._is_generator:
-            raise Exception("Cannot get the result of a generator function call. Use `get_gen` instead.")
-
         return await self._invocation().poll_function(timeout=timeout)
 
-    async def get_gen(self) -> AsyncGenerator[Any, None]:
-        """
-        Calls the generator remotely, executing it with the given arguments and returning the execution's result.
-        """
-        if not self._is_generator:
-            raise Exception("Cannot iterate over a non-generator function call. Use `get` instead.")
-
-        async for res in self._invocation().run_generator():
-            yield res
-
     async def get_call_graph(self) -> list[InputInfo]:
         """Returns a structure representing the call graph from a given root
         call ID, along with the status of execution for each node.
@@ -1778,9 +1749,7 @@ class _FunctionCall(typing.Generic[ReturnType], _Object, type_prefix="fc"):
         await retry_transient_errors(self._client.stub.FunctionCallCancel, request)
 
     @staticmethod
-    async def from_id(
-        function_call_id: str, client: Optional[_Client] = None, is_generator: bool = False
-    ) -> "_FunctionCall[Any]":
+    async def from_id(function_call_id: str, client: Optional[_Client] = None) -> "_FunctionCall[Any]":
         """Instantiate a FunctionCall object from an existing ID.
 
         Examples:
@@ -1803,7 +1772,6 @@ class _FunctionCall(typing.Generic[ReturnType], _Object, type_prefix="fc"):
             client = await _Client.from_env()
 
         fc: _FunctionCall[Any] = _FunctionCall._new_hydrated(function_call_id, client, None)
-        fc._is_generator = is_generator
         return fc
 
     @staticmethod

{modal-1.0.0.dev14 → modal-1.0.0.dev16}/modal/app.py

@@ -1,7 +1,6 @@
 # Copyright Modal Labs 2022
 import inspect
 import typing
-import warnings
 from collections.abc import AsyncGenerator, Coroutine, Sequence
 from pathlib import PurePosixPath
 from textwrap import dedent
@@ -78,11 +77,6 @@ class _LocalEntrypoint:
     def app(self) -> "_App":
         return self._app
 
-    @property
-    def stub(self) -> "_App":
-        # Deprecated soon, only for backwards compatibility
-        return self._app
-
 
 LocalEntrypoint = synchronize_api(_LocalEntrypoint)
 
@@ -781,12 +775,6 @@ class _App:
                 rdma = None
                 i6pn_enabled = i6pn
 
-            if info.function_name.endswith(".app"):
-                warnings.warn(
-                    "Beware: the function name is `app`. Modal will soon rename `Stub` to `App`, "
-                    "so you might run into issues if you have code like `app = modal.App()` in the same scope"
-                )
-
             if is_generator is None:
                 is_generator = inspect.isgeneratorfunction(raw_f) or inspect.isasyncgenfunction(raw_f)
 
@@ -1096,23 +1084,3 @@ class _App:
 
 
 App = synchronize_api(_App)
-
-
-class _Stub(_App):
-    """mdmd:hidden
-    This enables using a "Stub" class instead of "App".
-
-    For most of Modal's history, the app class was called "Stub", so this exists for
-    backwards compatibility, in order to facilitate moving from "Stub" to "App".
-    """
-
-    def __new__(cls, *args, **kwargs):
-        deprecation_warning(
-            (2024, 4, 29),
-            'The use of "Stub" has been deprecated in favor of "App".'
-            " This is a pure name change with no other implications.",
-        )
-        return _App(*args, **kwargs)
-
-
-Stub = synchronize_api(_Stub)

{modal-1.0.0.dev14 → modal-1.0.0.dev16}/modal/app.pyi

@@ -33,8 +33,6 @@ class _LocalEntrypoint:
     def info(self) -> modal._utils.function_utils.FunctionInfo: ...
     @property
     def app(self) -> _App: ...
-    @property
-    def stub(self) -> _App: ...
 
 class LocalEntrypoint:
     _info: modal._utils.function_utils.FunctionInfo
@@ -46,8 +44,6 @@ class LocalEntrypoint:
     def info(self) -> modal._utils.function_utils.FunctionInfo: ...
     @property
     def app(self) -> App: ...
-    @property
-    def stub(self) -> App: ...
 
 def check_sequence(items: typing.Sequence[typing.Any], item_type: type[typing.Any], error_msg: str) -> None: ...
 
@@ -520,29 +516,4 @@ class App:
     @classmethod
     def _reset_container_app(cls): ...
 
-class _Stub(_App):
-    @staticmethod
-    def __new__(
-        cls,
-        name: typing.Optional[str] = None,
-        *,
-        image: typing.Optional[modal.image._Image] = None,
-        mounts: collections.abc.Sequence[modal.mount._Mount] = [],
-        secrets: collections.abc.Sequence[modal.secret._Secret] = [],
-        volumes: dict[typing.Union[str, pathlib.PurePosixPath], modal.volume._Volume] = {},
-        include_source: typing.Optional[bool] = None,
-    ): ...
-
-class Stub(App):
-    def __init__(
-        self,
-        name: typing.Optional[str] = None,
-        *,
-        image: typing.Optional[modal.image.Image] = None,
-        mounts: collections.abc.Sequence[modal.mount.Mount] = [],
-        secrets: collections.abc.Sequence[modal.secret.Secret] = [],
-        volumes: dict[typing.Union[str, pathlib.PurePosixPath], modal.volume.Volume] = {},
-        include_source: typing.Optional[bool] = None,
-    ) -> None: ...
-
 _default_image: modal.image._Image

{modal-1.0.0.dev14 → modal-1.0.0.dev16}/modal/client.pyi

@@ -31,7 +31,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.0.dev14",
+        version: str = "1.0.0.dev16",
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -94,7 +94,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.0.dev14",
+        version: str = "1.0.0.dev16",
     ): ...
     def is_closed(self) -> bool: ...
     @property

{modal-1.0.0.dev14 → modal-1.0.0.dev16}/modal/exception.py

@@ -116,7 +116,7 @@ class InternalFailure(Error):
 
 class _CliUserExecutionError(Exception):
     """mdmd:hidden
-    Private wrapper for exceptions during when importing or running stubs from the CLI.
+    Private wrapper for exceptions during when importing or running Apps from the CLI.
 
     This intentionally does not inherit from `modal.exception.Error` because it
     is a private type that should never bubble up to users. Exceptions raised in

{modal-1.0.0.dev14 → modal-1.0.0.dev16}/modal/functions.pyi

@@ -228,12 +228,6 @@ class Function(
 
     _call_generator: ___call_generator_spec[typing_extensions.Self]
 
-    class ___call_generator_nowait_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, /, args, kwargs): ...
-        async def aio(self, /, args, kwargs): ...
-
-    _call_generator_nowait: ___call_generator_nowait_spec[typing_extensions.Self]
-
     class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER: ...
         async def aio(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER: ...
@@ -350,12 +344,6 @@ class FunctionCall(typing.Generic[modal._functions.ReturnType], modal.object.Obj
 
     get: __get_spec[modal._functions.ReturnType, typing_extensions.Self]
 
-    class __get_gen_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, /) -> typing.Generator[typing.Any, None, None]: ...
-        def aio(self, /) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
-
-    get_gen: __get_gen_spec[typing_extensions.Self]
-
     class __get_call_graph_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /) -> list[modal.call_graph.InputInfo]: ...
         async def aio(self, /) -> list[modal.call_graph.InputInfo]: ...
@@ -370,18 +358,10 @@ class FunctionCall(typing.Generic[modal._functions.ReturnType], modal.object.Obj
 
     class __from_id_spec(typing_extensions.Protocol):
         def __call__(
-            self,
-            /,
-            function_call_id: str,
-            client: typing.Optional[modal.client.Client] = None,
-            is_generator: bool = False,
+            self, /, function_call_id: str, client: typing.Optional[modal.client.Client] = None
         ) -> FunctionCall[typing.Any]: ...
         async def aio(
-            self,
-            /,
-            function_call_id: str,
-            client: typing.Optional[modal.client.Client] = None,
-            is_generator: bool = False,
+            self, /, function_call_id: str, client: typing.Optional[modal.client.Client] = None
         ) -> FunctionCall[typing.Any]: ...
 
     from_id: __from_id_spec

{modal-1.0.0.dev14 → modal-1.0.0.dev16}/modal.egg-info/PKG-INFO

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

{modal-1.0.0.dev14 → modal-1.0.0.dev16}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.0.0.dev14"
+__version__ = "1.0.0.dev16"