diff --git a/server/app/main.py b/server/app/main.py index 7b4afe5..25ac2a7 100644 --- a/server/app/main.py +++ b/server/app/main.py @@ -1,20 +1,24 @@ from __future__ import annotations +from datetime import UTC, datetime from typing import Any from fastapi import Depends, FastAPI, HTTPException, Query from .config import Settings, get_settings -from .docs_repository import DocsRepository, RepositoryError +from .docs_repository import RepositoryError from .freshness import build_freshness_report from .git_adapter import CommitRequest, GitAdapter, GitAdapterError -from .inventory import InventoryError, InventoryRepository +from .inventory import InventoryError from .pending_changes import ( PendingChangeError, PendingChangeRepository, ProposedChangeRequest, ) from .relationships import build_relationships +from .storage.db import Database +from .storage.factory import make_docs_repository, make_inventory_repository +from .storage.protocols import DocsRepositoryProtocol, InventoryRepositoryProtocol from .validation import validate_repository @@ -28,12 +32,12 @@ ) -def get_docs_repo(settings: Settings = Depends(get_settings)) -> DocsRepository: - return DocsRepository(settings) +def get_docs_repo(settings: Settings = Depends(get_settings)) -> DocsRepositoryProtocol: + return make_docs_repository(settings) -def get_inventory_repo(settings: Settings = Depends(get_settings)) -> InventoryRepository: - return InventoryRepository(settings) +def get_inventory_repo(settings: Settings = Depends(get_settings)) -> InventoryRepositoryProtocol: + return make_inventory_repository(settings) def get_pending_change_repo(settings: Settings = Depends(get_settings)) -> PendingChangeRepository: @@ -45,17 +49,31 @@ @app.get("/health") -def health(settings: Settings = Depends(get_settings)) -> dict[str, str]: - return {"status": "ok", "repo_root": settings.repo_root.as_posix()} +def health(settings: Settings = Depends(get_settings)) -> dict[str, Any]: + payload: dict[str, Any] = { + "status": "ok", + "service": "gnexus-book", + "version": app.version, + "storage": settings.storage_backend, + "timestamp": datetime.now(UTC).isoformat().replace("+00:00", "Z"), + } + if settings.storage_backend == "db": + try: + Database.from_settings(settings).ping() + payload["checks"] = {"db": {"status": "ok"}} + except Exception: + payload["status"] = "down" + payload["checks"] = {"db": {"status": "down", "detail": "database unavailable"}} + return payload @app.get("/docs") -def list_docs(repo: DocsRepository = Depends(get_docs_repo)) -> list[dict[str, object]]: +def list_docs(repo: DocsRepositoryProtocol = Depends(get_docs_repo)) -> list[dict[str, object]]: return repo.list_docs() @app.get("/docs/read") -def read_doc(path: str = Query(...), repo: DocsRepository = Depends(get_docs_repo)) -> dict[str, object]: +def read_doc(path: str = Query(...), repo: DocsRepositoryProtocol = Depends(get_docs_repo)) -> dict[str, object]: try: return repo.read_doc(path) except RepositoryError as exc: @@ -63,12 +81,12 @@ @app.get("/search") -def search(q: str = Query(...), repo: DocsRepository = Depends(get_docs_repo)) -> list[dict[str, object]]: +def search(q: str = Query(...), repo: DocsRepositoryProtocol = Depends(get_docs_repo)) -> list[dict[str, object]]: return repo.search(q) @app.get("/inventory") -def list_inventory_types(repo: InventoryRepository = Depends(get_inventory_repo)) -> list[str]: +def list_inventory_types(repo: InventoryRepositoryProtocol = Depends(get_inventory_repo)) -> list[str]: return repo.list_types() @@ -76,7 +94,7 @@ def read_inventory( inventory_type: str, raw: bool = False, - repo: InventoryRepository = Depends(get_inventory_repo), + repo: InventoryRepositoryProtocol = Depends(get_inventory_repo), ) -> object: try: if raw: @@ -90,7 +108,7 @@ def read_inventory_item( inventory_type: str, item_id: str, - repo: InventoryRepository = Depends(get_inventory_repo), + repo: InventoryRepositoryProtocol = Depends(get_inventory_repo), ) -> dict[str, object]: try: return repo.read_item(inventory_type, item_id) @@ -99,7 +117,7 @@ @app.get("/traffic-routes") -def read_traffic_routes(repo: InventoryRepository = Depends(get_inventory_repo)) -> object: +def read_traffic_routes(repo: InventoryRepositoryProtocol = Depends(get_inventory_repo)) -> object: try: return repo.read_parsed("traffic-routes") except InventoryError as exc: @@ -107,7 +125,7 @@ @app.get("/relationships") -def relationships(repo: InventoryRepository = Depends(get_inventory_repo)) -> dict[str, object]: +def relationships(repo: InventoryRepositoryProtocol = Depends(get_inventory_repo)) -> dict[str, object]: try: return build_relationships(repo) except InventoryError as exc: diff --git a/server/app/mcp_server.py b/server/app/mcp_server.py index d0abdef..048ace0 100644 --- a/server/app/mcp_server.py +++ b/server/app/mcp_server.py @@ -9,12 +9,11 @@ from pydantic import Field from .config import Settings -from .docs_repository import DocsRepository from .freshness import build_freshness_report from .git_adapter import CommitRequest, GitAdapter -from .inventory import InventoryRepository from .pending_changes import PendingChangeRepository, ProposedChangeRequest from .relationships import build_relationships +from .storage.factory import make_docs_repository, make_inventory_repository from .validation import validate_repository @@ -132,12 +131,12 @@ return Settings() if not repo_root else Settings(repo_root=Path(repo_root)) -def _docs() -> DocsRepository: - return DocsRepository(_settings()) +def _docs(): + return make_docs_repository(_settings()) -def _inventory() -> InventoryRepository: - return InventoryRepository(_settings()) +def _inventory(): + return make_inventory_repository(_settings()) def _pending() -> PendingChangeRepository: diff --git a/ui/src/main.js b/ui/src/main.js index 3d4f8af..da840cc 100644 --- a/ui/src/main.js +++ b/ui/src/main.js @@ -104,7 +104,7 @@ ); const overview = computed(() => [ - { key: "repo", term: "Repository", value: health.value?.repo_root || "unknown" }, + { key: "storage", term: "Storage", value: health.value?.storage || "unknown" }, { key: "validation", term: "Validation", value: validation.value?.status || "unknown" }, { key: "freshness", term: "Freshness", value: freshness.value?.status || "unknown" } ]);