chellow 1744367649.0.0__py3-none-any.whl → 1744720514.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/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/general_import.py

@@ -381,7 +381,7 @@ def general_import_era(sess, action, vals, args):
             else:
                 ssc_code = ssc.code
         elif len(ssc_code) > 0:
-            Ssc.get_by_code(sess, ssc_code)
+            Ssc.get_by_code(sess, ssc_code, start_date)
         else:
             ssc_code = None
 

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/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")

{chellow-1744367649.0.0.dist-info → chellow-1744720514.0.0.dist-info}/METADATA

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

@@ -1,10 +1,11 @@
-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/general_import.py,sha256=pRGMcdhPq0Gfr1QG8LiqToKp-mnYa2yB8tfh8fy7eQo,65313
+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
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
@@ -12,7 +13,7 @@ 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/views.py,sha256=Ax8TW5dOoWN1G7zmmO4_X0af_9gftKU0HAHoPpkYNIc,84883
 chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/aahedc.py,sha256=d2usudp7KYWpU6Pk3fal5EQ47EbvkvKeaFGylnb3NWw,606
 chellow/e/bill_importer.py,sha256=7UcnqNlKbJc2GhW9gy8sDp9GuqambJVpZLvbafOZztA,7411
@@ -121,9 +122,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
@@ -378,6 +380,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-1744367649.0.0.dist-info/METADATA,sha256=B5-QNvM_HsXto5KceFuR3iyKpLANapsBFik7TsDiy84,12238
-chellow-1744367649.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1744367649.0.0.dist-info/RECORD,,
+chellow-1744720514.0.0.dist-info/METADATA,sha256=h25ZnkwR-pmuFVXtxncX-IM8v7L7Z_yXQ4DZ_H-HlYw,12238
+chellow-1744720514.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1744720514.0.0.dist-info/RECORD,,