`601e857`

fix(cli): narrow _previously_accepted except + wrap parse_file in train/prompt/export (audit-05 N2/N7)

Authored by

espadonne 3 weeks ago

SHA: 601e857f51e37749b5ef7a43fe947332c4038297
Parents: bcdeff2
Tree: f10a83d

1 changed file

Status	File	+	-
M	`src/dlm/cli/commands.py`	15	4

src/dlm/cli/commands.pymodified

      """
      if not store_manifest_path.exists():
          return False
 -    try:
 -        from dlm.store.manifest import load_manifest
 +    from dlm.store.errors import ManifestCorruptError
 +    from dlm.store.manifest import load_manifest
 +    try:
          manifest = load_manifest(store_manifest_path)
 -    except Exception:
 +    except (ManifestCorruptError, OSError):
 +        # Audit-05 N2: narrow from bare `Exception` so programmer bugs
 +        # propagate instead of being silently treated as "no acceptance."
          return False
      return manifest.license_acceptance is not None
      from dlm.base_models import GatedModelError
      from dlm.base_models import resolve as resolve_base_model
 +    from dlm.doc.errors import DlmParseError
      from dlm.doc.parser import parse_file
      from dlm.hardware import doctor
      from dlm.lock import LockMode, LockValidationError
      elif ignore_lock:
          lock_mode = "ignore"
 -    parsed = parse_file(path)
 +    try:
 +        parsed = parse_file(path)
 +    except (DlmParseError, OSError) as exc:
 +        console.print(f"[red]error:[/red] {exc}")
 +        raise typer.Exit(code=1) from exc
      try:
          spec = resolve_base_model(
              parsed.frontmatter.base_model,
      from rich.console import Console
      from dlm.base_models import resolve as resolve_base_model
 +    from dlm.doc.errors import DlmParseError
      from dlm.doc.parser import parse_file
      from dlm.hardware import doctor
      from dlm.inference import AdapterNotFoundError, generate, load_for_inference
      from dlm.base_models import GatedModelError, download_spec
      from dlm.base_models import resolve as resolve_base_model
 +    from dlm.doc.errors import DlmParseError
      from dlm.doc.parser import parse_file
      from dlm.export import (
          ExportError,
      from rich.console import Console
 +    from dlm.doc.errors import DlmParseError
      from dlm.doc.errors import DlmParseError
      from dlm.doc.parser import parse_file
      from dlm.store.errors import ManifestCorruptError