update app.py

app.py

@@ -1,4 +1,5 @@
 import json, random
+from collections import deque
 import numpy as np
 import faiss, gradio as gr
 from sentence_transformers import SentenceTransformer
@@ -14,14 +15,15 @@ with open(actions_path, "r", encoding="utf-8") as f:
 
 index = faiss.read_index(index_path)
 model = SentenceTransformer("sentence-transformers/all-MiniLM-L6-v2")
+recent = deque(maxlen=120)
 
-def pick_unique(idxs, goal, energy, max_minutes, ignore_goal=False, ignore_energy=False, ignore_minutes=False, need=3, used_titles=None):
-    if used_titles is None:
-        used_titles = set()
+def pick_unique(idxs, goal, energy, max_minutes, ignore_goal=False, ignore_energy=False, ignore_minutes=False, need=3, used=None):
+    if used is None:
+        used = set()
     out = []
     for i in idxs:
         a = actions[i]
-        if a["title"] in used_titles:
+        if a["title"] in used or a["title"] in recent:
             continue
         if not ignore_goal and goal and a["goal"] != goal:
             continue
@@ -29,36 +31,35 @@ def pick_unique(idxs, goal, energy, max_minutes, ignore_goal=False, ignore_energ
             continue
         if not ignore_minutes and max_minutes and a["duration_min"] > int(max_minutes):
             continue
-        used_titles.add(a["title"])
+        used.add(a["title"])
         out.append(a)
         if len(out) == need:
             break
-    return out, used_titles
-
-def fill_random(need, used_titles):
-    pool = [a for a in actions if a["title"] not in used_titles]
-    random.shuffle(pool)
-    return pool[:need]
+    return out, used
 
 def search(query, goal, energy, max_minutes):
-    q = query.strip() or "short action to help me focus quickly"
-    v = model.encode([q], normalize_embeddings=True)
+    q = (query or "").strip()
+    qx = f"{q} Goal:{goal or 'any'} Energy:{energy or 'any'} Max:{int(max_minutes) if max_minutes else ''} minutes"
+    v = model.encode([qx], normalize_embeddings=True)
     D, I = index.search(np.asarray(v, dtype="float32"), 800)
     idxs = list(I[0]); random.shuffle(idxs)
 
-    results, used = [], set()
-    step, used = pick_unique(idxs, goal, energy, max_minutes, False, False, False, 3, used); results += step
-    if len(results) < 3:
-        step, used = pick_unique(idxs, goal, energy, max_minutes, False, True, False, 3-len(results), used); results += step
-    if len(results) < 3:
-        step, used = pick_unique(idxs, goal, energy, max_minutes, False, True, True, 3-len(results), used); results += step
-    if len(results) < 3:
-        step, used = pick_unique(idxs, goal, energy, max_minutes, True, True, True, 3-len(results), used); results += step
-    if len(results) < 3:
-        results += fill_random(3 - len(results), used)
+    res, used = [], set()
+    step, used = pick_unique(idxs, goal, energy, max_minutes, False, False, False, 3, used); res += step
+    if len(res) < 3:
+        step, used = pick_unique(idxs, goal, energy, max_minutes, False, True, False, 3-len(res), used); res += step
+    if len(res) < 3:
+        step, used = pick_unique(idxs, goal, energy, max_minutes, False, True, True, 3-len(res), used); res += step
+    if len(res) < 3:
+        step, used = pick_unique(idxs, goal, energy, max_minutes, True, True, True, 3-len(res), used); res += step
+    if len(res) < 3:
+        extras = [a for a in actions if a["title"] not in used and a["title"] not in recent]
+        random.shuffle(extras)
+        res += extras[:3-len(res)]
 
+    recent.extend([a["title"] for a in res[:3]])
     out = []
-    for a in results[:3]:
+    for a in res[:3]:
         out.append(f"**{a['title']}**  \n{a['instruction']}  \nGoal: {a['goal']} • Duration: {a['duration_min']} min • Energy: {a['energy']} • Context: {', '.join(a['context'])}")
     return "\n\n---\n\n".join(out)