fix(tracker): no duplicate Telegram messages on not-modified/transient edits
edit_telegram now returns a distinguishable outcome (ok|not_modified|gone|
failed) instead of a bare bool. update_task_tracker only sends a NEW message
when the original is truly gone; not_modified and transient failures no longer
spawn duplicate trackers or orphan the live one.
render_task_tracker shows "попытка N" on an actively re-run stage (>=2 agent
runs) so the text changes between review<->development cycles. Finished (✅)
lines are unchanged.
Tests: edit_telegram classification (ok/not_modified/gone/failed via mocked
httpx), update_task_tracker (not_modified/failed -> no send, gone -> send+id),
render attempt marker.
This commit is contained in:
@@ -68,16 +68,43 @@ def send_telegram(text: str, disable_notification: bool = False):
|
||||
return None
|
||||
|
||||
|
||||
def edit_telegram(message_id: int, text: str) -> bool:
|
||||
"""Edit an existing Telegram message. Returns True on success, else False.
|
||||
# edit_telegram outcome codes -> let update_task_tracker decide what to do:
|
||||
# "ok" edit applied -> nothing else to do
|
||||
# "not_modified" Telegram says text is identical (400 "message is not
|
||||
# modified" / "exactly the same") -> success, NO new message
|
||||
# "gone" original message can't be edited (deleted / too old /
|
||||
# invalid id) -> caller must fall back to a NEW message
|
||||
# "failed" transient failure (network / timeout / 5xx / unknown 400)
|
||||
# -> caller must NOT send a new message (avoid duplicates)
|
||||
EDIT_OK = "ok"
|
||||
EDIT_NOT_MODIFIED = "not_modified"
|
||||
EDIT_GONE = "gone"
|
||||
EDIT_FAILED = "failed"
|
||||
|
||||
Used by the live tracker to refresh the single per-task message in place.
|
||||
Never raises. A False return tells the caller to fall back to a new message
|
||||
(e.g. the message is too old to edit / was deleted / 400).
|
||||
# Telegram error descriptions that mean the message is permanently un-editable
|
||||
# (it is gone / orphaned) -> fall back to a fresh message.
|
||||
_GONE_MARKERS = (
|
||||
"message to edit not found",
|
||||
"message can't be edited",
|
||||
"message_id_invalid",
|
||||
)
|
||||
# Telegram "nothing changed" -> treat as success, never a duplicate.
|
||||
_NOT_MODIFIED_MARKERS = (
|
||||
"message is not modified",
|
||||
"exactly the same",
|
||||
)
|
||||
|
||||
|
||||
def edit_telegram(message_id: int, text: str) -> str:
|
||||
"""Edit an existing Telegram message. Never raises.
|
||||
|
||||
Returns a distinguishable outcome (see EDIT_* constants) so the caller can
|
||||
tell apart "all good" / "nothing changed" / "message gone" / "transient
|
||||
failure" and only fall back to a NEW message when the original is truly gone.
|
||||
"""
|
||||
s = _get_settings()
|
||||
if not s.telegram_bot_token or not s.telegram_chat_id:
|
||||
return False
|
||||
return EDIT_FAILED
|
||||
try:
|
||||
url = f"https://api.telegram.org/bot{s.telegram_bot_token}/editMessageText"
|
||||
resp = httpx.post(
|
||||
@@ -91,9 +118,32 @@ def edit_telegram(message_id: int, text: str) -> bool:
|
||||
timeout=5,
|
||||
)
|
||||
data = resp.json()
|
||||
return bool(data.get("ok"))
|
||||
except Exception:
|
||||
return False
|
||||
if data.get("ok"):
|
||||
return EDIT_OK
|
||||
# ok:false -> inspect the description to classify the 400.
|
||||
desc = str(data.get("description") or "").lower()
|
||||
if any(m in desc for m in _NOT_MODIFIED_MARKERS):
|
||||
# Text is identical between transitions (e.g. repeat review cycle
|
||||
# renders the same line). Nothing to do, NOT a duplicate.
|
||||
logger.debug(
|
||||
f"edit_telegram(mid={message_id}): not modified, skipping"
|
||||
)
|
||||
return EDIT_NOT_MODIFIED
|
||||
if any(m in desc for m in _GONE_MARKERS):
|
||||
logger.warning(
|
||||
f"edit_telegram(mid={message_id}): message gone ({desc!r}), "
|
||||
f"will fall back to a new message"
|
||||
)
|
||||
return EDIT_GONE
|
||||
# Unknown 400 / other non-ok -> transient/unknown, do NOT duplicate.
|
||||
logger.warning(
|
||||
f"edit_telegram(mid={message_id}): edit failed ({desc!r})"
|
||||
)
|
||||
return EDIT_FAILED
|
||||
except Exception as e:
|
||||
# Network / timeout / 5xx -> transient, do NOT duplicate.
|
||||
logger.warning(f"edit_telegram(mid={message_id}): transient error: {e}")
|
||||
return EDIT_FAILED
|
||||
|
||||
|
||||
def _get_work_item_id(task_id: int) -> str:
|
||||
@@ -280,11 +330,35 @@ def render_task_tracker(task_id: int) -> str:
|
||||
|
||||
for stage_key, label, agent in _TRACKER_STAGES:
|
||||
run = last_done.get(agent)
|
||||
if run is not None:
|
||||
# The stage is "in progress" only when it is the task's current stage AND
|
||||
# there is an unfinished run for its agent (the agent is actually still
|
||||
# working). A finished run with no in-flight run -> show the \u2705 result,
|
||||
# even if the task still sits in that stage (just-finished snapshot).
|
||||
agent_runs = agent_runs_by_agent.get(agent, [])
|
||||
has_inflight = any(ar["finished_at"] is None for ar in agent_runs)
|
||||
is_active_stage = (
|
||||
_STAGE_ACTIVE_AGENT.get(stage) == agent
|
||||
and stage == stage_key
|
||||
and (has_inflight or run is None)
|
||||
)
|
||||
if is_active_stage:
|
||||
# Live "\U0001f504 ... \u0438\u0434\u0451\u0442" line. Count how many times THIS stage's
|
||||
# agent has run for this task; a 2nd+ run means we're re-doing the
|
||||
# stage (e.g. review->development->review), so show "\u043f\u043e\u043f\u044b\u0442\u043a\u0430 N"
|
||||
# to make the text change between cycles and to honestly show Slava
|
||||
# the stage is being re-worked.
|
||||
attempt = len(agent_runs)
|
||||
if attempt >= 2:
|
||||
lines.append(
|
||||
f"\U0001f504 {label} \u00b7 \u043f\u043e\u043f\u044b\u0442\u043a\u0430 {attempt} "
|
||||
f"\u2026 \u0438\u0434\u0451\u0442"
|
||||
)
|
||||
else:
|
||||
lines.append(
|
||||
f"\U0001f504 {label:<13} \u2026 \u00b7 \u0438\u0434\u0451\u0442"
|
||||
)
|
||||
elif run is not None:
|
||||
lines.append(_stage_line(label, run))
|
||||
elif _STAGE_ACTIVE_AGENT.get(stage) == agent and stage == stage_key:
|
||||
# This stage is the active one and has no finished run yet.
|
||||
lines.append(f"\U0001f504 {label:<13} \u2026 \u00b7 \u0438\u0434\u0451\u0442")
|
||||
# else: not started yet -> not shown.
|
||||
|
||||
# Insert the BRD review line right after Analysis.
|
||||
@@ -372,19 +446,32 @@ def update_task_tracker(task_id: int):
|
||||
"""Render + push the live tracker for a task. Never raises.
|
||||
|
||||
First call (no stored tracker_message_id): sendMessage (silent) and store the
|
||||
returned message_id. Subsequent calls: editMessageText the stored message; if
|
||||
the edit fails (too old / deleted / 400), fall back to a NEW message and
|
||||
update the stored id. The tracker is always sent with disable_notification so
|
||||
it never pings — only the dedicated alert helpers ping.
|
||||
returned message_id. Subsequent calls: editMessageText the stored message.
|
||||
A NEW message is sent ONLY when the original is truly gone (deleted / too old
|
||||
/ invalid id). On "not modified" (text unchanged) or transient failures
|
||||
(network / timeout / 5xx / unknown 400) we do NOT send a new message — that
|
||||
is exactly what produced duplicate trackers and orphaned (lagging) messages.
|
||||
The tracker is always sent with disable_notification so it never pings —
|
||||
only the dedicated alert helpers ping.
|
||||
"""
|
||||
try:
|
||||
from .db import get_tracker_message_id, set_tracker_message_id
|
||||
text = render_task_tracker(task_id)
|
||||
mid = get_tracker_message_id(task_id)
|
||||
if mid is not None:
|
||||
if edit_telegram(mid, text):
|
||||
result = edit_telegram(mid, text)
|
||||
if result in (EDIT_OK, EDIT_NOT_MODIFIED):
|
||||
# Edited in place (or nothing to change) -> done, no duplicate.
|
||||
return
|
||||
# Edit failed -> fall back to a fresh message.
|
||||
if result == EDIT_FAILED:
|
||||
# Transient -> don't duplicate; tracker redraws next transition.
|
||||
logger.debug(
|
||||
f"update_task_tracker({task_id}): edit failed transiently, "
|
||||
f"keeping message {mid}"
|
||||
)
|
||||
return
|
||||
# result == EDIT_GONE -> the stored message is gone; fall through
|
||||
# to send a fresh one and re-point tracker_message_id at it.
|
||||
new_mid = send_telegram(text, disable_notification=True)
|
||||
if new_mid is not None:
|
||||
set_tracker_message_id(task_id, new_mid)
|
||||
|
||||
Reference in New Issue
Block a user