earthjasonlin/ai-mail-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: show email subject and sender in all status messages

Browse Source
This commit is contained in:
Zichao Lin
2026-07-15 18:39:58 +08:00
parent 2822075f2f
commit dcdfba11fa
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main.py
View File

@@ -7,7 +7,7 @@ import threading
import time import time
from concurrent.futures import ThreadPoolExecutor from concurrent.futures import ThreadPoolExecutor
from src.config import load_config from src.config import load_config
from src.summarizer import poll_accounts, ai_process, tg_send_and_mark from src.summarizer import poll_accounts, ai_process, tg_send_and_mark, _mail_label
from src.tg_bot import poll_telegram, send_thinking from src.tg_bot import poll_telegram, send_thinking
from src.database import init_db, is_uid_processed, mark_fetched, mark_processing, mark_sent, mark_failed from src.database import init_db, is_uid_processed, mark_fetched, mark_processing, mark_sent, mark_failed
@@ -56,7 +56,8 @@ def _email_poller(cfg):
mark_fetched(uid_str, mail.account_email, mail.folder, mark_fetched(uid_str, mail.account_email, mail.folder,
mail.subject, mail.sender) mail.subject, mail.sender)
try: try:
tg_msg_id = send_thinking(cfg.telegram, cfg.telegram.chat_id, "📥 获取邮件中…") tg_msg_id = send_thinking(cfg.telegram, cfg.telegram.chat_id,
f"📥 *获取邮件中…*\n{_mail_label(mail)}")
except Exception: except Exception:
tg_msg_id = 0 tg_msg_id = 0
_email_queue.put((acct_idx, mail, tg_msg_id)) _email_queue.put((acct_idx, mail, tg_msg_id))

19
src/summarizer.py
View File

@@ -1,4 +1,5 @@
import logging import logging
import re
from typing import Generator, Optional from typing import Generator, Optional
from src.config import Config from src.config import Config
from src.email_client import fetch_unseen_emails, mark_as_seen, Email from src.email_client import fetch_unseen_emails, mark_as_seen, Email
@@ -7,6 +8,17 @@ from src.tg_bot import send_summary, send_thinking, edit_message, format_summary
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
_MD_SPECIAL = re.compile(r"([_*\[\]()~`>#+\-=|{}.!\\])")
def _escape_md(text: str) -> str:
return _MD_SPECIAL.sub(r"\\\1", text)
def _mail_label(mail: Email) -> str:
sender_short = mail.sender.split("<")[0].strip() if "<" in mail.sender else mail.sender.split("@")[0]
subject_short = mail.subject[:30] + ("…" if len(mail.subject) > 30 else "")
return f"{_escape_md(sender_short)} · {_escape_md(subject_short)}"
def poll_accounts(cfg: Config, skip_uids: set[bytes] | None = None) -> Generator[tuple[int, Email], None, None]: def poll_accounts(cfg: Config, skip_uids: set[bytes] | None = None) -> Generator[tuple[int, Email], None, None]:
for idx, acct in enumerate(cfg.email_accounts): for idx, acct in enumerate(cfg.email_accounts):
@@ -23,14 +35,15 @@ def poll_accounts(cfg: Config, skip_uids: set[bytes] | None = None) -> Generator
def ai_process(cfg: Config, acct_idx: int, mail: Email, tg_msg_id: int = 0) -> Optional[dict]: def ai_process(cfg: Config, acct_idx: int, mail: Email, tg_msg_id: int = 0) -> Optional[dict]:
logger.info(f" 正在摘要: {mail.subject}") logger.info(f" 正在摘要: {mail.subject}")
label = _mail_label(mail)
# 阶段1：显示等待处理 # 阶段1：显示等待处理
if tg_msg_id: if tg_msg_id:
edit_message(cfg.telegram, cfg.telegram.chat_id, tg_msg_id, "⏳ 等待处理…") edit_message(cfg.telegram, cfg.telegram.chat_id, tg_msg_id, f"⏳ *等待处理…*\n{label}")
else: else:
tg_msg_id = send_thinking(cfg.telegram, cfg.telegram.chat_id, "⏳ 等待处理…") tg_msg_id = send_thinking(cfg.telegram, cfg.telegram.chat_id, f"⏳ *等待处理…*\n{label}")
# 阶段2：AI 处理，更新为思考中 # 阶段2：AI 处理，更新为思考中
edit_message(cfg.telegram, cfg.telegram.chat_id, tg_msg_id, "🤖 AI思考中…") edit_message(cfg.telegram, cfg.telegram.chat_id, tg_msg_id, f"🤖 *AI思考中…*\n{label}")
summary = summarize_email(cfg.ai, mail.recipient, mail.subject, mail.sender, mail.body, mail.account_email) summary = summarize_email(cfg.ai, mail.recipient, mail.subject, mail.sender, mail.body, mail.account_email)
summary["recipient"] = mail.recipient summary["recipient"] = mail.recipient
if "@" not in summary.get("sender", ""): if "@" not in summary.get("sender", ""):