chellow 1726820485.0.0__tar.gz → 1726827015.0.0__tar.gz

{chellow-1726820485.0.0 → chellow-1726827015.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1726820485.0.0
+Version: 1726827015.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-1726827015.0.0/VERSION

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

{chellow-1726820485.0.0 → chellow-1726827015.0.0}/chellow/reports/report_59.py

@@ -670,7 +670,7 @@ def _process_site(
 
                     _add_bills(era_vals, bills, chunk_start, chunk_finish)
 
-                    era_rows.append([make_val(vals.get(t)) for t in era_titles])
+                    era_rows.append([make_val(era_vals.get(t)) for t in era_titles])
                     for t in summary_titles:
                         v = era_vals.get(t)
                         if v is not None:
@@ -1066,7 +1066,9 @@ def content(
             ef.write(msg + "\n")
             ef.close()
         else:
-            write_spreadsheet(rf, compression, site_rows, era_rows, normal_read_rows)
+            write_spreadsheet(
+                rf, compression, site_rows, supply_rows, era_rows, normal_read_rows
+            )
     finally:
         if rf is not None:
             rf.close()

{chellow-1726820485.0.0 → chellow-1726827015.0.0}/test/reports/test_report_59.py

@@ -2304,18 +2304,18 @@ def virtual_bill(ds):
         ],
         [
             Datetime(2020, 1, 1, 0, 0),
-            Datetime(2000, 1, 15, 0, 0),
+            Datetime(2000, 1, 1, 0, 0),
             Datetime(2000, 1, 31, 23, 30),
             "22 7867 6232 781",
             None,
             "CI017",
             "Water Works",
             None,
-            Datetime(2000, 1, 15, 0, 0),
+            None,
             None,
             "Fusion Supplier 2000",
-            816.0,
-            0.0,
+            None,
+            None,
             None,
             None,
             None,
@@ -2331,16 +2331,11 @@ def virtual_bill(ds):
             0.0,
             0.0,
             0.0,
-            None,
-            0.0,
-            0.0,
-            0.0,
             0.0,
             0.0,
             0.0,
             0.0,
             0.0,
-            None,
             0.0,
             0.0,
             0.0,
@@ -2348,8 +2343,13 @@ def virtual_bill(ds):
             0.0,
             0.0,
             0.0,
+            10.0,
+            10.0,
             0.0,
             0.0,
+            10.0,
+            10.0,
+            10.0,
             0.0,
             0.0,
             0.0,
@@ -2357,20 +2357,20 @@ def virtual_bill(ds):
             0.0,
             0.0,
             None,
-            0.0,
             None,
             None,
-            0.0,
             None,
             None,
             None,
             None,
             None,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
+            None,
+            None,
+            None,
+            None,
+            None,
+            None,
+            None,
             None,
             None,
         ],
@@ -3630,3 +3630,361 @@ def virtual_bill(ds):
         ],
     ]
     match_tables(era_expected, era_table)
+
+
+def test_base_exception(mocker, 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",
+        "",
+        {},
+        vf,
+        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_charge_script = """
+from chellow.utils import reduce_bill_hhs
+
+def virtual_bill_titles():
+    return ['net-gbp', 'problem']
+
+def virtual_bill(ds):
+    raise Exception("MOP Exception")
+"""
+    mop_contract = Contract.insert_mop(
+        sess,
+        "Fusion Mop Contract",
+        participant,
+        mop_charge_script,
+        {},
+        utc_datetime(2000, 1, 1),
+        None,
+        {},
+    )
+
+    dc_charge_script = """
+from chellow.utils import reduce_bill_hhs
+
+def virtual_bill_titles():
+    return ['net-gbp', 'problem']
+
+def virtual_bill(ds):
+    for hh in ds.hh_data:
+        hh_start = hh['start-date']
+        bill_hh = ds.supplier_bill_hhs[hh_start]
+
+        bill_hh['net-gbp'] = sum(
+            v for k, v in bill_hh.items() if k.endswith('gbp'))
+
+    ds.dc_bill = reduce_bill_hhs(ds.supplier_bill_hhs)
+"""
+
+    dc_contract = Contract.insert_dc(
+        sess, "Fusion DC 2000", participant, dc_charge_script, {}, 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_titles():
+    return [
+        'ccl-kwh', 'ccl-rate', 'ccl-gbp', 'net-gbp', 'vat-gbp', 'gross-gbp',
+        'sum-msp-kwh', 'sum-msp-gbp', 'problem']
+
+def virtual_bill(ds):
+    for hh in ds.hh_data:
+        hh_start = hh['start-date']
+        bill_hh = ds.supplier_bill_hhs[hh_start]
+        bill_hh['sum-msp-kwh'] = hh['msp-kwh']
+        bill_hh['sum-msp-gbp'] = hh['msp-kwh'] * 0.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']
+
+    ds.supplier_bill = reduce_bill_hhs(ds.supplier_bill_hhs)
+"""
+    imp_supplier_contract = Contract.insert_supplier(
+        sess,
+        "Fusion Supplier 2000",
+        participant,
+        supplier_charge_script,
+        {},
+        vf,
+        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", vf, None)
+    meter_payment_type = MeterPaymentType.insert(sess, "CR", "Credit", vf, 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_grid = Source.get_by_code(sess, "grid")
+    insert_generator_types(sess)
+    gsp_group = GspGroup.insert(sess, "_L", "South Western")
+    insert_energisation_statuses(sess)
+    energisation_status = EnergisationStatus.get_by_code(sess, "E")
+    insert_dtc_meter_types(sess)
+    dtc_meter_type = DtcMeterType.get_by_code(sess, "H")
+    site.insert_e_supply(
+        sess,
+        source_grid,
+        None,
+        "Bob",
+        to_utc(ct_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",
+        imp_supplier_contract,
+        "7748",
+        361,
+        None,
+        None,
+        None,
+        None,
+        None,
+    )
+
+    editor = UserRole.insert(sess, "editor")
+    user = User.insert(sess, "admin@example.com", "xxx", editor, None)
+    user_id = user.id
+
+    sess.commit()
+
+    scenario_props = {
+        "scenario_start_year": 2000,
+        "scenario_start_month": 1,
+        "scenario_start_day": 1,
+        "scenario_start_hour": 0,
+        "scenario_start_minute": 0,
+        "scenario_finish_year": 2000,
+        "scenario_finish_month": 1,
+        "scenario_finish_day": 31,
+        "scenario_finish_hour": 23,
+        "scenario_finish_minute": 30,
+        "by_hh": False,
+    }
+    base_name = ["monthly_duration"]
+    compression = False
+    now = utc_datetime(2020, 1, 1)
+    is_bill_check = False
+
+    mock_file = BytesIO()
+    mock_file.close = mocker.Mock()
+    mocker.patch("chellow.reports.report_59.open_file", return_value=mock_file)
+
+    content(
+        scenario_props,
+        base_name,
+        user_id,
+        compression,
+        now,
+        is_bill_check,
+    )
+
+    sheet = odio.parse_spreadsheet(mock_file)
+    site_table = list(sheet.tables[0].rows)
+
+    assert site_table[1][0].startswith("Problem Traceback")
+
+    supply_table = list(sheet.tables[1].rows)
+    supply_expected = [
+        [
+            "creation-date",
+            "start-date",
+            "finish-date",
+            "imp-mpan-core",
+            "exp-mpan-core",
+            "site-code",
+            "site-name",
+            "associated-site-codes",
+            "source",
+            "generator-type",
+            "supply-name",
+            "imp-md-kw",
+            "imp-md-kva",
+            "exp-md-kw",
+            "exp-md-kva",
+            "import-grid-kwh",
+            "export-grid-kwh",
+            "import-gen-kwh",
+            "export-gen-kwh",
+            "import-3rd-party-kwh",
+            "export-3rd-party-kwh",
+            "displaced-kwh",
+            "used-kwh",
+            "used-3rd-party-kwh",
+            "import-grid-net-gbp",
+            "export-grid-net-gbp",
+            "import-gen-net-gbp",
+            "export-gen-net-gbp",
+            "import-3rd-party-net-gbp",
+            "export-3rd-party-net-gbp",
+            "displaced-net-gbp",
+            "used-net-gbp",
+            "used-3rd-party-net-gbp",
+            "billed-import-kwh",
+            "billed-import-net-gbp",
+            "billed-import-vat-gbp",
+            "billed-import-gross-gbp",
+            "billed-import-supplier-net-gbp",
+            "billed-import-supplier-vat-gbp",
+            "billed-import-supplier-gross-gbp",
+            "billed-import-dc-net-gbp",
+            "billed-import-dc-vat-gbp",
+            "billed-import-dc-gross-gbp",
+            "billed-import-mop-net-gbp",
+            "billed-import-mop-vat-gbp",
+            "billed-import-mop-gross-gbp",
+        ],
+    ]
+    match_tables(supply_expected, supply_table)
+
+    era_table = list(sheet.tables[2].rows)
+
+    era_expected = [
+        [
+            "creation-date",
+            "start-date",
+            "finish-date",
+            "imp-mpan-core",
+            "exp-mpan-core",
+            "site-code",
+            "site-name",
+            "associated-site-codes",
+            "era-start-date",
+            "era-finish-date",
+            "imp-supplier-contract",
+            "imp-non-actual-hhs",
+            "imp-non-actual-kwh",
+            "exp-supplier-contract",
+            "exp-non-actual-hhs",
+            "exp-non-actual-kwh",
+            "metering-type",
+            "source",
+            "generator-type",
+            "supply-name",
+            "msn",
+            "pc",
+            "import-grid-kwh",
+            "export-grid-kwh",
+            "import-gen-kwh",
+            "export-gen-kwh",
+            "import-3rd-party-kwh",
+            "export-3rd-party-kwh",
+            "displaced-kwh",
+            "used-kwh",
+            "used-3rd-party-kwh",
+            "import-grid-net-gbp",
+            "export-grid-net-gbp",
+            "import-gen-net-gbp",
+            "export-gen-net-gbp",
+            "import-3rd-party-net-gbp",
+            "export-3rd-party-net-gbp",
+            "displaced-net-gbp",
+            "used-net-gbp",
+            "used-3rd-party-net-gbp",
+            "billed-import-kwh",
+            "billed-import-net-gbp",
+            "billed-import-vat-gbp",
+            "billed-import-gross-gbp",
+            "billed-import-supplier-net-gbp",
+            "billed-import-supplier-vat-gbp",
+            "billed-import-supplier-gross-gbp",
+            "billed-import-dc-net-gbp",
+            "billed-import-dc-vat-gbp",
+            "billed-import-dc-gross-gbp",
+            "billed-import-mop-net-gbp",
+            "billed-import-mop-vat-gbp",
+            "billed-import-mop-gross-gbp",
+            None,
+            "mop-net-gbp",
+            "mop-problem",
+            None,
+            "dc-net-gbp",
+            "dc-problem",
+            None,
+            "imp-supplier-ccl-kwh",
+            "imp-supplier-ccl-rate",
+            "imp-supplier-ccl-gbp",
+            "imp-supplier-net-gbp",
+            "imp-supplier-vat-gbp",
+            "imp-supplier-gross-gbp",
+            "imp-supplier-sum-msp-kwh",
+            "imp-supplier-sum-msp-gbp",
+            "imp-supplier-problem",
+            None,
+        ],
+    ]
+    match_tables(era_expected, era_table)

chellow-1726820485.0.0/VERSION

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