svc-infra 0.1.624__tar.gz → 0.1.626__tar.gz

{svc_infra-0.1.624 → svc_infra-0.1.626}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: svc-infra
-Version: 0.1.624
+Version: 0.1.626
 Summary: Infrastructure for building and deploying prod-ready services
 License: MIT
 Keywords: fastapi,sqlalchemy,alembic,auth,infra,async,pydantic

{svc_infra-0.1.624 → svc_infra-0.1.626}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "svc-infra"
-version = "0.1.624"
+version = "0.1.626"
 description = "Infrastructure for building and deploying prod-ready services"
 authors = ["Ali Khatami <aliikhatami94@gmail.com>"]
 license = "MIT"

{svc_infra-0.1.624 → svc_infra-0.1.626}/src/svc_infra/cli/cmds/docs/docs_cmds.py

@@ -51,29 +51,17 @@ def _discover_pkg_topics() -> Dict[str, Path]:
 def _resolve_docs_dir(ctx: click.Context) -> Path | None:
     """
     Optional override precedence:
-      1) --docs-dir CLI option
-      2) SVC_INFRA_DOCS_DIR env var
-      3) *Only when working inside the svc-infra repo itself*: repo-root /docs
+      1) SVC_INFRA_DOCS_DIR env var
+      2) *Only when working inside the svc-infra repo itself*: repo-root /docs
     """
-    # 1) CLI option on this or parent contexts
-    current: click.Context | None = ctx
-    while current is not None:
-        docs_dir_opt = (current.params or {}).get("docs_dir")
-        if docs_dir_opt:
-            path = docs_dir_opt if isinstance(docs_dir_opt, Path) else Path(docs_dir_opt)
-            path = path.expanduser()
-            if path.exists():
-                return path
-        current = current.parent
-
-    # 2) Env var
+    # 1) Env var
     env_dir = os.getenv("SVC_INFRA_DOCS_DIR")
     if env_dir:
         p = Path(env_dir).expanduser()
         if p.exists():
             return p
 
-    # 3) In-repo convenience (so `svc-infra docs` works inside this repo)
+    # 2) In-repo convenience (so `svc-infra docs` works inside this repo)
     try:
         root = resolve_project_root()
         proj_docs = root / "docs"
@@ -130,46 +118,9 @@ def register(app: typer.Typer) -> None:
     docs_app = typer.Typer(no_args_is_help=True, add_completion=False, cls=DocsGroup)
 
     @docs_app.callback(invoke_without_command=True)
-    def _docs_options(
-        docs_dir: Path | None = typer.Option(
-            None,
-            "--docs-dir",
-            help="Path to a docs directory to read from (overrides packaged docs)",
-        ),
-        topic: str | None = typer.Option(None, "--topic", help="Topic to show directly"),
-    ) -> None:
-        if topic:
-            key = _norm(topic)
-            ctx = click.get_current_context()
-            dir_to_use = _resolve_docs_dir(ctx)
-            fs = _discover_fs_topics(dir_to_use) if dir_to_use else {}
-            if key in fs:
-                typer.echo(fs[key].read_text(encoding="utf-8", errors="replace"))
-                raise typer.Exit(code=0)
-            pkg = _discover_pkg_topics()
-            if key in pkg:
-                typer.echo(pkg[key].read_text(encoding="utf-8", errors="replace"))
-                raise typer.Exit(code=0)
-            raise typer.BadParameter(f"Unknown topic: {topic}")
-
-    @docs_app.command("list", help="List available documentation topics")
-    def list_topics() -> None:
-        ctx = click.get_current_context()
-        dir_to_use = _resolve_docs_dir(ctx)
-        fs = _discover_fs_topics(dir_to_use) if dir_to_use else {}
-        pkg = _discover_pkg_topics()
-
-        def _print(name: str, path: Path) -> None:
-            try:
-                typer.echo(f"{name}\t{path}")
-            except Exception:
-                typer.echo(name)
-
-        for name, path in fs.items():
-            _print(name, path)
-        for name, path in pkg.items():
-            if name not in fs:
-                _print(name, path)
+    def _docs_options() -> None:
+        # No group-level options; dynamic commands and 'show' handle topics.
+        return None
 
     @docs_app.command("show", help="Show docs for a topic (alternative to dynamic subcommand)")
     def show(topic: str) -> None:

{svc_infra-0.1.624 → svc_infra-0.1.626}/src/svc_infra/cli/cmds/help.py

@@ -21,4 +21,8 @@ How to run (pick what fits your workflow):
 Notes:
 * Make sure you’re in the right virtual environment (or use `pipx`).
 * You can point `--project-root` at your Alembic root; if omitted we auto-detect.
+
+Learn more:
+* Explore available topics: `svc-infra docs --help`
+* Show a topic directly: `svc-infra docs <topic>` or `svc-infra docs show <topic>`
 """

{svc_infra-0.1.624 → svc_infra-0.1.626}/src/svc_infra/mcp/svc_infra_mcp.py

@@ -20,6 +20,25 @@ async def svc_infra_cmd_help() -> dict:
     return await cli_cmd_help(CLI_PROG)
 
 
+# No dedicated 'docs list' function — users can use 'docs --help' to discover topics.
+
+
+async def svc_infra_docs_help() -> dict:
+    """
+    Run 'svc-infra docs --help' and return its output.
+    Prepares the project environment and executes from the repo root so
+    environment-provided docs directories and local topics are discoverable.
+    """
+    root = prepare_env()
+    text = await run_from_root(root, CLI_PROG, ["docs", "--help"])
+    return {
+        "ok": True,
+        "action": "docs_help",
+        "project_root": str(root),
+        "help": text,
+    }
+
+
 class Subcommand(str, Enum):
     # SQL group commands
     sql_init = "sql init"
@@ -52,7 +71,7 @@ class Subcommand(str, Enum):
     obs_scaffold = "obs scaffold"
 
     # Docs group
-    docs_list = "docs list"
+    docs_help = "docs --help"
     docs_show = "docs show"
 
     # DX group
@@ -95,8 +114,11 @@ mcp = mcp_from_functions(
     functions=[
         svc_infra_cmd_help,
         svc_infra_subcmd_help,
+        svc_infra_docs_help,
+        # Docs listing is available via 'docs --help'; no separate MCP function needed.
     ],
 )
 
+
 if __name__ == "__main__":
     mcp.run(transport="stdio")