modal 1.1.5.dev48__tar.gz → 1.1.5.dev49__tar.gz

{modal-1.1.5.dev48 → modal-1.1.5.dev49}/PKG-INFO

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

{modal-1.1.5.dev48 → modal-1.1.5.dev49}/modal/_utils/name_utils.py

@@ -31,12 +31,27 @@ def is_valid_environment_name(name: str) -> bool:
     return len(name) <= 64 and re.match(r"^[a-zA-Z0-9][a-zA-Z0-9-_.]+$", name) is not None
 
 
-def is_valid_tag(tag: str) -> bool:
-    """Tags are alphanumeric, dashes, periods, and underscores, and must be 50 characters or less"""
-    pattern = r"^[a-zA-Z0-9._-]{1,50}$"
+def is_valid_tag(tag: str, max_length: int = 50) -> bool:
+    """Tags are alphanumeric, dashes, periods, and underscores, and not longer than the max_length."""
+    pattern = rf"^[a-zA-Z0-9._-]{{1,{max_length}}}$"
     return bool(re.match(pattern, tag))
 
 
+def check_tag_dict(tags: dict[str, str]) -> dict[str, str]:
+    rules = (
+        "\n\nTags may contain only alphanumeric characters, dashes, periods, or underscores, "
+        "and must be 63 characters or less."
+    )
+    max_length = 63
+    for key, value in tags.items():
+        if not is_valid_tag(key, max_length):
+            raise InvalidError(f"Invalid tag key: {key!r}.{rules}")
+        if not is_valid_tag(value, max_length):
+            raise InvalidError(f"Invalid tag value: {value!r}.{rules}")
+
+    return tags
+
+
 def check_object_name(name: str, object_type: str) -> None:
     message = (
         f"Invalid {object_type} name: '{name}'."

{modal-1.1.5.dev48 → modal-1.1.5.dev49}/modal/app.py

@@ -35,7 +35,7 @@ from ._utils.deprecation import (
 from ._utils.function_utils import FunctionInfo, is_global_object, is_method_fn
 from ._utils.grpc_utils import retry_transient_errors
 from ._utils.mount_utils import validate_volumes
-from ._utils.name_utils import check_object_name
+from ._utils.name_utils import check_object_name, check_tag_dict
 from .client import _Client
 from .cloud_bucket_mount import _CloudBucketMount
 from .cls import _Cls, parameter
@@ -151,6 +151,8 @@ class _App:
 
     _name: Optional[str]
     _description: Optional[str]
+    _tags: dict[str, str]
+
     _functions: dict[str, _Function]
     _classes: dict[str, _Cls]
 
@@ -171,6 +173,7 @@ class _App:
         self,
         name: Optional[str] = None,
         *,
+        tags: Optional[dict[str, str]] = None,  # Additional metadata to set on the App
         image: Optional[_Image] = None,  # Default Image for the App (otherwise default to `modal.Image.debian_slim()`)
         secrets: Sequence[_Secret] = [],  # Secrets to add for all Functions in the App
         volumes: dict[Union[str, PurePosixPath], _Volume] = {},  # Volume mounts to use for all Functions
@@ -190,6 +193,7 @@ class _App:
 
         self._name = name
         self._description = name
+        self._tags = check_tag_dict(tags or {})
         self._include_source_default = include_source
 
         check_sequence(secrets, _Secret, "`secrets=` has to be a list or tuple of `modal.Secret` objects")
@@ -371,8 +375,8 @@ class _App:
         *,
         name: Optional[str] = None,  # Name for the deployment, overriding any set on the App
         environment_name: Optional[str] = None,  # Environment to deploy the App in
-        tag: str = "",  # Optional metadata that will be visible in the deployment history
-        client: Optional[_Client] = None,  # Alternate client to use for RPCs
+        tag: str = "",  # Optional metadata that is specific to this deployment
+        client: Optional[_Client] = None,  # Alternate client to use for communication with the server
     ) -> typing_extensions.Self:
         """Deploy the App so that it is available persistently.
 
@@ -1044,7 +1048,7 @@ class _App:
 
         return wrapper
 
-    def include(self, /, other_app: "_App") -> typing_extensions.Self:
+    def include(self, /, other_app: "_App", inherit_tags: bool = True) -> typing_extensions.Self:
         """Include another App's objects in this one.
 
         Useful for splitting up Modal Apps across different self-contained files.
@@ -1067,6 +1071,10 @@ class _App:
             # use function declared on the included app
             bar.remote()
         ```
+
+        When `inherit_tags=True` any tags set on the other App will be inherited by this App
+        (with this App's tags taking precedence in the case of conflicts).
+
         """
         for tag, function in other_app._functions.items():
             self._add_function(function, False)  # TODO(erikbern): webhook config?
@@ -1080,6 +1088,10 @@ class _App:
                 )
 
             self._add_class(tag, cls)
+
+        if inherit_tags:
+            self._tags = {**other_app._tags, **self._tags}
+
         return self
 
     async def _logs(self, client: Optional[_Client] = None) -> AsyncGenerator[str, None]:

{modal-1.1.5.dev48 → modal-1.1.5.dev49}/modal/app.pyi

@@ -110,6 +110,7 @@ class _App:
     _container_app: typing.ClassVar[typing.Optional[_App]]
     _name: typing.Optional[str]
     _description: typing.Optional[str]
+    _tags: dict[str, str]
     _functions: dict[str, modal._functions._Function]
     _classes: dict[str, modal.cls._Cls]
     _image: typing.Optional[modal.image._Image]
@@ -126,6 +127,7 @@ class _App:
         self,
         name: typing.Optional[str] = None,
         *,
+        tags: typing.Optional[dict[str, str]] = None,
         image: typing.Optional[modal.image._Image] = None,
         secrets: collections.abc.Sequence[modal.secret._Secret] = [],
         volumes: dict[typing.Union[str, pathlib.PurePosixPath], modal.volume._Volume] = {},
@@ -492,7 +494,7 @@ class _App:
         """Decorator to register a new Modal [Cls](https://modal.com/docs/reference/modal.Cls) with this App."""
         ...
 
-    def include(self, /, other_app: _App) -> typing_extensions.Self:
+    def include(self, /, other_app: _App, inherit_tags: bool = True) -> typing_extensions.Self:
         """Include another App's objects in this one.
 
         Useful for splitting up Modal Apps across different self-contained files.
@@ -515,6 +517,9 @@ class _App:
             # use function declared on the included app
             bar.remote()
         ```
+
+        When `inherit_tags=True` any tags set on the other App will be inherited by this App
+        (with this App's tags taking precedence in the case of conflicts).
         """
         ...
 
@@ -576,6 +581,7 @@ class App:
     _container_app: typing.ClassVar[typing.Optional[App]]
     _name: typing.Optional[str]
     _description: typing.Optional[str]
+    _tags: dict[str, str]
     _functions: dict[str, modal.functions.Function]
     _classes: dict[str, modal.cls.Cls]
     _image: typing.Optional[modal.image.Image]
@@ -592,6 +598,7 @@ class App:
         self,
         name: typing.Optional[str] = None,
         *,
+        tags: typing.Optional[dict[str, str]] = None,
         image: typing.Optional[modal.image.Image] = None,
         secrets: collections.abc.Sequence[modal.secret.Secret] = [],
         volumes: dict[typing.Union[str, pathlib.PurePosixPath], modal.volume.Volume] = {},
@@ -1101,7 +1108,7 @@ class App:
         """Decorator to register a new Modal [Cls](https://modal.com/docs/reference/modal.Cls) with this App."""
         ...
 
-    def include(self, /, other_app: App) -> typing_extensions.Self:
+    def include(self, /, other_app: App, inherit_tags: bool = True) -> typing_extensions.Self:
         """Include another App's objects in this one.
 
         Useful for splitting up Modal Apps across different self-contained files.
@@ -1124,6 +1131,9 @@ class App:
             # use function declared on the included app
             bar.remote()
         ```
+
+        When `inherit_tags=True` any tags set on the other App will be inherited by this App
+        (with this App's tags taking precedence in the case of conflicts).
         """
         ...
 

{modal-1.1.5.dev48 → modal-1.1.5.dev49}/modal/client.pyi

@@ -33,7 +33,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.1.5.dev48",
+        version: str = "1.1.5.dev49",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -164,7 +164,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.1.5.dev48",
+        version: str = "1.1.5.dev49",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.1.5.dev48 → modal-1.1.5.dev49}/modal/runner.py

@@ -183,8 +183,9 @@ async def _publish_app(
     app_state: int,  # api_pb2.AppState.value
     functions: dict[str, _Function],
     classes: dict[str, _Cls],
-    name: str = "",  # Only relevant for deployments
-    tag: str = "",  # Only relevant for deployments
+    name: str = "",
+    tags: dict[str, str] = {},  # Additional App metadata
+    deployment_tag: str = "",  # Only relevant for deployments
     commit_info: Optional[api_pb2.CommitInfo] = None,  # Git commit information
 ) -> tuple[str, list[api_pb2.Warning]]:
     """Wrapper for AppPublish RPC."""
@@ -194,12 +195,13 @@ async def _publish_app(
     request = api_pb2.AppPublishRequest(
         app_id=running_app.app_id,
         name=name,
-        deployment_tag=tag,
+        tags=tags,
+        deployment_tag=deployment_tag,
+        commit_info=commit_info,
         app_state=app_state,  # type: ignore  : should be a api_pb2.AppState.value
         function_ids=running_app.function_ids,
         class_ids=running_app.class_ids,
         definition_ids=definition_ids,
-        commit_info=commit_info,
     )
 
     try:
@@ -340,7 +342,7 @@ async def _run_app(
             await _create_all_objects(client, running_app, app._functions, app._classes, environment_name)
 
             # Publish the app
-            await _publish_app(client, running_app, app_state, app._functions, app._classes)
+            await _publish_app(client, running_app, app_state, app._functions, app._classes, tags=app._tags)
         except asyncio.CancelledError as e:
             # this typically happens on sigint/ctrl-C during setup (the KeyboardInterrupt happens in the main thread)
             if output_mgr := _get_output_manager():
@@ -448,7 +450,14 @@ async def _serve_update(
         )
 
         # Publish the updated app
-        await _publish_app(client, running_app, api_pb2.APP_STATE_UNSPECIFIED, app._functions, app._classes)
+        await _publish_app(
+            client,
+            running_app,
+            app_state=api_pb2.APP_STATE_UNSPECIFIED,
+            functions=app._functions,
+            classes=app._classes,
+            tags=app._tags,
+        )
 
         # Communicate to the parent process
         is_ready.set()
@@ -497,7 +506,7 @@ async def _deploy_app(
     else:
         check_object_name(name, "App")
 
-    if tag and not is_valid_tag(tag):
+    if tag and not is_valid_tag(tag, max_length=50):
         raise InvalidError(
             f"Deployment tag {tag!r} is invalid."
             "\n\nTags may only contain alphanumeric characters, dashes, periods, and underscores, "
@@ -540,12 +549,13 @@ async def _deploy_app(
             app_url, warnings = await _publish_app(
                 client,
                 running_app,
-                api_pb2.APP_STATE_DEPLOYED,
-                app._functions,
-                app._classes,
-                name,
-                tag,
-                commit_info,
+                app_state=api_pb2.APP_STATE_DEPLOYED,
+                functions=app._functions,
+                classes=app._classes,
+                name=name,
+                tags=app._tags,
+                deployment_tag=tag,
+                commit_info=commit_info,
             )
         except Exception as e:
             # Note that AppClientDisconnect only stops the app if it's still initializing, and is a no-op otherwise.

{modal-1.1.5.dev48 → modal-1.1.5.dev49}/modal/runner.pyi

@@ -43,7 +43,8 @@ async def _publish_app(
     functions: dict[str, modal._functions._Function],
     classes: dict[str, modal.cls._Cls],
     name: str = "",
-    tag: str = "",
+    tags: dict[str, str] = {},
+    deployment_tag: str = "",
     commit_info: typing.Optional[modal_proto.api_pb2.CommitInfo] = None,
 ) -> tuple[str, list[modal_proto.api_pb2.Warning]]:
     """Wrapper for AppPublish RPC."""

{modal-1.1.5.dev48 → modal-1.1.5.dev49}/modal.egg-info/PKG-INFO

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

{modal-1.1.5.dev48 → modal-1.1.5.dev49}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.1.5.dev48"
+__version__ = "1.1.5.dev49"