modal 1.1.2.dev2__tar.gz → 1.1.2.dev5__tar.gz

{modal-1.1.2.dev2 → modal-1.1.2.dev5}/PKG-INFO

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

{modal-1.1.2.dev2 → modal-1.1.2.dev5}/modal/__main__.py

@@ -37,7 +37,6 @@ def main():
 
         from grpclib import GRPCError, Status
         from rich.panel import Panel
-        from rich.text import Text
 
         if isinstance(exc, GRPCError):
             status_map = {
@@ -69,7 +68,7 @@ def main():
                 content = f"{content}\n\nNote: {' '.join(notes)}"
 
         console = make_console(stderr=True)
-        panel = Panel(Text(content), title=title, title_align="left", border_style="red")
+        panel = Panel(content, title=title, title_align="left", border_style="red")
         console.print(panel, highlight=False)
         sys.exit(1)
 

{modal-1.1.2.dev2 → modal-1.1.2.dev5}/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.2.dev2",
+        version: str = "1.1.2.dev5",
     ):
         """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.2.dev2",
+        version: str = "1.1.2.dev5",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.1.2.dev2 → modal-1.1.2.dev5}/modal/config.py

@@ -94,7 +94,7 @@ from google.protobuf.empty_pb2 import Empty
 from modal_proto import api_pb2
 
 from ._utils.logger import configure_logger
-from .exception import InvalidError
+from .exception import InvalidError, NotFoundError
 
 DEFAULT_SERVER_URL = "https://api.modal.com"
 
@@ -158,15 +158,15 @@ def _config_active_profile() -> str:
         return "default"
 
 
-def config_set_active_profile(env: str) -> None:
+def config_set_active_profile(profile: str) -> None:
     """Set the user's active modal profile by writing it to the `.modal.toml` file."""
-    if env not in _user_config:
-        raise KeyError(env)
+    if profile not in _user_config:
+        raise NotFoundError(f"No profile named '{profile}' found in {user_config_path}")
 
-    for key, values in _user_config.items():
-        values.pop("active", None)
+    for profile_data in _user_config.values():
+        profile_data.pop("active", None)
 
-    _user_config[env]["active"] = True
+    _user_config[profile]["active"] = True  # type: ignore
     _write_user_config(_user_config)
 
 

{modal-1.1.2.dev2 → modal-1.1.2.dev5}/modal/file_pattern_matcher.py

@@ -11,6 +11,7 @@ then asking it whether file paths match any of its patterns.
 
 import os
 from abc import abstractmethod
+from functools import cached_property
 from pathlib import Path
 from typing import Callable, Optional, Sequence, Union
 
@@ -99,11 +100,11 @@ class FilePatternMatcher(_AbstractPatternMatcher):
     ```
     """
 
-    patterns: list[Pattern]
-    _delayed_init: Callable[[], None] = None
+    _file_path: Optional[Union[str, Path]]
+    _pattern_strings: Optional[Sequence[str]]
 
-    def _set_patterns(self, patterns: Sequence[str]) -> None:
-        self.patterns = []
+    def _parse_patterns(self, patterns: Sequence[str]) -> list[Pattern]:
+        parsed_patterns = []
         for pattern in list(patterns):
             pattern = pattern.strip().strip(os.path.sep)
             if not pattern:
@@ -118,7 +119,8 @@ class FilePatternMatcher(_AbstractPatternMatcher):
             # In Python, we can proceed without explicit syntax checking
             new_pattern.cleaned_pattern = pattern
             new_pattern.dirs = pattern.split(os.path.sep)
-            self.patterns.append(new_pattern)
+            parsed_patterns.append(new_pattern)
+        return parsed_patterns
 
     def __init__(self, *pattern: str) -> None:
         """Initialize a new FilePatternMatcher instance.
@@ -129,7 +131,8 @@ class FilePatternMatcher(_AbstractPatternMatcher):
         Raises:
             ValueError: If an illegal exclusion pattern is provided.
         """
-        self._set_patterns(pattern)
+        self._pattern_strings = pattern
+        self._file_path = None
 
     @classmethod
     def from_file(cls, file_path: Union[str, Path]) -> "FilePatternMatcher":
@@ -148,14 +151,10 @@ class FilePatternMatcher(_AbstractPatternMatcher):
         ```
 
         """
-        uninitialized = cls.__new__(cls)
-
-        def _delayed_init():
-            uninitialized._set_patterns(Path(file_path).read_text("utf8").splitlines())
-            uninitialized._delayed_init = None
-
-        uninitialized._delayed_init = _delayed_init
-        return uninitialized
+        instance = cls.__new__(cls)
+        instance._file_path = file_path
+        instance._pattern_strings = None
+        return instance
 
     def _matches(self, file_path: str) -> bool:
         """Check if the file path or any of its parent directories match the patterns.
@@ -194,6 +193,18 @@ class FilePatternMatcher(_AbstractPatternMatcher):
 
         return matched
 
+    @cached_property
+    def patterns(self) -> list[Pattern]:
+        """Get the patterns, loading from file if necessary."""
+        if self._file_path is not None:
+            # Lazy load from file
+            pattern_strings = Path(self._file_path).read_text("utf8").splitlines()
+        else:
+            # Use patterns provided in __init__
+            pattern_strings = list(self._pattern_strings)
+
+        return self._parse_patterns(pattern_strings)
+
     def can_prune_directories(self) -> bool:
         """
         Returns True if this pattern matcher allows safe early directory pruning.
@@ -205,8 +216,6 @@ class FilePatternMatcher(_AbstractPatternMatcher):
         return not any(pattern.exclusion for pattern in self.patterns)
 
     def __call__(self, file_path: Path) -> bool:
-        if self._delayed_init:
-            self._delayed_init()
         return self._matches(str(file_path))
 
 

{modal-1.1.2.dev2 → modal-1.1.2.dev5}/modal/image.pyi

@@ -91,7 +91,7 @@ def _create_context_mount_function(
     dockerfile_cmds: list[str] = [],
     dockerfile_path: typing.Optional[pathlib.Path] = None,
     context_mount: typing.Optional[modal.mount._Mount] = None,
-    context_dir: typing.Union[pathlib.Path, str, None] = None,
+    context_dir: typing.Union[str, pathlib.Path, None] = None,
 ): ...
 
 class _ImageRegistryConfig:
@@ -537,7 +537,7 @@ class _Image(modal._object._Object):
         secrets: collections.abc.Sequence[modal.secret._Secret] = [],
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
         context_mount: typing.Optional[modal.mount._Mount] = None,
-        context_dir: typing.Union[pathlib.Path, str, None] = None,
+        context_dir: typing.Union[str, pathlib.Path, None] = None,
         force_build: bool = False,
         ignore: typing.Union[
             collections.abc.Sequence[str], collections.abc.Callable[[pathlib.Path], bool]
@@ -748,7 +748,7 @@ class _Image(modal._object._Object):
         *,
         context_mount: typing.Optional[modal.mount._Mount] = None,
         force_build: bool = False,
-        context_dir: typing.Union[pathlib.Path, str, None] = None,
+        context_dir: typing.Union[str, pathlib.Path, None] = None,
         secrets: collections.abc.Sequence[modal.secret._Secret] = [],
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
         add_python: typing.Optional[str] = None,
@@ -1381,7 +1381,7 @@ class Image(modal.object.Object):
         secrets: collections.abc.Sequence[modal.secret.Secret] = [],
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
         context_mount: typing.Optional[modal.mount.Mount] = None,
-        context_dir: typing.Union[pathlib.Path, str, None] = None,
+        context_dir: typing.Union[str, pathlib.Path, None] = None,
         force_build: bool = False,
         ignore: typing.Union[
             collections.abc.Sequence[str], collections.abc.Callable[[pathlib.Path], bool]
@@ -1592,7 +1592,7 @@ class Image(modal.object.Object):
         *,
         context_mount: typing.Optional[modal.mount.Mount] = None,
         force_build: bool = False,
-        context_dir: typing.Union[pathlib.Path, str, None] = None,
+        context_dir: typing.Union[str, pathlib.Path, None] = None,
         secrets: collections.abc.Sequence[modal.secret.Secret] = [],
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
         add_python: typing.Optional[str] = None,

{modal-1.1.2.dev2 → modal-1.1.2.dev5}/modal.egg-info/PKG-INFO

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

{modal-1.1.2.dev2 → modal-1.1.2.dev5}/modal_proto/api.proto

@@ -1819,6 +1819,7 @@ message FunctionOptions {
   optional uint32 max_concurrent_inputs = 14;
   optional uint32 batch_max_size = 15;
   optional uint64 batch_linger_ms = 16;
+  optional SchedulerPlacement scheduler_placement = 17;
 }
 
 message FunctionPrecreateRequest {