chellow 1761571905.0.0__tar.gz → 1761645803.0.0__tar.gz

{chellow-1761571905.0.0 → chellow-1761645803.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1761571905.0.0
+Version: 1761645803.0.0
 Summary: Web Application for checking UK energy bills.
 Project-URL: Homepage, https://github.com/WessexWater/chellow
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)

chellow-1761645803.0.0/VERSION

@@ -0,0 +1 @@
+__version__ = "1761645803.0.0"

{chellow-1761571905.0.0 → chellow-1761645803.0.0}/chellow/e/views.py

@@ -104,7 +104,7 @@ from chellow.utils import (
     hh_range,
     parse_hh_start,
     parse_mpan_core,
-    req_bool,
+    req_checkbox,
     req_date,
     req_decimal,
     req_file,
@@ -230,7 +230,7 @@ def channel_add_get(era_id):
 @e.route("/eras/<int:era_id>/add_channel", methods=["POST"])
 def channel_add_post(era_id):
     try:
-        imp_related = req_bool("imp_related")
+        imp_related = req_checkbox("imp_related")
         channel_type = req_str("channel_type")
         era = Era.get_by_id(g.sess, era_id)
         channel = era.insert_channel(g.sess, imp_related, channel_type)
@@ -357,7 +357,7 @@ def channel_snags_get():
     else:
         contract = Contract.get_dc_by_id(g.sess, contract_id)
     days_hidden = req_int("days_hidden")
-    is_ignored = req_bool("is_ignored")
+    is_ignored = req_checkbox("is_ignored")
 
     cutoff_date = utc_datetime_now() - relativedelta(days=days_hidden)
 
@@ -435,7 +435,7 @@ def channel_snag_edit_get(snag_id):
 @e.route("/channel_snags/<int:snag_id>/edit", methods=["POST"])
 def channel_snag_edit_post(snag_id):
     try:
-        ignore = req_bool("ignore")
+        ignore = req_checkbox("ignore")
         snag = Snag.get_by_id(g.sess, snag_id)
         snag.set_is_ignored(ignore)
         g.sess.commit()
@@ -1532,7 +1532,7 @@ def dc_rate_script_edit_post(dc_rate_script_id):
         dc_contract = dc_rate_script.contract
         script = req_zish("script")
         start_date = req_date("start")
-        has_finished = req_bool("has_finished")
+        has_finished = req_checkbox("has_finished")
         finish_date = req_date("finish") if has_finished else None
         dc_contract.update_rate_script(
             g.sess, dc_rate_script, start_date, finish_date, script
@@ -1613,7 +1613,7 @@ def dno_rate_script_edit_post(dno_rate_script_id):
         dno = Party.get_dno_by_code(g.sess, contract.name, rate_script.start_date)
         script = req_zish("script")
         start_date = req_date("start")
-        has_finished = req_bool("has_finished")
+        has_finished = req_checkbox("has_finished")
         finish_date = req_date("finish") if has_finished else None
         contract.update_rate_script(
             g.sess, rate_script, start_date, finish_date, script
@@ -1817,7 +1817,7 @@ def era_edit_form_get(era_id):
         else:
             start_date = era.start_date
 
-        is_ended = req_bool("is_ended")
+        is_ended = req_checkbox("is_ended")
         if is_ended:
             if "finish_year" in request.values:
                 finish_date = req_hh_date("finish")
@@ -2176,7 +2176,7 @@ def era_edit_post(era_id):
             return chellow_redirect(f"/supplies/{era.supply.id}", 303)
         else:
             start_date = req_date("start")
-            is_ended = req_bool("is_ended")
+            is_ended = req_checkbox("is_ended")
             if is_ended:
                 finish_date = req_hh_date("finish")
             else:
@@ -2213,8 +2213,8 @@ def era_edit_post(era_id):
             else:
                 dtc_meter_type = DtcMeterType.get_by_id(g.sess, dtc_meter_type_id)
 
-            has_imp_mpan = req_bool("has_imp_mpan")
-            has_exp_mpan = req_bool("has_exp_mpan")
+            has_imp_mpan = req_checkbox("has_imp_mpan")
+            has_exp_mpan = req_checkbox("has_exp_mpan")
 
             if has_imp_mpan:
                 imp_mpan_core_raw = req_str("imp_mpan_core")
@@ -2637,7 +2637,7 @@ def llfc_edit_post(llfc_id):
         llfc = Llfc.get_by_id(g.sess, llfc_id)
         voltage_level_id = req_int("voltage_level_id")
         voltage_level = VoltageLevel.get_by_id(g.sess, voltage_level_id)
-        is_substation = req_bool("is_substation")
+        is_substation = req_checkbox("is_substation")
         llfc.update(
             llfc.description,
             voltage_level,
@@ -3583,7 +3583,7 @@ def mtc_participant_get(mtc_participant_id):
 def mtc_sscs_get():
     participant_id = req_int("participant_id")
     participant = Participant.get_by_id(g.sess, participant_id)
-    only_ongoing = req_bool("only_ongoing")
+    only_ongoing = req_checkbox("only_ongoing")
     q = (
         select(MtcSsc)
         .join(MtcParticipant)
@@ -3641,7 +3641,7 @@ def mtc_ssc_get(mtc_ssc_id):
 def mtc_llfcs_get():
     participant_id = req_int("participant_id")
     participant = Participant.get_by_id(g.sess, participant_id)
-    only_ongoing = req_bool("only_ongoing")
+    only_ongoing = req_checkbox("only_ongoing")
     q = (
         select(MtcLlfc)
         .join(MtcParticipant)
@@ -3699,7 +3699,7 @@ def mtc_llfc_get(mtc_llfc_id):
 def mtc_llfc_ssc_pcs_get():
     dno_id = req_int("dno_id")
     dno = Party.get_dno_by_id(g.sess, dno_id)
-    only_ongoing = req_bool("only_ongoing")
+    only_ongoing = req_checkbox("only_ongoing")
     q = (
         select(MtcLlfcSscPc)
         .join(Pc)
@@ -3786,7 +3786,7 @@ def mtc_llfc_ssc_pc_get(combo_id):
 def mtc_llfc_sscs_get():
     participant_id = req_int("participant_id")
     participant = Participant.get_by_id(g.sess, participant_id)
-    only_ongoing = req_bool("only_ongoing")
+    only_ongoing = req_checkbox("only_ongoing")
     q = (
         select(MtcLlfcSsc)
         .join(Llfc)
@@ -4072,7 +4072,13 @@ def site_energy_management_get(site_id):
     site = Site.get_by_id(g.sess, site_id)
 
     now = utc_datetime_now()
-    last_month = now - relativedelta(months=1)
+    now_ct = to_ct(now)
+    months = list(
+        c_months_u(finish_year=now_ct.year, finish_month=now_ct.month, months=2)
+    )
+    last_month_start, last_month_finish = months[0]
+    last_month_start_ct = to_ct(last_month_start)
+    last_month_finish_ct = to_ct(last_month_finish)
 
     supply_dicts = []
     for era in g.sess.scalars(
@@ -4096,7 +4102,10 @@ def site_energy_management_get(site_id):
         site=site,
         supply_dicts=supply_dicts,
         now=now,
-        last_month=last_month,
+        last_month_start=last_month_start,
+        last_month_finish=last_month_finish,
+        last_month_start_ct=last_month_start_ct,
+        last_month_finish_ct=last_month_finish_ct,
     )
 
 
@@ -4127,7 +4136,7 @@ def site_snag_edit_get(snag_id):
 @e.route("/site_snags/<int:snag_id>/edit", methods=["POST"])
 def site_snag_edit_post(snag_id):
     try:
-        ignore = req_bool("ignore")
+        ignore = req_checkbox("ignore")
         snag = Snag.get_by_id(g.sess, snag_id)
         snag.set_is_ignored(ignore)
         g.sess.commit()
@@ -4182,10 +4191,10 @@ def em_hh_data_get(site_id):
     caches = {}
     site = Site.get_by_id(g.sess, site_id)
 
-    year = req_int("year")
-    month = req_int("month")
+    timestamp = req_date("timestamp", resolution="month")
+    ts_ct = to_ct(timestamp)
     start_date, finish_date = next(
-        c_months_u(start_year=year, start_month=month, months=1)
+        c_months_u(start_year=ts_ct.year, start_month=ts_ct.month, months=1)
     )
 
     supplies = (
@@ -5909,7 +5918,7 @@ def supplier_rate_script_edit_post(rate_script_id):
         contract = rate_script.contract
         script = req_zish("script")
         start_date = req_date("start")
-        has_finished = req_bool("has_finished")
+        has_finished = req_checkbox("has_finished")
         finish_date = req_date("finish") if has_finished else None
         contract.update_rate_script(
             g.sess, rate_script, start_date, finish_date, script
@@ -6202,7 +6211,7 @@ def supply_get(supply_id):
 def supply_months_get(supply_id):
     supply = Supply.get_by_id(g.sess, supply_id)
 
-    is_import = req_bool("is_import")
+    is_import = req_checkbox("is_import")
     year = req_int("year")
     years = req_int("years")
 

{chellow-1761571905.0.0 → chellow-1761645803.0.0}/chellow/gas/views.py

@@ -51,7 +51,7 @@ from chellow.models import (
 from chellow.utils import (
     HH,
     csv_make_val,
-    req_bool,
+    req_checkbox,
     req_date,
     req_decimal,
     req_file,
@@ -869,7 +869,7 @@ def era_edit_post(g_era_id):
 
         else:
             start_date = req_date("start")
-            is_ended = req_bool("is_ended")
+            is_ended = req_checkbox("is_ended")
             finish_date = req_date("finish") if is_ended else None
             msn = req_str("msn")
             correction_factor = req_decimal("correction_factor")
@@ -1363,7 +1363,7 @@ def industry_rate_script_edit_post(g_rate_script_id):
         else:
             script = req_zish("script")
             start_date = req_date("start")
-            has_finished = req_bool("has_finished")
+            has_finished = req_checkbox("has_finished")
             finish_date = req_date("finish") if has_finished else None
             g_contract.update_g_rate_script(
                 g.sess, g_rate_script, start_date, finish_date, script
@@ -1729,7 +1729,7 @@ def supplier_rate_script_edit_post(g_rate_script_id):
         else:
             script = req_zish("script")
             start_date = req_date("start")
-            has_finished = req_bool("has_finished")
+            has_finished = req_checkbox("has_finished")
             finish_date = req_date("finish") if has_finished else None
             g_contract.update_g_rate_script(
                 g.sess, g_rate_script, start_date, finish_date, script

{chellow-1761571905.0.0 → chellow-1761645803.0.0}/chellow/reports/report_169.py

@@ -16,7 +16,7 @@ from chellow.utils import (
     ct_datetime,
     hh_range,
     parse_mpan_core,
-    req_bool,
+    req_checkbox,
     req_date,
     req_int,
     req_str,
@@ -249,9 +249,9 @@ def handle_request(mpan_cores=None):
 
     finish_date = to_utc(ct_datetime(finish_year, finish_month, finish_day, 23, 30))
 
-    imp_related = req_bool("imp_related")
+    imp_related = req_checkbox("imp_related")
     channel_type = req_str("channel_type")
-    is_zipped = req_bool("is_zipped")
+    is_zipped = req_checkbox("is_zipped")
     supply_id = req_int("supply_id") if "supply_id" in request.values else None
     user = g.user
     args = (

{chellow-1761571905.0.0 → chellow-1761645803.0.0}/chellow/reports/report_247.py

@@ -43,7 +43,7 @@ from chellow.utils import (
     hh_min,
     hh_range,
     make_val,
-    req_bool,
+    req_checkbox,
     req_int,
     req_str,
     to_utc,
@@ -1088,7 +1088,7 @@ def do_post(sess):
         scenario_props["scenario_start_month"] = start_date.month
         scenario_props["scenario_duration"] = months
 
-    scenario_props["by_hh"] = req_bool("by_hh")
+    scenario_props["by_hh"] = req_checkbox("by_hh")
 
     try:
         if "site_id" in request.values:
@@ -1116,7 +1116,7 @@ def do_post(sess):
                 exp_mpan_core if imp_mpan_core is None else imp_mpan_core
             ]
 
-        compression = req_bool("compression")
+        compression = req_checkbox("compression")
 
         user = g.user
 

{chellow-1761571905.0.0 → chellow-1761645803.0.0}/chellow/reports/report_59.py

@@ -42,7 +42,7 @@ from chellow.utils import (
     hh_range,
     make_val,
     parse_mpan_core,
-    req_bool,
+    req_checkbox,
     req_hh_date,
     req_int,
     req_str,
@@ -1011,7 +1011,7 @@ def content(
 
 def do_post(sess):
     base_name = ["duration"]
-    compression = req_bool("compression")
+    compression = req_checkbox("compression")
 
     try:
         if "scenario_id" in request.values:

{chellow-1761571905.0.0 → chellow-1761645803.0.0}/chellow/reports/report_channel_snags.py

@@ -28,7 +28,7 @@ from chellow.models import (
 from chellow.utils import (
     csv_make_val,
     hh_before,
-    req_bool,
+    req_checkbox,
     req_date,
     req_int,
     req_int_none,
@@ -242,10 +242,10 @@ LIMIT = 200
 def do_get(sess):
     contract_id = req_int_none("dc_contract_id")
     days_hidden = req_int("days_hidden")
-    is_ignored = req_bool("is_ignored")
-    only_ongoing = req_bool("only_ongoing")
+    is_ignored = req_checkbox("is_ignored")
+    only_ongoing = req_checkbox("only_ongoing")
     show_settlement = req_str("show_settlement")
-    as_csv = req_bool("as_csv")
+    as_csv = req_checkbox("as_csv")
     days_long_hidden = req_int_none("days_long_hidden")
     if "now_year" in request.values:
         now = req_date("now")

{chellow-1761571905.0.0 → chellow-1761645803.0.0}/chellow/reports/report_csv_site_hh_data.py

@@ -10,13 +10,13 @@ from sqlalchemy.orm import joinedload
 
 from chellow.dloads import open_file
 from chellow.models import Era, Session, Site, SiteEra, Source, Supply, User
-from chellow.utils import req_date, req_int, write_row
+from chellow.utils import req_checkbox, req_date, req_int, write_row
 
 
 TYPE_ORDER = {"hh": 0, "amr": 1, "nhh": 2, "unmetered": 3}
 
 
-def content(start_date, finish_date, site_id, user_id):
+def content(start_date, finish_date, site_id, user_id, exclude_virtual):
     try:
         with Session() as sess:
             user = User.get_by_id(sess, user_id)
@@ -82,7 +82,9 @@ def content(start_date, finish_date, site_id, user_id):
                 sources_str = ",".join(sorted(list(sources)))
                 generators_str = ",".join(sorted(list(generator_types)))
 
-                for hh in site.hh_data(sess, start_date, finish_date):
+                for hh in site.hh_data(
+                    sess, start_date, finish_date, exclude_virtual=exclude_virtual
+                ):
                     write_row(
                         writer,
                         site.code,
@@ -114,11 +116,12 @@ def content(start_date, finish_date, site_id, user_id):
 def do_get(sess):
     start_date = req_date("start")
     finish_date = req_date("finish")
+    exclude_virtual = req_checkbox("exclude_virtual")
     if "site_id" in request.values:
         site_id = req_int("site_id")
     else:
         site_id = None
 
-    args = start_date, finish_date, site_id, g.user.id
+    args = start_date, finish_date, site_id, g.user.id, exclude_virtual
     threading.Thread(target=content, args=args).start()
     return redirect("/downloads", 303)

{chellow-1761571905.0.0 → chellow-1761645803.0.0}/chellow/templates/e/em_hh_data.html

@@ -14,7 +14,6 @@
 {% block content %}
 	<form action="/e/sites/{{site.id}}/energy_management/hh_data">
 		<fieldset>						
-			<label>Site Code </label> {{input_text('site_code', site.code)}}
 			<label>Month</label> {{input_date(resolution='month')}}
 			<input type="submit" value="Show">
 		</fieldset>

{chellow-1761571905.0.0 → chellow-1761645803.0.0}/chellow/templates/e/em_site.html

@@ -82,13 +82,24 @@
 
 	<ul>
 		<li>
-			<a href="/e/sites/{{site.id}}/energy_management/months?finish_year={{last_month.year}}&finish_month={{last_month.month}}">Site Data By Month</a>
+			<a href="/e/sites/{{site.id}}/energy_management/months?finish_year={{last_month_start_ct.year}}&finish_month={{last_month_start_ct.month}}">Site Data By Month</a>
 		</li>
 		<li>
-			<a href="/e/sites/{{site.id}}/energy_management/hh_data?year={{now.year}}&month={{now.month}}">HH Data</a>
+			<a href="/e/sites/{{site.id}}/energy_management/hh_data?timestamp_year={{now.year}}&timestamp_month={{now.month}}">HH Data</a>
 		</li>
 	</ul>
 
+	<form action="/reports/csv_site_hh_data">
+		<fieldset>
+			<input type="hidden" name="site_id" value="{{site.id}}">
+			<input type="hidden" name="exclude_virtual" value="true">
+			<legend>HH Data CSV: HH Per Row Format</legend>
+			<label>From</label> {{input_date('start', last_month_start)}}
+			<label>To</label> {{input_date('finish', last_month_finish)}}
+			<input type="submit" value="Download">
+		</fieldset>
+	</form>
+
 	<form hx-get="/e/sites/{{site.id}}/energy_management/totals">
 		<fieldset>
 			<legend>Calculate virtual bills for the last 12 months</legend>

{chellow-1761571905.0.0 → chellow-1761645803.0.0}/chellow/utils.py

@@ -37,6 +37,19 @@ def req_strs(name):
 
 
 def req_bool(name):
+    val = req_str(name)
+    if val == "true":
+        return True
+    elif val == "false":
+        return False
+    else:
+        raise BadRequest(
+            f"Problem parsing the field {name} with values {val} as a boolean: "
+            f"expected 'true' or 'false'."
+        )
+
+
+def req_checkbox(name):
     return name in request.values
 
 

{chellow-1761571905.0.0 → chellow-1761645803.0.0}/chellow/views.py

@@ -115,7 +115,7 @@ from chellow.utils import (
     ct_datetime,
     ct_datetime_now,
     hh_range,
-    req_bool,
+    req_checkbox,
     req_date,
     req_decimal,
     req_file,
@@ -1406,7 +1406,7 @@ def report_run_get(run_id):
         else:
             element = "problem"
 
-        hide_checked = req_bool("hide_checked")
+        hide_checked = req_checkbox("hide_checked")
 
         ROW_LIMIT = 200
         q = select(ReportRunRow).where(ReportRunRow.report_run == run).limit(ROW_LIMIT)
@@ -1627,7 +1627,7 @@ def report_run_delete(run_id):
 @home.route("/report_runs/<int:run_id>", methods=["POST"])
 def report_run_post(run_id):
     run = g.sess.scalar(select(ReportRun).where(ReportRun.id == run_id))
-    keep = req_bool("keep")
+    keep = req_checkbox("keep")
 
     run_data = run.data
     run_data["keep"] = keep
@@ -1749,7 +1749,7 @@ def report_run_row_post(row_id):
     row = g.sess.query(ReportRunRow).filter(ReportRunRow.id == row_id).one()
 
     if row.report_run.name == "bill_check":
-        is_checked = req_bool("is_checked")
+        is_checked = req_checkbox("is_checked")
         note = req_str("note")
 
         properties = row.data.get("properties", {})

{chellow-1761571905.0.0 → chellow-1761645803.0.0}/test/e/test_views.py

@@ -987,14 +987,7 @@ def test_em_hh_data(sess, client):
     insert_voltage_levels(sess)
     voltage_level = VoltageLevel.get_by_code(sess, "HV")
     llfc = dno.insert_llfc(
-        sess,
-        "510",
-        "PC 5-8 & HH HV",
-        voltage_level,
-        False,
-        True,
-        utc_datetime(1996, 1, 1),
-        None,
+        sess, "510", "PC 5-8 & HH HV", voltage_level, False, True, vf, None
     )
     MtcLlfc.insert(sess, mtc_participant, llfc, vf, None)
     insert_sources(sess)
@@ -1047,7 +1040,8 @@ def test_em_hh_data(sess, client):
     sess.commit()
 
     response = client.get(
-        f"/e/sites/{site.id}/energy_management/hh_data?year=2020&month=01"
+        f"/e/sites/{site.id}/energy_management/hh_data?"
+        f"timestamp_year=2020&timestamp_month=01"
     )
 
     match(response, 200, "88.7")

{chellow-1761571905.0.0 → chellow-1761645803.0.0}/test/reports/test_report_csv_site_hh_data.py

@@ -16,7 +16,8 @@ def test_do_get(client, mocker, sess):
     start_date = to_utc(ct_datetime(2020, 1, 1))
     finish_date = to_utc(ct_datetime(2020, 1, 31, 23, 30))
     site_id = None
-    expected_args = start_date, finish_date, site_id, user.id
+    exclude_virtual = False
+    expected_args = start_date, finish_date, site_id, user.id, exclude_virtual
     query_string = {
         "start_year": "2020",
         "start_month": "01",
@@ -51,7 +52,8 @@ def test_content(mocker, sess):
 
     start_date = to_utc(ct_datetime(2024, 6, 1))
     finish_date = to_utc(ct_datetime(2024, 6, 1))
-    content(start_date, finish_date, site_id, user_id)
+    exclude_virtual = False
+    content(start_date, finish_date, site_id, user_id, exclude_virtual)
     mock_file.seek(0)
     actual = list(csv.reader(mock_file))
     expected = [

chellow-1761571905.0.0/VERSION

@@ -1 +0,0 @@
-__version__ = "1761571905.0.0"