svc-infra 0.1.617__py3-none-any.whl → 0.1.618__py3-none-any.whl

svc_infra/cli/cmds/docs/docs_cmds.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import os
+from importlib.metadata import PackageNotFoundError, distribution
 from pathlib import Path
 from typing import Dict, List
 
@@ -20,9 +21,35 @@ def _discover_fs_topics(docs_dir: Path) -> Dict[str, Path]:
     return topics
 
 
-def _discover_pkg_topics() -> Dict[str, object]:
-    # No bundled fallback; docs are packaged from repo root 'docs/'
-    return {}
+def _discover_pkg_topics() -> Dict[str, Path]:
+    """Discover docs packaged under 'docs/' in the installed distribution.
+
+    This lets 'svc-infra docs' work from external projects that don't have a
+    local docs/ directory by falling back to files shipped in the wheel.
+    """
+    topics: Dict[str, Path] = {}
+    try:
+        dist = distribution("svc-infra")
+    except PackageNotFoundError:
+        return topics
+
+    files = getattr(dist, "files", None) or []
+    for f in files:
+        # f is a PackagePath; string form like 'docs/topic.md'
+        s = str(f)
+        if not s.startswith("docs/") or not s.endswith(".md"):
+            continue
+        name = Path(s).stem.replace(" ", "-")
+        try:
+            abs_path = dist.locate_file(f)
+            # Ensure it's a file before adding
+            abs_p = Path(abs_path)
+            if abs_p.exists() and abs_p.is_file():
+                topics[name] = abs_p
+        except Exception:
+            # best-effort; skip unreadable entries
+            continue
+    return topics
 
 
 def _resolve_docs_dir(ctx: click.Context) -> Path | None:
@@ -56,7 +83,10 @@ class DocsGroup(TyperGroup):
         names: List[str] = list(super().list_commands(ctx) or [])
         dir_to_use = _resolve_docs_dir(ctx)
         fs = _discover_fs_topics(dir_to_use) if dir_to_use else {}
-        names.extend(fs.keys())
+        pkg = _discover_pkg_topics()
+        # FS topics win on conflicts; add both for visibility
+        names.extend([k for k in fs.keys()])
+        names.extend([k for k in pkg.keys() if k not in fs])
         # Deduplicate and sort
         uniq = sorted({*names})
         return uniq
@@ -79,7 +109,16 @@ class DocsGroup(TyperGroup):
 
             return _show_fs
 
-        # No packaged fallback
+        # Packaged fallback
+        pkg = _discover_pkg_topics()
+        if name in pkg:
+            file_path = pkg[name]
+
+            @click.command(name=name)
+            def _show_pkg() -> None:
+                click.echo(file_path.read_text(encoding="utf-8", errors="replace"))
+
+            return _show_pkg
 
         return None
 
@@ -114,13 +153,23 @@ def register(app: typer.Typer) -> None:
         root = resolve_project_root()
         dir_to_use = _resolve_docs_dir(ctx)
         fs = _discover_fs_topics(dir_to_use) if dir_to_use else {}
-        for name, path in fs.items():
+        pkg = _discover_pkg_topics()
+
+        # Print FS topics first (project/env/option), then packaged topics not shadowed by FS
+        def _print(name: str, path: Path) -> None:
             try:
                 rel = path.relative_to(root)
                 typer.echo(f"{name}\t{rel}")
             except Exception:
+                # For packaged topics, path will be site-packages absolute path
                 typer.echo(f"{name}\t{path}")
 
+        for name, path in fs.items():
+            _print(name, path)
+        for name, path in pkg.items():
+            if name not in fs:
+                _print(name, path)
+
     # Also support a generic "show" command
     @docs_app.command("show", help="Show docs for a topic (alternative to dynamic subcommand)")
     def show(topic: str) -> None:
@@ -130,6 +179,10 @@ def register(app: typer.Typer) -> None:
         if topic in fs:
             typer.echo(fs[topic].read_text(encoding="utf-8", errors="replace"))
             return
+        pkg = _discover_pkg_topics()
+        if topic in pkg:
+            typer.echo(pkg[topic].read_text(encoding="utf-8", errors="replace"))
+            return
         raise typer.BadParameter(f"Unknown topic: {topic}")
 
     app.add_typer(docs_app, name="docs")

{svc_infra-0.1.617.dist-info → svc_infra-0.1.618.dist-info}/METADATA

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

{svc_infra-0.1.617.dist-info → svc_infra-0.1.618.dist-info}/RECORD

@@ -142,7 +142,7 @@ svc_infra/cli/cmds/db/sql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 svc_infra/cli/cmds/db/sql/alembic_cmds.py,sha256=kkAu8sfBLWbb9ApMS95b7b_c6GifqvPaRsO7K8icMVI,9649
 svc_infra/cli/cmds/db/sql/sql_export_cmds.py,sha256=6MxoQO-9upoXg0cl1RHIqz96yXFVGidiBYp_ewhB0E0,2700
 svc_infra/cli/cmds/db/sql/sql_scaffold_cmds.py,sha256=eNTCqHXOxgl9H3WTbGVn9BHXYwCpjIEJsDqhEFdrYMM,4613
-svc_infra/cli/cmds/docs/docs_cmds.py,sha256=A3LT__UffM8elPGTnaXmjNqsq8h4y2VVMMSzoqAeZeM,4668
+svc_infra/cli/cmds/docs/docs_cmds.py,sha256=nvqxkqeYNSV79Eeq0Kv8PN1M8CbyS3lnrFNjHNlO53w,6661
 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=wGfZFMYaR2ZPwW2JwKDU7M3m4AtdCd8GRQ412AmEBUM,758
@@ -296,7 +296,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.617.dist-info/METADATA,sha256=gFtkUXgTuAGcECWRsaWvXwoxnTEqxyl2yTYw9zzYhSk,8106
-svc_infra-0.1.617.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-svc_infra-0.1.617.dist-info/entry_points.txt,sha256=6x_nZOsjvn6hRZsMgZLgTasaCSKCgAjsGhACe_CiP0U,48
-svc_infra-0.1.617.dist-info/RECORD,,
+svc_infra-0.1.618.dist-info/METADATA,sha256=mH41WGLu0texy6G1rqK_cX5DmiJZFrhIN6kn6GgvLfE,8106
+svc_infra-0.1.618.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+svc_infra-0.1.618.dist-info/entry_points.txt,sha256=6x_nZOsjvn6hRZsMgZLgTasaCSKCgAjsGhACe_CiP0U,48
+svc_infra-0.1.618.dist-info/RECORD,,