chellow 1739889885.0.0__tar.gz → 1740736363.0.0__tar.gz

{chellow-1739889885.0.0 → chellow-1740736363.0.0}/PKG-INFO

@@ -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-1740736363.0.0/VERSION

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

{chellow-1739889885.0.0 → chellow-1740736363.0.0}/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-1739889885.0.0 → chellow-1740736363.0.0}/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-1739889885.0.0 → chellow-1740736363.0.0}/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-1740736363.0.0/chellow/templates/report_run_row_g_bill_check.html

@@ -0,0 +1,261 @@
+{% 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 %}
+
+{% 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>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>GBP</caption>
+			<thead>
+				<tr>
+					<th>Part</th>
+					<th>Covered</th>
+					<th>Virtual</th>
+					<th>Difference</th>
+				</tr>
+			</thead>
+			<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>kWh</caption>
+			<thead>
+				<tr>
+					<th>Part</th>
+					<th>Covered</th>
+					<th>Virtual</th>
+					<th>Difference</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<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 '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.covered_correction_factor is number %}
+							{{"{:0,.2f}".format(values.covered_correction_factor)}}
+						{% else %}
+							{{values.covered_correction_factor|join(' | ')}}
+						{% endif %}
+					</td>
+					<td>
+						{% 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_correction_factor is number %}
+							{{"{:0,.2f}".format(values.difference_correction_factor)}}</td>
+						{% else %}
+							{{values.difference_correction_factor|join(' | ')}}
+						{% endif %}
+					</td>
+				</tr>
+				<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 %}
+			<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 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>
+{% endblock %}

{chellow-1739889885.0.0 → chellow-1740736363.0.0}/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 → chellow-1740736363.0.0}/pyproject.toml

@@ -17,9 +17,10 @@ dependencies = [
 	"odio==0.0.23",
 	"pypdf==4.3.1",
 	"pg8000==1.31.1",
-	"Flask==2.3.3",
+	"Flask==3.1.0",
 	"SQLAlchemy==2.0.30",
-	"flask-restx==1.2.0",
+	"flask-restx==1.3.0",
+  "jsonschema==4.17.3",  # Temporarily needed until RestX updated
 	"openpyxl==3.1.2",
 	"python-dateutil==2.8.2",
 	"pytz==2022.6",

chellow-1739889885.0.0/VERSION

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