modal 1.5.5.dev15__tar.gz → 1.5.5.dev17__tar.gz

{modal-1.5.5.dev15 → modal-1.5.5.dev17}/PKG-INFO

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

{modal-1.5.5.dev15 → modal-1.5.5.dev17}/modal/_environments.py

@@ -478,7 +478,7 @@ class _EnvironmentBillingManager:
         elif end.tzinfo != timezone.utc:
             raise InvalidError("Timezone-aware 'end' parameter must be in UTC.")
 
-        if not self._environment.is_hydrated:
+        if not self._environment._is_hydrated:
             await self._environment.hydrate()
 
         request = api_pb2.WorkspaceBillingReportRequest(
@@ -549,7 +549,7 @@ class _EnvironmentBillingManager:
         if cycle > datetime.now(timezone.utc):
             raise InvalidError("Provided 'cycle' parameter cannot be in the future.")
 
-        if not self._environment.is_hydrated:
+        if not self._environment._is_hydrated:
             await self._environment.hydrate()
 
         request = api_pb2.EnvironmentBillingSummaryRequest(environment_id=self._environment.object_id)

{modal-1.5.5.dev15 → modal-1.5.5.dev17}/modal/_function_variants.py

@@ -157,7 +157,7 @@ class _FunctionOptions:
             + list(self.secrets)
             + [mount.secret for _, mount in self.cloud_bucket_mounts if mount.secret]
         )
-        return [dep for dep in all_deps if not dep.is_hydrated]
+        return [dep for dep in all_deps if not dep._is_hydrated]
 
     def to_proto(self) -> api_pb2.FunctionOptions:
         """Convert the dataclass to a FunctionOptions protobuf message."""
@@ -246,7 +246,7 @@ def _make_function_variant(
         load_context: "LoadContext",
         existing_object_id: str | None,
     ):
-        if not base_function.is_hydrated:
+        if not base_function._is_hydrated:
             await base_function.hydrate(load_context.client)
         assert base_function._client and base_function._client.stub
 

{modal-1.5.5.dev15 → modal-1.5.5.dev17}/modal/_functions.py

@@ -46,6 +46,7 @@ from ._utils.async_utils import (
     warn_if_generator_is_not_consumed,
 )
 from ._utils.blob_utils import MAX_ASYNC_OBJECT_SIZE_BYTES, MAX_OBJECT_SIZE_BYTES
+from ._utils.deprecation import with_deprecation_warning
 from ._utils.function_utils import (
     ATTEMPT_TIMEOUT_GRACE_PERIOD,
     OUTPUTS_TIMEOUT,
@@ -937,7 +938,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             with FunctionCreationStatus(tag) as function_creation_status:
                 timeout_secs = timeout
 
-                if app and app.is_interactive and not is_builder_function:
+                if app and app._is_interactive_ and not is_builder_function:
                     pty_info = get_pty_info(shell=False)
                 else:
                     pty_info = None
@@ -1194,7 +1195,10 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
 
         return obj
 
-    from_local = _from_local
+    from_local = with_deprecation_warning(
+        (2026, 8, 26),
+        "`Function.from_local` is deprecated and will be removed in `modal` version 1.6.0",
+    )(_from_local)
     """mdmd:hidden"""
 
     async def _update_autoscaler(
@@ -1389,6 +1393,10 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         )
 
     @property
+    @with_deprecation_warning(
+        (2026, 8, 26),
+        "`Function.tag` is deprecated and will be removed in `modal` version 1.6.0",
+    )
     def tag(self) -> str:
         """mdmd:hidden"""
         return self._tag_
@@ -1407,12 +1415,20 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         return self._app
 
     @property
+    @with_deprecation_warning(
+        (2026, 8, 26),
+        "`Function.stub` is deprecated and will be removed in `modal` version 1.6.0",
+    )
     def stub(self) -> "modal.app._App":
         """mdmd:hidden"""
         # Deprecated soon, only for backwards compatibility
         return self.app
 
     @property
+    @with_deprecation_warning(
+        (2026, 8, 26),
+        "`Function.info` is deprecated and will be removed in `modal` version 1.6.0",
+    )
     def info(self) -> FunctionInfo:
         """mdmd:hidden"""
         return self._info_
@@ -1423,6 +1439,10 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         return self._info
 
     @property
+    @with_deprecation_warning(
+        (2026, 8, 26),
+        "`Function.spec` is deprecated and will be removed in `modal` version 1.6.0",
+    )
     def spec(self) -> _FunctionSpec:
         """mdmd:hidden"""
         return self._spec_
@@ -1443,7 +1463,10 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         assert hasattr(self, "_raw_f") and hasattr(self, "_build_args") and self._raw_f is not None
         return f"{inspect.getsource(self._raw_f)}\n{repr(self._build_args)}"
 
-    get_build_def = _get_build_def
+    get_build_def = with_deprecation_warning(
+        (2026, 8, 26),
+        "`Function.get_build_def` is deprecated and will be removed in `modal` version 1.6.0",
+    )(_get_build_def)
     """mdmd:hidden"""
 
     # Live handle methods
@@ -1693,6 +1716,10 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         return self._apply_dynamic_config(options, "with_batching")
 
     @property
+    @with_deprecation_warning(
+        (2026, 8, 26),
+        "`Function.is_generator` is deprecated and will be removed in `modal` version 1.6.0",
+    )
     async def is_generator(self) -> bool:
         """mdmd:hidden"""
         return await self._is_generator_
@@ -1934,7 +1961,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             # TODO: check if we end up here in a container for a serialized function?
             raise ExecutionError("Can't call .local on service function")
 
-        if is_local() and self.spec.volumes or self.spec.network_file_systems:
+        if is_local() and self._spec_.volumes or self._spec_.network_file_systems:
             warnings.warn(
                 f"The {info.function_name} function is executing locally "
                 + "and will not have access to the mounted Volume or NetworkFileSystem data"
@@ -2032,6 +2059,10 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         fc._function_id = self.object_id
         return fc
 
+    @with_deprecation_warning(
+        (2026, 8, 26),
+        "`Function.get_raw_f` is deprecated and will be removed in `modal` version 1.6.0",
+    )
     def get_raw_f(self) -> Callable[..., Any]:
         """Return the inner Python object wrapped by this Modal Function.
 

{modal-1.5.5.dev15 → modal-1.5.5.dev17}/modal/_image.py

@@ -704,7 +704,7 @@ class _Image(_Object, type_prefix="im"):
                 # TODO: better way to filter out types that don't have a stable hash?
                 build_function_globals = serialize(filtered_globals) if filtered_globals else b""
                 _build_function = api_pb2.BuildFunction(
-                    definition=build_function.get_build_def(),
+                    definition=build_function._get_build_def(),
                     globals=build_function_globals,
                     input=build_function_input,
                 )
@@ -2756,7 +2756,7 @@ class _Image(_Object, type_prefix="im"):
 
         info = FunctionInfo(raw_f)
 
-        function = _Function.from_local(
+        function = _Function._from_local(
             info,
             app=None,
             image=self,
@@ -2938,7 +2938,7 @@ class _Image(_Object, type_prefix="im"):
         try:
             yield
         except Exception as exc:
-            if not self.is_hydrated:
+            if not self._is_hydrated:
                 # Might be hydrated later (if it's the container's used image)
                 self.inside_exceptions.append(exc)
             elif env_image_id == self.object_id:
@@ -3051,7 +3051,7 @@ class _Image(_Object, type_prefix="im"):
         """mdmd:hidden"""
         # Image inherits hydrate() from Object but can't be hydrated on demand
         # Overriding the method lets us hide it from the docs and raise a better error message
-        if not self.is_hydrated:
+        if not self._is_hydrated:
             raise ExecutionError(
                 "Images cannot currently be hydrated on demand; you can build an Image by running an App that uses it."
             )

{modal-1.5.5.dev15 → modal-1.5.5.dev17}/modal/_object.py

@@ -9,11 +9,11 @@ from typing import ClassVar
 from google.protobuf.message import Message
 from typing_extensions import Self
 
-from modal._traceback import suppress_tb_frame
-
 from ._load_context import LoadContext
 from ._resolver import Resolver
+from ._traceback import suppress_tb_frame
 from ._utils.async_utils import TaskContext, aclosing
+from ._utils.deprecation import deprecation_warning
 from .client import _Client
 from .config import config, logger
 from .exception import ExecutionError, InvalidError
@@ -91,13 +91,21 @@ class _Object:
     # For hydrated objects
     _object_id: str | None
     _client: _Client | None
-    _is_hydrated: bool
+    __is_hydrated: bool
     _is_rehydrated: bool
 
     # Not all object subclasses have a meaningful "name" concept
     # So whether they expose this is a matter of having a name property
     _name: str | None
 
+    @property
+    def _is_hydrated(self) -> bool:
+        return self.__is_hydrated
+
+    @_is_hydrated.setter
+    def _is_hydrated(self, value: bool):
+        self.__is_hydrated = value
+
     @classmethod
     def __init_subclass__(cls, type_prefix: str | None = None):
         super().__init_subclass__()
@@ -281,9 +289,18 @@ class _Object:
     def __repr__(self):
         return self._rep
 
+    @property
+    def _class_name(self):
+        return self.__class__.__name__.removeprefix("_")
+
     @property
     def local_uuid(self):
         """mdmd:hidden"""
+        deprecation_warning(
+            (2026, 8, 26),
+            f"`{self._class_name}.local_uuid` is deprecated and will be removed in `modal` version 1.6.0",
+        )
+
         return self._local_uuid
 
     @property
@@ -308,11 +325,21 @@ class _Object:
     @property
     def is_hydrated(self) -> bool:
         """mdmd:hidden"""
+        deprecation_warning(
+            (2026, 8, 26),
+            f"`{self._class_name}.is_hydrated` is deprecated and will be removed in `modal` version 1.6.0",
+        )
+
         return self._is_hydrated
 
     @property
     def deps(self) -> Callable[..., Sequence["_Object"]]:
         """mdmd:hidden"""
+        deprecation_warning(
+            (2026, 8, 26),
+            f"`{self._class_name}.deps` is deprecated and will be removed in `modal` version 1.6.0",
+        )
+
         return self._deps_
 
     @property

{modal-1.5.5.dev15 → modal-1.5.5.dev17}/modal/_resolver.py

@@ -44,19 +44,19 @@ class Resolver:
         existing_object_id: str | None = None,
     ):
         if obj._is_hydrated and obj._skip_reload:
-            if obj.local_uuid not in self._local_uuid_to_future:
+            if obj._local_uuid not in self._local_uuid_to_future:
                 # a bit dumb - but we still need to store a reference to the object here
                 # to be able to include all referenced objects when setting up the app
                 fut: Future = Future()
                 fut.set_result(obj)
-                self._local_uuid_to_future[obj.local_uuid] = fut
+                self._local_uuid_to_future[obj._local_uuid] = fut
             return obj
 
         deduplication_key: Hashable | None = None
         if obj._deduplication_key:
             deduplication_key = await obj._deduplication_key()
 
-        cached_future = self._local_uuid_to_future.get(obj.local_uuid)
+        cached_future = self._local_uuid_to_future.get(obj._local_uuid)
 
         if not cached_future and deduplication_key is not None:
             # deduplication cache makes sure duplicate mounts are resolved only
@@ -78,7 +78,7 @@ class Resolver:
                     # Use asyncio.gather here (not TaskContext.gather) - the shared TaskContext
                     # in load_context handles cancellation at the top level, preventing premature
                     # cancellation of shared dependencies when sibling tasks fail.
-                    await asyncio.gather(*[self.load(dep, load_context) for dep in obj.deps()])
+                    await asyncio.gather(*[self.load(dep, load_context) for dep in obj._deps_()])
 
                     # Load the object itself
                     if not obj._load:
@@ -102,7 +102,7 @@ class Resolver:
 
             # use task_context from load_context to make sure tasks are cleaned up eventually
             cached_future = parent_load_context.task_context.create_task(loader())
-            self._local_uuid_to_future[obj.local_uuid] = cached_future
+            self._local_uuid_to_future[obj._local_uuid] = cached_future
             if deduplication_key is not None:
                 self._deduplication_cache[deduplication_key] = cached_future
         with suppress_tb_frame():

{modal-1.5.5.dev15 → modal-1.5.5.dev17}/modal/_runtime/user_code_imports.py

@@ -522,8 +522,8 @@ def import_single_function_service(
         f = getattr(module, qual_name)
         if isinstance(f, Function):
             _function: modal._functions._Function[Any, Any, Any] = synchronizer._translate_in(f)  # type: ignore
-            service_deps = _function.deps(only_explicit_mounts=True)
-            user_defined_callable = _function.get_raw_f()
+            service_deps = _function._deps_(only_explicit_mounts=True)
+            user_defined_callable = _function._raw_f_
             assert _function._app  # app should always be set on a decorated function
             active_app = _function._app
         else:
@@ -594,7 +594,7 @@ def import_class_service(
     if isinstance(cls_or_user_cls, modal.cls.Cls):
         _cls = typing.cast(modal.cls._Cls, synchronizer._translate_in(cls_or_user_cls))
         class_service_function: _Function = _cls._get_class_service_function()
-        service_deps = class_service_function.deps(only_explicit_mounts=True)
+        service_deps = class_service_function._deps_(only_explicit_mounts=True)
         active_app = class_service_function.app
     else:
         # Undecorated user class (serialized or local scope-decoration).
@@ -606,7 +606,7 @@ def import_class_service(
             service_function_hydration_data.function_handle_metadata,
             skip_reload=True,  # this skips re-loading the function, which is required since it doesn't have a loader
         )
-        _cls = modal.cls._Cls.from_local(cls_or_user_cls, active_app, _service_function)
+        _cls = modal.cls._Cls._from_local(cls_or_user_cls, active_app, _service_function)
         # hydration of the class itself - just sets the id and triggers some side effects
         # that transfers metadata from the service function to the class. TODO: cleanup!
         _cls._hydrate(class_id, _client, api_pb2.ClassHandleMetadata())
@@ -647,7 +647,7 @@ def import_server_service(
     if isinstance(cls_or_user_cls, modal.server.Server):
         _server = typing.cast(modal._server._Server, synchronizer._translate_in(cls_or_user_cls))
         server_service_function: _Function = _server._get_service_function()
-        service_deps = server_service_function.deps(only_explicit_mounts=True)
+        service_deps = server_service_function._deps_(only_explicit_mounts=True)
         active_app = _server._get_app()
 
     else:

{modal-1.5.5.dev15 → modal-1.5.5.dev17}/modal/_serialization.py

@@ -66,8 +66,10 @@ class Pickler(cloudpickle.Pickler):
             return ("sync", (impl_object.__class__, attributes))
         else:
             return
-        if not obj.is_hydrated:
+
+        if not obj._is_hydrated:
             raise InvalidError(f"Can't serialize object {obj} which hasn't been hydrated.")
+
         return (obj.object_id, flag, obj._get_metadata())
 
 

{modal-1.5.5.dev15 → modal-1.5.5.dev17}/modal/_utils/deprecation.py

@@ -118,3 +118,32 @@ def handle_deprecated_parameters(func: Callable[P, R]) -> Callable[P, R]:
         return func(*args, **kwargs)
 
     return wrapper
+
+
+def with_deprecation_warning(
+    deprecated_on: tuple[int, int, int], msg: str, *, show_source: bool = True
+) -> Callable[[Callable[P, R]], Callable[P, R]]:
+    def decorator(method: Callable[P, R]) -> Callable[P, R]:
+        is_static = False
+        if isinstance(method, staticmethod):
+            is_static = True
+            method = method.__wrapped__
+
+        # Note: despite `wrapped` being synchronous, this also works with async functions, in that if
+        # a function returns a coroutine, then this function will also return a coroutine. So, when
+        # called from an async context, the return can be awaited without issues. However, code that
+        # introspects `wrapped` with, e.g. inspect.iscoroutinefunction(), will not pick up on the
+        # fact that it returns a coroutine unless it unwraps `wrapped` and tries to introspect `method`
+        # directly. Synchronicity already does this (https://github.com/modal-labs/synchronicity/blob/441085df7dfa953c86304d06da5e0e74cebbe858/src/synchronicity/async_wrap.py#L42-L57),
+        # but this is fixable on Python >= 3.12, which adds `inspect.markcoroutinefunction`.
+        @functools.wraps(method)
+        def wrapped(*args: P.args, **kwargs: P.kwargs) -> R:
+            deprecation_warning(deprecated_on, msg, show_source=show_source)
+            return method(*args, **kwargs)
+
+        if is_static:
+            return staticmethod(wrapped)
+
+        return wrapped
+
+    return decorator

{modal-1.5.5.dev15 → modal-1.5.5.dev17}/modal/_utils/mount_utils.py

@@ -108,7 +108,7 @@ def validate_volumes_by_object_id(validated_volumes: Sequence[tuple[str, _Volume
     """
     object_id_to_paths: dict[str, list[str]] = {}
     for path, volume in validated_volumes:
-        if not volume.is_hydrated:
+        if not volume._is_hydrated:
             # This should never happen since this function is only called at load time
             raise RuntimeError(f"Internal error: Volume at '{path}' is not hydrated when validating mounts")
         object_id_to_paths.setdefault(volume.object_id, []).append(path)

{modal-1.5.5.dev15 → modal-1.5.5.dev17}/modal/_workspace.py

@@ -321,7 +321,7 @@ class _WorkspaceBillingManager:
             A single mapping containing cost values. All values are reported as `decimal.Decimal`s.
         """
 
-        if not self._workspace.is_hydrated:
+        if not self._workspace._is_hydrated:
             await self._workspace.hydrate()
 
         response = await self._workspace.client.stub.WorkspaceBillingRates(
@@ -386,7 +386,7 @@ class _WorkspaceBillingManager:
         elif end.tzinfo != timezone.utc:
             raise InvalidError("Timezone-aware 'end' parameter must be in UTC.")
 
-        if not self._workspace.is_hydrated:
+        if not self._workspace._is_hydrated:
             await self._workspace.hydrate()
 
         request = api_pb2.WorkspaceBillingReportRequest(
@@ -457,7 +457,7 @@ class _WorkspaceBillingManager:
         if cycle > datetime.now(timezone.utc):
             raise InvalidError("Provided 'cycle' parameter cannot be in the future.")
 
-        if not self._workspace.is_hydrated:
+        if not self._workspace._is_hydrated:
             await self._workspace.hydrate()
 
         request = api_pb2.WorkspaceBillingSummaryRequest()
@@ -483,7 +483,7 @@ class _WorkspaceSettingsManager:
         Returns:
             A `WorkspaceSettings` dataclass.
         """
-        if not self._workspace.is_hydrated:
+        if not self._workspace._is_hydrated:
             await self._workspace.hydrate()
         resp = await self._workspace.client.stub.WorkspaceSettings(Empty())
         return WorkspaceSettings(
@@ -494,14 +494,14 @@ class _WorkspaceSettingsManager:
         """mdmd:hidden
         Set the image builder version for the Workspace.
         """
-        if not self._workspace.is_hydrated:
+        if not self._workspace._is_hydrated:
             await self._workspace.hydrate()
         req = api_pb2.WorkspaceSetImageBuilderVersionRequest(new_image_builder_version=version)
         await self._workspace.client.stub.WorkspaceSetImageBuilderVersion(req)
 
     async def _set_default_environment(self, name: str) -> None:
         """Set the default environment for the Workspace."""
-        if not self._workspace.is_hydrated:
+        if not self._workspace._is_hydrated:
             await self._workspace.hydrate()
         req = api_pb2.WorkspaceSetDefaultEnvironmentRequest(environment_name=name)
         await self._workspace.client.stub.WorkspaceSetDefaultEnvironment(req)

{modal-1.5.5.dev15 → modal-1.5.5.dev17}/modal/app.py

@@ -33,10 +33,7 @@ from ._partial_function import (
 from ._server import _Server, validate_http_server_config
 from ._supports_logs import _LogQueryData
 from ._utils.async_utils import synchronize_api
-from ._utils.deprecation import (
-    deprecation_warning,
-    handle_deprecated_parameters,
-)
+from ._utils.deprecation import deprecation_warning, handle_deprecated_parameters, with_deprecation_warning
 from ._utils.function_utils import (
     FunctionInfo,
     is_flash_object,
@@ -274,6 +271,10 @@ class _App:
         return self._name
 
     @property
+    @with_deprecation_warning(
+        (2026, 8, 26),
+        "`App.is_interactive` is deprecated and will be removed in `modal` version 1.6.0",
+    )
     def is_interactive(self) -> bool:
         """mdmd:hidden"""
         return self._is_interactive_
@@ -383,6 +384,11 @@ class _App:
             raise InvalidError("App is not running")
         return f"https://modal.com/id/{self._app_id}"
 
+    @with_deprecation_warning(
+        (2026, 8, 26),
+        "`App.set_description` is deprecated and will be removed in `modal` version 1.6.0. "
+        "Set `App.description` directly instead",
+    )
     def set_description(self, description: str):
         """mdmd:hidden
         Set the description of the App before it starts running.
@@ -396,6 +402,10 @@ class _App:
             raise InvalidError(f"App attribute `{key}` with value {value!r} is not a valid Modal object")
 
     @property
+    @with_deprecation_warning(
+        (2026, 8, 26),
+        "`App.image` is deprecated and will be removed in `modal` version 1.6.0",
+    )
     def image(self) -> _Image:
         """mdmd:hidden
         Retrieve the Image that will be used as the default for any Functions registered to the App.
@@ -599,14 +609,14 @@ class _App:
             raise ExecutionError("`_get_watch_mounts` requires a running app.")
 
         all_mounts = []
-        for function in self.registered_functions.values():
+        for function in self._local_state.functions.values():
             all_mounts.extend(function._serve_mounts)
 
         return [m for m in all_mounts if m.is_local()]
 
     def _add_function(self, function: _Function, is_web_endpoint: bool):
         local_state = self._local_state
-        if old_function := local_state.functions.get(function.tag, None):
+        if old_function := local_state.functions.get(function._tag_, None):
             if old_function is function:
                 return  # already added the same exact instance, ignore
 
@@ -615,25 +625,25 @@ class _App:
             # and we don't want to warn about a collision in that case.
             if not is_interactive_ipython():
                 logger.warning(
-                    f"Warning: function name '{function.tag}' collision!"
+                    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}"
                 )
-        if function.tag in local_state.classes:
-            logger.warning(f"Warning: tag {function.tag} exists but is overridden by function")
+        if function._tag_ in local_state.classes:
+            logger.warning(f"Warning: tag {function._tag_} exists but is overridden by function")
 
         if self._running_app:
             # If this is inside a container, then objects can be defined after app initialization.
             # So we may have to initialize objects once they get bound to the app.
-            if function.tag in self._running_app.function_ids:
-                object_id: str = self._running_app.function_ids[function.tag]
+            if function._tag_ in self._running_app.function_ids:
+                object_id: str = self._running_app.function_ids[function._tag_]
                 metadata: Message = self._running_app.object_handle_metadata[object_id]
                 function._hydrate(object_id, self._client, metadata)
 
-        local_state.functions[function.tag] = function
+        local_state.functions[function._tag_] = function
         if is_web_endpoint:
-            local_state.web_endpoints.append(function.tag)
+            local_state.web_endpoints.append(function._tag_)
 
     def _add_class(self, tag: str, cls: _Cls):
         if self._running_app:
@@ -668,6 +678,10 @@ class _App:
                 obj._hydrate(object_id, client, handle_metadata)
 
     @property
+    @with_deprecation_warning(
+        (2026, 8, 26),
+        "`App.registered_functions` is deprecated and will be removed in `modal` version 1.6.0",
+    )
     def registered_functions(self) -> dict[str, _Function]:
         """mdmd:hidden
         All modal.Function objects registered on the app.
@@ -680,6 +694,10 @@ class _App:
         return self._local_state.functions
 
     @property
+    @with_deprecation_warning(
+        (2026, 8, 26),
+        "`App.registered_classes` is deprecated and will be removed in `modal` version 1.6.0",
+    )
     def registered_classes(self) -> dict[str, _Cls]:
         """mdmd:hidden
         All modal.Cls objects registered on the app.
@@ -692,6 +710,10 @@ class _App:
         return self._local_state.classes
 
     @property
+    @with_deprecation_warning(
+        (2026, 8, 26),
+        "`App.registered_entrypoints` is deprecated and will be removed in `modal` version 1.6.0",
+    )
     def registered_entrypoints(self) -> dict[str, _LocalEntrypoint]:
         """mdmd:hidden
         All local CLI entrypoints registered on the app.
@@ -703,6 +725,10 @@ class _App:
         return self._local_state.local_entrypoints
 
     @property
+    @with_deprecation_warning(
+        (2026, 8, 26),
+        "`App.registered_web_endpoints` is deprecated and will be removed in `modal` version 1.6.0",
+    )
     def registered_web_endpoints(self) -> list[str]:
         """mdmd:hidden
         Names of Web Functions registered on the app.
@@ -995,7 +1021,7 @@ class _App:
             if is_generator is None:
                 is_generator = inspect.isgeneratorfunction(raw_f) or inspect.isasyncgenfunction(raw_f)
 
-            function = _Function.from_local(
+            function = _Function._from_local(
                 info,
                 app=self,
                 image=image,
@@ -1231,7 +1257,7 @@ class _App:
             info = FunctionInfo(None, serialized=serialized, user_cls=user_cls)
 
             i6pn_enabled = i6pn or cluster_size is not None
-            cls_func = _Function.from_local(
+            cls_func = _Function._from_local(
                 info,
                 app=self,
                 image=image or self._get_default_image(),
@@ -1274,7 +1300,7 @@ class _App:
 
             self._add_function(cls_func, is_web_endpoint=False)
 
-            cls: _Cls = _Cls.from_local(user_cls, self, cls_func)
+            cls: _Cls = _Cls._from_local(user_cls, self, cls_func)
 
             for method_name, partial_function in cls._method_partials.items():
                 if partial_function.params.webhook_config is not None:
@@ -1442,7 +1468,7 @@ class _App:
             # 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__)
             # Create the service function
-            service_function = _Function.from_local(
+            service_function = _Function._from_local(
                 info,
                 app=self,
                 image=image or self._get_default_image(),

{modal-1.5.5.dev15 → modal-1.5.5.dev17}/modal/cli/config.py

@@ -22,12 +22,16 @@ config_cli = ModalGroup(
 
 
 @config_cli.command("show", help="Show current configuration values (debugging command).")
-@click.option("--redact/--no-redact", default=True, help="Redact the `token_secret` value.")
+@click.option("--redact/--no-redact", default=True, help="Redact secret credential values.")
 def show(redact: bool):
     # This is just a test command
     config_dict = config.to_dict()
     if redact and config_dict.get("token_secret"):
         config_dict["token_secret"] = "***"
+    if redact and config_dict.get("oauth_refresh_token"):
+        config_dict["oauth_refresh_token"] = "***"
+    if redact and config_dict.get("oauth_client_secret"):
+        config_dict["oauth_client_secret"] = "***"
 
     OutputManager.get().print_json(json.dumps(config_dict))