@genduo/desk 0.0.0-stage → 0.5.0

package/jdy_secrets.py

@@ -0,0 +1,228 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""简道云密码 / MCP —— 与「销量计算系统」jdy_api.py + config.py 一致。
+
+本机钥匙串只存一件（店机由用户维护；本开发机可以没有）：
+  service = JDY_MCP
+  account = 服务器URL
+
+环境变量优先：JDY_MCP_URL
+
+API Key：MCP member_data_list 查【密码PASSWORDパスワード】，
+Title 精确匹配 JDY_API_KEY_TITLE（= config 中「api key 精细化运营」）。
+不硬编码 Key；不打印 secret。
+
+实现说明：逻辑与 zip 内 jdy_api 相同。若未安装 mcp/keyring，
+则用等价的 urllib JSON-RPC / security CLI 完成同一调用（filter / fields / Title）。
+"""
+from __future__ import annotations
+
+import asyncio
+import json
+import logging
+import os
+import re
+import subprocess
+import time
+from typing import Any, Optional
+from urllib.error import URLError
+from urllib.request import Request, urlopen
+
+log = logging.getLogger("jdy")
+
+# ── 与销量计算系统 config.py 同名常量 ─────────────────────
+JDY_PWD_APP_ID = "5a6f241ae24fd5382436f985"
+JDY_PWD_ENTRY_ID = "67188a2824e6cc898a1d7d7f"
+JDY_PWD_F_TITLE = "_widget_1729661480436"       # Title (text)
+JDY_PWD_F_PASSWORD = "_widget_1729661480439"    # Password (text)
+JDY_API_KEY_TITLE = "api key 精细化运营"
+JDY_MCP_KEYRING_SERVICE = "JDY_MCP"
+JDY_MCP_KEYRING_ACCOUNT = "服务器URL"
+
+# 别名（旧调用方）
+JDY_MCP_SERVICE = JDY_MCP_KEYRING_SERVICE
+JDY_MCP_ACCOUNT = JDY_MCP_KEYRING_ACCOUNT
+
+_API_KEY: Optional[str] = None
+
+
+def _get_mcp_url() -> str:
+    """MCP URL 优先级：环境变量 > 钥匙串（与销量计算系统 jdy_api 一致）"""
+    env = os.environ.get("JDY_MCP_URL")
+    if env:
+        return env
+    try:
+        import keyring
+        v = keyring.get_password(JDY_MCP_KEYRING_SERVICE,
+                                 JDY_MCP_KEYRING_ACCOUNT)
+        if v:
+            return v
+    except Exception:
+        pass
+    # keyring 未装或读失败时：同条目的 security CLI（仍是 JDY_MCP/服务器URL）
+    try:
+        r = subprocess.run(
+            ["security", "find-generic-password",
+             "-s", JDY_MCP_KEYRING_SERVICE,
+             "-a", JDY_MCP_KEYRING_ACCOUNT, "-w"],
+            capture_output=True, text=True,
+        )
+        if r.returncode == 0 and (r.stdout or "").strip():
+            return (r.stdout or "").rstrip("\n")
+    except Exception:
+        pass
+    raise RuntimeError(
+        "未找到 JDY MCP URL：请设置环境变量 JDY_MCP_URL "
+        "或钥匙串条目 JDY_MCP/服务器URL"
+    )
+
+
+def get_mcp_url() -> str:
+    return _get_mcp_url()
+
+
+def mcp_url_present() -> bool:
+    try:
+        _get_mcp_url()
+        return True
+    except RuntimeError:
+        return False
+
+
+async def _fetch_api_key_async() -> str:
+    """MCP member_data_list 查询密码表单，按 Title 精确匹配取 Password 字段。"""
+    # 优先与销量系统相同的 mcp SDK
+    try:
+        from mcp import ClientSession
+        from mcp.client.streamable_http import streamable_http_client
+    except ImportError:
+        return _fetch_api_key_urllib()
+
+    async with streamable_http_client(_get_mcp_url()) as (read, write):
+        async with ClientSession(read, write) as session:
+            await session.initialize()
+            await asyncio.sleep(1)  # JDY MCP 限流 3 次/秒
+            res = await session.call_tool("member_data_list", {
+                "app_id": JDY_PWD_APP_ID,
+                "entry_id": JDY_PWD_ENTRY_ID,
+                "limit": 20,
+                "fields": [JDY_PWD_F_TITLE, JDY_PWD_F_PASSWORD],
+                "filter": {"rel": "and", "cond": [
+                    {"field": JDY_PWD_F_TITLE, "type": "text",
+                     "method": "like", "value": ["api key"]},
+                ]},
+            })
+            if res.is_error:
+                raise RuntimeError(f"MCP member_data_list 失败: {res.content}")
+            for block in res.content:
+                if getattr(block, "type", None) != "text":
+                    continue
+                rows = json.loads(block.text).get("data", [])
+                for row in rows:
+                    if row.get(JDY_PWD_F_TITLE) == JDY_API_KEY_TITLE:
+                        key = row.get(JDY_PWD_F_PASSWORD)
+                        if key:
+                            log.info("JDY API Key 已从密码表单读取: %s",
+                                     JDY_API_KEY_TITLE)
+                            return key
+    raise RuntimeError(
+        f"密码表单中未找到 Title={JDY_API_KEY_TITLE!r} 的 API Key"
+    )
+
+
+def _rpc(url: str, method: str, params: dict) -> dict:
+    body = json.dumps(
+        {"jsonrpc": "2.0", "id": 1, "method": method, "params": params}
+    ).encode()
+    req = Request(
+        url, data=body, method="POST",
+        headers={"Content-Type": "application/json",
+                 "Accept": "application/json, text/event-stream"},
+    )
+    last_err: Exception | None = None
+    for attempt in range(3):
+        try:
+            with urlopen(req, timeout=40) as resp:
+                raw = resp.read().decode("utf-8", "replace")
+            break
+        except (URLError, TimeoutError, ConnectionError) as exc:
+            last_err = exc
+            time.sleep(1.5 * (attempt + 1))
+    else:
+        raise RuntimeError(f"JDY MCP 网络失败: {type(last_err).__name__}")
+    m = re.search(r"data:\s*(\{.*\})", raw, re.S)
+    data = json.loads(m.group(1) if m else raw)
+    if "error" in data:
+        err = data["error"]
+        msg = err.get("message", err) if isinstance(err, dict) else err
+        raise RuntimeError(f"JDY MCP {method} 失败: {msg}")
+    return data.get("result", {})
+
+
+def _fetch_api_key_urllib() -> str:
+    """无 mcp 包时：同一 member_data_list 参数，经 JSON-RPC 调用。"""
+    url = _get_mcp_url()
+    time.sleep(1)
+    res = _rpc(url, "tools/call", {
+        "name": "member_data_list",
+        "arguments": {
+            "app_id": JDY_PWD_APP_ID,
+            "entry_id": JDY_PWD_ENTRY_ID,
+            "limit": 20,
+            "fields": [JDY_PWD_F_TITLE, JDY_PWD_F_PASSWORD],
+            "filter": {"rel": "and", "cond": [
+                {"field": JDY_PWD_F_TITLE, "type": "text",
+                 "method": "like", "value": ["api key"]},
+            ]},
+        },
+    })
+    text = ""
+    for c in res.get("content", []) or []:
+        if c.get("type") == "text":
+            text = c.get("text") or ""
+            break
+    if not text:
+        raise RuntimeError("MCP member_data_list 无 text 内容")
+    if text.strip().startswith("API error"):
+        raise RuntimeError(f"MCP member_data_list 失败: {text.strip()[:200]}")
+    body: Any = json.loads(text)
+    rows = body.get("data") if isinstance(body, dict) else body
+    for row in rows or []:
+        if not isinstance(row, dict):
+            continue
+        if row.get(JDY_PWD_F_TITLE) == JDY_API_KEY_TITLE:
+            key = row.get(JDY_PWD_F_PASSWORD)
+            if key:
+                log.info("JDY API Key 已从密码表单读取: %s", JDY_API_KEY_TITLE)
+                return key
+    raise RuntimeError(
+        f"密码表单中未找到 Title={JDY_API_KEY_TITLE!r} 的 API Key"
+    )
+
+
+def get_api_key() -> str:
+    """同步接口：动态读取 JDY API Key（不落盘、不硬编码、不打印）。"""
+    global _API_KEY
+    if _API_KEY:
+        return _API_KEY
+    try:
+        # mcp SDK 路径
+        import mcp  # noqa: F401
+        key = asyncio.run(_fetch_api_key_async())
+    except ImportError:
+        key = _fetch_api_key_urllib()
+    except Exception:
+        # SDK 可用但失败时，再试 urllib 等价路径
+        try:
+            key = _fetch_api_key_urllib()
+        except Exception as exc:
+            raise RuntimeError(
+                f"读取 JDY API Key 失败: {type(exc).__name__}"
+            ) from exc
+    _API_KEY = key
+    return key
+
+
+def clear_cache() -> None:
+    global _API_KEY
+    _API_KEY = None

package/keychain_util.py

@@ -0,0 +1,108 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""凭据入口（兼容旧 import 名 keychain_util）。
+
+与「销量计算系统」一致：
+  · 本机 Keychain 只用于 JDY_MCP / 服务器URL（店机维护；本开发机可无）
+  · JDY API Key 经 MCP 密码表读取（Title = api key 精细化运营）
+
+已废弃（不再读写）：
+  · dataanalyst-agent-token
+  · dataanalyst/rms/<SHOP>-rlogin / -ai
+
+Agent token：环境变量 DATAANALYST_AGENT_TOKEN（或 login --bootstrap 注入本进程）。
+RMS 登录：env-file / 环境变量 RMS_<SHOP>_*，见 rms_browser_login。
+"""
+from __future__ import annotations
+
+import os
+from typing import Optional
+
+import jdy_secrets as jdy
+
+AGENT_TOKEN_SERVICE = "DEPRECATED:dataanalyst-agent-token"
+JDY_MCP_SERVICE = jdy.JDY_MCP_KEYRING_SERVICE
+JDY_MCP_ACCOUNT = jdy.JDY_MCP_KEYRING_ACCOUNT
+JDY_API_KEY_TITLE = jdy.JDY_API_KEY_TITLE
+
+
+def get_mcp_url() -> str:
+    return jdy.get_mcp_url()
+
+
+def get_api_key() -> str:
+    """与销量计算系统 jdy_api.get_api_key 相同。勿打印返回值。"""
+    return jdy.get_api_key()
+
+
+def get_agent_token(shop: Optional[str] = None) -> str:
+    """中心 Agent token：只从环境变量读（不再走 dataanalyst Keychain / 自创 JDY Title）。"""
+    env = (os.environ.get("DATAANALYST_AGENT_TOKEN") or "").strip()
+    if env:
+        return env
+    raise RuntimeError(
+        "未设置 DATAANALYST_AGENT_TOKEN。"
+        "请 export、或 genduo-desk login --bootstrap / --token-env"
+    )
+
+
+def rms_env_prefix(shop: str) -> str:
+    return f"RMS_{shop.upper()}_"
+
+
+def get_rms_creds(shop: str) -> dict[str, str]:
+    """从环境变量读 RMS 两组。勿打印。"""
+    p = rms_env_prefix(shop)
+    out = {
+        "rlogin_id": (os.environ.get(p + "LOGIN_ID") or "").strip(),
+        "rlogin_password": (os.environ.get(p + "PASSWORD") or "").strip(),
+        "sso_user": (os.environ.get(p + "SHOP_USER") or "").strip(),
+        "sso_password": (os.environ.get(p + "SHOP_PASSWORD") or "").strip(),
+    }
+    missing = [k for k, v in out.items() if not v]
+    if missing:
+        raise RuntimeError(
+            f"{shop.upper()} 缺少环境变量 {p}*（缺: {', '.join(missing)}）；"
+            "见 rms_browser_login --env-file"
+        )
+    return out
+
+
+def rms_creds_present(shop: str) -> dict:
+    """布尔：mcp_url / api_key 不在此探测网络；agent_token / rlogin / ai 看环境变量。"""
+    p = rms_env_prefix(shop)
+    return {
+        "mcp_url": jdy.mcp_url_present(),
+        "agent_token": bool((os.environ.get("DATAANALYST_AGENT_TOKEN") or "").strip()),
+        "rlogin": bool((os.environ.get(p + "LOGIN_ID") or "").strip()
+                       and (os.environ.get(p + "PASSWORD") or "").strip()),
+        "ai": bool((os.environ.get(p + "SHOP_USER") or "").strip()
+                   and (os.environ.get(p + "SHOP_PASSWORD") or "").strip()),
+    }
+
+
+def has_generic(service: str, account: Optional[str] = None) -> bool:
+    if service == JDY_MCP_SERVICE:
+        return jdy.mcp_url_present()
+    return False
+
+
+def set_generic(*_a, **_k) -> None:
+    raise RuntimeError(
+        "已废弃：不再写入 dataanalyst/* Keychain。"
+        "与销量计算系统一致，本机只维护 JDY_MCP / 服务器URL。"
+    )
+
+
+def set_agent_token(*_a, **_k) -> None:
+    raise RuntimeError(
+        "已废弃：不再写入 dataanalyst-agent-token。"
+        "请使用环境变量 DATAANALYST_AGENT_TOKEN 或 login --bootstrap。"
+    )
+
+
+def set_rms_creds(*_a, **_k) -> None:
+    raise RuntimeError(
+        "已废弃：不再写入 dataanalyst/rms/* Keychain。"
+        "请使用 RMS_<SHOP>_* 环境变量或 rms_browser_login --env-file。"
+    )

package/local_config.py

@@ -0,0 +1,53 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""本机非机密配置（shop / base URL）。不存 token / 密码。"""
+from __future__ import annotations
+
+import json
+import os
+from pathlib import Path
+
+SHOPS = ["0RT1", "3RT1", "5RT1", "3RT2", "5RT2", "7RT2"]
+DEFAULT_BASE = "https://dataanalyst.jp"
+VERSION = "0.5.0"
+HERE = Path(__file__).resolve().parent
+# 优先用户级配置，其次包内 state（POC 兼容）
+USER_CFG = Path.home() / ".config" / "dataanalyst-agent" / "config.json"
+STATE_CFG = HERE / "state" / "config.json"
+
+
+def config_path() -> Path:
+    if USER_CFG.is_file():
+        return USER_CFG
+    return STATE_CFG
+
+
+def load() -> dict:
+    path = config_path()
+    if not path.is_file():
+        return {
+            "shop": os.environ.get("DATAANALYST_SHOP", "").upper() or None,
+            "base": os.environ.get("DATAANALYST_BASE", DEFAULT_BASE).rstrip("/"),
+        }
+    data = json.loads(path.read_text(encoding="utf-8"))
+    shop = (data.get("shop") or os.environ.get("DATAANALYST_SHOP") or "").upper() or None
+    base = (data.get("base") or os.environ.get("DATAANALYST_BASE") or DEFAULT_BASE).rstrip("/")
+    return {"shop": shop, "base": base}
+
+
+def save(shop: str, base: str = DEFAULT_BASE) -> Path:
+    shop_u = shop.upper()
+    if shop_u not in SHOPS:
+        raise ValueError(f"非法店铺: {shop}（允许: {', '.join(SHOPS)}）")
+    path = USER_CFG
+    path.parent.mkdir(parents=True, exist_ok=True)
+    payload = {"shop": shop_u, "base": base.rstrip("/")}
+    path.write_text(json.dumps(payload, ensure_ascii=False, indent=2) + "\n",
+                    encoding="utf-8")
+    os.chmod(path, 0o600)
+    # 同步一份到 state，方便 POC 路径发现
+    STATE_CFG.parent.mkdir(parents=True, exist_ok=True)
+    STATE_CFG.write_text(json.dumps(payload, ensure_ascii=False, indent=2) + "\n",
+                         encoding="utf-8")
+    os.chmod(STATE_CFG, 0o600)
+    return path

package/package.json

@@ -1,6 +1,45 @@
 {
   "name": "@genduo/desk",
-  "version": "0.0.0-stage",
-  "stub": true,
-  "description": "Temporary package placeholder for staged publishing"
-}
+  "version": "0.5.0",
+  "description": "Local Mac desk agent CLI for genduo",
+  "bin": {
+    "genduo-desk": "bin/genduo-desk.js"
+  },
+  "files": [
+    "bin/",
+    "scripts/",
+    "cli.py",
+    "api_client.py",
+    "keychain_util.py",
+    "jdy_secrets.py",
+    "local_config.py",
+    "run.py",
+    "rms_browser_login.py",
+    "README.md",
+    "collect_access.py",
+    "collect_ads.py",
+    "ingest_util.py",
+    "rms_ads_parse.py"
+  ],
+  "scripts": {
+    "postinstall": "node scripts/postinstall.js"
+  },
+  "os": [
+    "darwin"
+  ],
+  "engines": {
+    "node": ">=18"
+  },
+  "preferGlobal": true,
+  "license": "UNLICENSED",
+  "private": false,
+  "publishConfig": {
+    "access": "public"
+  },
+  "keywords": [
+    "genduo",
+    "macos",
+    "cli",
+    "desk"
+  ]
+}

package/rms_ads_parse.py

@@ -0,0 +1,99 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""RPP 报表 ZIP/CSV 解析。"""
+from __future__ import annotations
+
+import csv
+import io
+import re
+import zipfile
+from datetime import date
+from pathlib import Path
+
+YM_RE = re.compile(r"(\d{4})年(\d{1,2})月")
+DATE_RE = re.compile(r"(\d{4})-(\d{2})-(\d{2})")
+
+
+def _num(v):
+    if v is None:
+        return None
+    s = str(v).replace(",", "").replace("%", "").replace("円", "").strip()
+    if not s or s in ("-", "--"):
+        return None
+    try:
+        return float(s)
+    except ValueError:
+        return None
+
+
+def _period(value: str) -> tuple[date, date] | None:
+    m = YM_RE.search(value or "")
+    if m:
+        y, mo = int(m.group(1)), int(m.group(2))
+        start = date(y, mo, 1)
+        nxt = date(y + (mo == 12), 1 if mo == 12 else mo + 1, 1)
+        return start, date.fromordinal(nxt.toordinal() - 1)
+    m = DATE_RE.search(value or "")
+    if m:
+        d = date(*map(int, m.groups()))
+        return d, d
+    return None
+
+
+def _text(buf: bytes) -> str:
+    for enc in ("cp932", "utf-8-sig", "utf-8"):
+        try:
+            return buf.decode(enc)
+        except UnicodeDecodeError:
+            continue
+    return buf.decode("cp932", "replace")
+
+
+def parse_zip(buf: bytes, ad_type: str, shop: str) -> list[dict]:
+    with zipfile.ZipFile(io.BytesIO(buf)) as z:
+        names = [n for n in z.namelist() if n.lower().endswith(".csv")]
+        if not names:
+            return []
+        text = _text(z.read(names[0]))
+    rows = list(csv.reader(io.StringIO(text)))
+    header_idx = next((i for i, r in enumerate(rows)
+                       if r and "コントロールカラム" in r[0]), None)
+    if header_idx is None:
+        raise ValueError("找不到表头（コントロールカラム）")
+    header = [h.strip() for h in rows[header_idx]]
+    idx = {h: i for i, h in enumerate(header)}
+
+    def col(row, name):
+        i = idx.get(name)
+        return row[i] if i is not None and i < len(row) else None
+
+    out = []
+    for row in rows[header_idx + 1:]:
+        if not row or not any(x.strip() for x in row):
+            continue
+        d = col(row, "日付")
+        period = _period(d or "")
+        if not period:
+            continue
+        item = (col(row, "商品管理番号") or "").strip()
+        keyword = (col(row, "キーワード") or "").strip()
+        if ad_type == "rpp_item" and not item:
+            continue
+        if ad_type == "rpp_keyword" and not keyword:
+            continue
+        start, end = period
+        out.append({
+            "shop": shop, "ad_type": ad_type, "period_type": "monthly",
+            "period_start": start, "period_end": end,
+            "item_number": item, "item_name": col(row, "商品名"),
+            "keyword": keyword,
+            "clicks": int(float(col(row, "クリック数(合計)") or 0)),
+            "cost": _num(col(row, "実績額(合計)")),
+            "sales": _num(col(row, "売上金額(合計720時間)")),
+            "orders": int(float(col(row, "売上件数(合計720時間)") or 0)),
+            "cpc": _num(col(row, "CPC実績(合計)")),
+            "ctr": _num(col(row, "CTR(%)")),
+            "roas": _num(col(row, "ROAS(合計720時間)(%)")),
+            "cvr": _num(col(row, "CVR(合計720時間)(%)")),
+        })
+    return out