chellow 1744710468.0.0__py3-none-any.whl → 1745313690.0.0__py3-none-any.whl

chellow/__init__.py

@@ -22,6 +22,7 @@ import chellow.e.hh_importer
 import chellow.e.rcrc
 import chellow.e.system_price
 import chellow.e.views
+import chellow.fake_batch_updater
 import chellow.gas.cv
 import chellow.gas.views
 import chellow.national_grid
@@ -62,6 +63,7 @@ def get_importer_modules():
         chellow.national_grid,
         chellow.rate_server,
         chellow.rrun,
+        chellow.fake_batch_updater,
     )
 
 

chellow/e/bill_parsers/mm.py

@@ -59,7 +59,7 @@ def _handle_0100(headers, pre_record, record):
     headers["issue_date"] = issue_date
     if late_payment is not None:
         headers["late_payment"] = late_payment
-    headers["account"] = pre_record[33:41]
+    headers["account"] = pre_record[43:52]
     headers["reference"] = pre_record[41:46]
     headers["kwh"] = Decimal("0")
     headers["breakdown"] = defaultdict(int, {"vat": {}})

chellow/e/bill_parsers/nonsettlement_dc_stark_xlsx.py

@@ -4,6 +4,7 @@ from openpyxl import load_workbook
 
 from werkzeug.exceptions import BadRequest
 
+from chellow.e.computer import hh_rate
 from chellow.models import Session
 from chellow.utils import ct_datetime, parse_mpan_core, to_utc
 
@@ -16,12 +17,6 @@ def get_start_date(title_row, row, name):
     return to_utc(get_ct_date(title_row, row, name))
 
 
-def get_finish_date(title_row, row, name):
-    d = get_ct_date(title_row, row, name)
-
-    return to_utc(ct_datetime(d.year, d.month, d.day, 23, 30))
-
-
 def get_value(title_row, row, name):
     idx = None
     name = name.strip().lower()
@@ -61,9 +56,6 @@ def get_int(title_row, row, name):
     return int(get_value(title_row, row, name))
 
 
-METER_RATE = Decimal("60.00")
-
-
 class Parser:
     def __init__(self, f):
         self.book = load_workbook(f)
@@ -86,6 +78,7 @@ class Parser:
 
     def make_raw_bills(self):
         row_index = None
+        caches = {}
         try:
             with Session() as sess:
                 bills = []
@@ -101,14 +94,30 @@ class Parser:
                     mpan_core = parse_mpan_core(
                         str(get_int(title_row, row, "mpan ref"))
                     )
-                    start_date = get_start_date(title_row, row, "start")
+                    start_date_ct = get_ct_date(title_row, row, "start")
+                    start_date = to_utc(start_date_ct)
                     issue_date = start_date
-                    finish_date = get_finish_date(title_row, row, "end")
+                    finish_date_ct = get_ct_date(title_row, row, "end")
+                    finish_date = to_utc(
+                        ct_datetime(
+                            finish_date_ct.year,
+                            finish_date_ct.month,
+                            finish_date_ct.day,
+                            23,
+                            30,
+                        )
+                    )
                     check = get_str(title_row, row, "check")
                     if check != "Billed":
                         continue
-
-                    net = METER_RATE / 12
+                    rates = hh_rate(sess, caches, 0, start_date)
+                    meter_rate = rates["annual_rates"]["non_settlement"]["*"]["IP"][
+                        "*"
+                    ]["gbp_per_meter"]
+                    months = (finish_date_ct.year - start_date_ct.year) * 12 + (
+                        finish_date_ct.month - start_date_ct.month + 1
+                    )
+                    net = round(Decimal(float(meter_rate) / 12 * months), 2)
                     vat = round(net * Decimal("0.2"), 2)
 
                     breakdown = {
@@ -116,7 +125,8 @@ class Parser:
                         "cop": ["5"],
                         "settlement-status": ["non_settlement"],
                         "msn": [msn],
-                        "meter-rate": [METER_RATE],
+                        "meter-rate": [meter_rate],
+                        "months": months,
                         "meter-gbp": net,
                     }
 

chellow/e/dno_rate_parser.py

@@ -650,15 +650,15 @@ def update_vls(sess, logger, vls, dno_code, fy_start, rs_finish):
         llfc = sess.execute(q).scalar_one_or_none()
 
         if llfc is None:
-            raise BadRequest(
+            logger(
                 f"There is no LLFC with the code '{vl_code}' associated with the DNO "
-                f"{dno.code} from {hh_format(fy_start)} to {hh_format(rs_finish)}."
+                f"{dno.dno_code} from {hh_format(fy_start)} to {hh_format(rs_finish)}."
             )
-
-        vl_voltage_level = VoltageLevel.get_by_code(sess, vl["voltage_level"])
-        llfc.voltage_level = vl_voltage_level
-
-        llfc.is_substation = vl["is_substation"]
-        if sess.is_modified(llfc):
-            logger(f"Updated LLFC {llfc.code} of DNO {dno_code}")
-            sess.flush()
+        else:
+            vl_voltage_level = VoltageLevel.get_by_code(sess, vl["voltage_level"])
+            llfc.voltage_level = vl_voltage_level
+
+            llfc.is_substation = vl["is_substation"]
+            if sess.is_modified(llfc):
+                logger(f"Updated LLFC {llfc.code} of DNO {dno_code}")
+                sess.flush()

chellow/fake_batch_updater.py

@@ -0,0 +1,305 @@
+import atexit
+import collections
+import threading
+import traceback
+from datetime import timedelta
+
+from sqlalchemy import false, null, select
+
+from werkzeug.exceptions import BadRequest
+
+from chellow.e.computer import contract_func
+from chellow.gas.engine import g_contract_func
+from chellow.models import (
+    Batch,
+    BillType,
+    Contract,
+    GBatch,
+    GBill,
+    GContract,
+    GRateScript,
+    GReadType,
+    GSupply,
+    GUnit,
+    RateScript,
+    ReadType,
+    Session,
+    Supply,
+    Tpr,
+)
+from chellow.utils import (
+    c_months_u,
+    ct_datetime_now,
+    hh_format,
+    keydefaultdict,
+    utc_datetime_now,
+)
+
+
+importer = None
+
+
+def run_import(sess, log, set_progress):
+    log("Starting to update the fake batches")
+    caches = {}
+
+    now_ct = ct_datetime_now()
+    (last_month_start, last_month_finish), (
+        current_month_start,
+        current_month_finish,
+    ) = list(c_months_u(finish_year=now_ct.year, finish_month=now_ct.month, months=2))
+
+    for last_rate_script in sess.scalars(
+        select(RateScript)
+        .join(Contract, RateScript.contract_id == Contract.id)
+        .where(RateScript.finish_date == null())
+    ):
+        contract = last_rate_script.contract
+        fb_func = contract_func(caches, contract, "make_fake_bills")
+        if fb_func is None:
+            continue
+
+        fake_batch_name = f"fake_e_batch_{contract.id}"
+
+        fake_batch = sess.scalar_one_or_none(
+            select(Batch).where(
+                Batch.contract == contract,
+                Batch.reference == fake_batch_name,
+            )
+        )
+
+        if fake_batch is not None and fake_batch.start_date < current_month_start:
+            fake_batch.delete(sess)
+            sess.flush()
+            fake_batch = None
+
+        if fake_batch is None:
+            fake_batch = contract.insert_batch(sess, fake_batch_name, "Fake Batch")
+            bill_types = keydefaultdict(lambda k: BillType.get_by_code(sess, k))
+
+            tprs = keydefaultdict(
+                lambda k: None if k is None else Tpr.get_by_code(sess, k)
+            )
+
+            read_types = keydefaultdict(lambda k: ReadType.get_by_code(sess, k))
+            for raw_bill in fb_func(
+                sess,
+                log,
+                last_month_start,
+                last_month_finish,
+                current_month_start,
+                current_month_finish,
+            ):
+                mpan_core = raw_bill["mpan_core"]
+                supply = Supply.get_by_mpan_core(sess, mpan_core)
+                bill = fake_batch.insert_bill(
+                    sess,
+                    raw_bill["account"],
+                    raw_bill["reference"],
+                    raw_bill["issue_date"],
+                    raw_bill["start_date"],
+                    raw_bill["finish_date"],
+                    raw_bill["kwh"],
+                    raw_bill["net"],
+                    raw_bill["vat"],
+                    raw_bill["gross"],
+                    bill_types[raw_bill["bill_type_code"]],
+                    raw_bill["breakdown"],
+                    supply,
+                )
+                for raw_read in raw_bill["reads"]:
+                    bill.insert_read(
+                        sess,
+                        tprs[raw_read["tpr_code"]],
+                        raw_read["coefficient"],
+                        raw_read["units"],
+                        raw_read["msn"],
+                        raw_read["mpan"],
+                        raw_read["prev_date"],
+                        raw_read["prev_value"],
+                        read_types[raw_read["prev_type_code"]],
+                        raw_read["pres_date"],
+                        raw_read["pres_value"],
+                        read_types[raw_read["pres_type_code"]],
+                    )
+    for last_rate_script in sess.scalars(
+        select(GRateScript)
+        .join(GContract, GRateScript.g_contract_id == GContract.id)
+        .where(GContract.is_industry == false(), GRateScript.finish_date == null())
+    ):
+        g_contract = last_rate_script.g_contract
+        log(f"Looking at gas contract {g_contract.name}")
+        fb_func = g_contract_func(caches, g_contract, "make_fake_bills")
+        if fb_func is None:
+            log("Doesn't have a make_fake_bills function so skipping")
+            continue
+
+        fake_batch_name = f"fake_g_batch_{g_contract.id}"
+
+        fake_batch = sess.scalars(
+            select(GBatch).where(
+                GBatch.g_contract == g_contract,
+                GBatch.reference == fake_batch_name,
+            )
+        ).one_or_none()
+
+        if fake_batch is not None:
+            first_fake_bill = sess.scalars(
+                select(GBill)
+                .where(GBill.g_batch == fake_batch)
+                .order_by(GBill.start_date)
+            ).first()
+            if (
+                first_fake_bill is None
+                or first_fake_bill.start_date < current_month_start
+            ):
+                fake_batch.delete(sess)
+                sess.flush()
+                fake_batch = None
+
+        if fake_batch is None:
+            fake_batch = g_contract.insert_g_batch(sess, fake_batch_name, "Fake Batch")
+            raw_bills = fb_func(
+                sess,
+                log,
+                last_month_start,
+                last_month_finish,
+                current_month_start,
+                current_month_finish,
+            )
+            if raw_bills is not None and len(raw_bills) > 0:
+                for raw_bill in raw_bills:
+                    bill_type = BillType.get_by_code(sess, raw_bill["bill_type_code"])
+                    g_supply = GSupply.get_by_mprn(sess, raw_bill["mprn"])
+                    g_bill = fake_batch.insert_g_bill(
+                        sess,
+                        g_supply,
+                        bill_type,
+                        raw_bill["reference"],
+                        raw_bill["account"],
+                        raw_bill["issue_date"],
+                        raw_bill["start_date"],
+                        raw_bill["finish_date"],
+                        raw_bill["kwh"],
+                        raw_bill["net_gbp"],
+                        raw_bill["vat_gbp"],
+                        raw_bill["gross_gbp"],
+                        raw_bill["raw_lines"],
+                        raw_bill["breakdown"],
+                    )
+                    sess.flush()
+                    for raw_read in raw_bill["reads"]:
+                        prev_type = GReadType.get_by_code(
+                            sess, raw_read["prev_type_code"]
+                        )
+                        pres_type = GReadType.get_by_code(
+                            sess, raw_read["pres_type_code"]
+                        )
+                        g_unit = GUnit.get_by_code(sess, raw_read["unit"])
+                        g_bill.insert_g_read(
+                            sess,
+                            raw_read["msn"],
+                            g_unit,
+                            raw_read["correction_factor"],
+                            raw_read["calorific_value"],
+                            raw_read["prev_value"],
+                            raw_read["prev_date"],
+                            prev_type,
+                            raw_read["pres_value"],
+                            raw_read["pres_date"],
+                            pres_type,
+                        )
+                    sess.commit()
+
+
+LAST_RUN_KEY = "fake_batch_updater_last_run"
+
+
+class FakeBatchUpdater(threading.Thread):
+    def __init__(self):
+        super().__init__(name="Fake Batch Updater")
+        self.messages = collections.deque(maxlen=500)
+        self.progress = ""
+        self.stopped = threading.Event()
+        self.going = threading.Event()
+        self.global_alert = None
+
+    def stop(self):
+        self.stopped.set()
+        self.going.set()
+        self.join()
+
+    def go(self):
+        self.going.set()
+
+    def log(self, message):
+        self.messages.appendleft(
+            f"{ct_datetime_now().strftime('%Y-%m-%d %H:%M:%S')} - {message}"
+        )
+
+    def set_progress(self, progress):
+        self.progress = progress
+
+    def run(self):
+        while not self.stopped.is_set():
+            with Session() as sess:
+                try:
+                    config = Contract.get_non_core_by_name(sess, "configuration")
+                    state = config.make_state()
+                except BaseException as e:
+                    msg = f"{e.description} " if isinstance(e, BadRequest) else ""
+                    self.log(f"{msg}{traceback.format_exc()}")
+                    self.global_alert = (
+                        "There's a problem with a <a href='/fake_batch_updater'>"
+                        "Fake Batch Updater</a>."
+                    )
+                    sess.rollback()
+
+            last_run = state.get(LAST_RUN_KEY)
+            if last_run is None or utc_datetime_now() - last_run > timedelta(days=1):
+                self.going.set()
+
+            if self.going.is_set():
+                self.global_alert = None
+                with Session() as sess:
+                    try:
+                        config = Contract.get_non_core_by_name(sess, "configuration")
+                        state = config.make_state()
+                        state[LAST_RUN_KEY] = utc_datetime_now()
+                        config.update_state(state)
+                        sess.commit()
+                        run_import(sess, self.log, self.set_progress)
+                    except BaseException as e:
+                        msg = f"{e.description} " if isinstance(e, BadRequest) else ""
+                        self.log(f"{msg}{traceback.format_exc()}")
+                        self.global_alert = (
+                            "There's a problem with a "
+                            "<a href='/fake_batch_updater'>Fake Batch Updater</a>."
+                        )
+                        sess.rollback()
+                    finally:
+                        self.going.clear()
+                        self.log("Finished updating fake batches.")
+
+            else:
+                self.log(
+                    f"The updater was last run at {hh_format(last_run)}. There will "
+                    f"be another update when a hour has elapsed since the last run."
+                )
+                self.going.wait(60 * 60)
+
+
+def get_importer():
+    return importer
+
+
+def startup():
+    global importer
+    importer = FakeBatchUpdater()
+    importer.start()
+
+
+@atexit.register
+def shutdown():
+    if importer is not None:
+        importer.stop()

chellow/reports/report_missing_bills.py

@@ -0,0 +1,158 @@
+import csv
+import threading
+import traceback
+
+from flask import g, redirect
+
+
+from sqlalchemy import null, or_, select
+from sqlalchemy.orm import joinedload
+
+from chellow.dloads import open_file
+from chellow.models import Batch, Bill, Contract, Era, RSession, ReportRun, User
+from chellow.utils import (
+    c_months_u,
+    csv_make_val,
+    hh_max,
+    hh_min,
+    hh_range,
+    req_date,
+    req_int,
+)
+
+
+def content(user_id, report_run_id, contract_id, months_length, finish_date):
+    f = writer = None
+    try:
+        with RSession() as sess:
+            caches = {}
+            contract = Contract.get_by_id(sess, contract_id)
+            user = User.get_by_id(sess, user_id)
+            f = open_file(
+                f"missing_bills_{contract.id}.csv", user, mode="w", newline=""
+            )
+            writer = csv.writer(f, lineterminator="\n")
+            titles = (
+                "contract_name",
+                "month_start",
+                "month_finish",
+                "site_code",
+                "site_name",
+                "imp_mpan_core",
+                "exp_mpan_core",
+                "account",
+            )
+            writer.writerow(titles)
+
+            months = list(
+                c_months_u(
+                    finish_year=finish_date.year,
+                    finish_month=finish_date.month,
+                    months=months_length,
+                )
+            )
+
+            for month_start, month_finish in months:
+                missing_bills = {}
+                missing_account = {}
+                account_missing_tuple = hh_range(caches, month_start, month_finish)
+                for era in sess.scalars(
+                    select(Era)
+                    .where(
+                        Era.start_date <= month_finish,
+                        or_(Era.finish_date == null(), Era.finish_date >= month_start),
+                        or_(
+                            Era.mop_contract == contract,
+                            Era.dc_contract == contract,
+                            Era.imp_supplier_contract == contract,
+                            Era.exp_supplier_contract == contract,
+                        ),
+                    )
+                    .options(joinedload(Era.supply))
+                ):
+                    chunk_start = hh_max(era.start_date, month_start)
+                    chunk_finish = hh_min(era.finish_date, month_finish)
+                    missing_set = set(hh_range(caches, chunk_start, chunk_finish))
+                    if era.mop_contract == contract:
+                        account = era.mop_account
+                    elif era.dc_contract == contract:
+                        account = era.dc_account
+                    elif era.imp_supplier_contract == contract:
+                        account = era.imp_supplier_account
+                    elif era.imp_supplier_contract == contract:
+                        account = era.exp_supplier_account
+
+                    try:
+                        account_missing_set = missing_account[account]
+                    except KeyError:
+                        account_missing_set = missing_account[account] = set(
+                            account_missing_tuple
+                        )
+                    supply = era.supply
+
+                    for bill in sess.scalars(
+                        select(Bill)
+                        .join(Batch)
+                        .where(
+                            Batch.contract == contract,
+                            Bill.supply == supply,
+                            Bill.start_date <= chunk_finish,
+                            Bill.finish_date >= chunk_start,
+                        )
+                    ):
+                        found_set = set(
+                            hh_range(caches, bill.start_date, bill.finish_date)
+                        )
+                        missing_set.difference_update(found_set)
+                        account_missing_set.difference_update(found_set)
+
+                    if len(missing_set) > 0:
+                        site = era.get_physical_site(sess)
+
+                        values = {
+                            "contract_id": contract.id,
+                            "contract_name": contract.name,
+                            "month_start": month_start,
+                            "month_finish": month_finish,
+                            "era_id": era.id,
+                            "supply_id": supply.id,
+                            "imp_mpan_core": era.imp_mpan_core,
+                            "exp_mpan_core": era.exp_mpan_core,
+                            "site_id": site.id,
+                            "site_code": site.code,
+                            "site_name": site.name,
+                            "account": account,
+                            "market_role_code": contract.market_role.code,
+                        }
+                        missing_bills[era.id] = values
+        for era_id, values in missing_bills.items():
+            if len(missing_account[values["account"]]) > 0:
+                writer.writerow(csv_make_val(values[t]) for t in titles)
+                ReportRun.w_insert_row(report_run_id, "", titles, values, {})
+
+    except BaseException:
+        msg = traceback.format_exc()
+        print(msg)
+        if writer is not None:
+            writer.writerow([msg])
+    finally:
+        ReportRun.w_update(report_run_id, "finished")
+        if f is not None:
+            f.close()
+
+
+def do_get(sess):
+    contract_id = req_int("contract_id")
+    months = req_int("months")
+    finish_date = req_date("finish", resolution="month")
+    report_run = ReportRun.insert(
+        sess,
+        "missing_e_bills",
+        g.user,
+        "missing_e_bills",
+        {},
+    )
+    sess.commit()
+    args = g.user.id, report_run.id, contract_id, months, finish_date
+    threading.Thread(target=content, args=args).start()
+    return redirect(f"/report_runs/{report_run.id}", 303)

chellow/templates/e/dc_contract.html

@@ -97,7 +97,18 @@
 			<input type="submit" value="Download">
 		</fieldset>
 	</form>
-	<br>
+
+	<form action="/reports/missing_bills">
+		<fieldset>
+			<legend>Download Missing Bills</legend>
+			<input type="hidden" name="contract_id" value="{{dc_contract.id}}">
+			
+			<label>Months</label> <input name="months" value="1" maxlength="2" size="2">
+			<label>Last Month</label> {{input_date('finish', last_month_finish, 'month')}}
+			<input type="submit" value="Download">
+		</fieldset>
+	</form>
+
 	<h3>Script</h3>
 
 	<pre>{{dc_contract.charge_script}}</pre>

chellow/templates/e/mop_contract.html

@@ -76,6 +76,17 @@
 			<input type="submit" value="Download"/>
 		</fieldset>
 	</form>
+
+	<form action="/reports/missing_bills">
+		<fieldset>
+			<legend>Download Missing Bills</legend>
+			<input type="hidden" name="contract_id" value="{{contract.id}}">
+			
+			<label>Months</label> <input name="months" value="1" maxlength="2" size="2">
+			<label>Last Month</label> {{input_date('finish', last_month_finish, 'month')}}
+			<input type="submit" value="Download">
+		</fieldset>
+	</form>
 	<br>
 	<h2>Script</h2>
 		<pre>{{contract.charge_script}}</pre>

chellow/templates/e/supplier_contract.html

@@ -97,6 +97,17 @@
 		</fieldset>
 	</form>
 
+	<form action="/reports/missing_bills">
+		<fieldset>
+			<legend>Download Missing Bills</legend>
+			<input type="hidden" name="contract_id" value="{{contract.id}}">
+			
+			<label>Months</label> <input name="months" value="1" maxlength="2" size="2">
+			<label>Last Month</label> {{input_date('finish', month_finish, 'month')}}
+			<input type="submit" value="Download">
+		</fieldset>
+	</form>
+
 	<h2>Script</h2>	
 
 	<pre>{{contract.charge_script}}</pre>

chellow/templates/fake_batch_updater.html

@@ -0,0 +1,99 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» Fake Batch Updater
+{% endblock %}
+
+{% block nav %}
+	Fake Batch Updater
+{% endblock %}
+
+{% block content %}
+	<p>
+	{% if importer %}
+		<ul>
+			<li><a href="#controls">Controls</a></li>
+			<li><a href="#log">Log</a></li>
+			<li><a href="#batches">Fake Batches</a></li>
+		</ul>
+
+		<h4 id="controls">Controls</h4>
+
+		<table>
+			<tr>
+				<th>Is Going?</th>
+				<td>{{importer.going.is_set()}}</td>
+			</tr>
+			<tr>
+				<th>Import Now</th>
+				<td>
+					<form method="post">
+						<fieldset {% if importer.going.is_set() %}disabled{% endif %}>
+							<input type="submit" value="Import" name="import">
+						</fieldset>
+					</form>
+				</td>
+			</tr>
+			{% if importer.going.is_set() %}
+				<tr>
+					<th>Progress</th>
+					<td>{{importer.progress}}</td>
+				</tr>
+			{% endif %}
+		</table>
+
+
+		<h4 id="log">Log</h4>
+
+		<ul>
+			{% for message in importer.messages %}
+				<li>{{message}}</li>
+			{% endfor %}
+		</ul>
+
+		<h4 id="batches">Fake Batches</h4>
+
+		<table>
+			<caption>Electricity</caption>
+			<thead>
+				<tr>
+					<th>View</th>
+					<th>Reference</th>
+					<th>Contract Name</th>
+				</tr>
+			</thead>
+			<tbody>
+				{% for batch in e_fake_batches %}
+					<tr>
+						<th><a href="/e/supplier_batches/{{batch.id}}">View</a></th>
+						<td>{{ batch.reference }}</td>
+						<td>{{ batch.contract.name }}</td>
+					</tr>
+				{% endfor %}
+			</tbody>
+		</table>
+
+		<table>
+			<caption>Gas</caption>
+			<thead>
+				<tr>
+					<th>View</th>
+					<th>Reference</th>
+					<th>Contract Name</th>
+				</tr>
+			</thead>
+			<tbody>
+				{% for batch in g_fake_batches %}
+					<tr>
+						<th><a href="/g/batches/{{batch.id}}">View</a></th>
+						<td>{{ batch.reference }}</td>
+						<td>{{ batch.g_contract.name }}</td>
+					</tr>
+				{% endfor %}
+			</tbody>
+		</table>
+
+	{% else %}
+		<p>Importer not present.</p>
+	{% endif %}
+{% endblock %}

chellow/templates/home.html

@@ -214,6 +214,7 @@
 					<li><a href="/national_grid">Automatic Importer: National Grid</a></li>
 					<li><a href="/e/lcc">Automatic Importer: Low Carbon Contracts</a></li>
 					<li><a href="/e/elexon">Automatic Importer: Elexon</a></li>
+					<li><a href="/fake_batch_updater">Automatic Fake Batch Updater</a></li>
 				</ul>
 			
 				<ul>

chellow/templates/report_run_missing_e_bills.html

@@ -0,0 +1,97 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» Report Runs » {{run.id}}
+{% endblock %}
+
+{% block nav %}
+	<a href="/report_runs">Report Runs</a> &raquo; {{run.id}}
+{% endblock %}
+
+{% block content %}
+	<table class="sticky">
+		<caption>Missing Electricity Bills Summary</caption>
+		<thead>
+			<tr>
+				<th>Date Created</th>
+				<th>Created By</th>
+				<th>State</th>
+				<th>Number Of Rows</th>
+				<th>Delete</th>
+				<th>Download Spreadsheet</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td>{{run.date_created|hh_format}}</td>
+				<td>{{run.creator}}</td>
+				<td>{{run.state}}</td>
+				<td>{{rows|length}}</td>
+				<td>
+					<form hx-delete="/report_runs/{{run.id}}/edit"
+							hx-confirm="Are you sure you want to delete this report run?">
+						<fieldset style="border: none;">
+							<input type="submit" name="delete" value="Delete">
+						</fieldset>
+					</form>
+				</td>
+				<td>
+					<a href="/report_runs/{{run.id}}/spreadsheet">Download</a>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+
+	<table class="sticky">
+		<caption>
+			Missing Electricity Bills
+		</caption>
+		<thead>
+			<tr>
+				<th>Contract</th>
+				<th>Month</th>
+				<th>Supply</th>
+				<th>Import MPAN</th>
+				<th>Export MPAN</th>
+				<th>Account</th>
+				<th>Site</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for row in rows %}
+				{% set values = row.data['values'] %}
+				<tr>
+					<td>
+						{% if values['market_role_code'] == 'M' %}
+							<a href="/e/mop_contracts/{{values['contract_id']}}">{{values['contract_name']}}</a>
+						{% elif values['market_role_code'] == 'C' %}
+							<a href="/e/dc_contracts/{{values['contract_id']}}">{{values['contract_name']}}</a>
+						{% elif values['market_role_code'] == 'X' %}
+							<a href="/e/supplier_contracts/{{values['contract_id']}}">{{values['contract_name']}}</a>
+						{% endif %}
+					</td>
+					<td>{{values['month_start'][:7]}}</td>
+					<td>
+						<a href="/e/supplies/{{values['supply_id']}}">View</a>
+					</td>
+					<td>
+						{% if values['imp_mpan_core'] is not none %}
+							{{values['imp_mpan_core']}}
+						{% endif %}
+					</td>
+					<td>
+						{% if values['exp_mpan_core'] is not none %}
+							{{values['exp_mpan_core']}}
+						{% endif %}
+					</td>
+					<td>{{values['account']}}</td>
+					<td>
+						<a href="/sites/{{values['site_id']}}" title="{{values['site_name']}}">
+							{{values['site_code']}}
+						</a>
+					</td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
+{% endblock %}

chellow/utils.py

@@ -67,12 +67,15 @@ def req_zish(name):
 def req_date(prefix, resolution="minute"):
     year = req_int(f"{prefix}_year")
     month = req_int(f"{prefix}_month")
-    day = req_int(f"{prefix}_day")
 
     try:
-        if resolution == "day":
+        if resolution == "month":
+            d = ct_datetime(year, month)
+        elif resolution == "day":
+            day = req_int(f"{prefix}_day")
             d = ct_datetime(year, month, day)
         elif resolution == "minute":
+            day = req_int(f"{prefix}_day")
             hour = req_int(f"{prefix}_hour")
             minute = req_int(f"{prefix}_minute")
             d = ct_datetime(year, month, day, hour, minute)

chellow/views.py

@@ -72,6 +72,7 @@ import chellow.national_grid
 import chellow.rate_server
 from chellow.edi_lib import SEGMENTS, parse_edi
 from chellow.models import (
+    Batch,
     BillType,
     Channel,
     Comm,
@@ -79,6 +80,7 @@ from chellow.models import (
     Cop,
     EnergisationStatus,
     Era,
+    GBatch,
     GContract,
     GEra,
     GExitZone,
@@ -156,6 +158,41 @@ def configuration():
     return redirect(f"/non_core_contracts/{config.id}")
 
 
+@home.route("/fake_batch_updater")
+def fake_batch_updater_get():
+    importer = chellow.fake_batch_updater.importer
+    config = Contract.get_non_core_by_name(g.sess, "configuration")
+    props = config.make_properties()
+
+    e_fake_batches = g.sess.scalars(
+        select(Batch).where(
+            Batch.reference.startswith("e_fake_batch_"),
+        )
+    )
+
+    g_fake_batches = g.sess.scalars(
+        select(GBatch).where(
+            GBatch.reference.startswith("g_fake_batch_"),
+        )
+    )
+
+    return render_template(
+        "fake_batch_updater.html",
+        importer=importer,
+        config_state=config.make_state(),
+        config_properties=props.get("fake_batch_updater", {}),
+        e_fake_batches=e_fake_batches,
+        g_fake_batches=g_fake_batches,
+    )
+
+
+@home.route("/fake_batch_updater", methods=["POST"])
+def fake_batch_updater_post():
+    importer = chellow.fake_batch_updater.importer
+    importer.go()
+    return redirect("/fake_batch_updater", 303)
+
+
 @home.route("/health")
 def health():
     return Response("healthy\n", mimetype="text/plain")
@@ -1501,6 +1538,19 @@ def report_run_get(run_id):
             run=run,
             rows=rows,
         )
+    elif run.name == "missing_e_bills":
+        rows = g.sess.scalars(
+            select(ReportRunRow)
+            .filter(ReportRunRow.report_run == run)
+            .order_by(
+                ReportRunRow.data["values"]["month_start"],
+            )
+        ).all()
+        return render_template(
+            "report_run_missing_e_bills.html",
+            run=run,
+            rows=rows,
+        )
 
     else:
         order_by = "row.id"
@@ -1524,12 +1574,12 @@ def report_run_get(run_id):
         )
 
 
-@home.route("/report_runs/<int:run_id>", methods=["POST"])
-def report_run_post(run_id):
+@home.route("/report_runs/<int:run_id>", methods=["DELETE"])
+def report_run_delete(run_id):
     run = g.sess.query(ReportRun).filter(ReportRun.id == run_id).one()
     run.delete(g.sess)
     g.sess.commit()
-    return redirect("/report_runs", 303)
+    return hx_redirect("/report_runs", 303)
 
 
 @home.route("/report_runs/<int:run_id>/spreadsheet")

{chellow-1744710468.0.0.dist-info → chellow-1745313690.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1744710468.0.0
+Version: 1745313690.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-1744710468.0.0.dist-info → chellow-1745313690.0.0.dist-info}/RECORD

@@ -1,9 +1,10 @@
-chellow/__init__.py,sha256=S1IjQChkEMA_MfzE5F1pPP-54bz_CRH4KE9X6SgX8bI,9722
+chellow/__init__.py,sha256=yBjAoOWh4NlA847_j4hiI7O6YyiEysf2X1y873JS-aA,9792
 chellow/api.py,sha256=mk17TfweR76DPFC8lX2SArTjai6y6YshASxqO1w-_-s,11036
 chellow/bank_holidays.py,sha256=T_utYMwe_g1dz5X-aOTdIPryg49SvB7QsWM1yphlqG8,4423
 chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=dixp-O0MF2_mlwrnKx3D9DH09Qu05BjTo0rZfigTjR4,5534
 chellow/edi_lib.py,sha256=alu20x9ZX06iPfnNI9dEJzuP6RIf4We3Y_M_bl7RrcY,51789
+chellow/fake_batch_updater.py,sha256=UdI1ygrrU5a9UZVxc9j9Lq-tIejHFGalG_4g-rPsriI,10596
 chellow/general_import.py,sha256=y8X-FzQJzVrfvVMyErNHns2MGI511KwDC19AjIX3nTk,65325
 chellow/models.py,sha256=XD5wl3Pa8vZFGA0aB1Pu-xJs3iBoBoeX44E8Myho_68,244648
 chellow/national_grid.py,sha256=czwIZqzJndSGhEMQ5YzI6hRBhvjkM6VRVYXybf4_KXg,4377
@@ -11,8 +12,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=Dj2c1NX8lVlygueOrh2eyYawLW6qKEHxNhXVVUaNRO0,3637
-chellow/utils.py,sha256=Ej7dsbQ6Ee8X2aZ7B2Vs-hUFCsMABioAdOV1DJjwY-0,19293
-chellow/views.py,sha256=2WCU-_8lDuSDROvNlCGsAQVLSMh5qrD2wmeSr2G-umA,83872
+chellow/utils.py,sha256=i3GQK9MIcweosZk2gi-nX_IFq2DxURAJDyNoLBg6YwM,19421
+chellow/views.py,sha256=GVmmChaMaFmZmcsgvR9Z5xfSh4Y1mPEBDR90kiZH5Xk,85292
 chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/aahedc.py,sha256=d2usudp7KYWpU6Pk3fal5EQ47EbvkvKeaFGylnb3NWw,606
 chellow/e/bill_importer.py,sha256=7UcnqNlKbJc2GhW9gy8sDp9GuqambJVpZLvbafOZztA,7411
@@ -21,7 +22,7 @@ chellow/e/bsuos.py,sha256=hdP9vnOJSuZl46OAkJeUg1XJYvYIBj4J6Sqce1Hy9Vs,15542
 chellow/e/ccl.py,sha256=30dh_SvlgzsTQPPAJNZWILaMvbeDsv9-P-S1JxS5_SQ,3184
 chellow/e/cfd.py,sha256=CWLdYeNjgqT6Ro8YRf4vhwXIAJ2aV4Wi6HLNClVSeaQ,14260
 chellow/e/computer.py,sha256=aGti5aXRTdC85M-WRiAoZkC_76sqfAiP-79ggWZF09Q,68020
-chellow/e/dno_rate_parser.py,sha256=A5TP6KjyfT5lVWh7dX4SiXRi6wnf2lGv-H_T4Sod8CI,21731
+chellow/e/dno_rate_parser.py,sha256=NOVfS9HRDsc0rO282hU-IdrcuvMlC7VE8RySqd_5eT0,21762
 chellow/e/duos.py,sha256=RHrn93I1ASO2uYkuF18qlhG4p-jpuJhd_g3o69wtP4U,31004
 chellow/e/elexon.py,sha256=ALhXS9Es7PV0z9ukPbIramn3cf3iLyFi-PMWPSm5iOs,5487
 chellow/e/energy_management.py,sha256=aXC2qlGt3FAODlNl_frWzVYAQrJLP8FFOiNX3m-QE_Y,12388
@@ -58,8 +59,8 @@ 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=MmGPNWYPY9UURvKwAHYpWQF2C8YuF8D1IVH9xptemDs,11227
-chellow/e/bill_parsers/nonsettlement_dc_stark_xlsx.py,sha256=yogXTuQHGRL7IiqvRWr2C9V24ez1j9Yx0128UygPE_k,4723
+chellow/e/bill_parsers/mm.py,sha256=tv7SAIbwFJYCiHz1ZwTV9QJeGkSo3-KuOp--DUimzLI,11227
+chellow/e/bill_parsers/nonsettlement_dc_stark_xlsx.py,sha256=YvQ0Q6HlZ4XSk6Phx1UWaTSj8FREVjwQe8nrpiLVzbU,5458
 chellow/e/bill_parsers/settlement_dc_stark_xlsx.py,sha256=osCpUYUdLcPtlo7ngXWGw0ImnxssLa1fOSejMwe51-k,6381
 chellow/e/bill_parsers/sse_edi.py,sha256=L85DOfNkqexeEIEr8pCBn_2sHJI-zEaw6cogpE3YyYM,15204
 chellow/e/bill_parsers/sww_xls.py,sha256=QEjiuvwvr5FuWCfqqVw8LaA_vZyAKsvRAS5fw3xtFhM,7533
@@ -106,6 +107,7 @@ chellow/reports/report_g_supplies_snapshot.py,sha256=9xB6RDrnbgxuomMcP1b1yEP4kOn
 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_missing_bills.py,sha256=3uWA6Wyskn30tUDOV_W6u_009flfKzua7vDh_jsBDaM,5956
 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=dnkuj9Z1BCOV_L2Y26lDd2QlTmFFhATa1YvwPVch1Oc,5375
@@ -121,9 +123,10 @@ chellow/templates/chain.html,sha256=iOnSoDQOO_-1tfcxUHQKDAUnV4QbCYu5PPNmS4RkOg4,
 chellow/templates/csv_sites_monthly_duration.html,sha256=59gErG6KwA57z-qh2EJsVGvTUazqm85CSXefSfqPWcQ,486
 chellow/templates/downloads.html,sha256=R9QPcFz-PLJOX7rDlmquIk-Hp9Iq-thzWCTfOexSpXg,937
 chellow/templates/edi_viewer.html,sha256=szUthgHOdph6Of-7f_1LeC_zYlNJaMeS5ctn6xTAeiM,1437
+chellow/templates/fake_batch_updater.html,sha256=aRQbxtNUlIzxwgSUy2pr-Km5NbhZkse4WSBtlqFIJMg,1885
 chellow/templates/general_import.html,sha256=9ezzieDjaPBZ0nUJkMkzoDxWVzYtr4D-Dr2UCA5xV8U,1370
 chellow/templates/general_imports.html,sha256=9sYN7FdzfxFypAUbUJ4VbhU3WhJrjArtqneohgX1hGE,13171
-chellow/templates/home.html,sha256=illtSabepcScYwmKss0o2gwvjXGBtr6LkfwmeL6ezSA,5655
+chellow/templates/home.html,sha256=EZbvIvNw0RiuIlaUTOojYSZMTd3VMbTkulABgTB_lAc,5732
 chellow/templates/input_date.html,sha256=rpgB5n0LfN8Y5djN_ZiuSxqdskxzCoKrEqI7hyJkVQo,1248
 chellow/templates/local_report.html,sha256=pV7_0QwyQ-D3OS9LXrly5pq3qprZnwTCoq6vCnMTkS4,1332
 chellow/templates/local_reports.html,sha256=4wbfVkY4wUfSSfWjxqIsvCpIsa9k7H_dGAjznrG5jNM,701
@@ -143,6 +146,7 @@ chellow/templates/report_run_asset_comparison.html,sha256=VYCCUmIC7Mfe7uuaAHb6ih
 chellow/templates/report_run_bill_check.html,sha256=H2ayoBL7EgKMq2Nwq5VjE_TNvcIKcqeCm0alQWLIw78,5084
 chellow/templates/report_run_ecoes_comparison.html,sha256=VmkT5ypWLP8qZS6NbDTC4yDaG7mnUlxZz7EV8xkHGZw,4086
 chellow/templates/report_run_g_bill_check.html,sha256=tOXl_mjR__foYKiOYflJbK-459actAtjzv8rfuL3TwM,4851
+chellow/templates/report_run_missing_e_bills.html,sha256=l5idQhfaNhMvvzIRv-iqCpeDnYl_wgs6-mZMBOmuyR8,2447
 chellow/templates/report_run_monthly_duration_org.html,sha256=gGNGJ4Q50q4BtIMi98rhO-7NqRHcsFUmbj2qzeOLejw,1713
 chellow/templates/report_run_row.html,sha256=bmtcdqJaS1CXpL0i8PuqvmeF98jKNYX5-mnQu-OuDKQ,3791
 chellow/templates/report_run_row_bill_check.html,sha256=aC2LMu_6NvmTN3ZdxHJPPPczyxPN6hg0F-PPcqIWUws,4683
@@ -198,7 +202,7 @@ chellow/templates/e/dc_bill_add.html,sha256=73Sn_MKBsUuYYnDfUMCdX1Dul6GimMC9YXk6
 chellow/templates/e/dc_bill_edit.html,sha256=0GsN-ZIc4q-z_xs8igC2ZS6t4soo2SvB3qRA6iC-AuM,2707
 chellow/templates/e/dc_bill_import.html,sha256=NHjMSoFizvFQIaPWuVE3nTCtMDTzJB0XmH8jXfV1tiA,2188
 chellow/templates/e/dc_bill_imports.html,sha256=lCaUR47r9KPr0VrQhEvVEaKexM5R_nmkxtzgpWZ0e9s,2135
-chellow/templates/e/dc_contract.html,sha256=b6DLDrGdzN9Rri56pFvfpE7QZKYXGHib2veYAztuHlg,2352
+chellow/templates/e/dc_contract.html,sha256=MqkRck0qCgxXrHSbYTfyqjf_bAbIfMy93b9kdqH0pCQ,2746
 chellow/templates/e/dc_contract_edit.html,sha256=IObmbHQmeZ_LSpnYgabmhoSNUR3aPmm-Jk5nJLM_u74,1706
 chellow/templates/e/dc_contract_hh_import.html,sha256=JncR3L6cOK4jghsGyr-itEqlIemXBXt3kL09wpqnQSE,856
 chellow/templates/e/dc_contract_hh_imports.html,sha256=eXFDGyzSgag4JRism81_p5yTzQOjCIXaVkQ8tl3dDcM,8172
@@ -255,7 +259,7 @@ chellow/templates/e/mop_bill_add.html,sha256=fjoJj6QvcCk28rPD0Z6tIXrFYZ7ygN6lIXu
 chellow/templates/e/mop_bill_edit.html,sha256=Hld9b-ckLCd9N7hleugg0BuwsZrmkvDeiJ5yLW8z-Js,2748
 chellow/templates/e/mop_bill_import.html,sha256=sSVCZnarru0GKYFW1uuP0f1Ix9iNFDtEypQ93hqeUsk,3201
 chellow/templates/e/mop_bill_imports.html,sha256=jIhWaOuk4hYj9jhXBUxQ7C8v9HJljWfOGGeu1rZa1PI,1610
-chellow/templates/e/mop_contract.html,sha256=CyuBhj6da1-TiaomXSDD8JD449Ksu8QvIZODHmsE804,1748
+chellow/templates/e/mop_contract.html,sha256=M6_pZuNpjdh9EaSGA5UsqSFIAvB0ABOehJ7s5oQ3pvk,2144
 chellow/templates/e/mop_contract_add.html,sha256=qyjDNz_pOVgfrsKaju0KwxBKJnWF9RxUa-8gUtaOc60,738
 chellow/templates/e/mop_contract_edit.html,sha256=4DbyiKbWRdliQGPh0wlh4dEuhD-R4-3XRzXoNMLfFD4,1719
 chellow/templates/e/mop_contracts.html,sha256=2TPVkeUefsYOVZIiiLMPJgwcrxhvjk8Io4UKvgdQ2AY,768
@@ -315,7 +319,7 @@ chellow/templates/e/supplier_bill_add.html,sha256=BsD-Zh7d9auiqJ61VPHiQrP8u8rTcw
 chellow/templates/e/supplier_bill_edit.html,sha256=oxZrMcMwrvluJSPxD4yfM9mWNeugoguAwT_ai9Ynl88,2732
 chellow/templates/e/supplier_bill_import.html,sha256=2_VvBoNE838UwuN0AiMwIrzqxQmWBo5DGY0lY833Bpk,5265
 chellow/templates/e/supplier_bill_imports.html,sha256=9iTNGWKn9XjQTBP1Sepbo0QVNlgKh7EfizXapam7I6s,9356
-chellow/templates/e/supplier_contract.html,sha256=oVGrYGIbCb-7MmpFQaXeTNRKBKy8GoGCWICWgo5E4xI,2863
+chellow/templates/e/supplier_contract.html,sha256=TOm5ey5b1tm0A-8g2EmZhY7WddbGDih1B4ieJknA8Ns,3254
 chellow/templates/e/supplier_contract_add.html,sha256=gsozEtF24lzYi_Bb4LTenvh62tCt7dQ4CwaIz7rFck4,899
 chellow/templates/e/supplier_contract_edit.html,sha256=Afwtn0l8XRbt86bMOru2AjjvctoUkieD052aY0B2mDc,1463
 chellow/templates/e/supplier_contracts.html,sha256=VwWD4q88Fynz7vioFSAsyH6RR_1SyQQl6bQwzL-W1m0,1508
@@ -378,6 +382,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-1744710468.0.0.dist-info/METADATA,sha256=iMSbXSKlBSPZZa8DhxsOskSD_yN4Q40MZJBuA_CXHf4,12238
-chellow-1744710468.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1744710468.0.0.dist-info/RECORD,,
+chellow-1745313690.0.0.dist-info/METADATA,sha256=6L9prKczSdFxE1p_b8WJ_f16sePhQBrdB5ZLbBmbnTk,12238
+chellow-1745313690.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1745313690.0.0.dist-info/RECORD,,