Update app.py

app.py

@@ -1,106 +1,110 @@
-import os, random, datetime
+import os, json, random, datetime, io
 import gradio as gr
 
 APP_TITLE = "100个不"
+TASKS_FILE = "tasks.json"          # 你的题库文件
 TARGET_PERCENT = 100
 
-# ====== 题库按难度分组 ======
-TASKS = {
-    "easy": [
-        "夸陌生人的衣服很好看",
-        "向便利店店员说谢谢并微笑",
-        "问路人：请问地铁站怎么走？",
-        "在咖啡店点单时加一句“今天人真多呀”",
-        "向同事或同学说：今天辛苦啦！",
-    ],
-    "medium": [
-        "在便利店问：有没有免费的样品？",
-        "夸陌生人的发型好看并问在哪剪的",
-        "向陌生人打招呼并介绍自己名字",
-        "打电话咨询商家一个简单问题",
-        "向店员要求换个靠窗的位置",
-    ],
-    "hard": [
-        "在街上送给陌生人一朵花",
-        "在餐厅请求调低音量",
-        "主动邀请一个不太熟的人喝咖啡",
-        "在朋友圈发一条真诚但不完美的内容",
-        "打客服电话表达不满并保持冷静",
-    ]
-}
-
-LEVEL_REWARDS = {
-    "easy": 1,
-    "medium": 5,
-    "hard": 10
-}
-
-LEVEL_LABELS = {
-    "easy": "简单",
-    "medium": "进阶",
-    "hard": "挑战"
-}
-
-# ====== State 初始化 ======
+# 难度映射与奖励
+LEVEL_LABELS = {"easy": "简单", "medium": "进阶", "hard": "挑战"}
+LABEL_TO_KEY = {v: k for k, v in LEVEL_LABELS.items()}
+LEVEL_REWARDS = {"easy": 1, "medium": 5, "hard": 10}
+
+# ====== 读取 tasks.json ======
+def load_tasks_from_file():
+    """
+    从 tasks.json 读取：必须包含 easy/medium/hard 三个数组。
+    返回 (tasks, message)；message 为 None 表示正常，否则是提示信息。
+    """
+    if not os.path.exists(TASKS_FILE):
+        return {"easy": [], "medium": [], "hard": []}, f"未找到 {TASKS_FILE}，使用空题库。"
+    try:
+        with open(TASKS_FILE, "r", encoding="utf-8") as f:
+            data = json.load(f)
+        # 基本校验
+        for k in ["easy", "medium", "hard"]:
+            if k not in data or not isinstance(data[k], list):
+                raise ValueError("JSON 结构不正确，应包含 easy/medium/hard 三个数组。")
+        return data, None
+    except Exception as e:
+        return {"easy": [], "medium": [], "hard": []}, f"{TASKS_FILE} 解析失败：{e}。已使用空题库。"
+
+# ====== 进度状态 ======
 def init_state():
+    tasks, msg = load_tasks_from_file()
     return {
         "done_percent": 0,
-        "history": [],  # [(task, level, datetime, note)]
+        "history": [],             # [(task, level, datetime, note)]
         "current": None,
         "current_level": None,
+        "tasks": tasks,
+        "load_msg": msg            # 若有加载提示，首次显示
     }
 
-# ====== 核心函数 ======
-def draw_task(state, selected_level):
-    if selected_level not in TASKS:
-        return state, "请选择难度后再抽题。", progress_bar(state)
-    task = random.choice(TASKS[selected_level])
+# ====== 业务逻辑 ======
+def progress_text(state):
+    pct = min(100, int(state["done_percent"]))
+    bar = f"{'█' * (pct//5)}{'░' * (20 - pct//5)}"  # 20格进度条
+    return f"进度：{pct}%\n{bar}"
+
+def draw_task(state, level_cn):
+    level = LABEL_TO_KEY.get(level_cn, "easy")
+    pool = state["tasks"].get(level, [])
+    if not pool:
+        return state, f"（{LEVEL_LABELS[level]}暂无任务，请检查 {TASKS_FILE}）", progress_text(state), state.get("load_msg") or ""
+    task = random.choice(pool)
     state["current"] = task
-    state["current_level"] = selected_level
-    return state, f"难度：{LEVEL_LABELS[selected_level]}\n\n任务：{task}", progress_bar(state)
+    state["current_level"] = level
+    return state, f"难度：{LEVEL_LABELS[level]}\n\n任务：{task}", progress_text(state), ""
 
 def complete_task(state, note):
     if not state["current"]:
-        return state, "（请先抽取任务）", progress_bar(state)
+        return state, "（请先抽取任务）", progress_text(state)
     level = state["current_level"]
     reward = LEVEL_REWARDS.get(level, 0)
-    state["done_percent"] += reward
-    state["done_percent"] = min(state["done_percent"], TARGET_PERCENT)
-    state["history"].append((state["current"], level, datetime.datetime.now().isoformat(timespec="seconds"), note or ""))
-    done_msg = f"✅ 已完成：{state['current']} （+{reward}%）"
+    state["done_percent"] = min(TARGET_PERCENT, state["done_percent"] + reward)
+    state["history"].append((
+        state["current"], level,
+        datetime.datetime.now().isoformat(timespec="seconds"),
+        (note or "").strip()
+    ))
+    msg = f"✅ 已完成：{state['current']}（+{reward}%）"
     state["current"], state["current_level"] = None, None
-    return state, done_msg, progress_bar(state)
+    return state, msg, progress_text(state)
 
 def skip_task(state):
     if not state["current"]:
-        return state, "（当前没有任务）", progress_bar(state)
+        return state, "（当前没有任务）", progress_text(state)
     skipped = state["current"]
     state["current"], state["current_level"] = None, None
-    return state, f"⏭ 已跳过：{skipped}", progress_bar(state)
+    return state, f"⏭ 已跳过：{skipped}", progress_text(state)
 
 def reset_state():
     st = init_state()
-    return st, "已重置进度。", progress_bar(st)
+    return st, "已重置进度。", progress_text(st), (st["load_msg"] or "")
+
+def reload_tasks(state):
+    tasks, msg = load_tasks_from_file()
+    state["tasks"] = tasks
+    # 若当前难度没题，将 current 清空，避免脏状态
+    state["current"], state["current_level"] = None, None
+    tip = msg if msg else "已从 tasks.json 重新加载题库。"
+    return state, tip
 
 def export_progress(state):
     lines = [
-        f"# 100个不｜练习记录",
+        "# 100个不｜练习记录",
         f"已完成：{state['done_percent']}%",
         ""
     ]
     for i, (task, lvl, ts, note) in enumerate(state["history"], 1):
-        lines.append(f"{i}. [{ts}] {LEVEL_LABELS[lvl]}任务：{task} 反思：{note}")
-    fname = "/tmp/100no_progress.txt"
-    with open(fname, "w", encoding="utf-8") as f:
-        f.write("\n".join(lines))
-    return fname
-
-def progress_bar(state):
-    pct = min(100, int(state["done_percent"]))
-    bar = f"{'█' * (pct//5)}{'░' * (20 - pct//5)}"
-    return f"进度：{pct}%\n{bar}"
+        note_part = f" 反思：{note}" if note else ""
+        lines.append(f"{i}. [{ts}] {LEVEL_LABELS[lvl]}任务：{task}{note_part}")
+    content = "\n".join(lines) if len(lines) > 3 else "暂无记录"
+    # 使用内存文件导出（避免路径权限问题）
+    return gr.File.update(value=("progress.txt", content))
 
-# ====== UI 布局 ======
+# ====== 界面样式 ======
 theme = gr.themes.Soft(primary_hue="pink", secondary_hue="cyan", neutral_hue="slate")
 CSS = """
 body,.gradio-container{background:#faf7fb!important;}
@@ -111,7 +115,8 @@ body,.gradio-container{background:#faf7fb!important;}
 .tip{color:#6b7280;font-size:12px;}
 """
 
-with gr.Blocks(title="100个不", theme=theme, css=CSS) as demo:
+# ====== 构建 UI ======
+with gr.Blocks(title=APP_TITLE, theme=theme, css=CSS) as demo:
     gr.HTML(f"""<div class='topbar'><div class='title'>{APP_TITLE}</div></div>""")
 
     state = gr.State(init_state())
@@ -125,9 +130,12 @@ with gr.Blocks(title="100个不", theme=theme, css=CSS) as demo:
                     choices=[LEVEL_LABELS["easy"], LEVEL_LABELS["medium"], LEVEL_LABELS["hard"]],
                     value=LEVEL_LABELS["easy"]
                 )
-                btn_draw = gr.Button("🎲 抽取任务", variant="primary")
-                btn_complete = gr.Button("✅ 标记完成")
-                btn_skip = gr.Button("⏭ 跳过")
+                with gr.Row():
+                    btn_draw = gr.Button("🎲 抽取任务", variant="primary")
+                    btn_reload = gr.Button("🔁 刷新题库（读取 tasks.json）")
+                with gr.Row():
+                    btn_complete = gr.Button("✅ 标记完成")
+                    btn_skip = gr.Button("⏭ 跳过")
                 reflect = gr.Textbox(label="反思（可选）", placeholder="完成后写一句感受", lines=2)
                 with gr.Row():
                     btn_export = gr.Button("📤 导出记录")
@@ -138,44 +146,44 @@ with gr.Blocks(title="100个不", theme=theme, css=CSS) as demo:
                 gr.Markdown("#### 当前任务")
                 current_task = gr.Markdown("（点击 🎲 抽取任务）", elem_classes=["taskbox"])
                 progress = gr.Markdown("进度：0%\n░░░░░░░░░░░░░░░░░░░░░░")
-                gr.Markdown(
-                    "- 每完成一个任务就标记 ✅。\n"
-                    "- 简单任务 +1%，进阶 +5%，挑战 +10%。\n"
-                    "- 当你达到 100%，恭喜你完成了“100个不”。",
-                    elem_classes=["tip"]
-                )
+                tip = gr.Markdown("", elem_classes=["tip"])  # 用于显示加载/刷新提示
 
-    def map_level(label_cn):
-        rev = {v:k for k,v in LEVEL_LABELS.items()}
-        return rev.get(label_cn, "easy")
+            file_out = gr.File(label="下载导出记录", visible=True)
 
-    def on_draw(st, level_cn):
-        lvl = map_level(level_cn)
-        st, msg, prog = draw_task(st, lvl)
-        return st, msg, prog
+    # ====== 事件处理 ======
+    def on_draw(st, lvl_cn):
+        st["load_msg"] = ""  # 清理一次性提示
+        st, msg, prog, info = draw_task(st, lvl_cn)
+        return st, msg, prog, (info or "")
 
     def on_complete(st, note):
         st, msg, prog = complete_task(st, note)
-        return st, msg, prog, ""
-
+        return st, msg, prog, "" , ""   # 清空提示 & 反思框
     def on_skip(st):
         st, msg, prog = skip_task(st)
-        return st, msg, prog
-
+        return st, msg, prog, ""
     def on_export(st):
         return export_progress(st)
-
     def on_reset():
-        st, msg, prog = reset_state()
-        return st, "（点击 🎲 抽取任务）", prog, "", None
-
-    file_out = gr.File(label="导出TXT", visible=True)
-
-    btn_draw.click(on_draw, inputs=[state, level_choice], outputs=[state, current_task, progress])
-    btn_complete.click(on_complete, inputs=[state, reflect], outputs=[state, current_task, progress, reflect])
-    btn_skip.click(on_skip, inputs=[state], outputs=[state, current_task, progress])
+        st, msg, prog, info = reset_state()
+        return st, "（点击 🎲 抽取任务）", prog, "", None, info
+    def on_reload(st):
+        st, info = reload_tasks(st)
+        return st, info
+
+    # 绑定
+    btn_draw.click(on_draw, inputs=[state, level_choice], outputs=[state, current_task, progress, tip])
+    btn_complete.click(on_complete, inputs=[state, reflect], outputs=[state, current_task, progress, tip, reflect])
+    btn_skip.click(on_skip, inputs=[state], outputs=[state, current_task, progress, tip])
     btn_export.click(on_export, inputs=[state], outputs=[file_out])
-    btn_reset.click(on_reset, outputs=[state, current_task, progress, reflect, file_out])
+    btn_reset.click(on_reset, outputs=[state, current_task, progress, tip, file_out, tip])
+    btn_reload.click(on_reload, inputs=[state], outputs=[state, tip])
+
+    # 初次加载，如有提示显示出来
+    def show_first_tip(st):
+        return st.get("load_msg") or ""
+    tip.load(show_first_tip, inputs=[state], outputs=[tip])
 
 if __name__ == "__main__":
+    # 在 HF Spaces 上建议关闭 SSR 提示；share 是否公开交给 Space 设置
     demo.launch(ssr_mode=False)