modal 1.1.5.dev66__py3-none-any.whl → 1.3.1.dev8__py3-none-any.whl

modal/client.pyi

@@ -5,7 +5,6 @@ import google.protobuf.message
 import grpclib.client
 import modal._utils.async_utils
 import modal._utils.auth_token_manager
-import modal_proto.api_grpc
 import modal_proto.modal_api_grpc
 import synchronicity.combined_types
 import typing
@@ -23,17 +22,18 @@ class _Client:
     _client_from_env: typing.ClassVar[typing.Optional[_Client]]
     _client_from_env_lock: typing.ClassVar[typing.Optional[asyncio.locks.Lock]]
     _cancellation_context: modal._utils.async_utils.TaskContext
-    _cancellation_context_event_loop: asyncio.events.AbstractEventLoop
-    _stub: typing.Optional[modal_proto.api_grpc.ModalClientStub]
-    _auth_token_manager: modal._utils.auth_token_manager._AuthTokenManager
+    _cancellation_context_event_loop: typing.Optional[asyncio.events.AbstractEventLoop]
+    _stub: typing.Optional[modal_proto.modal_api_grpc.ModalClientModal]
+    _auth_token_manager: typing.Optional[modal._utils.auth_token_manager._AuthTokenManager]
     _snapshotted: bool
+    client_type: int
 
     def __init__(
         self,
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.1.5.dev66",
+        version: str = "1.3.1.dev8",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -148,23 +148,22 @@ class _Client:
         ],
     ) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
 
-SUPERSELF = typing.TypeVar("SUPERSELF", covariant=True)
-
 class Client:
     _client_from_env: typing.ClassVar[typing.Optional[Client]]
     _client_from_env_lock: typing.ClassVar[typing.Optional[asyncio.locks.Lock]]
     _cancellation_context: modal._utils.async_utils.TaskContext
-    _cancellation_context_event_loop: asyncio.events.AbstractEventLoop
-    _stub: typing.Optional[modal_proto.api_grpc.ModalClientStub]
-    _auth_token_manager: modal._utils.auth_token_manager._AuthTokenManager
+    _cancellation_context_event_loop: typing.Optional[asyncio.events.AbstractEventLoop]
+    _stub: typing.Optional[modal_proto.modal_api_grpc.ModalClientModal]
+    _auth_token_manager: typing.Optional[modal._utils.auth_token_manager._AuthTokenManager]
     _snapshotted: bool
+    client_type: int
 
     def __init__(
         self,
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.1.5.dev66",
+        version: str = "1.3.1.dev8",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -184,7 +183,7 @@ class Client:
         """
         ...
 
-    class __get_stub_spec(typing_extensions.Protocol[SUPERSELF]):
+    class __get_stub_spec(typing_extensions.Protocol):
         def __call__(self, /, server_url: str) -> modal_proto.modal_api_grpc.ModalClientModal:
             """mdmd:hidden
             Get a stub for a specific server URL. Stubs can safely be used across forks / client snapshots.
@@ -207,21 +206,21 @@ class Client:
             """
             ...
 
-    get_stub: __get_stub_spec[typing_extensions.Self]
+    get_stub: __get_stub_spec
 
-    class ___open_spec(typing_extensions.Protocol[SUPERSELF]):
+    class ___open_spec(typing_extensions.Protocol):
         def __call__(self, /): ...
         async def aio(self, /): ...
 
-    _open: ___open_spec[typing_extensions.Self]
+    _open: ___open_spec
 
-    class ___close_spec(typing_extensions.Protocol[SUPERSELF]):
+    class ___close_spec(typing_extensions.Protocol):
         def __call__(self, /, prep_for_restore: bool = False): ...
         async def aio(self, /, prep_for_restore: bool = False): ...
 
-    _close: ___close_spec[typing_extensions.Self]
+    _close: ___close_spec
 
-    class __hello_spec(typing_extensions.Protocol[SUPERSELF]):
+    class __hello_spec(typing_extensions.Protocol):
         def __call__(self, /):
             """Connect to server and retrieve version information; raise appropriate error for various failures."""
             ...
@@ -230,59 +229,99 @@ class Client:
             """Connect to server and retrieve version information; raise appropriate error for various failures."""
             ...
 
-    hello: __hello_spec[typing_extensions.Self]
+    hello: __hello_spec
 
     def __enter__(self): ...
     async def __aenter__(self): ...
     def __exit__(self, exc_type, exc, tb): ...
     async def __aexit__(self, exc_type, exc, tb): ...
-    @classmethod
-    def anonymous(cls, server_url: str) -> synchronicity.combined_types.AsyncAndBlockingContextManager[Client]:
-        """mdmd:hidden
-        Create a connection with no credentials; to be used for token creation.
-        """
-        ...
 
-    @classmethod
-    def from_env(cls, _override_config=None) -> Client:
-        """mdmd:hidden
-        Singleton that is instantiated from the Modal config and reused on subsequent calls.
-        """
-        ...
+    class __anonymous_spec(typing_extensions.Protocol):
+        def __call__(self, /, server_url: str) -> synchronicity.combined_types.AsyncAndBlockingContextManager[Client]:
+            """mdmd:hidden
+            Create a connection with no credentials; to be used for token creation.
+            """
+            ...
 
-    @classmethod
-    def from_credentials(cls, token_id: str, token_secret: str) -> Client:
-        """Constructor based on token credentials; useful for managing Modal on behalf of third-party users.
+        def aio(self, /, server_url: str) -> typing.AsyncContextManager[Client]:
+            """mdmd:hidden
+            Create a connection with no credentials; to be used for token creation.
+            """
+            ...
 
-        **Usage:**
+    anonymous: typing.ClassVar[__anonymous_spec]
 
-        ```python notest
-        client = modal.Client.from_credentials("my_token_id", "my_token_secret")
+    class __from_env_spec(typing_extensions.Protocol):
+        def __call__(self, /, _override_config=None) -> Client:
+            """mdmd:hidden
+            Singleton that is instantiated from the Modal config and reused on subsequent calls.
+            """
+            ...
 
-        modal.Sandbox.create("echo", "hi", client=client, app=app)
-        ```
-        """
-        ...
+        async def aio(self, /, _override_config=None) -> Client:
+            """mdmd:hidden
+            Singleton that is instantiated from the Modal config and reused on subsequent calls.
+            """
+            ...
 
-    @classmethod
-    def verify(cls, server_url: str, credentials: tuple[str, str]) -> None:
-        """mdmd:hidden
-        Check whether can the client can connect to this server with these credentials; raise if not.
-        """
-        ...
+    from_env: typing.ClassVar[__from_env_spec]
+
+    class __from_credentials_spec(typing_extensions.Protocol):
+        def __call__(self, /, token_id: str, token_secret: str) -> Client:
+            """Constructor based on token credentials; useful for managing Modal on behalf of third-party users.
+
+            **Usage:**
+
+            ```python notest
+            client = modal.Client.from_credentials("my_token_id", "my_token_secret")
+
+            modal.Sandbox.create("echo", "hi", client=client, app=app)
+            ```
+            """
+            ...
+
+        async def aio(self, /, token_id: str, token_secret: str) -> Client:
+            """Constructor based on token credentials; useful for managing Modal on behalf of third-party users.
+
+            **Usage:**
+
+            ```python notest
+            client = modal.Client.from_credentials("my_token_id", "my_token_secret")
+
+            modal.Sandbox.create("echo", "hi", client=client, app=app)
+            ```
+            """
+            ...
+
+    from_credentials: typing.ClassVar[__from_credentials_spec]
+
+    class __verify_spec(typing_extensions.Protocol):
+        def __call__(self, /, server_url: str, credentials: tuple[str, str]) -> None:
+            """mdmd:hidden
+            Check whether can the client can connect to this server with these credentials; raise if not.
+            """
+            ...
+
+        async def aio(self, /, server_url: str, credentials: tuple[str, str]) -> None:
+            """mdmd:hidden
+            Check whether can the client can connect to this server with these credentials; raise if not.
+            """
+            ...
+
+    verify: typing.ClassVar[__verify_spec]
 
     @classmethod
     def set_env_client(cls, client: typing.Optional[Client]):
         """mdmd:hidden"""
         ...
 
-    class __get_input_plane_metadata_spec(typing_extensions.Protocol[SUPERSELF]):
+    class __get_input_plane_metadata_spec(typing_extensions.Protocol):
         def __call__(self, /, input_plane_region: str) -> list[tuple[str, str]]: ...
         async def aio(self, /, input_plane_region: str) -> list[tuple[str, str]]: ...
 
-    get_input_plane_metadata: __get_input_plane_metadata_spec[typing_extensions.Self]
+    get_input_plane_metadata: __get_input_plane_metadata_spec
 
-    class ___call_safely_spec(typing_extensions.Protocol[SUPERSELF]):
+    class ___call_safely_spec(typing_extensions.Protocol):
         def __call__(self, /, coro, readable_method: str):
             """Runs coroutine wrapped in a task that's part of the client's task context
 
@@ -301,19 +340,19 @@ class Client:
             """
             ...
 
-    _call_safely: ___call_safely_spec[typing_extensions.Self]
+    _call_safely: ___call_safely_spec
 
-    class ___reset_on_pid_change_spec(typing_extensions.Protocol[SUPERSELF]):
+    class ___reset_on_pid_change_spec(typing_extensions.Protocol):
         def __call__(self, /): ...
         async def aio(self, /): ...
 
-    _reset_on_pid_change: ___reset_on_pid_change_spec[typing_extensions.Self]
+    _reset_on_pid_change: ___reset_on_pid_change_spec
 
-    class ___get_channel_spec(typing_extensions.Protocol[SUPERSELF]):
+    class ___get_channel_spec(typing_extensions.Protocol):
         def __call__(self, /, server_url: str) -> grpclib.client.Channel: ...
         async def aio(self, /, server_url: str) -> grpclib.client.Channel: ...
 
-    _get_channel: ___get_channel_spec[typing_extensions.Self]
+    _get_channel: ___get_channel_spec
 
     async def _call_unary(
         self,
@@ -339,95 +378,6 @@ class Client:
         ],
     ) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
 
-class grpc_error_converter:
-    def __enter__(self): ...
-    def __exit__(self, exc_type, exc, traceback) -> bool: ...
-
-class UnaryUnaryWrapper(typing.Generic[RequestType, ResponseType]):
-    """Abstract base class for generic types.
-
-    A generic type is typically declared by inheriting from
-    this class parameterized with one or more type variables.
-    For example, a generic mapping type might be defined as::
-
-      class Mapping(Generic[KT, VT]):
-          def __getitem__(self, key: KT) -> VT:
-              ...
-          # Etc.
-
-    This class can then be used as follows::
-
-      def lookup_name(mapping: Mapping[KT, VT], key: KT, default: VT) -> VT:
-          try:
-              return mapping[key]
-          except KeyError:
-              return default
-    """
-
-    wrapped_method: grpclib.client.UnaryUnaryMethod[RequestType, ResponseType]
-    client: _Client
-
-    def __init__(
-        self,
-        wrapped_method: grpclib.client.UnaryUnaryMethod[RequestType, ResponseType],
-        client: _Client,
-        server_url: str,
-    ):
-        """Initialize self.  See help(type(self)) for accurate signature."""
-        ...
-
-    @property
-    def name(self) -> str: ...
-    async def __call__(
-        self,
-        req: RequestType,
-        *,
-        timeout: typing.Optional[float] = None,
-        metadata: typing.Union[
-            collections.abc.Mapping[str, typing.Union[str, bytes]],
-            collections.abc.Collection[tuple[str, typing.Union[str, bytes]]],
-            None,
-        ] = None,
-    ) -> ResponseType:
-        """Call self as a function."""
-        ...
-
-class UnaryStreamWrapper(typing.Generic[RequestType, ResponseType]):
-    """Abstract base class for generic types.
-
-    A generic type is typically declared by inheriting from
-    this class parameterized with one or more type variables.
-    For example, a generic mapping type might be defined as::
-
-      class Mapping(Generic[KT, VT]):
-          def __getitem__(self, key: KT) -> VT:
-              ...
-          # Etc.
-
-    This class can then be used as follows::
-
-      def lookup_name(mapping: Mapping[KT, VT], key: KT, default: VT) -> VT:
-          try:
-              return mapping[key]
-          except KeyError:
-              return default
-    """
-
-    wrapped_method: grpclib.client.UnaryStreamMethod[RequestType, ResponseType]
-
-    def __init__(
-        self,
-        wrapped_method: grpclib.client.UnaryStreamMethod[RequestType, ResponseType],
-        client: _Client,
-        server_url: str,
-    ):
-        """Initialize self.  See help(type(self)) for accurate signature."""
-        ...
-
-    @property
-    def name(self) -> str: ...
-    def unary_stream(self, request, metadata: typing.Optional[typing.Any] = None): ...
-
 HEARTBEAT_INTERVAL: float
 
 HEARTBEAT_TIMEOUT: float

modal/cloud_bucket_mount.py

@@ -117,6 +117,7 @@ class _CloudBucketMount:
 
     read_only: bool = False
     requester_pays: bool = False
+    force_path_style: bool = False
 
 
 def cloud_bucket_mounts_to_proto(mounts: Sequence[tuple[str, _CloudBucketMount]]) -> list[api_pb2.CloudBucketMount]:
@@ -132,7 +133,7 @@ def cloud_bucket_mounts_to_proto(mounts: Sequence[tuple[str, _CloudBucketMount]]
             elif parse_result.hostname.endswith("storage.googleapis.com"):
                 bucket_type = api_pb2.CloudBucketMount.BucketType.GCP
             else:
-                logger.warning(
+                logger.info(
                     "CloudBucketMount received unrecognized bucket endpoint URL. "
                     "Assuming AWS S3 configuration as fallback."
                 )
@@ -159,6 +160,7 @@ def cloud_bucket_mounts_to_proto(mounts: Sequence[tuple[str, _CloudBucketMount]]
             requester_pays=mount.requester_pays,
             key_prefix=key_prefix,
             oidc_auth_role_arn=mount.oidc_auth_role_arn,
+            force_path_style=mount.force_path_style,
         )
         cloud_bucket_mounts.append(cloud_bucket_mount)
 

modal/cloud_bucket_mount.pyi

@@ -99,6 +99,7 @@ class _CloudBucketMount:
     oidc_auth_role_arn: typing.Optional[str]
     read_only: bool
     requester_pays: bool
+    force_path_style: bool
 
     def __init__(
         self,
@@ -109,6 +110,7 @@ class _CloudBucketMount:
         oidc_auth_role_arn: typing.Optional[str] = None,
         read_only: bool = False,
         requester_pays: bool = False,
+        force_path_style: bool = False,
     ) -> None:
         """Initialize self.  See help(type(self)) for accurate signature."""
         ...
@@ -224,6 +226,7 @@ class CloudBucketMount:
     oidc_auth_role_arn: typing.Optional[str]
     read_only: bool
     requester_pays: bool
+    force_path_style: bool
 
     def __init__(
         self,
@@ -234,6 +237,7 @@ class CloudBucketMount:
         oidc_auth_role_arn: typing.Optional[str] = None,
         read_only: bool = False,
         requester_pays: bool = False,
+        force_path_style: bool = False,
     ) -> None: ...
     def __repr__(self): ...
     def __eq__(self, other): ...