Update app.py

app.py

@@ -1,3 +1,5 @@
+
+
 # ---------- 1) Imports & Config ----------
 import os, uuid, json, random
 from dataclasses import dataclass, field, asdict
@@ -21,6 +23,34 @@ if NARRATION_BACKEND == "hf":
             max_new_tokens=180, do_sample=True, temperature=0.9, top_p=0.95
         )[0]["generated_text"]
         return out[-600:].strip()
+import torch
+from transformers import pipeline
+import time
+
+# 检查 GPU 是否可用
+device = 0 if torch.cuda.is_available() else -1
+print(f"Device set to {'GPU' if device == 0 else 'CPU'}")
+
+# 加载模型并显示进度
+print("Loading model...")
+start_time = time.time()
+generator = pipeline(
+    "text-generation", 
+    model="tiiuae/Falcon-E-1B-Instruct", 
+    device=device
+)
+print(f"Model loaded in {time.time() - start_time:.2f} seconds!")
+
+# 显示是否在使用 GPU
+if torch.cuda.is_available():
+    print(f"Using GPU: {torch.cuda.get_device_name(0)}")
+else:
+    print("Using CPU")
+
+# 测试生成的输出，确保可以推理
+print("Testing model inference...")
+test_output = generator("Please generate a story.")
+print(f"Generated text: {test_output[0]['generated_text']}")
 
 # ---------- 2) Data Models ----------
 Day = int
@@ -29,15 +59,11 @@ Day = int
 class Agent:
     name: str
     role: str
-    relations: Dict[str, Dict[str, float]] = field(default_factory=dict)  # 【关系维度】喜好、信任等
-
-    name: str
-    role: str
+    relations: Dict[str, Dict[str, float]] = field(default_factory=dict)  # 存储与其他角色的关系
     memory: Dict[str, Any] = field(default_factory=dict)
     belief_about_others: Dict[str, Dict[str, Any]] = field(default_factory=dict)
-
-    full_name: str = ""         
-    gender: str = ""            
+    full_name: str = ""
+    gender: str = ""
     height: int = 170
     appearance: str = ""
     spirit_root: str = ""
@@ -46,12 +72,37 @@ class Agent:
     cultivation: int = 50
     willpower: int = 50
     face: int = 0
-    jealousy: int = 0
     scandal: int = 0
 ####基础信息生成
+
+ROLES = ["炼气期", "筑基期", "金丹期", "元婴期", "化神期", "合体期", "大乘期"]
 #name
-SURNAMES = ["李","赵","王","欧阳","慕容","上官","东方","南宫","司马","诸葛"]
-NAME_PARTS = ["清","灵","雪","尘","梦","羽","轩","霖","珏","婉","澈","寒","月","落","竹","珊"]
+SURNAMES = [
+    "李", "赵", "王", "欧阳", "慕容", "上官", "东方", "南宫", "司马", "诸葛", 
+    "龙", "风", "云", "凤", "陆", "沈", "陆", "白", "周", "秦", 
+    "冯", "段", "朱", "唐", "陆", "花", "凌", "慕", "方", "柏", 
+    "纪", "萧", "沈", "简", "颜", "祁", "孟", "庞", "苏", "施", 
+    "夏", "石", "钟", "梁", "丁", "阮", "黄", "唐", "陈", "范", 
+    "萧", "韦", "何", "冯", "穆", "丘", "薛", "杜", "任", "俞"
+]
+
+NAME_PARTS = [
+    "清", "灵", "雪", "尘", "梦", "羽", "轩", "霖", "珏", "婉", 
+    "澈", "寒", "月", "落", "竹", "珊", "风", "云", "雨", "山", "水", 
+    "青", "霄", "渊", "瑶", "萧", "璇", "月", "辰", "遥", "瑾", 
+    "璃", "星", "凝", "寒", "竹", "飞", "悠", "萧", "星", "琴", 
+    "瑶", "晨", "逸", "岚", "沧", "洛", "晨", "凌", "宸", "熙", 
+    "鸣", "尧", "洛", "彭", "遥", "兰", "琪", "霖", "思", "尘", 
+    "璇", "涵", "泽", "涵", "彬", "雅", "泽", "宇", "琪", 
+    # 新增的2个字名字部分
+    "紫霄", "白霜", "千秋", "云霁", "玉瑶", "青兰", "月华", "星辰", 
+    "秋水", "长风", "天瑶", "暮雪", "寒月", "紫烟", "白月", "流云", 
+    "醉影", "逍遥", "凌风", "清逸", "皓月", "星云", "红叶", "碧空",
+    "天雪", "玄霄", "冰心", "凝烟", "云笙", "水月", "风轻", "夜星", 
+    "羽瑶", "千尘", "翠烟", "紫电", "空灵", "雪影", "云起", "凌云",
+    "独孤", "风华", "清幽", "白兰", "青冥", "羽寒", "天风", "冰澜"
+]
+
 
 def random_name():
     surname = random.choice(SURNAMES)
@@ -60,13 +111,14 @@ def random_name():
 
 #长相
 APPEARANCES = ["清秀","俊逸","冷艳","稚气","邪魅","清冷","英气","娇美","秀雅","潇洒"]
+#灵根
 SPIRIT_ROOTS = ["金灵根","木灵根","水灵根","火灵根","土灵根","冰灵根","风灵根","雷灵根","混沌灵根"]
 
 def random_gender():
     return random.choice(["male","female"])
 
 def random_height(gender):
-    return random.randint(168,190) if gender=="male" else random.randint(155,175)
+    return random.randint(168,200) if gender=="male" else random.randint(155,175)
 
 def random_appearance():
     return random.choice(APPEARANCES)
@@ -148,12 +200,11 @@ class World:
         }
 
 # ---------- 3) Init ----------
-ROLES = ["Saintess","Senior","Enforcer","Alchemist","ArrayMaster","Bard","Matchmaker","Shadow","Guest","Head"]
 
 def init_world(seed=42) -> World:
     random.seed(seed)
     ags = []
-    for i in range(10):
+    for i in range(3):
         role = ROLES[i]
         gender = random_gender()
         ags.append(Agent(
@@ -242,68 +293,126 @@ def inform(world:World, speaker:str, listener:str, fact_key:str, boost=0.15):
 
 # ---------- 5) Actions（合欢宗简化版） ----------
 def update_relations(world: World, actor: str, target: str, event_type: str):
-    # 获取当前关系
+    """
+    更新角色之间的关系，保存好感度、信任度、敌对度和嫉妒心。
+    """
+    # 获取角色的关系字典
     actor_relations = world.relations.get(actor, {})
     target_relations = world.relations.get(target, {})
-    
-    # 初始化，如果没有的话
-    actor_relations.setdefault(target, {"liking": 50, "trust": 50, "rivalry": 0})
-    target_relations.setdefault(actor, {"liking": 50, "trust": 50, "rivalry": 0})
-    
-    # 根据事件类型调整关系
-    if event_type == "gift":
-        actor_relations[target]["liking"] = min(100, actor_relations[target]["liking"] + 10)
-        target_relations[actor]["liking"] = min(100, target_relations[actor]["liking"] + 10)
-    elif event_type == "confide":
-        actor_relations[target]["trust"] = min(100, actor_relations[target]["trust"] + 15)
-        target_relations[actor]["trust"] = min(100, target_relations[actor]["trust"] + 15)
-    elif event_type == "spar":
-        actor_relations[target]["rivalry"] = max(-100, actor_relations[target]["rivalry"] - 15)
-        target_relations[actor]["rivalry"] = max(-100, target_relations[actor]["rivalry"] - 15)
-    elif event_type == "expose":
-        actor_relations[target]["rivalry"] = min(100, actor_relations[target]["rivalry"] + 30)
-        target_relations[actor]["rivalry"] = min(100, target_relations[actor]["rivalry"] + 30)
-    
-    # 保存更新
+
+    # 初始化关系数据（如果不存在）
+    if target not in actor_relations:
+        actor_relations[target] = {"liking": 0, "trust": 0, "rivalry": 0, "jealousy": 0}
+    if actor not in target_relations:
+        target_relations[actor] = {"liking": 0, "trust": 0, "rivalry": 0, "jealousy": 0}
+
+    # 只保存更新后的关系（好感度、嫉妒心等）
     world.relations[actor] = actor_relations
     world.relations[target] = target_relations
 
 
-def act_gift(world:World, giver:str, receiver:str, place="藏书阁"):
-    ev = make_event(world.day, "gift", [giver, receiver], {"place":place,"item":"清心茶"})
-    world.events[ev.id] = ev
-    # 当事人记忆
-    for nm in [giver, receiver]:
-        ag = next(a for a in world.agents if a.name==nm)
-        fk = f"gift_{giver}_{receiver}_d{world.day}"
-        upsert_memory(ag, fk, {"type":"gift","giver":giver,"receiver":receiver,"place":place},
-                      world.day, {"src":"self_participant","cred":0.9}, 0.9)
-    # 旁观者
-    obs = sample_observers(world, ev, base_p=0.18)
-    world.observations += obs
-    for o in obs:
-        ag = next(a for a in world.agents if a.name==o.observer)
-        fk = f"gift_{giver}_{receiver}_d{world.day}"
-        conf = max(0.2, o.cred*(1-o.noise))
-        upsert_memory(ag, fk, {"type":"gift_hint","giver":giver,"receiver":receiver,"place":place},
-                      world.day, {"src":o.mode,"cred":conf}, conf)
-    # 流言上板
-    if random.random() < 0.25:
-        publish_public(world, f"gift_{giver}_{receiver}",
-                       {"hint":"有人在藏书阁递了东西"}, world.day, 0.55, "rumor")
-
-def act_confide(world:World, a:str, b:str):
-    ev = make_event(world.day, "confide", [a,b], {"topic":"心法共鸣"})
-    world.events[ev.id] = ev
-    for nm in [a,b]:
-        ag = next(x for x in world.agents if x.name==nm)
-        fk = f"confide_{a}_{b}_d{world.day}"
-        upsert_memory(ag, fk, {"type":"confide","pair":[a,b]}, world.day, {"src":"private_talk","cred":0.95}, 0.95)
-    for o in sample_observers(world, ev, 0.12):
-        ag = next(x for x in world.agents if x.name==o.observer)
-        fk = f"confide_{a}_{b}_d{world.day}"
-        conf = max(0.15, o.cred*(1-o.noise))
-        upsert_memory(ag, fk, {"type":"confide_hint","pair":[a,b]}, world.day, {"src":o.mode,"cred":conf}, conf)
+
+def act_gift(world: World, giver: str, receiver: str):
+    """
+    角色 A 赠送礼物给角色 B，增加好感度并可能引发嫉妒。
+    """
+    giver_agent = next(agent for agent in world.agents if agent.name == giver)
+    receiver_agent = next(agent for agent in world.agents if agent.name == receiver)
+
+    # 增加好感度
+    giver_agent.relations[receiver]["liking"] += 10
+    receiver_agent.relations[giver]["liking"] += 10
+
+    # 检查是否有第三方嫉妒
+    other_agents = [agent for agent in world.agents if agent.name != giver and agent.name != receiver]
+    third_party = max(other_agents, key=lambda x: x.relations[giver]["liking"] if x.relations[giver]["liking"] > x.relations[receiver]["liking"] else x.relations[receiver]["liking"])
+
+    # 增加嫉妒心
+    third_party.relations[giver]["jealousy"] += 10
+    third_party.relations[receiver]["jealousy"] += 10
+
+    # 发布流言
+    if random.random() < 0.25:  # 有一定概率发布流言
+        publish_public(world, f"gift_{giver}_{receiver}", {"hint": "有人在藏书阁递了东西"}, world.day, 0.55, "rumor")
+
+    # 更新关系
+    update_relations(world, giver, receiver, "gift")
+    update_relations(world, receiver, third_party.name, "gift")
+
+    # 返回事件描述
+    return f"{giver} 赠送了礼物给 {receiver}，增进了好感度，第三方 {third_party.name} 产生了嫉妒。"
+
+def act_confide(world: World, actor: str, target: str):
+    """
+    角色 A 向角色 B 倾诉心事，可能会触发三角恋情节
+    - 如果角色 A 对 B 表白或倾诉时，可能涉及第三方 C 引发嫉妒等情感纠葛。
+    """
+    actor_agent = next(agent for agent in world.agents if agent.name == actor)
+    target_agent = next(agent for agent in world.agents if agent.name == target)
+
+    # 判断是否涉及三角恋情节，随机选择第三方角色 C
+    other_agents = [agent for agent in world.agents if agent.name != actor and agent.name != target]
+    third_party = max(other_agents, key=lambda x: x.relations[actor]["liking"] if x.relations[actor]["liking"] > x.relations[target]["liking"] else x.relations[target]["liking"])  # 第三者选择对两者好感度较高的
+
+    # 获取被表白者对表白者的好感度
+    liking_score = target_agent.relations[actor]["liking"]  # B对A的好感度
+
+    # 表白是否成功，成功几率与好感度相关
+    is_successful = random.random() < (liking_score / 100)  # 好感度越高，成功概率越大
+
+    if is_successful:
+        # A向B表白并成功，第三方嫉妒
+        event_description = f"{actor} 向 {target} 表白成功，二人产生了深厚的情感，而 {third_party.name} 看到后感到嫉妒！"
+        
+        # 更新关系中的嫉妒心
+        actor_agent.relations[target]["jealousy"] += 10  # A因得到回应产生更多的情感波动
+        target_agent.relations[actor]["jealousy"] += 5  # B因接受表白产生情感波动
+        third_party_agent = third_party  # C看到表白成功，产生嫉妒
+        third_party_agent.relations[actor]["jealousy"] += 20  # C因为插足产生嫉妒
+        third_party_agent.relations[target]["jealousy"] += 20  # C因为插足产生嫉妒
+
+        # 发布流言
+        if random.random() < 0.25:  # 有一定概率发布流言
+            publish_public(world, f"triangle_love_{actor}_{target}", {"hint": "有人偷偷在藏书阁表白"}, world.day, 0.55, "rumor")
+
+        # 更新关系
+        update_relations(world, actor, target, "confide")
+        update_relations(world, target, third_party_agent.name, "confide")
+
+        # 更新角色的记忆
+        memory_key = f"{actor}_confides_in_{target}_success"
+        upsert_memory(actor_agent, memory_key, {"event": event_description, "target": target, "third_party": third_party.name})
+        upsert_memory(target_agent, memory_key, {"event": event_description, "actor": actor, "third_party": third_party.name})
+        upsert_memory(third_party_agent, memory_key, {"event": event_description, "actor": actor, "target": target})
+
+        return event_description  # 返回事件描述
+
+    else:
+        # A向B表白失败，第三方窃喜
+        event_description = f"{actor} 向 {target} 表白失败，{target} 拒绝了 {actor}，而 {third_party.name} 看到后感到窃喜！"
+        
+        # 更新关系中的嫉妒心
+        actor_agent.relations[target]["jealousy"] += 20  # A因未被接受产生嫉妒
+        target_agent.relations[actor]["jealousy"] += 5  # B因拒绝A表白产生负面情绪
+        third_party_agent = third_party  # C看到表白失败，窃喜
+        third_party_agent.relations[actor]["jealousy"] -= 5  # C因表白失败感到窃喜，嫉妒心降低
+        third_party_agent.relations[target]["jealousy"] -= 5  # C因表白失败感到窃喜，嫉妒心降低
+
+        # 发布流言
+        if random.random() < 0.25:  # 有一定概率发布流言
+            publish_public(world, f"triangle_love_{actor}_{target}_failure", {"hint": "有人偷偷在藏书阁被拒绝了"}, world.day, 0.55, "rumor")
+
+        # 更新关系
+        update_relations(world, actor, target, "confide")
+        update_relations(world, target, third_party_agent.name, "confide")
+
+        # 更新角色的记忆
+        memory_key = f"{actor}_confides_in_{target}_failure"
+        upsert_memory(actor_agent, memory_key, {"event": event_description, "target": target, "third_party": third_party.name})
+        upsert_memory(target_agent, memory_key, {"event": event_description, "actor": actor, "third_party": third_party.name})
+        upsert_memory(third_party_agent, memory_key, {"event": event_description, "actor": actor, "target": target})
+
+        return event_description  # 返回事件描述
 
 def act_expose(world:World, accuser:str, target:str, evidence:str):
     ev = make_event(world.day, "expose", [accuser,target], {"evidence":evidence})
@@ -527,14 +636,26 @@ def tick_one_day(world: World):
     formatted_events = []
     for event in daily_events:
         if event.type == "expose":
-            # 使用 agent 名字和事件描述
             formatted_events.append(f"🗣️ <b>{event.actors[0]} 揭发了 {event.actors[1]}</b>！这是关于 {event.payload.get('evidence', '残页证据')} 的丑闻。")
         elif event.type == "gift":
             formatted_events.append(f"🎁 <b>{event.actors[0]} 送给 {event.actors[1]} 一份礼物</b>，暗示着他们之间的关系发生了微妙变化。")
         elif event.type == "spar":
             formatted_events.append(f"⚔️ <b>{event.actors[0]} 与 {event.actors[1]} 进行了比试</b>，并且 {event.actors[0]} 获胜！")
+        elif event.type == "confide":
+            # For confide events, include success or failure of the confession
+            result = "心意已达" if event.payload.get('result') == 'success' else "表白未果"
+            formatted_events.append(f"🗣️ <b>{event.actors[0]} 向 {event.actors[1]}</b> 倾诉心事，{result}，情感深沉。")
+        elif event.type == "rumor":
+            # If the event is a rumor, format the details accordingly
+            formatted_events.append(f"💬 <b>{event.actors[0]} 传出了关于 {event.payload.get('about', '某人')}</b> 的流言。")
+        elif event.type == "oath":
+            formatted_events.append(f"🤝 <b>{event.actors[0]} 向 <b>{event.actors[1]}</b> 立下誓言</b>，誓言让他们的关系更深。")
+        elif event.type == "sabotage":
+            formatted_events.append(f"💥 <b>{event.actors[0]} 对 <b>{event.actors[1]}</b> 进行了破坏</b>，引发了一场风波。")
+        elif event.type == "mediate":
+            formatted_events.append(f"🕊️ <b>{event.actors[0]} 调解了 <b>{event.actors[1]} 和 {event.actors[2]}</b> 之间的争执</b>，关系暂时恢复平静。")
         else:
-            formatted_events.append(f"🔍 发生了未明确的事件：{event.type}，参与者：{event.actors[0]} 和 {event.actors[1]}")
+            formatted_events.append(f"🔍 发生了未明确的事件：<b>{event.type}</b>，参与者：<b>{', '.join(event.actors)}</b>")
 
     narration += "\n\n" + "\n".join(formatted_events)
 
@@ -621,7 +742,7 @@ def agents_dataframe(world: World) -> pd.DataFrame:
         rows.append({
             "ID": a.name,
             "姓名": a.full_name,
-            "角色": a.role,
+            "修为": a.role,
             "灵根": a.spirit_root,
             "性格": pers,
             "黑化?": "✔ 黑化" if getattr(a, "is_darkened", False) else "❌",
@@ -647,9 +768,12 @@ def public_board_pretty(world: World) -> str:
             lines.append(f"🤝 <b>{x.actors[0]}</b> 向 <b>{x.actors[1]}</b> 发誓，誓言让他们的关系更加牢固。")
         elif event_type == "expose":
             lines.append(f"⚠️ <b>{x.actors[0]}</b> 揭发了 <b>{x.actors[1]}</b> 的丑闻！证据：{c.get('evidence', '残页证据')}")
+        elif event_type == "confide":
+            # Check if the confession was successful or failed and express it in classical style
+            result = "心意已达" if c.get('result') == 'success' else "表白未果"
+            lines.append(f"🗣️ <b>{x.actors[0]}</b> 向 <b>{x.actors[1]}</b> 倾诉心事，{result}，情感深沉。")
         else:
             lines.append(f"🔍 发生了未明确的事件：<b>{event_type}</b>，涉及人物：<b>{', '.join(x.actors)}</b>")
-
     return "<br>".join(lines)
 
 
@@ -713,7 +837,7 @@ def ui_inform_pretty(speaker, listener, fact_key):
 theme = gr.themes.Soft(primary_hue="violet", neutral_hue="slate")
 
 with gr.Blocks(theme=theme, analytics_enabled=False) as demo:
-    gr.Markdown("## 🌸 合欢宗 · 多角恋八卦模拟（10 Agents, Day-based）")
+    gr.Markdown("## 🌸 某某宗 · 多角恋八卦模拟（10 Agents, Day-based）")
 
     with gr.Tab("Dashboard"):
         sum_html = gr.HTML(world_summary_html(WORLD))