chellow 1753693159.0.0__tar.gz → 1754563507.0.0__tar.gz

{chellow-1753693159.0.0 → chellow-1754563507.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1753693159.0.0
+Version: 1754563507.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-1754563507.0.0/VERSION

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

{chellow-1753693159.0.0 → chellow-1754563507.0.0}/chellow/e/bill_parsers/drax_edi.py

@@ -449,11 +449,18 @@ def _process_MTR(elements, headers):
 
 
 def _process_VAT(elements, headers):
+    breakdown = headers["breakdown"]
     vat = Decimal("0.00") + to_decimal(elements["UVTT"]) / Decimal("100")
     vat_percentage = to_decimal(elements["VATP"]) / Decimal("1000")
+
+    if "vat_rate" in breakdown:
+        vat_rate = breakdown["vat-rate"]
+    else:
+        vat_rate = breakdown["vat-rate"] = set()
+    vat_rate.add(vat_percentage / Decimal("100"))
     vat_net = Decimal("0.00") + to_decimal(elements["UVLA"]) / Decimal("100")
 
-    headers["breakdown"]["vat"][vat_percentage] = {"vat": vat, "net": vat_net}
+    breakdown["vat"][vat_percentage] = {"vat": vat, "net": vat_net}
 
 
 def _process_NOOP(elements, headers):

{chellow-1753693159.0.0 → chellow-1754563507.0.0}/chellow/e/bill_parsers/engie_edi.py

@@ -54,7 +54,7 @@ TCOD_MAP = {
     "839829": ("cfd-fit-gbp", "cfd-fit-rate", "cfd-fit-kwh"),
     "649282": ("cfd-fit-gbp", "cfd-fit-rate", "cfd-fit-kwh"),
     "068476": ("day-gbp", "day-rate", "day-kwh"),
-    "133186": ("day-gbp", "day-rate", "day-kwh"),
+    "133186": ("nrg-gbp", "nrg-rate", "nrg-kwh"),
     "400434": ("day-gbp", "day-rate", "day-kwh"),
     "219182": (
         "duos-availability-gbp",
@@ -109,7 +109,7 @@ TCOD_MAP = {
     "220894": ("winter-night-gbp", "winter-night-rate", "winter-night-kwh"),
     "264929": ("winter-weekday-gbp", "winter-weekday-rate", "winter-weekday-kwh"),
     "638187": ("winter-weekend-gbp", "winter-weekend-rate", "winter-weekend-kwh"),
-    "700285": ("duos-fixed-gbp", "duos-fixed-rate", "duos-fixed-days"),
+    "700285": ("standing-gbp", "standing-rate", "standing-days"),
 }
 
 TPR_LOOKUP = {

{chellow-1753693159.0.0 → chellow-1754563507.0.0}/chellow/e/bill_parsers/haven_edi_tprs.py

@@ -330,6 +330,13 @@ def _process_VAT(elements, headers):
     else:
         vat_breakdown = bd["vat"] = {}
 
+    if "vat-rate" in bd:
+        vat_rate = bd["vat-rate"]
+    else:
+        vat_rate = bd["vat-rate"] = set()
+
+    vat_rate.add(vat_percentage / Decimal("100"))
+
     try:
         vat_values = vat_breakdown[vat_percentage]
     except KeyError:

{chellow-1753693159.0.0 → chellow-1754563507.0.0}/chellow/e/ro.py

@@ -15,4 +15,5 @@ def hh(supply_source):
 
         ro_kwh = hh["msp-kwh"]
         hh["ro-msp-kwh"] = ro_kwh
+        hh["ro-kwh"] = ro_kwh
         hh["ro-gbp"] = ro_kwh * ro_rate

{chellow-1753693159.0.0 → chellow-1754563507.0.0}/chellow/e/tlms.py

@@ -148,13 +148,7 @@ def elexon_import(sess, log, set_progress, s, scripting_key):
 
             set_progress(values[0])
 
-            if values[3] == "":
-                for zone in GSP_GROUP_LOOKUP.keys():
-                    values[3] = zone
-                    _process_line(
-                        cache, sess, contract, log, values, complete_date, caches
-                    )
-            else:
+            if len(values) > 5:
                 _process_line(cache, sess, contract, log, values, complete_date, caches)
 
         for rscript in cache["rate_scripts"]:

{chellow-1753693159.0.0 → chellow-1754563507.0.0}/chellow/reports/report_111.py

@@ -6,6 +6,7 @@ from collections import defaultdict
 from datetime import datetime as Datetime
 from decimal import Decimal
 from itertools import combinations
+from numbers import Number
 
 from dateutil.relativedelta import relativedelta
 
@@ -775,6 +776,33 @@ def _process_supply(
         values["batch_id"] = bill.batch.id
         values["supply_id"] = supply.id
         values["site_id"] = None if site_code is None else site.id
+        for key in tuple(values.keys()):
+            for element in sorted(long_map.keys(), key=len, reverse=True):
+                if not key.endswith("-gbp"):
+                    covered_prefix = f"covered-{element}-"
+                    virtual_prefix = f"virtual-{element}-"
+                    if key.startswith(covered_prefix):
+                        part_name = key[len(covered_prefix) :]
+                    elif key.startswith(virtual_prefix):
+                        part_name = key[len(virtual_prefix) :]
+                    else:
+                        continue
+                    virtual_part = values.get(f"virtual-{element}-{part_name}", {0})
+                    covered_part = values.get(f"covered-{element}-{part_name}", {0})
+                    if isinstance(virtual_part, set) and len(virtual_part) == 1:
+                        virtual_part = next(iter(virtual_part))
+                    if isinstance(covered_part, set) and len(covered_part) == 1:
+                        covered_part = next(iter(covered_part))
+
+                    if isinstance(virtual_part, Number) and isinstance(
+                        covered_part, Number
+                    ):
+                        diff = float(covered_part) - float(virtual_part)
+                    else:
+                        diff = None
+
+                    values[f"difference-{element}-{part_name}"] = diff
+                    break
         ReportRun.w_insert_row(
             report_run_id, "", report_run_titles, values, {"is_checked": False}
         )

{chellow-1753693159.0.0 → chellow-1754563507.0.0}/chellow/reports/report_247.py

@@ -8,7 +8,7 @@ from dateutil.relativedelta import relativedelta
 
 from flask import flash, g, make_response, redirect, render_template, request
 
-import odio
+from odio import create_spreadsheet
 
 from sqlalchemy import or_, select, true
 from sqlalchemy.sql.expression import null
@@ -63,10 +63,10 @@ def write_spreadsheet(
 ):
     fl.seek(0)
     fl.truncate()
-    with odio.create_spreadsheet(fl, "1.2", compressed=compressed) as f:
-        f.append_table("Site Level", site_rows)
-        f.append_table("Era Level", era_rows)
-        f.append_table("Normal Reads", read_rows)
+    with create_spreadsheet(fl, compressed=compressed) as sheet:
+        sheet.append_table("Site Level", site_rows)
+        sheet.append_table("Era Level", era_rows)
+        sheet.append_table("Normal Reads", read_rows)
 
 
 def make_bill_row(titles, bill):

{chellow-1753693159.0.0 → chellow-1754563507.0.0}/chellow/reports/report_59.py

@@ -7,7 +7,7 @@ from dateutil.relativedelta import relativedelta
 
 from flask import flash, g, make_response, redirect, render_template, request
 
-import odio
+from odio import create_spreadsheet
 
 from sqlalchemy import or_, select, true
 from sqlalchemy.sql.expression import null
@@ -58,11 +58,11 @@ CATEGORY_ORDER = {None: 0, "unmetered": 1, "nhh": 2, "amr": 3, "hh": 4}
 def write_spreadsheet(fl, compressed, site_rows, supply_rows, era_rows, read_rows):
     fl.seek(0)
     fl.truncate()
-    with odio.create_spreadsheet(fl, "1.2", compressed=compressed) as f:
-        f.append_table("Site Level", site_rows)
-        f.append_table("Supply Level", supply_rows)
-        f.append_table("Era Level", era_rows)
-        f.append_table("Normal Reads", read_rows)
+    with create_spreadsheet(fl, compressed=compressed) as sheet:
+        sheet.append_table("Site Level", site_rows)
+        sheet.append_table("Supply Level", supply_rows)
+        sheet.append_table("Era Level", era_rows)
+        sheet.append_table("Normal Reads", read_rows)
 
 
 def make_bill_row(titles, bill):

{chellow-1753693159.0.0 → chellow-1754563507.0.0}/chellow/reports/report_g_monthly_duration.py

@@ -3,7 +3,7 @@ import traceback
 
 from flask import g, redirect, request
 
-import odio
+from odio import create_spreadsheet
 
 from sqlalchemy import or_, select, true
 from sqlalchemy.orm import joinedload
@@ -47,9 +47,9 @@ from chellow.utils import (
 def write_spreadsheet(fl, compressed, site_rows, era_rows):
     fl.seek(0)
     fl.truncate()
-    with odio.create_spreadsheet(fl, "1.2", compressed=compressed) as f:
-        f.append_table("Site Level", site_rows)
-        f.append_table("Era Level", era_rows)
+    with create_spreadsheet(fl, compressed=compressed) as sheet:
+        sheet.append_table("Site Level", site_rows)
+        sheet.append_table("Era Level", era_rows)
 
 
 def _process_era(

{chellow-1753693159.0.0 → chellow-1754563507.0.0}/chellow/reports/report_sscs.py

@@ -5,7 +5,7 @@ import traceback
 
 from flask import g, redirect, request
 
-import odio
+from odio import create_spreadsheet
 
 from sqlalchemy import select
 from sqlalchemy.orm import joinedload
@@ -26,10 +26,10 @@ def write_spreadsheet(
 ):
     fl.seek(0)
     fl.truncate()
-    with odio.create_spreadsheet(fl, "1.2", compressed=compressed) as f:
-        f.append_table("SSCs", ssc_rows)
-        f.append_table("MRs", mr_rows)
-        f.append_table("TPRs", tpr_rows)
+    with create_spreadsheet(fl, compressed=compressed) as sheet:
+        sheet.append_table("SSCs", ssc_rows)
+        sheet.append_table("MRs", mr_rows)
+        sheet.append_table("TPRs", tpr_rows)
 
 
 def content(

{chellow-1753693159.0.0 → chellow-1754563507.0.0}/chellow/templates/report_run_bill_check.html

@@ -175,7 +175,7 @@
 											</li>
 										{% endfor %}
 									</ul>
-								{% else %}
+								{% elif values[title] is not none %}
 									{{values[title]}}
 								{% endif %}
 							</td>

chellow-1754563507.0.0/chellow/templates/report_run_row_bill_check.html

@@ -0,0 +1,299 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» Report Runs » {{row.report_run.id}} » Row {{row.id}}
+{% endblock %}
+
+{% block nav %}
+	<a href="/report_runs">Report Runs</a> &raquo;
+	<a href="/report_runs/{{row.report_run.id}}">{{row.report_run.id}}</a>
+	&raquo; Row {{row.id}}
+{% endblock %}
+
+{% block content %}
+	{% set values = row.data['values'] %}
+	{% set properties = row.data.get('properties', {}) %}
+	<table>
+		<caption>Bill Check</caption>	
+		<thead>
+			<tr>
+				<th rowspan="2">Batch</th>
+				<th colspan="8">Bill</th>
+				<th colspan="2">MPAN Core</th>
+				<th colspan="2">Site</th>
+				<th rowspan="2">Checking</th>
+			</tr>
+			<tr>
+				<th>Reference</th>
+				<th>Type</th>
+				<th>kWh</th>
+				<th>Net GBP</th>
+				<th>VAT GBP</th>
+				<th>Gross GBP</th>
+				<th>Start</th>
+				<th>Finish</th>
+				<th>Import</th>
+				<th>Export</th>
+				<th>Code</th>
+				<th>Name</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td>
+					{% if values.batch_id != None %}
+						<a href="/e/supplier_batches/{{values.batch_id}}">{{values['batch']}}</a>
+					{% endif %}
+				</td>
+				<td>
+					{% if values.bill_id != None %}
+						<a href="/e/supplier_bills/{{values.bill_id}}">{{
+							values['bill-reference']}}</a>
+					{% endif %}
+				</td>
+				<td>{{values['bill-type']}}</td>
+				<td>{{values['bill-kwh']}}</td>
+				<td>{{values['bill-net-gbp']}}</td>
+				<td>{{values['bill-vat-gbp']}}</td>
+				<td>{{values['bill-gross-gbp']}}</td>
+				<td>{{values['bill-start-date']}}</td>
+				<td>{{values['bill-finish-date']}}</td>
+				<td>
+					{% if values['imp-mpan-core'] != None %}
+					<a href="/e/supplies/{{values.supply_id}}">{{
+						values['imp-mpan-core']}}</a>
+					{% endif %}
+				</td>
+				<td>
+					{% if values['exp-mpan-core'] != None %}
+						<a href="/e/supplies/{{values.supply_id}}">{{
+							values['exp-mpan-core']}}</a>
+					{% endif %}
+				</td>
+				<td>
+					{% if values.site_id != None %}
+						<a href="/sites/{{values.site_id}}">{{
+							values['site-code']}}</a>
+					{% endif %}
+				</td>
+				<td>{{values['site-name']}}</td>
+				<td>
+					<form action="/report_run_rows/{{row.id}}" method="post">
+						<fieldset>
+							{{input_textarea(
+								'note', properties.note, 5, 40,
+								placeholder='Notes on checking go here...')}}
+							<br>
+							<br>
+							<label>Checked?
+								{{input_checkbox('is_checked', properties.is_checked)}}
+							</label>
+							<input type="submit" name="update" value="Update">
+						</fieldset>
+					</form>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+
+	<table>
+		<caption>Covered</caption>
+		<thead>
+			<tr>
+				<th>From</th>
+				<th>To</th>
+				<th>Bills</th>
+				<th>Metered kWh</th>
+				<th>Net GBP</th>
+				<th>Virtual Net GBP</th>
+				<th>Difference GBP</th>
+				<th>Problem</th>
+				<th>Virtual Problem</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td>{{values['covered-from']}}</td>
+				<td>{{values['covered-to']}}</td>
+				<td>
+					{% if values['covered-bills'] != None %}
+						<ul>
+							{% for bill_id in values['covered-bills'] %}
+								<li>
+									<a href="/e/supplier_bills/{{bill_id}}">{{bill_id}}</a>
+									{% if bill_id == values.bill_id %}
+										(This bill)
+									{% endif %}
+								</li>
+							{% endfor %}
+						</ul>
+					{% endif %}
+				</td>
+				<td>
+					{% if values['metered-kwh'] != None %}
+						{{"%.0f"|format(values['metered-kwh'])}}
+					{% endif %}
+				</td>
+				<td>{{values['covered-net-gbp']}}</td>
+				<td>
+					{% if values['virtual-net-gbp'] != None %}
+						{{"%.2f"|format(values['virtual-net-gbp'])}}
+					{% endif %}
+				</td>
+				<td>
+					{% if values['difference-net-gbp'] != None %}
+						{{"%.2f"|format(values['difference-net-gbp'])}}
+					{% endif %}
+				</td>
+				<td>{{values['covered-problem']}}</td>
+				<td>{{values['virtual-problem']}}</td>
+			</tr>
+		</tbody>
+	</table>
+  
+	<section class="elements">
+		<table>
+			<caption>GBP</caption>
+			<thead>
+				<tr>
+					<th>Part</th>
+					<th>Covered</th>
+					<th>Virtual</th>
+					<th>Difference</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td>gross</td>
+					<td>
+						{% if 'covered-gross-gbp' in values and values['covered-gross-gbp'] is number %}
+							{{"{:0,.2f}".format(values['covered-gross-gbp'])}}
+						{% endif %}
+					</td>
+					<td>
+						{% if 'virtual-gross-gbp' in values and values['virtual-gross-gbp'] is number %}
+							{{"{:0,.2f}".format(values['virtual-gross-gbp'])}}
+						{% endif %}
+					</td>
+					<td>
+						{% if 'difference-gross-gbp' in values and values['difference-gross-gbp'] is number %}
+							{{"{:0,.2f}".format(values['difference-gross-gbp'])}}
+						{% endif %}
+					</td>
+				</tr>
+				<tr>
+					<td>net</td>
+					<td>
+						{% if 'covered-net-gbp' in values and values['covered-net-gbp'] is number %}
+							{{"{:0,.2f}".format(values['covered-net-gbp'])}}</td>
+						{% endif %}
+					<td>
+						{% if 'virtual-net-gbp' in values and values['virtual-net-gbp'] is number %}
+							{{"{:0,.2f}".format(values['virtual-net-gbp'])}}</td>
+						{% endif %}
+					<td>
+						{% if 'difference-net-gbp' in values and values['difference-net-gbp'] is number %}
+							{{"{:0,.2f}".format(values['difference-net-gbp'])}}</td>
+						{% endif %}
+				</tr>
+				<tr>
+					<td>vat</td>
+					<td>
+						{% if 'covered-vat-gbp' in values and values['covered-vat-gbp'] is number %}
+							{{"{:0,.2f}".format(values['covered-vat-gbp'])}}</td>
+						{% endif %}
+					<td>
+						{% if 'virtual-vat-gbp' in values and values['virtual-vat-gbp'] is number %}
+							{{"{:0,.2f}".format(values['virtual-vat-gbp'])}}</td>
+						{% endif %}
+					<td>
+						{% if 'difference-vat-gbp' in values and values['difference-vat-gbp'] is number %}
+							{{"{:0,.2f}".format(values['difference-vat-gbp'])}}</td>
+						{% endif %}
+				</tr>
+				<tr>
+					<td>vat-rate</td>
+					<td>
+						{{values['covered-vat-rate']}}</td>
+					<td>{{values['virtual-vat-rate']}}</td>
+					<td>
+						{% if values['difference-vat-rate'] is number %}
+							{{"{:0,.2f}".format(values['difference-vat-rate'])}}
+						{% endif %}
+					</td>
+				</tr>
+			</tbody>
+		</table>
+
+		{% for table in tables %}
+			<table>
+				<caption>{{table.name}}</caption>
+				<thead>
+					<tr>
+						<th>Part</th>
+						<th>Covered</th>
+						<th>Virtual</th>
+						<th>Difference</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<td>gbp</td>
+						{% for pref in ('covered-', 'virtual-', 'difference-') %}
+							<td>
+								{% set k = pref + table.name + "-gbp" %}
+								{% if k in values %}
+									{% set val = values[k] %}
+								{% else %}
+									{% set val = '' %}
+								{% endif %}
+								{% if val is none %}
+								{% elif val is number %}
+									{{"{:0,.2f}".format(val)}}
+								{% else %}
+									{{val}}
+								{% endif %}
+							</td>
+						{% endfor %}
+					</tr>
+					{% for part in table['parts']|sort %}
+						<tr>
+							<td>{{part}}</td>
+							{% for pref in ('covered-', 'virtual-', 'difference-') %}
+								<td>
+									{% set k = pref + table.name + "-" + part %}
+									{% if k in values %}
+										{% set val = values[k] %}
+									{% else %}
+										{% set val = '' %}
+									{% endif %}
+									{% if val is none %}
+									{% elif val is number %}
+										{{"{:0,.2f}".format(val)}}
+									{% elif (val is string) or (val is boolean) %}
+										{{val}}
+									{% else %}
+										{% for v in val %}
+											{% if v is number %}
+												{{"{:0,.2f}".format(v)}}
+											{% else %}
+												{{v}}
+											{% endif %}
+											{% if not loop.last %}
+												|
+											{% endif %}
+										{% endfor %}
+									{% endif %}
+								</td>
+							{% endfor %}
+						</tr>
+					{% endfor %}
+				</tbody>
+			</table>
+		{% endfor %}
+
+	</section>
+
+	<h2>Raw</h2>	
+	<pre>{{raw_data}}</pre>
+{% endblock %}

{chellow-1753693159.0.0 → chellow-1754563507.0.0}/chellow/views.py

@@ -1629,42 +1629,40 @@ def report_run_row_get(row_id):
     if row.report_run.name == "bill_check":
         values = row.data["values"]
         elements = {}
-        for t in row.data["values"].keys():
-            if t == "difference-tpr-gbp":
-                continue
+        for t in values.keys():
 
             if (
                 t.startswith("covered-")
                 or t.startswith("virtual-")
                 or t.startswith("difference-")
-            ) and t not in (
-                "covered-from",
-                "covered-to",
-                "covered-bills",
-                "covered-problem",
-                "virtual-problem",
-            ):
+            ) and t.endswith("-gbp"):
                 toks = t.split("-")
                 name = "-".join(toks[1:-1])
+                if name in ("vat", "gross", "net", "tpr"):
+                    continue
                 try:
                     table = elements[name]
                 except KeyError:
-                    table = elements[name] = {"order": 0}
-
-                if "titles" not in table:
-                    table["titles"] = []
-                table["titles"].append(toks[0] + "-" + "-".join(toks[2:]))
-                if "values" not in table:
-                    table["values"] = []
-                table["values"].append(values[t])
-                if t.startswith("difference-") and t.endswith("-gbp"):
+                    table = elements[name] = {"order": 0, "name": name, "parts": set()}
+                    tables.append(table)
+
+                if t.startswith("difference-"):
                     table["order"] = abs(values[t])
 
-        for k, v in elements.items():
-            if k == "net":
-                continue
-            v["name"] = k
-            tables.append(v)
+        for t in values.keys():
+
+            toks = t.split("-")
+            if toks[0] in ("covered", "virtual", "difference"):
+                tail = "-".join(toks[1:])
+                for element in sorted(elements.keys(), key=len, reverse=True):
+
+                    table = elements[element]
+                    elstr = f"{element}-"
+                    if tail.startswith(elstr):
+                        part = tail[len(elstr) :]
+                        if part != "gbp":
+                            table["parts"].add(part)
+                        break
 
         tables.sort(key=lambda t: t["order"], reverse=True)
         return render_template(
@@ -1678,7 +1676,7 @@ def report_run_row_get(row_id):
 
         values = row.data["values"]
         elements = {}
-        for t in row.data["values"].keys():
+        for t in values.keys():
 
             if (
                 t.startswith("covered_")
@@ -1695,7 +1693,7 @@ def report_run_row_get(row_id):
                     table = elements[name] = {"order": 0, "name": name, "parts": set()}
                     tables.append(table)
 
-        for t in row.data["values"].keys():
+        for t in values.keys():
 
             toks = t.split("_")
             if toks[0] in ("covered", "virtual", "difference"):

{chellow-1753693159.0.0 → chellow-1754563507.0.0}/test/e/bill_parsers/test_bill_parser_drax_edi.py

@@ -284,6 +284,7 @@ def test_process_VAT(mocker):
     _process_VAT(elements, headers)
     expected_headers = {
         "breakdown": {
+            "vat-rate": {Decimal("0.20")},
             "vat": {Decimal("20"): {"net": Decimal("6.00"), "vat": Decimal("1.50")}},
         }
     }

{chellow-1753693159.0.0 → chellow-1754563507.0.0}/test/e/bill_parsers/test_bill_parser_haven_edi_tprs.py

@@ -350,7 +350,8 @@ def test_process_VAT(mocker):
         "vat": Decimal("1.50"),
         "gross": Decimal("8.50"),
         "breakdown": {
-            "vat": {Decimal("20"): {"vat": Decimal("1.50"), "net": Decimal("6.00")}}
+            "vat-rate": {Decimal("0.20")},
+            "vat": {Decimal("20"): {"vat": Decimal("1.50"), "net": Decimal("6.00")}},
         },
     }
     assert headers == expected_headers