Memory: Aktive Items vor Kandidaten pruefen im Fallback, Duplikat ID 19 bereinigt
This commit is contained in:
parent
c3d306e495
commit
b2dd69dd1e
1 changed files with 19 additions and 19 deletions
|
|
@ -446,18 +446,9 @@ async def handle_message(update: Update, ctx: ContextTypes.DEFAULT_TYPE):
|
||||||
sent = True
|
sent = True
|
||||||
|
|
||||||
if not sent and suggest["type"] is None:
|
if not sent and suggest["type"] is None:
|
||||||
matched_cand = _find_matching_item(text, memory_client.get_candidates())
|
from datetime import datetime as _dt
|
||||||
if matched_cand:
|
|
||||||
log.info("Fallback-Match: Kandidat ID=%s", matched_cand["id"])
|
|
||||||
await update.message.reply_text(
|
|
||||||
answer[:4000] + "\n\n" + _format_candidate(matched_cand),
|
|
||||||
reply_markup=_memory_buttons(matched_cand["id"]),
|
|
||||||
)
|
|
||||||
sent = True
|
|
||||||
else:
|
|
||||||
matched_active = _find_matching_item(text, memory_client.get_active_memory())
|
matched_active = _find_matching_item(text, memory_client.get_active_memory())
|
||||||
if matched_active:
|
if matched_active:
|
||||||
from datetime import datetime as _dt
|
|
||||||
mtype = matched_active.get("memory_type", "")
|
mtype = matched_active.get("memory_type", "")
|
||||||
exp = matched_active.get("expires_at")
|
exp = matched_active.get("expires_at")
|
||||||
if mtype == "temporary" and exp:
|
if mtype == "temporary" and exp:
|
||||||
|
|
@ -468,6 +459,15 @@ async def handle_message(update: Update, ctx: ContextTypes.DEFAULT_TYPE):
|
||||||
status_msg = "\n\n✅ Bereits gespeichert."
|
status_msg = "\n\n✅ Bereits gespeichert."
|
||||||
await update.message.reply_text(answer[:3900] + status_msg, reply_markup=KEYBOARD)
|
await update.message.reply_text(answer[:3900] + status_msg, reply_markup=KEYBOARD)
|
||||||
sent = True
|
sent = True
|
||||||
|
else:
|
||||||
|
matched_cand = _find_matching_item(text, memory_client.get_candidates())
|
||||||
|
if matched_cand:
|
||||||
|
log.info("Fallback-Match: Kandidat ID=%s", matched_cand["id"])
|
||||||
|
await update.message.reply_text(
|
||||||
|
answer[:4000] + "\n\n" + _format_candidate(matched_cand),
|
||||||
|
reply_markup=_memory_buttons(matched_cand["id"]),
|
||||||
|
)
|
||||||
|
sent = True
|
||||||
|
|
||||||
if not sent:
|
if not sent:
|
||||||
await update.message.reply_text(answer[:4000], reply_markup=KEYBOARD)
|
await update.message.reply_text(answer[:4000], reply_markup=KEYBOARD)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue