modal 1.0.0.dev15__tar.gz → 1.0.0.dev17__tar.gz

{modal-1.0.0.dev15 → modal-1.0.0.dev17}/PKG-INFO

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

{modal-1.0.0.dev15 → modal-1.0.0.dev17}/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.dev15 → modal-1.0.0.dev17}/modal/_functions.py

@@ -99,6 +99,7 @@ if TYPE_CHECKING:
     import modal.cls
     import modal.partial_function
 
+MAX_INTERNAL_FAILURE_COUNT = 100
 
 @dataclasses.dataclass
 class _RetryContext:
@@ -348,10 +349,14 @@ class _InputPlaneInvocation:
         stub: ModalClientModal,
         attempt_token: str,
         client: _Client,
+        input_item: api_pb2.FunctionPutInputsItem,
+        function_id: str
     ):
         self.stub = stub
         self.client = client  # Used by the deserializer.
         self.attempt_token = attempt_token
+        self.input_item = input_item
+        self.function_id = function_id
 
     @staticmethod
     async def create(
@@ -365,36 +370,53 @@ class _InputPlaneInvocation:
         stub = await client.get_stub(input_plane_url)
 
         function_id = function.object_id
-        item = await _create_input(args, kwargs, stub, method_name=function._use_method_name)
+        input_item = await _create_input(args, kwargs, stub, method_name=function._use_method_name)
 
         request = api_pb2.AttemptStartRequest(
             function_id=function_id,
             parent_input_id=current_input_id() or "",
-            input=item,
+            input=input_item,
         )
         response = await retry_transient_errors(stub.AttemptStart, request)
         attempt_token = response.attempt_token
 
-        return _InputPlaneInvocation(stub, attempt_token, client)
+        return _InputPlaneInvocation(stub, attempt_token, client, input_item, function_id)
 
     async def run_function(self) -> Any:
-        # TODO(nathan): add retry logic
+        # This will retry when the server returns GENERIC_STATUS_INTERNAL_FAILURE, i.e. lost inputs or worker preemption
+        # TODO(ryan): add logic to retry for user defined
+        internal_failure_count = 0
         while True:
-            request = api_pb2.AttemptAwaitRequest(
+            await_request = api_pb2.AttemptAwaitRequest(
                 attempt_token=self.attempt_token,
                 timeout_secs=OUTPUTS_TIMEOUT,
                 requested_at=time.time(),
             )
-            response: api_pb2.AttemptAwaitResponse = await retry_transient_errors(
+            await_response: api_pb2.AttemptAwaitResponse = await retry_transient_errors(
                 self.stub.AttemptAwait,
-                request,
+                await_request,
                 attempt_timeout=OUTPUTS_TIMEOUT + ATTEMPT_TIMEOUT_GRACE_PERIOD,
             )
 
-            if response.HasField("output"):
+            try:
                 return await _process_result(
-                    response.output.result, response.output.data_format, self.stub, self.client
+                    await_response.output.result, await_response.output.data_format, self.stub, self.client
+                )
+            except InternalFailure as e:
+                internal_failure_count += 1
+                # Limit the number of times we retry
+                if internal_failure_count >= MAX_INTERNAL_FAILURE_COUNT:
+                    raise e
+                # For system failures on the server, we retry immediately,
+                # and the failure does not count towards the retry policy.
+                retry_request = api_pb2.AttemptRetryRequest(
+                    function_id=self.function_id,
+                    parent_input_id=current_input_id() or "",
+                    input=self.input_item,
+                    attempt_token=self.attempt_token
                 )
+                retry_response = await retry_transient_errors(self.stub.AttemptRetry, retry_request)
+                self.attempt_token = retry_response.attempt_token
 
 
 # Wrapper type for api_pb2.FunctionStats

{modal-1.0.0.dev15 → modal-1.0.0.dev17}/modal/_utils/function_utils.py

@@ -466,7 +466,10 @@ async def _process_result(result: api_pb2.GenericResult, data_format: int, stub,
 
     if result.status == api_pb2.GenericResult.GENERIC_STATUS_TIMEOUT:
         raise FunctionTimeoutError(result.exception)
-    elif result.status == api_pb2.GenericResult.GENERIC_STATUS_INTERNAL_FAILURE:
+    elif result.status in [
+        api_pb2.GenericResult.GENERIC_STATUS_INTERNAL_FAILURE,
+        api_pb2.GenericResult.GENERIC_STATUS_TERMINATED,
+    ]:
         raise InternalFailure(result.exception)
     elif result.status != api_pb2.GenericResult.GENERIC_STATUS_SUCCESS:
         if data:

{modal-1.0.0.dev15 → modal-1.0.0.dev17}/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.dev15 → modal-1.0.0.dev17}/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.dev15 → modal-1.0.0.dev17}/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.dev15",
+        version: str = "1.0.0.dev17",
     ): ...
     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.dev15",
+        version: str = "1.0.0.dev17",
     ): ...
     def is_closed(self) -> bool: ...
     @property

{modal-1.0.0.dev15 → modal-1.0.0.dev17}/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.dev15 → modal-1.0.0.dev17}/modal/functions.pyi

@@ -228,11 +228,11 @@ class Function(
 
     _call_generator: ___call_generator_spec[typing_extensions.Self]
 
-    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_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: ...
 
-    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
+    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
 
     class __remote_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]: ...
@@ -247,12 +247,12 @@ class Function(
         self, *args: modal._functions.P.args, **kwargs: modal._functions.P.kwargs
     ) -> modal._functions.OriginalReturnType: ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
         async def aio(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
 
     _experimental_spawn: ___experimental_spawn_spec[
-        modal._functions.P, modal._functions.ReturnType, typing_extensions.Self
+        modal._functions.ReturnType, modal._functions.P, typing_extensions.Self
     ]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER, SUPERSELF]):
@@ -261,11 +261,11 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P, typing_extensions.Self]
 
-    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
         async def aio(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
 
-    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]: ...
 

{modal-1.0.0.dev15 → modal-1.0.0.dev17}/modal.egg-info/PKG-INFO

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

{modal-1.0.0.dev15 → modal-1.0.0.dev17}/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.dev15"
+__version__ = "1.0.0.dev17"