excel-orm 0.1.1__tar.gz → 0.1.2__tar.gz

{excel_orm-0.1.1 → excel_orm-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: excel-orm
-Version: 0.1.1
+Version: 0.1.2
 Summary: A lightweight Excel ORM for generating templates and parsing typed row models.
 Project-URL: Homepage, https://github.com/acdelrusso/excel-orm
 Project-URL: Repository, https://github.com/acdelrusso/excel-orm

{excel_orm-0.1.1 → excel_orm-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "excel-orm"
-version = "0.1.1"
+version = "0.1.2"
 description = "A lightweight Excel ORM for generating templates and parsing typed row models."
 readme = "README.md"
 requires-python = ">=3.13"

{excel_orm-0.1.1 → excel_orm-0.1.2}/src/excel_orm/orm.py

@@ -23,6 +23,8 @@ def _pluralize(s: str) -> str:
     # keep deliberately simple; can be swapped for inflect later
     if s.endswith("s"):
         return s
+    if s.endswith("y") and len(s) >= 2 and s[-2] not in "aeiou":
+        return s[:-1] + "ies"
     return s + "s"
 
 
@@ -84,7 +86,7 @@ class PivotSheetSpec:
 
     # field names on the model
     pivot_field: str
-    row_field: str
+    row_fields: list[str]
     value_field: str
 
     # layout
@@ -92,7 +94,6 @@ class PivotSheetSpec:
     header_row: int = 2  # pivot headers
     row_header_col: int = 1
     data_start_row: int = 3
-    data_start_col: int = 2
 
     # template: define the pivot column values (dates) to render across the top
     pivot_values: list[Any] | None = None  # e.g., list[date]; required for generation
@@ -102,6 +103,10 @@ class PivotSheetSpec:
 
     include_blanks: bool = False  # whether to load blank cells as data points
 
+    @property
+    def data_start_col(self) -> int:
+        return len(self.row_fields) + 1
+
 
 AnySheetSpec = PivotSheetSpec | SheetSpec
 
@@ -274,39 +279,54 @@ class ExcelFile:
         tcell.font = title_font
         tcell.alignment = title_alignment
 
-        # Top-left corner header (row field name)
-        corner = ws.cell(spec.header_row, spec.row_header_col, spec.row_field.title())
-        corner.font = header_font
+        # Row field headers (left block)
+        for i, rf in enumerate(spec.row_fields):
+            c = spec.row_header_col + i
+            cell = ws.cell(spec.header_row, c, rf.title())
+            cell.font = header_font
+            col_letter = cell.column_letter
+            ws.column_dimensions[col_letter].width = max(12, min(40, len(str(rf)) + 4))
 
         # Pivot headers across the top
         for j, pv in enumerate(spec.pivot_values):
             c = spec.data_start_col + j
             cell = ws.cell(spec.header_row, c, pv)
             cell.font = header_font
-
-            col_letter = ws.cell(spec.header_row, c).column_letter
+            col_letter = cell.column_letter
             ws.column_dimensions[col_letter].width = 14
 
-        # Seed row keys (optional)
         if spec.row_values:
             for i, rv in enumerate(spec.row_values):
                 r = spec.data_start_row + i
-                ws.cell(r, spec.row_header_col, rv)
+
+                if len(spec.row_fields) == 1:
+                    # Back-compat: rv is a single value
+                    ws.cell(r, spec.row_header_col, rv)
+                else:
+                    # Expect rv to be a tuple/list matching row_fields
+                    if not isinstance(rv, (tuple, list)) or len(rv) != len(spec.row_fields):
+                        raise ValueError(
+                            "For multi-row_fields, PivotSheetSpec.row_values must be a list of "
+                            f"tuples/lists with length {len(spec.row_fields)}."
+                        )
+                    for k, part in enumerate(rv):
+                        ws.cell(r, spec.row_header_col + k, part)
 
     def _parse_pivot_sheet(self, ws: Worksheet, spec: PivotSheetSpec) -> None:
         model = spec.model
         cols = {c.name: c for c in _get_model_columns(model)}  # Column descriptors by field name
 
         # Validate fields exist
-        for fname in (spec.pivot_field, spec.row_field, spec.value_field):
-            if fname not in cols:
-                raise ValueError(
-                    f"{model.__name__} is missing Column field '{fname}' required by PivotSheetSpec."
-                )
+        required = [spec.pivot_field, spec.value_field, *spec.row_fields]
+        missing = [f for f in required if f not in cols]
+        if missing:
+            raise ValueError(
+                f"{model.__name__} is missing Column field(s) required by PivotSheetSpec: {missing}"
+            )
 
         pivot_col = cols[spec.pivot_field]
-        row_col = cols[spec.row_field]
         val_col = cols[spec.value_field]
+        row_cols = [cols[f] for f in spec.row_fields]
 
         # Determine pivot headers from sheet (or trust spec.pivot_values)
         pivot_headers: list[Any] = []
@@ -326,11 +346,13 @@ class ExcelFile:
 
         r = spec.data_start_row
         while r <= ws.max_row:
-            raw_row_key = ws.cell(r, spec.row_header_col).value
-            if raw_row_key is None or str(raw_row_key).strip() == "":
+            raw_parts = [
+                ws.cell(r, spec.row_header_col + i).value for i in range(len(spec.row_fields))
+            ]
+            if _row_is_blank(raw_parts):
                 break
 
-            row_key = row_col.parse_cell(raw_row_key)
+            row_parts = [row_cols[i].parse_cell(raw_parts[i]) for i in range(len(row_cols))]
 
             for j, pivot_value in enumerate(pivot_headers):
                 c = spec.data_start_col + j
@@ -340,7 +362,8 @@ class ExcelFile:
 
                 obj = _instantiate_model(model)
 
-                setattr(obj, spec.row_field, row_key)
+                for fname, parsed in zip(spec.row_fields, row_parts, strict=False):
+                    setattr(obj, fname, parsed)
                 setattr(obj, spec.pivot_field, pivot_value)
                 setattr(obj, spec.value_field, val_col.parse_cell(raw_val))
 

{excel_orm-0.1.1 → excel_orm-0.1.2}/tests/conftest.py

@@ -51,6 +51,17 @@ def demand_model():
     return Demand
 
 
+@pytest.fixture
+def demand_two_pivot():
+    class Demand:
+        dt: Column[date] = date_column(header="Date")
+        region: Column[str] = text_column(header="Region", not_null=True)
+        product: Column[str] = text_column(header="Product", not_null=True)
+        value: Column[int] = int_column(header="Value", not_null=True)
+
+    return Demand
+
+
 @pytest.fixture
 def pivot_excel_file(demand_model):
     Demand = demand_model
@@ -66,7 +77,7 @@ def pivot_excel_file(demand_model):
         name="Demand",
         model=Demand,
         pivot_field="dt",
-        row_field="region",
+        row_fields=["region"],
         value_field="value",
         pivot_values=pivot_values,
         row_values=["NA", "EU"],  # seed some regions

{excel_orm-0.1.1 → excel_orm-0.1.2}/tests/test_orm.py

@@ -183,7 +183,7 @@ def test_load_data_pivot_stops_at_blank_region_row(tmp_path, demand_model):
         name="Demand",
         model=demand_model,
         pivot_field="dt",
-        row_field="region",
+        row_fields=["region"],
         value_field="value",
         pivot_values=pivot_values,
         row_values=None,  # user-entered regions
@@ -230,3 +230,78 @@ def test_load_data_missing_pivot_sheet_raises(tmp_path, pivot_excel_file):
 
     with pytest.raises(ValueError):
         pivot_excel_file.load_data(str(p))
+
+
+def test_pivot_two_row_fields_template_and_parse_end_to_end(tmp_path, demand_two_pivot):
+    """
+    Two row_fields case:
+      row_fields: [region, product]
+      pivot cols: Jun, Jul
+      row_values seeded with composite keys (NA/ABC, EU/ABC)
+    Validate:
+      - template layout places row headers in A2,B2
+      - pivot headers start at C2,D2
+      - seeded keys appear in A3,B3 and A4,B4
+      - parsing emits correct objects with BOTH row fields populated
+    """
+    pivot_values = [date(2025, 6, 1), date(2025, 7, 1)]
+    spec = PivotSheetSpec(
+        name="Demand",
+        model=demand_two_pivot,
+        pivot_field="dt",
+        row_fields=["region", "product"],
+        value_field="value",
+        pivot_values=pivot_values,
+        row_values=[("NA", "ABC"), ("EU", "ABC")],
+        row_header_col=1,
+        include_blanks=False,
+    )
+    xf = ExcelFile(sheets=[spec])
+
+    out = tmp_path / "pivot_two_row_fields.xlsx"
+    xf.generate_template(str(out))
+
+    wb = load_workbook(out)
+    ws = wb["Demand"]
+
+    # Title merged across A..D (A,B row headers + C,D pivot headers)
+    assert ws["A1"].value == "Demands"
+    merged = [str(rng) for rng in ws.merged_cells.ranges]
+    assert "A1:D1" in merged
+
+    # Row field headers in A2,B2
+    assert ws["A2"].value == "Region"
+    assert ws["B2"].value == "Product"
+
+    # Pivot headers start at C2..D2
+    assert _as_date(ws["C2"].value) == date(2025, 6, 1)
+    assert _as_date(ws["D2"].value) == date(2025, 7, 1)
+
+    # Seeded composite keys appear across A/B
+    assert ws["A3"].value == "NA"
+    assert ws["B3"].value == "ABC"
+    assert ws["A4"].value == "EU"
+    assert ws["B4"].value == "ABC"
+
+    # Fill matrix values: (row 3: NA/ABC), (row 4: EU/ABC)
+    ws["C3"].value = 10  # NA/ABC, Jun
+    ws["D3"].value = 20  # NA/ABC, Jul
+    ws["C4"].value = 5  # EU/ABC, Jun
+    ws["D4"].value = 0  # EU/ABC, Jul
+
+    wb.save(out)
+
+    xf.load_data(str(out))
+    rows = xf.demands.all()  # repo name plural of Demand
+
+    # Expect 4 objects (2 rows x 2 pivots)
+    assert len(rows) == 4
+
+    got = {(r.region, r.product, r.dt, r.value) for r in rows}
+    expected = {
+        ("NA", "ABC", date(2025, 6, 1), 10),
+        ("NA", "ABC", date(2025, 7, 1), 20),
+        ("EU", "ABC", date(2025, 6, 1), 5),
+        ("EU", "ABC", date(2025, 7, 1), 0),
+    }
+    assert got == expected

{excel_orm-0.1.1 → excel_orm-0.1.2}/uv.lock

@@ -187,7 +187,7 @@ wheels = [
 
 [[package]]
 name = "excel-orm"
-version = "0.1.1"
+version = "0.1.2"
 source = { editable = "." }
 dependencies = [
     { name = "openpyxl" },