Implement instruction and fix naming issues

Author: ianmkenney

alchemiscale/compute/api.py

@@ -428,6 +428,9 @@ def computemanager_register(
         identifier=ComputeManagerID(compute_manager_id),
         registered=now,
         last_status_update=now,
+        status=ComputeManagerStatus.OK,
+        detail="",
+        saturation=0,
     )
 
     compute_manager_id_ = n4js.register_computemanager(cm_registration)
@@ -446,7 +449,7 @@ def computemanager_deregister(
     return compute_manager_id
 
 
-@router.post("/computemanager/{compute_manager_id}/get_instruction")
+@router.post("/computemanager/{compute_manager_id}/instruction")
 def computemanager_get_instruction(
     compute_manager_id,
     *,

alchemiscale/compute/client.py

@@ -10,6 +10,8 @@
 from gufe import Transformation
 from gufe.protocols import ProtocolDAGResult
 
+from .manager import ComputeManagerInstruction
+
 from ..base.client import (
     AlchemiscaleBaseClient,
     AlchemiscaleBaseClientError,
@@ -179,4 +181,8 @@ def update_status(
         return ComputeManagerID(res)
 
     def get_instruction(self, compute_manager_id: ComputeManagerID) -> ComputeManagerID:
-        raise NotImplementedError
+        res = self._post_resource(
+            f"/computemanager/{compute_manager_id}/instruction",
+            {},
+        )
+        return ComputeManagerInstruction(res)

alchemiscale/storage/statestore.py

@@ -32,6 +32,7 @@
 from .models import (
     ComputeServiceID,
     ComputeServiceRegistration,
+    ComputeManagerRegistration,
     ComputeManagerID,
     ComputeManagerStatus,
     NetworkMark,
@@ -1358,45 +1359,91 @@ def compute_service_can_claim(
 
     ## compute manager
 
-    def get_compute_manager_compute_services(
+    def get_compute_manager_compute_service_ids(
         self, compute_manager_id: ComputeManagerID
     ):
-        raise NotImplementedError
+
+        manager_id, uuid = compute_manager_id.manager_id, compute_manager_id.uuid
+
+        query = """
+        MATCH (:ComputeManagerRegistration {manager_id: $manager_id, uuid: $uuid})-[:MANAGES]->(csr:ComputeServiceRegistration)
+        RETURN csr.identifier as id
+        """
+
+        results = self.execute_query(query, manager_id=manager_id, uuid=uuid)
+
+        ids = []
+        for record in results.records:
+            ids.append(ComputeServiceID(record["id"]))
+
+        return ids
 
     def deregister_computemanager(
         self, compute_manager_id: ComputeManagerID, force=False
     ):
-        name, uuid = compute_manager_id.name, compute_manager_id.uuid
+        manager_id, uuid = compute_manager_id.manager_id, compute_manager_id.uuid
 
         full_delete_query = """
-            MATCH (csm:ComputeServiceManager {name: $name, uuid: $uuid})
+            MATCH (csm:ComputeServiceManager {manager_id: $manager_id, uuid: $uuid})
             DELETE csm
             RETURN
             """
 
         if force:
-            self.execute_query(full_delete_query, name=name, uuid=uuid)
+            self.execute_query(full_delete_query, manager_id=manager_id, uuid=uuid)
             return compute_manager_id
 
         query = """
-        MATCH (csm: ComputeServiceManager {name: $name, uuid: $uuid})-[rel:MANAGES]->(ComputeServiceRegistration)
+        MATCH (csm: ComputeServiceManager {manager_id: $manager_id, uuid: $uuid})-[rel:MANAGES]->(ComputeServiceRegistration)
         DELETE rel
         RETURN csm.status AS status
         """
 
-        results = self.execute_query(query, name=name, uuid=uuid)
+        results = self.execute_query(query, manager_id=manager_id, uuid=uuid)
 
         if (
             ComputeManagerStatus(results.records[0]["status"])
             != ComputeManagerStatus.ERRORED
         ):
-            self.execute_query(full_delete_query, name=name, uuid=uuid)
+            self.execute_query(full_delete_query, manager_id=manager_id, uuid=uuid)
 
-    def register_computemanager(self, compute_manager_id: ComputeManagerID):
-        raise NotImplementedError
+    def register_computemanager(
+        self, compute_manager_registration: ComputeManagerRegistration
+    ):
+        node = Node(
+            "ComputeManagerRegistration", **compute_manager_registration.to_dict()
+        )
+
+        with self.transaction() as tx:
+            create_subgraph(tx, Subgraph() | node)
+
+        identifier = (
+            compute_manager_registration.manager_id
+            + "-"
+            + compute_manager_registration.uuid
+        )
+        return identifier
 
     def expire_computemanager_registrations(self, expire_time: datetime):
-        raise NotImplementedError
+        query = """
+        MATCH (cmr:ComputeManagerRegistration)
+        WHERE cmr.last_status_update < localdatetime($expire_time)
+
+        DETACH DELETE cmr
+
+        RETURN cmr.manager_id as id, cmr.uuid as uuid
+        """
+
+        results = self.execute_query(query, expire_time=expire_time.isoformat())
+
+        identities = set()
+        for record in results:
+            compute_manager_id = ComputeManagerID(
+                record["manager_id"] + "-" + record["uuid"]
+            )
+            identities.add(compute_manager_id)
+
+        return identities
 
     def get_computemanager_instruction(
         self,
@@ -1405,15 +1452,15 @@ def get_computemanager_instruction(
         max_failures: int,
     ) -> ComputeManagerInstruction:
 
-        name, uuid = compute_manager_id.name, compute_manager_id.uuid
+        manager_id, uuid = compute_manager_id.manager_id, compute_manager_id.uuid
 
         query = """
-        MATCH (csm: ComputeServiceManager {name: $name, uuid: $uuid})
+        MATCH (csm: ComputeServiceManager {manager_id: $manager_id, uuid: $uuid})
         OPTIONAL MATCH (csm)-[rel:MANAGES]->(csr: ComputeServiceRegistration)
         RETURN csm, csr.identifier as csr_id
         """
 
-        results = self.execute_query(query, name=name, uuid=uuid)
+        results = self.execute_query(query, manager_id=manager_id, uuid=uuid)
 
         # no compute manager was found the given name and UUID
         if len(results.records) == 0:
@@ -1441,17 +1488,17 @@ def update_compute_manager_status(
     ):
         status = ComputeManagerStatus(status)
 
-        name, uuid = compute_manager_id.name, compute_manager_id.uuid
+        manager_id, uuid = compute_manager_id.manager_id, compute_manager_id.uuid
 
         query = """
-        MATCH (csm: ComputeServiceManager {name: $name, uuid: $uuid})
+        MATCH (csm: ComputeServiceManager {manager_id: $manager_id, uuid: $uuid})
         SET csm.status = $status
         SET csm.detail = $detail
         RETURN csm
         """
 
         results = self.execute_query(
-            query, status=str(status), uuid=uuid, name=name, detail=detail
+            query, status=str(status), uuid=uuid, manager_id=manager_id, detail=detail
         )
 
         if len(results.records) == 0: