modAL 1.4.4.dev2__py3-none-any.whl → 1.4.4.dev3__py3-none-any.whl

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/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/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.dist-info → modal-1.4.4.dev3.dist-info}/METADATA

@@ -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.dist-info → modal-1.4.4.dev3.dist-info}/RECORD

@@ -28,7 +28,7 @@ modal/app.pyi,sha256=KgYfkXXrwF31zvS0U-O3gpLCyPf-aenwOg_g97eMSoA,54010
 modal/billing.py,sha256=B2zXa7KeMnpqi2AQINycEk-KSXVYaLTTTAQTtuf2Gfs,257
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=jjT4eLFHGcvIF6Xw4kPptIx-VmExtphRN8XJ1JA7fWI,15502
-modal/client.pyi,sha256=qJl4Q-34RQzDTmRCxfibQ4yl123ydSag9AXVc9OuYJI,15701
+modal/client.pyi,sha256=fsgU-pW7wYdAsVWd9YYUMyLI-6zM2V23xy0xhMQCSSI,15701
 modal/cloud_bucket_mount.py,sha256=KkaJVy5vpO_u2NtDYtv1JM-M3y4J0UtWBapTDKpQRcA,6034
 modal/cloud_bucket_mount.pyi,sha256=mGDeEd1XvxGpCE6O5jRBSfIvMXvZ5AtIybea5k-0w9w,7560
 modal/cls.py,sha256=UTtp9W3SuFIbkYEE2D94SUzKiMXM5BYgfHGzBQD6CEk,38304
@@ -45,7 +45,7 @@ modal/file_io.py,sha256=DYQXrPUNkKG-0lyzc81E3rh7g56Fg5y6eIQkTqhfqbU,22015
 modal/file_io.pyi,sha256=DPaq0BhySaiCX3g56QHhyIMdU1izbfWsjpSp30JoJUU,15745
 modal/file_pattern_matcher.py,sha256=A_Kdkej6q7YQyhM_2-BvpFmPqJ0oHb54B6yf9VqvPVE,8116
 modal/functions.py,sha256=EZRcHFfnoYbvawUJnAHF5nIvoo9GX2Djy7mUmOCXmXc,258
-modal/functions.pyi,sha256=oQbuXhpMhPmOvDK5YvDaC19iGqa_gbtPG8yTe8MOhz4,37940
+modal/functions.pyi,sha256=2iAOMlEZcKsDyTR1xay1gRpSw5VuhT_pE2beT75A_Ro,37940
 modal/image.py,sha256=1iHT8KmdWtvIfusupTf_AJGBMUI4PQuAciBp-f_uYL0,113221
 modal/image.pyi,sha256=FUAY23rnaUmpRBVazrzh3Z3b9tYTMikbyk2SbuIpihI,81004
 modal/io_streams.py,sha256=15dSqTktIFvqANRDO8pjFjuwgybGAdRBorEM-3ag-fw,25000
@@ -128,7 +128,7 @@ modal/_utils/pattern_utils.py,sha256=ZUffaECfe2iYBhH6cvCB-0-UWhmEBTZEl_TwG_So3ag
 modal/_utils/rand_pb_testing.py,sha256=OYfbSeEXNMgwy-nAi4hHbgZdb08Ss3BV6TyJp6-gwNs,4360
 modal/_utils/sandbox_fs_utils.py,sha256=lfYcYA8wQgnUWtSC0UxRzrEThFWOY5ppuA0GJeYzhrg,13914
 modal/_utils/shell_utils.py,sha256=GjMrO1YxnBr4_UlpA2ZYQKCHxV78QTg0mqxAMHWGTE4,3427
-modal/_utils/task_command_router_client.py,sha256=O116m39h569JgpF8w5zA3g9UzWJcsRKYKNG08Wcyaac,31510
+modal/_utils/task_command_router_client.py,sha256=3WZXS9wljwOg7aYmFJkzCSMsrLw1POa2s4KPQ06J9H0,31967
 modal/_utils/time_utils.py,sha256=PBMHCGzysBVaEnsjc0BSf0bPdSOSXeV11rtTAu5vvus,8451
 modal/_vendor/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
 modal/_vendor/a2wsgi_wsgi.py,sha256=Q1AsjpV_Q_vzQsz_cSqmP9jWzsGsB-ARFU6vpQYml8k,21878
@@ -178,7 +178,7 @@ modal/experimental/__init__.py,sha256=Wb1YoAKAnNxH_0c2wA0T12I7bSu9PSO2nS_LuLska7
 modal/experimental/flash.py,sha256=3k7Co0JrrVMjUQxTmi1VPXJX4jgRWetlAJnwm_kxhqg,34301
 modal/experimental/flash.pyi,sha256=lpTqJFZRMGWscw0xpYZVdBMnAYjj16asXE4_64A6itQ,17774
 modal/experimental/ipython.py,sha256=TrCfmol9LGsRZMeDoeMPx3Hv3BFqQhYnmD_iH0pqdhk,2904
-modal-1.4.4.dev2.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.4.4.dev3.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=bfUSLscHfoQoKkKjIqJvQMe3fURzqcQK7gF1h9WQLtM,3742
 modal_docs/gen_cli_docs_main.py,sha256=UPGr7O1DYTIRLwfINe2rbdh89J3cPVTU1OWL-SjxnOQ,198
@@ -188,22 +188,22 @@ modal_docs/mdmd/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,2
 modal_docs/mdmd/mdmd.py,sha256=z9T3lMktTq3N4r6T6MSSyw8lebbqKc3Igw8l9EdMJNM,9998
 modal_docs/mdmd/signatures.py,sha256=XJaZrK7Mdepk5fdX51A8uENiLFNil85Ud0d4MH8H5f0,3218
 modal_proto/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
-modal_proto/api_grpc.py,sha256=4ErwJFcD3jPUKXX_HHRgthaqgfTOq8dLqiB8ZohGXFg,154654
-modal_proto/api_pb2.py,sha256=4n_hmurYrvGZnuq-80RoXicuiGQohzK6RHvrhjGYaaA,434801
-modal_proto/api_pb2.pyi,sha256=pgb-ocPukY-knn-zjdDgNuClDWzUedS7oxd3nlEEZac,609680
-modal_proto/api_pb2_grpc.py,sha256=S4oYGdOi1gQlVugQ9zCvZUCRZp-F79cUmVw3op4by8I,333121
-modal_proto/api_pb2_grpc.pyi,sha256=Gljc73MSstLm_wnNroCcjr39hizIFgePwLTJGnxf5XU,77806
-modal_proto/modal_api_grpc.py,sha256=FZWpz-qO42QM_9IZTvzrn2GHrKWn48HLZBV8_IqEVUs,24405
+modal_proto/api_grpc.py,sha256=XR3Roql3A9T8ADCLVtB9K7gI9BpdU3wUti7GXfb416o,155400
+modal_proto/api_pb2.py,sha256=UMPzLtzLSC73C3Pu3grYa-EXukoteTL8qaBy7jKiMuQ,437864
+modal_proto/api_pb2.pyi,sha256=gmCP0hULNx0uEg2Tr4EKs9M3tdM51SqpYzJbT1rzoDM,612780
+modal_proto/api_pb2_grpc.py,sha256=F9j1jMfVDXpzgo8341GdvdwclTI8iCyi-yFpWtwM11s,334754
+modal_proto/api_pb2_grpc.pyi,sha256=lXX9bu15Bn2rPrTnTky26gZgB2LBHyYRc4LmfcitJEc,78171
+modal_proto/modal_api_grpc.py,sha256=6rZCAcGpgkzO6Sms-1-3fEoB0QBqJwH8t_VgXX8k6ec,24517
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal_proto/task_command_router_grpc.py,sha256=VWwYwMSfCt7Yy-u8RNrr3swODsBvUw2FyYczbw-wuwo,17438
 modal_proto/task_command_router_pb2.py,sha256=-K4H-C7N-ILpdvFyM4PQMZcGZvXV1J89mfycupxxCvU,33745
 modal_proto/task_command_router_pb2.pyi,sha256=KNM7lPtngiv0_Ni_1zRg1rl65ynyjN8vpzd3XISxMGo,37281
 modal_proto/task_command_router_pb2_grpc.py,sha256=368j8b_h19L7bidFTRGSdSG4bK0zU9Y_Oq46_B2ACDg,34666
 modal_proto/task_command_router_pb2_grpc.pyi,sha256=PbzkCj-uSlN1inYSdhncPQ1-04vhBnj3Wzvb-D2pLHY,11226
-modal_version/__init__.py,sha256=vE84STAXPQrjZmrV3-mDuxe5RE2Swoscu7BMcmoCuc4,120
+modal_version/__init__.py,sha256=sIAKAF42X0xUrzlVP6HK9Mh15JlIsAylz--jiJsbXrI,120
 modal_version/__main__.py,sha256=nLUbubxKx7GXNzJIkTB7M7_u8080LyLM0IS0rzFkC_c,119
-modal-1.4.4.dev2.dist-info/METADATA,sha256=CaZD4-sP2z3FDBranHmUjeK-P3DvwLdaHfVg_FeHzTs,2338
-modal-1.4.4.dev2.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-1.4.4.dev2.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.4.4.dev2.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.4.4.dev2.dist-info/RECORD,,
+modal-1.4.4.dev3.dist-info/METADATA,sha256=7aMGikjhT0UDXp_CTCYX0oSebpOGdrwD7mjDe70aLKg,2338
+modal-1.4.4.dev3.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-1.4.4.dev3.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.4.4.dev3.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.4.4.dev3.dist-info/RECORD,,

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',