fix: better count when done

Haidra-Org · Oct 1, 2024 · 7310ea7 · 7310ea7
1 parent 6b8da9b
commit 7310ea7
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/horde/classes/base/waiting_prompt.py b/horde/classes/base/waiting_prompt.py
@@ -300,15 +300,27 @@ def is_completed(self):
             db.session.query(procgen_class.wp_id)
             .filter(
                 procgen_class.wp_id == self.id,
-                procgen_class.fake == False,  # noqa E712
+                procgen_class.fake.is_(False),
                 or_(
-                    procgen_class.faulted == True,  # noqa E712
+                    procgen_class.faulted.is_(True),
                     procgen_class.generation != None,  # noqa E712
                 ),
             )
             .count()
         )
-        if finished_procgens < self.jobs:
+        processing_procgens = (
+            db.session.query(procgen_class.wp_id)
+            .filter(
+                procgen_class.wp_id == self.id,
+                procgen_class.fake.is_(False),
+                or_(
+                    procgen_class.faulted.is_(False),
+                    procgen_class.generation.is_(None),
+                ),
+            )
+            .count()
+        )
+        if finished_procgens - processing_procgens < self.jobs:
             return False
         return True