check to make sure helpers need to be killed before sending kill signal

sidecar/app/query/ipa.py

@@ -34,14 +34,25 @@ def send_kill_signals(self):
         for helper in settings.helpers.values():
             if helper.role == self.role:
                 continue
-            finish_url = urlunparse(
+            status_url = urlunparse(
                 helper.sidecar_url._replace(
-                    scheme="https", path=f"/stop/kill/{self.query_id}"
+                    scheme="https", path=f"/start/{self.query_id}/status"
                 ),
             )
+            r = httpx.get(status_url).json()
+            status = Status.from_json(r)
+            self.logger.info(
+                f"Helper {helper.role} status for query {self.query_id}: {status.name}"
+            )
+            if status < Status.COMPLETE:
+                finish_url = urlunparse(
+                    helper.sidecar_url._replace(
+                        scheme="https", path=f"/stop/kill/{self.query_id}"
+                    ),
+                )
 
-            r = httpx.post(finish_url)
-            self.logger.info(f"sent post request: {r.text}")
+                r = httpx.post(finish_url)
+                self.logger.info(f"sent post request: {r.text}")
 
     def crash(self):
         super().crash()
@@ -261,17 +272,11 @@ def run(self):
             )
             while True:
                 r = httpx.get(url).json()
-                status = r.get("status")
+                status = Status.from_json(r)
                 match status:
-                    case Status.IN_PROGRESS.name:
+                    case Status.IN_PROGRESS:
                         break
-                    case Status.KILLED.name:
-                        self.success = False
-                        return
-                    case Status.NOT_FOUND.name:
-                        self.success = False
-                        return
-                    case Status.CRASHED.name:
+                    case Status.KILLED | Status.NOT_FOUND | Status.CRASHED:
                         self.success = False
                         return
 

sidecar/app/query/status.py

@@ -20,6 +20,14 @@ class Status(IntEnum):
     KILLED = auto()
     CRASHED = auto()
 
+    @classmethod
+    def from_json(cls, response: dict[str, str]):
+        status_str = response.get("status", "")
+        try:
+            return cls[status_str]
+        except KeyError:
+            return cls.UNKNOWN
+
 
 StatusChangeEvent = NamedTuple(
     "StatusChangeEvent", [("status", Status), ("timestamp", float)]

sidecar/tests/app/query/test_status.py

@@ -113,3 +113,19 @@ def test_status_history_status_event_json(
         "start_time": now,
         "end_time": now2,
     }
+
+
+def test_status_from_json():
+    # matching string
+    status = Status.from_json({"status": "STARTING"})
+    assert status == Status.STARTING
+    status = Status.from_json({"status": "UNKNOWN"})
+    assert status == Status.UNKNOWN
+
+    # non-mathcing string
+    status = Status.from_json({"status": "not-a-status"})
+    assert status == Status.UNKNOWN
+
+    # empty json
+    status = Status.from_json({})
+    assert status == Status.UNKNOWN