update app.py

app.py

@@ -37,56 +37,42 @@ def pick_unique(idxs, goal, energy, max_minutes, ignore_goal=False, ignore_energ
             break
     return out, used
 
-def search(query, goal, energy, max_minutes):
-    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)
-
-    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)]
+def fill_random(need, used, goal, energy, max_minutes):
+    pool = [a for a in actions if a["title"] not in used and a["title"] not in recent and (not goal or a["goal"]==goal) and (not energy or a["energy"]==energy) and (not max_minutes or a["duration_min"]<=int(max_minutes))]
+    if len(pool) < need:
+        pool = [a for a in actions if a["title"] not in used and a["title"] not in recent]
+    random.shuffle(pool)
+    return pool[:need]
 
-    recent.extend([a["title"] for a in res[:3]])
-    out = []
-    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)
-
-goals = ["","calm","focus","productivity","wellbeing"]
-energies = ["","low","medium","high"]
+def search(query, goal, energy, max_minutes):
+    try:
+        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)
 
-with gr.Blocks(theme=gr.themes.Soft(primary_hue="indigo", neutral_hue="slate")) as demo:
-    gr.Markdown("# ActionMatch\nTop-3 micro-actions based on your situation, goal, energy and time.")
-    with gr.Row():
-        with gr.Column(scale=3):
-            q = gr.Textbox(lines=2, label="Your situation", placeholder="e.g., Stressed before exam")
-            btn = gr.Button("Recommend")
-        with gr.Column(scale=2):
-            g = gr.Dropdown(goals, label="Goal")
-            e = gr.Radio(energies, label="Energy")
-            m = gr.Slider(1, 15, step=1, value=5, label="Max minutes")
-    out = gr.Markdown()
-    btn.click(search, [q, g, e, m], out)
-    gr.Examples(
-        [["Stressed before exam","calm","low",5],
-         ["No energy but need to start studying","focus","low",7],
-         ["Keep switching tabs while writing essay","focus","medium",10]],
-        inputs=[q, g, e, m],
-        outputs=out,
-        fn=search,
-        label="One-click examples",
-        cache_examples=False
-    )
+        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:
+            res += fill_random(3-len(res), used, goal, energy, max_minutes)
 
-demo.launch()
+        recent.extend([a["title"] for a in res[:3]])
+        out = []
+        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)
+    except Exception:
+        pool = [a for a in actions if (not goal or a["goal"]==goal) and (not energy or a["energy"]==energy) and (not max_minutes or a["duration_min"]<=int(max_minutes))]
+        if len(pool) < 3:
+            pool = actions[:]
+        random.shuffle(pool)
+        out = []
+        for a in pool[:3]:
+            out.append(f"**{a['title']}**  \n{a['instruction']}  \nGoal: {a['goal']} • Duration: {a['duration_min']} min • Energy: {a['energy']} • Context: {', '.join(a['context]()_]()