chellow 1733390302.0.0__py3-none-any.whl → 1734005435.0.0__py3-none-any.whl

chellow/views.py

@@ -10,7 +10,6 @@ import traceback
 import types
 from collections import OrderedDict
 from datetime import datetime as Datetime
-from decimal import Decimal
 from functools import wraps
 from importlib import import_module
 from io import DEFAULT_BUFFER_SIZE, StringIO
@@ -50,7 +49,6 @@ from sqlalchemy import (
     true,
 )
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import joinedload
 from sqlalchemy.orm.attributes import flag_modified
 
 from werkzeug.exceptions import BadRequest, Forbidden
@@ -135,19 +133,9 @@ from chellow.utils import (
 home = Blueprint("home", __name__, url_prefix="", template_folder="templates")
 
 
-def chellow_redirect(path, code=None):
-    location = chellow.utils.url_root + path
-    if code is None:
-        res = redirect(location)
-    else:
-        res = redirect(location, code)
-
-    return res
-
-
 def hx_redirect(path, status=None):
     res = Response(status=status)
-    res.headers["HX-Redirect"] = chellow.utils.url_root + path
+    res.headers["HX-Redirect"] = path
     return res
 
 
@@ -165,7 +153,7 @@ def requires_editor(f):
 @home.route("/configuration", methods=["GET"])
 def configuration():
     config = Contract.get_non_core_by_name(g.sess, "configuration")
-    return chellow_redirect(f"/non_core_contracts/{config.id}")
+    return redirect(f"/non_core_contracts/{config.id}")
 
 
 @home.route("/health")
@@ -215,7 +203,7 @@ def local_reports_post():
             return Response("There's already a report with that name.", status=400)
         else:
             raise
-    return chellow_redirect(f"/local_reports/{report.id}", 303)
+    return redirect(f"/local_reports/{report.id}", 303)
 
 
 @home.route("/local_reports/<int:report_id>")
@@ -229,7 +217,7 @@ def local_report_post(report_id):
     report = Report.get_by_id(g.sess, report_id)
     if "delete" in request.values:
         g.sess.delete(report)
-        return chellow_redirect("/local_reports", 303)
+        return redirect("/local_reports", 303)
 
     else:
         name = req_str("name")
@@ -243,7 +231,7 @@ def local_report_post(report_id):
                 return Response("There's already a report with that name.", status=400)
             else:
                 raise
-        return chellow_redirect(f"/local_reports/{report.id}", 303)
+        return redirect(f"/local_reports/{report.id}", 303)
 
 
 @home.route("/scenarios")
@@ -259,7 +247,7 @@ def scenario_add_post():
         properties = req_zish("properties")
         scenario = Scenario.insert(g.sess, name, properties)
         g.sess.commit()
-        return chellow_redirect(f"/scenarios/{scenario.id}", 303)
+        return redirect(f"/scenarios/{scenario.id}", 303)
     except BadRequest as e:
         g.sess.rollback()
         flash(e.description)
@@ -352,16 +340,13 @@ def scenario_edit_post(scenario_id):
         properties = req_zish("properties")
         scenario.update(name, properties)
         g.sess.commit()
-        return chellow_redirect(f"/scenarios/{scenario.id}", 303)
+        return redirect(f"/scenarios/{scenario.id}", 303)
     except BadRequest as e:
         g.sess.rollback()
         description = e.description
         flash(description)
         return make_response(
-            render_template(
-                "scenario_edit.html",
-                scenario=scenario,
-            ),
+            render_template("scenario_edit.html", scenario=scenario),
             400,
         )
 
@@ -372,9 +357,7 @@ def scenario_edit_delete(scenario_id):
         scenario = Scenario.get_by_id(g.sess, scenario_id)
         scenario.delete(g.sess)
         g.sess.commit()
-        res = make_response()
-        res.headers["HX-Redirect"] = f"{chellow.utils.url_root}/e/scenarios"
-        return res
+        return hx_redirect("/scenarios")
     except BadRequest as e:
         g.sess.rollback()
         flash(e.description)
@@ -633,7 +616,7 @@ def users_post():
             party = g.sess.query(Party).get(party_id)
         user = User.insert(g.sess, email_address, password, role, party)
         g.sess.commit()
-        return chellow_redirect("/users/" + str(user.id), 303)
+        return redirect("/users/" + str(user.id), 303)
     except BadRequest as e:
         g.sess.rollback()
         flash(e.description)
@@ -669,11 +652,11 @@ def user_post(user_id):
                 raise BadRequest("The password must be at least 6 characters long.")
             user.set_password(new_password)
             g.sess.commit()
-            return chellow_redirect("/users/" + str(user.id), 303)
+            return redirect("/users/" + str(user.id), 303)
         elif "delete" in request.values:
             g.sess.delete(user)
             g.sess.commit()
-            return chellow_redirect("/users", 303)
+            return redirect("/users", 303)
         else:
             email_address = req_str("email_address")
             user_role_code = req_str("user_role_code")
@@ -684,7 +667,7 @@ def user_post(user_id):
                 party = Party.get_by_id(g.sess, party_id)
             user.update(email_address, user_role, party)
             g.sess.commit()
-            return chellow_redirect("/users/" + str(user.id), 303)
+            return redirect("/users/" + str(user.id), 303)
     except BadRequest as e:
         flash(e.description)
         parties = (
@@ -743,7 +726,7 @@ def general_imports_post():
         )
         f.seek(0)
         proc_id = chellow.general_import.start_process(f)
-        return chellow_redirect("/general_imports/" + str(proc_id), 303)
+        return redirect(f"/general_imports/{proc_id}", 303)
     except BadRequest as e:
         flash(e.description)
         return render_template(
@@ -921,7 +904,7 @@ def site_edit_post(site_id):
             site.delete(g.sess)
             g.sess.commit()
             flash("Site deleted successfully.")
-            return chellow_redirect("/sites", 303)
+            return redirect("/sites", 303)
 
         elif "update" in request.form:
             code = req_str("code")
@@ -929,7 +912,7 @@ def site_edit_post(site_id):
             site.update(code, name)
             g.sess.commit()
             flash("Site updated successfully.")
-            return chellow_redirect(f"/sites/{site.id}", 303)
+            return redirect(f"/sites/{site.id}", 303)
 
         elif "insert_gas" in request.form:
             name = req_str("name")
@@ -967,7 +950,7 @@ def site_edit_post(site_id):
                 soq,
             )
             g.sess.commit()
-            return chellow_redirect(f"/g/supplies/{g_supply.id}", 303)
+            return redirect(f"/g/supplies/{g_supply.id}", 303)
         else:
             raise BadRequest(
                 "The request must contain one of the following parameter names: "
@@ -1049,7 +1032,7 @@ def site_add_post():
         name = req_str("name")
         site = Site.insert(g.sess, code, name)
         g.sess.commit()
-        return chellow_redirect("/sites/" + str(site.id), 303)
+        return redirect(f"/sites/{site.id}", 303)
     except BadRequest as e:
         flash(e.description)
         return render_template("site_add.html")
@@ -1079,7 +1062,7 @@ def sites_get():
         )
 
         if len(sites) == 1:
-            return chellow_redirect(f"/sites/{sites[0].id}")
+            return redirect(f"/sites/{sites[0].id}")
         else:
             return render_template("sites.html", sites=sites, limit=LIMIT)
     else:
@@ -1147,9 +1130,9 @@ limit :max_results"""
         )
 
         if len(e_eras) == 1 and len(g_eras) == 0:
-            return chellow_redirect(f"/e/supplies/{e_eras[0].supply.id}", 307)
+            return redirect(f"/e/supplies/{e_eras[0].supply.id}", 307)
         elif len(e_eras) == 0 and len(g_eras) == 1:
-            return chellow_redirect(f"/g/supplies/{g_eras[0].g_supply.id}", 307)
+            return redirect(f"/g/supplies/{g_eras[0].g_supply.id}", 307)
         else:
             return render_template(
                 "supplies.html", e_eras=e_eras, g_eras=g_eras, max_results=max_results
@@ -1170,123 +1153,6 @@ def report_post(report_id):
     return report_module.do_post(g.sess)
 
 
-@home.route("/sites/<int:site_id>/hh_data")
-def site_hh_data_get(site_id):
-    caches = {}
-    site = Site.get_by_id(g.sess, site_id)
-
-    year = req_int("year")
-    month = req_int("month")
-    start_date, finish_date = next(
-        c_months_u(start_year=year, start_month=month, months=1)
-    )
-
-    supplies = (
-        g.sess.query(Supply)
-        .join(Era)
-        .join(SiteEra)
-        .join(Source)
-        .filter(
-            SiteEra.site == site,
-            SiteEra.is_physical == true(),
-            Era.start_date <= finish_date,
-            or_(Era.finish_date == null(), Era.finish_date >= start_date),
-            Source.code != "sub",
-        )
-        .order_by(Supply.id)
-        .distinct()
-        .options(joinedload(Supply.source), joinedload(Supply.generator_type))
-        .all()
-    )
-
-    data = iter(
-        g.sess.query(HhDatum)
-        .join(Channel)
-        .join(Era)
-        .filter(
-            Channel.channel_type == "ACTIVE",
-            Era.supply_id.in_([s.id for s in supplies]),
-            HhDatum.start_date >= start_date,
-            HhDatum.start_date <= finish_date,
-        )
-        .order_by(HhDatum.start_date, Era.supply_id)
-        .options(
-            joinedload(HhDatum.channel)
-            .joinedload(Channel.era)
-            .joinedload(Era.supply)
-            .joinedload(Supply.source)
-        )
-    )
-    datum = next(data, None)
-
-    hh_data = []
-    for hh_date in hh_range(caches, start_date, finish_date):
-        sups = []
-        hh_dict = {
-            "start_date": hh_date,
-            "supplies": sups,
-            "export_kwh": Decimal(0),
-            "import_kwh": Decimal(0),
-            "parasitic_kwh": Decimal(0),
-            "generated_kwh": Decimal(0),
-            "third_party_import_kwh": Decimal(0),
-            "third_party_export_kwh": Decimal(0),
-        }
-        hh_data.append(hh_dict)
-        for supply in supplies:
-            sup_hh = {}
-            sups.append(sup_hh)
-            while (
-                datum is not None
-                and datum.start_date == hh_date
-                and datum.channel.era.supply_id == supply.id
-            ):
-                channel = datum.channel
-                imp_related = channel.imp_related
-                source_code = channel.era.supply.source.code
-
-                prefix = "import_" if imp_related else "export_"
-                sup_hh[f"{prefix}kwh"] = datum.value
-                sup_hh[f"{prefix}status"] = datum.status
-
-                if not imp_related and source_code in ("grid", "gen-grid"):
-                    hh_dict["export_kwh"] += datum.value
-                if imp_related and source_code in ("grid", "gen-grid"):
-                    hh_dict["import_kwh"] += datum.value
-                if (imp_related and source_code == "gen") or (
-                    not imp_related and source_code == "gen-grid"
-                ):
-                    hh_dict["generated_kwh"] += datum.value
-                if (not imp_related and source_code == "gen") or (
-                    imp_related and source_code == "gen-grid"
-                ):
-                    hh_dict["parasitic_kwh"] += datum.value
-                if (imp_related and source_code == "3rd-party") or (
-                    not imp_related and source_code == "3rd-party-reverse"
-                ):
-                    hh_dict["third_party_import_kwh"] += datum.value
-                if (not imp_related and source_code == "3rd-party") or (
-                    imp_related and source_code == "3rd-party-reverse"
-                ):
-                    hh_dict["third_party_export_kwh"] += datum.value
-                datum = next(data, None)
-
-        hh_dict["displaced_kwh"] = (
-            hh_dict["generated_kwh"] - hh_dict["export_kwh"] - hh_dict["parasitic_kwh"]
-        )
-        hh_dict["used_kwh"] = sum(
-            (
-                hh_dict["import_kwh"],
-                hh_dict["displaced_kwh"],
-                hh_dict["third_party_import_kwh"] - hh_dict["third_party_export_kwh"],
-            )
-        )
-
-    return render_template(
-        "site_hh_data.html", site=site, supplies=supplies, hh_data=hh_data
-    )
-
-
 @home.route("/sites/<int:site_id>")
 def site_get(site_id):
     configuration_contract = Contract.get_non_core_by_name(g.sess, "configuration")
@@ -1595,7 +1461,7 @@ def report_run_post(run_id):
     run = g.sess.query(ReportRun).filter(ReportRun.id == run_id).one()
     run.delete(g.sess)
     g.sess.commit()
-    return chellow_redirect("/report_runs", 303)
+    return redirect("/report_runs", 303)
 
 
 @home.route("/report_runs/<int:run_id>/spreadsheet")
@@ -1705,7 +1571,7 @@ def report_run_row_post(row_id):
         g.sess.commit()
         flash("Update successful")
 
-    return chellow_redirect(f"/report_run_rows/{row_id}", 303)
+    return redirect(f"/report_run_rows/{row_id}", 303)
 
 
 @home.route("/non_core_contracts")
@@ -1905,17 +1771,17 @@ def non_core_contract_edit_post(contract_id):
         if "delete" in request.values:
             contract.delete(g.sess)
             g.sess.commit()
-            return chellow_redirect("/non_core_contracts", 303)
+            return redirect("/non_core_contracts", 303)
         if "update_state" in request.values:
             state = req_zish("state")
             contract.update_state(state)
             g.sess.commit()
-            return chellow_redirect(f"/non_core_contracts/{contract.id}", 303)
+            return redirect(f"/non_core_contracts/{contract.id}", 303)
         else:
             properties = req_zish("properties")
             contract.update_properties(properties)
             g.sess.commit()
-            return chellow_redirect(f"/non_core_contracts/{contract.id}", 303)
+            return redirect(f"/non_core_contracts/{contract.id}", 303)
     except BadRequest as e:
         flash(e.description)
         return make_response(
@@ -2014,7 +1880,7 @@ def national_grid_get():
 def national_grid_post():
     importer = chellow.national_grid.importer
     importer.go()
-    return chellow_redirect("/national_grid", 303)
+    return redirect("/national_grid", 303)
 
 
 @home.route("/non_core_contracts/<int:contract_id>/add_rate_script")
@@ -2037,7 +1903,7 @@ def non_core_rate_script_add_post(contract_id):
         start_date = req_date("start")
         rate_script = contract.insert_rate_script(g.sess, start_date, {})
         g.sess.commit()
-        return chellow_redirect("/non_core_rate_scripts/" + str(rate_script.id), 303)
+        return redirect(f"/non_core_rate_scripts/{rate_script.id}", 303)
     except BadRequest as e:
         flash(e.description)
         now = utc_datetime_now()
@@ -2109,7 +1975,7 @@ def non_core_rate_script_edit_post(rs_id):
         if "delete" in request.values:
             contract.delete_rate_script(g.sess, rate_script)
             g.sess.commit()
-            return chellow_redirect(f"/non_core_contracts/{contract.id}", 303)
+            return redirect(f"/non_core_contracts/{contract.id}", 303)
         else:
             script = req_zish("script")
             start_date = req_hh_date("start")
@@ -2121,7 +1987,7 @@ def non_core_rate_script_edit_post(rs_id):
                 g.sess, rate_script, start_date, finish_date, script
             )
             g.sess.commit()
-            return chellow_redirect(f"/non_core_rate_scripts/{rate_script.id}", 303)
+            return redirect(f"/non_core_rate_scripts/{rate_script.id}", 303)
     except BadRequest as e:
         g.sess.rollback()
         flash(e.description)
@@ -2152,7 +2018,7 @@ def non_core_auto_importer_post(contract_id):
         except ModuleNotFoundError:
             importer = import_module(f"chellow.e.{contract.name}").get_importer()
         importer.go()
-        return chellow_redirect(f"/non_core_contracts/{contract.id}/auto_importer", 303)
+        return redirect(f"/non_core_contracts/{contract.id}/auto_importer", 303)
     except BadRequest as e:
         g.sess.rollback()
         flash(e.description)
@@ -2262,7 +2128,7 @@ def rate_server_get():
 def rate_server_post():
     importer = chellow.rate_server.importer
     importer.go()
-    return chellow_redirect("/rate_server", 303)
+    return redirect("/rate_server", 303)
 
 
 @home.route("/tester")
@@ -2275,7 +2141,7 @@ def tester_get():
 def tester_post():
     tester = chellow.testing.tester
     tester.go()
-    return chellow_redirect("/tester", 303)
+    return redirect("/tester", 303)
 
 
 @home.route("/user_roles")

{chellow-1733390302.0.0.dist-info → chellow-1734005435.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1733390302.0.0
+Version: 1734005435.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-1733390302.0.0.dist-info → chellow-1734005435.0.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-chellow/__init__.py,sha256=ML9TeTCsCbEEjXLwe9BjeSe9WDj9VVgfdfW-D74oxVU,9785
+chellow/__init__.py,sha256=S1IjQChkEMA_MfzE5F1pPP-54bz_CRH4KE9X6SgX8bI,9722
 chellow/api.py,sha256=mk17TfweR76DPFC8lX2SArTjai6y6YshASxqO1w-_-s,11036
 chellow/bank_holidays.py,sha256=T_utYMwe_g1dz5X-aOTdIPryg49SvB7QsWM1yphlqG8,4423
 chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
@@ -11,8 +11,8 @@ chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 chellow/rate_server.py,sha256=fg-Pf_9Hk3bXmC9riPQNGQxBvLvBa_WtNYdwDCjnCSg,5678
 chellow/rrun.py,sha256=1Kt2q_K9UoDG_nsZz-Q6XJiMNKroWqlqFdxn2M6Q8CA,2088
 chellow/testing.py,sha256=Od4HHH6pZrhJ_De118_F55RJEKmAvhUH2S24QE9qFQk,3635
-chellow/utils.py,sha256=32qPWEGzCPKPhSM7ztpzcR6ZG74sVZanScDIdK50Rq4,19308
-chellow/views.py,sha256=qJrvhVjb3KL_sHDQl5dLhi0aqUe_IUYhrjiPjdk4lQI,84317
+chellow/utils.py,sha256=Ej7dsbQ6Ee8X2aZ7B2Vs-hUFCsMABioAdOV1DJjwY-0,19293
+chellow/views.py,sha256=OlNGtFB9OatQPMzHiXTjBoGOSnFT7cC38GA2x7rtcFg,79490
 chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/aahedc.py,sha256=d2usudp7KYWpU6Pk3fal5EQ47EbvkvKeaFGylnb3NWw,606
 chellow/e/bill_importer.py,sha256=7UcnqNlKbJc2GhW9gy8sDp9GuqambJVpZLvbafOZztA,7411
@@ -20,7 +20,7 @@ chellow/e/bmarketidx.py,sha256=C0BaHn2RxIuWH2QzA-OmSP0fbUGvW9tqEUhLnzOEdmA,7968
 chellow/e/bsuos.py,sha256=hdP9vnOJSuZl46OAkJeUg1XJYvYIBj4J6Sqce1Hy9Vs,15542
 chellow/e/ccl.py,sha256=30dh_SvlgzsTQPPAJNZWILaMvbeDsv9-P-S1JxS5_SQ,3184
 chellow/e/cfd.py,sha256=Gm435c42LFwZx1n-1UY1Tdx6mL1is7E0vRLWQe8RPOo,14184
-chellow/e/computer.py,sha256=jslEeLsSHbu4l95WDIHCytL2Fced-kLtyxZtvm2WEtg,67597
+chellow/e/computer.py,sha256=Fq4SpEvCLArZHOGgSGqvm7mdAVLiswnNWspuuft4h70,67460
 chellow/e/dno_rate_parser.py,sha256=A5TP6KjyfT5lVWh7dX4SiXRi6wnf2lGv-H_T4Sod8CI,21731
 chellow/e/duos.py,sha256=nwviRjz-qIt3GxIMHk0hItIT4dtKsxOWq9TUC1z-hO8,30864
 chellow/e/elexon.py,sha256=ALhXS9Es7PV0z9ukPbIramn3cf3iLyFi-PMWPSm5iOs,5487
@@ -43,7 +43,7 @@ chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,623
 chellow/e/tlms.py,sha256=M33D6YpMixu2KkwSCzDRM3kThLgShg8exp63Obo75l8,8905
 chellow/e/tnuos.py,sha256=NBmc-f3oezrl4gviAKobljHfICTpBKxxxEGBGJi_lRk,4927
 chellow/e/triad.py,sha256=lIQj7EdUrcFwEqleuHZXYU_bfzIwNOqUVVxB3NPQt4A,13710
-chellow/e/views.py,sha256=ZISAhDQZHM8j0VKdMOqfNBtwSLTE9c0OtnsGVCaT0kE,216706
+chellow/e/views.py,sha256=VkoB3-jgydp-2RMdlYVvSL4UVUmt7wMnCJpHSBdf1jM,220753
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=UgWXDPzQkQghyj_lfgBqoSJpHB-t-qOdSaB8qY6GLog,4071
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=-HMoIfa_utXYKA44RuC0Xqv3vd2HLeQU_4P0iBUd3WA,4219
@@ -58,7 +58,7 @@ chellow/e/bill_parsers/gdf_csv.py,sha256=ZfK3Oc6oP28p_P9DIevLNB_zW2WLcEJ3Lvb1gL3
 chellow/e/bill_parsers/haven_csv.py,sha256=0uENq8IgVNqdxfBQMBxLTSZWCOuDHXZC0xzk52SbfyE,13652
 chellow/e/bill_parsers/haven_edi.py,sha256=YGPHRxPOhje9s32jqPHHELni2tooOYj3cMC_qaZVPq4,16107
 chellow/e/bill_parsers/haven_edi_tprs.py,sha256=ZVX9CCqUybsot_Z0BEOJPvl9x5kSr7fEWyuJXvZDcz4,11841
-chellow/e/bill_parsers/mm.py,sha256=jFy5KlUnqfO0dsGgLMCEYAw0LPBIMBa9NDa-5ob2GwM,10033
+chellow/e/bill_parsers/mm.py,sha256=CdYVV3OI-BCtpd9PohOPkY3127dhz0wOCtXOLCDRVsw,10724
 chellow/e/bill_parsers/nonsettlement_dc_stark_xlsx.py,sha256=yogXTuQHGRL7IiqvRWr2C9V24ez1j9Yx0128UygPE_k,4723
 chellow/e/bill_parsers/settlement_dc_stark_xlsx.py,sha256=PlEqCZuJ9DfQXeeYQ64jtf3ML7sUt_tt61QOOTnkE5c,6380
 chellow/e/bill_parsers/sse_edi.py,sha256=L85DOfNkqexeEIEr8pCBn_2sHJI-zEaw6cogpE3YyYM,15204
@@ -70,44 +70,44 @@ chellow/gas/bill_parser_total_edi.py,sha256=bMAeIkzHwNhv0qdKYXtRl-tzUUYtjNkbM3PM
 chellow/gas/ccl.py,sha256=DMlcPUELZi00CaDekVJINYk3GgH5apFrImVdmkbyba0,2913
 chellow/gas/cv.py,sha256=4cdYYQ8Qak6NeYdBCB4YaQ0jX8-UkaydIIdibCQuXxM,7344
 chellow/gas/dn_rate_parser.py,sha256=Mq8rAcUEUxIQOks59bsCKl8GrefvoHbrTCHqon9N0z0,11340
-chellow/gas/engine.py,sha256=NR96BtZKVYQ8hnZVb5oZelb8IhaxupyovNWoHK5ZhTk,25355
+chellow/gas/engine.py,sha256=d2rR1y8b3u2QhmfqyFwwLu_loeZxY_3WwwtDyGJfam0,25282
 chellow/gas/transportation.py,sha256=Bkg8TWOs-v0ES-4qqwbleiOhqbE_t2KauUx9JYMZELM,5300
-chellow/gas/views.py,sha256=R4Ky8syioWSQJLTuSKVLsc266eDv8a6WEo_e60u_4ug,59021
+chellow/gas/views.py,sha256=1_bPHA6i0BlQmQ6YhQaGSMnIm-81dO3ksHW5uL2n2NE,59003
 chellow/reports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-chellow/reports/report_109.py,sha256=FmRWG8wQC97cj0nqQH7mrfbYesRIKWXQLh6ERHvtHrU,11212
-chellow/reports/report_111.py,sha256=MBXMABwHonjH2cvkqFYC0Vx7rU7LB2mJxXsEjI0RvTU,28828
-chellow/reports/report_169.py,sha256=tnTiHmhigcgZ7E8rUSfgzsVYUCW947xBZZq04-KqfK8,9287
-chellow/reports/report_181.py,sha256=mCL6vXfrj8r0kL-LilDS0SnSu5tJOzCq7eMJVx9zpEw,4999
-chellow/reports/report_183.py,sha256=DZX-hHJPl_Tbgkt31C_cuLZg_5L2b6iCPQ5foOZizR0,8817
-chellow/reports/report_187.py,sha256=UvpaYHjyJFNV5puYq8_KxfzoBtVrwFgIGUOmC5oGA9A,9956
-chellow/reports/report_219.py,sha256=cA0lfJKnJg41Zc4_gZB1KUXZ9JeJo0TiTlu5jm1bdDM,7158
-chellow/reports/report_231.py,sha256=uhO1algP7sibpZVaniqGs56HOCPCQeDO-Y-UfvFQwnI,5311
-chellow/reports/report_233.py,sha256=HJRn4wH7RsYIduD2MNZYjFTbgb5LIu8_-jmUuRc0Q6Y,5016
-chellow/reports/report_241.py,sha256=AlFmSHnfG2HWv_ICmWX7fNpPwLHjq7mo1QtOTjSKO3k,5384
-chellow/reports/report_247.py,sha256=eQurEZB51uucdpvBRZ8riOTRs55px4hMo1r3BBeo4Uw,44550
-chellow/reports/report_29.py,sha256=KDFjgrLBv4WbG9efCdu_geMR7gT_QV9N97Wfdt7aDc4,2736
-chellow/reports/report_291.py,sha256=rqBXy6s7hMeYWw-yNX6w_L5t2yz6rNEeos_4xO7wf90,7519
-chellow/reports/report_33.py,sha256=laVz-itDbJTdvC6LxLEeuY0eKpYx43Un4adiExPTEEE,16730
-chellow/reports/report_387.py,sha256=kmBZopb0AOivcowO2nPjRj6LnV0_QjCDXLwqPL7IGVE,5672
-chellow/reports/report_41.py,sha256=QQeTshA1Og7N3wPaoZ8ynJzwsvZ1mgSFc7DDkVqIZoM,7447
-chellow/reports/report_429.py,sha256=8WlLqyfMyvIF5Kc6CE0MKwcT5xwmR_Ao99Ef72yAOVc,12668
-chellow/reports/report_59.py,sha256=3N5I9U-nqNGKz39IdBTyDMlb_-srwpo_0kwn9viQnYs,42262
-chellow/reports/report_81.py,sha256=NkT6dZeMo7Z0AkJemD_Xv8Ut5PIZ9vn8Ia1Q_DS9v54,5611
-chellow/reports/report_87.py,sha256=j2gdBOapaVY1ZnlNlw14RPx58_k8eUkc3oRSnKuCsNA,7057
-chellow/reports/report_asset_comparison.py,sha256=UN298MHuzyUDUiiZr7F_Ua6SrdVOlFLjgKjnIbrA-14,6118
-chellow/reports/report_batches.py,sha256=7O5TcB9W1sPKS0LQMsC6sUDzx73X5iyoZE0O3zK91zs,4798
-chellow/reports/report_bills.py,sha256=AHW6tiZAOE0gXDfencPvemE4zqK6eTqfN8_bWQ4RT5o,3323
-chellow/reports/report_csv_llfcs.py,sha256=OHSbP64lQ6dlAMcQYgvdANlA4lQyF0iBlwk7V9c9nuo,1944
-chellow/reports/report_csv_site_hh_data.py,sha256=yWhEoGGyg_ctM8T55raksTPRJ5ycVO6lVfUx5tRBzTQ,4372
-chellow/reports/report_csv_site_snags.py,sha256=gG2sYQrLoIBwCoMUC8rhmAL7Kffh_rvNb9UOX7cYDko,2668
-chellow/reports/report_ecoes_comparison.py,sha256=CaeMCpLifP-kh2O9MZPs0EYf4UqksL-xFjwki41DTRA,21444
-chellow/reports/report_g_monthly_duration.py,sha256=I1MsLr-VD6VczRB8YrDGuTXVXv_iKpBZiCA7DLqZQQc,18305
-chellow/reports/report_g_supplies_snapshot.py,sha256=0M0x_0o0985Hu45gUJJJwzfx0DDOAuXBJ1UVUDbQ36g,4718
-chellow/reports/report_g_supply_virtual_bill.py,sha256=x_KtQ02dwgmXvAEUXJ1poK0BRwqxa-GcbJ5pddEina0,3694
-chellow/reports/report_g_virtual_bills.py,sha256=t3hmTiURk1E_mPucIboCdPBlSLapDIUdHYRpVTFtJgw,4569
-chellow/reports/report_g_virtual_bills_hh.py,sha256=5crgu7oUrOSR9GAA1uhb8lJNn4gCUSBAaXci1gOuohE,3457
-chellow/reports/report_sscs.py,sha256=beCzKpaQaeeiyMGpX6o-gbl1tCS6ArdF1o4GeIQE67s,3255
-chellow/reports/report_supply_contacts.py,sha256=vyA3mLWqYISwOuRhzRIYQIWmvWXS1Vv_rJClq2IFBiw,3640
+chellow/reports/report_109.py,sha256=Exb-FQ5f70-ier_h15CgHGysQ7vJ7k3gFZ1001zM3iM,11171
+chellow/reports/report_111.py,sha256=o_wWyrtmxpTnmT9DVlsG5h5wdm3JqojirRlx_7W5_kQ,28787
+chellow/reports/report_169.py,sha256=wortJyvgXTrnjjXhLzqwaksKKu63K5IgdzU5f4SkHMI,9246
+chellow/reports/report_181.py,sha256=ypfYWYVNC1X2fMlJyDzwNiNTTRrpPW49DirXE_xDKa0,4958
+chellow/reports/report_183.py,sha256=fGONpKEIXTqIT_3dE5jZKBIesWPgLq-chHO6X22dIv0,8768
+chellow/reports/report_187.py,sha256=RCvxDnkfRu7ocKUPEX0qtVphGOBEl9RULy790uteXcQ,9915
+chellow/reports/report_219.py,sha256=3Zs16ka6dWWY_lCDoA-ZFrlPb4vHk1LQoa2yrlTMntA,7117
+chellow/reports/report_231.py,sha256=WARLztV2HzBFSi5_xvY_DTXVyuBBbBYiU0RazfjKw-Y,5270
+chellow/reports/report_233.py,sha256=qJdPFuBgQAWD24BsljgGJ44L_RGdHOA1RqsxGjTWhFc,4975
+chellow/reports/report_241.py,sha256=lfivElRkV_CZAhck0rxAuhqzgponj3aWwmwGMNQvUxg,5343
+chellow/reports/report_247.py,sha256=Hhhk0XcDdS3SaA-BJxw6BtN7mOhdKjBdtBNV7zqqaAI,44509
+chellow/reports/report_29.py,sha256=ZXnq6Kg5on-IPquUsH4bn46mBVESY_WhwqDWZPXOJwo,2695
+chellow/reports/report_291.py,sha256=BnWtxe0eWN2QKKWpwjs5-RI5LbReBKL119QbkrkNhV8,7478
+chellow/reports/report_33.py,sha256=lt1EN_LNx6u-AgdaS3YRkPMZA33JgMcELolHF4oJUMw,16689
+chellow/reports/report_387.py,sha256=bBqtnGGDWIXzXe2zVm9yeDRZKNgkUaOS3XTX6k09f18,5631
+chellow/reports/report_41.py,sha256=8xUIN9D5dtT0Dn1RmbnWsLRmM-QbGA5xGhWCK3ljAzA,7406
+chellow/reports/report_429.py,sha256=bpnz_SAiWFoHN7UF3rS0-LupbDyE_AnGI-XOphGXyPc,12627
+chellow/reports/report_59.py,sha256=PkdRA6ctvDGWTQd5vb9cQH6MG920TxcD6aHh268zrj8,42221
+chellow/reports/report_81.py,sha256=bBpV6MtvKGtoLiqzZoK2h21KDs4vfDwy-etpfL9oiEI,5570
+chellow/reports/report_87.py,sha256=udzbCuXcckWD-OHmfJCT6bwg_paYhm4vfDWlL8WM-jA,6933
+chellow/reports/report_asset_comparison.py,sha256=Cl2NgvbclqhOVvKuUu3sajTVO2JupMfzK3bV0_K8eNs,6077
+chellow/reports/report_batches.py,sha256=MoCv2dE-JgaJzaMjMA-kZrPkYR13uDoXer5UuF12OYc,4757
+chellow/reports/report_bills.py,sha256=cxhrheJggBcP0BHmbNKCPG25KxgBSFr5NOZ_XCIek1M,3344
+chellow/reports/report_csv_llfcs.py,sha256=mMB06b6Jems5kcQU4H4Le_fyKgVr8THP8BCx3pkvg5E,1903
+chellow/reports/report_csv_site_hh_data.py,sha256=ik0OkGVo1bfTXLdcT3gPUHnxSkSdorzZheP3qgnOR5c,4331
+chellow/reports/report_csv_site_snags.py,sha256=AuAy6vjL0g7vwPPAZhBqxOyITL9_jnyFj012MnUcxxk,2627
+chellow/reports/report_ecoes_comparison.py,sha256=wEwJrFMOz74CidONkTmgWD1Ghhgo9DT0V7Vddkspkqg,21403
+chellow/reports/report_g_monthly_duration.py,sha256=VQq5xTLvdu9Z_vqrgWNP2S4xm2uCSSZA9HVNiQv9Dus,18264
+chellow/reports/report_g_supplies_snapshot.py,sha256=f6yuds1_X3j3domC1lCyA788RdxCgFZSee-4L7BhwU8,4677
+chellow/reports/report_g_supply_virtual_bill.py,sha256=EaYrB8PHJIXrUuhiZ7dwUlbNBkuyJebQHrdc308_z1o,3653
+chellow/reports/report_g_virtual_bills.py,sha256=20vHa5LGQwOAlJlaGJaGszZrrbT0PMOZJf6hSxU2hIQ,4528
+chellow/reports/report_g_virtual_bills_hh.py,sha256=gaiLEmKTpq6JsfZ1p0SdCDuPvzvigXp6z88gHRCA63w,3416
+chellow/reports/report_sscs.py,sha256=fQWyVG-gdg37DyNHgpNARpSxIwTl7mCn20fDLwx9oHg,3214
+chellow/reports/report_supply_contacts.py,sha256=pvwlInaPYV_pa9MMK6vh854plHFwv3m5zo5xulR1g5I,3599
 chellow/static/css/chellow.css,sha256=mcLjqKMo0qtdQWY7AnXEL8Bvx2B-Pu8kcGO58bUXOpY,5372
 chellow/static/images/favicon.svg,sha256=ySFHoVJYmr-xU93QrE-jLYn-ZNythh2vsemnR8dkvg0,2339
 chellow/static/images/favicon_test.svg,sha256=HnLS_BjNt8M0Ikko5Z-f_E2aed7y6RRU6j3K6XADciE,2346
@@ -152,11 +152,10 @@ chellow/templates/scenario_add.html,sha256=xFTb9CaA-qV2iwnVqcS44vD8JlYatBQet8Rat
 chellow/templates/scenario_docs.html,sha256=0YP_h8GYkqCFLBoCj2w4PE4Js15DT_WoxYlK9nRSMlA,6949
 chellow/templates/scenario_edit.html,sha256=x2Eicq_eFs7ax2EtL4GrD73qKF-LhN41OQdPFbDivrc,1060
 chellow/templates/scenarios.html,sha256=FIDOSWs9VO_3bJkQoNHh-DdRzVfUyJGK9WbdEHRxxdM,841
-chellow/templates/site.html,sha256=dj0VgcmjaKJHuTOZDESO2E2MOyluYJtx4YaSOaWOkwU,10024
+chellow/templates/site.html,sha256=rvK4VnSsiSswyYTPJrKn4iKpT_-t1nfH-4yCPF7OKQc,10038
 chellow/templates/site_add.html,sha256=NxYmOIZQH6X8EBOuJUbhUJ8IYB3t0BukjR1yVRhnJhM,422
 chellow/templates/site_edit.html,sha256=TJ_ZDDkodj-uDB3GPP9Cel3FGZY2oP42KCzHOydPWVc,2909
 chellow/templates/site_gen_graph.html,sha256=LXkD4n_aC_sFm9JJTCmBRrczpyTn2UUEgBToFiM5RPo,3468
-chellow/templates/site_hh_data.html,sha256=xmSJ5h_DvI1-bnV7FdBodDUvDCU0-q-UHYj2MuyLOTg,1907
 chellow/templates/site_months.html,sha256=ToqH42dym82Q4ihFIT3St-EwPlhDAfwskNMh4cZ2EsM,6572
 chellow/templates/site_used_graph.html,sha256=NXuQYcPXnk2mHb2O4mxVPZ1R-X-MWPwneUV-J6z285w,3094
 chellow/templates/sites.html,sha256=4ouJ5xYqYHjXCv3cDucTjgbOd_whReFPPHopLBdW6Go,621
@@ -202,7 +201,7 @@ chellow/templates/e/dc_contract_edit.html,sha256=IObmbHQmeZ_LSpnYgabmhoSNUR3aPmm
 chellow/templates/e/dc_contract_hh_import.html,sha256=JncR3L6cOK4jghsGyr-itEqlIemXBXt3kL09wpqnQSE,856
 chellow/templates/e/dc_contract_hh_imports.html,sha256=eXFDGyzSgag4JRism81_p5yTzQOjCIXaVkQ8tl3dDcM,8172
 chellow/templates/e/dc_contract_properties.html,sha256=2EmA91gYWZcTOHQ3PxXQrpTOb8dm0OGjwRWsW6qNI9s,455
-chellow/templates/e/dc_contract_properties_edit.html,sha256=YWmG0dnzD6hf2kAFWCAjQWkHDPVRDi0jaUdLSLw-tfw,1901
+chellow/templates/e/dc_contract_properties_edit.html,sha256=t7X7Exht6ZMqmiEnuhv9kAFNfjchyJdD_2pZEORqUD8,1925
 chellow/templates/e/dc_contracts.html,sha256=FPZUM7fkw-R6sRELHZCQTUkKSRqad8HOLHnyyYhQEEw,1819
 chellow/templates/e/dc_contracts_add.html,sha256=2lrGrNqAoKp16OiMoNDNlJxBMW3QdSPfgEFheSg826s,710
 chellow/templates/e/dc_rate_script.html,sha256=gfKUHV2IMsTQT-cYfjl4aiEBqGEWSj3uW22UZpoyGq4,1219
@@ -291,7 +290,7 @@ chellow/templates/e/scenario_edit.html,sha256=Uf64v_qsBP0BxaFEIz214CC_dZXlvro4zv
 chellow/templates/e/scenarios.html,sha256=zlNhZvQEcuwLgHObVHS-4THur5Lz9Jf1G6xD98-jamI,847
 chellow/templates/e/site_add_e_supply.html,sha256=_gi1ejI4TMTMX9vCW7z2kToR2XKR6qoVh67qp_VrDsM,2731
 chellow/templates/e/site_add_e_supply_form.html,sha256=q5LfSmp_eamph4FLKslMrxKGOtGCkSFRe9I5AVn-hgM,5553
-chellow/templates/e/site_hh_data.html,sha256=1Ld5IIM3G84tVCAwtlJNGJTnrASS7d84AgaPwwHNEMI,1413
+chellow/templates/e/site_hh_data.html,sha256=qCmqQcPKWhNiZ7eSVs8NhMIiBXJHVHF5OAzjEdppyjM,1982
 chellow/templates/e/site_site_snags.html,sha256=vWpsFyxZj7GOrMXQz2rKq9zOQdVsqeUVtdBzehp9J5w,847
 chellow/templates/e/site_snag.html,sha256=eZt1H-t-hsoKZBteU9ILpKqKLD0Pf0Uybp8pPQYuTAc,924
 chellow/templates/e/site_snag_edit.html,sha256=O-m95S-ig9sXmFFkQmjfNnF9zJkgSIuPizuF7ieNi7s,1436
@@ -377,6 +376,6 @@ chellow/templates/g/supply_note_edit.html,sha256=b8mB6_ucBwoljp03iy6AgVaZUhGw3-1
 chellow/templates/g/supply_notes.html,sha256=6epNmZ3NKdXZz27fvmRUGeffg_oc1kmwuBeyRzQe3Rg,854
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1733390302.0.0.dist-info/METADATA,sha256=gaYBOwq3UhXxTCphDMWhGc0rFvubI80XXISsocq3EK0,12204
-chellow-1733390302.0.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-chellow-1733390302.0.0.dist-info/RECORD,,
+chellow-1734005435.0.0.dist-info/METADATA,sha256=rikcxSjkW6hkiNWM_zQJBT9tqQUz1C0JhNytTqShEdk,12204
+chellow-1734005435.0.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+chellow-1734005435.0.0.dist-info/RECORD,,