modal 0.73.166__py3-none-any.whl → 0.73.168__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/cli/import_refs.py

@@ -69,7 +69,6 @@ def import_file_or_module(import_ref: ImportRef, base_cmd: str = ""):
                 (2025, 2, 6),
                 f"Using Python module paths will require using the -m flag in a future version of Modal.\n"
                 f"Use `{base_cmd} -m {import_ref.file_or_module}` instead.",
-                pending=True,
                 show_source=False,
             )
         try:

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.166",
+        version: str = "0.73.168",
     ): ...
     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.166",
+        version: str = "0.73.168",
     ): ...
     def is_closed(self) -> bool: ...
     @property

modal/cls.py

@@ -706,10 +706,9 @@ class _Cls(_Object, type_prefix="cs"):
             # if not local (== k *could* be a method) or it is local and we know k is a method
             deprecation_warning(
                 (2025, 1, 13),
-                "Usage of methods directly on the class will soon be deprecated, "
-                "instantiate classes before using methods, e.g.:\n"
+                "Calling a method on an uninstantiated class will soon be deprecated; "
+                "update your code to instantiate the class first, i.e.:\n"
                 f"{self._name}().{k} instead of {self._name}.{k}",
-                pending=True,
             )
             return getattr(self(), k)
         # non-method attribute access on local class - arguably shouldn't be used either:

modal/image.py

@@ -820,7 +820,8 @@ class _Image(_Object, type_prefix="im"):
         works in a `Dockerfile`.
         """
         deprecation_warning(
-            (2025, 1, 13), COPY_DEPRECATION_MESSAGE_PATTERN.format(replacement="image.add_local_file"), pending=True
+            (2025, 1, 13),
+            COPY_DEPRECATION_MESSAGE_PATTERN.format(replacement="image.add_local_file"),
         )
         basename = str(Path(local_path).name)
 
@@ -934,7 +935,8 @@ class _Image(_Object, type_prefix="im"):
         ```
         """
         deprecation_warning(
-            (2025, 1, 13), COPY_DEPRECATION_MESSAGE_PATTERN.format(replacement="image.add_local_dir"), pending=True
+            (2025, 1, 13),
+            COPY_DEPRECATION_MESSAGE_PATTERN.format(replacement="image.add_local_dir"),
         )
 
         def build_dockerfile(version: ImageBuilderVersion) -> DockerfileSpec:
@@ -1367,9 +1369,8 @@ class _Image(_Object, type_prefix="im"):
         if context_mount is not None:
             deprecation_warning(
                 (2025, 1, 13),
-                "`context_mount` is deprecated."
-                + " Files are now automatically added to the build context based on the commands.",
-                pending=True,
+                "The `context_mount` parameter of `Image.dockerfile_commands` is deprecated."
+                " Files are now automatically added to the build context based on the commands.",
             )
         cmds = _flatten_str_args("dockerfile_commands", "dockerfile_commands", dockerfile_commands)
         if not cmds:
@@ -1777,9 +1778,8 @@ class _Image(_Object, type_prefix="im"):
         if context_mount is not None:
             deprecation_warning(
                 (2025, 1, 13),
-                "`context_mount` is deprecated."
-                + " Files are now automatically added to the build context based on the commands in the Dockerfile.",
-                pending=True,
+                "The `context_mount` parameter of `Image.from_dockerfile` is deprecated."
+                " Files are now automatically added to the build context based on the commands in the Dockerfile.",
             )
 
         # --- Build the base dockerfile

modal/mount.py

@@ -410,7 +410,8 @@ class _Mount(_Object, type_prefix="mo"):
         ```
         """
         deprecation_warning(
-            (2025, 1, 8), MOUNT_DEPRECATION_MESSAGE_PATTERN.format(replacement="image.add_local_dir"), pending=True
+            (2025, 1, 8),
+            MOUNT_DEPRECATION_MESSAGE_PATTERN.format(replacement="image.add_local_dir"),
         )
         return _Mount._from_local_dir(local_path, remote_path=remote_path, condition=condition, recursive=recursive)
 
@@ -467,7 +468,8 @@ class _Mount(_Object, type_prefix="mo"):
         ```
         """
         deprecation_warning(
-            (2025, 1, 8), MOUNT_DEPRECATION_MESSAGE_PATTERN.format(replacement="image.add_local_file"), pending=True
+            (2025, 1, 8),
+            MOUNT_DEPRECATION_MESSAGE_PATTERN.format(replacement="image.add_local_file"),
         )
         return _Mount._from_local_file(local_path, remote_path)
 
@@ -640,7 +642,6 @@ class _Mount(_Object, type_prefix="mo"):
         deprecation_warning(
             (2025, 1, 8),
             MOUNT_DEPRECATION_MESSAGE_PATTERN.format(replacement="image.add_local_python_source"),
-            pending=True,
         )
         return _Mount._from_local_python_packages(
             *module_names, remote_dir=remote_dir, condition=condition, ignore=ignore

{modal-0.73.166.dist-info → modal-0.73.168.dist-info}/METADATA

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

{modal-0.73.166.dist-info → modal-0.73.168.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,10 +22,10 @@ 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=iDprzZTVWygReQ1tdzssE36Uvq1_RfNgdO5GC_dMhSc,7661
+modal/client.pyi,sha256=EVuMDnBwDN6KjVggka2jbjfk49kNwIqk-ymDq07yF4Y,7661
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
-modal/cls.py,sha256=8tvSw7QFTS1FnX2MXaxagu3KwuR6y_DMwhqHv3MZ0Nk,32963
+modal/cls.py,sha256=x3CUDPC-QK7pa9E2eiFsiCS2ULvVi8UzNZQw1i9drsU,32945
 modal/cls.pyi,sha256=pTYO9JsRENmsa5pDgzfoRJGm_NpCvEjEx--vs-jJkj8,10902
 modal/config.py,sha256=FlqVyh6LVukMahhmEGQVTwWtwtfoPfHqEo3GDn13EOA,11687
 modal/container_process.py,sha256=vvyK3DVPUMsuqvkKdUiQ49cDLF9JawGrxpglLk5vfgI,6208
@@ -42,11 +41,11 @@ modal/file_pattern_matcher.py,sha256=trosX-Bp7dOubudN1bLLhRAoidWy1TcoaR4Pv8CedWw
 modal/functions.py,sha256=kcNHvqeGBxPI7Cgd57NIBBghkfbeFJzXO44WW0jSmao,325
 modal/functions.pyi,sha256=Bg_zlYSHMYuEXQYLcFU-j1Kwq5zHQ9jggMA_5ZO_du8,14785
 modal/gpu.py,sha256=Kbhs_u49FaC2Zi0TjCdrpstpRtT5eZgecynmQi5IZVE,6752
-modal/image.py,sha256=qagLzHPbeEoM7TqvIuFJ8JV_IEJtRqiR0lik4O_K4Gw,92857
+modal/image.py,sha256=I-9_YZL0SSfnuGPywa3-4PlxDmJ-53p7ce3gP74SrOA,92877
 modal/image.pyi,sha256=89zv12C1sFrJs7Es9SnX23_m208ASAdeNGCVTrhjzHI,25632
 modal/io_streams.py,sha256=h5O2LmbRoT9l777z3TQhCAm-JF1r7avZ2ykXlejztDs,15163
 modal/io_streams.pyi,sha256=bJ7ZLmSmJ0nKoa6r4FJpbqvzdUVa0lEe0Fa-MMpMezU,5071
-modal/mount.py,sha256=Y2sXIbUbr3ymVvfvknwbouBkkAUPIW1nkSToRGh8w7g,31973
+modal/mount.py,sha256=_v1VYxryY3BcF4XxyRfOWm7AxAz79D2VRWh5tOHhWuc,31945
 modal/mount.pyi,sha256=CmHa7zKSxHA_7-vMQLnGfw_ZXvAvHlafvUEVJcQ1LQA,12535
 modal/network_file_system.py,sha256=WXdyL7du_fvjvuG6hSAREyJ83sSEP2xSLAIAhBsisdI,14869
 modal/network_file_system.pyi,sha256=4N3eqMbTSlqmS8VV_aJK-uvrgJC8xnf_YtW5FHfRfc8,8156
@@ -124,7 +123,7 @@ modal/cli/container.py,sha256=FYwEgjf93j4NMorAjGbSV98i1wpebqdAeNU1wfrFp1k,3668
 modal/cli/dict.py,sha256=8Wq3w-UDaywk8EVNdj-ECCNV9TYHqh4kzhUqhhulatM,4593
 modal/cli/entry_point.py,sha256=dOosuCwhfznwTCB4oMljUFhihq5aLUVoAz7RhcBEDnc,4189
 modal/cli/environment.py,sha256=Ayddkiq9jdj3XYDJ8ZmUqFpPPH8xajYlbexRkzGtUcg,4334
-modal/cli/import_refs.py,sha256=53WmXyOivTk2Pi85NgAr8K5tjwOxNeCmOR0wLNEEX1c,13941
+modal/cli/import_refs.py,sha256=pmzY0hpexx6DtvobNmCOvRqEdS9IriEP4BpMw1TIy2w,13911
 modal/cli/launch.py,sha256=0_sBu6bv2xJEPWi-rbGS6Ri9ggnkWQvrGlgpYSUBMyY,3097
 modal/cli/network_file_system.py,sha256=eq3JnwjbfFNsJodIyANHL06ByYc3BSavzdmu8C96cHA,7948
 modal/cli/profile.py,sha256=0TYhgRSGUvQZ5LH9nkl6iZllEvAjDniES264dE57wOM,3201
@@ -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.166.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.73.168.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=sC0tLCnx3SA3ug30Mb8CeHVzuzTF5kCgUvvoRJgRMB0,150
-modal-0.73.166.dist-info/METADATA,sha256=vKOazcM7Fa1cFmz6c1DZZhuPGXzwHG4O0iVSDqHQTwA,2475
-modal-0.73.166.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-0.73.166.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.73.166.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-0.73.166.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=-aZvps2fh2rCp0UNwje5SJ9IP_jUoaH-CNdrA4Q-0mo,150
+modal-0.73.168.dist-info/METADATA,sha256=RogiuavaiLYUjRPCDOeC74__s09i-PFiFsUExNzeoAo,2475
+modal-0.73.168.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-0.73.168.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.73.168.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-0.73.168.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 = 166  # git: 5e72556
+build_number = 168  # git: cafe25f

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()