chellow 1759155233.0.0__tar.gz → 1759411815.0.0__tar.gz

{chellow-1759155233.0.0 → chellow-1759411815.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1759155233.0.0
+Version: 1759411815.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-1759411815.0.0/VERSION

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

{chellow-1759155233.0.0 → chellow-1759411815.0.0}/chellow/reports/report_111.py

@@ -4,7 +4,7 @@ import threading
 import traceback
 from collections import defaultdict
 from datetime import datetime as Datetime
-from decimal import Decimal
+from decimal import Decimal, ROUND_HALF_UP
 from itertools import combinations
 from numbers import Number
 
@@ -18,6 +18,8 @@ from sqlalchemy.sql.expression import null
 
 from werkzeug.exceptions import BadRequest
 
+from zish import ZishException
+
 
 from chellow.dloads import open_file
 from chellow.e.computer import SupplySource, contract_func
@@ -456,6 +458,40 @@ def _process_period(
                     f"the Net GBP ({bill.net}) + VAT GBP ({bill.vat}) of the bill."
                 )
 
+            vat_net = Decimal("0.00")
+            vat_vat = Decimal("0.00")
+
+            try:
+                bd = bill.bd
+
+                if "vat" in bd:
+                    for vat_percentage, vat_vals in bd["vat"].items():
+                        calc_vat = Decimal(
+                            float(vat_percentage) / 100 * float(vat_vals["net"])
+                        ).quantize(Decimal("0.01"), rounding=ROUND_HALF_UP)
+                        if calc_vat != vat_vals["vat"]:
+                            actual_bill["problem"] += (
+                                f"The VAT at {vat_percentage}% on the net amount "
+                                f"{vat_vals['net']} is calculated to be {calc_vat}, "
+                                f"which is different from the value in the bill of "
+                                f"{vat_vals['vat']}"
+                            )
+                        vat_net += vat_vals["net"]
+                        vat_vat += vat_vals["vat"]
+            except ZishException as e:
+                actual_bill["problem"] += f"Problem parsing the breakdown: {e}"
+
+            if vat_net != bill.net:
+                actual_bill["problem"] += (
+                    f"The total 'net' {vat_net} in the VAT breakdown doesn't "
+                    f"match the 'net' {bill.net} of the bill."
+                )
+            if vat_vat != bill.vat:
+                actual_bill["problem"] += (
+                    f"The total VAT {vat_vat} in the VAT breakdown doesn't "
+                    f"match the VAT {bill.vat} of the bill."
+                )
+
             if len(actual_bill["problem"]) > 0:
                 vals["problem"] += "Bills have problems. "
 

{chellow-1759155233.0.0 → chellow-1759411815.0.0}/chellow/templates/report_run_bill_check.html

@@ -101,7 +101,7 @@
 			{% for row in rows %}
 				{% set data = row.data['data'] %}
 				{% set properties = row.data.get('properties', {}) %}
-				{% set market_ROLE_Code = data['market_role_code'] %}
+				{% set market_role_code = data['market_role_code'] %}
 				<tr>
 					<td><a href="/report_run_rows/{{row.id}}">View</a></td>
 					<td style="white-space: nowrap">

{chellow-1759155233.0.0 → chellow-1759411815.0.0}/chellow/templates/report_run_row_bill_check.html

@@ -108,7 +108,12 @@
 					<td>
 						<strong style="color: red">{{bill.problem}}</strong>
 					</td>
-					<td>{{bill.breakdown}}</td>
+					<td>
+						<details>
+							<summary>Breakdown</summary>
+							<pre>{{bill.breakdown}}</pre>
+						</details>
+					</td>
 				</tr>
 			{% endfor %}
 		</tbody>

{chellow-1759155233.0.0 → chellow-1759411815.0.0}/chellow/views.py

@@ -1389,14 +1389,17 @@ def report_run_get(run_id):
                 )
                 for n in element_names
             ]
-            sum_diffs = g.sess.execute(
-                select(*diff_selects).where(ReportRunRow.report_run == run)
-            ).one()
+            if len(diff_selects) > 0:
+                sum_diffs = g.sess.execute(
+                    select(*diff_selects).where(ReportRunRow.report_run == run)
+                ).one()
 
-            for elem, sum_diff in zip(element_names, sum_diffs):
-                elements.append((elem, sum_diff))
+                for elem, sum_diff in zip(element_names, sum_diffs):
+                    elements.append((elem, sum_diff))
 
-            elements.sort(key=lambda x: 0 if x[1] is None else abs(x[1]), reverse=True)
+                elements.sort(
+                    key=lambda x: 0 if x[1] is None else abs(x[1]), reverse=True
+                )
 
         if "element" in request.values:
             element = req_str("element")

{chellow-1759155233.0.0 → chellow-1759411815.0.0}/test/reports/test_report_111.py

@@ -35,7 +35,12 @@ from chellow.models import (
     insert_sources,
     insert_voltage_levels,
 )
-from chellow.reports.report_111 import _process_supply, content, find_gaps
+from chellow.reports.report_111 import (
+    _process_period,
+    _process_supply,
+    content,
+    find_gaps,
+)
 from chellow.utils import ct_datetime, to_utc, utc_datetime
 
 
@@ -119,6 +124,270 @@ def test_http_supplier_batch_with_mpan_cores(mocker, client, sess):
 # Worker level tests
 
 
+def test_process_period(sess):
+    vf = to_utc(ct_datetime(1996, 1, 1))
+    site = Site.insert(sess, "CI017", "Water Works")
+
+    market_role_Z = MarketRole.insert(sess, "Z", "Non-core")
+    participant = Participant.insert(sess, "CALB", "AK Industries")
+    participant.insert_party(sess, market_role_Z, "None core", vf, None, None)
+    bank_holiday_rate_script = {"bank_holidays": []}
+    Contract.insert_non_core(
+        sess,
+        "bank_holidays",
+        "",
+        {},
+        utc_datetime(2000, 1, 1),
+        None,
+        bank_holiday_rate_script,
+    )
+    market_role_X = MarketRole.insert(sess, "X", "Supplier")
+    market_role_M = MarketRole.insert(sess, "M", "Mop")
+    market_role_C = MarketRole.insert(sess, "C", "HH Dc")
+    market_role_R = MarketRole.insert(sess, "R", "Distributor")
+    participant.insert_party(sess, market_role_M, "Fusion Mop Ltd", vf, None, None)
+    participant.insert_party(sess, market_role_X, "Fusion Ltc", vf, None, None)
+    participant.insert_party(sess, market_role_C, "Fusion DC", vf, None, None)
+    mop_contract = Contract.insert_mop(
+        sess, "Fusion", participant, "", {}, vf, None, {}
+    )
+    dc_contract = Contract.insert_dc(
+        sess, "Fusion DC 2000", participant, "", {}, vf, None, {}
+    )
+    pc = Pc.insert(sess, "00", "hh", vf, None)
+    insert_cops(sess)
+    cop = Cop.get_by_code(sess, "5")
+    insert_comms(sess)
+    comm = Comm.get_by_code(sess, "GSM")
+    supplier_charge_script = """
+import chellow.e.ccl
+from chellow.utils import HH, reduce_bill_hhs, utc_datetime
+
+def virtual_bill(ds):
+    rate = 0.1
+    for hh in ds.hh_data:
+        hh_start = hh['start-date']
+        bill_hh = ds.supplier_bill_hhs[hh_start]
+        bill_hh['nrg-kwh'] = hh['msp-kwh']
+        bill_hh['nrg-rate'] = {rate}
+        bill_hh['off-rate'] = {0.1}
+        bill_hh['nrg-gbp'] = hh['msp-kwh'] * rate + 1
+        bill_hh['net-gbp'] = sum(
+            v for k, v in bill_hh.items() if k.endswith('gbp'))
+        bill_hh['vat-gbp'] = 0
+        bill_hh['gross-gbp'] = bill_hh['net-gbp'] + bill_hh['vat-gbp']
+        bill_hh['problem'] = 'hello '
+
+    ds.supplier_bill = reduce_bill_hhs(ds.supplier_bill_hhs)
+"""
+    supplier_contract = Contract.insert_supplier(
+        sess,
+        "Fusion Supplier 2000",
+        participant,
+        supplier_charge_script,
+        {},
+        utc_datetime(2000, 1, 1),
+        None,
+        {},
+    )
+    dno = participant.insert_party(sess, market_role_R, "WPD", vf, None, "22")
+    Contract.insert_dno(sess, dno.dno_code, participant, "", {}, vf, None, {})
+    meter_type = MeterType.insert(sess, "C5", "COP 1-5", utc_datetime(2000, 1, 1), None)
+    meter_payment_type = MeterPaymentType.insert(
+        sess, "CR", "Credit", utc_datetime(1996, 1, 1), None
+    )
+    mtc = Mtc.insert(sess, "845", False, True, vf, None)
+    mtc_participant = MtcParticipant.insert(
+        sess,
+        mtc,
+        participant,
+        "HH COP5 And Above With Comms",
+        False,
+        True,
+        meter_type,
+        meter_payment_type,
+        0,
+        vf,
+        None,
+    )
+    insert_voltage_levels(sess)
+    voltage_level = VoltageLevel.get_by_code(sess, "HV")
+    llfc = dno.insert_llfc(
+        sess, "510", "PC 5-8 & HH HV", voltage_level, False, True, vf, None
+    )
+    MtcLlfc.insert(sess, mtc_participant, llfc, vf, None)
+    insert_sources(sess)
+    source = Source.get_by_code(sess, "grid")
+    insert_energisation_statuses(sess)
+    energisation_status = EnergisationStatus.get_by_code(sess, "E")
+    gsp_group = GspGroup.insert(sess, "_L", "South Western")
+    insert_dtc_meter_types(sess)
+    dtc_meter_type = DtcMeterType.get_by_code(sess, "H")
+    supply = site.insert_e_supply(
+        sess,
+        source,
+        None,
+        "Bob",
+        utc_datetime(2000, 1, 1),
+        None,
+        gsp_group,
+        mop_contract,
+        "773",
+        dc_contract,
+        "ghyy3",
+        "hgjeyhuw",
+        dno,
+        pc,
+        "845",
+        cop,
+        comm,
+        None,
+        energisation_status,
+        dtc_meter_type,
+        "22 7867 6232 781",
+        "510",
+        supplier_contract,
+        "7748",
+        361,
+        None,
+        None,
+        None,
+        None,
+        None,
+    )
+    batch = supplier_contract.insert_batch(sess, "a b", "")
+    insert_bill_types(sess)
+    bill_type = BillType.get_by_code(sess, "N")
+    bill = batch.insert_bill(
+        sess,
+        "dd",
+        "hjk",
+        to_utc(ct_datetime(2009, 7, 10)),
+        to_utc(ct_datetime(2009, 7, 10)),
+        to_utc(ct_datetime(2009, 7, 10)),
+        Decimal("10.00"),
+        Decimal("10.00"),
+        Decimal("10.00"),
+        Decimal("10.00"),
+        bill_type,
+        {"vat": {Decimal("20"): {"net": Decimal("10.00"), "vat": Decimal("10.00")}}},
+        supply,
+    )
+    bill.insert_element(
+        sess,
+        "nrg",
+        to_utc(ct_datetime(2009, 7, 10)),
+        to_utc(ct_datetime(2009, 7, 10)),
+        Decimal("10.00"),
+        {"rate": {Decimal("0.1")}},
+    )
+    sess.commit()
+
+    report_context = {}
+    bill_ids = {bill.id: bill}
+    forecast_date = utc_datetime(2020, 7, 10)
+    vbf = contract_func(report_context, supplier_contract, "virtual_bill")
+    period_start = to_utc(ct_datetime(2009, 7, 10, 0, 0))
+    period_finish = to_utc(ct_datetime(2009, 7, 10, 0, 0))
+
+    data = _process_period(
+        sess,
+        report_context,
+        supply,
+        supplier_contract,
+        bill_ids,
+        forecast_date,
+        vbf,
+        period_start,
+        period_finish,
+    )
+    expected = {
+        "actual_bills": [
+            {
+                "batch_id": 1,
+                "batch_reference": "a b",
+                "breakdown": "{\n"
+                '  "vat": {\n'
+                "    20: {\n"
+                '      "net": 10.00,\n'
+                '      "vat": 10.00,\n'
+                "    },\n"
+                "  },\n"
+                "}",
+                "gross": Decimal("10.00"),
+                "id": 1,
+                "kwh": Decimal("10.00"),
+                "net": Decimal("10.00"),
+                "problem": "The Gross GBP (10.00) of the bill isn't equal "
+                "to the Net GBP "
+                "(10.00) + VAT GBP (10.00) of the bill.The VAT at 20% on the net "
+                "amount 10.00 is calculated to be 2.00, which is different from "
+                "the value in the bill of 10.00",
+                "start_date": to_utc(ct_datetime(2009, 7, 10, 0, 0)),
+                "finish_date": to_utc(ct_datetime(2009, 7, 10, 0, 0)),
+                "vat": Decimal("10.00"),
+            },
+        ],
+        "actual_net_gbp": 10.0,
+        "difference_net_gbp": 9.0,
+        "contract_id": 4,
+        "contract_name": "Fusion Supplier 2000",
+        "market_role_code": "X",
+        "elements": {
+            "nrg": {
+                "parts": {
+                    "gbp": {
+                        "actual": Decimal("10.00"),
+                        "difference": 9.0,
+                        "virtual": 1.0,
+                    },
+                    "kwh": {
+                        "difference": 0.0,
+                        "virtual": 0,
+                    },
+                    "rate": {
+                        "actual": {
+                            Decimal("0.1"),
+                        },
+                        "difference": 0.0,
+                        "virtual": {
+                            0.1,
+                        },
+                    },
+                },
+                "actual_elements": [
+                    {
+                        "bill": {
+                            "batch": {
+                                "id": 1,
+                                "reference": "a b",
+                            },
+                            "id": 1,
+                        },
+                        "breakdown": "{\n" '  "rate": [\n' "    0.1,\n" "  ],\n" "}",
+                        "finish_date": to_utc(ct_datetime(2009, 7, 10, 0, 0)),
+                        "id": 1,
+                        "net": Decimal("10.00"),
+                        "start_date": to_utc(ct_datetime(2009, 7, 10, 0, 0)),
+                    },
+                ],
+            },
+        },
+        "exp_mpan_core": None,
+        "imp_mpan_core": "22 7867 6232 781",
+        "period_start": to_utc(ct_datetime(2009, 7, 10, 0, 0)),
+        "period_finish": to_utc(ct_datetime(2009, 7, 10, 0, 0)),
+        "site_id": 1,
+        "site_code": "CI017",
+        "site_name": "Water Works",
+        "supply_id": 1,
+        "virtual_net_gbp": 1.0,
+        "problem": "Bills have problems. hello ",
+    }
+
+    assert data == expected
+
+
 def test_process_supply(sess):
     vf = to_utc(ct_datetime(1996, 1, 1))
     site = Site.insert(sess, "CI017", "Water Works")
@@ -308,7 +577,10 @@ def virtual_bill(ds):
                     "net": Decimal("10.00"),
                     "problem": "The Gross GBP (10.00) of the bill isn't equal "
                     "to the Net GBP "
-                    "(10.00) + VAT GBP (10.00) of the bill.",
+                    "(10.00) + VAT GBP (10.00) of the bill.The total 'net' 0.00 in "
+                    "the VAT breakdown doesn't match the 'net' 10.00 of the "
+                    "bill.The total VAT 0.00 in the VAT breakdown doesn't match the "
+                    "VAT 10.00 of the bill.",
                     "vat": Decimal("10.00"),
                     "start_date": utc_datetime(2009, 7, 10, 0, 0),
                     "finish_date": utc_datetime(2009, 7, 10, 0, 0),

chellow-1759155233.0.0/VERSION

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