sophhub 0.2.1 → 0.2.2

package/skills/image-classify/src/scripts/face_search.py

@@ -8,6 +8,7 @@ import sys
 import json
 import argparse
 import shutil
+import subprocess
 import zipfile
 from datetime import datetime
 import cv2
@@ -254,6 +255,26 @@ def get_config(config_path='references/config.json'):
             "query_threshold": 0.7,
             "search_similarity_threshold": 0.3
         }
+
+
+def _user_friend_id(user):
+    """用户条目中的好友 ID（虾友号）。新字段 `friendId`，兼容旧字段 `xia_you_hao`。"""
+    if not isinstance(user, dict):
+        return None
+    v = user.get("friendId")
+    if v is not None:
+        return v
+    return user.get("xia_you_hao")
+
+
+def _user_friend_label(user):
+    """DM 展示名。新字段 `friendLabel`，兼容旧字段 `xia_you_label`。"""
+    if not isinstance(user, dict):
+        return None
+    v = user.get("friendLabel")
+    if v is not None:
+        return v
+    return user.get("xia_you_label")
     
 def name_in_config(name, config_path='references/config.json'):
     """检查名字是否在配置文件的用户列表中"""
@@ -289,8 +310,14 @@ def delete_user_config(ost_name, config_path='references/config.json'):
     with open(config_path, 'w', encoding='utf-8') as f:
         json.dump(basic_config, f, indent=4, ensure_ascii=False)
 
-def add_user_config(name, image_path, config_path='references/config.json'):
-    """添加用户到config配置文件的用户列表中"""
+def add_user_config(
+    name,
+    image_path,
+    config_path="references/config.json",
+    friend_id=None,
+    friend_label=None,
+):
+    """添加用户到 config。friendId 为可选好友 userId（正整数）；friendLabel 为可选展示名。"""
     basic_config = get_config(config_path)
     user_list = basic_config.get("users", [])
     face_embedding = get_baseface_embedding(image_path, det_thr=basic_config.get("query_threshold", 0.7))
@@ -298,7 +325,12 @@ def add_user_config(name, image_path, config_path='references/config.json'):
         return False, "未检测到有效的人脸信息"
 
     abs_image_path = os.path.realpath(image_path)
-    user_list.append({"name": name, "info":[{"file_path": abs_image_path, "embedding": face_embedding}]})
+    entry = {"name": name, "info": [{"file_path": abs_image_path, "embedding": face_embedding}]}
+    if friend_id is not None:
+        entry["friendId"] = int(friend_id)
+    if friend_label is not None and str(friend_label).strip():
+        entry["friendLabel"] = str(friend_label).strip()
+    user_list.append(entry)
     basic_config["users"] = user_list
     with open(config_path, 'w', encoding='utf-8') as f:
         json.dump(basic_config, f, indent=4, ensure_ascii=False)
@@ -563,6 +595,296 @@ def classify_all_users(search_path, config_path='references/config.json'):
     return all_results
 
 
+def _format_classify_dm_message(name: str, items: list, max_lines: int = 30, max_chars: int = 3500) -> str:
+    """将单用户分类结果格式化为私信正文（控制长度）。"""
+    n = len(items)
+    lines = [f"【照片分类结果】👤 {name}", f"匹配共 {n} 张。"]
+    if n == 0:
+        lines.append("本轮目录中暂无匹配照片。")
+        return "\n".join(lines)
+    for i, item in enumerate(items[:max_lines]):
+        path = item.get("image_path", "")
+        sim = item.get("similarity", 0)
+        try:
+            sim_s = f"{float(sim):.4f}"
+        except (TypeError, ValueError):
+            sim_s = str(sim)
+        lines.append(f"- {path} · 相似度 {sim_s}")
+    if n > max_lines:
+        lines.append(f"… 另有 {n - max_lines} 张未列出，请在本机打包下载查看完整列表。")
+    text = "\n".join(lines)
+    if len(text) > max_chars:
+        text = text[: max_chars - 20] + "\n…（正文过长已截断）"
+    return text
+
+
+def _format_pack_link_dm_message(name: str, url: str) -> str:
+    """pack 成功后发给 friendId 的私信正文（含下载链接）。"""
+    return (
+        f"✨「{name}」的照片已为您送达\n\n"
+        f"{url}\n\n"
+        f"请在 24 小时内下载保存；逾期链接可能失效，请及时转存。"
+    )
+
+
+def _find_user_by_name(config_path: str, name: str):
+    if not name:
+        return None
+    for u in get_config(config_path).get("users", []):
+        if u.get("name") == name:
+            return u
+    return None
+
+
+def _send_classify_dm(friend_id: int, message: str, timeout: int = 90) -> tuple:
+    """调用同目录 send_dm_message.py 发送私信（--user-id 即 friendId）。返回 (success: bool, detail: str)。"""
+    script = os.path.join(os.path.dirname(os.path.abspath(__file__)), "send_dm_message.py")
+    if not os.path.isfile(script):
+        return False, f"未找到 DM 脚本: {script}"
+    try:
+        proc = subprocess.run(
+            [sys.executable, script, "--user-id", str(int(friend_id)), "-m", message],
+            capture_output=True,
+            text=True,
+            timeout=timeout,
+        )
+        if proc.returncode == 0:
+            return True, (proc.stdout or "").strip() or "ok"
+        err = (proc.stderr or proc.stdout or "").strip() or f"exit {proc.returncode}"
+        return False, err[:2000]
+    except subprocess.TimeoutExpired:
+        return False, "发送私信超时"
+    except Exception as e:
+        return False, str(e)
+
+
+def notify_classify_dm(config_path: str, all_results: dict) -> dict:
+    """对配置了 friendId 的用户推送 DM。返回 {用户名: {success, friendId, friendLabel?, detail?}}。"""
+    basic_config = get_config(config_path)
+    out = {}
+    for user in basic_config.get("users", []):
+        xid = _user_friend_id(user)
+        name = user.get("name") or ""
+        if xid is None:
+            continue
+        try:
+            xid_int = int(xid)
+        except (TypeError, ValueError):
+            bad = {"success": False, "detail": f"无效的 friendId: {xid!r}"}
+            lab_bad = _user_friend_label(user)
+            if isinstance(lab_bad, str) and lab_bad.strip():
+                bad["friendLabel"] = lab_bad.strip()
+            out[name if name else f"invalid_friend_id:{xid}"] = bad
+            continue
+        if xid_int <= 0:
+            fail_e = {"success": False, "detail": "friendId 须为正整数", "friendId": xid_int}
+            lab0 = _user_friend_label(user)
+            if isinstance(lab0, str) and lab0.strip():
+                fail_e["friendLabel"] = lab0.strip()
+            out[name] = fail_e
+            continue
+        lab = _user_friend_label(user)
+        if isinstance(lab, str) and lab.strip():
+            label_s = lab.strip()
+        else:
+            label_s = None
+        items = all_results.get(name, [])
+        msg = _format_classify_dm_message(name, items)
+        ok, detail = _send_classify_dm(xid_int, msg)
+        entry = {"success": ok, "friendId": xid_int}
+        if label_s:
+            entry["friendLabel"] = label_s
+        if not ok:
+            entry["detail"] = detail
+        out[name] = entry
+    return out
+
+
+def notify_pack_link_dm(config_path: str, name_to_url: dict) -> dict:
+    """pack 成功后，向配置了 friendId 的用户私信下载链接。name_to_url: {本地用户名: url}。"""
+    out = {}
+    for name, url in (name_to_url or {}).items():
+        if not name or name == "quick_search":
+            continue
+        if not url:
+            continue
+        user = _find_user_by_name(config_path, name)
+        if not user:
+            continue
+        xid = _user_friend_id(user)
+        if xid is None:
+            continue
+        try:
+            xid_int = int(xid)
+        except (TypeError, ValueError):
+            bad = {"success": False, "detail": f"无效的 friendId: {xid!r}", "url": url}
+            lab_bad = _user_friend_label(user)
+            if isinstance(lab_bad, str) and lab_bad.strip():
+                bad["friendLabel"] = lab_bad.strip()
+            out[name] = bad
+            continue
+        if xid_int <= 0:
+            fail_e = {"success": False, "detail": "friendId 须为正整数", "friendId": xid_int, "url": url}
+            lab0 = _user_friend_label(user)
+            if isinstance(lab0, str) and lab0.strip():
+                fail_e["friendLabel"] = lab0.strip()
+            out[name] = fail_e
+            continue
+        lab = _user_friend_label(user)
+        label_s = lab.strip() if isinstance(lab, str) and lab.strip() else None
+        msg = _format_pack_link_dm_message(name, url)
+        ok, detail = _send_classify_dm(xid_int, msg)
+        entry = {"success": ok, "friendId": xid_int, "url": url}
+        if label_s:
+            entry["friendLabel"] = label_s
+        if not ok:
+            entry["detail"] = detail
+        out[name] = entry
+    return out
+
+
+def _fmt_dm_line_ok(disp: str) -> str:
+    """dm_lines：私信发送成功（展示虾友昵称或 friendId）。"""
+    return f"✅ 💌 已向虾友「{disp}」发送成功"
+
+
+def _fmt_dm_line_fail(disp: str, detail: str) -> str:
+    """dm_lines：私信发送失败。"""
+    return f"❌ 💢 虾友「{disp}」发送失败：{detail}"
+
+
+def _fmt_dm_line_no_friend(name: str) -> str:
+    """dm_lines：未配置 friendId。"""
+    return f"📭 「{name}」暂未绑定虾友，跳过私信"
+
+
+def _fmt_pack_line_fail(name: str, err: str) -> str:
+    """dm_lines：pack 打包失败。"""
+    return f"📦❌ 「{name}」下载包生成失败：{err}"
+
+
+def build_pack_dm_status_lines(
+    config_path: str,
+    results_dict: dict,
+    user_urls: dict,
+    errors: dict | None,
+    pack_dm_out: dict,
+) -> list:
+    """pack 后的虾友发送状态短句（与 classify 的 dm_lines 同一套 emoji 模板）。"""
+    lines = []
+    errors = errors or {}
+    pack_dm_out = pack_dm_out or {}
+    for name in results_dict.keys():
+        if name == "quick_search":
+            continue
+        if name in errors and name not in user_urls:
+            lines.append(_fmt_pack_line_fail(name, str(errors[name])))
+            continue
+        if name not in user_urls:
+            continue
+        u = _find_user_by_name(config_path, name) or {}
+        xid = _user_friend_id(u)
+        if xid is None:
+            lines.append(_fmt_dm_line_no_friend(name))
+            continue
+
+        def _disp(uu) -> str:
+            lab = _user_friend_label(uu)
+            if isinstance(lab, str) and lab.strip():
+                return lab.strip()
+            try:
+                return str(int(_user_friend_id(uu)))
+            except (TypeError, ValueError):
+                return str(_user_friend_id(uu))
+
+        try:
+            xid_int = int(xid)
+        except (TypeError, ValueError):
+            disp = _disp(u)
+            info = pack_dm_out.get(name)
+            if info and not info.get("success"):
+                det = (info.get("detail") or "未知错误").strip()
+                lines.append(_fmt_dm_line_fail(disp, det))
+            else:
+                lines.append(_fmt_dm_line_fail(disp, "friendId 无效"))
+            continue
+
+        if xid_int <= 0:
+            disp = _disp(u)
+            info = pack_dm_out.get(name)
+            if info and not info.get("success"):
+                det = (info.get("detail") or "未知错误").strip()
+                lines.append(_fmt_dm_line_fail(disp, det))
+            else:
+                lines.append(_fmt_dm_line_fail(disp, "friendId 须为正整数"))
+            continue
+
+        disp = _disp(u)
+        info = pack_dm_out.get(name)
+        if info and info.get("success"):
+            lines.append(_fmt_dm_line_ok(disp))
+        elif info:
+            det = (info.get("detail") or "未知错误").strip()
+            lines.append(_fmt_dm_line_fail(disp, det))
+        else:
+            lines.append(_fmt_dm_line_fail(disp, "未返回状态"))
+    return lines
+
+
+def build_dm_status_lines(config_path: str, all_results: dict, dm_out: dict) -> list:
+    """按本轮参与分类的用户顺序，生成最终提示用短句（含 emoji，见 _fmt_dm_line_*）。"""
+    basic_config = get_config(config_path)
+    name_to_user = {u.get("name"): u for u in basic_config.get("users", []) if u.get("name")}
+    lines = []
+    for name in all_results.keys():
+        u = name_to_user.get(name, {})
+        xid = _user_friend_id(u)
+        if xid is None:
+            lines.append(_fmt_dm_line_no_friend(name))
+            continue
+
+        def _disp_for_xid(raw, fallback_int=None) -> str:
+            lab = _user_friend_label(u)
+            if isinstance(lab, str) and lab.strip():
+                return lab.strip()
+            if fallback_int is not None:
+                return str(fallback_int)
+            return str(raw)
+
+        try:
+            xid_int = int(xid)
+        except (TypeError, ValueError):
+            disp = _disp_for_xid(xid, None)
+            info = dm_out.get(name) if dm_out else None
+            if info and not info.get("success"):
+                det = (info.get("detail") or "未知错误").strip()
+                lines.append(_fmt_dm_line_fail(disp, det))
+            else:
+                lines.append(_fmt_dm_line_fail(disp, "friendId 无效"))
+            continue
+
+        if xid_int <= 0:
+            disp = _disp_for_xid(xid, xid_int)
+            info = dm_out.get(name) if dm_out else None
+            if info and not info.get("success"):
+                det = (info.get("detail") or "未知错误").strip()
+                lines.append(_fmt_dm_line_fail(disp, det))
+            else:
+                lines.append(_fmt_dm_line_fail(disp, "friendId 须为正整数"))
+            continue
+
+        disp = _disp_for_xid(xid, xid_int)
+        info = dm_out.get(name) if dm_out else None
+        if info and info.get("success"):
+            lines.append(_fmt_dm_line_ok(disp))
+        elif info:
+            det = (info.get("detail") or "未知错误").strip()
+            lines.append(_fmt_dm_line_fail(disp, det))
+        else:
+            lines.append(_fmt_dm_line_fail(disp, "未返回状态"))
+    return lines
+
+
 def copy_results_to_folder(results, target_folder, user_name=None):
     """将搜索结果中的照片复制到指定文件夹。
     如果指定了 user_name，会在 target_folder 下创建以用户名命名的子目录。
@@ -667,6 +989,21 @@ def main():
     sp = subparsers.add_parser("add", help="注册新用户")
     sp.add_argument("name", help="用户名")
     sp.add_argument("image", help="照片路径")
+    sp.add_argument(
+        "--friend-id",
+        type=int,
+        default=None,
+        dest="friend_id",
+        metavar="ID",
+        help="可选：好友 userId（friendId）。设置后，一键 classify 会将该用户分类结果自动 DM 到此账号",
+    )
+    sp.add_argument(
+        "--friend-label",
+        default=None,
+        dest="friend_label",
+        metavar="NAME",
+        help="可选：DM 展示名（与自然语言「虾友：xxx」对应，用于最终提示括号内文案）",
+    )
 
     # replace — 替换用户照片
     sp = subparsers.add_parser("replace", help="替换用户照片（删除旧照片）")
@@ -738,14 +1075,36 @@ def main():
         _json_output({"exists": exists, "name": args.name})
 
     elif args.command == "add":
-        ok, msg = add_user_config(args.name, args.image, cfg)
-        result = {"success": ok, "message": msg, "name": args.name}
-        if ok:
-            try:
-                result["image_url"] = convert_to_url(args.image, timeout=30)
-            except Exception:
-                result["image_url"] = None
-        _json_output(result)
+        friend_id = getattr(args, "friend_id", None)
+        raw_label = getattr(args, "friend_label", None)
+        friend_label = str(raw_label).strip() if raw_label is not None and str(raw_label).strip() else None
+        if friend_id is not None and friend_id <= 0:
+            _json_output(
+                {
+                    "success": False,
+                    "message": "friendId 须为正整数",
+                    "name": args.name,
+                }
+            )
+        else:
+            ok, msg = add_user_config(
+                args.name,
+                args.image,
+                cfg,
+                friend_id=friend_id,
+                friend_label=friend_label,
+            )
+            result = {"success": ok, "message": msg, "name": args.name}
+            if friend_id is not None:
+                result["friendId"] = friend_id
+            if friend_label:
+                result["friendLabel"] = friend_label
+            if ok:
+                try:
+                    result["image_url"] = convert_to_url(args.image, timeout=30)
+                except Exception:
+                    result["image_url"] = None
+            _json_output(result)
 
     elif args.command == "replace":
         ok, msg = replace_user_embeding_config(args.name, args.image, cfg)
@@ -791,7 +1150,13 @@ def main():
         summary = {}
         for name, items in all_results.items():
             summary[name] = {"count": len(items), "results": items}
-        _json_output({"user_count": len(all_results), "users": summary})
+        payload = {"user_count": len(all_results), "users": summary}
+        dm_status = notify_classify_dm(cfg, all_results)
+        if dm_status:
+            payload["dm"] = dm_status
+        if all_results:
+            payload["dm_lines"] = build_dm_status_lines(cfg, all_results, dm_status or {})
+        _json_output(payload)
 
     elif args.command == "copy":
         results = _load_search_results(cfg, args.name)
@@ -815,12 +1180,32 @@ def main():
                     user_urls[user_name] = url
                 else:
                     errors[user_name] = info
-            _json_output({"success": bool(user_urls), "user_urls": user_urls,
-                          "errors": errors if errors else None})
+            pack_dm = notify_pack_link_dm(cfg, user_urls)
+            dm_lines = build_pack_dm_status_lines(cfg, results, user_urls, errors, pack_dm)
+            payload = {
+                "success": bool(user_urls),
+                "user_urls": user_urls,
+                "errors": errors if errors else None,
+            }
+            if pack_dm:
+                payload["dm"] = pack_dm
+            if dm_lines:
+                payload["dm_lines"] = dm_lines
+            _json_output(payload)
         else:
             url, info = pack_results_to_url(results, args.archive_name, args.timeout)
             if url:
-                _json_output({"success": True, "url": url, "zip_path": info})
+                payload = {"success": True, "url": url, "zip_path": info}
+                if args.name:
+                    pack_dm = notify_pack_link_dm(cfg, {args.name: url})
+                    dm_lines = build_pack_dm_status_lines(
+                        cfg, {args.name: results}, {args.name: url}, None, pack_dm
+                    )
+                    if pack_dm:
+                        payload["dm"] = pack_dm
+                    if dm_lines:
+                        payload["dm_lines"] = dm_lines
+                _json_output(payload)
             else:
                 _json_output({"success": False, "message": info})