fix(telegram): replace substring caption check with exact line-by-line match by dlkakbs · Pull Request #2671 · NousResearch/hermes-agent

dlkakbs · 2026-03-23T21:34:43Z

What does this PR do?

The caption merge logic in _enqueue_photo_event and _queue_media_group_eventused a substring check (event.text not in existing.text) to avoid duplicate captions when batching photo bursts and media group albums. This caused silent
data loss: whenever a shorter caption happened to appear as a substring of an already-stored caption, the incoming caption was silently dropped.

Fix: extract a shared _merge_caption static helper that splits the existing text on "\n\n" boundaries and uses exact match (with whitespace normalisation) instead of substring containment. Both functions now delegate to this helper.

Type of Change

Bug fix (non-breaking change that fixes an issue)
Tests (adding or improving test coverage)
Refactor (no behavior change)

Changes Made

gateway/platforms/telegram.py: added TelegramAdapter._merge_caption static helper - splits existing text on "\n\n", uses exact match + strip() for deduplication instead of substring check
gateway/platforms/telegram.py: _enqueue_photo_event (line ~1056) - replaced 4-line inline merge block with single self._merge_caption(...) call
gateway/platforms/telegram.py: _queue_media_group_event (line ~1244) - same replacement
tests/gateway/test_telegram_caption_merge.py: 13 new unit tests covering the bug scenarios, exact duplicates, whitespace normalisation, and multi-item album merges

How to Test

Run the new unit tests:
pytest tests/gateway/test_telegram_caption_merge.py -v
Manual repro (photo burst):
Send two photos in quick succession to your Telegram bot.
Photo 1 caption: "Meeting agenda"
Photo 2 caption: "Meeting"
Before fix: only "Meeting agenda" appeared (second caption dropped).
After fix: both captions appear separated by a blank line.
Manual repro (album):
Send a multi-photo album.
Item 1 caption: "Revenue and Profit"
Item 2 caption: "Revenue"
Before fix: "Revenue" was dropped (substring match).
After fix: both captions appear.
Run the full test suite to verify no regressions:
pytest tests/ -q

Checklist

I've read the Contributing Guide
My commit messages follow Conventional Commits
I searched for existing PRs to make sure this isn't a duplicate
My PR contains only changes related to this fix/feature
I've run pytest tests/ -q and all tests pass (13 passed)
I've added tests for my changes
I've tested on my platform: macOS

Documentation & Housekeeping

I've updated relevant documentation — N/A
I've updated cli-config.yaml.example — N/A
I've updated CONTRIBUTING.md or AGENTS.md — N/A
I've considered cross-platform impact — N/A (pure Python string logic)
I've updated tool descriptions/schemas — N/A

…e match Captions in photo bursts and media group albums were silently dropped when a shorter caption happened to be a substring of an existing one (e.g. "Meeting" lost inside "Meeting agenda"). Extract a shared _merge_caption static helper that splits on "\n\n" and uses exact match with whitespace normalisation, then use it in both _enqueue_photo_event and _queue_media_group_event. Adds 13 unit tests covering the fixed bug scenarios.

…e match Captions in photo bursts and media group albums were silently dropped when a shorter caption happened to be a substring of an existing one (e.g. "Meeting" lost inside "Meeting agenda"). Extract a shared _merge_caption static helper that splits on "\n\n" and uses exact match with whitespace normalisation, then use it in both _enqueue_photo_event and _queue_media_group_event. Adds 13 unit tests covering the fixed bug scenarios. Cherry-picked from PR #2671 by Dilee.

teknium1 · 2026-04-07T21:09:17Z

Merged via PR #5939. Your commit was cherry-picked onto current main with your authorship preserved in git log, and the fix was extended to all platforms (base.py, run.py, feishu.py) that had the same substring bug. Thanks for the clean fix and thorough tests!

…xiliary routing (#5978) * fix(telegram): replace substring caption check with exact line-by-line match Captions in photo bursts and media group albums were silently dropped when a shorter caption happened to be a substring of an existing one (e.g. "Meeting" lost inside "Meeting agenda"). Extract a shared _merge_caption static helper that splits on "\n\n" and uses exact match with whitespace normalisation, then use it in both _enqueue_photo_event and _queue_media_group_event. Adds 13 unit tests covering the fixed bug scenarios. Cherry-picked from PR #2671 by Dilee. * fix: extend caption substring fix to all platforms Move _merge_caption helper from TelegramAdapter to BasePlatformAdapter so all adapters inherit it. Fix the same substring-containment bug in: - gateway/platforms/base.py (photo burst merging) - gateway/run.py (priority photo follow-up merging) - gateway/platforms/feishu.py (media batch merging) The original fix only covered telegram.py. The same bug existed in base.py and run.py (pure substring check) and feishu.py (list membership without whitespace normalization). * fix(auxiliary): resolve named custom providers and 'main' alias in auxiliary routing Two bugs caused auxiliary tasks (vision, compression, etc.) to fail when using named custom providers defined in config.yaml: 1. 'provider: main' was hardcoded to 'custom', which only checks legacy OPENAI_BASE_URL env vars. Now reads _read_main_provider() to resolve to the actual provider (e.g., 'custom:beans', 'openrouter', 'deepseek'). 2. Named custom provider names (e.g., 'beans') fell through to PROVIDER_REGISTRY which doesn't know about config.yaml entries. Now checks _get_named_custom_provider() before the registry fallback. Fixes both resolve_provider_client() and _normalize_vision_provider() so the fix covers all auxiliary tasks (vision, compression, web_extract, session_search, etc.). Adds 13 unit tests. Reported by Laura via Discord. --------- Co-authored-by: Dilee <uzmpsk.dilekakbas@gmail.com>

…e match Captions in photo bursts and media group albums were silently dropped when a shorter caption happened to be a substring of an existing one (e.g. "Meeting" lost inside "Meeting agenda"). Extract a shared _merge_caption static helper that splits on "\n\n" and uses exact match with whitespace normalisation, then use it in both _enqueue_photo_event and _queue_media_group_event. Adds 13 unit tests covering the fixed bug scenarios. Cherry-picked from PR NousResearch#2671 by Dilee.

…xiliary routing (NousResearch#5978) * fix(telegram): replace substring caption check with exact line-by-line match Captions in photo bursts and media group albums were silently dropped when a shorter caption happened to be a substring of an existing one (e.g. "Meeting" lost inside "Meeting agenda"). Extract a shared _merge_caption static helper that splits on "\n\n" and uses exact match with whitespace normalisation, then use it in both _enqueue_photo_event and _queue_media_group_event. Adds 13 unit tests covering the fixed bug scenarios. Cherry-picked from PR NousResearch#2671 by Dilee. * fix: extend caption substring fix to all platforms Move _merge_caption helper from TelegramAdapter to BasePlatformAdapter so all adapters inherit it. Fix the same substring-containment bug in: - gateway/platforms/base.py (photo burst merging) - gateway/run.py (priority photo follow-up merging) - gateway/platforms/feishu.py (media batch merging) The original fix only covered telegram.py. The same bug existed in base.py and run.py (pure substring check) and feishu.py (list membership without whitespace normalization). * fix(auxiliary): resolve named custom providers and 'main' alias in auxiliary routing Two bugs caused auxiliary tasks (vision, compression, etc.) to fail when using named custom providers defined in config.yaml: 1. 'provider: main' was hardcoded to 'custom', which only checks legacy OPENAI_BASE_URL env vars. Now reads _read_main_provider() to resolve to the actual provider (e.g., 'custom:beans', 'openrouter', 'deepseek'). 2. Named custom provider names (e.g., 'beans') fell through to PROVIDER_REGISTRY which doesn't know about config.yaml entries. Now checks _get_named_custom_provider() before the registry fallback. Fixes both resolve_provider_client() and _normalize_vision_provider() so the fix covers all auxiliary tasks (vision, compression, web_extract, session_search, etc.). Adds 13 unit tests. Reported by Laura via Discord. --------- Co-authored-by: Dilee <uzmpsk.dilekakbas@gmail.com>