modal 0.73.166__tar.gz → 0.73.168__tar.gz

{modal-0.73.166 → modal-0.73.168}/PKG-INFO

@@ -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 → modal-0.73.168}/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-0.73.166 → modal-0.73.168}/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-0.73.166 → modal-0.73.168}/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-0.73.166 → modal-0.73.168}/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-0.73.166 → modal-0.73.168}/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-0.73.166 → modal-0.73.168}/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-0.73.166 → modal-0.73.168}/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 → modal-0.73.168}/modal.egg-info/PKG-INFO

@@ -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 → modal-0.73.168}/modal.egg-info/SOURCES.txt

@@ -12,7 +12,6 @@ modal/_location.py
 modal/_object.py
 modal/_output.py
 modal/_partial_function.py
-modal/_proxy_tunnel.py
 modal/_pty.py
 modal/_resolver.py
 modal/_resources.py

{modal-0.73.166 → modal-0.73.168}/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-0.73.166/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()