Fix agreement_level in 1 table merges

Author: flbulgarelli

src/tablemerge/merge.py

@@ -34,13 +34,15 @@ def normalize_value(value: str | list[ValueWithAgreement]) -> str:
         return value
 
 
-def normalize_row(row: Row) -> Row:
+def normalize_row(row: Row, with_row_agreement: bool = False) -> Row:
     return Row(
         **{
             column: normalize_value(value)
             for column, value in row.get_columns().items()
         },
-        agreement_level_=row.agreement_level_,
+        agreement_level_=(
+            row.get_agreement_level() if with_row_agreement else row.agreement_level_
+        ),
     )
 
 
@@ -167,7 +169,12 @@ class TableFragmentBuilder:
     with_row_agreement: bool
 
     def __init__(self, initial_fragment: TableFragment, with_row_agreement: bool):
-        self.rows = list(map(normalize_row, initial_fragment.rows))
+        self.rows = list(
+            map(
+                lambda row: normalize_row(row, with_row_agreement),
+                initial_fragment.rows,
+            )
+        )
         self.page = initial_fragment.page
         self.with_row_agreement = with_row_agreement
 
@@ -177,9 +184,7 @@ def next_left_rows(self):
         return list(rows)
 
     def _append(self, row: Row):
-        new = normalize_row(row)
-        if self.with_row_agreement:
-            new.agreement_level_ = new.get_agreement_level()
+        new = normalize_row(row, self.with_row_agreement)
         self.rows.append(new)
 
     def append_skipped(self, rows: list[Row]):

tests/test_merge.py

@@ -33,6 +33,16 @@ def test_single_table_returns_normalized():
     ]
 
 
+def test_single_table_with_row_agreement():
+    table = [Row(family=" Apiaceae ", scientific_name="Ammi majus L.")]
+
+    result = merge_tablesfiles([wrap(table)], with_row_agreement=True)
+    assert len(result.tables) == 1
+    assert result.tables[0].table_fragments[0].rows == [
+        Row(family="apiaceae", scientific_name="ammi majus l.", agreement_level_=1)
+    ]
+
+
 def test_two_identical_tables():
     table = [Row(family="Apiaceae", scientific_name="Ammi majus L.")]
 
@@ -43,6 +53,16 @@ def test_two_identical_tables():
     ]
 
 
+def test_two_identical_tables_with_row_agreement():
+    table = [Row(family="Apiaceae", scientific_name="Ammi majus L.")]
+
+    result = merge_tablesfiles([wrap(table), wrap(table)], with_row_agreement=True)
+    assert len(result.tables) == 1
+    assert result.tables[0].table_fragments[0].rows == [
+        Row(family="apiaceae", scientific_name="ammi majus l.", agreement_level_=2)
+    ]
+
+
 def test_two_tables_with_non_normalized_columns():
     table_1 = [Row(family=" Apiaceae ", scientific_name=" Ammi majus L. ")]
     table_2 = [Row(family="apiaceae", scientific_name="ammi majus l.")]
@@ -85,6 +105,7 @@ def test_two_tablesfiles_with_different_pages():
         Row(family="rosaceae", scientific_name="rosa canina l."),
     ]
 
+
 def test_two_tables_with_mixed_values():
     table_1 = [Row(family="Apiaceae", scientific_name="Ammi majus L.")]
     table_2 = [