update server to receive grow/shrink request

Signed-off-by: vsoch <[email protected]>

Author: vsoch

Dockerfile

@@ -21,5 +21,6 @@ RUN python3 -m pip install --break-system-packages -r requirements.txt && \
     python3 -m pip install --break-system-packages  -e .
 
 # ensemble-server start --workers 10 --port <port>
+ENV PYTHONUNBUFFERED=1
 ENTRYPOINT ["ensemble-server"]
 CMD ["start"]

ensemble/config/types.py

@@ -178,6 +178,12 @@ def finished(self):
         """
         return self.repetitions <= 0
 
+    def value(self, default=1):
+        """
+        Return a value, with some default (default is 1)
+        """
+        return self._action.get("value", 1)
+
     @property
     def label(self):
         return self._action.get("label")

ensemble/defaults.py

@@ -4,6 +4,7 @@
 supported_members = ["flux", "minicluster"]
 valid_actions = ["submit", "custom", "terminate", "grow", "shrink"]
 heartbeat_seconds = 60
+service_account_file = "/var/run/secrets/kubernetes.io/serviceaccount/namespace"
 
 job_events = [
     "job-depend",

ensemble/members/client.py

@@ -19,14 +19,16 @@ def __init__(self, host="localhost:50051", use_ssl=False):
         self.host = host
         self.use_ssl = use_ssl
 
-    def action_request(self, member, action, payload):
+    def action_request(self, member, name, action, payload):
         """
         Send an action request to the grpc server.
         """
         payload = json.dumps(payload)
 
         # These are submit variables. A more substantial submit script would have argparse, etc.
-        request = ensemble_service_pb2.ActionRequest(member=member, action=action, payload=payload)
+        request = ensemble_service_pb2.ActionRequest(
+            member=member, name=name, action=action, payload=payload
+        )
 
         with auth.grpc_channel(self.host, self.use_ssl) as channel:
             stub = ensemble_service_pb2_grpc.EnsembleOperatorStub(channel)

ensemble/members/flux/minicluster.py

@@ -57,20 +57,42 @@ def client(self):
         self._client = EnsembleClient(host=self.host)
         return self._client
 
+    @property
+    def payload(self):
+        """
+        Return the default payload
+        """
+        return {"version": "v1alpha2", "group": "flux-framework.org"}
+
     def grow(self, rule, record=None):
         """
         Request to the API to grow the MiniCluster
         """
         name = self.options["name"]
-        response = self.client.action_request(member=name, action="grow", payload={})
+        payload = self.payload
+
+        # Add the grow value to the payload
+        payload["grow"] = rule.action.value()
+
+        # Member "minicluster" should be plural here
+        response = self.client.action_request(
+            member=f"{self.name}s", name=name, action="grow", payload=payload
+        )
         print(response)
 
     def shrink(self, rule, record=None):
         """
         Request to the API to shrink the MiniCluster
         """
         name = self.options["name"]
-        response = self.client.action_request(member=name, action="shrink", payload={})
+
+        # Add the grow value to the payload
+        payload = self.payload
+        payload["shrink"] = rule.action.value()
+
+        response = self.client.action_request(
+            member=f"{self.name}s", name=name, action="shrink", payload=payload
+        )
         print(response)
 
     @property

ensemble/protos/ensemble_service_pb2.py

@@ -6,24 +6,24 @@ from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union
 DESCRIPTOR: _descriptor.FileDescriptor
 
 class StatusRequest(_message.Message):
-    __slots__ = ("member", "namespace")
+    __slots__ = ("member", "name")
     MEMBER_FIELD_NUMBER: _ClassVar[int]
-    NAMESPACE_FIELD_NUMBER: _ClassVar[int]
+    NAME_FIELD_NUMBER: _ClassVar[int]
     member: str
-    namespace: str
-    def __init__(self, member: _Optional[str] = ..., namespace: _Optional[str] = ...) -> None: ...
+    name: str
+    def __init__(self, member: _Optional[str] = ..., name: _Optional[str] = ...) -> None: ...
 
 class ActionRequest(_message.Message):
-    __slots__ = ("member", "namespace", "action", "payload")
+    __slots__ = ("member", "name", "action", "payload")
     MEMBER_FIELD_NUMBER: _ClassVar[int]
-    NAMESPACE_FIELD_NUMBER: _ClassVar[int]
+    NAME_FIELD_NUMBER: _ClassVar[int]
     ACTION_FIELD_NUMBER: _ClassVar[int]
     PAYLOAD_FIELD_NUMBER: _ClassVar[int]
     member: str
-    namespace: str
+    name: str
     action: str
     payload: str
-    def __init__(self, member: _Optional[str] = ..., namespace: _Optional[str] = ..., action: _Optional[str] = ..., payload: _Optional[str] = ...) -> None: ...
+    def __init__(self, member: _Optional[str] = ..., name: _Optional[str] = ..., action: _Optional[str] = ..., payload: _Optional[str] = ...) -> None: ...
 
 class Response(_message.Message):
     __slots__ = ("payload", "status")

ensemble/protos/ensemble_service_pb2.pyi

@@ -68,6 +68,7 @@
                         "items": {
                             "properties": {
                                 "name": {"type": "string"},
+                                "value": {"type": ["number", "string"]},
                                 "label": {"type": ["number", "string"]},
                             },
                             "required": ["name"],