modAL 1.3.1.dev10__py3-none-any.whl → 1.3.1.dev12__py3-none-any.whl

modal/cli/token.py

@@ -1,11 +1,16 @@
 # Copyright Modal Labs 2022
 import getpass
+import os
+from datetime import datetime
 from typing import Optional
 
 import typer
 
+from modal._output import make_console
 from modal._utils.async_utils import synchronizer
+from modal.client import _Client
 from modal.token_flow import _new_token, _set_token
+from modal_proto import api_pb2
 
 token_cli = typer.Typer(name="token", help="Manage tokens.", no_args_is_help=True)
 
@@ -58,3 +63,46 @@ async def new(
 ):
     """Create a new token by using an authenticated web session."""
     await _new_token(profile=profile, activate=activate, verify=verify, source=source)
+
+
+@token_cli.command(name="info")
+@synchronizer.create_blocking
+async def info():
+    """Display information about the token that is currently in use."""
+    console = make_console()
+
+    client = await _Client.from_env()
+    req = api_pb2.TokenInfoGetRequest()
+    resp = await client.stub.TokenInfoGet(req)
+
+    env_vars = []
+    if os.environ.get("MODAL_TOKEN_ID"):
+        env_vars.append("MODAL_TOKEN_ID")
+    if os.environ.get("MODAL_TOKEN_SECRET"):
+        env_vars.append("MODAL_TOKEN_SECRET")
+
+    if env_vars:
+        env_vars_str = " and ".join(env_vars)
+        plural = "s" if len(env_vars) > 1 else ""
+        console.print(f"[dim](Using {env_vars_str} environment variable{plural})[/dim]")
+
+    console.print(f"[bold]Token:[/bold] {resp.token_id}")
+    console.print(f"[bold]Workspace:[/bold] {resp.workspace_name} [dim]({resp.workspace_id})[/dim]")
+
+    if resp.HasField("user_identity"):
+        console.print(f"[bold]User:[/bold] {resp.user_identity.username} [dim]({resp.user_identity.user_id})[/dim]")
+    elif resp.HasField("service_user_identity"):
+        service = resp.service_user_identity
+        console.print(f"[bold]Service User:[/bold] {service.service_user_name} [dim]({service.service_user_id})[/dim]")
+        if service.HasField("created_by"):
+            console.print(
+                f"[bold]Created By:[/bold] {service.created_by.username} [dim]({service.created_by.user_id})[/dim]"
+            )
+
+    if resp.HasField("created_at") and resp.created_at.seconds > 0:
+        created_dt = datetime.fromtimestamp(resp.created_at.seconds).astimezone()
+        console.print(f"[bold]Created at:[/bold] [white]{created_dt.strftime('%Y-%m-%d %H:%M:%S %Z')}[/white]")
+
+    if resp.HasField("expires_at") and resp.expires_at.seconds > 0:
+        expires_dt = datetime.fromtimestamp(resp.expires_at.seconds).astimezone()
+        console.print(f"[bold]Expires at:[/bold] [white]{expires_dt.strftime('%Y-%m-%d %H:%M:%S %Z')}[/white]")

modal/client.pyi

@@ -33,7 +33,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.3.1.dev10",
+        version: str = "1.3.1.dev12",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -163,7 +163,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.3.1.dev10",
+        version: str = "1.3.1.dev12",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

modal/functions.pyi

@@ -407,7 +407,7 @@ class Function(
 
     _call_generator: ___call_generator_spec
 
-    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_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."""
             ...
@@ -416,7 +416,7 @@ class Function(
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
 
-    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType]
+    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P]
 
     class __remote_gen_spec(typing_extensions.Protocol):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -443,7 +443,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_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.
 
@@ -466,7 +466,7 @@ class Function(
             """
             ...
 
-    _experimental_spawn: ___experimental_spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    _experimental_spawn: ___experimental_spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> None: ...
@@ -474,7 +474,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P]
 
-    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_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.
 
@@ -495,7 +495,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function."""

{modal-1.3.1.dev10.dist-info → modal-1.3.1.dev12.dist-info}/METADATA

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

{modal-1.3.1.dev10.dist-info → modal-1.3.1.dev12.dist-info}/RECORD

@@ -26,7 +26,7 @@ modal/app.pyi,sha256=WR0nGSUh8-8OYRHFqEnijGoPp_IbawNY1JW_0pozXsE,50857
 modal/billing.py,sha256=zmQ3bcCJlwa4KD1IA_QgdWpm1pn13c-7qfy79iEauYI,195
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=CXnyJYLhY--xaCkjv3tpjYDca8AuXGQG1IiaXQVX4y4,14436
-modal/client.pyi,sha256=7JsS0VZHKqEZ83COaOpatzvZgoOvKUWsPLN8l2gDr1Y,14473
+modal/client.pyi,sha256=18zSEWajEhEpaTNF1oSeELgXY9sTCoeDRv2bLLlNGPM,14473
 modal/cloud_bucket_mount.py,sha256=cvVj5Rt4nDHoQbTneoJPTaAcnl_Ab_mrsjnnzd0v9OI,6013
 modal/cloud_bucket_mount.pyi,sha256=vXusGMOUk9HjCs4lhxteuCK4xLQclPfugGWKo7LECEA,7539
 modal/cls.py,sha256=DNXcOrd9l2DoX-nLGdpwXm-N9V0BbQEvWA7d2UwFf44,41510
@@ -43,7 +43,7 @@ modal/file_io.py,sha256=dx90C5L8cQv2Z7pVVPaQmE0R3pUOGv2h-wn1qNNXbGQ,19818
 modal/file_io.pyi,sha256=up9OhV2Y54n-X7nlfV6j_eBwJ8D2cNMEswZ1iddrEQw,15877
 modal/file_pattern_matcher.py,sha256=A_Kdkej6q7YQyhM_2-BvpFmPqJ0oHb54B6yf9VqvPVE,8116
 modal/functions.py,sha256=kcNHvqeGBxPI7Cgd57NIBBghkfbeFJzXO44WW0jSmao,325
-modal/functions.pyi,sha256=fDH5yZSKq_uUrcze_zwWWZyxSCeEI1PfGlGOqCutCTY,36465
+modal/functions.pyi,sha256=fkjxeYAqh6sX9C84gjUGoLVgHT1IfNB_07h0fpmIyWw,36465
 modal/gpu.py,sha256=Fe5ORvVPDIstSq1xjmM6OoNgLYFWvogP9r5BgmD3hYg,6769
 modal/image.py,sha256=sPaYxx4Dwdod1FjVooDaDDcPbcyyBXY4ChpbQvWe5mc,108197
 modal/image.pyi,sha256=UMwAaYu4feSDzJS9l-5xKYP_yaJm18bY_s3pREOQF6A,78249
@@ -148,7 +148,7 @@ modal/cli/queues.py,sha256=S5dqk6lEd_2fJolHqoN9iRs6EkeTa0k7KqJWBBGS23k,6170
 modal/cli/run.py,sha256=j0NJqxZrfPikpuIjLtQV9dwi2GK3rUHcr6_BJabZXBQ,18728
 modal/cli/secret.py,sha256=zkCztov8c4x8CI8G0EoyieUfv9XLQQtVXV8xeMLK-Os,8044
 modal/cli/shell.py,sha256=L5Dw8yeuu9-f6vNlBGbUT4oh9AVSK4GuB5J6m6vYLBk,12613
-modal/cli/token.py,sha256=NAmQzKBfEHkcldWKeFxAVIqQBoo1RTp7_A4yc7-8qM0,1911
+modal/cli/token.py,sha256=OiVPDsFo6EpCGVuOOx7Q9WjKxVKIka2gRx_676MaITU,4017
 modal/cli/utils.py,sha256=d7J4j29b6bsj2GqYe3QdqgHpO-QkxcjtF9YnRCYxVIg,2879
 modal/cli/volume.py,sha256=8_wjfaFmtcPrIYx46__CbCefaSLPJ14nlm6iCLz_HOA,10512
 modal/cli/programs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
@@ -158,7 +158,7 @@ modal/experimental/__init__.py,sha256=GOuo3t4-Le0ZVddiHIOw0MQxkdTJge-bVbhDvgnblm
 modal/experimental/flash.py,sha256=GJZwSr-4OHlP6gCIZdcbsSb8D8WX9xJwMphjwcfsRoU,31262
 modal/experimental/flash.pyi,sha256=W62a0AhmLUuH9a0n8Y3-DYhyEEFH3-bRUQFphOQfKHg,16418
 modal/experimental/ipython.py,sha256=TrCfmol9LGsRZMeDoeMPx3Hv3BFqQhYnmD_iH0pqdhk,2904
-modal-1.3.1.dev10.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.3.1.dev12.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=c1yfBS_x--gL5bs0N4ihMwqwX8l3IBWSkBAKNNIi6bQ,3801
 modal_docs/gen_reference_docs.py,sha256=d_CQUGQ0rfw28u75I2mov9AlS773z9rG40-yq5o7g2U,6359
@@ -166,13 +166,13 @@ modal_docs/mdmd/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,2
 modal_docs/mdmd/mdmd.py,sha256=tUTImNd4UMFk1opkaw8J672gX8AkBO5gbY2S_NMxsxs,7140
 modal_docs/mdmd/signatures.py,sha256=XJaZrK7Mdepk5fdX51A8uENiLFNil85Ud0d4MH8H5f0,3218
 modal_proto/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
-modal_proto/api.proto,sha256=U4RPjakx4nLCsmZjICIz1zpVEIr3D1nle1mhpynTz_0,111590
-modal_proto/api_grpc.py,sha256=-8SHvPtalTAjQtRv7zzU7Z1VoDupoJs2ifG4gl_mF0s,134442
-modal_proto/api_pb2.py,sha256=MU5qdVpesBfSsu0BnB_BqcFe6QRvicl7JSb3pcN5YVo,386094
-modal_proto/api_pb2.pyi,sha256=_3xSd3voS5fgOTWxD5RvaY0uoTq5e_NQoB4wVYga4hw,545686
-modal_proto/api_pb2_grpc.py,sha256=Hqw9jcbhpr-W6jsfog_tGU55ouZjITxGvA-DGNBqOLA,289714
-modal_proto/api_pb2_grpc.pyi,sha256=QLJ58ANCx147HeGJva58h0MTCLIDs9JmVjrx8bDdwlg,67776
-modal_proto/modal_api_grpc.py,sha256=MqaBZB2ZqYj6XTIgI_p5dOPjt9gKT4pAJNd_WXR3W84,21295
+modal_proto/api.proto,sha256=GXKOqBNz9URbPeIWchVUNfsQNxhNwD356aMfyX6d0uc,112224
+modal_proto/api_grpc.py,sha256=ozNudkNLbPLp2bFm0bJtb0FHK9ACvJXXnGy771noCKc,135188
+modal_proto/api_pb2.py,sha256=DeyC243zTKxyoQR8koJFroYEdim1aK7gXYmcOKFNvi8,388892
+modal_proto/api_pb2.pyi,sha256=-a8hoKsyc2g_H_6SFD3ZRU_szPJ1cwTfkNrtO7I0vdM,549568
+modal_proto/api_pb2_grpc.py,sha256=hHdfvfbS6HELZXTmHNfxlgPxFRDSc2B81G8YRtLwuHM,291347
+modal_proto/api_pb2_grpc.pyi,sha256=cqpXpAVrLoMQMCCyzyW5oXSFKmUPC9Y2wkTOpwNeAGM,68141
+modal_proto/modal_api_grpc.py,sha256=ls_o6oVYm8iup0nbKGPqs-CcJZJrry0eIY51mQFJRUc,21407
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal_proto/task_command_router.proto,sha256=oyHT02Ck7jrBe55s4ge5f2ko58-2sg3gZ-xEvvn5bXU,5620
 modal_proto/task_command_router_grpc.py,sha256=_K9lOLOB_pyT8-XvGnicgAIW1aLVFTqQISmP7Q1x4e8,6962
@@ -180,10 +180,10 @@ modal_proto/task_command_router_pb2.py,sha256=2Y8wRvnq4_7RiQ-5ZAPIgXaxrHv_MXzgS5
 modal_proto/task_command_router_pb2.pyi,sha256=yI4tFteErLlonFA2HyaWtONfhY_VGSe7KCWFIspvmkE,16323
 modal_proto/task_command_router_pb2_grpc.py,sha256=q2VWfK2-4uDcPaPLhAqPZkgxhuQRYnWmwUcnEbPbGuk,13895
 modal_proto/task_command_router_pb2_grpc.pyi,sha256=e1MM10VGUgDkm041v53QeTglGQPzTpA0FUsFtezjp74,4536
-modal_version/__init__.py,sha256=V964I_QCM1nsVXl3ijxPe7nppozCvz5Xp6_8RJUc2z8,121
+modal_version/__init__.py,sha256=p7Kr6XTekZbafGsmwVCctfFFERuDp3kC2yy1OupdiMQ,121
 modal_version/__main__.py,sha256=nLUbubxKx7GXNzJIkTB7M7_u8080LyLM0IS0rzFkC_c,119
-modal-1.3.1.dev10.dist-info/METADATA,sha256=cBGMeVqt2Nk1pQ2-vnwtGFqmeU15U_HldezpY8LY4Ek,2582
-modal-1.3.1.dev10.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-1.3.1.dev10.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.3.1.dev10.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.3.1.dev10.dist-info/RECORD,,
+modal-1.3.1.dev12.dist-info/METADATA,sha256=uyQENlqNQddQ3Iq0c4B7WuLAqla8v_vdlrOiptChEVA,2582
+modal-1.3.1.dev12.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-1.3.1.dev12.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.3.1.dev12.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.3.1.dev12.dist-info/RECORD,,

modal_proto/api.proto

@@ -2894,6 +2894,7 @@ message SandboxHandleMetadata {
 
 message SandboxInfo {
   string id = 1;
+  reserved 2; // modal.client.Sandbox definition
   double created_at = 3;
   TaskInfo task_info = 4;
   string app_id = 5;
@@ -2902,7 +2903,6 @@ message SandboxInfo {
   string image_id = 8;
   ResourceInfo resource_info = 9;
   repeated string regions = 10;
-  reserved 2; // modal.client.Sandbox definition
 }
 
 
@@ -3115,6 +3115,12 @@ message SecretMetadata {
   CreationInfo creation_info = 2;
 }
 
+message ServiceUserIdentity {
+  string service_user_id = 1;
+  string service_user_name = 2;
+  UserIdentity created_by = 3;
+}
+
 // SharedVolume in the backend corresponds to NetworkFileSystem in the current API
 
 message SharedVolumeDeleteRequest {
@@ -3336,6 +3342,23 @@ message TokenFlowWaitResponse {
   string workspace_username = 4;
 }
 
+message TokenInfoGetRequest {}
+
+message TokenInfoGetResponse {
+  string token_id = 1;
+  string workspace_id = 2;
+  string workspace_name = 3;
+
+  oneof identity {
+    UserIdentity user_identity = 4;
+    ServiceUserIdentity service_user_identity = 5;
+  }
+
+  // Token metadata
+  google.protobuf.Timestamp created_at = 6;
+  google.protobuf.Timestamp expires_at = 7;
+}
+
 message TunnelData {
   string host = 1;
   uint32 port = 2;
@@ -3375,6 +3398,11 @@ message UserActionInfo {
   double timestamp = 2;
 }
 
+message UserIdentity {
+  string user_id = 1;
+  string username = 2;
+}
+
 message VolumeCommitRequest {
   // NOTE(staffan): Mounting a volume in multiple locations is not supported, so volume_id alone uniquely identifies
   // a volume mount.
@@ -3858,6 +3886,7 @@ service ModalClient {
   // Tokens (web auth flow)
   rpc TokenFlowCreate(TokenFlowCreateRequest) returns (TokenFlowCreateResponse);
   rpc TokenFlowWait(TokenFlowWaitRequest) returns (TokenFlowWaitResponse);
+  rpc TokenInfoGet(TokenInfoGetRequest) returns (TokenInfoGetResponse);
 
   // Tunnels
   rpc TunnelStart(TunnelStartRequest) returns (TunnelStartResponse);

modal_proto/api_grpc.py

@@ -631,6 +631,10 @@ class ModalClientBase(abc.ABC):
     async def TokenFlowWait(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.TokenFlowWaitRequest, modal_proto.api_pb2.TokenFlowWaitResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def TokenInfoGet(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.TokenInfoGetRequest, modal_proto.api_pb2.TokenInfoGetResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def TunnelStart(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.TunnelStartRequest, modal_proto.api_pb2.TunnelStartResponse]') -> None:
         pass
@@ -1635,6 +1639,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.TokenFlowWaitRequest,
                 modal_proto.api_pb2.TokenFlowWaitResponse,
             ),
+            '/modal.client.ModalClient/TokenInfoGet': grpclib.const.Handler(
+                self.TokenInfoGet,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.TokenInfoGetRequest,
+                modal_proto.api_pb2.TokenInfoGetResponse,
+            ),
             '/modal.client.ModalClient/TunnelStart': grpclib.const.Handler(
                 self.TunnelStart,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -2685,6 +2695,12 @@ class ModalClientStub:
             modal_proto.api_pb2.TokenFlowWaitRequest,
             modal_proto.api_pb2.TokenFlowWaitResponse,
         )
+        self.TokenInfoGet = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/TokenInfoGet',
+            modal_proto.api_pb2.TokenInfoGetRequest,
+            modal_proto.api_pb2.TokenInfoGetResponse,
+        )
         self.TunnelStart = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/TunnelStart',