chellow 1739889885.0.0__py3-none-any.whl → 1740736363.0.0__py3-none-any.whl

chellow/e/computer.py

@@ -119,11 +119,15 @@ def contract_func(caches, contract, func_name):
     return ns.get(func_name, None)
 
 
-def non_core_rate(sess, caches, contract_id_or_name, date):
-    return hh_rate(sess, caches, contract_id_or_name, date, market_role_code="Z")
+def non_core_rate(sess, caches, contract_id_or_name, date, exact=False):
+    return hh_rate(
+        sess, caches, contract_id_or_name, date, market_role_code="Z", exact=exact
+    )
 
 
-def hh_rate(sess, caches, contract_id_or_name, date, market_role_code=None):
+def hh_rate(
+    sess, caches, contract_id_or_name, date, market_role_code=None, exact=False
+):
     try:
         ccache = caches["computer"]
     except KeyError:
@@ -181,18 +185,20 @@ def hh_rate(sess, caches, contract_id_or_name, date, market_role_code=None):
             )
 
             if rs is None:
-                rs = (
+                last_rs = (
                     sess.query(RateScript)
                     .filter(RateScript.contract == contract)
                     .order_by(RateScript.start_date.desc())
                     .first()
                 )
-                if date < rs.start_date:
+                if date < last_rs.start_date:
                     cstart = year_before
-                    cfinish = min(year_after, rs.start_date - HH)
+                    cfinish = min(year_after, last_rs.start_date - HH)
                 else:
-                    cstart = max(rs.finish_date + HH, year_before)
+                    cstart = max(last_rs.finish_date + HH, year_before)
                     cfinish = year_after
+                if not exact:
+                    rs = last_rs
             else:
                 cstart = max(rs.start_date, year_before)
                 if rs.finish_date is None:
@@ -200,23 +206,26 @@ def hh_rate(sess, caches, contract_id_or_name, date, market_role_code=None):
                 else:
                     cfinish = min(rs.finish_date, year_after)
 
-            market_role_code = rs.contract.market_role.code
-            if market_role_code == "M":
-                seg = "/e/mop_rate_scripts/"
-            elif market_role_code == "C":
-                seg = "/e/dc_rate_scripts/"
-            elif market_role_code == "X":
-                seg = "/e/supplier_rate_scripts/"
-            elif market_role_code == "Z":
-                seg = "/non_core_rate_scripts/"
-            elif market_role_code == "R":
-                seg = "/e/dno_rate_scripts/"
+            if rs is None:
+                vals = None
             else:
-                raise Exception(
-                    f"The market role code {market_role_code} isn't recognized."
-                )
+                market_role_code = rs.contract.market_role.code
+                if market_role_code == "M":
+                    seg = "/e/mop_rate_scripts/"
+                elif market_role_code == "C":
+                    seg = "/e/dc_rate_scripts/"
+                elif market_role_code == "X":
+                    seg = "/e/supplier_rate_scripts/"
+                elif market_role_code == "Z":
+                    seg = "/non_core_rate_scripts/"
+                elif market_role_code == "R":
+                    seg = "/e/dno_rate_scripts/"
+                else:
+                    raise Exception(
+                        f"The market role code {market_role_code} isn't recognized."
+                    )
 
-            vals = PropDict(f"the rate script {seg}{rs.id} ", loads(rs.script), [])
+                vals = PropDict(f"the rate script {seg}{rs.id} ", loads(rs.script), [])
             for dt in hh_range(caches, cstart, cfinish):
                 if dt not in cont_cache:
                     cont_cache[dt] = vals
@@ -572,8 +581,10 @@ class DataSource:
             self.rate_cache = self.caches["computer"]["rates"]
             return val
 
-    def non_core_rate(self, contract_name_or_id, date):
-        return non_core_rate(self.sess, self.caches, contract_name_or_id, date)
+    def non_core_rate(self, contract_name_or_id, date, exact=False):
+        return non_core_rate(
+            self.sess, self.caches, contract_name_or_id, date, exact=exact
+        )
 
     def _add_problem(self, problem):
         self.supplier_bill["problem"] += problem

chellow/e/tlms.py

@@ -36,7 +36,11 @@ def hh(data_source, run="DF"):
             h["tlm"] = tlm = cache[h["start-date"]][gsp_group_code][run]
         except KeyError:
             h_start = h["start-date"]
-            rates = data_source.non_core_rate("tlms", h_start)["tlms"]
+            vals = data_source.non_core_rate("tlms", h_start, exact=True)
+            if vals is None:
+                vals = data_source.non_core_rate("tlms", h["hist-start"])
+
+            rates = vals["tlms"]
 
             key = key_format(h_start)
             try:

chellow/reports/report_429.py

@@ -6,6 +6,7 @@ from collections import OrderedDict, defaultdict
 from datetime import datetime as Datetime
 from decimal import Decimal
 from itertools import combinations
+from numbers import Number
 
 from flask import g, redirect, request
 
@@ -364,22 +365,61 @@ def _process_g_bill_ids(
     vals["g_supply_id"] = g_supply.id
     vals["site_id"] = site_id
     for element in sorted(elements):
-        rate_name = f"difference_{element}_rate"
-        covered_rates = vals.get(f"covered_{element}_rate", [0])
-        virtual_rates = vals.get(f"virtual_{element}_rate", [0])
-        if len(covered_rates) == 1 and len(virtual_rates) == 1:
-            vals[rate_name] = (
-                float(covered_rates.pop()) * 100 - float(virtual_rates.pop()) * 100
-            )
+        for key in tuple(vals.keys()):
+            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 = vals.get(f"virtual_{element}_{part_name}", {0})
+                covered_part = vals.get(f"covered_{element}_{part_name}", {0})
+                if isinstance(virtual_part, set) and len(virtual_part) == 1:
+                    virtual_part = float(next(iter(virtual_part)))
+                if isinstance(covered_part, set) and len(covered_part) == 1:
+                    covered_part = float(next(iter(covered_part)))
+
+                if isinstance(virtual_part, Number) and isinstance(
+                    covered_part, Number
+                ):
+                    diff = float(covered_part) - float(virtual_part)
+                else:
+                    diff = 0
+
+                vals[f"difference_{element}_{part_name}"] = diff
+
+    for suffix in (
+        "kwh",
+        "units_consumed",
+    ):
+        try:
+            covered = float(vals[f"covered_{suffix}"])
+            virtual = float(vals[f"virtual_{suffix}"])
+            vals[f"difference_{suffix}"] = covered - virtual
+        except KeyError:
+            vals[f"difference_{suffix}"] = 0
+
+    for prefix in (
+        "correction_factor",
+        "unit_code",
+        "calorific_value",
+    ):
+        covered = vals.get(f"covered_{prefix}", [0])
+        virtual = vals.get(f"virtual_{prefix}", [0])
+        if len(covered) == 1 and len(virtual) == 1:
+            if covered == virtual:
+                diff = 0
+            else:
+                try:
+                    diff = float(next(iter(covered))) - float(next(iter(virtual)))
+                except ValueError:
+                    diff = False
         else:
-            vals[rate_name] = 0
-
-    try:
-        covered_kwh = float(vals["covered_kwh"])
-        virtual_kwh = float(vals["virtual_kwh"])
-        vals["difference_kwh"] = covered_kwh - virtual_kwh
-    except KeyError:
-        vals["difference_kwh"] = None
+            diff = False
+        vals[f"difference_{prefix}"] = diff
 
     ReportRun.w_insert_row(report_run_id, "", titles, vals, {"is_checked": False})
 

chellow/templates/report_run_row_g_bill_check.html

@@ -1,5 +1,16 @@
 {% extends "base.html" %}
 
+{% block inside_head %}
+	<style>
+		section.elements {
+			display: flex;
+			flex-wrap: wrap;
+			gap: 4em;
+			align-items: flex-start;
+		}
+	</style>
+{% endblock %}
+
 {% block title %}
 	&raquo; Report Runs &raquo; {{row.report_run.id}} &raquo; Row {{row.id}}
 {% endblock %}
@@ -10,146 +21,173 @@
 	&raquo; Row {{row.id}}
 {% endblock %}
 
+
 {% block content %}
 	{% set values = row.data['values'] %}
 	{% set properties = row.data.get('properties', {}) %}
-	{% if row.report_run.name == 'bill_check' %}
+	<table>
+		<caption>Bill Check</caption>	
+		<thead>
+			<tr>
+				<th>Batch</th>
+				<th>Site</th>
+				<th>MPRN</th>
+				<th>Covered Bills</th>
+				<th>Covered Start</th>
+				<th>Covered Finish</th>
+				<th>Problem</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td><a href="/g/batches/{{values.g_batch_id}}">{{values.batch}}</a></td>
+				<td>
+					<a href="/sites/{{values.site_id}}">{{values.site_code}} {{values.site_name}}</a>
+				</td>
+				<td>
+					<a href="/g/supplies/{{values.g_supply_id}}">{{values.mprn}}</a>
+				</td>
+				<td>	
+					{% if values['covered_bill_ids'] is not none %}
+						{% for bill_id in values['covered_bill_ids'] %}
+								<a href="/g/bills/{{bill_id}}">{{bill_id}}</a>
+								{% if bill_id == values.g_bill_id %}
+								{% endif %}
+						{% endfor %}
+					{% endif %}
+				</td>
+				<td><span title="{{values.covered_start}}">{{values.covered_start[:10]}}</span></td>
+				<td><span title="{{values.covered_finish}}">{{values.covered_finish[:10]}}</span></td>
+				{% for title in columns %}
+					<td>	
+						{% if title in values and values[title] is not none %}
+							{{"%.2f"|format(values[title])}}
+						{% endif %}
+					</td>
+				{% endfor %}
+				<td>
+					{{ values.covered_problem }} {{ values.virtual_problem }}
+				</td>
+			</tr>
+		</tbody>
+	</table>
+
+	<section class="elements">
 		<table>
-			<caption>Bill Check</caption>	
+			<caption>GBP</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>
+					<th>Part</th>
+					<th>Covered</th>
+					<th>Virtual</th>
+					<th>Difference</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>
+				{% if 'difference_gross_gbp' in values %}
+					<tr>
+						<td>gross</td>
+						<td>{{"{:0,.2f}".format(values.covered_gross_gbp)}}</td>
+						<td>{{"{:0,.2f}".format(values.virtual_gross_gbp)}}</td>
+						<td>{{"{:0,.2f}".format(values.difference_gross_gbp)}}</td>
+					</tr>
+				{% endif %}
+					<tr>
+						<td>net</td>
+						<td>{{"{:0,.2f}".format(values.covered_net_gbp)}}</td>
+						<td>{{"{:0,.2f}".format(values.virtual_net_gbp)}}</td>
+						<td>{{"{:0,.2f}".format(values.difference_net_gbp)}}</td>
+					</tr>
+				{% if 'difference_vat_gbp' in values %}
+					<tr>
+						<td>vat</td>
+						<td>{{"{:0,.2f}".format(values.covered_vat_gbp)}}</td>
+						<td>{{"{:0,.2f}".format(values.virtual_vat_gbp)}}</td>
+						<td>{{"{:0,.2f}".format(values.difference_vat_gbp)}}</td>
+					</tr>
+				{% endif %}
+				{% if 'difference_vat_rate' in values and values.difference_vat_rate != 0 %}
+					<tr>
+						<td>vat_rate</td>
+						<td>{{values.covered_vat_rate}}</td>
+						<td>{{values.virtual_vat_rate}}</td>
+						<td>{{"{:0,.2f}".format(values.difference_vat_rate)}}</td>
+					</tr>
+				{% endif %}
+				{% if 'difference_is_commercial' in values %}
+					<tr>
+						<td>is_commercial</td>
+						<td>{{values.covered_is_commercial}}</td>
+						<td>{{values.virtual_is_commercial}}</td>
+						<td>{{values.difference_is_commercial}}</td>
+					</tr>
+				{% endif %}
+
 		</table>
 
 		<table>
-			<caption>Covered</caption>
+			<caption>kWh</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>
+					<th>Part</th>
+					<th>Covered</th>
+					<th>Virtual</th>
+					<th>Difference</th>
 				</tr>
 			</thead>
 			<tbody>
 				<tr>
-					<td>{{values['covered-from']}}</td>
-					<td>{{values['covered-to']}}</td>
+					<td>kwh</td>
+					<td>{{"{:0,.2f}".format(values.covered_kwh)}}</td>
+					<td>{{"{:0,.2f}".format(values.virtual_kwh)}}</td>
+					<td>{{"{:0,.2f}".format(values.difference_kwh)}}</td>
+				</tr>
+				<tr>
+					<td>units_consumed</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>
+						{% if 'covered_units_consumed' in values %}
+							{{"{:0,.2f}".format(values.covered_units_consumed)}}
 						{% endif %}
 					</td>
+					<td>{{"{:0,.2f}".format(values.virtual_units_consumed)}}</td>
+					<td>{{"{:0,.2f}".format(values.difference_units_consumed)}}</td>
+				</tr>
+				<tr>
+					<td>correction_factor</td>
 					<td>
-						{% if values['metered-kwh'] != None %}
-							{{"%.0f"|format(values['metered-kwh'])}}
+						{% if values.covered_correction_factor is number %}
+							{{"{:0,.2f}".format(values.covered_correction_factor)}}
+						{% else %}
+							{{values.covered_correction_factor|join(' | ')}}
 						{% endif %}
 					</td>
-					<td>{{values['covered-net-gbp']}}</td>
 					<td>
-						{% if values['virtual-net-gbp'] != None %}
-							{{"%.2f"|format(values['virtual-net-gbp'])}}
+						{% if values.virtual_correction_factor is number %}
+							{{"{:0,.2f}".format(values.virtual_correction_factor)}}
+						{% else %}
+							{{values.virtual_correction_factor|join(' | ')}}
 						{% endif %}
 					</td>
 					<td>
-						{% if values['difference-net-gbp'] != None %}
-							{{"%.2f"|format(values['difference-net-gbp'])}}
+						{% if values.difference_correction_factor is number %}
+							{{"{:0,.2f}".format(values.difference_correction_factor)}}</td>
+						{% else %}
+							{{values.difference_correction_factor|join(' | ')}}
 						{% endif %}
 					</td>
-					<td>{{values['covered-problem']}}</td>
-					<td>{{values['virtual-problem']}}</td>
 				</tr>
-			</tbody>
+				<tr>
+					<td>unit_code</td>
+					<td>{{values.covered_unit_code|join(' | ')}}</td>
+					<td>{{values.virtual_unit_code|join(' | ')}}</td>
+					<td>{{values.difference_unit_code}}</td>
+				</tr>
+				<tr>
+					<td>calorific_value</td>
+					<td>{{values.covered_calorific_value|join(' | ')}}</td>
+					<td>{{values.virtual_calorific_value|join(' | ')}}</td>
+					<td>{{values.difference_calorific_value}}</td>
+				</tr>
 		</table>
 
 		{% for table in tables %}
@@ -157,35 +195,67 @@
 				<caption>{{table.name}}</caption>
 				<thead>
 					<tr>
-						{% for title in table.titles %}
-							<th>{{title}}</th>
-						{% endfor %}
+						<th>Part</th>
+						<th>Covered</th>
+						<th>Virtual</th>
+						<th>Difference</th>
 					</tr>
 				</thead>
 				<tbody>
 					<tr>
-						{% for v in table['values'] %}
-							<td>{{v}}</td>
+						<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 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 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>
-
-	{% else %}
-		<table>
-			<caption>Report Run Row</caption>	
-			<tbody>
-				{% for title in row.data.titles %}
-					<tr>
-						<th>{{title}}</th>
-						<td>{{row.data['values'][title]}}</td>
-					</tr>
-				{% endfor %}
-			</tbody>
-		</table>
-	{% endif %}
+	<h2>Raw</h2>	
+	<pre>{{raw_data}}</pre>
 {% endblock %}

chellow/views.py

@@ -1617,6 +1617,11 @@ def report_run_row_get(row_id):
             "report_run_row_bill_check.html", row=row, raw_data=raw_data, tables=tables
         )
     elif row.report_run.name == "g_bill_check":
+        g_contract = GContract.get_by_id(g.sess, row.report_run.data["g_contract_id"])
+        g_contract_props = g_contract.make_properties()
+        props = g_contract_props.get("report_run", {})
+        table_names_hide = props.get("table_names_hide", [])
+
         values = row.data["values"]
         elements = {}
         for t in row.data["values"].keys():
@@ -1625,34 +1630,31 @@ def report_run_row_get(row_id):
                 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") or name in table_names_hide:
+                    continue
                 try:
                     table = elements[name]
                 except KeyError:
-                    table = elements[name] = {"order": 0}
+                    table = elements[name] = {"order": 0, "name": name, "parts": set()}
+                    tables.append(table)
 
-                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["order"] = abs(values[t])
+        for t in row.data["values"].keys():
 
-        for k, v in elements.items():
-            if k == "net":
-                continue
-            v["name"] = k
-            tables.append(v)
+            toks = t.split("_")
+            if toks[0] in ("covered", "virtual", "difference"):
+                tail = "_".join(toks[1:])
+                for element in elements.keys():
+                    table = elements[element]
+                    elstr = f"{element}_"
+                    if tail.startswith(elstr):
+                        part = tail[len(elstr) :]
+                        if part != "gbp":
+                            table["parts"].add(part)
+                        if t.startswith("difference_") and t.endswith("_gbp"):
+                            table["order"] = abs(values[t])
 
         tables.sort(key=lambda t: t["order"], reverse=True)
         return render_template(

{chellow-1739889885.0.0.dist-info → chellow-1740736363.0.0.dist-info}/METADATA

@@ -1,14 +1,15 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1739889885.0.0
+Version: 1740736363.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)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
-Requires-Dist: flask-restx==1.2.0
-Requires-Dist: flask==2.3.3
+Requires-Dist: flask-restx==1.3.0
+Requires-Dist: flask==3.1.0
+Requires-Dist: jsonschema==4.17.3
 Requires-Dist: odio==0.0.23
 Requires-Dist: openpyxl==3.1.2
 Requires-Dist: paramiko==3.4.1

{chellow-1739889885.0.0.dist-info → chellow-1740736363.0.0.dist-info}/RECORD

@@ -12,7 +12,7 @@ chellow/rate_server.py,sha256=fg-Pf_9Hk3bXmC9riPQNGQxBvLvBa_WtNYdwDCjnCSg,5678
 chellow/rrun.py,sha256=1Kt2q_K9UoDG_nsZz-Q6XJiMNKroWqlqFdxn2M6Q8CA,2088
 chellow/testing.py,sha256=Od4HHH6pZrhJ_De118_F55RJEKmAvhUH2S24QE9qFQk,3635
 chellow/utils.py,sha256=Ej7dsbQ6Ee8X2aZ7B2Vs-hUFCsMABioAdOV1DJjwY-0,19293
-chellow/views.py,sha256=82V1OtdscrAmbiT3B5MDZoCe50fDSJwfBF-PpbB5tm8,83513
+chellow/views.py,sha256=2WCU-_8lDuSDROvNlCGsAQVLSMh5qrD2wmeSr2G-umA,83872
 chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/aahedc.py,sha256=d2usudp7KYWpU6Pk3fal5EQ47EbvkvKeaFGylnb3NWw,606
 chellow/e/bill_importer.py,sha256=7UcnqNlKbJc2GhW9gy8sDp9GuqambJVpZLvbafOZztA,7411
@@ -20,7 +20,7 @@ chellow/e/bmarketidx.py,sha256=C0BaHn2RxIuWH2QzA-OmSP0fbUGvW9tqEUhLnzOEdmA,7968
 chellow/e/bsuos.py,sha256=hdP9vnOJSuZl46OAkJeUg1XJYvYIBj4J6Sqce1Hy9Vs,15542
 chellow/e/ccl.py,sha256=30dh_SvlgzsTQPPAJNZWILaMvbeDsv9-P-S1JxS5_SQ,3184
 chellow/e/cfd.py,sha256=Gm435c42LFwZx1n-1UY1Tdx6mL1is7E0vRLWQe8RPOo,14184
-chellow/e/computer.py,sha256=Fq4SpEvCLArZHOGgSGqvm7mdAVLiswnNWspuuft4h70,67460
+chellow/e/computer.py,sha256=KkYNaD4W13s_BvtyPrYbfZ9MU73hKi-IIL-g4OOQxBA,67787
 chellow/e/dno_rate_parser.py,sha256=A5TP6KjyfT5lVWh7dX4SiXRi6wnf2lGv-H_T4Sod8CI,21731
 chellow/e/duos.py,sha256=nwviRjz-qIt3GxIMHk0hItIT4dtKsxOWq9TUC1z-hO8,30864
 chellow/e/elexon.py,sha256=ALhXS9Es7PV0z9ukPbIramn3cf3iLyFi-PMWPSm5iOs,5487
@@ -40,7 +40,7 @@ chellow/e/rcrc.py,sha256=92CA1uIotIHd1epQ_jEPdJKzXqDFV-AoJOJeRO6MEyA,4274
 chellow/e/ro.py,sha256=dZKZv_9wXSWuwcb3jiKavoD_9ot-PZseNVeEEe0siLo,596
 chellow/e/scenario.py,sha256=FLgh03r_SgXx0hMWFbAvwsz2ScDL8LUwYWSWVv2rQlg,24973
 chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,6232
-chellow/e/tlms.py,sha256=M33D6YpMixu2KkwSCzDRM3kThLgShg8exp63Obo75l8,8905
+chellow/e/tlms.py,sha256=Wb9ZuxscMzxXs0FT06Iu5YXeccmO6ai_mUjnJGJwTM4,9045
 chellow/e/tnuos.py,sha256=NBmc-f3oezrl4gviAKobljHfICTpBKxxxEGBGJi_lRk,4927
 chellow/e/triad.py,sha256=lIQj7EdUrcFwEqleuHZXYU_bfzIwNOqUVVxB3NPQt4A,13710
 chellow/e/views.py,sha256=ZDVUirf0fMLO8aS5gF3xpPnRDmNqYxxGHkGjxm0_AY4,220901
@@ -90,7 +90,7 @@ chellow/reports/report_291.py,sha256=BnWtxe0eWN2QKKWpwjs5-RI5LbReBKL119QbkrkNhV8
 chellow/reports/report_33.py,sha256=lt1EN_LNx6u-AgdaS3YRkPMZA33JgMcELolHF4oJUMw,16689
 chellow/reports/report_387.py,sha256=bBqtnGGDWIXzXe2zVm9yeDRZKNgkUaOS3XTX6k09f18,5631
 chellow/reports/report_41.py,sha256=8xUIN9D5dtT0Dn1RmbnWsLRmM-QbGA5xGhWCK3ljAzA,7406
-chellow/reports/report_429.py,sha256=SbFlBsHXWMWRlMbY_e0zco2R8tMG9XVulr56E3mRalU,14287
+chellow/reports/report_429.py,sha256=1LzrhfePeLg98eczzxy9HrR0EYcPYINw1LSJKk9kKAM,15812
 chellow/reports/report_59.py,sha256=PkdRA6ctvDGWTQd5vb9cQH6MG920TxcD6aHh268zrj8,42221
 chellow/reports/report_81.py,sha256=bBpV6MtvKGtoLiqzZoK2h21KDs4vfDwy-etpfL9oiEI,5570
 chellow/reports/report_87.py,sha256=udzbCuXcckWD-OHmfJCT6bwg_paYhm4vfDWlL8WM-jA,6933
@@ -146,7 +146,7 @@ chellow/templates/report_run_g_bill_check.html,sha256=tOXl_mjR__foYKiOYflJbK-459
 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
-chellow/templates/report_run_row_g_bill_check.html,sha256=aC2LMu_6NvmTN3ZdxHJPPPczyxPN6hg0F-PPcqIWUws,4683
+chellow/templates/report_run_row_g_bill_check.html,sha256=2Ym9mkwvA_DGDrgktDDwXQXlUK7tR2aR3gp3KUqMLoI,7017
 chellow/templates/report_run_supply_contacts.html,sha256=JNzwz9M6qbLRDMkCzFCxxANapUer5klxo7t5a48nAzg,2117
 chellow/templates/report_runs.html,sha256=ecoIkl2WtfYtifiTxnslmpMGYYGVQW-CVSBpqhXyiE4,1131
 chellow/templates/scenario.html,sha256=tCoq1wBq4l9PRS-zFtPcCWXlxD_SSFvFFkERf4FWVNU,2055
@@ -378,6 +378,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-1739889885.0.0.dist-info/METADATA,sha256=iQJxsDUYm0NRHUc8O70ShLjSedd-0j5cjZh_5ojdJuw,12204
-chellow-1739889885.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1739889885.0.0.dist-info/RECORD,,
+chellow-1740736363.0.0.dist-info/METADATA,sha256=qWpHKbIMKoTX4yjpi3XczaOvWuvWo2PVOHgflg919HY,12238
+chellow-1740736363.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1740736363.0.0.dist-info/RECORD,,