earshot-cli 0.1.1__tar.gz → 0.2.0__tar.gz

{earshot_cli-0.1.1 → earshot_cli-0.2.0}/.github/workflows/ci.yml

@@ -13,6 +13,8 @@ jobs:
       - uses: astral-sh/setup-uv@v5
         with:
           python-version: "3.12"
+      - name: Install system audio deps
+        run: sudo apt-get update && sudo apt-get install -y libpulse-dev
       - name: Install
         run: uv sync
       - name: Lint

{earshot_cli-0.1.1 → earshot_cli-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: earshot-cli
-Version: 0.1.1
+Version: 0.2.0
 Summary: 旁听剪藏:跨平台桌面端系统声录制 → 本地转写 → 投递知识库(默认 ExoMind,可插拔)
 Project-URL: Homepage, https://github.com/helloworldtang/earshot
 Project-URL: Repository, https://github.com/helloworldtang/earshot
@@ -49,15 +49,24 @@ uv tool install earshot-cli   # 或 pipx install earshot-cli
 earshot doctor                # 环境自检;earshot 与 earshot-cli 两个命令名等价可用
 ```
 
+升级:
+
+```bash
+uv tool upgrade earshot-cli
+# 刚发布的版本若报 "Nothing to upgrade":PyPI 索引传播延迟(约 1 分钟),
+# 稍后再试,或立即生效:uv tool install --force earshot-cli
+```
+
 源码安装请**锁版本 tag**,不要引滚动的 `main`(消费方 `uv sync`/`pip install` 会隐性升级到未审阅代码;升级应当是显式改版本号的决策):
 
 ```bash
-uv tool install "earshot-cli @ https://github.com/helloworldtang/earshot/archive/refs/tags/v0.1.0.tar.gz"
+uv tool install "earshot-cli @ https://github.com/helloworldtang/earshot/archive/refs/tags/v0.2.0.tar.gz"
 ```
 
 - **零系统依赖**:ffmpeg 已随 Python wheel 内置([imageio-ffmpeg](https://pypi.org/project/imageio-ffmpeg),MoviePy 同款),无需 brew/apt。
 - **模型首次运行自动下载**:SenseVoice int8 + silero VAD(~230MB,默认走 hf-mirror,`HF_ENDPOINT` 可覆盖),装完不再下。
 - **投递免装 CLI**:默认直连 ExoMind HTTP API(复用 `~/.exomind/config.json` 凭据);没有凭据但有 exomind CLI 时自动回退;也支持任意 webhook。
+- **独立登录免装 emcli**:`earshot login` 设备流浏览器授权,直接写入 `~/.exomind/config.json`(与 emcli 共用同一凭据文件);已装 emcli 且登录过则无需再登。
 
 ### 平台采集矩阵
 
@@ -106,6 +115,9 @@ earshot clean --days 30
 `--deliver webhook --webhook <url>`(投递到任意知识库,POST JSON `{origin,title,content,tags}`)、
 `--deliver none`(只落 `~/.earshot/outbox/` 存档)。
 
+首次使用取凭据:`earshot login`(浏览器设备流授权;凭据仍有效时直接返回,`--force` 强制重登),
+或设 `EXOMIND_API_KEY` 环境变量(从 exomind 网页 `/ui/account` 复制)。
+
 笔记留档:`~/.earshot/outbox/YYYYMMDD-HHMMSS-<标题>.md`。
 
 ### 文件生命周期

{earshot_cli-0.1.1 → earshot_cli-0.2.0}/README.md

@@ -16,15 +16,24 @@ uv tool install earshot-cli   # 或 pipx install earshot-cli
 earshot doctor                # 环境自检;earshot 与 earshot-cli 两个命令名等价可用
 ```
 
+升级:
+
+```bash
+uv tool upgrade earshot-cli
+# 刚发布的版本若报 "Nothing to upgrade":PyPI 索引传播延迟(约 1 分钟),
+# 稍后再试,或立即生效:uv tool install --force earshot-cli
+```
+
 源码安装请**锁版本 tag**,不要引滚动的 `main`(消费方 `uv sync`/`pip install` 会隐性升级到未审阅代码;升级应当是显式改版本号的决策):
 
 ```bash
-uv tool install "earshot-cli @ https://github.com/helloworldtang/earshot/archive/refs/tags/v0.1.0.tar.gz"
+uv tool install "earshot-cli @ https://github.com/helloworldtang/earshot/archive/refs/tags/v0.2.0.tar.gz"
 ```
 
 - **零系统依赖**:ffmpeg 已随 Python wheel 内置([imageio-ffmpeg](https://pypi.org/project/imageio-ffmpeg),MoviePy 同款),无需 brew/apt。
 - **模型首次运行自动下载**:SenseVoice int8 + silero VAD(~230MB,默认走 hf-mirror,`HF_ENDPOINT` 可覆盖),装完不再下。
 - **投递免装 CLI**:默认直连 ExoMind HTTP API(复用 `~/.exomind/config.json` 凭据);没有凭据但有 exomind CLI 时自动回退;也支持任意 webhook。
+- **独立登录免装 emcli**:`earshot login` 设备流浏览器授权,直接写入 `~/.exomind/config.json`(与 emcli 共用同一凭据文件);已装 emcli 且登录过则无需再登。
 
 ### 平台采集矩阵
 
@@ -73,6 +82,9 @@ earshot clean --days 30
 `--deliver webhook --webhook <url>`(投递到任意知识库,POST JSON `{origin,title,content,tags}`)、
 `--deliver none`(只落 `~/.earshot/outbox/` 存档)。
 
+首次使用取凭据:`earshot login`(浏览器设备流授权;凭据仍有效时直接返回,`--force` 强制重登),
+或设 `EXOMIND_API_KEY` 环境变量(从 exomind 网页 `/ui/account` 复制)。
+
 笔记留档:`~/.earshot/outbox/YYYYMMDD-HHMMSS-<标题>.md`。
 
 ### 文件生命周期

{earshot_cli-0.1.1 → earshot_cli-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "earshot-cli"
-version = "0.1.1"
+version = "0.2.0"
 description = "旁听剪藏:跨平台桌面端系统声录制 → 本地转写 → 投递知识库(默认 ExoMind,可插拔)"
 readme = "README.md"
 license = "MIT"

earshot_cli-0.2.0/src/earshot/auth.py

@@ -0,0 +1,149 @@
+"""设备流登录:复用 exomind 服务端 /auth/device/* 端点,写入 ~/.exomind/config.json。
+
+earshot 单独安装(未装 emcli)时的取凭据出口;与 emcli 共写同一配置文件,单一凭据源不变。
+智能登录:已有凭据探活仍有效则直接返回,不弹浏览器(--force 跳过)。
+"""
+
+from __future__ import annotations
+
+import contextlib
+import json
+import socket
+import time
+import webbrowser
+from collections.abc import Callable
+from pathlib import Path
+from typing import Any
+
+import httpx
+
+from earshot.config import EXOMIND_CONFIG_FILENAME
+
+Poster = Callable[[str, dict[str, Any]], dict[str, Any]]
+Getter = Callable[[str, dict[str, str]], int]
+Opener = Callable[[str], bool]
+Sleeper = Callable[[float], None]
+
+
+def _post_json(url: str, payload: dict[str, Any]) -> dict[str, Any]:
+    resp = httpx.post(url, json=payload, timeout=30.0)
+    resp.raise_for_status()
+    return dict(resp.json())
+
+
+def _get_status(url: str, headers: dict[str, str]) -> int:
+    return int(httpx.get(url, headers=headers, timeout=30.0).status_code)
+
+
+def _open_browser(url: str) -> bool:
+    return webbrowser.open(url)
+
+
+def verify_key(base_url: str, api_key: str, getter: Getter | None = None) -> bool:
+    """探活已有凭据:打一次受保护端点 /keywords,200 即仍有效。
+
+    Args:
+        base_url: exomind API 地址。
+        api_key: 待验证的凭据。
+        getter: ``(url, headers) -> HTTP 状态码``,测试注入;缺省走 httpx。
+
+    Returns:
+        是否仍有效;401/403 与网络错误均返回 False(交给设备流给出更准确的错误)。
+    """
+    get_status = getter or _get_status
+    try:
+        return get_status(f"{base_url.rstrip('/')}/keywords", {"Authorization": f"Bearer {api_key}"}) == 200
+    except httpx.HTTPError:
+        return False
+
+
+def device_login(
+    base_url: str,
+    poster: Poster | None = None,
+    opener: Opener | None = None,
+    sleeper: Sleeper | None = None,
+) -> str:
+    """设备流登录:发起 → 打开浏览器授权页 → 轮询拿 api_key。
+
+    Args:
+        base_url: exomind API 地址。
+        poster: ``(url, payload) -> 响应 dict``,测试注入;缺省走 httpx。
+        opener: 打开授权页的回调(返回是否成功),测试注入;缺省 webbrowser。
+        sleeper: 轮询间隔等待,测试注入;缺省 time.sleep。
+
+    Returns:
+        服务端签发的 api_key(长期有效,写入 ~/.exomind/config.json 后投递/云转写均可用)。
+
+    Raises:
+        RuntimeError: 授权被拒、会话过期或等待超时。
+        httpx.HTTPError: 网络或服务端错误(5xx 等)。
+    """
+    post = poster or _post_json
+    open_page = opener or _open_browser
+    sleep = sleeper or time.sleep
+
+    info = post(
+        f"{base_url.rstrip('/')}/auth/device/code",
+        {"name": f"earshot@{socket.gethostname()[:60]}"},
+    )
+    device_code = str(info["device_code"])
+    user_code = str(info.get("user_code", ""))
+    interval = max(1, int(info.get("interval", 3)))
+    expires_in = max(30, int(info.get("expires_in", 600)))
+    url = str(info.get("verification_url") or "")
+    if not url.startswith("http"):
+        url = f"{base_url.rstrip('/')}/ui/device?code={user_code}"
+
+    print(f"  1. 打开 {url}")
+    print(f"  2. 确认设备码 {user_code},点击「授权登录」")
+    open_page(url)
+
+    deadline = time.monotonic() + expires_in
+    while time.monotonic() < deadline:
+        sleep(interval)
+        try:
+            result = post(f"{base_url.rstrip('/')}/auth/device/token", {"device_code": device_code})
+        except httpx.HTTPStatusError as exc:
+            if exc.response.status_code != 400:
+                raise
+            detail = ""
+            with contextlib.suppress(ValueError):
+                detail = str((exc.response.json() or {}).get("error", ""))
+            if detail == "authorization_pending":
+                continue
+            raise RuntimeError("设备登录会话已过期,请重新执行 earshot login") from exc
+        api_key = str(result.get("api_key") or "")
+        if api_key:
+            return api_key
+    raise RuntimeError(f"等待授权超时({expires_in}s),请重新执行 earshot login")
+
+
+def save_credentials(
+    base_url: str,
+    api_key: str,
+    config_path: Path | None = None,
+) -> Path:
+    """写入凭据到 ~/.exomind/config.json(0600),保留既有其他字段。
+
+    Args:
+        base_url: exomind API 地址。
+        api_key: 登录拿到的凭据。
+        config_path: 配置文件路径,测试注入;缺省 ``~/.exomind/config.json``。
+
+    Returns:
+        实际写入的配置文件路径。
+    """
+    path = config_path if config_path is not None else Path.home() / EXOMIND_CONFIG_FILENAME
+    data: dict[str, str] = {}
+    try:
+        raw = json.loads(path.read_text(encoding="utf-8"))
+        if isinstance(raw, dict):
+            data = {k: v for k, v in raw.items() if isinstance(v, str)}
+    except (OSError, ValueError):
+        pass
+    data["base_url"] = base_url.rstrip("/")
+    data["api_key"] = api_key
+    path.parent.mkdir(parents=True, exist_ok=True)
+    path.write_text(json.dumps(data, ensure_ascii=False, indent=2) + "\n", encoding="utf-8")
+    path.chmod(0o600)
+    return path

{earshot_cli-0.1.1 → earshot_cli-0.2.0}/src/earshot/cli.py

@@ -13,9 +13,10 @@ from pathlib import Path
 import numpy as np
 
 from earshot import __version__
+from earshot.auth import device_login, save_credentials, verify_key
 from earshot.capture import blackhole_missing_hint, list_capture_devices, pick_device, record_to_wav
 from earshot.compose import NoteMeta, add_punctuation, derive_title, group_paragraphs, outbox_path, render_markdown
-from earshot.config import Settings, load_settings
+from earshot.config import DEFAULT_EXOMIND_BASE_URL, Settings, load_settings
 from earshot.deliver import DeliveryResult, deliver_exomind, deliver_exomind_api, deliver_webhook
 from earshot.extract import ExtractError, ffmpeg_available, to_wav16k, wav_duration
 from earshot.live import LiveSession
@@ -77,6 +78,10 @@ def build_parser() -> argparse.ArgumentParser:
     )
     p_deliver.add_argument("--webhook", help="webhook 地址(--deliver webhook 时必填)")
 
+    p_login = sub.add_parser("login", help="设备流登录 exomind(免装 emcli,写入 ~/.exomind/config.json)")
+    p_login.add_argument("--base-url", default=DEFAULT_EXOMIND_BASE_URL, help="exomind API 地址")
+    p_login.add_argument("--force", action="store_true", help="跳过「凭据仍有效」检查,无条件重新登录")
+
     sub.add_parser("devices", help="列出可用采集设备")
     sub.add_parser("doctor", help="环境自检")
     p_clean = sub.add_parser("clean", help="清理过期留档(outbox+tmp)")
@@ -188,8 +193,9 @@ def _do_deliver(
             except ValueError as e:
                 print(f"  配置文件解析失败: {e}")
         print(f"  PATH={os.environ.get('PATH', '')[:200]}")
-        print("  → exomind login 生成 ~/.exomind/config.json,或 npm i -g exomind,或改用 --deliver webhook/none")
-        print("  → 笔记已留档,环境修好后可用 earshot deliver <md路径> 补投")
+        print("  → 取凭据三选一:① earshot login(浏览器设备流授权) ② 设 EXOMIND_API_KEY 环境变量")
+        print("    (从 exomind-api.ai-as.cn/ui/account 复制) ③ npm i -g exomind && exomind login")
+        print("  → 或改用 --deliver webhook/none;笔记已留档,环境修好后可用 earshot deliver <md路径> 补投")
         return EXIT_FAIL
     mark = {"delivered": "✓", "pending": "⏳", "failed": "✗"}.get(result.status, "·")
     print(f"{mark} {result.status}: {result.detail}")
@@ -507,6 +513,26 @@ def cmd_clean(args: argparse.Namespace, settings: Settings) -> int:
     return EXIT_OK
 
 
+def cmd_login(args: argparse.Namespace, settings: Settings) -> int:
+    """设备流登录 exomind:已有凭据探活仍有效则直接返回(与 emcli/wxpub 同款智能登录)。"""
+    base_url = args.base_url
+    if not args.force and settings.exomind_api_key:
+        existing_base = settings.exomind_base_url or base_url
+        if verify_key(existing_base, settings.exomind_api_key):
+            print(f"✓ 凭据仍有效({existing_base}),未重新登录。强制重登用: earshot login --force")
+            return EXIT_OK
+    print(f"连接 exomind:{base_url}")
+    print("设备登录:")
+    api_key = device_login(base_url)
+    if not verify_key(base_url, api_key):
+        print("✗ 拿到的凭据探活失败,未写入配置;请重试 earshot login")
+        return EXIT_FAIL
+    path = save_credentials(base_url, api_key)
+    print(f"✓ 登录成功,凭据已写入 {path}")
+    print("  投递与云端转写(--engine server)现在可用")
+    return EXIT_OK
+
+
 def main(argv: list[str] | None = None) -> int:
     parser = build_parser()
     args = parser.parse_args(argv)
@@ -516,6 +542,7 @@ def main(argv: list[str] | None = None) -> int:
         "audio": cmd_audio,
         "video": cmd_video,
         "deliver": cmd_deliver,
+        "login": cmd_login,
         "devices": cmd_devices,
         "doctor": cmd_doctor,
         "clean": cmd_clean,

earshot_cli-0.2.0/tests/conftest.py

@@ -0,0 +1,29 @@
+"""测试公共桩:headless CI(Linux 无音频栈)上 stub 掉 soundcard。
+
+soundcard 在无 PulseAudio 守护的环境 import 即挂(OSError: libpulse 缺失 /
+AssertionError: 无守护),而 capture.py 仅在函数内使用它——stub 成「调用即报错」
+的空模块。采集类测试本就不在 CI 跑,投递/向导/登录等纯逻辑测试不被 import 连坐。
+"""
+
+from __future__ import annotations
+
+import sys
+import types
+
+try:
+    import soundcard  # noqa: F401
+except Exception:  # OSError / AssertionError 均视为不可用
+    stub = types.ModuleType("soundcard")
+
+    def _unavailable(*_args: object, **_kwargs: object) -> object:
+        raise RuntimeError("soundcard 不可用(headless 环境 stub)")
+
+    for _name in (
+        "all_microphones",
+        "default_speaker",
+        "default_microphone",
+        "get_microphone",
+        "get_speaker",
+    ):
+        setattr(stub, _name, _unavailable)
+    sys.modules["soundcard"] = stub

earshot_cli-0.2.0/tests/test_auth.py

@@ -0,0 +1,94 @@
+"""设备流登录测试:全 mock 网络与浏览器,无真实请求。"""
+
+from __future__ import annotations
+
+import json
+from pathlib import Path
+
+import httpx
+import pytest
+
+from earshot.auth import device_login, save_credentials, verify_key
+
+
+def test_verify_key_three_branches() -> None:
+    """探活:200→True;401→False;网络错误→False(交给设备流)。"""
+    assert verify_key("https://x.test/", "sk_ok", getter=lambda url, headers: 200) is True
+    assert verify_key("https://x.test", "sk_bad", getter=lambda url, headers: 401) is False
+
+    def _raise(url: str, headers: dict[str, str]) -> int:
+        raise httpx.ConnectError("network down")
+
+    assert verify_key("https://x.test", "sk_x", getter=_raise) is False
+
+
+def test_device_login_pending_then_key() -> None:
+    """发起→pending 一次→拿到 key;verification_url 相对路径拼成绝对;浏览器被打开。"""
+    calls: list[str] = []
+    opened: list[str] = []
+
+    def poster(url: str, payload: dict[str, object]) -> dict[str, object]:
+        calls.append(url)
+        if url.endswith("/auth/device/code"):
+            return {
+                "device_code": "dc-1",
+                "user_code": "AB12-CD34",
+                "expires_in": 60,
+                "interval": 1,
+                "verification_url": "/ui/device",
+            }
+        if url.endswith("/auth/device/token"):
+            if len(calls) == 2:
+                raise httpx.HTTPStatusError(
+                    "pending",
+                    request=httpx.Request("POST", url),
+                    response=httpx.Response(400, json={"error": "authorization_pending"}),
+                )
+            return {"api_key": "sk_dev_1"}
+        raise AssertionError(f"意外请求: {url}")
+
+    def opener(url: str) -> bool:
+        opened.append(url)
+        return True
+
+    key = device_login(
+        "https://x.test",
+        poster=poster,
+        opener=opener,
+        sleeper=lambda s: None,
+    )
+    assert key == "sk_dev_1"
+    assert opened and "code=AB12-CD34" in opened[0], "相对 verification_url 应拼成带设备码的绝对地址"
+
+
+def test_device_login_expired_session() -> None:
+    """400 非 pending(expires)→ 明确报错会话过期。"""
+
+    def poster(url: str, payload: dict[str, object]) -> dict[str, object]:
+        if url.endswith("/auth/device/code"):
+            return {"device_code": "dc-x", "user_code": "AAAA-BBBB", "expires_in": 60, "interval": 1}
+        raise httpx.HTTPStatusError(
+            "expired", request=httpx.Request("POST", url), response=httpx.Response(400, json={"error": "expired_token"})
+        )
+
+    with pytest.raises(RuntimeError, match="过期"):
+        device_login("https://x.test", poster=poster, opener=lambda url: True, sleeper=lambda s: None)
+
+
+def test_save_credentials_merges_and_chmods(tmp_path: Path) -> None:
+    """写入保留既有其他字段;权限 0600;损坏旧文件可覆盖。"""
+    cfg = tmp_path / "config.json"
+    cfg.write_text(json.dumps({"base_url": "https://old.example", "extra": "keep"}), encoding="utf-8")
+
+    path = save_credentials("https://x.test/", "sk_new", config_path=cfg)
+    assert path == cfg
+    data = json.loads(cfg.read_text(encoding="utf-8"))
+    assert data["base_url"] == "https://x.test", "去尾斜杠且更新"
+    assert data["api_key"] == "sk_new"
+    assert data["extra"] == "keep", "既有其他字段保留"
+    assert cfg.stat().st_mode & 0o777 == 0o600
+
+    cfg.write_text("not-json", encoding="utf-8")
+    save_credentials("https://x.test", "sk_again", config_path=cfg)
+    data = json.loads(cfg.read_text(encoding="utf-8"))
+    assert data["api_key"] == "sk_again", "损坏旧文件可覆盖"

{earshot_cli-0.1.1 → earshot_cli-0.2.0}/tests/test_compose.py

@@ -54,7 +54,7 @@ def test_derive_title_no_content() -> None:
 
 def test_add_punctuation_by_timing() -> None:
     segs = [
-        _seg(0.0, 2.0, "想理解递归"),      # 与下一段间隔 0.2s → 逗号
+        _seg(0.0, 2.0, "想理解递归"),  # 与下一段间隔 0.2s → 逗号
         _seg(2.2, 4.0, "你得先理解递归"),  # 与下一段间隔 1.5s → 句号
         _seg(5.5, 7.0, "这句话像个玩笑"),  # 末段 → 句号
     ]

{earshot_cli-0.1.1 → earshot_cli-0.2.0}/tests/test_deliver_api.py

@@ -135,7 +135,13 @@ def test_deliver_api_passes_source_url(tmp_path: Path) -> None:
         return {"status": "done", "entities": 1}
 
     result = deliver_exomind_api(
-        md, "t", [], _settings(), poster=poster, getter=getter, poll_interval_s=0,
+        md,
+        "t",
+        [],
+        _settings(),
+        poster=poster,
+        getter=getter,
+        poll_interval_s=0,
         source_url="https://www.bilibili.com/video/BV16qpF64E6V/",
     )
     assert result.status == "delivered"

{earshot_cli-0.1.1 → earshot_cli-0.2.0}/tests/test_extract.py

@@ -6,15 +6,19 @@ from pathlib import Path
 
 import pytest
 
-from earshot.extract import ffmpeg_available, to_wav16k, wav_duration
+from earshot.extract import ffmpeg_available, ffmpeg_exe, to_wav16k, wav_duration
 
 pytestmark = pytest.mark.skipif(not ffmpeg_available(), reason="本机无 ffmpeg")
 
 
 def _make_sine(path: Path, seconds: float = 1.0, rate: int = 44100, channels: int = 2) -> None:
+    # 用 ffmpeg_exe() 而非裸 "ffmpeg":CI 无系统 ffmpeg 时 fallback 到 imageio-ffmpeg
+    # wheel 内置二进制(ffmpeg_available()=True 使 skipif 不触发,裸调反而找不到)
+    exe = ffmpeg_exe()
+    assert exe is not None
     subprocess.run(
         [
-            "ffmpeg",
+            exe,
             "-hide_banner",
             "-loglevel",
             "error",
@@ -46,9 +50,11 @@ def test_to_wav16k_downmixes_and_resamples(tmp_path: Path) -> None:
 
 def test_to_wav16k_accepts_video_container(tmp_path: Path) -> None:
     src = tmp_path / "in.mp4"
+    exe = ffmpeg_exe()
+    assert exe is not None
     subprocess.run(
         [
-            "ffmpeg",
+            exe,
             "-hide_banner",
             "-loglevel",
             "error",