nous-genai 0.1.0__tar.gz → 0.1.2__tar.gz

{nous_genai-0.1.0/nous_genai.egg-info → nous_genai-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nous-genai
-Version: 0.1.0
+Version: 0.1.2
 Summary: Single-endpoint GenAI SDK (multi-provider, multimodal)
 License-Expression: Apache-2.0
 Project-URL: Homepage, https://github.com/gravtice/nous-genai
@@ -168,6 +168,11 @@ If you need to write to file, see `examples/demo.py` (`_write_binary()`), or reu
 uv run genai --model openai:gpt-4o-mini --prompt "Hello"
 uv run genai model available --all
 
+# Tuzi Chirp music
+uv run genai --model tuzi-web:chirp-v3-5 --prompt "Lo-fi hiphop beat, 30s" --no-wait
+# ...later
+uv run genai --model tuzi-web:chirp-v3-5 --job-id "<job_id>" --output-path demo_suno.mp3 --timeout-ms 600000
+
 # MCP Server
 uv run genai-mcp-server                    # Streamable HTTP: /mcp, SSE: /sse
 uv run genai-mcp-cli tools                 # Debug CLI

{nous_genai-0.1.0 → nous_genai-0.1.2}/README.md

@@ -151,6 +151,11 @@ If you need to write to file, see `examples/demo.py` (`_write_binary()`), or reu
 uv run genai --model openai:gpt-4o-mini --prompt "Hello"
 uv run genai model available --all
 
+# Tuzi Chirp music
+uv run genai --model tuzi-web:chirp-v3-5 --prompt "Lo-fi hiphop beat, 30s" --no-wait
+# ...later
+uv run genai --model tuzi-web:chirp-v3-5 --job-id "<job_id>" --output-path demo_suno.mp3 --timeout-ms 600000
+
 # MCP Server
 uv run genai-mcp-server                    # Streamable HTTP: /mcp, SSE: /sse
 uv run genai-mcp-cli tools                 # Debug CLI

{nous_genai-0.1.0 → nous_genai-0.1.2}/nous/genai/_internal/capability_rules.py

@@ -63,7 +63,6 @@ _TTS_PREFIX: Final[str] = "tts-"
 _TTS_SUFFIX: Final[str] = "-tts"
 _VOICE_SUFFIXES: Final[tuple[str, ...]] = ("-voice", "_voice")
 _ADVANCED_VOICE_MODEL: Final[str] = "advanced-voice"
-_SUNO_PREFIX: Final[str] = "suno-"
 _CHIRP_PREFIX: Final[str] = "chirp-"
 
 _WHISPER_PREFIX: Final[str] = "whisper-"
@@ -223,7 +222,6 @@ def is_tts_model(model_id: str) -> bool:
     mid_l = _norm(model_id)
     return (
         mid_l.startswith(_TTS_PREFIX)
-        or mid_l.startswith(_SUNO_PREFIX)
         or mid_l.startswith(_CHIRP_PREFIX)
         or mid_l.endswith(_TTS_SUFFIX)
         or mid_l.endswith(_VOICE_SUFFIXES)

{nous_genai-0.1.0 → nous_genai-0.1.2}/nous/genai/cli.py

@@ -109,6 +109,15 @@ def main(argv: list[str] | None = None) -> None:
     parser.add_argument("--video-path", help="Input video file path")
     parser.add_argument("--output-path", help="Write output to file (text/json/binary)")
     parser.add_argument("--ouput-path", dest="output_path", help=argparse.SUPPRESS)
+    parser.add_argument(
+        "--job-id",
+        help="Resume/poll a provider job id (tuzi-web only for now); ignores --prompt/--*-path",
+    )
+    parser.add_argument(
+        "--no-wait",
+        action="store_true",
+        help="Do not wait for job completion (returns job_id if supported)",
+    )
     parser.add_argument(
         "--timeout-ms",
         type=int,
@@ -184,7 +193,25 @@ def main(argv: list[str] | None = None) -> None:
         except BrokenPipeError:
             return
 
+    client = Client()
     provider, model_id = _split_model(args.model)
+    _apply_protocol_override(client, provider=provider, protocol=args.protocol)
+
+    cap = client.capabilities(args.model)
+    output = _infer_output_spec(provider=provider, model_id=model_id, cap=cap)
+
+    if args.job_id:
+        _run_job(
+            client,
+            provider=provider,
+            model_id=model_id,
+            job_id=str(args.job_id),
+            output=output,
+            output_path=args.output_path,
+            timeout_ms=timeout_ms,
+        )
+        return
+
     prompt = args.prompt
     if prompt is None and args.prompt_path:
         try:
@@ -192,11 +219,6 @@ def main(argv: list[str] | None = None) -> None:
                 prompt = f.read()
         except OSError as e:
             raise SystemExit(f"cannot read --prompt-path: {e}") from None
-    client = Client()
-    _apply_protocol_override(client, provider=provider, protocol=args.protocol)
-
-    cap = client.capabilities(args.model)
-    output = _infer_output_spec(provider=provider, model_id=model_id, cap=cap)
 
     parts = _build_input_parts(
         prompt=prompt,
@@ -212,7 +234,7 @@ def main(argv: list[str] | None = None) -> None:
         model=args.model,
         input=[Message(role="user", content=parts)],
         output=output,
-        wait=True,
+        wait=not bool(getattr(args, "no_wait", False)),
     )
     if timeout_ms is not None:
         req = replace(req, params=replace(req.params, timeout_ms=timeout_ms))
@@ -229,21 +251,37 @@ def main(argv: list[str] | None = None) -> None:
             if resp.job and resp.job.job_id:
                 print(resp.job.job_id)
                 if resp.status == "running":
-                    effective_timeout_ms = timeout_ms
-                    if effective_timeout_ms is None:
-                        effective_timeout_ms = getattr(
-                            client, "_default_timeout_ms", None
+                    status_note = ""
+                    if resp.job.last_status:
+                        status_note += f" upstream_status={resp.job.last_status}"
+                    if resp.job.last_detail:
+                        d = resp.job.last_detail
+                        if len(d) > 200:
+                            d = d[:200] + "..."
+                        status_note += f" fail_reason={d}"
+                    if not req.wait:
+                        print(
+                            "[INFO] 已提交任务（未等待完成）；已返回 job_id。"
+                            f"可用 --job-id {resp.job.job_id} 继续轮询/下载。",
+                            file=sys.stderr,
+                        )
+                    else:
+                        effective_timeout_ms = timeout_ms
+                        if effective_timeout_ms is None:
+                            effective_timeout_ms = getattr(
+                                client, "_default_timeout_ms", None
+                            )
+                        timeout_note = (
+                            f"{effective_timeout_ms}ms"
+                            if isinstance(effective_timeout_ms, int)
+                            else "timeout"
+                        )
+                        print(
+                            f"[INFO] 任务仍在运行（等待 {elapsed_s:.1f}s，可能已超时 {timeout_note}）；已返回 job_id。"
+                            f"可用 --job-id {resp.job.job_id} 继续轮询/下载，或增大 --timeout-ms 重试。"
+                            f"{status_note}",
+                            file=sys.stderr,
                         )
-                    timeout_note = (
-                        f"{effective_timeout_ms}ms"
-                        if isinstance(effective_timeout_ms, int)
-                        else "timeout"
-                    )
-                    print(
-                        f"[INFO] 任务仍在运行（等待 {elapsed_s:.1f}s，可能已超时 {timeout_note}）；已返回 job_id。"
-                        "可增大 --timeout-ms 或设置 NOUS_GENAI_TIMEOUT_MS 后重试。",
-                        file=sys.stderr,
-                    )
                     if args.output_path:
                         print(
                             f"[INFO] 未写入输出文件：{args.output_path}",
@@ -275,6 +313,122 @@ _DEFAULT_VIDEO_URL = (
 )
 
 
+def _run_job(
+    client: Client,
+    *,
+    provider: str,
+    model_id: str,
+    job_id: str,
+    output: OutputSpec,
+    output_path: str | None,
+    timeout_ms: int | None,
+) -> None:
+    provider = provider.strip().lower()
+    if provider != "tuzi-web":
+        raise SystemExit("--job-id only supported for provider=tuzi-web for now")
+
+    job_id = job_id.strip()
+    if not job_id:
+        raise SystemExit("--job-id must be non-empty")
+
+    adapter = client._adapter(provider)
+    from .providers import TuziAdapter
+
+    if not isinstance(adapter, TuziAdapter):
+        raise SystemExit("tuzi-web adapter not configured")
+
+    effective_timeout_ms = timeout_ms
+    if effective_timeout_ms is None:
+        effective_timeout_ms = getattr(client, "_default_timeout_ms", None)
+    if effective_timeout_ms is None:
+        effective_timeout_ms = 120_000
+
+    modalities = set(output.modalities)
+    mid_l = model_id.lower().strip()
+    is_chirp_music = (
+        modalities == {"audio"} and mid_l.startswith("chirp-") and mid_l != "chirp-v3"
+    )
+    if not is_chirp_music:
+        raise SystemExit("--job-id only supports tuzi-web chirp-* audio tasks for now")
+
+    def fn():
+        try:
+            host = adapter._base_host()
+            probe = adapter._suno_feed(
+                host=host,
+                ids=job_id,
+                timeout_ms=min(10_000, int(effective_timeout_ms)),
+            )
+            clips = probe.get("clips")
+            clip_found = bool(
+                isinstance(clips, list)
+                and any(
+                    isinstance(c, dict)
+                    and isinstance(c.get("id"), str)
+                    and c.get("id") == job_id
+                    for c in clips
+                )
+            )
+            if clip_found:
+                return adapter._suno_wait_feed_audio(
+                    clip_id=job_id,
+                    model_id=model_id,
+                    timeout_ms=effective_timeout_ms,
+                    wait=True,
+                )
+        except Exception:
+            pass
+        return adapter._suno_wait_fetch_audio(
+            task_id=job_id,
+            model_id=model_id,
+            timeout_ms=effective_timeout_ms,
+            wait=True,
+        )
+
+    show_progress = sys.stderr.isatty()
+    resp, elapsed_s = _run_with_spinner(fn, enabled=show_progress, label="等待任务完成")
+
+    if resp.status != "completed":
+        if resp.job and resp.job.job_id:
+            print(resp.job.job_id)
+            if resp.status == "running":
+                status_note = ""
+                if resp.job.last_status:
+                    status_note += f" upstream_status={resp.job.last_status}"
+                if resp.job.last_detail:
+                    d = resp.job.last_detail
+                    if len(d) > 200:
+                        d = d[:200] + "..."
+                    status_note += f" fail_reason={d}"
+                timeout_note = (
+                    f"{effective_timeout_ms}ms"
+                    if isinstance(effective_timeout_ms, int)
+                    else "timeout"
+                )
+                print(
+                    f"[INFO] 任务仍在运行（等待 {elapsed_s:.1f}s，可能已超时 {timeout_note}）；已返回 job_id。"
+                    f"可稍后重试 --job-id。{status_note}",
+                    file=sys.stderr,
+                )
+                if output_path:
+                    print(f"[INFO] 未写入输出文件：{output_path}", file=sys.stderr)
+        else:
+            raise SystemExit(f"[FAIL]: request status={resp.status}")
+        return
+
+    if not resp.output:
+        raise SystemExit("[FAIL]: missing output")
+    _write_response(
+        resp.output[0].content,
+        output=output,
+        output_path=output_path,
+        timeout_ms=timeout_ms,
+        download_auth=_download_auth(client, provider=provider),
+    )
+    if show_progress:
+        print(f"[INFO] 完成，用时 {elapsed_s:.1f}s", file=sys.stderr)
+
+
 def _run_probe(args: argparse.Namespace, *, timeout_ms: int | None) -> int:
     from .client import _normalize_provider
     from .reference import get_sdk_supported_models_for_provider