modal 1.4.1.dev3__tar.gz → 1.4.1.dev5__tar.gz

{modal-1.4.1.dev3 → modal-1.4.1.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.4.1.dev3
+Version: 1.4.1.dev5
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License-Expression: Apache-2.0
@@ -23,7 +23,7 @@ Requires-Dist: grpclib<0.4.10,>=0.4.7; python_version < "3.14"
 Requires-Dist: grpclib<0.4.10,>=0.4.9; python_version >= "3.14"
 Requires-Dist: protobuf!=4.24.0,<7.0,>=3.19
 Requires-Dist: rich>=12.0.0
-Requires-Dist: synchronicity~=0.11.1
+Requires-Dist: synchronicity~=0.12.0
 Requires-Dist: toml
 Requires-Dist: typer>=0.9
 Requires-Dist: types-certifi

{modal-1.4.1.dev3 → modal-1.4.1.dev5}/modal/_utils/task_command_router_client.py

@@ -2,6 +2,7 @@
 import asyncio
 import base64
 import json
+import socket
 import ssl
 import time
 import urllib.parse
@@ -181,7 +182,10 @@ class TaskCommandRouterClient:
             closed_error_message="Unable to perform operation on a detached sandbox",
         )
 
-        await _connect_channel(channel)
+        try:
+            await _connect_channel(channel)
+        except socket.gaierror as exc:
+            raise ConnectionError(f"Could not resolve hostname '{host}': {exc}") from exc
         loop = asyncio.get_running_loop()
         jwt_refresh_lock = asyncio.Lock()
 

{modal-1.4.1.dev3 → modal-1.4.1.dev5}/modal/cli/import_refs.py

@@ -127,6 +127,7 @@ class AutoRunPriority:
 
 def list_cli_commands(
     module_members: dict[str, typing.Any],
+    include_service_functions: bool = False,
 ) -> list[CLICommand]:
     """
     Extracts all runnables found either directly in the input module, or in any of the Apps listed in that module
@@ -149,8 +150,8 @@ def list_cli_commands(
             all_runnables[local_entrypoint].append(f"{app_name}.{name}")
             priorities[local_entrypoint] = AutoRunPriority.APP_LOCAL_ENTRYPOINT
         for name, function in app.registered_functions.items():
-            if function.info.is_service_class():
-                continue  # Skip class and server service functions since they don't have associated cli commands
+            if function.info.is_service_class() and not include_service_functions:
+                continue  # Skip class and server service functions for all commands except `modal shell`.
             all_runnables[function].append(f"{app_name}.{name}")
             priorities[function] = AutoRunPriority.APP_FUNCTION
         for cls_name, cls in app.registered_classes.items():
@@ -322,7 +323,12 @@ def _get_runnable_app(runnable: Runnable) -> App:
 
 
 def import_and_filter(
-    import_ref: ImportRef, *, base_cmd: str, accept_local_entrypoint=True, accept_webhook=False
+    import_ref: ImportRef,
+    *,
+    base_cmd: str,
+    accept_local_entrypoint=True,
+    accept_webhook=False,
+    accept_service_functions=False,
 ) -> tuple[Optional[Runnable], list[CLICommand]]:
     """Takes a function ref string and returns a single determined "runnable" to use, and a list of all available
     runnables.
@@ -339,7 +345,10 @@ def import_and_filter(
     """
     # all commands:
     module = import_file_or_module(import_ref, base_cmd)
-    cli_commands = list_cli_commands(dict(inspect.getmembers(module)))
+    cli_commands = list_cli_commands(
+        dict(inspect.getmembers(module)),
+        include_service_functions=accept_service_functions,
+    )
 
     # all commands that satisfy local entrypoint/accept webhook limitations AND object path prefix
 

{modal-1.4.1.dev3 → modal-1.4.1.dev5}/modal/cli/shell.py

@@ -142,7 +142,11 @@ def _start_shell_in_running_container(ref: str, cmd: str, pty: bool) -> None:
 def _function_spec_from_ref(ref: str, use_module_mode: bool) -> _FunctionSpec:
     import_ref = parse_import_ref(ref, use_module_mode=use_module_mode)
     runnable, all_usable_commands = import_and_filter(
-        import_ref, base_cmd="modal shell", accept_local_entrypoint=False, accept_webhook=True
+        import_ref,
+        base_cmd="modal shell",
+        accept_local_entrypoint=False,
+        accept_webhook=True,
+        accept_service_functions=True,
     )
     if not runnable:
         help_header = (

{modal-1.4.1.dev3 → modal-1.4.1.dev5}/modal/client.py

@@ -56,8 +56,7 @@ def _get_metadata(client_type: int, credentials: Optional[tuple[str, str]], vers
                 "x-modal-token-secret": token_secret,
             }
         )
-    agent_env = _agent_environment()
-    if agent_env:
+    if agent_env := _agent_environment():
         metadata["x-modal-agent-harness"] = urllib.parse.quote(agent_env)
     return metadata
 

{modal-1.4.1.dev3 → modal-1.4.1.dev5}/modal/client.pyi

@@ -35,7 +35,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.4.1.dev3",
+        version: str = "1.4.1.dev5",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -171,7 +171,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.4.1.dev3",
+        version: str = "1.4.1.dev5",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.4.1.dev3 → modal-1.4.1.dev5}/modal/dict.py

@@ -298,7 +298,8 @@ class _Dict(_Object, type_prefix="di"):
         )
 
     @classproperty
-    def objects(cls) -> _DictManager:
+    @classmethod
+    def objects(cls) -> type[_DictManager]:
         return _DictManager
 
     @property

{modal-1.4.1.dev3 → modal-1.4.1.dev5}/modal/dict.pyi

@@ -412,7 +412,8 @@ class _Dict(modal._object._Object):
         ...
 
     @synchronicity.classproperty
-    def objects(cls) -> _DictManager: ...
+    @classmethod
+    def objects(cls) -> type[_DictManager]: ...
     @property
     def name(self) -> typing.Optional[str]: ...
     def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
@@ -653,7 +654,8 @@ class Dict(modal.object.Object):
         ...
 
     @synchronicity.classproperty
-    def objects(cls) -> DictManager: ...
+    @classmethod
+    def objects(cls) -> type[DictManager]: ...
     @property
     def name(self) -> typing.Optional[str]: ...
     def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...

{modal-1.4.1.dev3 → modal-1.4.1.dev5}/modal/queue.py

@@ -291,7 +291,8 @@ class _Queue(_Object, type_prefix="qu"):
         raise RuntimeError("Queue() is not allowed. Please use `Queue.from_name(...)` or `Queue.ephemeral()` instead.")
 
     @classproperty
-    def objects(cls) -> _QueueManager:
+    @classmethod
+    def objects(cls) -> type[_QueueManager]:
         return _QueueManager
 
     @property

{modal-1.4.1.dev3 → modal-1.4.1.dev5}/modal/queue.pyi

@@ -431,7 +431,8 @@ class _Queue(modal._object._Object):
         ...
 
     @synchronicity.classproperty
-    def objects(cls) -> _QueueManager: ...
+    @classmethod
+    def objects(cls) -> type[_QueueManager]: ...
     @property
     def name(self) -> typing.Optional[str]: ...
     def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
@@ -726,7 +727,8 @@ class Queue(modal.object.Object):
         ...
 
     @synchronicity.classproperty
-    def objects(cls) -> QueueManager: ...
+    @classmethod
+    def objects(cls) -> type[QueueManager]: ...
     @property
     def name(self) -> typing.Optional[str]: ...
     def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...

{modal-1.4.1.dev3 → modal-1.4.1.dev5}/modal/secret.py

@@ -237,7 +237,8 @@ class _Secret(_Object, type_prefix="st"):
     _metadata: Optional[api_pb2.SecretMetadata] = None
 
     @classproperty
-    def objects(cls) -> _SecretManager:
+    @classmethod
+    def objects(cls) -> type[_SecretManager]:
         return _SecretManager
 
     @property

{modal-1.4.1.dev3 → modal-1.4.1.dev5}/modal/secret.pyi

@@ -375,7 +375,8 @@ class _Secret(modal._object._Object):
     _metadata: typing.Optional[modal_proto.api_pb2.SecretMetadata]
 
     @synchronicity.classproperty
-    def objects(cls) -> _SecretManager: ...
+    @classmethod
+    def objects(cls) -> type[_SecretManager]: ...
     @property
     def name(self) -> typing.Optional[str]: ...
     def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
@@ -500,7 +501,8 @@ class Secret(modal.object.Object):
         ...
 
     @synchronicity.classproperty
-    def objects(cls) -> SecretManager: ...
+    @classmethod
+    def objects(cls) -> type[SecretManager]: ...
     @property
     def name(self) -> typing.Optional[str]: ...
     def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...

{modal-1.4.1.dev3 → modal-1.4.1.dev5}/modal/volume.py

@@ -358,7 +358,8 @@ class _Volume(_Object, type_prefix="vo"):
     _read_only: bool = False
 
     @classproperty
-    def objects(cls) -> _VolumeManager:
+    @classmethod
+    def objects(cls) -> type[_VolumeManager]:
         return _VolumeManager
 
     @property

{modal-1.4.1.dev3 → modal-1.4.1.dev5}/modal/volume.pyi

@@ -454,7 +454,8 @@ class _Volume(modal._object._Object):
     _read_only: bool
 
     @synchronicity.classproperty
-    def objects(cls) -> _VolumeManager: ...
+    @classmethod
+    def objects(cls) -> type[_VolumeManager]: ...
     @property
     def name(self) -> typing.Optional[str]: ...
     def read_only(self) -> _Volume:
@@ -789,7 +790,8 @@ class Volume(modal.object.Object):
         ...
 
     @synchronicity.classproperty
-    def objects(cls) -> VolumeManager: ...
+    @classmethod
+    def objects(cls) -> type[VolumeManager]: ...
     @property
     def name(self) -> typing.Optional[str]: ...
     def read_only(self) -> Volume:

{modal-1.4.1.dev3 → modal-1.4.1.dev5}/modal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.4.1.dev3
+Version: 1.4.1.dev5
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License-Expression: Apache-2.0
@@ -23,7 +23,7 @@ Requires-Dist: grpclib<0.4.10,>=0.4.7; python_version < "3.14"
 Requires-Dist: grpclib<0.4.10,>=0.4.9; python_version >= "3.14"
 Requires-Dist: protobuf!=4.24.0,<7.0,>=3.19
 Requires-Dist: rich>=12.0.0
-Requires-Dist: synchronicity~=0.11.1
+Requires-Dist: synchronicity~=0.12.0
 Requires-Dist: toml
 Requires-Dist: typer>=0.9
 Requires-Dist: types-certifi

{modal-1.4.1.dev3 → modal-1.4.1.dev5}/modal.egg-info/requires.txt

@@ -4,7 +4,7 @@ certifi
 click~=8.1
 protobuf!=4.24.0,<7.0,>=3.19
 rich>=12.0.0
-synchronicity~=0.11.1
+synchronicity~=0.12.0
 toml
 typer>=0.9
 types-certifi

{modal-1.4.1.dev3 → modal-1.4.1.dev5}/modal_proto/api_grpc.py

@@ -503,6 +503,10 @@ class ModalClientBase(abc.ABC):
     async def SandboxCreateV2(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxCreateV2Request, modal_proto.api_pb2.SandboxCreateV2Response]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def SandboxGetCommandRouterAccess(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxGetCommandRouterAccessRequest, modal_proto.api_pb2.SandboxGetCommandRouterAccessResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def SandboxGetFromName(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxGetFromNameRequest, modal_proto.api_pb2.SandboxGetFromNameResponse]') -> None:
         pass
@@ -1503,6 +1507,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.SandboxCreateV2Request,
                 modal_proto.api_pb2.SandboxCreateV2Response,
             ),
+            '/modal.client.ModalClient/SandboxGetCommandRouterAccess': grpclib.const.Handler(
+                self.SandboxGetCommandRouterAccess,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.SandboxGetCommandRouterAccessRequest,
+                modal_proto.api_pb2.SandboxGetCommandRouterAccessResponse,
+            ),
             '/modal.client.ModalClient/SandboxGetFromName': grpclib.const.Handler(
                 self.SandboxGetFromName,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -2643,6 +2653,12 @@ class ModalClientStub:
             modal_proto.api_pb2.SandboxCreateV2Request,
             modal_proto.api_pb2.SandboxCreateV2Response,
         )
+        self.SandboxGetCommandRouterAccess = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/SandboxGetCommandRouterAccess',
+            modal_proto.api_pb2.SandboxGetCommandRouterAccessRequest,
+            modal_proto.api_pb2.SandboxGetCommandRouterAccessResponse,
+        )
         self.SandboxGetFromName = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/SandboxGetFromName',