From a8f2b4f4f62b84f28c3082e12a32b28f850ec0e2 Mon Sep 17 00:00:00 2001
From: thePR0M3TH3AN <53631862+PR0M3TH3AN@users.noreply.github.com>
Date: Sat, 31 May 2025 08:28:40 -0400
Subject: [PATCH] Add timestamped default output naming

---
 README.md                                 |  4 ++++
 scripts/bitcoin_m2_chart.py               | 17 +++++++++++++++--
 scripts/custom_chart.py                   | 17 +++++++++++++++--
 scripts/lagged_oil_unrate_chart_styled.py | 20 +++++++++++++++++---
 4 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 82cce51..909ede8 100644
--- a/README.md
+++ b/README.md
@@ -95,6 +95,10 @@ To add new data and plot it later:
 The plotting script validates that both series contain data for the
 requested period before rendering the chart.
 
+If no `--output` path is provided, each script automatically saves the figure to
+`outputs/<script>_<timestamp>.png`, where `<script>` is the script's base name
+and `<timestamp>` is the current date and time in `YYYYMMDD_HHMMSS` format.
+
 | Option           | Description                                     |
 | ---------------- | ----------------------------------------------- |
 | `--offset`       | Lag in months (pos = oil leads; neg = oil lags) |
diff --git a/scripts/bitcoin_m2_chart.py b/scripts/bitcoin_m2_chart.py
index 9d330d7..51bee70 100644
--- a/scripts/bitcoin_m2_chart.py
+++ b/scripts/bitcoin_m2_chart.py
@@ -22,6 +22,20 @@ from dateutil.relativedelta import relativedelta
 import sqlite3
 
 
+def save_figure(fig: plt.Figure, output: str | None, script_path: str) -> Path:
+    """Save ``fig`` to ``output`` or a timestamped path under ``outputs/``."""
+    out_path = (
+        Path(output)
+        if output is not None
+        else Path("outputs")
+        / f"{Path(script_path).stem}_{datetime.now().strftime('%Y%m%d_%H%M%S')}.png"
+    )
+    out_path.parent.mkdir(parents=True, exist_ok=True)
+    fig.savefig(out_path)
+    print(f"Saved figure to {out_path}")
+    return out_path
+
+
 def fetch_series(
     start: datetime,
     end: datetime,
@@ -140,8 +154,7 @@ def main(argv: list[str] | None = None) -> plt.Figure:
     btc, m2 = fetch_series(start_dt, end_dt, args.btc_series, args.m2_series, args.db)
     fig = plot_bitcoin_m2(btc, m2, args.offset_days, args.extend_years)
 
-    if args.output:
-        fig.savefig(args.output)
+    save_figure(fig, args.output, __file__)
     if argv is None:
         fig.show()
     return fig
diff --git a/scripts/custom_chart.py b/scripts/custom_chart.py
index 9390a9f..915f500 100644
--- a/scripts/custom_chart.py
+++ b/scripts/custom_chart.py
@@ -20,6 +20,20 @@ import pandas as pd
 import sqlite3
 
 
+def save_figure(fig: plt.Figure, output: str | None, script_path: str) -> Path:
+    """Save ``fig`` to ``output`` or a timestamped path under ``outputs/``."""
+    out_path = (
+        Path(output)
+        if output is not None
+        else Path("outputs")
+        / f"{Path(script_path).stem}_{datetime.now().strftime('%Y%m%d_%H%M%S')}.png"
+    )
+    out_path.parent.mkdir(parents=True, exist_ok=True)
+    fig.savefig(out_path)
+    print(f"Saved figure to {out_path}")
+    return out_path
+
+
 def fetch_series_multi(
     series: Iterable[str],
     start: datetime,
@@ -97,8 +111,7 @@ def main(argv: list[str] | None = None) -> plt.Figure:
     data = fetch_series_multi(args.series, start_dt, end_dt, args.db)
     fig = plot_series(data)
 
-    if args.output:
-        fig.savefig(args.output)
+    save_figure(fig, args.output, __file__)
     if argv is None:
         fig.show()
     return fig
diff --git a/scripts/lagged_oil_unrate_chart_styled.py b/scripts/lagged_oil_unrate_chart_styled.py
index d846d41..cb65e43 100644
--- a/scripts/lagged_oil_unrate_chart_styled.py
+++ b/scripts/lagged_oil_unrate_chart_styled.py
@@ -23,6 +23,20 @@ from dateutil.relativedelta import relativedelta
 import sqlite3
 
 
+def save_figure(fig: plt.Figure, output: str | None, script_path: str) -> Path:
+    """Save ``fig`` to ``output`` or a timestamped path under ``outputs/``."""
+    out_path = (
+        Path(output)
+        if output is not None
+        else Path("outputs")
+        / f"{Path(script_path).stem}_{datetime.now().strftime('%Y%m%d_%H%M%S')}.png"
+    )
+    out_path.parent.mkdir(parents=True, exist_ok=True)
+    fig.savefig(out_path)
+    print(f"Saved figure to {out_path}")
+    return out_path
+
+
 # ──────────────────────────────────────────────────────────────────────────
 # Data helpers
 # ──────────────────────────────────────────────────────────────────────────
@@ -217,7 +231,7 @@ def plot_lagged(
 # ──────────────────────────────────────────────────────────────────────────
 # CLI
 # ──────────────────────────────────────────────────────────────────────────
-def main() -> None:
+def main() -> plt.Figure:
     p = argparse.ArgumentParser()
     p.add_argument(
         "-o",
@@ -264,9 +278,9 @@ def main() -> None:
     unrate, oil = fetch_series(start_dt, end_dt, args.db)
     validate_series(unrate, oil)
     fig = plot_lagged(unrate, oil, args.offset, start_dt, end_dt, args.extend_years)
-    if args.output:
-        fig.savefig(args.output)
+    save_figure(fig, args.output, __file__)
     fig.show()
+    return fig
 
 
 if __name__ == "__main__":