modAL 1.4.1.dev0__tar.gz → 1.4.1.dev1__tar.gz

{modal-1.4.1.dev0 → modal-1.4.1.dev1}/PKG-INFO

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

{modal-1.4.1.dev0 → modal-1.4.1.dev1}/modal/cli/container.py

@@ -1,4 +1,5 @@
 # Copyright Modal Labs 2022
+import warnings
 from datetime import datetime, timezone
 from typing import Optional, Union
 
@@ -185,20 +186,40 @@ async def logs(
         task_info_resp = await client.stub.TaskGetInfo(api_pb2.TaskGetInfoRequest(task_id=task_id))
         app_id = task_info_resp.app_id
 
+        if not task_info_resp.info.started_at:
+            # Unlikely race or Modal backend issue, don't treat as a usage exception
+            return
+        container_started_dt = datetime.fromtimestamp(task_info_resp.info.started_at, timezone.utc)
+
         now = datetime.now(timezone.utc)
         if all_logs:
-            since_dt = datetime.fromtimestamp(task_info_resp.info.started_at, timezone.utc)
+            since_dt = container_started_dt
             if task_info_resp.info.finished_at:
                 until_dt = datetime.fromtimestamp(task_info_resp.info.finished_at, timezone.utc)
             else:
                 until_dt = now
         else:
-            since_dt = _parse_time_arg(since, default=now) if since else None
-            until_dt = _parse_time_arg(until, default=now) if until else None
+            since_dt = _parse_time_arg(since, default=container_started_dt)
+            if task_info_resp.info.finished_at:
+                default_until_dt = datetime.fromtimestamp(task_info_resp.info.finished_at, timezone.utc)
+            else:
+                default_until_dt = now
+            until_dt = _parse_time_arg(until, default=default_until_dt)
 
-        if since_dt is not None and until_dt is not None and since_dt >= until_dt:
+        if since is not None and until is not None and since_dt >= until_dt:
+            # User provided both --since and --until, but did so incorrectly
             raise UsageError("--since must be before --until.")
 
+        if since is not None and until is None and since_dt >= until_dt:
+            # User provided only --since and it is after the container finished
+            warnings.warn("--since time is after the Container finished, no logs to fetch.", UserWarning)
+            return
+
+        if until is not None and since is None and since_dt >= until_dt:
+            # User provided only --until and it is before the Container started
+            warnings.warn("--until time is before the Container started, no logs to fetch.", UserWarning)
+            return
+
         if since_dt is not None:
             effective_until = until_dt or now
             if effective_until - since_dt > _MAX_FETCH_RANGE:

{modal-1.4.1.dev0 → modal-1.4.1.dev1}/modal/client.pyi

@@ -35,7 +35,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.4.1.dev0",
+        version: str = "1.4.1.dev1",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -171,7 +171,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.4.1.dev0",
+        version: str = "1.4.1.dev1",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.4.1.dev0 → modal-1.4.1.dev1}/modal/functions.pyi

@@ -348,7 +348,7 @@ class Function(
 
     _call_generator: ___call_generator_spec
 
-    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER:
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
@@ -357,7 +357,7 @@ class Function(
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
 
-    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P]
+    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType]
 
     class __remote_gen_spec(typing_extensions.Protocol):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -384,7 +384,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """[Experimental] Calls the function with the given arguments, without waiting for the results.
 
@@ -407,7 +407,7 @@ class Function(
             """
             ...
 
-    _experimental_spawn: ___experimental_spawn_spec[modal._functions.ReturnType, modal._functions.P]
+    _experimental_spawn: ___experimental_spawn_spec[modal._functions.P, modal._functions.ReturnType]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> None: ...
@@ -415,7 +415,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P]
 
-    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """Calls the function with the given arguments, without waiting for the results.
 
@@ -436,7 +436,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P]
+    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function."""

{modal-1.4.1.dev0 → modal-1.4.1.dev1}/modal/mount.py

@@ -699,16 +699,18 @@ Mount = synchronize_api(_Mount)
 
 def _create_client_mount():
     # TODO(erikbern): make this a static method on the Mount class
-    import synchronicity
+    import importlib
 
-    import modal
+    import synchronicity
 
-    # Get the base_path because it also contains `modal_proto`.
-    modal_parent_dir, _ = os.path.split(modal.__path__[0])
     client_mount = _Mount._new()
 
     for pkg_name in MODAL_PACKAGES:
-        package_base_path = Path(modal_parent_dir) / pkg_name
+        # Look up each package's actual install path via importlib rather than
+        # assuming all packages are siblings of `modal`. In Bazel runfiles,
+        # modal and modal_proto live in different directories.
+        pkg_module = importlib.import_module(pkg_name)
+        package_base_path = Path(pkg_module.__path__[0])
         client_mount = client_mount.add_local_dir(
             package_base_path,
             remote_path=f"/pkg/{pkg_name}",

{modal-1.4.1.dev0 → modal-1.4.1.dev1}/modal.egg-info/PKG-INFO

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