FIX: Handle root models in diff display

Author: mferrera

src/fmu_settings_cli/sync/cli.py

@@ -85,7 +85,7 @@ def sync(
         )
         raise typer.Abort from e
 
-    changes = to_fmu.get_dir_diff(from_fmu.path.parent)
+    changes = to_fmu.get_dir_diff(from_fmu)
 
     if all(len(change_list) == 0 for change_list in changes.values()):
         success("No changes detected.")
@@ -106,5 +106,5 @@ def sync(
     if not confirmed:
         raise typer.Abort
 
-    to_fmu.sync_dir(from_fmu.path.parent)
+    to_fmu.sync_dir(from_fmu)
     success(f"All done! {from_dir_abs} has been sync'd to {to_dir_abs}.")

src/fmu_settings_cli/sync/model_diff.py

@@ -2,7 +2,7 @@
 
 from typing import Any, Final
 
-from pydantic import BaseModel
+from pydantic import BaseModel, RootModel
 from rich.console import Console
 from rich.panel import Panel
 from rich.table import Table
@@ -64,11 +64,32 @@ def is_complex_change(old_val: Any, new_val: Any) -> bool:
     return False
 
 
-def add_model_to_panel_content(model: BaseModel, indent: int = 0) -> list[str]:
-    """Recursively build panel content line for a BaseModel."""
+def _add_root_model_to_panel_content(
+    model: RootModel[Any], indent: int = 0
+) -> list[str]:
+    """Build and return panel content for a RootModel."""
+    if not isinstance(model, RootModel):
+        raise ValueError(f"Received {type(model)}, but a  RootModel is required")
+
     lines = []
     indent_str = "  " * indent
+    root_value = model.model_dump()
+    if isinstance(root_value, list) and is_list_of_models(model.root):
+        for item in model.root:
+            lines.append(f"{indent_str}[dim]- {type(item).__name__}[/dim]")
+            lines.extend(add_model_to_panel_content(item, indent + 1))
+    elif isinstance(root_value, dict):
+        for k, v in root_value.items():
+            lines.append(f"{indent_str}[bold]{k}:[/bold] {v}")
+    else:
+        lines.append(f"{indent_str}{root_value}")
+    return lines
+
 
+def _add_base_model_to_panel_content(model: BaseModel, indent: int = 0) -> list[str]:
+    """Build and return panel content for a BaseModel."""
+    lines = []
+    indent_str = "  " * indent
     for key, value in model.model_dump().items():
         actual_value = getattr(model, key)
 
@@ -91,10 +112,16 @@ def add_model_to_panel_content(model: BaseModel, indent: int = 0) -> list[str]:
                 lines.append(f"{indent_str} [dim]{k}:[/dim] {v}")
         else:
             lines.append(f"{indent_str}[bold]{key}:[/bold] {value}")
-
     return lines
 
 
+def add_model_to_panel_content(model: BaseModel, indent: int = 0) -> list[str]:
+    """Recursively build panel content line for a BaseModel."""
+    if isinstance(model, RootModel):
+        return _add_root_model_to_panel_content(model, indent)
+    return _add_base_model_to_panel_content(model, indent)
+
+
 def render_basemodel_panel(
     model: BaseModel, field_path: str, added: bool = True
 ) -> Panel:

tests/test_sync/test_sync_cli.py

@@ -1,9 +1,7 @@
 """Tests for the 'fmu sync' commands."""
 
 from collections.abc import Generator
-from datetime import UTC, datetime
 from pathlib import Path
-from typing import Any
 from uuid import uuid4
 
 import pytest
@@ -13,7 +11,6 @@
 from typer.testing import CliRunner
 
 from fmu_settings_cli.__main__ import app
-from fmu_settings_cli.sync.model_diff import IGNORED_FIELDS
 
 # ruff: noqa: PLR2004
 
@@ -133,31 +130,6 @@ def test_sync_no_changes_from_current_dir(
     assert result.exit_code == 0
 
 
-@pytest.mark.parametrize(
-    "field, value",
-    [
-        ("created_at", datetime.now(UTC)),
-        ("created_by", "foo"),
-    ],
-)
-def test_sync_disregards_ignored_fields(
-    two_fmu_revisions: tuple[Path, ProjectFMUDirectory, ProjectFMUDirectory],
-    monkeypatch: MonkeyPatch,
-    field: str,
-    value: Any,
-) -> None:
-    """Tests that 'fmu sync' does not see ignored fields as changes to sync."""
-    tmp_path, project_a, project_b = two_fmu_revisions
-    monkeypatch.chdir(project_a.path.parent)
-
-    assert field in IGNORED_FIELDS
-    project_a.set_config_value(field, value)
-
-    result = runner.invoke(app, ["sync", "--to", str(project_b.path.parent)])
-    assert "No changes detected" in result.stdout
-    assert result.exit_code == 0
-
-
 def test_sync_finds_changed_value_field(
     two_fmu_revisions: tuple[Path, ProjectFMUDirectory, ProjectFMUDirectory],
     monkeypatch: MonkeyPatch,
@@ -202,7 +174,6 @@ def test_sync_finds_changed_value_field_and_saves_after_confirm(
     assert "Value Changes in config" in result.stdout
     assert "model.name" in result.stdout
     assert "foo" in result.stdout
-    assert "Complex Changes" not in result.stdout  # Not in
     assert "Success: All done!" in result.stdout
     assert str(project_a.path.parent.absolute()) in result.stdout.replace("\n", "")
     assert str(project_b.path.parent.absolute()) in result.stdout.replace("\n", "")