modal 0.73.42__tar.gz → 0.73.44__tar.gz

{modal-0.73.42 → modal-0.73.44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: modal
-Version: 0.73.42
+Version: 0.73.44
 Summary: Python client library for Modal
 Author: Modal Labs
 Author-email: support@modal.com

{modal-0.73.42 → modal-0.73.44}/modal/__init__.py

@@ -18,7 +18,7 @@ try:
     from .dict import Dict
     from .exception import Error
     from .file_pattern_matcher import FilePatternMatcher
-    from .functions import Function
+    from .functions import Function, FunctionCall
     from .image import Image
     from .mount import Mount
     from .network_file_system import NetworkFileSystem
@@ -52,6 +52,7 @@ __all__ = [
     "Error",
     "FilePatternMatcher",
     "Function",
+    "FunctionCall",
     "Image",
     "Mount",
     "NetworkFileSystem",

{modal-0.73.42 → modal-0.73.44}/modal/_functions.py

@@ -1474,7 +1474,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
 
         This experimental version of the spawn method allows up to 1 million inputs to be spawned.
 
-        Returns a `modal.functions.FunctionCall` object, that can later be polled or
+        Returns a `modal.FunctionCall` object, that can later be polled or
         waited for using `.get(timeout=...)`.
         Conceptually similar to `multiprocessing.pool.apply_async`, or a Future/Promise in other contexts.
         """
@@ -1497,7 +1497,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
     async def spawn(self, *args: P.args, **kwargs: P.kwargs) -> "_FunctionCall[ReturnType]":
         """Calls the function with the given arguments, without waiting for the results.
 
-        Returns a `modal.functions.FunctionCall` object, that can later be polled or
+        Returns a `modal.FunctionCall` object, that can later be polled or
         waited for using `.get(timeout=...)`.
         Conceptually similar to `multiprocessing.pool.apply_async`, or a Future/Promise in other contexts.
         """

modal-0.73.44/modal/_location.py

@@ -0,0 +1,11 @@
+# Copyright Modal Labs 2022
+import modal_proto.api_pb2
+
+
+def display_location(cloud_provider: "modal_proto.api_pb2.CloudProvider.V") -> str:
+    if cloud_provider == modal_proto.api_pb2.CLOUD_PROVIDER_GCP:
+        return "GCP (us-east1)"
+    elif cloud_provider == modal_proto.api_pb2.CLOUD_PROVIDER_AWS:
+        return "AWS (us-east-1)"
+    else:
+        return ""

{modal-0.73.42 → modal-0.73.44}/modal/cli/network_file_system.py

@@ -13,6 +13,7 @@ from rich.table import Table
 from typer import Argument, Typer
 
 import modal
+from modal._location import display_location
 from modal._output import OutputManager, ProgressHandler
 from modal._utils.async_utils import synchronizer
 from modal._utils.grpc_utils import retry_transient_errors
@@ -36,12 +37,13 @@ async def list_(env: Optional[str] = ENV_OPTION, json: Optional[bool] = False):
         client.stub.SharedVolumeList, api_pb2.SharedVolumeListRequest(environment_name=env)
     )
     env_part = f" in environment '{env}'" if env else ""
-    column_names = ["Name", "Created at"]
+    column_names = ["Name", "Location", "Created at"]
     rows = []
     for item in response.items:
         rows.append(
             [
                 item.label,
+                display_location(item.cloud_provider),
                 timestamp_to_local(item.created_at, json),
             ]
         )

{modal-0.73.42 → modal-0.73.44}/modal/client.pyi

@@ -27,7 +27,7 @@ class _Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.42"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.44"
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -85,7 +85,7 @@ class Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.42"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.44"
     ): ...
     def is_closed(self) -> bool: ...
     @property

{modal-0.73.42 → modal-0.73.44}/modal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: modal
-Version: 0.73.42
+Version: 0.73.44
 Summary: Python client library for Modal
 Author: Modal Labs
 Author-email: support@modal.com

{modal-0.73.42 → modal-0.73.44}/modal.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ modal/_clustered_functions.pyi
 modal/_container_entrypoint.py
 modal/_functions.py
 modal/_ipython.py
+modal/_location.py
 modal/_object.py
 modal/_output.py
 modal/_partial_function.py

{modal-0.73.42 → modal-0.73.44}/modal_proto/api.proto

@@ -86,8 +86,12 @@ enum ClientType {
 }
 
 enum CloudProvider {
-  // No longer used by clients, but server needs it to parse old protos
   CLOUD_PROVIDER_UNSPECIFIED = 0;
+  CLOUD_PROVIDER_AWS = 1;
+  CLOUD_PROVIDER_GCP = 2;
+  CLOUD_PROVIDER_AUTO = 3;
+  CLOUD_PROVIDER_OCI = 4;
+  reserved 5, 6, 7, 8; // now unused internal experimental values
 }
 
 enum DNSRecordType {
@@ -1181,7 +1185,7 @@ message Function {
 
   uint32 task_idle_timeout_secs = 25;  // To be replaced by autoscaler_settings.scaledown_period
 
-  optional CloudProvider cloud_provider = 26;  // Deprecated
+  optional CloudProvider cloud_provider = 26;  // Deprecated at some point
 
   uint32 warm_pool_size = 27;  // To be replaced by autoscaler_settings.min_containers
 
@@ -2231,7 +2235,7 @@ message Sandbox {
   repeated string secret_ids = 4;
 
   Resources resources = 5;
-  CloudProvider cloud_provider = 6;  // Deprecated
+  CloudProvider cloud_provider = 6;  // Deprecated at some point
 
   uint32 timeout_secs = 7;
 
@@ -2553,7 +2557,7 @@ message SharedVolumeListItem {
   string label = 1;  // app name of object entity app
   string shared_volume_id = 2;
   double created_at = 3;
-  reserved 4;
+  CloudProvider cloud_provider = 4;
 }
 
 message SharedVolumeListRequest {
@@ -2568,6 +2572,7 @@ message SharedVolumeListResponse {
 message SharedVolumeMount {
   string mount_path = 1;
   string shared_volume_id = 2;
+  CloudProvider cloud_provider = 3;
   bool allow_cross_region = 4;
 }