Make namespace an attr of ClientService

Author: NickCao

packages/jumpstarter/jumpstarter/client/grpc.py

@@ -128,56 +128,55 @@ def dump_yaml(self):
 @dataclass(kw_only=True, slots=True)
 class ClientService:
     channel: Channel
+    namespace: str
     stub: client_pb2_grpc.ClientServiceStub = field(init=False)
 
     def __post_init__(self):
         self.stub = client_pb2_grpc.ClientServiceStub(channel=self.channel)
 
-    async def GetExporter(self, *, namespace: str, name: str):
+    async def GetExporter(self, *, name: str):
         exporter = await self.stub.GetExporter(
             client_pb2.GetExporterRequest(
-                name="namespaces/{}/exporters/{}".format(namespace, name),
+                name="namespaces/{}/exporters/{}".format(self.namespace, name),
             )
         )
         return Exporter.from_protobuf(exporter)
 
     async def ListExporters(
         self,
         *,
-        namespace: str,
         page_size: int | None = None,
         page_token: str | None = None,
         filter: str | None = None,
     ):
         exporters = await self.stub.ListExporters(
             client_pb2.ListExportersRequest(
-                parent="namespaces/{}".format(namespace),
+                parent="namespaces/{}".format(self.namespace),
                 page_size=page_size,
                 page_token=page_token,
                 filter=filter,
             )
         )
         return ExporterList.from_protobuf(exporters)
 
-    async def GetLease(self, *, namespace: str, name: str):
+    async def GetLease(self, *, name: str):
         lease = await self.stub.GetLease(
             client_pb2.GetLeaseRequest(
-                name="namespaces/{}/leases/{}".format(namespace, name),
+                name="namespaces/{}/leases/{}".format(self.namespace, name),
             )
         )
         return Lease.from_protobuf(lease)
 
     async def ListLeases(
         self,
         *,
-        namespace: str,
         page_size: int | None = None,
         page_token: str | None = None,
         filter: str | None = None,
     ):
         leases = await self.stub.ListLeases(
             client_pb2.ListLeasesRequest(
-                parent="namespaces/{}".format(namespace),
+                parent="namespaces/{}".format(self.namespace),
                 page_size=page_size,
                 page_token=page_token,
                 filter=filter,
@@ -188,7 +187,6 @@ async def ListLeases(
     async def CreateLease(
         self,
         *,
-        namespace: str,
         selector: str,
         duration: timedelta,
     ):
@@ -197,7 +195,7 @@ async def CreateLease(
 
         lease = await self.stub.CreateLease(
             client_pb2.CreateLeaseRequest(
-                parent="namespaces/{}".format(namespace),
+                parent="namespaces/{}".format(self.namespace),
                 lease=client_pb2.Lease(
                     duration=duration_pb,
                     selector=selector,
@@ -209,7 +207,6 @@ async def CreateLease(
     async def UpdateLease(
         self,
         *,
-        namespace: str,
         name: str,
         duration: timedelta,
     ):
@@ -222,17 +219,17 @@ async def UpdateLease(
         lease = await self.stub.UpdateLease(
             client_pb2.UpdateLeaseRequest(
                 lease=client_pb2.Lease(
-                    name="namespaces/{}/leases/{}".format(namespace, name),
+                    name="namespaces/{}/leases/{}".format(self.namespace, name),
                     duration=duration_pb,
                 ),
                 update_mask=update_mask,
             )
         )
         return Lease.from_protobuf(lease)
 
-    async def DeleteLease(self, *, namespace: str, name: str):
+    async def DeleteLease(self, *, name: str):
         await self.stub.DeleteLease(
             client_pb2.DeleteLeaseRequest(
-                name="namespaces/{}/leases/{}".format(namespace, name),
+                name="namespaces/{}/leases/{}".format(self.namespace, name),
             )
         )

packages/jumpstarter/jumpstarter/client/lease.py

@@ -45,7 +45,7 @@ def __post_init__(self):
             super().__post_init__()
 
         self.controller = jumpstarter_pb2_grpc.ControllerServiceStub(self.channel)
-        self.svc = ClientService(channel=self.channel)
+        self.svc = ClientService(channel=self.channel, namespace=self.namespace)
         self.manager = self.portal.wrap_async_context_manager(self)
 
     async def _create(self):
@@ -56,7 +56,6 @@ async def _create(self):
         with translate_grpc_exceptions():
             self.name = (
                 await self.svc.CreateLease(
-                    namespace=self.namespace,
                     selector=selector,
                     duration=timedelta(seconds=self.timeout),
                 )
@@ -99,7 +98,6 @@ async def _acquire(self):
                 logger.debug("Polling Lease %s", self.name)
                 with translate_grpc_exceptions():
                     result = await self.svc.GetLease(
-                        namespace=self.namespace,
                         name=self.name,
                     )
 
@@ -136,7 +134,6 @@ async def __aexit__(self, exc_type, exc_value, traceback):
         if self.release:
             logger.info("Releasing Lease %s", self.name)
             await self.svc.DeleteLease(
-                namespace=self.namespace,
                 name=self.name,
             )
 

packages/jumpstarter/jumpstarter/config/client.py

@@ -91,21 +91,19 @@ def release_lease(self, name):
             portal.call(self.release_lease_async, name)
 
     async def get_exporter_async(self, name: str):
-        svc = ClientService(channel=await self.channel())
+        svc = ClientService(channel=await self.channel(), namespace=self.metadata.namespace)
         with translate_grpc_exceptions():
-            return await svc.GetExporter(namespace=self.metadata.namespace, name=name)
+            return await svc.GetExporter(name=name)
 
     async def list_exporters_async(
         self,
         page_size: int | None = None,
         page_token: str | None = None,
         filter: str | None = None,
     ):
-        svc = ClientService(channel=await self.channel())
+        svc = ClientService(channel=await self.channel(), namespace=self.metadata.namespace)
         with translate_grpc_exceptions():
-            return await svc.ListExporters(
-                namespace=self.metadata.namespace, page_size=page_size, page_token=page_token, filter=filter
-            )
+            return await svc.ListExporters(page_size=page_size, page_token=page_token, filter=filter)
 
     async def request_lease_async(
         self,
@@ -129,15 +127,15 @@ async def request_lease_async(
             return await lease.request_async()
 
     async def list_leases_async(self):
-        svc = ClientService(channel=await self.channel())
+        svc = ClientService(channel=await self.channel(), namespace=self.metadata.namespace)
         with translate_grpc_exceptions():
-            result = await svc.ListLeases(namespace=self.metadata.namespace)
+            result = await svc.ListLeases()
             return [lease.name for lease in result.leases]
 
     async def release_lease_async(self, name):
-        svc = ClientService(channel=await self.channel())
+        svc = ClientService(channel=await self.channel(), namespace=self.metadata.namespace)
         with translate_grpc_exceptions():
-            await svc.DeleteLease(namespace=self.metadata.namespace, name=name)
+            await svc.DeleteLease(name=name)
 
     @asynccontextmanager
     async def lease_async(