modAL 1.3.1.dev10__tar.gz → 1.3.1.dev12__tar.gz

{modal-1.3.1.dev10 → modal-1.3.1.dev12}/PKG-INFO

@@ -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.dev12/modal/cli/token.py

@@ -0,0 +1,108 @@
+# 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)
+
+profile_option = typer.Option(
+    None,
+    help=(
+        "Modal profile to set credentials for. If unspecified "
+        "(and MODAL_PROFILE environment variable is not set), "
+        "uses the workspace name associated with the credentials."
+    ),
+)
+activate_option = typer.Option(
+    True,
+    help="Activate the profile containing this token after creation.",
+)
+
+verify_option = typer.Option(
+    True,
+    help="Make a test request to verify the new credentials.",
+)
+
+
+@token_cli.command(name="set")
+@synchronizer.create_blocking
+async def set(
+    token_id: Optional[str] = typer.Option(None, help="Account token ID."),
+    token_secret: Optional[str] = typer.Option(None, help="Account token secret."),
+    profile: Optional[str] = profile_option,
+    activate: bool = activate_option,
+    verify: bool = verify_option,
+):
+    """Set account credentials for connecting to Modal.
+
+    If the credentials are not provided on the command line, you will be prompted to enter them.
+    """
+    if token_id is None:
+        token_id = getpass.getpass("Token ID:")
+    if token_secret is None:
+        token_secret = getpass.getpass("Token secret:")
+    await _set_token(token_id, token_secret, profile=profile, activate=activate, verify=verify)
+
+
+@token_cli.command(name="new")
+@synchronizer.create_blocking
+async def new(
+    profile: Optional[str] = profile_option,
+    activate: bool = activate_option,
+    verify: bool = verify_option,
+    source: Optional[str] = None,
+):
+    """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-1.3.1.dev10 → modal-1.3.1.dev12}/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-1.3.1.dev10 → modal-1.3.1.dev12}/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 → modal-1.3.1.dev12}/modal.egg-info/PKG-INFO

@@ -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 → modal-1.3.1.dev12}/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-1.3.1.dev10 → modal-1.3.1.dev12}/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',