stock-weekly-report 0.1.9 → 0.2.1

package/cli.py

@@ -17,7 +17,6 @@ Usage:
 
 import os
 import re
-import shutil
 import smtplib
 import subprocess
 import sys
@@ -90,24 +89,6 @@ def _write_zprofile_var(var_name: str, value: str) -> None:
     zprofile.write_text(content, encoding="utf-8")
 
 
-def _detect_nlm() -> str:
-    """Auto-detect the nlm binary path. Returns '' if not found."""
-    # 1. Check PATH
-    found = shutil.which("nlm")
-    if found:
-        return found
-    # 2. Check common install locations
-    candidates = [
-        "~/.local/bin/nlm",
-        "/usr/local/bin/nlm",
-        "/opt/homebrew/bin/nlm",
-    ]
-    for candidate in candidates:
-        expanded = Path(candidate).expanduser()
-        if expanded.exists():
-            return str(expanded)
-    return ""
-
 
 def _install_cron_job(schedule: str) -> None:
     run_sh = PROJECT_ROOT / "run.sh"
@@ -151,12 +132,15 @@ def init(ctx):
 
     # 0. Project root (where pipeline.py and venv/ live)
     cwd = Path.cwd()
+    saved_root = cfg.get("project_root", "")
     if (cwd / "pipeline.py").exists():
         suggested_root = str(cwd)
+    elif saved_root and (Path(saved_root) / "pipeline.py").exists():
+        suggested_root = saved_root
     elif (PROJECT_ROOT / "pipeline.py").exists():
         suggested_root = str(PROJECT_ROOT)
     else:
-        suggested_root = cfg.get("project_root", str(PROJECT_ROOT))
+        suggested_root = saved_root or ""
     project_root_input = click.prompt("Project root [required]", default=suggested_root)
     project_root_path = Path(project_root_input).expanduser().resolve()
     if not (project_root_path / "pipeline.py").exists():
@@ -168,21 +152,21 @@ def init(ctx):
     default_folder = cfg.get("parent_folder", str(Path.home() / "swr-data"))
     parent_folder = click.prompt("Data folder path [required]", default=default_folder)
 
-    # 2. nlm binary path (optional — only needed for NotebookLM upload stage)
-    saved_nlm = cfg.get("nlm_path", "")
-    default_nlm = (saved_nlm if saved_nlm and Path(saved_nlm).exists() else None) or _detect_nlm()
-    click.echo("  (nlm is only needed for the NotebookLM upload stage; use --skip-upload to bypass)")
-    nlm_path = click.prompt("nlm binary path [optional, leave blank to skip]", default=default_nlm or "")
-    nlm_path = nlm_path.strip()
-    if nlm_path:
-        nlm_path_expanded = str(Path(nlm_path).expanduser())
-        if Path(nlm_path_expanded).exists():
-            click.echo(f"  ✓ nlm found at {nlm_path_expanded}")
-        else:
-            click.echo(f"  ! nlm not found at {nlm_path_expanded} — fix this before using the upload stage")
+    # 2. nlm — installed automatically by postinstall; check auth status
+    nlm_path_expanded = cfg.get("nlm_path", "")
+    if nlm_path_expanded and Path(nlm_path_expanded).exists():
+        click.echo(f"  ✓ nlm found at {nlm_path_expanded}")
+        auth_ok = subprocess.run(
+            [nlm_path_expanded, "login", "--check"],
+            capture_output=True,
+        ).returncode == 0
+        if auth_ok:
+            click.echo("  ✓ nlm already authenticated")
+        elif click.confirm("  Log in to NotebookLM now? [optional — needed for upload stage]", default=True):
+            subprocess.run([nlm_path_expanded, "login"], check=False)
     else:
-        nlm_path_expanded = ""
-        click.echo("  Skipped — use --skip-upload when running the pipeline.")
+        click.echo("  ! nlm not found — run: swr config set nlm_path /path/to/nlm")
+        click.echo("    (or reinstall: npm install -g stock-weekly-report)")
 
     # 3. SMTP password → ~/.zprofile (optional)
     existing_password = os.environ.get("EMAIL_SMTP_PASSWORD", "")
@@ -277,7 +261,6 @@ def init(ctx):
     cfg.update({
         "project_root": str(project_root_path),
         "parent_folder": parent_folder,
-        "nlm_path": nlm_path_expanded,
         "email": email_cfg,
         "retention": {
             "audio_months": audio_months,
@@ -581,6 +564,26 @@ def config_set(ctx, key, value):
     click.echo(f"Set {key} = {obj[leaf]}")
 
 
+# ─── nlm-login ────────────────────────────────────────────────────────────────
+
+@main.command("nlm-login")
+@click.pass_context
+def nlm_login_cmd(ctx):
+    """Log in to NotebookLM (browser OAuth). Run once, or again if auth expires."""
+    cfg = _load_cfg(ctx.obj["config"])
+    nlm_path = cfg.get("nlm_path", "")
+    if not nlm_path or not Path(nlm_path).exists():
+        click.echo("Error: nlm not found. Set it with: swr config set nlm_path /path/to/nlm", err=True)
+        sys.exit(1)
+    auth_ok = subprocess.run([nlm_path, "login", "--check"], capture_output=True).returncode == 0
+    if auth_ok:
+        click.echo("Already authenticated. Use --force to re-login.")
+        if not click.confirm("Re-login anyway?", default=False):
+            return
+    result = subprocess.run([nlm_path, "login"], check=False)
+    sys.exit(result.returncode)
+
+
 # ─── mcp ──────────────────────────────────────────────────────────────────────
 
 @main.command("mcp")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stock-weekly-report",
-  "version": "0.1.9",
+  "version": "0.2.1",
   "description": "Stock weekly podcast report pipeline — CLI and MCP server",
   "bin": {
     "swr": "bin/swr.js",

package/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "stock-weekly-report"
-version = "0.1.9"
+version = "0.2.1"
 requires-python = ">=3.10"
 authors = [
     { name = "Chang Yu Chuan", email = "changyuchuanmicron@gmail.com" },

package/requirements.txt

@@ -5,8 +5,10 @@ tqdm>=4.0
 faster-whisper>=1.0
 markdown>=3.0
 click>=8.0
-# notebooklm-mcp-cli is not on PyPI — install separately:
-#   pip install notebooklm-mcp-cli  (or use the pre-installed binary at nlm_path in config.yaml)
+# notebooklm-mcp-cli requires Python >=3.11 — install into the CLI venv, not the pipeline venv:
+#   ~/.config/swr/venv/bin/pip install notebooklm-mcp-cli
+# Then set nlm_path in config:
+#   swr config set nlm_path ~/.config/swr/venv/bin/nlm
 
 # CLI + MCP entry points require Python >=3.10; install via:
 #   venv14/bin/pip install -e .

package/scripts/postinstall.js

@@ -72,8 +72,44 @@ try {
 
   const pip = path.join(VENV, "bin", "pip");
   execFileSync(pip, ["install", "."], { stdio: "inherit", cwd: ROOT });
+  execFileSync(pip, ["install", "notebooklm-mcp-cli"], { stdio: "inherit", cwd: ROOT });
 
   fs.writeFileSync(VERSION_FILE, CURRENT_VER + "\n", "utf8");
+
+  // ── Set project_root in config if not already pointing to a valid location ─
+  const configPath = path.join(SWR_DIR, "config.yaml");
+  let needsProjectRoot = true;
+  if (fs.existsSync(configPath)) {
+    const content = fs.readFileSync(configPath, "utf8");
+    const match = content.match(/^project_root:\s*(.+)$/m);
+    if (match) {
+      const existing = match[1].trim().replace(/^['"]|['"]$/g, "");
+      if (fs.existsSync(path.join(existing, "pipeline.py"))) {
+        needsProjectRoot = false;
+      }
+    }
+  }
+  if (needsProjectRoot) {
+    execFileSync(SWR_BIN, ["config", "set", "project_root", ROOT], { stdio: "inherit" });
+    console.log(`swr: Set project_root to ${ROOT}`);
+  }
+
+  // ── Set nlm_path if not already pointing to a working binary ─────────────
+  const nlmBin = path.join(VENV, "bin", "nlm");
+  let needsNlmPath = true;
+  if (fs.existsSync(configPath)) {
+    const content = fs.readFileSync(configPath, "utf8");
+    const match = content.match(/^nlm_path:\s*(.+)$/m);
+    if (match) {
+      const existing = match[1].trim().replace(/^['"]|['"]$/g, "");
+      if (fs.existsSync(existing)) needsNlmPath = false;
+    }
+  }
+  if (needsNlmPath && fs.existsSync(nlmBin)) {
+    execFileSync(SWR_BIN, ["config", "set", "nlm_path", nlmBin], { stdio: "inherit" });
+    console.log(`swr: Set nlm_path to ${nlmBin}`);
+  }
+
   console.log(`\nswr: Setup complete (v${CURRENT_VER}). Run \`swr --help\` to get started.\n`);
 } catch (err) {
   console.error("\nswr postinstall failed:", err.message);