modal 1.4.4.dev2__tar.gz → 1.4.4.dev3__tar.gz

{modal-1.4.4.dev2 → modal-1.4.4.dev3}/PKG-INFO

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

{modal-1.4.4.dev2 → modal-1.4.4.dev3}/modal/_utils/task_command_router_client.py

@@ -193,18 +193,25 @@ class TaskCommandRouterClient:
     ) -> "TaskCommandRouterClient":
         """Build a connected client from a jwt and url."""
         o = urllib.parse.urlparse(url)
-        if o.scheme != "https":
+        is_localhost_client = server_client._is_localhost
+        if o.scheme == "http":
+            # plain http serving should only be used for unit tests
+            if not is_localhost_client:
+                raise ValueError(f"Task router URL must be https, got: {url}")
+            ssl_context = None
+        elif o.scheme == "https":
+            ssl_context = ssl.create_default_context()
+            if is_localhost_client:
+                # Allow insecure TLS when the Modal server client points to localhost
+                # This is typically triggered from local e2e testing
+                logger.warning("Using insecure TLS for task command router because server client points to localhost")
+                ssl_context.check_hostname = False
+                ssl_context.verify_mode = ssl.CERT_NONE
+        else:
             raise ValueError(f"Task router URL must be https, got: {url}")
 
         host, _, port_str = o.netloc.partition(":")
-        port = int(port_str) if port_str else 443
-        ssl_context = ssl.create_default_context()
-
-        # Allow insecure TLS when explicitly enabled via config.
-        if server_client._is_localhost:
-            logger.warning("Using insecure TLS for task command router because server client points to localhost")
-            ssl_context.check_hostname = False
-            ssl_context.verify_mode = ssl.CERT_NONE
+        port = int(port_str) if port_str else (443 if o.scheme == "https" else 80)
 
         channel = PermanentCloseableChannel(
             host,

{modal-1.4.4.dev2 → modal-1.4.4.dev3}/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.4.dev2",
+        version: str = "1.4.4.dev3",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -175,7 +175,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.4.4.dev2",
+        version: str = "1.4.4.dev3",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.4.4.dev2 → modal-1.4.4.dev3}/modal/functions.pyi

@@ -421,7 +421,7 @@ class Function(
 
     _call_generator: ___call_generator_spec
 
-    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_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."""
             ...
@@ -430,7 +430,7 @@ class Function(
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
 
-    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType]
+    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P]
 
     class __remote_gen_spec(typing_extensions.Protocol):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -457,7 +457,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_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.
 
@@ -480,7 +480,7 @@ class Function(
             """
             ...
 
-    _experimental_spawn: ___experimental_spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    _experimental_spawn: ___experimental_spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> None: ...
@@ -488,7 +488,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P]
 
-    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_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.
 
@@ -509,7 +509,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function."""

{modal-1.4.4.dev2 → modal-1.4.4.dev3}/modal.egg-info/PKG-INFO

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

{modal-1.4.4.dev2 → modal-1.4.4.dev3}/modal_proto/api_grpc.py

@@ -267,6 +267,10 @@ class ModalClientBase(abc.ABC):
     async def EndpointList(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EndpointListRequest, modal_proto.api_pb2.EndpointListResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def EndpointStop(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EndpointStopRequest, modal_proto.api_pb2.EndpointStopResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def EnvironmentCreate(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EnvironmentCreateRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
@@ -1193,6 +1197,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.EndpointListRequest,
                 modal_proto.api_pb2.EndpointListResponse,
             ),
+            '/modal.client.ModalClient/EndpointStop': grpclib.const.Handler(
+                self.EndpointStop,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.EndpointStopRequest,
+                modal_proto.api_pb2.EndpointStopResponse,
+            ),
             '/modal.client.ModalClient/EnvironmentCreate': grpclib.const.Handler(
                 self.EnvironmentCreate,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -2399,6 +2409,12 @@ class ModalClientStub:
             modal_proto.api_pb2.EndpointListRequest,
             modal_proto.api_pb2.EndpointListResponse,
         )
+        self.EndpointStop = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/EndpointStop',
+            modal_proto.api_pb2.EndpointStopRequest,
+            modal_proto.api_pb2.EndpointStopResponse,
+        )
         self.EnvironmentCreate = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/EnvironmentCreate',