Improve is_active lookup

machinable-org · May 24, 2024 · a30841c · a30841c
1 parent 299ea20
commit a30841c
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/machinable/execution.py b/src/machinable/execution.py
@@ -411,14 +411,18 @@ def is_active(
     ):
         """True if not finished and last heartbeat occurred less than 30 seconds ago"""
         executable = self.executable(executable)
-        if not self.heartbeat_at(
-            executable,
+
+        if self.is_finished(executable):
+            return False
+
+        if not (
+            heartbeat := self.heartbeat_at(
+                executable,
+            )
         ):
             return False
 
-        return (not self.is_finished(executable)) and (
-            (arrow.now() - self.heartbeat_at(executable)).seconds < 30
-        )
+        return (arrow.now() - heartbeat).seconds < 30
 
     def is_live(
         self,