Kauldron CLI: small UX fixes and conflict resolution

PiperOrigin-RevId: 890386467

Author: Qwlouse

kauldron/cli/config.py

@@ -35,7 +35,7 @@ def __call__(self):
 class Resolve(cu.SubCommand):
   """Resolve and display the fully-instantiated config."""
 
-  verbose: bool = False
+  verbose: bool = True
 
   def __call__(self):
     self.print_config_origin()

kauldron/cli/config_test.py

@@ -18,22 +18,21 @@
 from kauldron.cli import config
 
 
-def test_show_returns_repr(capsys):
-  """show() should print the unresolved ConfigDict."""
-
+def test_show_prints_repr(capsys):
   cfg = konfig.ConfigDict({"seed": 42, "num_train_steps": 1000})
   cmd = config.Show(cfg=cfg)
   cmd()
-  result = capsys.readouterr().out
 
-  assert "'seed': 42" in result
-  assert "'num_train_steps': 1000" in result
+  captured = capsys.readouterr().out
+  assert "'seed': 42" in captured
+  assert "'num_train_steps': 1000" in captured
 
 
-def test_resolve_simple(capsys):
+def test_resolve_prints_config(capsys):
   cfg = konfig.ConfigDict({"seed": 42, "num_train_steps": 1000})
   cmd = config.Resolve(cfg=cfg, verbose=True)
   cmd()
-  result = capsys.readouterr().out
-  assert "'seed': 42" in result
-  assert "'num_train_steps': 1000" in result
+
+  captured = capsys.readouterr().out
+  assert "'seed': 42" in captured
+  assert "'num_train_steps': 1000" in captured

kauldron/cli/main.py

@@ -134,6 +134,11 @@ def main(args: Args) -> None:
 
     patched_config, patches = patcher(cfg)
 
+    conflicts = set(overrides) & set(patches)
+    for key in conflicts:
+      cu.tracked_update(patched_config, key, overrides[key])
+      del patches[key]
+
     origin = patch_config.ConfigOrigin(
         filename=filename,
         overrides=overrides,

kauldron/cli/patch_config.py

@@ -129,7 +129,7 @@ def _patch_batch_size(self, cfg: konfig.ConfigDict) -> dict[str, Any]:
   def _patch_num_batches(self, cfg: konfig.ConfigDict) -> dict[str, Any]:
     """Patches the number of batches."""
     updates = {}
-    if self.num_batches is not None:
+    if self.num_batches:
       if hasattr(cfg, "evals"):
         updates |= cu.tracked_update(
             cfg, "evals.**.num_batches", self.num_batches