ai_co_discuss 0.3.20 → 0.3.22

package/backend/free_room.py

@@ -1107,11 +1107,11 @@ def advance_queues(connection, room_id):
 
     Asked rows stay, so the speaking order can still show who already answered.
     """
-    connection.execute(f"""DELETE FROM free_queue WHERE room_id=? AND NOT {QUEUE_ASKED.format(row="free_queue")}
-        AND NOT EXISTS(SELECT 1 FROM room_members m WHERE m.id=free_queue.member_id AND m.status='active')""", (room_id,))
-    connection.execute(f"""INSERT OR IGNORE INTO member_requests (room_id,member_id,message_id,chain_id,batch_id,purpose,created_by,created_at)
-        SELECT q.room_id,q.member_id,q.message_id,q.message_id,0,'ask','user',? FROM free_queue q
-        WHERE q.room_id=? AND q.id=(SELECT MIN(x.id) FROM free_queue x WHERE x.message_id=q.message_id AND NOT {QUEUE_ASKED.format(row="x")})
+    connection.execute("""DELETE FROM free_queue WHERE id IN (SELECT q.id FROM free_queue_waiting q WHERE q.room_id=?
+        AND NOT EXISTS(SELECT 1 FROM room_members m WHERE m.id=q.member_id AND m.status='active'))""", (room_id,))
+    connection.execute("""INSERT OR IGNORE INTO member_requests (room_id,member_id,message_id,chain_id,batch_id,purpose,created_by,created_at)
+        SELECT q.room_id,q.member_id,q.message_id,q.message_id,0,'ask','user',? FROM free_queue_waiting q
+        WHERE q.id IN (SELECT MIN(id) FROM free_queue_waiting WHERE room_id=? GROUP BY message_id)
         AND NOT EXISTS(SELECT 1 FROM member_requests r WHERE r.message_id=q.message_id AND r.status IN ('pending','delivering'))""",
                        (int(time.time()), room_id))
 
@@ -1142,8 +1142,11 @@ def speaking_order(connection, room):
         target = session["id"]
         items, later, session_plan_state = discussion.session_speaking_order(connection, session)
     else:
-        target = connection.execute("""SELECT MAX(q.message_id) FROM free_queue q LEFT JOIN member_requests r ON r.message_id=q.message_id
-            AND r.member_id=q.member_id WHERE q.room_id=? AND (r.id IS NULL OR r.status IN ('pending','delivering'))""", (room["id"],)).fetchone()[0] or 0
+        target = connection.execute("""SELECT MAX(message_id) FROM (
+            SELECT MAX(message_id) AS message_id FROM free_queue_waiting WHERE room_id=?
+            UNION ALL SELECT MAX(r.message_id) FROM member_requests r WHERE r.room_id=? AND r.status IN ('pending','delivering')
+            AND EXISTS(SELECT 1 FROM free_queue q WHERE q.message_id=r.message_id AND q.member_id=r.member_id))""",
+            (room["id"], room["id"])).fetchone()[0] or 0
         if target:
             kind = "queue"
             for row in connection.execute("""SELECT q.member_id,r.status FROM free_queue q LEFT JOIN member_requests r
@@ -1817,8 +1820,8 @@ def interrupt_member(connection, room_id, member_id, token):
 
 def withdrawals(connection, room_id):
     """The room's taken-back messages by id, so the page keeps them in place while AI readers skip them."""
-    return [dict(row) for row in connection.execute("""SELECT w.message_id,w.kind FROM message_withdrawals w
-        JOIN messages m ON m.id=w.message_id WHERE m.room_id=? ORDER BY w.message_id""", (room_id,))]
+    return [dict(row) for row in connection.execute("""SELECT w.message_id,w.kind FROM message_withdrawal_rooms r
+        JOIN message_withdrawals w ON w.message_id=r.message_id WHERE r.room_id=? ORDER BY r.message_id""", (room_id,))]
 
 
 def owner_message(connection, room_id, message_id):

package/backend/remote_launch.py

@@ -20,6 +20,8 @@ from .admin import AdminError
 from .runtime import begin_write
 
 MACHINE_ONLINE_SECONDS = 30
+# Heartbeats refresh seen_at at most this often (well inside the online window) so frequent polls do not each write a row.
+MACHINE_SEEN_REFRESH_SECONDS = 10
 MACHINE_NAME_MAX = 60
 PROJECT_NAME_MAX = 80
 PROJECTS_MAX = 100
@@ -135,11 +137,15 @@ def machine_sync(connection, machine_id, token, payload, now):
     projects, clients = valid_projects(payload.get("projects")), valid_clients(payload.get("clients"))
     public_key = valid_public_key(payload["public_key"]) if "public_key" in payload else None
     begin_write(connection)
-    connection.execute("UPDATE local_machines SET projects=?, clients=?, seen_at=? WHERE id=?",
-                       (json.dumps(projects, ensure_ascii=False), json.dumps(clients, ensure_ascii=False), now, machine_id))
+    # Unchanged heartbeats write nothing until seen_at is due for a refresh.
+    connection.execute("UPDATE local_machines SET projects=?1, clients=?2, seen_at=?3 WHERE id=?4 "
+                       "AND (projects IS NOT ?1 OR clients IS NOT ?2 OR seen_at<?3-?5)",
+                       (json.dumps(projects, ensure_ascii=False), json.dumps(clients, ensure_ascii=False), now, machine_id,
+                        MACHINE_SEEN_REFRESH_SECONDS))
     if public_key:
         connection.execute("INSERT INTO machine_keys (machine_id,public_key) VALUES (?,?) "
-                           "ON CONFLICT(machine_id) DO UPDATE SET public_key=excluded.public_key", (machine_id, json.dumps(public_key)))
+                           "ON CONFLICT(machine_id) DO UPDATE SET public_key=excluded.public_key "
+                           "WHERE machine_keys.public_key IS NOT excluded.public_key", (machine_id, json.dumps(public_key)))
     rows = connection.execute("SELECT id,request FROM remote_launches WHERE machine_id=? AND status IN ('pending','claimed') ORDER BY created_at",
                               (machine_id,)).fetchall()
     return {"launches": [{"id": row["id"], "request": json.loads(row["request"])} for row in rows]}
@@ -245,7 +251,7 @@ def claim_machine_commands(connection, machine_id, token, now):
     require_machine(connection, machine_id, token)
     begin_write(connection)
     connection.execute("DELETE FROM machine_commands WHERE machine_id=? AND created_at<?", (machine_id, now - COMMAND_TTL_SECONDS))
-    connection.execute("UPDATE local_machines SET seen_at=? WHERE id=?", (now, machine_id))
+    connection.execute("UPDATE local_machines SET seen_at=? WHERE id=? AND seen_at<?", (now, machine_id, now - MACHINE_SEEN_REFRESH_SECONDS))
     rows = connection.execute("SELECT id,request FROM machine_commands WHERE machine_id=? AND status='pending' ORDER BY created_at",
                               (machine_id,)).fetchall()
     for row in rows: