svc-infra 0.1.625__py3-none-any.whl → 0.1.626__py3-none-any.whl

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/cli/cmds/help.py

@@ -23,6 +23,6 @@ Notes:
 * You can point `--project-root` at your Alembic root; if omitted we auto-detect.
 
 Learn more:
-* For full integration guides and all topics, run: `svc-infra docs list`
-* To explore docs commands, run: `svc-infra docs --help`
+* Explore available topics: `svc-infra docs --help`
+* Show a topic directly: `svc-infra docs <topic>` or `svc-infra docs show <topic>`
 """

svc_infra/mcp/svc_infra_mcp.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from enum import Enum
 
-from ai_infra.llm.tools.custom.cli import cli_cmd_help, cli_subcmd_help, run_cli
+from ai_infra.llm.tools.custom.cli import cli_cmd_help, cli_subcmd_help
 from ai_infra.mcp.server.tools import mcp_from_functions
 
 from svc_infra.app.env import prepare_env
@@ -20,22 +20,22 @@ async def svc_infra_cmd_help() -> dict:
     return await cli_cmd_help(CLI_PROG)
 
 
-async def svc_infra_docs_list() -> dict:
-    """Run `svc-infra docs list` and return its output.
+# No dedicated 'docs list' function — users can use 'docs --help' to discover topics.
 
-    Uses run_cli with the project root as cwd; falls back to run_from_root if needed.
+
+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()
-    try:
-        text = await run_cli(CLI_PROG, ["docs", "list"], cwd=str(root))
-    except TypeError:
-        # Fallback for older run_cli signatures
-        text = await run_from_root(root, CLI_PROG, ["docs", "list"])
+    text = await run_from_root(root, CLI_PROG, ["docs", "--help"])
     return {
         "ok": True,
-        "action": "docs_list",
+        "action": "docs_help",
         "project_root": str(root),
-        "output": text,
+        "help": text,
     }
 
 
@@ -71,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
@@ -114,12 +114,8 @@ mcp = mcp_from_functions(
     functions=[
         svc_infra_cmd_help,
         svc_infra_subcmd_help,
-        svc_infra_docs_list,
-        # Utility: list docs topics via `svc-infra docs list`
-        # Exposed as a dedicated MCP function for quick discovery in clients.
-        # See: svc_infra.cli.cmds.docs.docs_cmds
-        # NOTE: Prefer run_cli with cwd=project root; fallback to run_from_root if signature differs.
-        # Implemented as an inline wrapper to keep the API surface minimal.
+        svc_infra_docs_help,
+        # Docs listing is available via 'docs --help'; no separate MCP function needed.
     ],
 )
 

{svc_infra-0.1.625.dist-info → svc_infra-0.1.626.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: svc-infra
-Version: 0.1.625
+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.625.dist-info → svc_infra-0.1.626.dist-info}/RECORD

@@ -142,10 +142,10 @@ svc_infra/cli/cmds/db/sql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 svc_infra/cli/cmds/db/sql/alembic_cmds.py,sha256=uCreHg69Zf6B5gbv9Dm39jCRk6q2KQy_05A-75IP0Fg,9650
 svc_infra/cli/cmds/db/sql/sql_export_cmds.py,sha256=YpkguUJFeFApMphVkhOJllTi25ejlsQaJarMe6vJD54,2685
 svc_infra/cli/cmds/db/sql/sql_scaffold_cmds.py,sha256=MKc_T_tY1Y_wQl7XTlq8GhYWMMI1q1_vcFZVPOEcNUg,4601
-svc_infra/cli/cmds/docs/docs_cmds.py,sha256=Gyi0cr22-SY8kThAutRSzW9LmZ1ek9LTpwFpvlclKWM,6407
+svc_infra/cli/cmds/docs/docs_cmds.py,sha256=kvrBLeAvkv1lx_6TzvY_ciC9NJNBMNbmH0-wzA9LeHo,4501
 svc_infra/cli/cmds/dx/__init__.py,sha256=wQtl3-kOgoESlpVkjl3YFtqkOnQSIvVsOdutiaZFejM,197
 svc_infra/cli/cmds/dx/dx_cmds.py,sha256=XTKUJzS3UIYn6h3CHzDEWKYJaWn0TzGiUCq3OeW27E0,3326
-svc_infra/cli/cmds/help.py,sha256=kNbaWkppGfEiWUhOwekAMDr3DEkOUzXGyrNLSR3T5qI,901
+svc_infra/cli/cmds/help.py,sha256=a_U0MbzBTAs4WHO0e8GcdFwLUA8O5mzVXTxpyelhtiU,906
 svc_infra/cli/cmds/jobs/__init__.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
 svc_infra/cli/cmds/jobs/jobs_cmds.py,sha256=l-w5GuR82GWR_F1CA7WPYAM895XBD8TQj_hZ6retBv0,1252
 svc_infra/cli/cmds/obs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -257,7 +257,7 @@ svc_infra/jobs/redis_queue.py,sha256=wgmWKslF1dkYscJe49UgUX7gwEuGyOUWEb0-pn82I3g
 svc_infra/jobs/scheduler.py,sha256=dTUEEyEuTVHNmJT8wPdMu4YjnTN7R_YW67gtCKpqC7M,1180
 svc_infra/jobs/worker.py,sha256=T2A575_mnieJHPOYU_FseubLA_HQf9pB4CkRgzRJBHU,694
 svc_infra/mcp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-svc_infra/mcp/svc_infra_mcp.py,sha256=xz67oXIoEOZaFbyRn3_uda-SXmruOXtyF0OZuLX_LnA,3771
+svc_infra/mcp/svc_infra_mcp.py,sha256=ELX4jUOrHa55asCu7q4jhDvfB9EFPNwogqX3fnSa-z0,3489
 svc_infra/obs/README.md,sha256=pmd6AyFZW3GCCi0sr3uTHrPj5KgAI8rrXw8QPkrf1R8,8021
 svc_infra/obs/__init__.py,sha256=t5DgkiuuhHnfAHChzYqCI1-Fpr68iQ0A1nHOLFIlAuM,75
 svc_infra/obs/add.py,sha256=Qa8pswZDxspIn3oniqe8NYeHmVhFwiYOYxF9xNAyCOs,4016
@@ -325,7 +325,7 @@ svc_infra/webhooks/fastapi.py,sha256=BCNvGNxukf6dC2a4i-6en-PrjBGV19YvCWOot5lXWsA
 svc_infra/webhooks/router.py,sha256=6JvAVPMEth_xxHX-IsIOcyMgHX7g1H0OVxVXKLuMp9w,1596
 svc_infra/webhooks/service.py,sha256=hWgiJRXKBwKunJOx91C7EcLUkotDtD3Xp0RT6vj2IC0,1797
 svc_infra/webhooks/signing.py,sha256=NCwdZzmravUe7HVIK_uXK0qqf12FG-_MVsgPvOw6lsM,784
-svc_infra-0.1.625.dist-info/METADATA,sha256=gSopiurNf48SuyU4cG8H92kkgvZuB0XL51RKDZiohy4,8748
-svc_infra-0.1.625.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-svc_infra-0.1.625.dist-info/entry_points.txt,sha256=6x_nZOsjvn6hRZsMgZLgTasaCSKCgAjsGhACe_CiP0U,48
-svc_infra-0.1.625.dist-info/RECORD,,
+svc_infra-0.1.626.dist-info/METADATA,sha256=OC4P-US0KYQFiLZZflkU5ndhPHcj4F0RhM1MxK0PBK0,8748
+svc_infra-0.1.626.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+svc_infra-0.1.626.dist-info/entry_points.txt,sha256=6x_nZOsjvn6hRZsMgZLgTasaCSKCgAjsGhACe_CiP0U,48
+svc_infra-0.1.626.dist-info/RECORD,,