Update app.py

app.py

@@ -1,276 +1,181 @@
-import os, random, json, datetime, html
+import os, random, datetime
 import gradio as gr
 
-APP_TITLE = "100个不｜社交暴露练习（MVP）"
-TARGET = 100  # 目标完成数
-
-# ========== 题库（精简示例版：按类别+难度；可随时追加） ==========
-# level: easy / medium / hard
-# cat: compliment / ask / smalltalk / assert / shop / phone / social
-CHALLENGES = [
-    # compliment
-    {"text":"夸路上一个陌生人的衣服很好看", "cat":"compliment", "level":"easy"},
-    {"text":"夸便利店店员今天的笑容很治愈", "cat":"compliment", "level":"easy"},
-    {"text":"夸同电梯的人发型很利落", "cat":"compliment", "level":"easy"},
-    {"text":"夸咖啡师今天做的拉花很好看", "cat":"compliment", "level":"medium"},
-    {"text":"夸路人包包/鞋子很有质感并问在哪买的", "cat":"compliment", "level":"medium"},
-    {"text":"夸一位保安/清洁阿姨辛苦了并说谢谢", "cat":"compliment", "level":"easy"},
-    {"text":"在不打扰的前提下，对街头艺人说“你很棒”", "cat":"compliment", "level":"medium"},
-    # ask（小请求）
-    {"text":"在便利店询问：有没有免费的试吃/样品？", "cat":"ask", "level":"easy"},
-    {"text":"向路人问路：最近的地铁站怎么走？", "cat":"ask", "level":"easy"},
-    {"text":"在咖啡店问：可以给我多一杯常温水吗？", "cat":"ask", "level":"easy"},
-    {"text":"在小店讨价：这件能再便宜一点吗？", "cat":"ask", "level":"medium"},
-    {"text":"向同事/同学借用 1 支笔并说谢谢", "cat":"ask", "level":"easy"},
-    {"text":"向邻座借充电器 5 分钟", "cat":"ask", "level":"medium"},
-    {"text":"在餐厅请求换一个靠窗的位置", "cat":"ask", "level":"medium"},
-    # smalltalk（闲聊开场）
-    {"text":"收银排队时说：今天人好多呀（对前后的人）", "cat":"smalltalk", "level":"easy"},
-    {"text":"问同电梯的人：你也去几楼？（简短寒暄）", "cat":"smalltalk", "level":"easy"},
-    {"text":"超市排队时评论：这个水果看起来很新鲜对吧？", "cat":"smalltalk", "level":"easy"},
-    {"text":"对邻座说：你在看哪本书/听什么歌？", "cat":"smalltalk", "level":"medium"},
-    {"text":"在宠物店对别人家的宠物夸两句并问名字", "cat":"smalltalk", "level":"medium"},
-    # assert（温柔表达边界/需要）
-    {"text":"对外卖/快递：请放在门口，谢谢（不需要多聊）", "cat":"assert", "level":"easy"},
-    {"text":"对推销人员：谢谢，我现在不需要（保持微笑）", "cat":"assert", "level":"easy"},
-    {"text":"对熟人：我今天有点累，改天再聊可以吗？", "cat":"assert", "level":"medium"},
-    {"text":"餐厅太吵时礼貌请求调低音量", "cat":"assert", "level":"hard"},
-    # shop（店铺场景）
-    {"text":"进店问：这件有小一号的尺码吗？", "cat":"shop", "level":"easy"},
-    {"text":"问：可以试穿/试戴一下吗？", "cat":"shop", "level":"easy"},
-    {"text":"问：这件打折到什么时候？有会员价吗？", "cat":"shop", "level":"medium"},
-    {"text":"问：可以帮我推荐一个 200 元以内的礼物吗？", "cat":"shop", "level":"medium"},
-    {"text":"点单时提出“少糖/分开装/去冰”等个性化需求", "cat":"shop", "level":"easy"},
-    # phone（电话/线上）
-    {"text":"给商家打电话：今天营业到几点？", "cat":"phone", "level":"medium"},
-    {"text":"给医院/理发店电话预约/改期", "cat":"phone", "level":"hard"},
-    {"text":"打客服电话并友善表达问题", "cat":"phone", "level":"hard"},
-    # social（社交平台）
-    {"text":"在朋友圈/社交平台发一条正面感受（非炫耀）", "cat":"social", "level":"easy"},
-    {"text":"给朋友/同事发消息：这周一起喝咖啡吗？", "cat":"social", "level":"medium"},
-    {"text":"在认识的人动态下留一句温和真诚的评论", "cat":"social", "level":"easy"},
-    # 更多“生活灵感”型
-    {"text":"在健身房对陌生人说：加油！", "cat":"smalltalk", "level":"easy"},
-    {"text":"问地铁工作人员：下一班车还有多久？", "cat":"ask", "level":"easy"},
-    {"text":"对保洁人员说：谢谢你们打扫得这么干净", "cat":"compliment", "level":"easy"},
-    {"text":"在图书馆借书台问：可以推荐一本入门书吗？", "cat":"ask", "level":"medium"},
-    {"text":"在菜市场问摊主：今天哪样最鲜？", "cat":"ask", "level":"easy"},
-]
-
-CATS = [
-    ("夸赞类","compliment"),
-    ("小请求","ask"),
-    ("闲聊开场","smalltalk"),
-    ("表达边界","assert"),
-    ("逛店购物","shop"),
-    ("电话沟通","phone"),
-    ("社交平台","social"),
-]
-
-LEVELS = [("简单","easy"), ("进阶","medium"), ("挑战","hard")]
-
-# 安全开关（过滤掉潜在不适/风险项；本示例题库都较温和）
-SAFETY_FLAGS = [
-    ("不涉及身体接触","no_touch"),
-    ("不涉及调情/暧昧","no_flirt"),
-    ("不拍照/录音陌生人","no_record"),
-]
-
-def filter_pool(selected_cats, selected_levels, flags):
-    pool = []
-    cat_set = set(selected_cats)
-    lvl_set = set(selected_levels)
-    for item in CHALLENGES:
-        if item["cat"] in cat_set and item["level"] in lvl_set:
-            # 这里可以根据 flags 扩展更严格的过滤逻辑
-            pool.append(item["text"])
-    # 若筛选太窄，兜底全部
-    return pool if pool else [x["text"] for x in CHALLENGES]
-
+APP_TITLE = "100个不"
+TARGET_PERCENT = 100
+
+# ====== 题库按难度分组 ======
+TASKS = {
+    "easy": [
+        "夸陌生人的衣服很好看",
+        "向便利店店员说谢谢并微笑",
+        "问路人：请问地铁站怎么走？",
+        "在咖啡店点单时加一句“今天人真多呀”",
+        "向同事或同学说：今天辛苦啦！",
+    ],
+    "medium": [
+        "在便利店问：有没有免费的样品？",
+        "夸陌生人的发型好看并问在哪剪的",
+        "向陌生人打招呼并介绍自己名字",
+        "打电话咨询商家一个简单问题",
+        "向店员要求换个靠窗的位置",
+    ],
+    "hard": [
+        "在街上送给陌生人一朵花",
+        "在餐厅请求调低音量",
+        "主动邀请一个不太熟的人喝咖啡",
+        "在朋友圈发一条真诚但不完美的内容",
+        "打客服电话表达不满并保持冷静",
+    ]
+}
+
+LEVEL_REWARDS = {
+    "easy": 1,
+    "medium": 5,
+    "hard": 10
+}
+
+LEVEL_LABELS = {
+    "easy": "简单",
+    "medium": "进阶",
+    "hard": "挑战"
+}
+
+# ====== State 初始化 ======
 def init_state():
     return {
-        "done": 0,
-        "history": [],        # [(text, datetime, note)]
+        "done_percent": 0,
+        "history": [],  # [(task, level, datetime, note)]
         "current": None,
-        "pool": [],
-        "target": TARGET
+        "current_level": None,
     }
 
-def draw_task(state, selected_cats, selected_levels, flags):
-    if not state["pool"]:
-        state["pool"] = filter_pool(selected_cats, selected_levels, flags).copy()
-        random.shuffle(state["pool"])
-    # 从池子里抽一道
-    if not state["pool"]:
-        return state, "（没有可用任务，请调整筛选）", progress_bar(state)
-    task = state["pool"].pop()
+# ====== 核心函数 ======
+def draw_task(state, selected_level):
+    if selected_level not in TASKS:
+        return state, "请选择难度后再抽题。", progress_bar(state)
+    task = random.choice(TASKS[selected_level])
     state["current"] = task
-    return state, task, progress_bar(state)
+    state["current_level"] = selected_level
+    return state, f"难度：{LEVEL_LABELS[selected_level]}\n\n任务：{task}", progress_bar(state)
 
 def complete_task(state, note):
     if not state["current"]:
-        return state, "（请先抽取一题）", progress_bar(state)
-    state["done"] += 1
-    state["history"].append((state["current"], datetime.datetime.now().isoformat(timespec="seconds"), (note or "").strip()))
-    done_text = f"✔ 已完成：{state['current']}"
-    state["current"] = None
-    return state, done_text, progress_bar(state)
+        return state, "（请先抽取任务）", progress_bar(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["current"], state["current_level"] = None, None
+    return state, done_msg, progress_bar(state)
 
 def skip_task(state):
     if not state["current"]:
-        return state, "（没有正在进行的任务，先抽一题吧）", progress_bar(state)
+        return state, "（当前没有任务）", progress_bar(state)
     skipped = state["current"]
-    state["current"] = None
-    return state, f"已跳过：{skipped}", progress_bar(state)
+    state["current"], state["current_level"] = None, None
+    return state, f"⏭ 已跳过：{skipped}", progress_bar(state)
 
 def reset_state():
-    return init_state(), "已重置进度", progress_bar(init_state())
-
-def progress_bar(state):
-    pct = min(100, int(state["done"] / state["target"] * 100))
-    return f"完成进度：{state['done']}/{state['target']}（{pct}%）"
+    st = init_state()
+    return st, "已重置进度。", progress_bar(st)
 
 def export_progress(state):
-    lines = ["# 100个不｜练习记录", f"目标：{state['target']}，已完成：{state['done']}", ""]
-    for i, (t, ts, note) in enumerate(state["history"], 1):
-        note_part = f"；反思：{note}" if note else ""
-        lines.append(f"{i}. [{ts}] {t}{note_part}")
-    content = "\n".join(lines) if len(lines)>2 else "暂时没有完成记录。"
+    lines = [
+        f"# 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(content)
+        f.write("\n".join(lines))
     return fname
 
-# ========== UI ==========
-theme = gr.themes.Soft(primary_hue="pink", secondary_hue="cyan", neutral_hue="slate")
+def progress_bar(state):
+    pct = min(100, int(state["done_percent"]))
+    bar = f"{'█' * (pct//5)}{'░' * (20 - pct//5)}"
+    return f"进度：{pct}%\n{bar}"
 
-CUSTOM_CSS = """
-:root{--c-border:#eddcf3;}
+# ====== UI 布局 ======
+theme = gr.themes.Soft(primary_hue="pink", secondary_hue="cyan", neutral_hue="slate")
+CSS = """
 body,.gradio-container{background:#faf7fb!important;}
-.topbar{display:flex;align-items:center;gap:8px;padding:12px;border:1px solid var(--c-border);border-radius:12px;background:linear-gradient(90deg,#ffe8f3,#e8fbff);}
-.logo{font-size:22px} .title{font-weight:800;font-size:20px}
-.card{border:1px solid var(--c-border);border-radius:12px;background:#fff;box-shadow:0 4px 18px rgba(17,17,17,0.04);padding:14px}
-.taskbox{border:1px dashed var(--c-border);border-radius:10px;padding:12px;font-weight:700}
-.tip{color:#6b7280;font-size:12px}
+.topbar{display:flex;align-items:center;gap:8px;padding:12px;background:linear-gradient(90deg,#ffe8f3,#e8fbff);border:1px solid #eddcf3;border-radius:12px;}
+.title{font-weight:800;font-size:20px;color:#111;}
+.card{background:#fff;border:1px solid #eddcf3;border-radius:12px;box-shadow:0 4px 18px rgba(0,0,0,.05);padding:14px;}
+.taskbox{border:1px dashed #eddcf3;border-radius:10px;padding:12px;font-weight:700;}
+.tip{color:#6b7280;font-size:12px;}
 """
 
-with gr.Blocks(title="100个不", theme=theme, css=CUSTOM_CSS) as demo:
-    gr.HTML(f"""
-      <div class="topbar"><div class="logo">🧠</div><div class="title">{APP_TITLE}</div></div>
-    """)
+with gr.Blocks(title="100个不", theme=theme, css=CSS) as demo:
+    gr.HTML(f"""<div class='topbar'><div class='title'>{APP_TITLE}</div></div>""")
 
     state = gr.State(init_state())
 
     with gr.Row():
-        # 左侧：筛选与操作
         with gr.Column(scale=5):
             with gr.Group(elem_classes=["card"]):
-                gr.Markdown("#### 选择你的练习范围（可多选）")
-                cat_choices = gr.CheckboxGroup(
-                    choices=[c[0] for c in CATS],
-                    value=[c[0] for c in CATS],  # 默认全选
-                    label="类别"
+                gr.Markdown("#### 选择难度")
+                level_choice = gr.Radio(
+                    label="难度",
+                    choices=[LEVEL_LABELS["easy"], LEVEL_LABELS["medium"], LEVEL_LABELS["hard"]],
+                    value=LEVEL_LABELS["easy"]
                 )
-                # 映射中文label -> 英文key
-                cat_map = {c[0]:c[1] for c in CATS}
-
-                level_choices = gr.CheckboxGroup(
-                    choices=[l[0] for l in LEVELS],
-                    value=[LEVELS[0][0], LEVELS[1][0]],  # 默认 简单+进阶
-                    label="难度"
-                )
-                level_map = {l[0]:l[1] for l in LEVELS}
-
-                safety = gr.CheckboxGroup(
-                    choices=[s[0] for s in SAFETY_FLAGS],
-                    value=[s[0] for s in SAFETY_FLAGS],
-                    label="安全开关（建议全部开启）",
-                    info="尊重他人、遵守礼法与当地规定；如遇到“不舒服”立即停止。"
-                )
-
-            with gr.Group(elem_classes=["card"]):
-                gr.Markdown("#### 操作")
-                with gr.Row():
-                    btn_draw = gr.Button("🎲 抽取任务", variant="primary")
-                    btn_complete = gr.Button("✅ 标记完成")
-                    btn_skip = gr.Button("⏭ 跳过")
-                reflect = gr.Textbox(label="完成后写一句反思（可选）", placeholder="例：开始很紧张，但说出口后对方很友好。", lines=2)
+                btn_draw = gr.Button("🎲 抽取任务", variant="primary")
+                btn_complete = gr.Button("✅ 标记完成")
+                btn_skip = gr.Button("⏭ 跳过")
+                reflect = gr.Textbox(label="反思（可选）", placeholder="完成后写一句感受", lines=2)
                 with gr.Row():
                     btn_export = gr.Button("📤 导出记录")
                     btn_reset = gr.Button("🧹 重置进度")
 
-        # 右侧：当前任务与进度
         with gr.Column(scale=7):
             with gr.Group(elem_classes=["card"]):
                 gr.Markdown("#### 当前任务")
-                current_task = gr.Markdown("（点击“🎲 抽取任务”开始）", elem_classes=["taskbox"])
-                progress = gr.Markdown("完成进度：0/100（0%）")
-                tips = gr.Markdown(
-                    "- 微笑、简短、真诚。\n"
-                    "- 尊重“拒绝权”，不追问���纠缠。\n"
-                    "- 如有不适，立刻停止并换一题。\n",
-                    elem_classes=["tip"]
-                )
-
-            with gr.Group(elem_classes=["card"]):
-                gr.Markdown("#### 说明（MVP）")
+                current_task = gr.Markdown("（点击 🎲 抽取任务）", elem_classes=["taskbox"])
+                progress = gr.Markdown("进度：0%\n░░░░░░░░░░░░░░░░░░░░░░")
                 gr.Markdown(
-                    "- 本工具**不存储个人数据**，进度只在当前会话有效。\n"
-                    "- 你可以随时点击**导出记录**保存本地 TXT。\n"
-                    "- 若想要跨设备/长期保存，我可以下个版本加登录或云存储。"
+                    "- 每完成一个任务就标记 ✅。\n"
+                    "- 简单任务 +1%，进阶 +5%，挑战 +10%。\n"
+                    "- 当你达到 100%，恭喜你完成了“100个不”。",
+                    elem_classes=["tip"]
                 )
 
-    # ========== 交互逻辑 ==========
-    def _map_multi(labels, mapping):
-        return [mapping[l] for l in labels if l in mapping]
+    def map_level(label_cn):
+        rev = {v:k for k,v in LEVEL_LABELS.items()}
+        return rev.get(label_cn, "easy")
 
-    def on_draw(st, cats_cn, levels_cn, safety_cn):
-        cats = _map_multi(cats_cn, cat_map)
-        lvls = _map_multi(levels_cn, level_map)
-        flgs = safety_cn  # 目前未细分使用
-        st, task, prog = draw_task(st, cats, lvls, flgs)
-        return st, task, prog
+    def on_draw(st, level_cn):
+        lvl = map_level(level_cn)
+        st, msg, prog = draw_task(st, lvl)
+        return st, msg, prog
 
     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
 
     def on_export(st):
-        path = export_progress(st)
-        return path
+        return export_progress(st)
 
     def on_reset():
         st, msg, prog = reset_state()
-        return st, "（点击“🎲 抽取任务”开始）", prog, "", None
+        return st, "（点击 🎲 抽取任务）", prog, "", None
 
-    btn_draw.click(
-        on_draw,
-        inputs=[state, cat_choices, level_choices, safety],
-        outputs=[state, current_task, progress]
-    )
+    file_out = gr.File(label="导出TXT", visible=True)
 
-    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]
-    )
-
-    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])
     btn_export.click(on_export, inputs=[state], outputs=[file_out])
-
-    btn_reset.click(on_reset, inputs=None, outputs=[state, current_task, progress, reflect, file_out])
+    btn_reset.click(on_reset, outputs=[state, current_task, progress, reflect, file_out])
 
 if __name__ == "__main__":
-    # 关闭 SSR 提示，Spaces 也可运行；不自动 share，交给 HF Spaces 控制
-    gr.close_all()
     demo.launch(ssr_mode=False)