sync update from LAN repo (source dhk-1 @ c21a2a4a)
This commit is contained in:
1 parent
264e2200d6
commit
a1fa13a238
122 files changed
+8881
-623
No files matched your search
+22
-3
@@ -36,7 +36,9 @@ from deerflow.persistence.roundtable_jobs.model import RoundtableJobRow
|
||||
from deerflow.persistence.roundtable_jobs.sql import compute_active_dedupe_key
|
||||
from deerflow.persistence.roundtable_rooms.model import RoundtableRoomLeaseRow
|
||||
|
||||
LEASE_SECONDS = 60
|
||||
DEFAULT_LEASE_SECONDS = 5 * 60
|
||||
MIN_LEASE_SECONDS = 60
|
||||
MAX_LEASE_SECONDS = 60 * 60
|
||||
JOB_LIVE_SECONDS = 15 * 60
|
||||
OCCUPYING_JOB_STATUSES = ("queued", "running", "awaiting_input", "cancel_requested")
|
||||
# A background job keeps running while Step 3 generates its artifacts, but the
|
||||
@@ -80,6 +82,15 @@ def _job_is_live(
|
||||
return updated is not None and updated >= live_after
|
||||
|
||||
|
||||
def normalize_lease_seconds(value: int | None) -> int:
|
||||
"""Clamp a foreground room lease to the supported 1–60 minute window."""
|
||||
try:
|
||||
seconds = int(value) if value is not None else DEFAULT_LEASE_SECONDS
|
||||
except (TypeError, ValueError):
|
||||
seconds = DEFAULT_LEASE_SECONDS
|
||||
return max(MIN_LEASE_SECONDS, min(MAX_LEASE_SECONDS, seconds))
|
||||
|
||||
|
||||
def _hard_deadline_reached(
|
||||
created_at: datetime | None,
|
||||
now: datetime,
|
||||
@@ -104,6 +115,7 @@ class RoundtableRoomRepository:
|
||||
enabled: bool,
|
||||
max_rooms: int,
|
||||
max_hold_minutes: int = 30,
|
||||
lease_seconds: int = DEFAULT_LEASE_SECONDS,
|
||||
extra_keys: set[str] | Mapping[str, str | None] | None = None,
|
||||
) -> dict[str, Any]:
|
||||
"""Atomically reserve/renew a room, or reject when the pool is full."""
|
||||
@@ -119,6 +131,7 @@ class RoundtableRoomRepository:
|
||||
enabled=enabled,
|
||||
max_rooms=max_rooms,
|
||||
max_hold_minutes=max_hold_minutes,
|
||||
lease_seconds=lease_seconds,
|
||||
extra_keys=extra_keys,
|
||||
)
|
||||
|
||||
@@ -133,6 +146,7 @@ class RoundtableRoomRepository:
|
||||
enabled: bool,
|
||||
max_rooms: int,
|
||||
max_hold_minutes: int = 30,
|
||||
lease_seconds: int = DEFAULT_LEASE_SECONDS,
|
||||
extra_keys: set[str] | Mapping[str, str | None] | None = None,
|
||||
) -> dict[str, Any]:
|
||||
"""Atomically admit a pre-resolved room key.
|
||||
@@ -201,6 +215,7 @@ class RoundtableRoomRepository:
|
||||
task_id=task_id,
|
||||
holder_user_id=holder_user_id,
|
||||
now=now,
|
||||
lease_seconds=lease_seconds,
|
||||
)
|
||||
await session.commit()
|
||||
return self._decision(
|
||||
@@ -272,6 +287,7 @@ class RoundtableRoomRepository:
|
||||
enabled: bool,
|
||||
max_rooms: int,
|
||||
max_hold_minutes: int = 30,
|
||||
lease_seconds: int = DEFAULT_LEASE_SECONDS,
|
||||
extra_keys: set[str] | Mapping[str, str | None] | None = None,
|
||||
) -> dict[str, Any]:
|
||||
"""Renew one live foreground lease without ever creating it.
|
||||
@@ -298,6 +314,7 @@ class RoundtableRoomRepository:
|
||||
enabled=enabled,
|
||||
max_rooms=max_rooms,
|
||||
max_hold_minutes=max_hold_minutes,
|
||||
lease_seconds=lease_seconds,
|
||||
extra_keys=extra_keys,
|
||||
)
|
||||
|
||||
@@ -309,6 +326,7 @@ class RoundtableRoomRepository:
|
||||
enabled: bool,
|
||||
max_rooms: int,
|
||||
max_hold_minutes: int = 30,
|
||||
lease_seconds: int = DEFAULT_LEASE_SECONDS,
|
||||
extra_keys: set[str] | Mapping[str, str | None] | None = None,
|
||||
) -> dict[str, Any]:
|
||||
"""Renew a resolved persisted key without creating a missing lease."""
|
||||
@@ -354,7 +372,7 @@ class RoundtableRoomRepository:
|
||||
message="会商连接已断开,请重新恢复研讨。" if enabled else "",
|
||||
)
|
||||
|
||||
row.lease_until = now + timedelta(seconds=LEASE_SECONDS)
|
||||
row.lease_until = now + timedelta(seconds=normalize_lease_seconds(lease_seconds))
|
||||
row.updated_at = now
|
||||
await session.commit()
|
||||
return self._decision(
|
||||
@@ -538,9 +556,10 @@ class RoundtableRoomRepository:
|
||||
task_id: str | None,
|
||||
holder_user_id: str | None,
|
||||
now: datetime,
|
||||
lease_seconds: int = DEFAULT_LEASE_SECONDS,
|
||||
) -> None:
|
||||
row = await session.get(RoundtableRoomLeaseRow, room_key)
|
||||
lease_until = now + timedelta(seconds=LEASE_SECONDS)
|
||||
lease_until = now + timedelta(seconds=normalize_lease_seconds(lease_seconds))
|
||||
if row is None:
|
||||
session.add(
|
||||
RoundtableRoomLeaseRow(
|
||||
|
||||
Reference in new issue
Block a user