The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
refactor(telegram): move the reply-anchor normaliser into telegram_ids
Tekniumc05c476f14db
diff --git a/plugins/platforms/telegram/adapter.py b/plugins/platforms/telegram/adapter.pyindex 2b31399da10..851069c0b69 100644--- a/plugins/platforms/telegram/adapter.py+++ b/plugins/platforms/telegram/adapter.py@@ -181,7 +181,7 @@ _MEDIA_KIND_KEYS = {from gateway.platforms.event import MessageEvent, MessageType, ProcessingOutcomefrom plugins.platforms.telegram.telegram_entities import expand_link_entitiesfrom plugins.platforms.telegram.telegram_held_inbound import TelegramHeldInboundMixin-from plugins.platforms.telegram.telegram_ids import normalize_telegram_chat_id, parse_send_target+from plugins.platforms.telegram.telegram_ids import normalize_telegram_chat_id, parse_send_target, parse_telegram_message_idfrom plugins.platforms.telegram.telegram_network import (SEED_FALLBACK_IPS, TelegramFallbackTransport, discover_fallback_ips, parse_fallback_ip_env, tcp_keepalive_socket_options)from utils import env_float, env_int@@ -1004,24 +1004,9 @@ class TelegramAdapter(TelegramHeldInboundMixin, BasePlatformAdapter):topic_id = (metadata or {}).get("direct_messages_topic_id") or (metadata or {}).get("telegram_direct_messages_topic_id")return str(topic_id) if topic_id is not None else None- @staticmethod- def _telegram_message_id(value: Any) -> Optional[int]:- """A reply anchor as a Telegram message id, or None when it is not one.-- Anchors are opaque event ids upstream: a route wake (kanban-wake, loop-tick) is admitted with a- synthetic JSON identity (``session_automation.admit_route_wake``), and ``_reply_anchor_for_event``- hands it to the send verbatim. Raw ``int()`` on that raised ValueError and failed every reply into- the session (#139611); an unanchored reply is strictly better than a failed send."""- if isinstance(value, bool):- return None- if isinstance(value, int):- return value if value > 0 else None- text = str(value).strip() if value is not None else ""- return int(text) if text.isascii() and text.isdigit() and int(text) > 0 else None-@classmethoddef _metadata_reply_to_message_id(cls, metadata: Optional[dict[str, Any]]) -> Optional[int]:- return cls._telegram_message_id((metadata or {}).get("telegram_reply_to_message_id"))+ return parse_telegram_message_id((metadata or {}).get("telegram_reply_to_message_id"))@staticmethoddef _dm_topic_fallback(metadata: Optional[dict[str, Any]]) -> bool:@@ -1043,8 +1028,7 @@ class TelegramAdapter(TelegramHeldInboundMixin, BasePlatformAdapter):@classmethoddef _reply_to_message_id_for_send(cls, reply_to: Optional[str], metadata: Optional[dict[str, Any]] = None, reply_to_mode: Optional[str] = None) -> Optional[int]:- anchor = cls._telegram_message_id(reply_to)- if anchor is not None:+ if (anchor := parse_telegram_message_id(reply_to)) is not None:return anchorif cls._dm_topic_fallback(metadata) and reply_to_mode != "off":return cls._metadata_reply_to_message_id(metadata)@@ -1443,9 +1427,7 @@ class TelegramAdapter(TelegramHeldInboundMixin, BasePlatformAdapter):metadata_reply_to = self._metadata_reply_to_message_id(metadata)private_dm_topic_send = self._is_private_dm_topic_send(chat_id, thread_id, metadata)dm_topic_reply_to_off = private_dm_topic_send and self._reply_to_mode == "off" and self._dm_topic_fallback(metadata)- explicit_reply_to = self._telegram_message_id(reply_to)- reply_to_source = (str(explicit_reply_to) if explicit_reply_to is not None else None) or (- str(metadata_reply_to) if private_dm_topic_send and metadata_reply_to is not None else None)+ reply_to_source = next((str(i) for i in (parse_telegram_message_id(reply_to), metadata_reply_to if private_dm_topic_send else None) if i is not None), None)if private_dm_topic_send:should_thread = reply_to_source is not None and self._reply_to_mode != "off"else:diff --git a/plugins/platforms/telegram/telegram_ids.py b/plugins/platforms/telegram/telegram_ids.pyindex 21879d4c3b6..ab636fa8edb 100644--- a/plugins/platforms/telegram/telegram_ids.py+++ b/plugins/platforms/telegram/telegram_ids.py@@ -43,3 +43,17 @@ def parse_send_target(ref):if parsed:return parsedreturn parse_nonempty(parse_telegram_username_target(ref) or "")+++def parse_telegram_message_id(value: Any) -> int | None:+ """A reply anchor as a Telegram message id (a positive int), or ``None`` when it is not one.++ Anchors are opaque event ids upstream: a route wake (kanban-wake, loop-tick) carries a synthetic+ JSON identity, and raw ``int()`` on it failed every reply into the session (#139611); an+ unanchored reply is strictly better than a failed send."""+ if isinstance(value, bool):+ return None+ if isinstance(value, int):+ return value if value > 0 else None+ text = str(value).strip() if value is not None else ""+ return int(text) if text.isascii() and text.isdigit() and int(text) > 0 else None