chellow 1724062841.0.0__tar.gz → 1724313988.0.0__tar.gz

{chellow-1724062841.0.0 → chellow-1724313988.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1724062841.0.0
+Version: 1724313988.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-1724313988.0.0/VERSION

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

{chellow-1724062841.0.0 → chellow-1724313988.0.0}/chellow/e/cfd.py

@@ -225,46 +225,35 @@ def import_operational_costs_levy(sess, log, set_progress, s):
 RUN_TYPES = ("II", "SF", "R1", "R2", "R3", "RF", "DF")
 
 
-def _reconciled_days(log, s, search_from):
-    runs = {}
-
-    records = [
-        r
-        for r in api_records(log, s, "e0e163cb-ba36-416d-83fe-976992d61516")
-        if r["Settlement_Date"] > search_from
-    ]
-    if len(records) > 0:
-        prev_settlement_date = _parse_date(records[0]["Settlement_Date"])
-        runs = {}
-        for record in records:
-            settlement_date = _parse_date(record["Settlement_Date"])
-            if settlement_date != prev_settlement_date:
-                yield prev_settlement_date, runs
-                runs = {}
-
-            settlement_run_type = record["Settlement_Run_Type"]
-            runs[settlement_run_type] = record
-            prev_settlement_date = settlement_date
-
-        yield settlement_date, runs
-
-
-def _reconciled_daily_quarters(log, s, search_from):
-    quarter = {}
-    for settlement_date, lcc_runs in _reconciled_days(log, s, search_from):
-        try:
-            runs = quarter[settlement_date]
-        except KeyError:
-            runs = quarter[settlement_date] = {}
+def _reconciled_quarters(log, s, search_from):
+    quarters = {}
+
+    for record in api_records(log, s, "e0e163cb-ba36-416d-83fe-976992d61516"):
+        settlement_date = _parse_date(record["Settlement_Date"])
+        if settlement_date > search_from:
+            settlement_date_ct = to_ct(settlement_date)
+            quarter_start_ct_month = int((settlement_date_ct.month - 1) / 3) * 3 + 1
+            quarter_start = to_utc(
+                ct_datetime(settlement_date_ct.year, quarter_start_ct_month, 1)
+            )
+            try:
+                quarter = quarters[quarter_start]
+            except KeyError:
+                quarter = quarters[quarter_start] = {}
 
-        for run_type, record in lcc_runs.items():
-            runs[run_type] = record
+            try:
+                day = quarter[settlement_date]
+            except KeyError:
+                day = quarter[settlement_date] = {}
 
-        settlement_next_ct = to_ct(settlement_date) + relativedelta(days=1)
+            settlement_run_type = record["Settlement_Run_Type"]
+            day[settlement_run_type] = record
 
-        if settlement_next_ct.month in (1, 4, 7, 10) and settlement_next_ct.day == 1:
-            yield quarter
-            quarter = {}
+    # Only return complate quarters
+    if len(quarters) > 0:
+        last_start = sorted(quarters.keys())[-1]
+        del quarters[last_start]
+    return quarters
 
 
 def import_reconciled_daily_levy_rates(sess, log, set_progress, s):
@@ -277,7 +266,7 @@ def import_reconciled_daily_levy_rates(sess, log, set_progress, s):
             sess, contract_name, "", {}, to_utc(ct_datetime(1996, 4, 1)), None, {}
         )
 
-    search_from = "1996-04-01"
+    search_from = to_utc(ct_datetime(1996, 4, 1))
     for rs in sess.scalars(
         select(RateScript)
         .where(RateScript.contract == contract)
@@ -305,12 +294,12 @@ def import_reconciled_daily_levy_rates(sess, log, set_progress, s):
             day_ct += relativedelta(days=1)
 
         if complete:
-            search_from = quarter_finish_ct.strftime("%Y-%m-%d")
+            search_from = to_utc(quarter_finish_ct)
         else:
             break
 
-    for quarter in _reconciled_daily_quarters(log, s, search_from):
-        quarter_start = sorted(quarter.keys())[0]
+    for quarter_start, quarter in _reconciled_quarters(log, s, search_from).items():
+
         rs = sess.execute(
             select(RateScript).where(
                 RateScript.contract == contract,

{chellow-1724062841.0.0 → chellow-1724313988.0.0}/chellow/e/views.py

@@ -80,6 +80,7 @@ from chellow.models import (
 )
 from chellow.utils import (
     HH,
+    c_months_c,
     c_months_u,
     csv_make_val,
     ct_datetime,
@@ -3943,7 +3944,20 @@ def scenario_add_get():
 @e.route("/scenarios/<int:scenario_id>")
 def scenario_get(scenario_id):
     scenario = Scenario.get_by_id(g.sess, scenario_id)
-    return render_template("scenario.html", scenario=scenario)
+    props = scenario.props
+    _, finish_date_ct = list(
+        c_months_c(
+            start_year=props["scenario_start_year"],
+            start_month=props["scenario_start_month"],
+            months=props["scenario_duration"],
+        )
+    )[-1]
+    return render_template(
+        "scenario.html",
+        scenario=scenario,
+        scenario_finish_date=to_utc(finish_date_ct),
+        scenario_duration=props["scenario_duration"],
+    )
 
 
 @e.route("/scenarios/<int:scenario_id>/edit")

{chellow-1724062841.0.0 → chellow-1724313988.0.0}/chellow/reports/report_247.py

@@ -61,9 +61,6 @@ def write_spreadsheet(
     site_rows,
     era_rows,
     read_rows,
-    bill_check_site_rows,
-    bill_check_era_rows,
-    is_bill_check,
 ):
     fl.seek(0)
     fl.truncate()
@@ -71,9 +68,6 @@ def write_spreadsheet(
         f.append_table("Site Level", site_rows)
         f.append_table("Era Level", era_rows)
         f.append_table("Normal Reads", read_rows)
-        if is_bill_check:
-            f.append_table("Bill Check Site", bill_check_site_rows)
-            f.append_table("Bill Check Era", bill_check_era_rows)
 
 
 def make_bill_row(titles, bill):
@@ -721,14 +715,7 @@ class Object:
     pass
 
 
-def content(
-    scenario_props,
-    base_name,
-    user_id,
-    compression,
-    now,
-    is_bill_check,
-):
+def content(scenario_props, base_name, user_id, compression, now):
     report_context = {}
 
     try:
@@ -750,8 +737,6 @@ def content(
     site_rows = []
     era_rows = []
     normal_read_rows = []
-    bill_check_site_rows = []
-    bill_check_era_rows = []
     try:
         with RSession() as sess:
             start_year = scenario_props["scenario_start_year"]
@@ -821,9 +806,6 @@ def content(
 
             user = User.get_by_id(sess, user_id)
 
-            if is_bill_check:
-                base_name.append("bill_check")
-
             rf = open_file("_".join(base_name) + ".ods", user, mode="wb")
 
             for rate_script in scenario_props.get("rates", []):
@@ -1023,16 +1005,17 @@ def content(
             )
             site_rows.append(site_header_titles + summary_titles)
             era_rows.append(era_titles)
-            bill_check_site_rows.append(site_header_titles + summary_titles)
-            bill_check_era_rows.append(era_titles)
 
             sites = sites.all()
             normal_reads = set()
 
             for month_start, month_finish in month_pairs:
-                data_source_bill = Object()
-                data_source_bill.start_date = month_start
-                data_source_bill.finish_date = month_finish
+                if scenario_props.get("is_bill_check", False):
+                    data_source_bill = Object()
+                    data_source_bill.start_date = month_start
+                    data_source_bill.finish_date = month_finish
+                else:
+                    data_source_bill = None
                 for site in sites:
                     if by_hh:
                         sf = [
@@ -1058,25 +1041,8 @@ def content(
                                 title_dict,
                                 era_rows,
                                 site_rows,
-                                None,
+                                data_source_bill,
                             )
-                            if is_bill_check:
-                                _process_site(
-                                    sess,
-                                    report_context,
-                                    forecast_from,
-                                    start,
-                                    finish,
-                                    site,
-                                    scenario_props,
-                                    supply_ids,
-                                    now,
-                                    summary_titles,
-                                    title_dict,
-                                    bill_check_era_rows,
-                                    bill_check_site_rows,
-                                    data_source_bill,
-                                )
                         except BadRequest as e:
                             raise BadRequest(f"Site Code {site.code}: {e.description}")
 
@@ -1088,29 +1054,13 @@ def content(
                     normal_read_rows.append(row)
 
                 write_spreadsheet(
-                    rf,
-                    compression,
-                    site_rows,
-                    era_rows,
-                    normal_read_rows,
-                    bill_check_site_rows,
-                    bill_check_era_rows,
-                    is_bill_check,
+                    rf, compression, site_rows, era_rows, normal_read_rows
                 )
     except BadRequest as e:
         msg = e.description + traceback.format_exc()
         sys.stderr.write(msg + "\n")
         site_rows.append(["Problem " + msg])
-        write_spreadsheet(
-            rf,
-            compression,
-            site_rows,
-            era_rows,
-            normal_read_rows,
-            bill_check_site_rows,
-            bill_check_era_rows,
-            is_bill_check,
-        )
+        write_spreadsheet(rf, compression, site_rows, era_rows, normal_read_rows)
     except BaseException:
         msg = traceback.format_exc()
         sys.stderr.write(msg + "\n")
@@ -1121,16 +1071,7 @@ def content(
             ef.write(msg + "\n")
             ef.close()
         else:
-            write_spreadsheet(
-                rf,
-                compression,
-                site_rows,
-                era_rows,
-                normal_read_rows,
-                bill_check_site_rows,
-                bill_check_era_rows,
-                is_bill_check,
-            )
+            write_spreadsheet(rf, compression, site_rows, era_rows, normal_read_rows)
     finally:
         if rf is not None:
             rf.close()
@@ -1145,22 +1086,22 @@ def do_post(sess):
         scenario = Scenario.get_by_id(sess, scenario_id)
         scenario_props = scenario.props
         base_name.append(scenario.name)
-
     else:
+        scenario_props = {}
+        base_name.append("monthly_duration")
+
+    if "finish_year" in request.values:
         year = req_int("finish_year")
         month = req_int("finish_month")
         months = req_int("months")
         start_date, _ = next(
             c_months_c(finish_year=year, finish_month=month, months=months)
         )
-        by_hh = req_bool("by_hh")
-        scenario_props = {
-            "scenario_start_year": start_date.year,
-            "scenario_start_month": start_date.month,
-            "scenario_duration": months,
-            "by_hh": by_hh,
-        }
-        base_name.append("monthly_duration")
+        scenario_props["scenario_start_year"] = start_date.year
+        scenario_props["scenario_start_month"] = start_date.month
+        scenario_props["scenario_duration"] = months
+
+    scenario_props["by_hh"] = req_bool("by_hh")
 
     try:
         if "site_id" in request.values:
@@ -1193,18 +1134,9 @@ def do_post(sess):
         else:
             compression = True
 
-        is_bill_check = req_bool("is_bill_check")
-
         user = g.user
 
-        args = (
-            scenario_props,
-            base_name,
-            user.id,
-            compression,
-            now,
-            is_bill_check,
-        )
+        args = (scenario_props, base_name, user.id, compression, now)
         threading.Thread(target=content, args=args).start()
         return chellow_redirect("/downloads", 303)
     except BadRequest as e:

{chellow-1724062841.0.0 → chellow-1724313988.0.0}/chellow/reports/report_59.py

@@ -84,6 +84,37 @@ def make_bill_row(titles, bill):
     return [bill.get(t) for t in titles]
 
 
+def _add_bills(month_data, bills, chunk_start, chunk_finish):
+    for bill in bills:
+        bill_role_code = bill.batch.contract.market_role.code
+        bill_start = bill.start_date
+        bill_finish = bill.finish_date
+        bill_duration = (bill_finish - bill_start).total_seconds() + (30 * 60)
+        overlap_duration = (
+            min(bill_finish, chunk_finish) - max(bill_start, chunk_start)
+        ).total_seconds() + (30 * 60)
+        proportion = overlap_duration / bill_duration
+        bill_prop_kwh = proportion * float(bill.kwh)
+        bill_prop_net_gbp = proportion * float(bill.net)
+        bill_prop_vat_gbp = proportion * float(bill.vat)
+        bill_prop_gross_gbp = proportion * float(bill.gross)
+        if bill_role_code == "X":
+            role_name = "supplier"
+        elif bill_role_code == "C":
+            role_name = "dc"
+        elif bill_role_code == "M":
+            role_name = "mop"
+        else:
+            raise BadRequest("Role code not recognized.")
+
+        month_data["billed-import-kwh"] += bill_prop_kwh
+        month_data["billed-import-net-gbp"] += bill_prop_net_gbp
+        month_data[f"billed-import-{role_name}-kwh"] += bill_prop_kwh
+        month_data[f"billed-import-{role_name}-net-gbp"] += bill_prop_net_gbp
+        month_data[f"billed-import-{role_name}-vat-gbp"] += bill_prop_vat_gbp
+        month_data[f"billed-import-{role_name}-gross-gbp"] += bill_prop_gross_gbp
+
+
 def _process_site(
     sess,
     report_context,
@@ -560,41 +591,13 @@ def _process_site(
                         vals[f"billed-import-dc-{suf}"] = 0
                         vals[f"billed-import-mop-{suf}"] = 0
 
-                    for bill in bills:
-                        bill_role_code = bill.batch.contract.market_role.code
-                        bill_start = bill.start_date
-                        bill_finish = bill.finish_date
-                        bill_duration = (bill_finish - bill_start).total_seconds() + (
-                            30 * 60
-                        )
-                        overlap_duration = (
-                            min(bill_finish, chunk_finish)
-                            - max(bill_start, chunk_start)
-                        ).total_seconds() + (30 * 60)
-                        proportion = overlap_duration / bill_duration
-                        bill_prop_kwh = proportion * float(bill.kwh)
-                        bill_prop_net_gbp = proportion * float(bill.net)
-                        bill_prop_vat_gbp = proportion * float(bill.vat)
-                        bill_prop_gross_gbp = proportion * float(bill.gross)
-                        if bill_role_code == "X":
-                            key = "supplier"
-                        elif bill_role_code == "C":
-                            key = "dc"
-                        elif bill_role_code == "M":
-                            key = "mop"
-                        else:
-                            raise BadRequest("Role code not recognized.")
-
-                        for data in vals, site_data:
-                            data["billed-import-kwh"] += bill_prop_kwh
-                            data["billed-import-net-gbp"] += bill_prop_net_gbp
-                            data[f"billed-import-{key}-net-gbp"] += bill_prop_net_gbp
-                            data[f"billed-import-{key}-vat-gbp"] += bill_prop_vat_gbp
-                            data[
-                                f"billed-import-{key}-gross-gbp"
-                            ] += bill_prop_gross_gbp
+                    _add_bills(vals, bills, chunk_start, chunk_finish)
 
                     era_rows.append([make_val(vals.get(t)) for t in era_titles])
+                    for t in summary_titles:
+                        v = vals.get(t)
+                        if v is not None:
+                            site_data[t] += v
         first_era = (
             sess.execute(
                 select(Era).where(Era.supply == supply).order_by(Era.start_date)
@@ -640,49 +643,12 @@ def _process_site(
                         for sname in ("kwh", "net-gbp"):
                             month_data[f"{name}-{sname}"] = 0
                     for suf in ("kwh", "net-gbp", "vat-gbp", "gross-gbp"):
-                        month_data["billed-import-{suf}"],
-                        month_data["billed-import-supplier-{suf}"] = 0
-                        month_data["billed-import-dc-{suf}"] = 0
-                        month_data["billed-import-mop-{suf}"] = 0
-
-                    for bill in bills:
-                        bill_role_code = bill.batch.contract.market_role.code
-                        bill_start = bill.start_date
-                        bill_finish = bill.finish_date
-                        bill_duration = (bill_finish - bill_start).total_seconds() + (
-                            30 * 60
-                        )
-                        overlap_duration = (
-                            min(bill_finish, chunk_finish)
-                            - max(bill_start, chunk_start)
-                        ).total_seconds() + (30 * 60)
-                        proportion = overlap_duration / bill_duration
-                        bill_prop_kwh = proportion * float(bill.kwh)
-                        bill_prop_net_gbp = proportion * float(bill.net)
-                        bill_prop_vat_gbp = proportion * float(bill.vat)
-                        bill_prop_gross_gbp = proportion * float(bill.gross)
-                        if bill_role_code == "X":
-                            role_name = "supplier"
-                        elif bill_role_code == "C":
-                            key = "dc"
-                        elif bill_role_code == "M":
-                            key = "mop"
-                        else:
-                            raise BadRequest("Role code not recognized.")
-
-                        for data in month_data, site_data:
-                            data["billed-import-kwh"] += bill_prop_kwh
-                            data["billed-import-net-gbp"] += bill_prop_net_gbp
-                            data[f"billed-import-{role_name}-kwh"] += bill_prop_kwh
-                            data[
-                                f"billed-import-{role_name}-net-gbp"
-                            ] += bill_prop_net_gbp
-                            data[
-                                f"billed-import-{role_name}-vat-gbp"
-                            ] += bill_prop_vat_gbp
-                            data[
-                                f"billed-import-{role_name}-gross-gbp"
-                            ] += bill_prop_gross_gbp
+                        month_data[f"billed-import-{suf}"] = 0
+                        month_data[f"billed-import-supplier-{suf}"] = 0
+                        month_data[f"billed-import-dc-{suf}"] = 0
+                        month_data[f"billed-import-mop-{suf}"] = 0
+
+                    _add_bills(month_data, bills, chunk_start, chunk_finish)
 
                     imp_supplier_contract = first_era.imp_supplier_contract
                     exp_supplier_contract = first_era.exp_supplier_contract
@@ -715,6 +681,10 @@ def _process_site(
                     ] + [month_data[t] for t in summary_titles]
 
                     era_rows.append([make_val(v) for v in out])
+                    for t in summary_titles:
+                        v = month_data.get(t)
+                        if v is not None:
+                            site_data[t] += v
 
     for _, v in sorted(supplies_data.items()):
         row = [make_val(v.get(t)) for t in supply_titles]

{chellow-1724062841.0.0 → chellow-1724313988.0.0}/chellow/templates/e/ods_monthly_duration.html

@@ -19,9 +19,6 @@
 			<label>Site Codes</label>
 			{{input_textarea('site_codes', '', 5, 40, placeholder='One on each line, includes all if left blank')}}    						
 
-			<label>Include bill check tabs?</label>
-			{{input_checkbox('is_bill_check')}}
-
 			<input type="submit" value="Download">
 		</fieldset>
 	</form>

{chellow-1724062841.0.0 → chellow-1724313988.0.0}/chellow/templates/e/scenario.html

@@ -14,6 +14,9 @@
 		<fieldset>
 			<legend>Run With Monthly Duration</legend>
 			<input type="hidden" name="scenario_id" value="{{scenario.id}}">
+			<label>Months</label> {{input_text('months', initial=scenario_duration, size=2, maxlength=2)}}
+			<label>Finish month</label>
+		 	{{input_date('finish', scenario_finish_date, resolution='month')}}
 			<label>Site Codes</label>
 			{{input_textarea('site_codes', '', 5, 40,
 			  placeholder='One on each line, includes all if left blank')}}    						

{chellow-1724062841.0.0 → chellow-1724313988.0.0}/chellow/templates/e/scenario_docs.html

@@ -136,6 +136,7 @@
         2017-10-09 11:00, 3.5"
     }
   }
+  "is_bill_check": false,  /* Use the bill check rates */
 }</pre>
 
 <h3>HH Data</h3>

{chellow-1724062841.0.0 → chellow-1724313988.0.0}/test/e/test_cfd.py

@@ -1,6 +1,6 @@
 from chellow.e.cfd import (
     _find_quarter_rs,
-    _reconciled_days,
+    _reconciled_quarters,
     hh,
     import_forecast_ilr_tra,
 )
@@ -33,9 +33,9 @@ from chellow.models import (
 from chellow.utils import ct_datetime, to_utc, utc_datetime
 
 
-def test_reconciled_days(mocker):
+def test_reconciled_quarters(mocker):
     s = mocker.Mock()
-    search_from = "2023-01-01"
+    search_from = to_utc(ct_datetime(2023, 1, 1))
     log = mocker.Mock()
     result = [
         {"Settlement_Date": "2023-03-30", "Settlement_Run_Type": "DF"},
@@ -44,23 +44,8 @@ def test_reconciled_days(mocker):
         {"Settlement_Date": "2023-03-31", "Settlement_Run_Type": "RF"},
     ]
     mocker.patch("chellow.e.cfd.api_records", return_value=result)
-    actual = list(_reconciled_days(log, s, search_from))
-    expected = [
-        (
-            utc_datetime(2023, 3, 29, 23, 0),
-            {
-                "DF": {"Settlement_Date": "2023-03-30", "Settlement_Run_Type": "DF"},
-                "RF": {"Settlement_Date": "2023-03-30", "Settlement_Run_Type": "RF"},
-            },
-        ),
-        (
-            utc_datetime(2023, 3, 30, 23, 0),
-            {
-                "DF": {"Settlement_Date": "2023-03-31", "Settlement_Run_Type": "DF"},
-                "RF": {"Settlement_Date": "2023-03-31", "Settlement_Run_Type": "RF"},
-            },
-        ),
-    ]
+    actual = _reconciled_quarters(log, s, search_from)
+    expected = {}
     assert actual == expected