settable date ranges

v2/app.py

@@ -5,6 +5,8 @@ import numpy as np
 import pandas as pd
 import gradio as gr
 from types import SimpleNamespace
+import datetime
+
 
 # from simulation import *
 from data_processing import *
@@ -115,7 +117,8 @@ def ui_refresh(
         solar_cell_num, solar_cell_nominal_capacity,
         bess_capacity_Ah, bess_voltage_V, bess_charge_kW, bess_discharge_kW,
         fixed_consumption_checkbox, fixed_consumption_kW,
-        base_price_HUFpkWh, peak_price_HUFpkWh):
+        base_price_HUFpkWh, peak_price_HUFpkWh,
+        week_a, week_b):
 
     if not fixed_consumption_checkbox:
         fixed_consumption_kW = None # None means use dataframe.
@@ -128,9 +131,22 @@ def ui_refresh(
 
     results = recalculate(ui)
 
-    # TODO generalize to other input ranges
-    fig1 = plotly_visualize_simulation(results, date_range=("2021-02-01", "2021-02-07"))
-    fig2 = plotly_visualize_simulation(results, date_range=("2021-08-02", "2021-08-08"))
+
+    # TODO this is a bit too vibey
+    start_a = (week_a if isinstance(week_a, datetime.datetime) else
+               datetime.datetime.fromisoformat(week_a))
+    end_a   = start_a + datetime.timedelta(days=6)
+
+    start_b = (week_b if isinstance(week_b, datetime.datetime) else
+               datetime.datetime.fromisoformat(week_b))
+    end_b   = start_b + datetime.timedelta(days=6)
+
+    date_range_a = (start_a.strftime("%Y-%m-%d"), end_a.strftime("%Y-%m-%d"))
+    date_range_b = (start_b.strftime("%Y-%m-%d"), end_b.strftime("%Y-%m-%d"))
+
+    fig1 = plotly_visualize_simulation(results, date_range=date_range_a)
+    fig2 = plotly_visualize_simulation(results, date_range=date_range_b)
+
 
     # (12, 3), the 3 indexed with (network, solar, bess):
     consumptions_in_mwh = monthly_analysis(results)
@@ -175,18 +191,32 @@ with gr.Blocks() as ui:
 
             run_btn = gr.Button("Run Simulation")
 
+        week_a_default = "2021-02-01" ; week_b_default = "2021-08-02"
+        # week_b_default = datetime.date(2021, 2, 1) ; week_b_default = datetime.date(2021, 8, 2)
+
         # RIGHT: Output display
         with gr.Column(scale=2):  # wider column
             html_out = gr.HTML()
-            plot1 = gr.Plot()
-            plot2 = gr.Plot()
-            plot3 = gr.Plot()
+            plot1 = gr.Plot(label="Monthly energy use")
+
+            # date selector + Plot 2
+            week_a = gr.DateTime(
+                value=week_a_default, include_time=False, label="Start date for Week A", type="string"
+            )
+            plot2 = gr.Plot(label="Week A")
+
+            # date selector + Plot 3
+            week_b = gr.DateTime(
+                value=week_b_default, include_time=False, label="Start date for Week B", type="string"
+            )
+            plot3 = gr.Plot(label="Week B")
 
     inputs = [
         solar_cell_num, solar_cell_nominal_capacity,
         bess_capacity_Ah, bess_voltage_V, bess_charge_kW, bess_discharge_kW,
         fixed_consumption_checkbox, fixed_consumption_kW,
-        base_price_HUFpkWh, peak_price_HUFpkWh
+        base_price_HUFpkWh, peak_price_HUFpkWh,
+        week_a, week_b
     ]
 
     run_btn.click(