modal 1.5.3.dev4__tar.gz → 1.5.3.dev5__tar.gz

{modal-1.5.3.dev4 → modal-1.5.3.dev5}/PKG-INFO

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

{modal-1.5.3.dev4 → modal-1.5.3.dev5}/modal/_environments.py

@@ -103,26 +103,6 @@ class _EnvironmentManager:
         await client.stub.EnvironmentDelete(api_pb2.EnvironmentDeleteRequest(name=name))
 
 
-def _role_to_proto(role: str) -> "api_pb2.EnvironmentRole.ValueType":
-    match role:
-        case "viewer":
-            return api_pb2.ENVIRONMENT_ROLE_VIEWER
-        case "contributor":
-            return api_pb2.ENVIRONMENT_ROLE_CONTRIBUTOR
-        case _:
-            raise InvalidError(f"Invalid Environment role: {role!r} (expected 'viewer' or 'contributor')")
-
-
-def _role_from_proto(proto_value: int) -> str:
-    match proto_value:
-        case api_pb2.ENVIRONMENT_ROLE_VIEWER:
-            return "viewer"
-        case api_pb2.ENVIRONMENT_ROLE_CONTRIBUTOR:
-            return "contributor"
-        case _:
-            raise ValueError(f"Unknown environment role: {proto_value}")
-
-
 class _EnvironmentMembersManager:
     """mdmd:namespace
     Namespace with methods for managing the membership of a restricted Environment.
@@ -135,31 +115,30 @@ class _EnvironmentMembersManager:
         self._environment = environment
 
     async def list(self) -> dict[Literal["users", "service_users"], dict[str, str]]:
-        """Return the members of a restricted Environment with their roles.
+        """Enumerate the environment roles for each user and service user in the workspace.
 
         **Examples:**
 
         ```python notest
-        members = modal.Environment.from_name("my-restricted-env").members.list()
+        members = modal.Environment.from_name("my-env").members.list()
         print(members)
         # {
-        #     "users": {"alice": "contributor", "bob": "viewer"},
-        #     "service_users": {"alice-bot": "contributor"},
+        #     "users": {"alice": "contributor", "bob": "viewer", "carol": "contributor"},
+        #     "service_users": {"alice-bot": "contributor", "ops-bot": "viewer", "ci-bot": "no-access"},
         # }
         ```
         """
         await self._environment.hydrate()
-        req = api_pb2.EnvironmentGetManagedRequest(environment_id=self._environment.object_id)
-        resp = await self._environment.client.stub.EnvironmentGetManaged(req)
+        req = api_pb2.EnvironmentGetRolesRequest(environment_id=self._environment.object_id)
+        resp = await self._environment.client.stub.EnvironmentGetRoles(req)
 
         users: dict[str, str] = {}
         service_users: dict[str, str] = {}
         for principal in resp.principal_roles:
-            role = _role_from_proto(principal.role)
             if principal.user_id:
-                users[principal.user_name] = role
+                users[principal.user_name] = principal.role_str
             elif principal.service_user_id:
-                service_users[principal.service_user_name] = role
+                service_users[principal.service_user_name] = principal.role_str
 
         return {"users": users, "service_users": service_users}
 
@@ -188,13 +167,13 @@ class _EnvironmentMembersManager:
         users = users or {}
         service_users = service_users or {}
 
-        req = api_pb2.EnvironmentGetManagedRequest(environment_id=self._environment.object_id)
-        resp = await self._environment.client.stub.EnvironmentGetManaged(req)
+        req = api_pb2.EnvironmentGetRolesRequest(environment_id=self._environment.object_id)
+        resp = await self._environment.client.stub.EnvironmentGetRoles(req)
 
-        # Both current members and additional eligible workspace principals can be assigned a role
+        # EnvironmentGetRoles returns every workspace principal
         user_name_to_id: dict[str, str] = {}
         service_user_name_to_id: dict[str, str] = {}
-        for principal in [*resp.principal_roles, *resp.additional_roles]:
+        for principal in resp.principal_roles:
             if principal.user_id:
                 user_name_to_id[principal.user_name] = principal.user_id
             elif principal.service_user_id:
@@ -207,7 +186,7 @@ class _EnvironmentMembersManager:
             requests[f"User {name!r}"] = api_pb2.EnvironmentRoleSetRequest(
                 environment_id=self._environment.object_id,
                 user_id=user_name_to_id[name],
-                role=_role_to_proto(role),
+                role_str=role,
             )
         for name, role in service_users.items():
             if name not in service_user_name_to_id:
@@ -215,7 +194,7 @@ class _EnvironmentMembersManager:
             requests[f"Service user {name!r}"] = api_pb2.EnvironmentRoleSetRequest(
                 environment_id=self._environment.object_id,
                 service_user_id=service_user_name_to_id[name],
-                role=_role_to_proto(role),
+                role_str=role,
             )
 
         await self._dispatch_role_updates(requests)
@@ -242,8 +221,8 @@ class _EnvironmentMembersManager:
         users = users or []
         service_users = service_users or []
 
-        req = api_pb2.EnvironmentGetManagedRequest(environment_id=self._environment.object_id)
-        resp = await self._environment.client.stub.EnvironmentGetManaged(req)
+        req = api_pb2.EnvironmentGetRolesRequest(environment_id=self._environment.object_id)
+        resp = await self._environment.client.stub.EnvironmentGetRoles(req)
 
         user_name_to_id: dict[str, str] = {}
         service_user_name_to_id: dict[str, str] = {}
@@ -256,7 +235,7 @@ class _EnvironmentMembersManager:
         requests: dict[str, api_pb2.EnvironmentRoleSetRequest] = {}
         for name in users:
             if name not in user_name_to_id:
-                raise InvalidError(f"User {name!r} is not a member of this Environment")
+                raise InvalidError(f"User {name!r} not found in workspace")
             requests[f"User {name!r}"] = api_pb2.EnvironmentRoleSetRequest(
                 environment_id=self._environment.object_id,
                 user_id=user_name_to_id[name],
@@ -264,7 +243,7 @@ class _EnvironmentMembersManager:
             )
         for name in service_users:
             if name not in service_user_name_to_id:
-                raise InvalidError(f"Service user {name!r} is not a member of this Environment")
+                raise InvalidError(f"Service user {name!r} not found in workspace")
             requests[f"Service user {name!r}"] = api_pb2.EnvironmentRoleSetRequest(
                 environment_id=self._environment.object_id,
                 service_user_id=service_user_name_to_id[name],

{modal-1.5.3.dev4 → modal-1.5.3.dev5}/modal/client.pyi

@@ -37,7 +37,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.3.dev4",
+        version: str = "1.5.3.dev5",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -207,7 +207,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.3.dev4",
+        version: str = "1.5.3.dev5",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.5.3.dev4 → modal-1.5.3.dev5}/modal/environments.pyi

@@ -113,32 +113,32 @@ class EnvironmentMembersManager:
 
     class __list_spec(typing_extensions.Protocol):
         def __call__(self, /) -> dict[typing.Literal["users", "service_users"], dict[str, str]]:
-            """Return the members of a restricted Environment with their roles.
+            """Enumerate the environment roles for each user and service user in the workspace.
 
             **Examples:**
 
             ```python notest
-            members = modal.Environment.from_name("my-restricted-env").members.list()
+            members = modal.Environment.from_name("my-env").members.list()
             print(members)
             # {
-            #     "users": {"alice": "contributor", "bob": "viewer"},
-            #     "service_users": {"alice-bot": "contributor"},
+            #     "users": {"alice": "contributor", "bob": "viewer", "carol": "contributor"},
+            #     "service_users": {"alice-bot": "contributor", "ops-bot": "viewer", "ci-bot": "no-access"},
             # }
             ```
             """
             ...
 
         async def aio(self, /) -> dict[typing.Literal["users", "service_users"], dict[str, str]]:
-            """Return the members of a restricted Environment with their roles.
+            """Enumerate the environment roles for each user and service user in the workspace.
 
             **Examples:**
 
             ```python notest
-            members = modal.Environment.from_name("my-restricted-env").members.list()
+            members = modal.Environment.from_name("my-env").members.list()
             print(members)
             # {
-            #     "users": {"alice": "contributor", "bob": "viewer"},
-            #     "service_users": {"alice-bot": "contributor"},
+            #     "users": {"alice": "contributor", "bob": "viewer", "carol": "contributor"},
+            #     "service_users": {"alice-bot": "contributor", "ops-bot": "viewer", "ci-bot": "no-access"},
             # }
             ```
             """

{modal-1.5.3.dev4 → modal-1.5.3.dev5}/modal/sandbox.py

@@ -1021,10 +1021,14 @@ class _Sandbox(_Object, type_prefix="sb"):
             self._is_v2 = True
             self._task_id = create_resp.task_id
             self._hydrate_metadata_v2()
-            self._tunnels = {
-                t.container_port: Tunnel(t.host, t.port, t.unencrypted_host, t.unencrypted_port)
-                for t in create_resp.tunnels
-            }
+            # Unencrypted tunnel endpoints are not known at create time. Only
+            # cache a complete set so tunnels() fetches the rest otherwise.
+            create_resp_has_all_tunnels = len(create_resp.tunnels) == len(open_ports)
+            if create_resp_has_all_tunnels:
+                self._tunnels = {
+                    t.container_port: Tunnel(t.host, t.port, t.unencrypted_host, t.unencrypted_port)
+                    for t in create_resp.tunnels
+                }
 
             if logger.isEnabledFor(logging.DEBUG):
                 total_elapsed = time.monotonic() - load_start

{modal-1.5.3.dev4 → modal-1.5.3.dev5}/modal.egg-info/PKG-INFO

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

{modal-1.5.3.dev4 → modal-1.5.3.dev5}/modal_proto/api_grpc.py

@@ -639,6 +639,10 @@ class ModalClientBase(abc.ABC):
     async def SandboxRestore(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxRestoreRequest, modal_proto.api_pb2.SandboxRestoreResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def SandboxRestoreV2(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxRestoreV2Request, modal_proto.api_pb2.SandboxRestoreV2Response]') -> None:
+        pass
+
     @abc.abstractmethod
     async def SandboxSetName(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxSetNameRequest, modal_proto.api_pb2.SandboxSetNameResponse]') -> None:
         pass
@@ -1875,6 +1879,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.SandboxRestoreRequest,
                 modal_proto.api_pb2.SandboxRestoreResponse,
             ),
+            '/modal.client.ModalClient/SandboxRestoreV2': grpclib.const.Handler(
+                self.SandboxRestoreV2,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.SandboxRestoreV2Request,
+                modal_proto.api_pb2.SandboxRestoreV2Response,
+            ),
             '/modal.client.ModalClient/SandboxSetName': grpclib.const.Handler(
                 self.SandboxSetName,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -3267,6 +3277,12 @@ class ModalClientStub:
             modal_proto.api_pb2.SandboxRestoreRequest,
             modal_proto.api_pb2.SandboxRestoreResponse,
         )
+        self.SandboxRestoreV2 = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/SandboxRestoreV2',
+            modal_proto.api_pb2.SandboxRestoreV2Request,
+            modal_proto.api_pb2.SandboxRestoreV2Response,
+        )
         self.SandboxSetName = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/SandboxSetName',