Update landmarkdiff/cli.py to v0.3.2

landmarkdiff/cli.py

@@ -51,7 +51,6 @@ def cmd_infer(args: argparse.Namespace) -> None:
 
     if args.watermark:
         from landmarkdiff.safety import SafetyValidator
-
         validator = SafetyValidator()
         watermarked = validator.apply_watermark(result["output"])
         wm_path = out_path.with_stem(out_path.stem + "_watermarked")
@@ -78,26 +77,36 @@ def cmd_ensemble(args: argparse.Namespace) -> None:
 
 
 def cmd_evaluate(args: argparse.Namespace) -> None:
-    """Run evaluation on test set."""
-    from pathlib import Path
-
-    # Import evaluation functions
-    sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
-    from scripts.run_evaluation import run_evaluation
-
-    run_evaluation(
-        test_dir=args.test_dir,
-        output_dir=args.output,
-        checkpoint=args.checkpoint,
-        max_samples=args.max_samples,
+    """Run evaluation on test set.
+
+    Delegates to scripts/run_evaluation.py via subprocess to avoid
+    a circular dependency (landmarkdiff package should not import
+    from scripts/).
+    """
+    import subprocess
+
+    script = str(
+        __import__("pathlib").Path(__file__).resolve().parent.parent
+        / "scripts"
+        / "run_evaluation.py"
     )
+    cmd = [sys.executable, script, "--test_dir", args.test_dir, "--output", args.output]
+    if args.checkpoint:
+        cmd += ["--checkpoint", args.checkpoint]
+    if args.max_samples:
+        cmd += ["--max_samples", str(args.max_samples)]
+
+    subprocess.run(cmd, check=True)
 
 
 def cmd_config(args: argparse.Namespace) -> None:
     """Show or validate configuration."""
     from landmarkdiff.config import ExperimentConfig, load_config, validate_config
 
-    config = load_config(args.file) if args.file else ExperimentConfig()
+    if args.file:
+        config = load_config(args.file)
+    else:
+        config = ExperimentConfig()
 
     if args.validate:
         warnings = validate_config(config)
@@ -111,7 +120,6 @@ def cmd_config(args: argparse.Namespace) -> None:
         from dataclasses import asdict
 
         import yaml
-
         print(yaml.dump(asdict(config), default_flow_style=False, sort_keys=False))
 
 
@@ -147,7 +155,6 @@ def cmd_validate(args: argparse.Namespace) -> None:
 def cmd_version(args: argparse.Namespace) -> None:
     """Print version info."""
     from landmarkdiff import __version__
-
     print(f"LandmarkDiff v{__version__}")
 
 
@@ -162,14 +169,11 @@ def main(argv: list[str] | None = None) -> None:
     # --- infer ---
     p_infer = subparsers.add_parser("infer", help="Run single-image inference")
     p_infer.add_argument("image", help="Input face image path")
-    p_infer.add_argument(
-        "--procedure",
-        default="rhinoplasty",
-        choices=["rhinoplasty", "blepharoplasty", "rhytidectomy", "orthognathic"],
-    )
+    p_infer.add_argument("--procedure", default="rhinoplasty",
+                         choices=["rhinoplasty", "blepharoplasty", "rhytidectomy", "orthognathic", "brow_lift", "mentoplasty"])
     p_infer.add_argument("--intensity", type=float, default=65.0)
     p_infer.add_argument("--output", default="output.png")
-    p_infer.add_argument("--mode", default="tps", choices=["controlnet", "img2img", "tps"])
+    p_infer.add_argument("--mode", default="tps", choices=["controlnet", "controlnet_ip", "controlnet_fast", "img2img", "tps"])
     p_infer.add_argument("--checkpoint", default=None)
     p_infer.add_argument("--displacement-model", default=None)
     p_infer.add_argument("--seed", type=int, default=42)
@@ -183,12 +187,9 @@ def main(argv: list[str] | None = None) -> None:
     p_ensemble.add_argument("--intensity", type=float, default=65.0)
     p_ensemble.add_argument("--output", default="ensemble_output")
     p_ensemble.add_argument("--n-samples", type=int, default=5)
-    p_ensemble.add_argument(
-        "--strategy",
-        default="best_of_n",
-        choices=["pixel_average", "weighted_average", "best_of_n", "median"],
-    )
-    p_ensemble.add_argument("--mode", default="tps", choices=["controlnet", "img2img", "tps"])
+    p_ensemble.add_argument("--strategy", default="best_of_n",
+                            choices=["pixel_average", "weighted_average", "best_of_n", "median"])
+    p_ensemble.add_argument("--mode", default="tps", choices=["controlnet", "controlnet_ip", "controlnet_fast", "img2img", "tps"])
     p_ensemble.add_argument("--checkpoint", default=None)
     p_ensemble.add_argument("--displacement-model", default=None)
     p_ensemble.add_argument("--seed", type=int, default=42)
@@ -198,9 +199,7 @@ def main(argv: list[str] | None = None) -> None:
     p_eval = subparsers.add_parser("evaluate", help="Evaluate on test set")
     p_eval.add_argument("--test-dir", required=True)
     p_eval.add_argument("--output", default="eval_results")
-    p_eval.add_argument("--mode", default="tps")
     p_eval.add_argument("--checkpoint", default=None)
-    p_eval.add_argument("--displacement-model", default=None)
     p_eval.add_argument("--max-samples", type=int, default=0)
     p_eval.set_defaults(func=cmd_evaluate)