Update app.py

app.py

@@ -6,7 +6,7 @@ from http.server import HTTPServer, BaseHTTPRequestHandler
 from urllib.parse import parse_qs
 
 # ==========================================
-# 1. 核心逻辑与多媒体引擎 (既存逻辑与成就集成)
+# 1. 核心引擎 (逻辑推理 + 结构修复)
 # ==========================================
 class FengKinshipEngine:
     def __init__(self, data_path='family_data.jsonl'):
@@ -18,7 +18,6 @@ class FengKinshipEngine:
                     try:
                         d = json.loads(line)
                         info_text = str(d.get("info", ""))
-                        # 提取年份
                         year = 9999
                         year_match = re.search(r'(\d{4})', info_text)
                         if year_match: year = int(year_match.group(1))
@@ -27,8 +26,8 @@ class FengKinshipEngine:
                             "n": d.get("n"), "f": d.get("f"), "m": d.get("m"),
                             "g": d.get("g"), "sp": d.get("sp", []), "year": year,
                             "info": info_text,
-                            "has_media": any(k in info_text for k in ['照片', 'http', '.jpg', '链接']),
-                            "has_ach": any(k in info_text for k in ['成就', '事迹', '简介', '党员'])
+                            "has_media": any(k in info_text for k in ['照片', 'http', '.jpg']),
+                            "has_ach": any(k in info_text for k in ['成就', '事迹', '简介'])
                         })
                     except: continue
 
@@ -39,17 +38,22 @@ class FengKinshipEngine:
         try: t_gen = int(target.get("g"))
         except: t_gen = 0
         
+        # 统一输出格式为字典列表，避免类型错误
         res = {"target": target, "groups": {
-            "【始祖/先辈】": [], "【直系父母】": [], "【姻亲/配偶】": target["sp"],
+            "【始祖/先辈】": [], "【直系父母】": [], "【姻亲/配偶】": [],
             "【同辈-兄姐】": [], "【同辈-弟妹】": [], "【直系晚辈】": []
         }}
 
+        # 特殊处理配偶 (字符串转对象)
+        for sp_name in target.get("sp", []):
+            res["groups"]["【姻亲/配偶】"].append({"n": sp_name, "has_media": False, "has_ach": False})
+
         for m in self.members:
             if m["n"] == target_name: continue
             try: m_gen = int(m.get("g"))
             except: m_gen = 0
             
-            # 逻辑：代数 + 年份双重纠偏 (确保冯达尊等先辈被正确分类)
+            # 逻辑判定
             if m_gen == 0 or (t_gen - m_gen >= 2) or (target["year"] - m["year"] > 60):
                 res["groups"]["【始祖/先辈】"].append(m)
             elif m["n"] in [target["f"], target["m"]]:
@@ -66,48 +70,27 @@ class FengKinshipEngine:
 engine = FengKinshipEngine()
 
 # ==========================================
-# 2. 自动演示输出 (解决“啥都没有”的直观展示)
-# ==========================================
-def run_auto_audit():
-    print("\n" + "="*50)
-    print("冯氏亲戚关系网 (Feng's Kinship Network) 自动审计报告")
-    print("="*50)
-    for test_name in ["杨知秋", "冯达尊"]:
-        res = engine.analyze(test_name)
-        if res:
-            print(f"\n对象: {res['target']['n']} (第{res['target']['g']}代)")
-            print(f"背景: {res['target']['info']}")
-            for title, members in res["groups"].items():
-                if members:
-                    m_str = "、".join([m['n'] + ("[成就]" if m['has_ach'] else "") for m in (members if isinstance(members, list) else [])])
-                    if not m_str: m_str = str(members)
-                    print(f"{title}: {m_str}")
-    print("\n" + "="*50)
-    print("Web服务器已启动! 请访问端口 7860 进行实测。")
-    print("="*50 + "\n")
-
-# ==========================================
-# 3. 界面模板与服务器逻辑
+# 2. 界面显示逻辑
 # ==========================================
 HTML_TPL = """
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8"><title>冯氏亲戚关系网</title>
+    <meta charset="utf-8">
+    <title>冯氏亲戚关系网</title>
     <style>
         body {{ font-family: sans-serif; background: #f0f2f5; padding: 20px; }}
         .card {{ max-width: 800px; margin: auto; background: white; padding: 25px; border-radius: 12px; box-shadow: 0 4px 10px rgba(0,0,0,0.1); }}
-        .tag {{ font-size: 0.7em; padding: 2px 5px; border-radius: 3px; margin-left: 5px; color: white; }}
-        .tag-m {{ background: #2ecc71; }} .tag-a {{ background: #e67e22; }}
-        .res-block {{ border-left: 4px solid #1a73e8; padding-left: 15px; margin: 15px 0; }}
+        .res-block {{ border-left: 4px solid #1a73e8; padding-left: 15px; margin: 15px 0; line-height: 1.6; }}
+        .tag {{ font-size: 0.7em; padding: 2px 5px; border-radius: 3px; margin-left: 5px; color: white; background: #e67e22; }}
     </style>
 </head>
 <body>
     <div class="card">
-        <h1>冯氏亲戚关系网实测</h1>
+        <h1>冯氏亲戚关系网 (实测版)</h1>
         <form method="POST" style="display:flex;margin-bottom:20px;">
-            <input type="text" name="n" placeholder="输入姓名(如:杨知秋)" style="flex:1;padding:10px;" required>
-            <button type="submit" style="padding:10px 20px;background:#1a73e8;color:white;border:none;">立即推理</button>
+            <input type="text" name="n" placeholder="输入姓名实测 (如: 杨知秋)" style="flex:1;padding:10px;" required>
+            <button type="submit" style="padding:10px 20px;background:#1a73e8;color:white;border:none;cursor:pointer;">立即推理</button>
         </form>
         {content}
     </div>
@@ -118,7 +101,7 @@ HTML_TPL = """
 class RequestHandler(BaseHTTPRequestHandler):
     def do_GET(self):
         self.send_response(200); self.send_header('Content-type','text/html; charset=utf-8'); self.end_headers()
-        self.wfile.write(HTML_TPL.format(content="<p>输入姓名，验证逻辑推理与多媒体集成。</p>").encode('utf-8'))
+        self.wfile.write(HTML_TPL.format(content="<p>系统已修复，请输入姓名进行逻辑实测。</p>").encode('utf-8'))
 
     def do_POST(self):
         length = int(self.headers['Content-Length']); data = self.rfile.read(length).decode('utf-8')
@@ -126,14 +109,14 @@ class RequestHandler(BaseHTTPRequestHandler):
         content = ""
         if not res: content = f"<p style='color:red;'>未找到 '{name}'</p>"
         else:
-            content = f"<h2>{res['target']['n']} (第{res['target']['g']}代)</h2>"
+            content = f"<h2>{res['target']['n']} <small>(第{res['target']['g']}代)</small></h2><p><b>背景:</b> {res['target']['info']}</p>"
             for title, members in res["groups"].items():
                 if members:
-                    names = "、".join([m['n']+(f"<span class='tag tag-m'>多媒体</span>" if m['has_media'] else "") for m in members]) if isinstance(members, list) else str(members)
-                    content += f"<div class='res-block'><b>{title}:</b> {names}</div>"
+                    m_str = "、".join([m['n'] + (f"<span class='tag'>成就</span>" if m.get('has_ach') else "") for m in members])
+                    content += f"<div class='res-block'><b>{title}:</b> {m_str}</div>"
         self.send_response(200); self.send_header('Content-type','text/html; charset=utf-8'); self.end_headers()
         self.wfile.write(HTML_TPL.format(content=content).encode('utf-8'))
 
 if __name__ == '__main__':
-    run_auto_audit() # 启动时先打印一份报告到日志，确保“有东西”
+    print("冯氏亲戚关系网系统启动... 端口: 7860")
     HTTPServer(('0.0.0.0', 7860), RequestHandler).serve_forever()