f8-engine 0.2.0__tar.gz → 0.3.1__tar.gz

{f8_engine-0.2.0 → f8_engine-0.3.1}/Cargo.lock

@@ -37,7 +37,7 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "f8-core"
-version = "0.2.0"
+version = "0.3.1"
 dependencies = [
  "indexmap",
  "petgraph",
@@ -50,7 +50,7 @@ dependencies = [
 
 [[package]]
 name = "f8-python"
-version = "0.2.0"
+version = "0.3.1"
 dependencies = [
  "f8-core",
  "pyo3",

{f8_engine-0.2.0 → f8_engine-0.3.1}/Cargo.toml

@@ -3,7 +3,7 @@ resolver = "3"
 members = ["crates/f8-core", "crates/f8-python"]
 
 [workspace.package]
-version = "0.2.0"
+version = "0.3.1"
 edition = "2024"
 description = "Financial modeling engine with compiler verification and live Excel formulas"
 authors = ["Michael (Chencheng) Hu, CFA"]
@@ -25,3 +25,5 @@ pythonize = "0.24"
 [workspace.lints.clippy]
 unwrap_used = "deny"
 expect_used = "deny"
+wildcard_imports = "deny"
+fn_params_excessive_bools = "warn"

{f8_engine-0.2.0 → f8_engine-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: f8-engine
-Version: 0.2.0
+Version: 0.3.1
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
@@ -26,7 +26,7 @@ Project-URL: Repository, https://github.com/mhcfa/f8
 
 # f8
 
-Financial modeling engine with compiler verification and live Excel formulas.
+Author, verify, and automate financial models with code and AI agents, compiled into live Excel workbooks.
 
 ## Who is f8 for
 
@@ -71,35 +71,36 @@ f8 guide --all   # streams the full DSL, function, and auditing guide to stdout
 ```python
 from f8 import Model
 
+years = ["2025A", "2026E", "2027E"]
+capex = {"2025A": 25.0, "2026E": 30.0, "2027E": 35.0}
+depr = {"2025A": -15.0, "2026E": -18.0, "2027E": -22.0}
+
 model = Model("Operating Forecast")
 sheet = model.add_sheet("Summary")
 
-pnl = sheet.add_table("PnL", "Three-Year Projection", "($ in millions)")
-pnl.add_column("item", role="descriptor", header="Line Item")
-for year in ["2025A", "2026E", "2027E"]:
-    pnl.add_column(year, header=year, format="currency", decimals=1)
+ppe = sheet.add_table("PPE", "PP&E Corkscrew Schedule", "($ in millions)")
+ppe.add_column("item", role="descriptor", header="Line Item")
+for year in years:
+    ppe.add_column(year, header=year, format="currency", decimals=1)
 
-pnl.add_row(
-    "revenue",
-    cells={"item": "Revenue", "2025A": 100.0},
-    expr='PnL["revenue", col.prev] * 1.25',
-)
-pnl.add_row(
-    "cogs",
-    cells={"item": "Cost of Revenue"},
-    expr='PnL["revenue", @col] * 0.30',
+ppe.add_row(
+    "beg_balance",
+    cells={"item": "Beginning Balance", "2025A": 100.0},
+    expr='PPE["end_balance", col.prev]',
 )
-pnl.add_row(
-    "gross_profit",
-    cells={"item": "Gross Profit"},
-    expr='PnL["revenue", @col] - PnL["cogs", @col]',
+ppe.add_row("capex", cells={"item": "Capital Expenditures", **capex})
+ppe.add_row("depreciation", cells={"item": "Depreciation", **depr})
+ppe.add_row(
+    "end_balance",
+    cells={"item": "Ending Balance"},
+    expr='SUM(PPE["beg_balance".."depreciation", @col])',
     style="total",
 )
 
 compiled = model.compile()
 
 # Audit evaluated values in memory (or pass view="formulas" to inspect lowered Excel formulas)
-print(compiled.table("PnL").to_markdown())
+print(compiled.table("PPE").to_markdown())
 
 # Emit a live .xlsx workbook with native Excel formulas and styling (you don't have to)
 compiled.save("forecast.xlsx")
@@ -108,11 +109,12 @@ compiled.save("forecast.xlsx")
 Output:
 
 ```markdown
-| Line Item        |     2025A |     2026E |      2027E |
-| :--------------- | --------: | --------: | ---------: |
-| Revenue          |    $100.0 |    $125.0 |     $156.2 |
-| Cost of Revenue  |     $30.0 |     $37.5 |      $46.9 |
-| **Gross Profit** | **$70.0** | **$87.5** | **$109.4** |
+| Line Item            |      2025A |      2026E |      2027E |
+| :------------------- | ---------: | ---------: | ---------: |
+| Beginning Balance    |     $100.0 |     $110.0 |     $122.0 |
+| Capital Expenditures |      $25.0 |      $30.0 |      $35.0 |
+| Depreciation         |    ($15.0) |    ($18.0) |    ($22.0) |
+| **Ending Balance**   | **$110.0** | **$122.0** | **$135.0** |
 ```
 
 ## Sample deliverables

{f8_engine-0.2.0 → f8_engine-0.3.1}/README.md

@@ -1,6 +1,6 @@
 # f8
 
-Financial modeling engine with compiler verification and live Excel formulas.
+Author, verify, and automate financial models with code and AI agents, compiled into live Excel workbooks.
 
 ## Who is f8 for
 
@@ -45,35 +45,36 @@ f8 guide --all   # streams the full DSL, function, and auditing guide to stdout
 ```python
 from f8 import Model
 
+years = ["2025A", "2026E", "2027E"]
+capex = {"2025A": 25.0, "2026E": 30.0, "2027E": 35.0}
+depr = {"2025A": -15.0, "2026E": -18.0, "2027E": -22.0}
+
 model = Model("Operating Forecast")
 sheet = model.add_sheet("Summary")
 
-pnl = sheet.add_table("PnL", "Three-Year Projection", "($ in millions)")
-pnl.add_column("item", role="descriptor", header="Line Item")
-for year in ["2025A", "2026E", "2027E"]:
-    pnl.add_column(year, header=year, format="currency", decimals=1)
+ppe = sheet.add_table("PPE", "PP&E Corkscrew Schedule", "($ in millions)")
+ppe.add_column("item", role="descriptor", header="Line Item")
+for year in years:
+    ppe.add_column(year, header=year, format="currency", decimals=1)
 
-pnl.add_row(
-    "revenue",
-    cells={"item": "Revenue", "2025A": 100.0},
-    expr='PnL["revenue", col.prev] * 1.25',
-)
-pnl.add_row(
-    "cogs",
-    cells={"item": "Cost of Revenue"},
-    expr='PnL["revenue", @col] * 0.30',
+ppe.add_row(
+    "beg_balance",
+    cells={"item": "Beginning Balance", "2025A": 100.0},
+    expr='PPE["end_balance", col.prev]',
 )
-pnl.add_row(
-    "gross_profit",
-    cells={"item": "Gross Profit"},
-    expr='PnL["revenue", @col] - PnL["cogs", @col]',
+ppe.add_row("capex", cells={"item": "Capital Expenditures", **capex})
+ppe.add_row("depreciation", cells={"item": "Depreciation", **depr})
+ppe.add_row(
+    "end_balance",
+    cells={"item": "Ending Balance"},
+    expr='SUM(PPE["beg_balance".."depreciation", @col])',
     style="total",
 )
 
 compiled = model.compile()
 
 # Audit evaluated values in memory (or pass view="formulas" to inspect lowered Excel formulas)
-print(compiled.table("PnL").to_markdown())
+print(compiled.table("PPE").to_markdown())
 
 # Emit a live .xlsx workbook with native Excel formulas and styling (you don't have to)
 compiled.save("forecast.xlsx")
@@ -82,11 +83,12 @@ compiled.save("forecast.xlsx")
 Output:
 
 ```markdown
-| Line Item        |     2025A |     2026E |      2027E |
-| :--------------- | --------: | --------: | ---------: |
-| Revenue          |    $100.0 |    $125.0 |     $156.2 |
-| Cost of Revenue  |     $30.0 |     $37.5 |      $46.9 |
-| **Gross Profit** | **$70.0** | **$87.5** | **$109.4** |
+| Line Item            |      2025A |      2026E |      2027E |
+| :------------------- | ---------: | ---------: | ---------: |
+| Beginning Balance    |     $100.0 |     $110.0 |     $122.0 |
+| Capital Expenditures |      $25.0 |      $30.0 |      $35.0 |
+| Depreciation         |    ($15.0) |    ($18.0) |    ($22.0) |
+| **Ending Balance**   | **$110.0** | **$122.0** | **$135.0** |
 ```
 
 ## Sample deliverables

{f8_engine-0.2.0 → f8_engine-0.3.1}/crates/f8-core/src/compiler/emission/workbook.rs

@@ -12,8 +12,9 @@ use super::format::{CellFormatKey, FormatCache, parse_hex_color};
 use crate::compiler::eval::EvaluatedModel;
 use crate::compiler::ir::cell::{CellGrid, CellPayload};
 use crate::compiler::ir::id::CellId;
-use crate::compiler::layout::LayoutMap;
+use crate::compiler::layout::{LayoutMap, StyleRole};
 use crate::compiler::lowering::LoweredFormulaMap;
+use crate::model::format::SemanticStyle;
 use crate::model::id::SheetId;
 use crate::model::manifest::ProjectManifest;
 use crate::model::table::{ColumnSpec, RowSpec, TableSpec, ValueLiteral};
@@ -274,7 +275,15 @@ impl WorkbookEmitter {
                             let col_idx = (placement.start_col + c_idx as u32) as u16;
                             match col_spec {
                                 ColumnSpec::Gutter => {
-                                    // Gutter column: blank unstyled cell across all header tiers
+                                    // Gutter column: continue header bottom border and fill across gutter
+                                    if is_bottom_tier || format_cache.has_col_header_fill() {
+                                        let fmt = if is_bottom_tier {
+                                            format_cache.col_header_format(false)
+                                        } else {
+                                            format_cache.col_header_upper_format(false)
+                                        };
+                                        worksheet.write_blank(tier_row, col_idx, &fmt)?;
+                                    }
                                 }
                                 ColumnSpec::Data(d) => {
                                     if t == 0 && d.group.is_some() {
@@ -349,10 +358,36 @@ impl WorkbookEmitter {
                             }
                         }
                         RowSpec::Data(row_data) => {
-                            for col_spec in &table.columns {
-                                let ColumnSpec::Data(col_data) = col_spec else {
-                                    // Column gutter: remains blank without borders
-                                    continue;
+                            for (c_idx, col_spec) in table.columns.iter().enumerate() {
+                                let col_data = match col_spec {
+                                    ColumnSpec::Data(d) => d,
+                                    ColumnSpec::Gutter => {
+                                        // Gutter column: continue row formatting (horizontal borders, shade, highlight)
+                                        let role = StyleRole {
+                                            horizontal: row_data
+                                                .style
+                                                .unwrap_or(SemanticStyle::Data),
+                                            vertical: SemanticStyle::Data,
+                                            is_highlight: row_data.highlight.unwrap_or(false),
+                                            shade: row_data.shade.filter(|s| !s.is_none()),
+                                        };
+
+                                        if role != StyleRole::data() {
+                                            let format_key = CellFormatKey::new(
+                                                role, None, None, None, false, false, 0,
+                                            );
+                                            let cell_format =
+                                                format_cache.get_cell_format(&format_key)?;
+                                            let phys_col =
+                                                (placement.start_col + c_idx as u32) as u16;
+                                            worksheet.write_blank(
+                                                current_phys_row,
+                                                phys_col,
+                                                &cell_format,
+                                            )?;
+                                        }
+                                        continue;
+                                    }
                                 };
 
                                 let cell_id = CellId::new(

{f8_engine-0.2.0 → f8_engine-0.3.1}/crates/f8-core/src/compiler/eval/model.rs

@@ -144,6 +144,7 @@ mod tests {
             subtitle: None,
             currency: None,
             collapsible: false,
+            placement: crate::model::table::PlacementSpec::default(),
             columns: vec![
                 ColumnSpec::new("c1"),
                 ColumnSpec::new("c2"),