chellow 1751875889.0.0__tar.gz → 1751991276.0.0__tar.gz

{chellow-1751875889.0.0 → chellow-1751991276.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1751875889.0.0
+Version: 1751991276.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-1751991276.0.0/VERSION

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

{chellow-1751875889.0.0 → chellow-1751991276.0.0}/chellow/e/bill_parsers/drax_edi.py

@@ -104,6 +104,7 @@ ELEMENT_MAP = {
                 "duos-availability-kva",
             ),
             "209269": ("tnuos-gbp", "tnuos-rate", "tnuos-days"),
+            "065950": ("eii-gbp", "eii-rate", "eii-kwh"),
         },
         "DUSDIS": {
             "122568": ("nrg-gsp-losses-gbp", "nrg-rate", "nrg-gsp-losses-kwh"),
@@ -149,7 +150,6 @@ ELEMENT_MAP = {
     "930504": ("eii-gbp", None, None),
     "331201": ("eii-gbp", None, None),
     "307253": ("eii-gbp", "eii-rate", "eii-kwh"),
-    "065950": ("eii-gbp", "eii-rate", "eii-kwh"),
 }
 
 TPR_LOOKUP = {

{chellow-1751875889.0.0 → chellow-1751991276.0.0}/chellow/e/bill_parsers/mm.py

@@ -47,7 +47,9 @@ def _handle_0050(headers, pre_record, record):
         unknown_4=12,
         late_payment=12,
     )
-    headers["late_payment"] = Decimal(parts["late_payment"]) / Decimal(100)
+    headers["breakdown"]["late_payment"] += Decimal(parts["late_payment"]) / Decimal(
+        100
+    )
     """
 
 
@@ -57,13 +59,10 @@ def _handle_0051(headers, pre_record, record):
 
 def _handle_0100(headers, pre_record, record):
     issue_date = headers["issue_date"]
-    late_payment = headers.get("late_payment")
     headers.clear()
     headers["issue_date"] = issue_date
-    if late_payment is not None:
-        headers["late_payment"] = late_payment
-    headers["account"] = pre_record[43:52]
-    headers["reference"] = pre_record[41:46]
+    headers["account"] = pre_record[42:52]
+    headers["reference"] = pre_record[52:64]
     headers["kwh"] = Decimal("0")
     headers["breakdown"] = defaultdict(int, {"vat": {}})
     headers["reads"] = []
@@ -245,6 +244,17 @@ def _handle_0860(headers, pre_record, record):
     bd["metering-gbp"] += Decimal(parts["metering_gbp"]) / Decimal("100")
 
 
+def _handle_0960(headers, pre_record, record):
+    parts = _chop_record(
+        record,
+        days=3,
+        payment=12,
+        rate=6,
+    )
+    bd = headers["breakdown"]
+    bd["late_payment_gbp"] += Decimal(parts["payment"]) / Decimal(100)
+
+
 def _handle_1455(headers, pre_record, record):
     parts = _chop_record(
         record, ccl_kwh=13, unknown_1=10, ccl_rate=13, ccl_gbp=12, unkown_2=8
@@ -294,12 +304,6 @@ def _handle_1500(headers, pre_record, record):
     breakdown = headers["breakdown"]
     net = Decimal("0.00") + Decimal(parts["net"]) / Decimal("100")
     gross = Decimal("0.00") + Decimal(parts["gross"]) / Decimal("100")
-    if "late_payment" in headers:
-        late_payment_gbp = headers["late_payment"]
-        net += late_payment_gbp
-        gross += late_payment_gbp
-        breakdown["late-payment-gbp"] += late_payment_gbp
-        del headers["late_payment"]
 
     return {
         "bill_type_code": "W" if net < 0 else "N",
@@ -354,6 +358,7 @@ LINE_HANDLERS = {
     "0461": _handle_0461,
     "0470": _handle_0470,
     "0860": _handle_0860,
+    "0960": _handle_0960,
     "1455": _handle_1455,
     "1460": _handle_1460,
     "1500": _handle_1500,

{chellow-1751875889.0.0 → chellow-1751991276.0.0}/chellow/reports/report_247.py

@@ -471,14 +471,13 @@ def _process_site(
     if supply_ids is not None:
         q = q.where(Supply.id.in_(supply_ids))
     for supply in sess.execute(q).scalars():
-        last_era = (
-            sess.execute(
-                select(Era).where(Era.supply == supply).order_by(Era.start_date.desc())
-            )
-            .scalars()
-            .first()
-        )
-        if last_era.finish_date is not None and last_era.start_date <= finish_date:
+        last_era = sess.scalars(
+            select(Era)
+            .join(SiteEra)
+            .where(Era.supply == supply)
+            .order_by(Era.start_date.desc())
+        ).first()
+        if last_era.finish_date is not None and last_era.finish_date < finish_date:
             site_era = sess.execute(
                 select(SiteEra).where(
                     SiteEra.era == last_era,

{chellow-1751875889.0.0 → chellow-1751991276.0.0}/test/e/bill_parsers/test_bill_parser_mm.py

@@ -27,11 +27,11 @@ def test_handle_0100():
     _handle_0100(headers, pre_record, record)
     assert headers == {
         "issue_date": to_utc(ct_datetime(2023, 5, 2)),
-        "account": "023719050",
+        "account": "0023719050",
         "breakdown": {"vat": {}},
         "kwh": Decimal("0"),
         "reads": [],
-        "reference": " 0023",
+        "reference": "000023905961",
     }
 
 

{chellow-1751875889.0.0 → chellow-1751991276.0.0}/test/reports/test_report_247.py

@@ -1139,6 +1139,565 @@ def virtual_bill(ds):
     assert era_expected == era_table
 
 
+def test_bill_after_end_supply_and_after_month(mocker, sess):
+    vf = to_utc(ct_datetime(1996, 1, 1))
+    site = Site.insert(sess, "CI017", "Water Works")
+    start_date = utc_datetime(2009, 7, 31, 23, 00)
+    months = 1
+
+    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", 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):
+    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.mop_bill = reduce_bill_hhs(ds.supplier_bill_hhs)
+"""
+    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,
+        {},
+        utc_datetime(2000, 1, 1),
+        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,
+        {},
+        utc_datetime(2000, 1, 1),
+        None,
+        {},
+    )
+    batch = imp_supplier_contract.insert_batch(sess, "a b", "")
+    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 = Source.get_by_code(sess, "grid")
+    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")
+    supply = site.insert_e_supply(
+        sess,
+        source,
+        None,
+        "Bob",
+        to_utc(ct_datetime(2009, 7, 31, 23, 30)),
+        to_utc(ct_datetime(2009, 8, 31, 23, 30)),
+        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,
+    )
+    insert_bill_types(sess)
+    bill_type = sess.execute(select(BillType).where(BillType.code == "N")).scalar_one()
+    batch.insert_bill(
+        sess,
+        "dd",
+        "hjk",
+        start_date,
+        to_utc(ct_datetime(2009, 7, 30, 23, 30)),
+        to_utc(ct_datetime(2009, 9, 30, 23, 30)),
+        Decimal("10.00"),
+        Decimal("10.00"),
+        Decimal("10.00"),
+        Decimal("10.00"),
+        bill_type,
+        {},
+        supply,
+    )
+
+    editor = UserRole.insert(sess, "editor")
+    user = User.insert(sess, "admin@example.com", "xxx", editor, None)
+    user_id = user.id
+    site_code = site.code
+
+    sess.commit()
+
+    scenario_props = {
+        "scenario_start_year": start_date.year,
+        "scenario_start_month": start_date.month,
+        "scenario_duration": months,
+        "by_hh": False,
+        "site_codes": [site_code],
+        "mpan_cores": None,
+    }
+    base_name = ["monthly_duration"]
+    compression = False
+    now = utc_datetime(2020, 1, 1)
+
+    mock_file = BytesIO()
+    mock_file.close = mocker.Mock()
+    mocker.patch("chellow.reports.report_247.open_file", return_value=mock_file)
+
+    content(scenario_props, base_name, user_id, compression, now)
+
+    sheet = odio.parse_spreadsheet(mock_file)
+    site_table = list(sheet.tables[0].rows)
+
+    site_expected = [
+        [
+            "creation-date",
+            "site-id",
+            "site-name",
+            "associated-site-ids",
+            "month",
+            "metering-type",
+            "sources",
+            "generator-types",
+            "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",
+            "import-grid-vat-gbp",
+            "import-grid-gross-gbp",
+            "export-grid-net-gbp",
+            "export-grid-vat-gbp",
+            "export-grid-gross-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-supplier-import-net-gbp",
+            "billed-supplier-import-vat-gbp",
+            "billed-supplier-import-gross-gbp",
+            "billed-dc-import-net-gbp",
+            "billed-dc-import-vat-gbp",
+            "billed-dc-import-gross-gbp",
+            "billed-mop-import-net-gbp",
+            "billed-mop-import-vat-gbp",
+            "billed-mop-import-gross-gbp",
+            "billed-export-kwh",
+            "billed-export-net-gbp",
+        ],
+        [
+            Datetime(2020, 1, 1, 0, 0),
+            "CI017",
+            "Water Works",
+            "",
+            Datetime(2009, 7, 31, 23, 30),
+            "hh",
+            "grid",
+            "",
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.1645952300974135,
+            0.1645952300974135,
+            0.1645952300974135,
+            0.1645952300974135,
+            0.1645952300974135,
+            0.1645952300974135,
+            0.1645952300974135,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+        ],
+    ]
+
+    assert site_expected == site_table
+
+    era_table = list(sheet.tables[1].rows)
+    era_expected = [
+        [
+            "creation-date",
+            "imp-mpan-core",
+            "imp-supplier-contract",
+            "exp-mpan-core",
+            "exp-supplier-contract",
+            "era-start-date",
+            "metering-type",
+            "source",
+            "generator-type",
+            "supply-name",
+            "msn",
+            "pc",
+            "energisation-status",
+            "gsp-group",
+            "dno",
+            "imp-voltage-level",
+            "imp-is-substation",
+            "imp-llfc-code",
+            "imp-llfc-description",
+            "exp-voltage-level",
+            "exp-is-substation",
+            "exp-llfc-code",
+            "exp-llfc-description",
+            "site-id",
+            "site-name",
+            "associated-site-ids",
+            "month",
+            "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",
+            "import-grid-vat-gbp",
+            "import-grid-gross-gbp",
+            "export-grid-net-gbp",
+            "export-grid-vat-gbp",
+            "export-grid-gross-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-supplier-import-net-gbp",
+            "billed-supplier-import-vat-gbp",
+            "billed-supplier-import-gross-gbp",
+            "billed-dc-import-net-gbp",
+            "billed-dc-import-vat-gbp",
+            "billed-dc-import-gross-gbp",
+            "billed-mop-import-net-gbp",
+            "billed-mop-import-vat-gbp",
+            "billed-mop-import-gross-gbp",
+            "billed-export-kwh",
+            "billed-export-net-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,
+        ],
+        [
+            Datetime(2020, 1, 1, 0, 0),
+            "22 7867 6232 781",
+            "Fusion Supplier 2000",
+            None,
+            None,
+            Datetime(2009, 7, 31, 23, 30),
+            "hh",
+            "grid",
+            None,
+            "Bob",
+            "hgjeyhuw",
+            "00",
+            "E",
+            "_L",
+            "22",
+            "HV",
+            False,
+            "510",
+            "PC 5-8 & HH HV",
+            None,
+            None,
+            None,
+            None,
+            "CI017",
+            "Water Works",
+            "",
+            Datetime(2009, 7, 31, 23, 30),
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0033590863285186427,
+            0.0033590863285186427,
+            0.0033590863285186427,
+            0.0033590863285186427,
+            0.0033590863285186427,
+            0.0033590863285186427,
+            0.0033590863285186427,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            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,
+        ],
+        [
+            Datetime(2020, 1, 1, 0, 0),
+            "22 7867 6232 781",
+            "Fusion Supplier 2000",
+            None,
+            None,
+            None,
+            "hh",
+            "grid",
+            None,
+            "Bob",
+            "hgjeyhuw",
+            "00",
+            "E",
+            "_L",
+            "22",
+            "HV",
+            False,
+            "510",
+            "PC 5-8 & HH HV",
+            None,
+            None,
+            None,
+            None,
+            "CI017",
+            "Water Works",
+            None,
+            Datetime(2009, 7, 31, 23, 30),
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.16123614376889486,
+            0.16123614376889486,
+            0.16123614376889486,
+            0.16123614376889486,
+            0.16123614376889486,
+            0.16123614376889486,
+            0.16123614376889486,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+        ],
+    ]
+    match_tables(era_expected, era_table)
+
+
 def test_bill_after_end_supply_with_supply_id(mocker, sess):
     valid_from = to_utc(ct_datetime(1996, 1, 1))
     site = Site.insert(sess, "CI017", "Water Works")

chellow-1751875889.0.0/VERSION

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