modal 0.73.167__py3-none-any.whl → 0.73.169__py3-none-any.whl

modal/_container_entrypoint.py

@@ -33,7 +33,6 @@ from modal._partial_function import (
     _find_callables_for_obj,
     _PartialFunctionFlags,
 )
-from modal._proxy_tunnel import proxy_tunnel
 from modal._serialization import deserialize_params
 from modal._utils.async_utils import TaskContext, synchronizer
 from modal._utils.function_utils import (
@@ -586,11 +585,9 @@ if __name__ == "__main__":
     client = Client.from_env()
 
     try:
-        with proxy_tunnel(container_args.proxy_info):
-            try:
-                main(container_args, client)
-            except UserException:
-                logger.info("User exception caught, exiting")
+        main(container_args, client)
+    except UserException:
+        logger.info("User exception caught, exiting")
     except KeyboardInterrupt:
         logger.debug("Container: interrupted")
 

modal/_functions.py

@@ -530,12 +530,6 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             if is_generator:
                 raise InvalidError("Generator functions do not support retries.")
 
-        if proxy:
-            # HACK: remove this once we stop using ssh tunnels for this.
-            if image:
-                # TODO(elias): this will cause an error if users use prior `.add_local_*` commands without copy=True
-                image = image.apt_install("autossh")
-
         function_spec = _FunctionSpec(
             mounts=all_mounts,
             secrets=secrets,

modal/client.pyi

@@ -31,7 +31,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "0.73.167",
+        version: str = "0.73.169",
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -93,7 +93,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "0.73.167",
+        version: str = "0.73.169",
     ): ...
     def is_closed(self) -> bool: ...
     @property

modal/parallel_map.py

@@ -41,7 +41,8 @@ if typing.TYPE_CHECKING:
 # pump_inputs should retry if it receives any of the standard retryable codes plus RESOURCE_EXHAUSTED.
 PUMP_INPUTS_RETRYABLE_GRPC_STATUS_CODES = RETRYABLE_GRPC_STATUS_CODES + [Status.RESOURCE_EXHAUSTED]
 PUMP_INPUTS_MAX_RETRIES = 8
-PUMP_INPUTS_MAX_RETRY_DELAY=15
+PUMP_INPUTS_MAX_RETRY_DELAY = 15
+
 
 class _SynchronizedQueue:
     """mdmd:hidden"""
@@ -357,6 +358,7 @@ async def _map_invocation(
                 f"retried_outputs={retried_outputs} input_queue_size={input_queue.qsize()} "
                 f"retry_queue_size={retry_queue.qsize()} map_items_manager={len(map_items_manager)}"
             )
+
         while True:
             log_stats()
             try:
@@ -401,7 +403,7 @@ def _map_sync(
         assert list(my_func.map([1, 2, 3, 4])) == [1, 4, 9, 16]
     ```
 
-    If applied to a `stub.function`, `map()` returns one result per input and the output order
+    If applied to a `app.function`, `map()` returns one result per input and the output order
     is guaranteed to be the same as the input order. Set `order_outputs=False` to return results
     in the order that they are completed instead.
 
@@ -570,6 +572,7 @@ class _MapItemState(enum.Enum):
     # The output has been received and was either successful, or failed with no more retries remaining.
     COMPLETE = 5
 
+
 class _OutputType(enum.Enum):
     SUCCESSFUL_COMPLETION = 1
     FAILED_COMPLETION = 2
@@ -578,11 +581,12 @@ class _OutputType(enum.Enum):
     STALE_RETRY_DUPLICATE = 5
     NO_CONTEXT_DUPLICATE = 6
 
+
 class _MapItemContext:
     state: _MapItemState
     input: api_pb2.FunctionInput
     retry_manager: RetryManager
-    sync_client_retries_enabled:bool
+    sync_client_retries_enabled: bool
     # Both these futures are strings. Omitting generic type because
     # it causes an error when running `inv protoc type-stubs`.
     input_id: asyncio.Future
@@ -701,8 +705,7 @@ class _MapItemsManager:
         function_call_invocation_type: "api_pb2.FunctionCallInvocationType.ValueType",
         retry_queue: TimestampPriorityQueue,
         sync_client_retries_enabled: bool,
-        max_inputs_outstanding: int
-
+        max_inputs_outstanding: int,
     ):
         self._retry_policy = retry_policy
         self.function_call_invocation_type = function_call_invocation_type

{modal-0.73.167.dist-info → modal-0.73.169.dist-info}/METADATA

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

{modal-0.73.167.dist-info → modal-0.73.169.dist-info}/RECORD

@@ -2,14 +2,13 @@ modal/__init__.py,sha256=7wz1AT_bpWJJEzXsAo3QMb7i87y7UGXwfneb0bGDhRg,2502
 modal/__main__.py,sha256=CgIjP8m1xJjjd4AXc-delmR6LdBCZclw2A_V38CFIio,2870
 modal/_clustered_functions.py,sha256=kTf-9YBXY88NutC1akI-gCbvf01RhMPCw-zoOI_YIUE,2700
 modal/_clustered_functions.pyi,sha256=vllkegc99A0jrUOWa8mdlSbdp6uz36TsHhGxysAOpaQ,771
-modal/_container_entrypoint.py,sha256=85KptUAmlftjHR-mpl32H5deATqqDrRWp0Z1XrKmWyk,29166
-modal/_functions.py,sha256=M94gzMA9xfW9086djoG2yYFVihcslKnsleacmNbVrG0,74996
+modal/_container_entrypoint.py,sha256=PVs5WDgm0_vZlECf_Ga58L49zceTMKPlUA10YRpPmy8,29026
+modal/_functions.py,sha256=EoJ2IbApVoJYELjB0KvXwRV2J6jElhwGHzTbXbXef6A,74712
 modal/_ipython.py,sha256=TW1fkVOmZL3YYqdS2YlM1hqpf654Yf8ZyybHdBnlhSw,301
 modal/_location.py,sha256=joiX-0ZeutEUDTrrqLF1GHXCdVLF-rHzstocbMcd_-k,366
 modal/_object.py,sha256=JBIECWdfpRKCaCxVWZbC3Q1kF5Whk_EKvY9f4Y6AFyg,11446
 modal/_output.py,sha256=Z0nngPh2mKHMQc4MQ92YjVPc3ewOLa3I4dFBlL9nvQY,25656
 modal/_partial_function.py,sha256=8mmd5lvjZaC7qi0KAnLR1H590MlxNslAE2_Kr9biJUA,39704
-modal/_proxy_tunnel.py,sha256=gnKyCfmVB7x2d1A6c-JDysNIP3kEFxmXzhcXhPrzPn0,1906
 modal/_pty.py,sha256=JZfPDDpzqICZqtyPI_oMJf_9w-p_lLNuzHhwhodUXio,1329
 modal/_resolver.py,sha256=RtoXoYzSllPlFu0D1vel_FWiEmDO7RyToiC2bxeN8ZY,6917
 modal/_resources.py,sha256=5qmcirXUI8dSH926nwkUaeX9H25mqYu9mXD_KuT79-o,1733
@@ -23,7 +22,7 @@ modal/app.py,sha256=bJp7W3liuVG2VwWkG31tMFogDh84EKppzP8YJFWl3eQ,48140
 modal/app.pyi,sha256=SkqXNrdnGIZ4MmNNvpGtzNLoUdyuvi9IjQQR_DRiRHk,26968
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=U-YKSw0n7J1ZLREt9cbEJCtmHe5YoPKFxl0xlkan2yc,15565
-modal/client.pyi,sha256=AGcVcEelqx_X_Jfb4xfzqsQLTEdabMRN3AWICFkwqc8,7661
+modal/client.pyi,sha256=OPhN2duy3E59Cd0XH_KxhMf2Asehk37vBruSo_mJEZ8,7661
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
 modal/cls.py,sha256=x3CUDPC-QK7pa9E2eiFsiCS2ULvVi8UzNZQw1i9drsU,32945
@@ -53,7 +52,7 @@ modal/network_file_system.pyi,sha256=4N3eqMbTSlqmS8VV_aJK-uvrgJC8xnf_YtW5FHfRfc8
 modal/object.py,sha256=bTeskuY8JFrESjU4_UL_nTwYlBQdOLmVaOX3X6EMxsg,164
 modal/object.pyi,sha256=kyJkRQcVv3ct7zSAxvvXcuhBVeH914v80uSlqeS7cA4,5632
 modal/output.py,sha256=q4T9uHduunj4NwY-YSwkHGgjZlCXMuJbfQ5UFaAGRAc,1968
-modal/parallel_map.py,sha256=p9dklKZTxYCFb7szYWqTGjPZ-Yikvm6OFhU3JNoiTB4,33850
+modal/parallel_map.py,sha256=NN48Xg_qzbL4lbw781-t1HDV19w8lib8-9HofoAKxh4,33856
 modal/parallel_map.pyi,sha256=mEenHruPiZDq3ucV_6RM8ctc0c_Qpqra5MBagXeHiiQ,5708
 modal/partial_function.py,sha256=SwuAAj2wj4SO6F6nkSnwNZrczEmm9w9YdlQTHh6hr04,1195
 modal/partial_function.pyi,sha256=NFWz1aCAs2B3-GnPf1cTatWRZOLnYpFKCnjP_X9iNRs,6411
@@ -146,7 +145,7 @@ modal/requirements/2024.10.txt,sha256=qD-5cVIVM9wXesJ6JC89Ew-3m2KjEElUz3jaw_MddR
 modal/requirements/PREVIEW.txt,sha256=qD-5cVIVM9wXesJ6JC89Ew-3m2KjEElUz3jaw_MddRo,296
 modal/requirements/README.md,sha256=9tK76KP0Uph7O0M5oUgsSwEZDj5y-dcUPsnpR0Sc-Ik,854
 modal/requirements/base-images.json,sha256=57vMSqzMbLBxw5tFWSaMiIkkVEps4JfX5PAtXGnkS4U,740
-modal-0.73.167.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.73.169.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=c1yfBS_x--gL5bs0N4ihMwqwX8l3IBWSkBAKNNIi6bQ,3801
 modal_docs/gen_reference_docs.py,sha256=cvTgltucqYLLIX84QxAwf51Z5Vc2n6cLxS8VcrxNCAo,6401
@@ -171,9 +170,9 @@ modal_proto/options_pb2_grpc.pyi,sha256=CImmhxHsYnF09iENPoe8S4J-n93jtgUYD2JPAc0y
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal_version/__init__.py,sha256=wiJQ53c-OMs0Xf1UeXOxQ7FwlV1VzIjnX6o-pRYZ_Pk,470
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal_version/_version_generated.py,sha256=48GMAoPZ_ag_EWB42SJTPQblePrD_fvU9USnaFhq-D8,150
-modal-0.73.167.dist-info/METADATA,sha256=J9mj1Rd5kLYwuVHbs9jgxiyd5e19wUDaQZS76blat3g,2475
-modal-0.73.167.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-0.73.167.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.73.167.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-0.73.167.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=K1I-OHoqF3Qf9hN8YD8e7nCzAieLwZ3R8l4ov209qJs,150
+modal-0.73.169.dist-info/METADATA,sha256=1QhcQPji6dqJkEd3YfibNbEuaI5JLzZAsF9LmPZ8FFQ,2475
+modal-0.73.169.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-0.73.169.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.73.169.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-0.73.169.dist-info/RECORD,,

modal_version/_version_generated.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 
 # Note: Reset this value to -1 whenever you make a minor `0.X` release of the client.
-build_number = 167  # git: b37dda4
+build_number = 169  # git: 4137d51

modal/_proxy_tunnel.py

@@ -1,63 +0,0 @@
-# Copyright Modal Labs 2022
-import contextlib
-import os
-import subprocess
-import tempfile
-
-from modal_proto import api_pb2
-
-
-@contextlib.contextmanager
-def proxy_tunnel(info: api_pb2.ProxyInfo):
-    if not info.elastic_ip:
-        yield
-        return
-
-    with tempfile.NamedTemporaryFile(suffix=".pem") as t:
-        f = open(t.name, "w")
-        f.write(info.proxy_key)
-        f.close()
-
-        if info.remote_addr:
-            # Forward port from address.
-            args = [
-                "-L",
-                f"{info.remote_port}:{info.remote_addr}:{info.remote_port}",
-            ]
-        else:
-            # Set up SOCKS proxy.
-            # TODO: add a local_port column and proxy_type (this is all being rewritten anyway)
-            args = ["-D", f"{info.remote_port}"]
-            os.environ["HTTP_PROXY"] = f"socks5://localhost:{info.remote_port}"
-
-            # https://github.com/getsentry/sentry-python/issues/1049
-            os.environ["NO_PROXY"] = "sentry.io"
-
-        cmd = [
-            "autossh",
-            "-M 0",  # don't use a monitoring port for autossh
-            "-i",
-            t.name,  # use pem file
-            "-T",  # ignore the tty
-            "-n",  # no input
-            "-N",  # don't execute a command
-            *args,
-            f"ubuntu@{info.elastic_ip}",
-            "-o",
-            "StrictHostKeyChecking=no",  # avoid prompt for host
-            "-o",
-            "ServerAliveInterval=5",  # seconds before client sends keepalive to server
-            "-o",
-            "ServerAliveCountMax=1",  # number of failures before terminating ssh (autossh will restart)
-            "-o",
-            "LogLevel=ERROR",  # disable warning "Permanently added '...' to the list of known hosts."
-        ]
-        p = subprocess.Popen(cmd)
-
-        import time
-
-        time.sleep(3)
-        try:
-            yield
-        finally:
-            p.kill()