chellow 1715955542.0.0__tar.gz → 1716366171.0.0__tar.gz

{chellow-1715955542.0.0 → chellow-1716366171.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1715955542.0.0
+Version: 1716366171.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-1716366171.0.0/VERSION

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

chellow-1715955542.0.0/chellow/gas/bill_parser_edi.py → chellow-1716366171.0.0/chellow/gas/bill_parser_total_edi.py

@@ -12,27 +12,11 @@ from chellow.utils import HH, to_ct, to_utc
 
 READ_TYPE_MAP = {"00": "A", "01": "E", "02": "E"}
 
-TCOD_MAP = {
-    "Energy Bill Discount Scheme": {"PPK": "ebrs"},
-    "Energy Bill Relief Scheme": {"PPK": "ebrs"},
-    "Energy Bill Relief Scheme Discount": {"PPK": "ebrs"},
-    "Unidentified Gas": {"PPK": "ug"},
-    "Commodity": {"PPK": "commodity"},
-    "Transportation": {"PPD": "transportation_fixed", "PPK": "transportation_variable"},
-    "Gas Flexi": {"PPK": "commodity"},
-    "Flex - Gas Flexi (New)": {"PPK": "commodity"},
-    "Meter Reading": {"PPD": "meter_read"},
-    "Meter Reading Credit Oct 19": {"FIX": "meter_read"},
-    "Meter Rental": {"PPD": "metering"},
-    "CCL": {"PPK": "ccl"},
-    "Consumption Based Administration": {"PPK": "admin_variable"},
-    "Swing": {"PPK": "swing"},
-}
 
 SUPPLIER_CODE_MAP = {
-    "STD": "standing",
-    "MET": "commodity",
-    "CCL": "ccl",
+    "STD": ("standing", Decimal("1000"), Decimal("1")),
+    "MET": ("commodity", Decimal("100000"), Decimal("1000")),
+    "CCL": ("ccl", Decimal("100000"), Decimal("1000")),
 }
 
 UNIT_MAP = {"M3": "M3", "HH": "HCUF", "HCUF": "HCUF"}
@@ -62,16 +46,6 @@ def _process_BCD(elements, headers):
     btcd = elements["BTCD"]
     headers["bill_type_code"] = btcd[0]
 
-    sumo = elements["SUMO"]
-    start_date = to_date(sumo[0])
-    if start_date is not None:
-        headers["start_date"] = start_date
-
-    if len(sumo) > 1:
-        finish_date = _to_finish_date(sumo[1])
-        if finish_date is not None:
-            headers["finish_date"] = finish_date
-
 
 def _process_MHD(elements, headers):
     headers.clear()
@@ -88,62 +62,12 @@ def _process_MHD(elements, headers):
         headers["gross"] = Decimal("0.00")
 
 
-def _process_CCD1(elements, headers):
-    mtnr = elements["MTNR"]
-    msn = mtnr[0]
-
-    mloc = elements["MLOC"]
-
-    # Bug in EDI where MPRN missing in second CCD 1
-    if "mprn" not in headers:
-        headers["mprn"] = mloc[0]
-
-    prdt = elements["PRDT"]
-    pvdt = elements["PVDT"]
-
-    pres_read_date = to_date(prdt[0])
-    prev_read_date = to_date(pvdt[0])
-
-    prrd = elements["PRRD"]
-    pres_read_value = Decimal(prrd[0])
-    pres_read_type = READ_TYPE_MAP[prrd[1]]
-    prev_read_value = Decimal(prrd[2])
-    prev_read_type = READ_TYPE_MAP[prrd[3]]
-
-    conb = elements["CONB"]
-    unit = UNIT_MAP[conb[1]]
-    headers["breakdown"]["units_consumed"] += to_decimal(conb) / Decimal("1000")
-
-    adjf = elements["ADJF"]
-    correction_factor = Decimal(adjf[1]) / Decimal(100000)
-
-    nuct = elements["NUCT"]
-
-    headers["kwh"] += to_decimal(nuct) / Decimal("1000")
-
-    headers["reads"].append(
-        {
-            "msn": msn,
-            "unit": unit,
-            "correction_factor": correction_factor,
-            "prev_date": prev_read_date,
-            "prev_value": prev_read_value,
-            "prev_type_code": prev_read_type,
-            "pres_date": pres_read_date,
-            "pres_value": pres_read_value,
-            "pres_type_code": pres_read_type,
-        }
-    )
-
-
 NUCT_LOOKUP = {"DAY": "days", "KWH": "kwh"}
 
 
 def _process_CCD2(elements, headers):
     breakdown = headers["breakdown"]
     ccde = elements["CCDE"]
-    ccde_supplier_code = ccde[2]
-    tcod = elements["TCOD"]
     nuct = elements["NUCT"]
     mtnr = elements["MTNR"]
     conb = elements["CONB"]
@@ -151,57 +75,45 @@ def _process_CCD2(elements, headers):
     prdt = elements["PRDT"]
     pvdt = elements["PVDT"]
     prrd = elements["PRRD"]
+    cppu = elements["CPPU"]
+    ctot = elements["CTOT"]
+    csdt = elements["CSDT"]
+    cedt = elements["CEDT"]
+    mloc = elements["MLOC"]
 
-    if len(tcod) > 1:
-        tpref_lookup = TCOD_MAP[tcod[1]]
-    else:
-        tpref_lookup = SUPPLIER_CODE_MAP
+    ccde_supplier_code = ccde[2]
+    tpref, rate_divisor, units_divisor = SUPPLIER_CODE_MAP[ccde_supplier_code]
 
-    tpref = tpref_lookup[ccde_supplier_code]
+    rate_str = cppu[0]
 
-    bpri = elements["BPRI"]
-    if len(bpri[0]) > 0:
-        rate_key = f"{tpref}_rate"
-        if rate_key not in breakdown:
-            breakdown[rate_key] = set()
-        rate = Decimal(bpri[0]) / Decimal("10000000")
-        breakdown[rate_key].add(rate)
+    rate_key = f"{tpref}_rate"
+    if rate_key not in breakdown:
+        breakdown[rate_key] = set()
+    rate = Decimal(rate_str) / rate_divisor
+    breakdown[rate_key].add(rate)
 
-    try:
-        ctot = elements["CTOT"]
-        breakdown[f"{tpref}_gbp"] += to_decimal(ctot) / Decimal("100")
-
-        if len(nuct) > 1:
-            key = NUCT_LOOKUP[nuct[1]]
-        else:
-            if ccde_supplier_code == "PPK":
-                key = f"{tpref}_kwh"
-            elif ccde_supplier_code == "PPD":
-                key = f"{tpref}_days"
-
-        breakdown[key] += to_decimal(nuct) / Decimal("1000")
-    except KeyError:
-        pass
+    breakdown[f"{tpref}_gbp"] += to_decimal(ctot) / Decimal("100")
+
+    suff = NUCT_LOOKUP[nuct[1].strip()]
+    key = f"{tpref}_{suff}"
+    units_billed = to_decimal(nuct) / units_divisor
+    breakdown[key] += units_billed
 
     if "start_date" not in headers:
-        csdt = elements["CSDT"]
-        start_date = to_date(csdt[0])
-        if start_date is not None:
-            headers["start_date"] = start_date
+        headers["start_date"] = to_date(csdt[0])
 
     if "finish_date" not in headers:
-        cedt = elements["CSDT"]
-        finish_date = _to_finish_date(cedt[0])
-        if finish_date is not None:
-            headers["finish_date"] = finish_date
+        headers["finish_date"] = _to_finish_date(cedt[0])
 
     if "mprn" not in headers:
-        mloc = elements["MLOC"]
         headers["mprn"] = mloc[0]
 
     if len(conb) > 0 and len(conb[0]) > 0:
         headers["breakdown"]["units_consumed"] += to_decimal(conb) / Decimal("1000")
 
+    if tpref == "commodity":
+        headers["kwh"] += units_billed
+
     if len(prrd) > 0 and len(prrd[0]) > 0:
         pres_read_date = to_date(prdt[0])
         prev_read_date = to_date(pvdt[0])
@@ -229,70 +141,6 @@ def _process_CCD2(elements, headers):
         )
 
 
-def _process_CCD3(elements, headers):
-    breakdown = headers["breakdown"]
-    ccde = elements["CCDE"]
-    ccde_supplier_code = ccde[2]
-    tcod = elements["TCOD"]
-
-    tpref = TCOD_MAP[tcod[1]][ccde_supplier_code]
-
-    bpri = elements["BPRI"]
-    bpri_str = bpri[0]
-    if len(bpri_str) > 0:
-        rate_key = f"{tpref}_rate"
-        if rate_key not in breakdown:
-            breakdown[rate_key] = set()
-        rate = Decimal(bpri_str) / Decimal("10000000")
-        breakdown[rate_key].add(rate)
-
-    nuct = elements["NUCT"]
-
-    try:
-        ctot = elements["CTOT"]
-        breakdown[f"{tpref}_gbp"] += to_decimal(ctot) / Decimal("100")
-
-        if ccde_supplier_code == "PPK":
-            key = f"{tpref}_kwh"
-        elif ccde_supplier_code == "PPD":
-            key = f"{tpref}_days"
-
-        breakdown[key] += to_decimal(nuct) / Decimal("1000")
-    except KeyError:
-        pass
-
-
-def _process_CCD4(elements, headers):
-    breakdown = headers["breakdown"]
-    ccde = elements["ccde"]
-    ccde_supplier_code = ccde[2]
-    tcod = elements["TCOD"]
-
-    tpref = TCOD_MAP[tcod[1]][ccde_supplier_code]
-
-    bpri = elements["BPRI"]
-    rate_key = f"{tpref}_rate"
-    if rate_key not in breakdown:
-        breakdown[rate_key] = set()
-    rate = Decimal(bpri[0]) / Decimal("10000000")
-    breakdown[rate_key].add(rate)
-
-    nuct = elements["NUCT"]
-
-    try:
-        ctot = elements["CTOT"]
-        breakdown[tpref + "_gbp"] += to_decimal(ctot) / Decimal("100")
-
-        if ccde_supplier_code == "PPK":
-            key = f"{tpref}_kwh"
-        elif ccde_supplier_code == "PPD":
-            key = f"{tpref}_days"
-
-        breakdown[key] += to_decimal(nuct) / Decimal("1000")
-    except KeyError:
-        pass
-
-
 def _process_MTR(elements, headers):
     if headers["message_type"] == "UTLBIL":
         breakdown = headers["breakdown"]
@@ -357,10 +205,10 @@ CODE_FUNCS = {
     "ADJ": _process_ADJ,
     "BCD": _process_BCD,
     "BTL": _process_NOOP,
-    "CCD1": _process_CCD1,
+    "CCD1": _process_NOOP,
     "CCD2": _process_CCD2,
-    "CCD3": _process_CCD3,
-    "CCD4": _process_CCD4,
+    "CCD3": _process_NOOP,
+    "CCD4": _process_NOOP,
     "CDT": _process_NOOP,
     "CLO": _process_NOOP,
     "END": _process_NOOP,

{chellow-1715955542.0.0 → chellow-1716366171.0.0}/chellow/gas/engine.py

@@ -502,13 +502,6 @@ class GDataSource:
                 * h["calorific_value"]
                 / 3.6
             )
-            h["kwh_avg"] = (
-                h["units_consumed"]
-                * h["unit_factor"]
-                * h["correction_factor"]
-                * h["avg_cv"]
-                / 3.6
-            )
             h["ug_rate"] = float(
                 g_rates(sess, self.caches, "ug", h["start_date"], True)[
                     "ug_gbp_per_kwh"
@@ -703,9 +696,7 @@ def find_cv(sess, caches, dt, g_ldz_code):
             avg_cv = year_cache[ct.month]
         except KeyError:
             cv_list = [float(v["cv"]) for v in cvs.values()]
-            avg_cv = year_cache[ct.month] = round(
-                sum(cv_list) / len(cv_list), ndigits=1
-            )
+            avg_cv = year_cache[ct.month] = sum(cv_list) / len(cv_list)
     return cv, avg_cv
 
 

{chellow-1715955542.0.0 → chellow-1716366171.0.0}/chellow/gas/views.py

@@ -289,15 +289,37 @@ def supply_edit_get(g_supply_id):
     )
 
 
+@gas.route("/supplies/<int:g_supply_id>/edit", methods=["DELETE"])
+def supply_edit_delete(g_supply_id):
+    g_supply = GSupply.get_by_id(g.sess, g_supply_id)
+    try:
+        g_supply.delete(g.sess)
+        g.sess.commit()
+        return hx_redirect("/supplies")
+    except BadRequest as e:
+        flash(e.description)
+        g_eras = g.sess.scalars(
+            select(GEra)
+            .where(GEra.g_supply == g_supply)
+            .order_by(GEra.start_date.desc())
+        )
+        g_exit_zones = g.sess.query(GExitZone).order_by(GExitZone.code).all()
+        return make_response(
+            render_template(
+                "supply_edit.html",
+                g_supply=g_supply,
+                g_eras=g_eras,
+                g_exit_zones=g_exit_zones,
+            ),
+            400,
+        )
+
+
 @gas.route("/supplies/<int:g_supply_id>/edit", methods=["POST"])
 def supply_edit_post(g_supply_id):
     g_supply = GSupply.get_by_id(g.sess, g_supply_id)
     try:
-        if "delete" in request.values:
-            g_supply.delete(g.sess)
-            g.sess.commit()
-            return chellow_redirect("/supplies", 303)
-        elif "insert_g_era" in request.values:
+        if "insert_g_era" in request.values:
             start_date = req_date("start")
             g_supply.insert_g_era_at(g.sess, start_date)
             g.sess.commit()

{chellow-1715955542.0.0 → chellow-1716366171.0.0}/chellow/templates/g/bill_import.html

@@ -45,6 +45,7 @@
 					<th>Issue Date</th>
 					<th>Start Date</th>
 					<th>Finish Date</th>
+					<th>kWh</th>
 					<th>Net GBP</th>
 					<th>VAT</th>
 					<th>Gross GBP</th>
@@ -72,6 +73,7 @@
 						<td>{{bill.issue_date|hh_format}}</td>
 						<td>{{bill.start_date|hh_format}}</td>
 						<td>{{bill.finish_date|hh_format}}</td>
+						<td>{{bill.kwh}}</td>
 						<td>{{bill.net_gbp}}</td>
 						<td>{{bill.vat_gbp}}</td>
 						<td>{{bill.gross_gbp}}</td>

chellow-1716366171.0.0/chellow/templates/g/supply_edit.html

@@ -0,0 +1,62 @@
+{% extends "base.html" %}
+
+{% block title %}
+	Gas Supplies » {{g_supply.id}} » Edit
+{% endblock %}
+
+{% block nav %}
+	<a href="/g/supplies">Gas Supplies</a> &raquo;
+	<a href="/g/supplies/{{g_supply.id}}">{{g_supply.id}}</a> &raquo; Edit
+{% endblock %}
+
+{% block content %}
+	<form method="post" action="/g/supplies/{{g_supply.id}}/edit">
+		<fieldset>
+			<legend>Update this supply</legend>
+			<label>Name</label> {{input_text('name', g_supply.name)}}
+			<label>MPRN</label> {{input_text('mprn', g_supply.mprn)}}
+			<label>Exit Zone</label>
+			<select name="g_exit_zone_id">
+				{% for g_exit_zone in g_exit_zones %}
+					{{input_option(
+						'g_exit_zone_id', g_exit_zone.id, g_exit_zone.code, initial=g_supply.g_exit_zone.id)}}
+				{% endfor %}
+			</select>
+			<input type="submit" value="Update">
+		</fieldset>
+	</form>
+
+	<form hx-delete="/g/supplies/{{g_supply.id}}/edit"
+			hx-confirm="Are you sure you want to delete this supply?">
+		<fieldset>
+			<legend>Delete this supply</legend>
+			<input type="submit" value="Delete">
+		</fieldset>
+	</form>
+
+	<form method="post" action="/g/supplies/{{g_supply.id}}/edit">
+		<fieldset>
+			<legend>Insert a new era</legend>
+			<label>Start date</label> {{input_date('start', None)}}
+			<input type="submit" name="insert_g_era" value="Insert">
+		</fieldset>
+	</form>
+
+	<table>
+		<caption>Existing Eras</caption>
+		<thead>
+			<tr>
+				<th>Start date</th>
+				<th>Finish date</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for g_era in g_eras %}
+				<tr>
+					<td>{{g_era.start_date|hh_format}}</td>
+					<td>{{g_era.finish_date|hh_format}}</td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
+{% endblock %}

chellow-1716366171.0.0/test/gas/bill_parsers/test_g_bill_parser_total_edi.py

@@ -0,0 +1,80 @@
+from collections import defaultdict
+from decimal import Decimal
+
+from chellow.gas.bill_parser_total_edi import (
+    _process_CCD2,
+    _process_MHD,
+    _to_finish_date,
+)
+from chellow.utils import ct_datetime, to_utc, utc_datetime
+
+
+def test_to_finish_date():
+    actual = _to_finish_date("211031")
+    assert actual == to_utc(ct_datetime(2021, 10, 31, 23, 30))
+
+
+def test_process_MHD():
+    message_type = "UTLBIL"
+    headers = {}
+    elements = {"TYPE": [message_type, "3"]}
+    _process_MHD(elements, headers)
+
+    expected_headers = {
+        "message_type": message_type,
+        "reads": [],
+        "raw_lines": [],
+        "breakdown": {"units_consumed": Decimal("0")},
+        "kwh": Decimal("0.00"),
+        "net": Decimal("0.00"),
+        "vat": Decimal("0.00"),
+        "gross": Decimal("0.00"),
+    }
+    assert headers == expected_headers
+
+
+def test_process_CCD2():
+    headers = {}
+    headers["reads"] = []
+    headers["raw_lines"] = []
+    headers["breakdown"] = defaultdict(int, {"units_consumed": Decimal(0)})
+    headers["kwh"] = Decimal("0.00")
+    headers["net"] = Decimal("0.00")
+    headers["vat"] = Decimal("0.00")
+    headers["gross"] = Decimal("0.00")
+    elements = {
+        "CCDE": ["", "", "MET"],
+        "NUCT": ["968823", "KWH"],
+        "MTNR": [],
+        "CONB": [],
+        "ADJF": [],
+        "PRDT": [],
+        "PVDT": [],
+        "PRRD": [],
+        "MLOC": ["978672"],
+        "CSDT": ["240401"],
+        "CEDT": ["240430"],
+        "CTOT": ["3882"],
+        "CPPU": ["9742"],
+    }
+    _process_CCD2(elements, headers)
+    print(headers)
+    expected_headers = {
+        "reads": [],
+        "raw_lines": [],
+        "breakdown": {
+            "units_consumed": Decimal("0"),
+            "commodity_rate": {Decimal("0.09742")},
+            "commodity_gbp": Decimal("38.82"),
+            "commodity_kwh": Decimal("968.823"),
+        },
+        "kwh": Decimal("968.823"),
+        "net": Decimal("0.00"),
+        "vat": Decimal("0.00"),
+        "gross": Decimal("0.00"),
+        "start_date": utc_datetime(2024, 3, 31, 23, 0),
+        "finish_date": utc_datetime(2024, 4, 30, 22, 30),
+        "mprn": "978672",
+    }
+
+    assert headers == expected_headers

{chellow-1715955542.0.0 → chellow-1716366171.0.0}/test/gas/test_engine.py

@@ -40,7 +40,7 @@ def test_find_cv(sess):
     dt = to_utc(ct_datetime(2020, 1, 1))
     cv, avg_cv = find_cv(sess, caches, dt, g_ldz.code)
 
-    assert (cv, avg_cv) == (39.2101, 39.2)
+    assert (cv, avg_cv) == (39.2101, 39.2101)
 
 
 def test_find_hhs_pairs_before_after_chunk_finish(mocker):

{chellow-1715955542.0.0 → chellow-1716366171.0.0}/test/gas/test_gas_views.py

@@ -978,6 +978,44 @@ def test_read_edit_post_delete(sess, client):
     match(response, 303, f"/g/bills/{g_bill.id}")
 
 
+def test_supply_edit_get(client, sess):
+    vf = to_utc(ct_datetime(2000, 1, 1))
+    site = Site.insert(sess, "22488", "Water Works")
+
+    g_dn = GDn.insert(sess, "EE", "East of England")
+    g_ldz = g_dn.insert_g_ldz(sess, "EA")
+    g_exit_zone = g_ldz.insert_g_exit_zone(sess, "EA1")
+    insert_g_units(sess)
+    g_unit_M3 = GUnit.get_by_code(sess, "M3")
+
+    g_contract = GContract.insert_supplier(sess, "Fusion 2020", "", {}, vf, None, {})
+
+    insert_g_reading_frequencies(sess)
+    g_reading_frequency_M = GReadingFrequency.get_by_code(sess, "M")
+
+    g_supply = site.insert_g_supply(
+        sess,
+        "7y94u5",
+        "main",
+        g_exit_zone,
+        utc_datetime(2018, 1, 1),
+        None,
+        "hgeu8rhg",
+        1,
+        g_unit_M3,
+        g_contract,
+        "d7gthekrg",
+        g_reading_frequency_M,
+        1,
+        1,
+    )
+
+    sess.commit()
+
+    response = client.get(f"/g/supplies/{g_supply.id}/edit")
+    match(response, 200, r'<option value="1" selected>EA1</option>')
+
+
 def test_supplier_rate_script_get(sess, client):
     g_contract = GContract.insert(
         sess,

chellow-1715955542.0.0/VERSION

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

chellow-1715955542.0.0/chellow/templates/g/supply_edit.html

@@ -1,76 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}
-	Gas Supplies » {{g_supply.id}} » Edit
-{% endblock %}
-
-{% block nav %}
-	<a href="/g/supplies">Gas Supplies</a> &raquo;
-	<a href="/g/supplies/{{g_supply.id}}">{{g_supply.id}}</a> &raquo; Edit
-{% endblock %}
-
-{% block content %}
-	{% if request.method == 'GET' and request.values.delete %}
-		<form method="post" action="/g/supplies/{{g_supply.id}}/edit">
-			<fieldset>
-				<legend>Delete</legend>
-				<p>Are you sure you want to delete this supply?</p>
-				<input type="submit" name="delete" value="Delete">
-			</fieldset>
-		</form>
-
-		<p>
-			<a href="/g/supplies/{{g_supply.id}}">Cancel</a>
-		</p>
-
-	{% else %}
-
-		<form method="post" action="/g/supplies/{{g_supply.id}}/edit">
-			<fieldset>
-				<legend>Update this supply</legend>
-				<label>Name</label> {{input_text('name', g_supply.name)}}
-				<label>MPRN</label> {{input_text('mprn', g_supply.mprn)}}
-				<label>Exit Zone</label>
-				<select name="g_exit_zone_id">
-					{% for g_exit_zone in g_exit_zones %}
-						{{input_option( 'g_exit_zone_id', g_exit_zone.id, g_exit_zone.code)}}
-					{% endfor %}
-				</select>
-				<input type="submit" value="Update">
-			</fieldset>
-		</form>
-		<br>
-		<form action="/g/supplies/{{g_supply.id}}/edit">
-			<fieldset>
-				<legend>Delete this supply</legend>
-				<input type="submit" name="delete" value="Delete">
-			</fieldset>
-		</form>
-		<br>
-		<form method="post" action="/g/supplies/{{g_supply.id}}/edit">
-			<fieldset>
-				<legend>Insert a new era</legend>
-				<label>Start date</label> {{input_date('start', None)}}
-				<input type="submit" name="insert_g_era" value="Insert">
-			</fieldset>
-		</form>
-		<br>
-		<table>
-			<caption>Existing Eras</caption>
-			<thead>
-				<tr>
-					<th>Start date</th>
-					<th>Finish date</th>
-				</tr>
-			</thead>
-			<tbody>
-				{% for g_era in g_eras %}
-					<tr>
-						<td>{{g_era.start_date|hh_format}}</td>
-						<td>{{g_era.finish_date|hh_format}}</td>
-					</tr>
-				{% endfor %}
-			</tbody>
-		</table>
-	{% endif %}
-{% endblock %}