modal 1.5.5.dev17__tar.gz → 1.5.6.dev0__tar.gz

{modal-1.5.5.dev17 → modal-1.5.6.dev0}/PKG-INFO

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

{modal-1.5.5.dev17 → modal-1.5.6.dev0}/modal/_function_variants.py

@@ -290,6 +290,6 @@ def _make_function_variant(
         deps=_deps,
         load_context_overrides=base_function._load_context_overrides,
     )
-    fun._info = base_function._info
+    fun._source_info = base_function._source_info
     fun._spec = base_function._spec  # TODO (elias): fix - this is incorrect when using with_options
     return fun

{modal-1.5.5.dev17 → modal-1.5.6.dev0}/modal/_functions.py

@@ -50,7 +50,7 @@ from ._utils.deprecation import with_deprecation_warning
 from ._utils.function_utils import (
     ATTEMPT_TIMEOUT_GRACE_PERIOD,
     OUTPUTS_TIMEOUT,
-    FunctionInfo,
+    FunctionSourceInfo,
     _create_input,
     _parse_retries,
     _process_result,
@@ -604,7 +604,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
     """
 
     # TODO: more type annotations
-    _info: FunctionInfo | None
+    _source_info: FunctionSourceInfo | None
     _serve_mounts: frozenset[_Mount]  # set at load time, only by loader
     _app: "modal.app._App | None" = None
     # only set for InstanceServiceFunctions and bound instance methods
@@ -665,7 +665,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
 
     @staticmethod
     def _from_local(
-        info: FunctionInfo,
+        info: FunctionSourceInfo,
         app: "modal.app._App | None",  # App here should only be None in case of Image.run_function
         image: _Image,
         env: dict[str, str | None] | None = None,
@@ -1170,7 +1170,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         )
 
         obj._raw_f = info.raw_f
-        obj._info = info
+        obj._source_info = info
         obj._tag = tag
         obj._app = app  # needed for CLI right now
         obj._obj = None
@@ -1429,14 +1429,14 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         (2026, 8, 26),
         "`Function.info` is deprecated and will be removed in `modal` version 1.6.0",
     )
-    def info(self) -> FunctionInfo:
+    def info(self) -> FunctionSourceInfo:
         """mdmd:hidden"""
-        return self._info_
+        return self._source_info_
 
     @property
-    def _info_(self) -> FunctionInfo:
-        assert self._info
-        return self._info
+    def _source_info_(self) -> FunctionSourceInfo:
+        assert self._source_info
+        return self._source_info
 
     @property
     @with_deprecation_warning(
@@ -1477,7 +1477,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         self._is_generator = None
         self._web_url = None
         self._function_name = None
-        self._info = None
+        self._source_info = None
         self._serve_mounts = frozenset()
         self._metadata = None
         self._experimental_flash_urls = None
@@ -1609,7 +1609,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         new_function._webhook_config = self._webhook_config
 
         # Other fields not necessarily initialized
-        if self._info is not None:
+        if self._source_info is not None:
             new_function._build_args = self._build_args
             new_function._is_method = self._is_method
             new_function._raw_f = self._raw_f
@@ -1915,12 +1915,12 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             yield item
 
     def _is_local(self):
-        return self._info is not None
+        return self._source_info is not None
 
-    def _get_info(self) -> FunctionInfo:
-        if not self._info:
-            raise ExecutionError("Can't get info for a function that isn't locally defined")
-        return self._info
+    def _get_source_info(self) -> FunctionSourceInfo:
+        if not self._source_info:
+            raise ExecutionError("Can't get source info for a function that isn't locally defined")
+        return self._source_info
 
     def _get_obj(self) -> "modal.cls._Obj | None":
         if not self._is_method:
@@ -1955,7 +1955,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             )
             raise ExecutionError(msg)
 
-        info = self._get_info()
+        info = self._get_source_info()
         if not info.raw_f:
             # Here if calling .local on a service function itself which should never happen
             # TODO: check if we end up here in a container for a serialized function?

{modal-1.5.5.dev17 → modal-1.5.6.dev0}/modal/_image.py

@@ -41,7 +41,7 @@ from ._utils.docker_utils import (
     extract_copy_command_patterns,
     find_dockerignore_file,
 )
-from ._utils.function_utils import FunctionInfo, parse_gpu_config
+from ._utils.function_utils import FunctionSourceInfo, parse_gpu_config
 from ._utils.mount_utils import validate_only_modal_volumes, validate_volumes_by_object_id
 from ._utils.name_utils import check_object_name
 from .client import _Client
@@ -681,8 +681,8 @@ class _Image(_Object, type_prefix="im"):
 
             if build_function:
                 build_function_id = build_function.object_id
-                globals = build_function._get_info().get_globals()
-                attrs = build_function._get_info().get_cls_var_attrs()
+                globals = build_function._get_source_info().get_globals()
+                attrs = build_function._get_source_info().get_cls_var_attrs()
                 globals = {**globals, **attrs}
                 filtered_globals = {}
                 for k, v in globals.items():
@@ -694,7 +694,7 @@ class _Image(_Object, type_prefix="im"):
                         # Skip unserializable values for now.
                         logger.warning(
                             f"Skipping unserializable global variable {k} for "
-                            f"{build_function._get_info().function_name}. "
+                            f"{build_function._get_source_info().function_name}. "
                             "Changes to this variable won't invalidate the image."
                         )
                         continue
@@ -2754,7 +2754,7 @@ class _Image(_Object, type_prefix="im"):
             # It may be possible to support lambdas eventually, but for now we don't handle them well, so reject quickly
             raise InvalidError("Image.run_function does not support lambda functions.")
 
-        info = FunctionInfo(raw_f)
+        info = FunctionSourceInfo(raw_f)
 
         function = _Function._from_local(
             info,

{modal-1.5.5.dev17 → modal-1.5.6.dev0}/modal/_utils/function_utils.py

@@ -48,7 +48,7 @@ if typing.TYPE_CHECKING:
     import modal._functions
 
 
-class FunctionInfoType(Enum):
+class FunctionSourceInfoType(Enum):
     PACKAGE = "package"
     FILE = "file"
     SERIALIZED = "serialized"
@@ -162,7 +162,7 @@ def _parse_retries(
         raise InvalidError(msg)
 
 
-class FunctionInfo:
+class FunctionSourceInfo:
     """Utility that determines serialization/deserialization mechanisms for functions
 
     * Stored as file vs serialized
@@ -178,7 +178,7 @@ class FunctionInfo:
     user_cls: type[Any] | None
     module_name: str | None
 
-    _type: FunctionInfoType
+    _type: FunctionSourceInfoType
     _file: str | None
     _base_dir: str
     _remote_dir: PurePosixPath | None = None
@@ -245,7 +245,7 @@ class FunctionInfo:
             self.module_name = module.__spec__.name
             self._remote_dir = ROOT_DIR / PurePosixPath(module.__package__.split(".")[0])
             self._is_serialized = False
-            self._type = FunctionInfoType.PACKAGE
+            self._type = FunctionSourceInfoType.PACKAGE
         elif hasattr(module, "__file__") and not serialized:
             # This generally covers the case where it's invoked with
             # python foo/bar/baz.py
@@ -255,16 +255,16 @@ class FunctionInfo:
             self.module_name = inspect.getmodulename(self._file)
             self._base_dir = os.path.dirname(self._file)
             self._is_serialized = False
-            self._type = FunctionInfoType.FILE
+            self._type = FunctionSourceInfoType.FILE
         else:
             self.module_name = None
             self._base_dir = os.path.abspath("")  # get current dir
             self._is_serialized = True  # either explicitly, or by being in a notebook
             if serialized:  # if explicit
-                self._type = FunctionInfoType.SERIALIZED
+                self._type = FunctionSourceInfoType.SERIALIZED
             else:
                 # notebook, or in general any exec() on a function definition
-                self._type = FunctionInfoType.NOTEBOOK
+                self._type = FunctionSourceInfoType.NOTEBOOK
 
         if not self.is_serialized():
             # Sanity check that this function is defined in global scope
@@ -372,14 +372,14 @@ class FunctionInfo:
             return {}
 
         # make sure the function's own entrypoint is included:
-        if self._type == FunctionInfoType.PACKAGE:
+        if self._type == FunctionSourceInfoType.PACKAGE:
             top_level_package = self.module_name.split(".")[0]
             # TODO: add deprecation warning if the following entrypoint mount
             #  includes non-.py files, since we'll want to migrate to .py-only
             #  soon to get it consistent with the `add_local_python_source()`
             #  defaults.
             return {top_level_package: _Mount._from_local_python_packages(top_level_package)}
-        elif self._type == FunctionInfoType.FILE:
+        elif self._type == FunctionSourceInfoType.FILE:
             # TODO: inspect if this file is already included as part of
             #  a package mount, and skip it + reference that package
             #  instead if that's the case. This avoids possible module

{modal-1.5.5.dev17 → modal-1.5.6.dev0}/modal/app.py

@@ -35,7 +35,7 @@ from ._supports_logs import _LogQueryData
 from ._utils.async_utils import synchronize_api
 from ._utils.deprecation import deprecation_warning, handle_deprecated_parameters, with_deprecation_warning
 from ._utils.function_utils import (
-    FunctionInfo,
+    FunctionSourceInfo,
     is_flash_object,
     is_global_object,
     is_method_fn,
@@ -62,10 +62,10 @@ _default_image: _Image = _Image.debian_slim()
 
 
 class _LocalEntrypoint:
-    _info: FunctionInfo
+    _info: FunctionSourceInfo
     _app: "_App"
 
-    def __init__(self, info: FunctionInfo, app: "_App") -> None:
+    def __init__(self, info: FunctionSourceInfo, app: "_App") -> None:
         self._info = info
         self._app = app
 
@@ -73,7 +73,7 @@ class _LocalEntrypoint:
         return self._info.raw_f(*args, **kwargs)
 
     @property
-    def info(self) -> FunctionInfo:
+    def info(self) -> FunctionSourceInfo:
         return self._info
 
     @property
@@ -627,8 +627,8 @@ class _App:
                 logger.warning(
                     f"Warning: function name '{function._tag_}' collision!"
                     " Overriding existing function "
-                    f"[{old_function._info.module_name}].{old_function._info.function_name}"
-                    f" with new function [{function._info.module_name}].{function._info.function_name}"
+                    f"[{old_function._source_info.module_name}].{old_function._source_info.function_name}"
+                    f" with new function [{function._source_info.module_name}].{function._source_info.function_name}"
                 )
         if function._tag_ in local_state.classes:
             logger.warning(f"Warning: tag {function._tag_} exists but is overridden by function")
@@ -803,7 +803,7 @@ class _App:
             raise InvalidError("Invalid value for `name`: Must be string.")
 
         def wrapped(raw_f: Callable[..., Any]) -> _LocalEntrypoint:
-            info = FunctionInfo(raw_f)
+            info = FunctionSourceInfo(raw_f)
             tag = name if name is not None else raw_f.__qualname__
             local_state = self._local_state
             if tag in local_state.local_entrypoints:
@@ -962,7 +962,7 @@ class _App:
                 rdma = f.params.rdma
                 fabric_size = f.params.fabric_size
 
-                info = FunctionInfo(f.raw_f, serialized=serialized, name_override=name)
+                info = FunctionSourceInfo(f.raw_f, serialized=serialized, name_override=name)
                 raw_f = f.raw_f
                 webhook_config = f.params.webhook_config
                 is_generator = f.params.is_generator
@@ -1005,7 +1005,7 @@ class _App:
                         )
                     )
 
-                info = FunctionInfo(f, serialized=serialized, name_override=name)
+                info = FunctionSourceInfo(f, serialized=serialized, name_override=name)
                 raw_f = f
                 webhook_config = None
                 batch_max_size = None
@@ -1254,7 +1254,7 @@ class _App:
                 ).values():
                     raise InvalidError("Callable decorators cannot be combined with web interface decorators.")
 
-            info = FunctionInfo(None, serialized=serialized, user_cls=user_cls)
+            info = FunctionSourceInfo(None, serialized=serialized, user_cls=user_cls)
 
             i6pn_enabled = i6pn or cluster_size is not None
             cls_func = _Function._from_local(
@@ -1466,7 +1466,9 @@ class _App:
             local_state = self._local_state
 
             # Create the FunctionInfo for the server, note we treat FunctionInfo as a class for servers
-            info = FunctionInfo(None, serialized=serialized, user_cls=user_cls, name_override=name or user_cls.__name__)
+            info = FunctionSourceInfo(
+                None, serialized=serialized, user_cls=user_cls, name_override=name or user_cls.__name__
+            )
             # Create the service function
             service_function = _Function._from_local(
                 info,

{modal-1.5.5.dev17 → modal-1.5.6.dev0}/modal/app.pyi

@@ -27,10 +27,10 @@ import typing
 import typing_extensions
 
 class _LocalEntrypoint:
-    _info: modal._utils.function_utils.FunctionInfo
+    _info: modal._utils.function_utils.FunctionSourceInfo
     _app: _App
 
-    def __init__(self, info: modal._utils.function_utils.FunctionInfo, app: _App) -> None:
+    def __init__(self, info: modal._utils.function_utils.FunctionSourceInfo, app: _App) -> None:
         """Initialize self.  See help(type(self)) for accurate signature."""
         ...
 
@@ -39,18 +39,18 @@ class _LocalEntrypoint:
         ...
 
     @property
-    def info(self) -> modal._utils.function_utils.FunctionInfo: ...
+    def info(self) -> modal._utils.function_utils.FunctionSourceInfo: ...
     @property
     def app(self) -> _App: ...
 
 class LocalEntrypoint:
-    _info: modal._utils.function_utils.FunctionInfo
+    _info: modal._utils.function_utils.FunctionSourceInfo
     _app: App
 
-    def __init__(self, info: modal._utils.function_utils.FunctionInfo, app: App) -> None: ...
+    def __init__(self, info: modal._utils.function_utils.FunctionSourceInfo, app: App) -> None: ...
     def __call__(self, *args: typing.Any, **kwargs: typing.Any) -> typing.Any: ...
     @property
-    def info(self) -> modal._utils.function_utils.FunctionInfo: ...
+    def info(self) -> modal._utils.function_utils.FunctionSourceInfo: ...
     @property
     def app(self) -> App: ...
 

{modal-1.5.5.dev17 → modal-1.5.6.dev0}/modal/cli/import_refs.py

@@ -173,7 +173,7 @@ def list_cli_commands(
             priorities[local_entrypoint] = AutoRunPriority.APP_LOCAL_ENTRYPOINT
         for name, inner_function in app._local_state.functions.items():
             function = cast(Function, synchronizer._translate_out(inner_function))
-            if function._info_.is_service_class() and not include_service_functions:
+            if function._source_info_.is_service_class() and not include_service_functions:
                 continue  # Skip class and server service functions for all commands except `modal shell`.
             all_runnables[function].append(f"{app_name}.{name}")
             priorities[function] = AutoRunPriority.APP_FUNCTION

{modal-1.5.5.dev17 → modal-1.5.6.dev0}/modal/cli/run.py

@@ -263,9 +263,9 @@ def _get_click_command_for_function(app: App, function: Function, ctx: click.Con
     if function._is_generator_:
         raise InvalidError("`modal run` is not supported for generator functions")
 
-    assert function._info_.raw_f
-    sig: inspect.Signature = _get_signature(function._info_.raw_f)
-    type_hints = safe_get_type_hints(function._info_.raw_f)
+    assert function._source_info_.raw_f
+    sig: inspect.Signature = _get_signature(function._source_info_.raw_f)
+    type_hints = safe_get_type_hints(function._source_info_.raw_f)
     signature: CliRunnableSignature = _get_cli_runnable_signature(sig, type_hints)
 
     def _inner(args, click_kwargs):

{modal-1.5.5.dev17 → modal-1.5.6.dev0}/modal/client.pyi

@@ -77,7 +77,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.5.dev17",
+        version: str = "1.5.6.dev0",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):
@@ -277,7 +277,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.5.dev17",
+        version: str = "1.5.6.dev0",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):

{modal-1.5.5.dev17 → modal-1.5.6.dev0}/modal/cls.py

@@ -125,9 +125,9 @@ def _bind_instance_method(cls: "_Cls", service_function: _Function, method_name:
 
     if cls._is_local():
         partial_function = cls._method_partials[method_name]
-        from modal._utils.function_utils import FunctionInfo
+        from modal._utils.function_utils import FunctionSourceInfo
 
-        fun._info = FunctionInfo(
+        fun._source_info = FunctionSourceInfo(
             # ugly - needed for .local()  TODO (elias): Clean up!
             partial_function.raw_f,
             user_cls=cls._user_cls,
@@ -242,7 +242,7 @@ class _Obj:
                     load_context_overrides=parent._load_context_overrides,
                 )
                 fun._obj = self
-                fun._info = parent._info
+                fun._source_info = parent._source_info
                 fun._spec = parent._spec
 
             self._instance_service_function = fun

{modal-1.5.5.dev17 → modal-1.5.6.dev0}/modal/experimental/__init__.py

@@ -28,7 +28,6 @@ from ..secret import _Secret as _Secret
 from .flash import (  # noqa: F401
     flash_forward,
     flash_get_containers,
-    flash_prometheus_autoscaler,
     http_server,
 )