chellow 1728986476.0.0__tar.gz → 1729081025.0.0__tar.gz

{chellow-1728986476.0.0 → chellow-1729081025.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1728986476.0.0
+Version: 1729081025.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-1729081025.0.0/VERSION

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

{chellow-1728986476.0.0 → chellow-1729081025.0.0}/chellow/e/bill_parsers/mm.py

@@ -172,7 +172,8 @@ def _handle_0461(headers, pre_record, record):
     mpan_core = parse_mpan_core(parts["mpan_core"])
     headers["mpan_core"] = mpan_core
     units = CONSUMPTION_UNITS_LOOKUP[parts["units"].strip()]
-    if units == "kWh":
+    register_code = parts["register_code"].strip()
+    if units == "kWh" and not register_code.startswith("NOCHARGE"):
         headers["kwh"] += Decimal(parts["quantity"])
 
     prev_read_date_str = parts["prev_read_date"].strip()

{chellow-1728986476.0.0 → chellow-1729081025.0.0}/chellow/e/computer.py

@@ -993,7 +993,10 @@ class SupplySource(DataSource):
             else:
                 self.llfc = era.imp_llfc
 
-            self.sc = era.imp_sc
+            if "imp_sc" in self.era_map:
+                self.sc = self.era_map["imp_sc"]
+            else:
+                self.sc = era.imp_sc
             self.supplier_account = era.imp_supplier_account
 
             if era.imp_supplier_contract.id in self.era_map_supplier_contracts:
@@ -1020,7 +1023,10 @@ class SupplySource(DataSource):
             else:
                 self.llfc = era.exp_llfc
 
-            self.sc = 0 if era.exp_sc is None else era.exp_sc
+            if "exp_sc" in self.era_map:
+                self.sc = self.era_map["exp_sc"]
+            else:
+                self.sc = era.exp_sc
             self.supplier_account = era.exp_supplier_account
 
             if era.exp_supplier_contract is None:

{chellow-1728986476.0.0 → chellow-1729081025.0.0}/chellow/gas/bill_parser_total_edi.py

@@ -4,9 +4,12 @@ from decimal import Decimal
 
 from dateutil.relativedelta import relativedelta
 
+from sqlalchemy import select
+
 from werkzeug.exceptions import BadRequest
 
 from chellow.edi_lib import parse_edi, to_date, to_decimal
+from chellow.models import GEra, Session
 from chellow.utils import HH, to_ct, to_utc
 
 # From Total 2024-05-29
@@ -28,6 +31,7 @@ SUPPLIER_CODE_MAP = {
     "STD": ("standing", Decimal("1000"), Decimal("1")),
     "MET": ("commodity", Decimal("100000"), Decimal("1000")),
     "CCL": ("ccl", Decimal("100000"), Decimal("1000")),
+    "SUN": ("sundry", Decimal("1000"), Decimal("100")),
 }
 
 UNIT_MAP = {"M3": "M3", "HH": "HCUF", "HCUF": "HCUF"}
@@ -110,14 +114,19 @@ def _process_CCD2(elements, headers):
     units_billed = to_decimal(nuct) / units_divisor
     breakdown[key] += units_billed
 
-    if tpref == "standing" or "start_date" not in headers:
-        headers["start_date"] = to_date(csdt[0])
+    start_date = to_date(csdt[0])
+    if start_date is not None and (tpref == "standing" or "start_date" not in headers):
+        headers["start_date"] = start_date
 
-    if tpref == "standing" or "finish_date" not in headers:
-        headers["finish_date"] = _to_finish_date(cedt[0])
+    finish_date = _to_finish_date(cedt[0])
+    if finish_date is not None and (
+        tpref == "standing" or "finish_date" not in headers
+    ):
+        headers["finish_date"] = finish_date
 
-    if "mprn" not in headers:
-        headers["mprn"] = mloc[0]
+    mprn = mloc[0]
+    if "mprn" not in headers and len(mprn) > 0:
+        headers["mprn"] = mprn
 
     if len(conb) > 0 and len(conb[0]) > 0:
         headers["breakdown"]["units_consumed"] += to_decimal(conb) / Decimal("1000")
@@ -152,6 +161,93 @@ def _process_CCD2(elements, headers):
         )
 
 
+def _process_CCD3(elements, headers):
+    breakdown = headers["breakdown"]
+    ccde = elements["CCDE"]
+    nuct = elements["NUCT"]
+    mtnr = elements["MTNR"]
+    conb = elements["CONB"]
+    adjf = elements["ADJF"]
+    prdt = elements["PRDT"]
+    pvdt = elements["PVDT"]
+    prrd = elements["PRRD"]
+    cppu = elements["CPPU"]
+    ctot = elements["CTOT"]
+    csdt = elements["CSDT"]
+    cedt = elements["CEDT"]
+    mloc = elements["MLOC"]
+
+    ccde_supplier_code = ccde[2]
+    tpref, rate_divisor, units_divisor = SUPPLIER_CODE_MAP[ccde_supplier_code]
+
+    rate_str = cppu[0]
+    if len(rate_str.strip()) > 0:
+        rate_key = f"{tpref}_rate"
+        if rate_key not in breakdown:
+            breakdown[rate_key] = set()
+        rate = Decimal(rate_str) / rate_divisor
+        breakdown[rate_key].add(rate)
+
+    breakdown[f"{tpref}_gbp"] += to_decimal(ctot) / Decimal("100")
+
+    if len(nuct) > 1:
+        suff = NUCT_LOOKUP[nuct[1].strip()]
+        key = f"{tpref}_{suff}"
+        units_billed = to_decimal(nuct) / units_divisor
+        breakdown[key] += units_billed
+
+    start_date = to_date(csdt[0])
+    if start_date is not None and (tpref == "standing" or "start_date" not in headers):
+        headers["start_date"] = start_date
+
+    finish_date = _to_finish_date(cedt[0])
+    if finish_date is not None and (
+        tpref == "standing" or "finish_date" not in headers
+    ):
+        headers["finish_date"] = finish_date
+
+    mprn = mloc[0]
+    if "mprn" not in headers and len(mprn) > 0:
+        headers["mprn"] = mprn
+
+    if len(conb) > 0 and len(conb[0]) > 0:
+        headers["breakdown"]["units_consumed"] += to_decimal(conb) / Decimal("1000")
+
+    if tpref == "commodity":
+        headers["kwh"] += units_billed
+
+    if len(prrd) > 0 and len(prrd[0]) > 0:
+        pres_read_date = to_date(prdt[0])
+        prev_read_date = to_date(pvdt[0])
+
+        pres_read_value = Decimal(prrd[0])
+        pres_read_type = READ_TYPE_MAP[prrd[1]]
+        prev_read_value = Decimal(prrd[2])
+        prev_read_type = READ_TYPE_MAP[prrd[3]]
+        msn = mtnr[0]
+        unit = UNIT_MAP[conb[1]]
+        correction_factor = Decimal(adjf[1]) / Decimal(100000)
+
+        headers["reads"].append(
+            {
+                "msn": msn,
+                "unit": unit,
+                "correction_factor": correction_factor,
+                "prev_date": prev_read_date,
+                "prev_value": prev_read_value,
+                "prev_type_code": prev_read_type,
+                "pres_date": pres_read_date,
+                "pres_value": pres_read_value,
+                "pres_type_code": pres_read_type,
+            }
+        )
+
+
+def _process_CLO(elements, headers):
+    cloc = elements["CLOC"]
+    headers["account"] = cloc[2]
+
+
 def _process_MTR(elements, headers):
     if headers["message_type"] == "UTLBIL":
         breakdown = headers["breakdown"]
@@ -159,11 +255,35 @@ def _process_MTR(elements, headers):
             if isinstance(v, set):
                 breakdown[k] = sorted(v)
 
+        account = headers["account"]
+        try:
+            mprn = headers["mprn"]
+        except KeyError:
+            with Session() as sess:
+                g_era = sess.scalars(
+                    select(GEra)
+                    .where(GEra.account == account)
+                    .order_by(GEra.start_date)
+                ).first()
+                if g_era is None:
+                    raise BadRequest(
+                        f"Couldn't find an MPRN, and then couldn't fine a supply "
+                        f"with account {account}."
+                    )
+                else:
+                    mprn = g_era.g_supply.mprn
+
+        start_date = headers["start_date"]
+        if "finish_date" in headers:
+            finish_date = headers["finish_date"]
+        else:
+            finish_date = start_date
+
         return {
             "raw_lines": "\n".join(headers["raw_lines"]),
-            "mprn": headers["mprn"],
+            "mprn": mprn,
             "reference": headers["reference"],
-            "account": headers["mprn"],
+            "account": account,
             "reads": headers["reads"],
             "kwh": headers["kwh"],
             "breakdown": headers["breakdown"],
@@ -171,8 +291,8 @@ def _process_MTR(elements, headers):
             "vat_gbp": headers["vat"],
             "gross_gbp": headers["gross"],
             "bill_type_code": headers["bill_type_code"],
-            "start_date": headers["start_date"],
-            "finish_date": headers["finish_date"],
+            "start_date": start_date,
+            "finish_date": finish_date,
             "issue_date": headers["issue_date"],
         }
 
@@ -215,10 +335,10 @@ CODE_FUNCS = {
     "BTL": _process_NOOP,
     "CCD1": _process_NOOP,
     "CCD2": _process_CCD2,
-    "CCD3": _process_NOOP,
+    "CCD3": _process_CCD3,
     "CCD4": _process_NOOP,
     "CDT": _process_NOOP,
-    "CLO": _process_NOOP,
+    "CLO": _process_CLO,
     "END": _process_NOOP,
     "FIL": _process_NOOP,
     "MHD": _process_MHD,

{chellow-1728986476.0.0 → chellow-1729081025.0.0}/chellow/templates/e/scenario_docs.html

@@ -83,7 +83,8 @@
         "new_export": 3,
         9: 51
       },
-      "sc": 400,
+      "imp_sc": 400,
+      "exp_sc": 400,
       "mpan_cores": {
         "22 8679 7237 782": "20 7568 7217 378"
       }

{chellow-1728986476.0.0 → chellow-1729081025.0.0}/chellow/templates/user.html

@@ -23,7 +23,7 @@
 		<form method="post">
 			<fieldset>
 				<legend>Update details</legend>	
-				<label>Username</label>
+				<label>Username (case sensitive)</label>
 				<input name="email_address" size="100" value="
 						{%- if request.values.email_address -%}
 							{{ request.values.email_address }}
@@ -67,11 +67,11 @@
 				<fieldset>
 					<legend>Change password</legend>	
 					<input type="hidden" name="change_password">
-					<label>Current password</label>
+					<label>Current password (case sensitive)</label>
 					<input type="password" name="current_password">
-					<label>New password</label>
+					<label>New password (case sensitive)</label>
 					<input type="password" name="new_password">
-					<label>Confirm new Password</label>
+					<label>Confirm new Password (case sensitive)</label>
 					<input type="password" name="confirm_new_password">
 					<input type="submit" value="Change">
 				</fieldset>

{chellow-1728986476.0.0 → chellow-1729081025.0.0}/chellow/templates/users.html

@@ -50,10 +50,10 @@
 		<fieldset>
 			<legend>Add new user</legend>	
 
-			<label>Username</label>
+			<label>Username (case sensitive)</label>
 			{{input_text('email_address')}}
 			{% if not ad_auth_on %}
-				<label>Password</label>
+				<label>Password (case sensitive)</label>
 				<input type="password" name="password">
 			{% endif %}
 			<fieldset>
@@ -74,24 +74,6 @@
 						checked
 					{% endif %}
 				>
-				<label>Party Viewer</label>
-				<input type="radio" name="user_role_code" value="party-viewer"
-					{% if request.values.user_role_code == 'party-viewer' %}
-						checked
-					{% endif %}
-				>
-				<label>Party Viewer Party</label>
-				<select name="party_id">
-					{% for party in parties %}
-						<option value="{{ party.id }}"
-							{%- if request.values.user_role_id == party.id -%}
-								selected
-							{% endif %}
-						>{{ party.name }} {{ party.participant.code }}
-							{{ party.market_role.description }}
-						</option>
-					{% endfor %}
-				</select>
 			</fieldset>
 			<input type="submit" value="Add">
 		</fieldset>

{chellow-1728986476.0.0 → chellow-1729081025.0.0}/test/e/test_computer.py

@@ -1003,6 +1003,135 @@ def test_SupplySource_init_nhh(sess, mocker):
     SupplySource(sess, start_date, finish_date, forecast_date, era, is_import, caches)
 
 
+def test_SupplySource_init_era_maps(sess, mocker):
+    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_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")
+    exp_supplier_contract = Contract.insert_supplier(
+        sess, "Fusion Supplier 2000", participant, "", {}, 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", utc_datetime(2000, 1, 1), 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, "521", "Export (HV)", voltage_level, False, False, 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,
+        None,
+        None,
+        None,
+        None,
+        None,
+        "22 7867 6232 781",
+        "521",
+        exp_supplier_contract,
+        "7748",
+        361,
+    )
+    era = supply.eras[0]
+    active_channel = era.insert_channel(sess, False, "ACTIVE")
+    active_data_raw = [
+        {
+            "start_date": utc_datetime(2009, 8, 10),
+            "value": 10,
+            "status": "A",
+        }
+    ]
+    active_channel.add_hh_data(sess, active_data_raw)
+    era.insert_channel(sess, True, "REACTIVE_IMP")
+
+    sess.commit()
+
+    caches = {}
+    start_date = utc_datetime(2009, 7, 31, 23, 00)
+    finish_date = utc_datetime(2009, 8, 31, 22, 30)
+    forecast_date = utc_datetime(2019, 8, 31, 22, 30)
+    is_import = False
+    new_sc = 10000
+    era_maps = {vf: {"exp_sc": new_sc}}
+    ss = SupplySource(
+        sess,
+        start_date,
+        finish_date,
+        forecast_date,
+        era,
+        is_import,
+        caches,
+        era_maps=era_maps,
+    )
+
+    assert ss.sc == new_sc
+
+
 def test_SiteSource_get_data_sources(mocker):
     mocker.patch.object(SiteSource, "__init__", lambda *x: None)
     mocker.patch("chellow.e.computer.displaced_era")

chellow-1728986476.0.0/VERSION

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