improve cli log

Author: FynnBe

bioimageio/core/__main__.py

@@ -6,7 +6,7 @@
 from glob import glob
 
 from pathlib import Path
-from pprint import pprint
+from pprint import pformat, pprint
 from typing import List, Optional
 
 import typer
@@ -88,9 +88,29 @@ def _log_test_summaries(summaries: List[TestSummary], msg: str):
     # todo: improve logging of multiple test summaries
     ret_code = 0
     for summary in summaries:
-        print(f"\n{summary['name']}: {summary['status']}")
+        print(f"{summary['name']}: {summary['status']}")
         if summary["status"] != "passed":
-            pprint(summary)
+            s = {
+                k: v
+                for k, v in summary.items()
+                if k not in ("name", "status", "bioimageio_spec_version", "bioimageio_core_version")
+            }
+            tb = s.pop("traceback")
+            if tb:
+                print("traceback:")
+                print("".join(tb))
+
+            def show_part(part, show):
+                if show:
+                    line = f"{part}: "
+                    print(line + pformat(show, width=min(80, 120 - len(line))).replace("\n", " " * len(line) + "\n"))
+
+            for part in ["error", "warnings", "source_name"]:
+                show_part(part, s.pop(part, None))
+
+            for part in sorted(s.keys()):
+                show_part(part, s[part])
+
             ret_code = 1
 
     if ret_code:
@@ -114,27 +134,15 @@ def test_model(
     decimal: int = typer.Option(4, help="The test precision."),
 ):
     # this is a weird typer bug: default devices are empty tuple although they should be None
-    if len(devices) == 0:
-        devices = None
+    devices = devices or None
+
     summaries = resource_tests.test_model(
         model_rdf,
         weight_format=None if weight_format is None else weight_format.value,
         devices=devices,
         decimal=decimal,
     )
-
-    if weight_format is None:
-        weight_formats = get_weight_formats()
-        model_weight_formats = list(load_raw_resource_description(model_rdf).weights.keys())
-        for wf in weight_formats:
-            if wf in model_weight_formats:
-                weight_format = wf
-                break
-        weight_format = "unknown" if weight_format is None else weight_format
-
-    ret_code = _log_test_summaries(
-        summaries, f"\n{{icon}} Model test for {model_rdf} using {weight_format} weight format has {{result}}"
-    )
+    ret_code = _log_test_summaries(summaries, f"\n{{icon}} Model {model_rdf} {{result}}")
     sys.exit(ret_code)
 
 

bioimageio/core/resource_tests.py

@@ -98,7 +98,7 @@ def _test_resource_urls(rd: ResourceDescription) -> TestSummary:
         bioimageio_spec_version=bioimageio_spec_version,
         bioimageio_core_version=bioimageio_core_version,
         nested_errors=None,
-        source_name=rd.id if hasattr(rd, "id") else rd.name,
+        source_name=rd.id or rd.id or rd.name if hasattr(rd, "id") else rd.name,
         warnings={"SourceNodeChecker": [str(w.message) for w in all_warnings]} if all_warnings else {},
     )
 
@@ -120,7 +120,7 @@ def _test_model_documentation(rd: ResourceDescription) -> TestSummary:
             traceback=None,
             bioimageio_spec_version=bioimageio_spec_version,
             bioimageio_core_version=bioimageio_core_version,
-            source_name=rd.id if hasattr(rd, "id") else rd.name,
+            source_name=rd.id or rd.name if hasattr(rd, "id") else rd.name,
             warnings={"documentation": wrn} if wrn else {},
         )
 
@@ -176,7 +176,7 @@ def _test_model_inference(model: Model, weight_format: str, devices: Optional[Li
         bioimageio_spec_version=bioimageio_spec_version,
         bioimageio_core_version=bioimageio_core_version,
         warnings={},
-        source_name=model.id,
+        source_name=model.id or model.name,
     )
 
 
@@ -227,7 +227,7 @@ def _test_expected_resource_type(rd: ResourceDescription, expected_type: str) ->
         status="passed" if has_expected_type else "failed",
         error=f"expected type {expected_type}, found {rd.type}",
         traceback=None,
-        source_name=rd.id if hasattr(rd, "id") else rd.name,
+        source_name=rd.id or rd.name if hasattr(rd, "id") else rd.name,
     )