modal 1.5.6.dev16__tar.gz → 1.5.6.dev17__tar.gz

{modal-1.5.6.dev16 → modal-1.5.6.dev17}/PKG-INFO

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

{modal-1.5.6.dev16 → modal-1.5.6.dev17}/modal/_logs.py

@@ -21,6 +21,7 @@ if TYPE_CHECKING:
 class LogsFilters:
     source: "api_pb2.FileDescriptor.ValueType" = api_pb2.FILE_DESCRIPTOR_UNSPECIFIED
     function_id: str = ""
+    parametrized_function_id: str = ""
     function_call_id: str = ""
     task_id: str = ""
     sandbox_id: str = ""
@@ -249,6 +250,7 @@ async def _refine_dense_ranges(
                     bucket_secs=smaller_secs,
                     source=filters.source,
                     function_id=filters.function_id,
+                    parametrized_function_id=filters.parametrized_function_id,
                     function_call_id=filters.function_call_id,
                     task_id=filters.task_id,
                     sandbox_id=filters.sandbox_id,
@@ -303,6 +305,7 @@ async def _fetch_interval(
         limit=limit,
         source=filters.source,
         function_id=filters.function_id,
+        parametrized_function_id=filters.parametrized_function_id,
         function_call_id=filters.function_call_id,
         task_id=filters.task_id,
         sandbox_id=filters.sandbox_id,
@@ -356,6 +359,7 @@ async def tail_logs(
             limit=n,
             source=filters.source,
             function_id=filters.function_id,
+            parametrized_function_id=filters.parametrized_function_id,
             function_call_id=filters.function_call_id,
             task_id=filters.task_id,
             sandbox_id=filters.sandbox_id,
@@ -377,6 +381,7 @@ async def tail_logs(
             limit=n,
             source=filters.source,
             function_id=filters.function_id,
+            parametrized_function_id=filters.parametrized_function_id,
             function_call_id=filters.function_call_id,
             task_id=filters.task_id,
             sandbox_id=filters.sandbox_id,
@@ -422,6 +427,7 @@ async def fetch_logs(
         bucket_secs=bucket_secs,
         source=filters.source,
         function_id=filters.function_id,
+        parametrized_function_id=filters.parametrized_function_id,
         function_call_id=filters.function_call_id,
         task_id=filters.task_id,
         sandbox_id=filters.sandbox_id,

{modal-1.5.6.dev16 → modal-1.5.6.dev17}/modal/_output/pty.py

@@ -101,6 +101,7 @@ async def get_app_logs_loop(
     function_id: str = "",
     function_call_id: str = "",
     search_text: str = "",
+    parametrized_function_id: str = "",
 ):
     last_log_batch_entry_id = last_entry_id
     _prefixes = prefix_fields or []
@@ -172,6 +173,7 @@ async def get_app_logs_loop(
             last_entry_id=last_log_batch_entry_id,
             file_descriptor=file_descriptor,
             function_id=function_id,
+            parametrized_function_id=parametrized_function_id,
             function_call_id=function_call_id,
         )
         log_batch: api_pb2.TaskLogsBatch

{modal-1.5.6.dev16 → modal-1.5.6.dev17}/modal/_utils/blob_utils.py

@@ -254,26 +254,28 @@ def get_content_length(data: BinaryIO) -> int:
 
 async def _blob_upload_with_fallback(
     items, blob_ids: list[str], callback, content_length: int
-) -> tuple[str, bool, int]:
+) -> tuple[str, list[api_pb2.BlobUploadResult]]:
     """Try uploading to each provider in order, with fallback on failure."""
-    r2_throughput_bytes_s = 0
-    r2_failed = False
+    results: list[api_pb2.BlobUploadResult] = []
     for idx, (item, blob_id) in enumerate(zip(items, blob_ids)):
+        t0 = time.monotonic_ns()
         try:
-            if blob_id.endswith(":r2"):
-                t0 = time.monotonic_ns()
-                await callback(item)
-                dt_ns = time.monotonic_ns() - t0
-                r2_throughput_bytes_s = (content_length * 1_000_000_000) // max(dt_ns, 1)
-            else:
-                await callback(item)
-            return blob_id, r2_failed, r2_throughput_bytes_s
+            await callback(item)
         except Exception:
-            if blob_id.endswith(":r2"):
-                r2_failed = True
+            results.append(api_pb2.BlobUploadResult(blob_id=blob_id, outcome=api_pb2.BlobUploadResult.OUTCOME_FAILURE))
             # Ignore all errors except the last one, since we're out of fallback options.
             if idx == len(items) - 1:
                 raise
+            continue
+        dt_ns = time.monotonic_ns() - t0
+        results.append(
+            api_pb2.BlobUploadResult(
+                blob_id=blob_id,
+                outcome=api_pb2.BlobUploadResult.OUTCOME_SUCCESS,
+                throughput_bytes_s=(content_length * 1_000_000_000) // max(dt_ns, 1),
+            )
+        )
+        return blob_id, results
     raise ExecutionError("Failed to upload blob")
 
 
@@ -283,7 +285,7 @@ async def _blob_upload(
     stub,
     progress_report_cb: Callable | None = None,
     byte_budget: _ByteBudget | None = None,
-) -> tuple[str, bool, int]:
+) -> tuple[str, list[api_pb2.BlobUploadResult]]:
     if isinstance(data, bytes):
         data = BytesIO(data)
 
@@ -310,7 +312,7 @@ async def _blob_upload(
                 byte_budget=byte_budget,
             )
 
-        blob_id, r2_failed, r2_throughput_bytes_s = await _blob_upload_with_fallback(
+        blob_id, upload_results = await _blob_upload_with_fallback(
             resp.multiparts.items,
             resp.blob_ids,
             upload_multipart_upload,
@@ -331,7 +333,7 @@ async def _blob_upload(
                 content_md5_b64=upload_hashes.md5_base64,
             )
 
-        blob_id, r2_failed, r2_throughput_bytes_s = await _blob_upload_with_fallback(
+        blob_id, upload_results = await _blob_upload_with_fallback(
             resp.upload_urls.items,
             resp.blob_ids,
             upload_to_s3_url,
@@ -341,10 +343,12 @@ async def _blob_upload(
     if progress_report_cb:
         progress_report_cb(complete=True)
 
-    return blob_id, r2_failed, r2_throughput_bytes_s
+    return blob_id, upload_results
 
 
-async def blob_upload_with_r2_failure_info(payload: bytes, stub: ModalClientModal) -> tuple[str, bool, int]:
+async def blob_upload_with_results(
+    payload: bytes, stub: ModalClientModal
+) -> tuple[str, list[api_pb2.BlobUploadResult]]:
     size_mib = len(payload) / 1024 / 1024
     logger.debug(f"Uploading large blob of size {size_mib:.2f} MiB")
     t0 = time.time()
@@ -352,17 +356,17 @@ async def blob_upload_with_r2_failure_info(payload: bytes, stub: ModalClientModa
         logger.debug("Blob uploading string, not bytes - auto-encoding as utf8")
         payload = payload.encode("utf8")
     upload_hashes = get_upload_hashes(payload)
-    blob_id, r2_failed, r2_throughput_bytes_s = await _blob_upload(upload_hashes, payload, stub)
+    blob_id, upload_results = await _blob_upload(upload_hashes, payload, stub)
     dur_s = max(time.time() - t0, 0.001)  # avoid division by zero
     throughput_mib_s = (size_mib) / dur_s
     logger.debug(
         f"Uploaded large blob of size {size_mib:.2f} MiB ({throughput_mib_s:.2f} MiB/s, total {dur_s:.2f}s). {blob_id}"
     )
-    return blob_id, r2_failed, r2_throughput_bytes_s
+    return blob_id, upload_results
 
 
 async def blob_upload(payload: bytes, stub: ModalClientModal) -> str:
-    blob_id, _, _ = await blob_upload_with_r2_failure_info(payload, stub)
+    blob_id, _ = await blob_upload_with_results(payload, stub)
     return blob_id
 
 
@@ -381,7 +385,7 @@ async def blob_upload_file(
     byte_budget: _ByteBudget | None = None,
 ) -> str:
     upload_hashes = get_upload_hashes(file_obj, sha256_hex=sha256_hex, md5_hex=md5_hex)
-    blob_id, _, _ = await _blob_upload(upload_hashes, file_obj, stub, progress_report_cb, byte_budget=byte_budget)
+    blob_id, _ = await _blob_upload(upload_hashes, file_obj, stub, progress_report_cb, byte_budget=byte_budget)
     return blob_id
 
 

{modal-1.5.6.dev16 → modal-1.5.6.dev17}/modal/_utils/function_utils.py

@@ -41,7 +41,7 @@ from .blob_utils import (
     MAX_ASYNC_OBJECT_SIZE_BYTES,
     MAX_OBJECT_SIZE_BYTES,
     blob_download,
-    blob_upload_with_r2_failure_info,
+    blob_upload_with_results,
 )
 
 if typing.TYPE_CHECKING:
@@ -631,7 +631,7 @@ async def _create_input(
     if should_upload(
         len(args_serialized), max_object_size_bytes, max_async_object_size_bytes, function_call_invocation_type
     ):
-        args_blob_id, r2_failed, r2_throughput_bytes_s = await blob_upload_with_r2_failure_info(args_serialized, stub)
+        args_blob_id, blob_upload_results = await blob_upload_with_results(args_serialized, stub)
         return api_pb2.FunctionPutInputsItem(
             input=api_pb2.FunctionInput(
                 args_blob_id=args_blob_id,
@@ -639,8 +639,7 @@ async def _create_input(
                 method_name=method_name,
             ),
             idx=idx,
-            r2_failed=r2_failed,
-            r2_throughput_bytes_s=r2_throughput_bytes_s,
+            blob_upload_results=blob_upload_results,
         )
     else:
         return api_pb2.FunctionPutInputsItem(

{modal-1.5.6.dev16 → modal-1.5.6.dev17}/modal/cli/_logs.py

@@ -61,6 +61,7 @@ async def _run_logs_command(
     tail: int | None,
     search: str | None,
     function_id: str = "",
+    parametrized_function_id: str = "",
     function_call_id: str = "",
     container_id: str = "",
     source: str | None,
@@ -77,6 +78,7 @@ async def _run_logs_command(
     log_filters = LogsFilters(
         source=source_fd,
         function_id=function_id,
+        parametrized_function_id=parametrized_function_id,
         function_call_id=function_call_id,
         task_id=container_id,
         search_text=search or "",

{modal-1.5.6.dev16 → modal-1.5.6.dev17}/modal/cli/function.py

@@ -193,9 +193,7 @@ async def stats(
 
     environment_name = _get_environment_name(ensure_env(env))
     client = await _Client.from_env()
-    function_id = await _resolve_function_id(
-        client, function_identifier, environment_name, command="stats", include_app_id=False
-    )
+    function_id, _ = await _resolve_function_id(client, function_identifier, environment_name, command="stats")
     req = api_pb2.FunctionGetTimeRangeStatsRequest(
         function_id=function_id,
         since=_timestamp(since_dt),
@@ -322,11 +320,13 @@ async def stats(
 @click.option("--show-function-id", is_flag=True, default=False, help="Prefix each line with its Function ID")
 @click.option("--show-function-call-id", is_flag=True, default=False, help="Prefix each line with its FunctionCall ID")
 @click.option("--show-container-id", is_flag=True, default=False, help="Prefix each line with its Container ID")
+@click.option("--all-variants", is_flag=True, default=False, help="Include logs from the base and all its variants.")
 @env_option
 @synchronizer.create_blocking
 async def logs(
     function_ref: str,
     follow: bool = False,
+    all_variants: bool = False,
     since: str | None = None,
     until: str | None = None,
     tail: int | None = None,
@@ -346,6 +346,9 @@ async def logs(
     By default, this command fetches the last 100 log entries and exits. Use ``-f`` to
     live-stream logs from a running function instead. Fetch and follow are mutually exclusive.
 
+    By default, logs are limited to the specified ID. Pass ``--all-variants`` to
+    include the base and all its variants, even when specifying a variant ID.
+
     Examples:
 
     Get recent logs based on a function ID:
@@ -400,8 +403,8 @@ async def logs(
     _validate_logs_args(follow=follow, since=since, until=until, tail=tail)
 
     client = await _Client.from_env()
-    function_id, app_id = await _resolve_function_id(
-        client, function_ref, env, object_type="Function", command="logs", include_app_id=True
+    function_id, metadata = await _resolve_function_id(
+        client, function_ref, env, object_type="Function", command="logs"
     )
 
     prefix_fields: list[str] = []
@@ -413,13 +416,14 @@ async def logs(
         prefix_fields.append("ta")
 
     await _run_logs_command(
-        app_id,
+        metadata.app_id,
         follow=follow,
         since=since,
         until=until,
         tail=tail,
         search=search,
-        function_id=function_id,
+        function_id=metadata.base_function_id or function_id,
+        parametrized_function_id="" if all_variants else function_id,
         function_call_id=function_call_id,
         container_id=container_id,
         source=source,

{modal-1.5.6.dev16 → modal-1.5.6.dev17}/modal/cli/server.py

@@ -133,9 +133,7 @@ async def logs(
     _validate_logs_args(follow=follow, since=since, until=until, tail=tail)
     client = await _Client.from_env()
 
-    function_id, app_id = await _resolve_function_id(
-        client, server_ref, env, object_type="Server", command="logs", include_app_id=True
-    )
+    function_id, metadata = await _resolve_function_id(client, server_ref, env, object_type="Server", command="logs")
 
     prefix_fields: list[str] = []
     if show_server_id:
@@ -144,7 +142,7 @@ async def logs(
         prefix_fields.append("ta")
 
     await _run_logs_command(
-        app_id,
+        metadata.app_id,
         follow=follow,
         since=since,
         until=until,
@@ -419,13 +417,12 @@ async def stats(
 
     environment_name = _get_environment_name(ensure_env(env))
     client = await _Client.from_env()
-    function_id = await _resolve_function_id(
+    function_id, _ = await _resolve_function_id(
         client,
         server_identifier,
         environment_name,
         object_type="Server",
         command="stats",
-        include_app_id=False,
     )
     req = api_pb2.ServerGetTimeRangeStatsRequest(
         function_id=function_id,

{modal-1.5.6.dev16 → modal-1.5.6.dev17}/modal/cli/utils.py

@@ -8,7 +8,7 @@ from contextlib import nullcontext
 from csv import writer as csv_writer
 from datetime import datetime
 from json import dumps
-from typing import Literal, overload
+from typing import Literal
 
 import click
 from click.exceptions import UsageError
@@ -64,6 +64,7 @@ async def _stream_app_logs(
                 prefix_fields=prefix_fields or [],
                 file_descriptor=filters.source,
                 function_id=filters.function_id,
+                parametrized_function_id=filters.parametrized_function_id,
                 function_call_id=filters.function_call_id,
                 search_text=filters.search_text,
             )
@@ -209,7 +210,6 @@ def _is_function_id(ref: str) -> bool:
     return bool(re.match(r"^fu-[0-9a-zA-Z]+$", ref))
 
 
-@overload
 async def _resolve_function_id(
     client: _Client,
     function_identifier: str,
@@ -217,31 +217,7 @@ async def _resolve_function_id(
     *,
     object_type: Literal["Function", "Server"] = "Function",
     command: Literal["logs", "stats"],
-    include_app_id: Literal[True],
-) -> tuple[str, str]: ...
-
-
-@overload
-async def _resolve_function_id(
-    client: _Client,
-    function_identifier: str,
-    environment_name: str,
-    *,
-    object_type: Literal["Function", "Server"] = "Function",
-    command: Literal["logs", "stats"],
-    include_app_id: Literal[False],
-) -> str: ...
-
-
-async def _resolve_function_id(
-    client: _Client,
-    function_identifier: str,
-    environment_name: str,
-    *,
-    object_type: Literal["Function", "Server"] = "Function",
-    command: Literal["logs", "stats"],
-    include_app_id: bool,
-) -> str | tuple[str, str]:
+) -> tuple[str, api_pb2.FunctionHandleMetadata]:
     identifier_label = object_type.upper()
     usage = (
         f"{identifier_label} must be a Function ID (fu-…) "
@@ -272,16 +248,12 @@ async def _resolve_function_id(
             raise
 
         print_server_warnings(response.server_warnings)
-        if include_app_id:
-            return response.function_id, response.handle_metadata.app_id
-        return response.function_id
+        return response.function_id, response.handle_metadata
 
     if _is_function_id(function_identifier):
-        if include_app_id:
-            get_by_id_response = await client.stub.FunctionGetById(
-                api_pb2.FunctionGetByIdRequest(function_id=function_identifier)
-            )
-            return function_identifier, get_by_id_response.handle_metadata.app_id
-        return function_identifier
+        get_by_id_response = await client.stub.FunctionGetById(
+            api_pb2.FunctionGetByIdRequest(function_id=function_identifier)
+        )
+        return function_identifier, get_by_id_response.handle_metadata
 
     raise UsageError(usage)

{modal-1.5.6.dev16 → modal-1.5.6.dev17}/modal/client.pyi

@@ -77,7 +77,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.6.dev16",
+        version: str = "1.5.6.dev17",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):
@@ -277,7 +277,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.6.dev16",
+        version: str = "1.5.6.dev17",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):

{modal-1.5.6.dev16 → modal-1.5.6.dev17}/modal/functions.pyi

@@ -653,7 +653,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.
 
@@ -678,7 +678,7 @@ class Function(
             """
             ...
 
-    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]:
@@ -728,7 +728,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.
 
@@ -761,7 +761,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: ...
@@ -769,7 +769,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.
 
@@ -802,7 +802,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.5.6.dev16 → modal-1.5.6.dev17}/modal.egg-info/PKG-INFO

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