modAL 1.4.1.dev0__py3-none-any.whl → 1.4.1.dev1__py3-none-any.whl

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/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/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/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.dist-info → modal-1.4.1.dev1.dist-info}/METADATA

@@ -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.dist-info → modal-1.4.1.dev1.dist-info}/RECORD

@@ -26,7 +26,7 @@ modal/app.pyi,sha256=vU6tli-ELcF3do5sCF-Wch1gFRP3xjPLoq112SCq_z8,54009
 modal/billing.py,sha256=B2zXa7KeMnpqi2AQINycEk-KSXVYaLTTTAQTtuf2Gfs,257
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=-IxazxLhdkNFAHS2AP2FpyTVpCDVR58RF6ecSVV59r0,14862
-modal/client.pyi,sha256=GfSLk0jEainM9P3KPh523qZQmeC-V2M3VaC4uZ53W6s,14930
+modal/client.pyi,sha256=Y2lmvTB8EUZXdnD05uLwXQZq-9ZLcgmAoS-PR-ZjJiU,14930
 modal/cloud_bucket_mount.py,sha256=KkaJVy5vpO_u2NtDYtv1JM-M3y4J0UtWBapTDKpQRcA,6034
 modal/cloud_bucket_mount.pyi,sha256=mGDeEd1XvxGpCE6O5jRBSfIvMXvZ5AtIybea5k-0w9w,7560
 modal/cls.py,sha256=Yrl5b_tQhZMhc5avInM-i5UlGuqeog6Gs4rX2d9lLjI,40390
@@ -43,12 +43,12 @@ modal/file_io.py,sha256=AKTaKR4y2JO1vsmJ8tRxMhgJtHmtb-TCe1ZZYDte-w4,22221
 modal/file_io.pyi,sha256=DPaq0BhySaiCX3g56QHhyIMdU1izbfWsjpSp30JoJUU,15745
 modal/file_pattern_matcher.py,sha256=A_Kdkej6q7YQyhM_2-BvpFmPqJ0oHb54B6yf9VqvPVE,8116
 modal/functions.py,sha256=EZRcHFfnoYbvawUJnAHF5nIvoo9GX2Djy7mUmOCXmXc,258
-modal/functions.pyi,sha256=9TLs1YOVU9LXCzy3ecuoQTY4Pu8hGBd0thvYqNdxws4,34316
+modal/functions.pyi,sha256=rDN6WcJ6GYc4Hy5lrIXi1CUIiaQL8cmC49zuk4w9iJU,34316
 modal/image.py,sha256=-teX2JZYVId88KN-dH-orbdugDiyezlfmnrsvX1bgKg,112472
 modal/image.pyi,sha256=aCs8kbcZOSZp9eFHdG6CKD-3pplb9XBfVKaoBiH_rU0,79295
 modal/io_streams.py,sha256=JcYbvvjMZFugv53yHc9Id0N4nIvDMwV63ZtnN1bPmZc,30940
 modal/io_streams.pyi,sha256=aBxCcbHTprL08FLvPlkzu4bypCTT7xUdelNe5kc7OZY,18506
-modal/mount.py,sha256=S09M8zspoY6PwqabUFVSVgO3C5OpJZLTtWaXQthQPyo,34090
+modal/mount.py,sha256=FkpAuQ8Mo2FHNwNtWhuNwvOmNDcUxk4wY9WGntLYa6k,34239
 modal/mount.pyi,sha256=HVNPL8po23Hulaj7Kdl5goakZbirN0ADv2nkLc8Hpn4,15748
 modal/network_file_system.py,sha256=huBlv5aY977qVavInhrgu-rJnwwytGEMJiT4DsdZMk4,13337
 modal/network_file_system.pyi,sha256=m4dzWF4rYUjKMcQllMn2FzTtMI6lR7lORSBancsx9t4,16059
@@ -149,7 +149,7 @@ modal/cli/billing.py,sha256=9Gj1H_Y8ziRAupJj90XhnPOw6nBMQfGU_Ys_ImheLYk,5690
 modal/cli/changelog.py,sha256=Ilzy1_3xF3y49w-_nwQkEVjoCupwdht7UuBrfV53nT0,5686
 modal/cli/cluster.py,sha256=FdCe4a0I_o9dT6Vi3r3k-19D64fOGEWFaPYFvBlnTBE,3337
 modal/cli/config.py,sha256=qPgj9qhQNClttO9DZEBYYxCmkaHv0WCP8O75u5eqZlY,1704
-modal/cli/container.py,sha256=YzwryjOTrMJ8PV44tH1Yo5XPgTyoiOxXEfMbHx-HksY,9768
+modal/cli/container.py,sha256=Db51L3Z6FYq-tZixm8hod8TgamGMN8PN6ke8j_xgtAM,10819
 modal/cli/dashboard.py,sha256=MJdbZq1duj97Hu3p9NNLrPogC1Wm2wL3dmCjBUgrMtU,862
 modal/cli/dict.py,sha256=uRny4LtN7ej7ONir1cpSLGAC-gvZrIGO8bftbCeK0VE,4743
 modal/cli/entry_point.py,sha256=6NXIo2JzzQD7yZ57M6Y5KvL8QnYYGp0_T7YucOeqFQA,6262
@@ -173,7 +173,7 @@ modal/experimental/__init__.py,sha256=Wb1YoAKAnNxH_0c2wA0T12I7bSu9PSO2nS_LuLska7
 modal/experimental/flash.py,sha256=ATGhVO8AleJ-TOe2PGolI5T7zfCEtj0kl_ivMPp7Rqg,33362
 modal/experimental/flash.pyi,sha256=R4h2nQl7-oiwqq_twCp0YqID_LnPjPGqxywXvxbiLIk,17011
 modal/experimental/ipython.py,sha256=TrCfmol9LGsRZMeDoeMPx3Hv3BFqQhYnmD_iH0pqdhk,2904
-modal-1.4.1.dev0.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.4.1.dev1.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=5sVABw4uGUqPXjcWT0Nqjkpe5KLs89C3tFnla58-D0M,3756
 modal_docs/gen_cli_docs_main.py,sha256=UPGr7O1DYTIRLwfINe2rbdh89J3cPVTU1OWL-SjxnOQ,198
@@ -184,8 +184,8 @@ modal_docs/mdmd/mdmd.py,sha256=fNMtrFy0Z7KMXysr9v0w9H0OOuRVBW4-sqJu1pvRQm4,9583
 modal_docs/mdmd/signatures.py,sha256=XJaZrK7Mdepk5fdX51A8uENiLFNil85Ud0d4MH8H5f0,3218
 modal_proto/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
 modal_proto/api_grpc.py,sha256=rTv9MyBCWKTEbPEXk4h5sFoCbjrCTg0Gcwqc69gr2Ns,146012
-modal_proto/api_pb2.py,sha256=eGjknXw7PV3F4-3vZUZMT3u9qvaTITxg-mBcn-hj_WU,406441
-modal_proto/api_pb2.pyi,sha256=vrRnTkhs-ljO55p_FmSetY2uSVDGaI_mUZkVg2VmMM8,571829
+modal_proto/api_pb2.py,sha256=bXZh5CrAOJ4sxNzrvXbU87Oirmeh2UCcjgCLwTf4R5M,406482
+modal_proto/api_pb2.pyi,sha256=HsusJF-hH3S89Xa0GDOVWnoo-oC8J34Behfj4NDsYOE,571974
 modal_proto/api_pb2_grpc.py,sha256=nZWyLmjNkwq3H33-HWmARRLqfJ7Zgdr0ou7lYnRu2jg,314684
 modal_proto/api_pb2_grpc.pyi,sha256=safA3cDMsiSgIO6ig_x7tRkfqq3fKM2Apqsm6WbHnw4,73447
 modal_proto/modal_api_grpc.py,sha256=O743nwd1Li6I8Bz0qsJEtujl2tocgSEW70HY1N6n9VY,23061
@@ -195,10 +195,10 @@ modal_proto/task_command_router_pb2.py,sha256=uSSR8Y9Yp07cIL60ds7__wUr5rj1uL2CQY
 modal_proto/task_command_router_pb2.pyi,sha256=utNwipYgMZUEUuWBE7sJ5cNjRctozHKPKDRpLy6cPLM,25667
 modal_proto/task_command_router_pb2_grpc.py,sha256=YoinPeLc-uwFShig8gE0MluOi6n-qqJZQ3YvnKwKUz8,23194
 modal_proto/task_command_router_pb2_grpc.pyi,sha256=VUSE5l1O6ATPT8Wbj4M3faMiIy5vFxSoS5ZlKfTEpHc,7449
-modal_version/__init__.py,sha256=qKtPcmRup5kC8XWcFCzLkS5clWTSHkBOrkU3bWqaUHE,120
+modal_version/__init__.py,sha256=3eckhcwFp0zlkdoJXzBjKav0gkIIikNduHVdRRvHjiU,120
 modal_version/__main__.py,sha256=nLUbubxKx7GXNzJIkTB7M7_u8080LyLM0IS0rzFkC_c,119
-modal-1.4.1.dev0.dist-info/METADATA,sha256=q7nsEe4iFIRPVdPSSsQz5R3r8hPFCymZg56A2UJL020,2364
-modal-1.4.1.dev0.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-1.4.1.dev0.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.4.1.dev0.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.4.1.dev0.dist-info/RECORD,,
+modal-1.4.1.dev1.dist-info/METADATA,sha256=K8UMDlT_3tZMvqanq3mpyaVvhyirrE5Y4QK0b_mcQdI,2364
+modal-1.4.1.dev1.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-1.4.1.dev1.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.4.1.dev1.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.4.1.dev1.dist-info/RECORD,,