chellow 1728924490.0.0__tar.gz → 1729012049.0.0__tar.gz

{chellow-1728924490.0.0 → chellow-1729012049.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1728924490.0.0
+Version: 1729012049.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-1729012049.0.0/VERSION

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

{chellow-1728924490.0.0 → chellow-1729012049.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-1728924490.0.0 → chellow-1729012049.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-1728924490.0.0 → chellow-1729012049.0.0}/chellow/e/hh_importer.py

@@ -40,7 +40,7 @@ from chellow.utils import (
 processes = defaultdict(list)
 tasks = {}
 
-extensions = [".df2", ".simple.csv", ".bg.csv", ".vital.xlsx"]
+extensions = [".df2", ".simple.csv", ".bg.csv", ".vital.xlsx", ".edf.csv"]
 
 
 class HhDataImportProcess(threading.Thread):

chellow-1729012049.0.0/chellow/e/hh_parser_edf_csv.py

@@ -0,0 +1,102 @@
+import csv
+from codecs import iterdecode
+from datetime import datetime as Datetime
+from decimal import Decimal
+
+from werkzeug.exceptions import BadRequest
+
+from chellow.utils import (
+    HH,
+    parse_mpan_core,
+    to_ct,
+    to_utc,
+)
+
+# From the EDF Portal select:
+# - Electricity
+# - Half-hourly
+# - Reactive Power and kWh combined
+# export data as CSV
+#
+#
+# "Month","MPAN","Measurement Type","Settlement Date","00:00",..,"00:00_Act_Est",
+# "Apr-24", "2200000000000", "AI", "01-04-2024", "0.0000", ..., "Actual", "Actual",
+
+
+def create_parser(reader, mpan_map, messages):
+    return HhParserEdfCsv(reader, mpan_map, messages)
+
+
+CHANNEL_LOOKUP = {
+    "AI": "ACTIVE",
+    "RI": "REACTIVE_IMP",
+    "RE": "REACTIVE_EXP",
+}
+
+STATUS_LOOKUP = {
+    "Actual": "A",
+    "Estimated": "E",
+    "-": "E",
+}
+
+
+def _get_field(values, index, name):
+    if len(values) > index:
+        return values[index].strip()
+    else:
+        raise BadRequest(f"Can't find field {index}, {name}.")
+
+
+def _find_data(shredder):
+    try:
+        for line_number, values in enumerate(shredder, start=2):
+            mpan_core_str = _get_field(values, 1, "MPAN Core")
+            mpan_core = parse_mpan_core(mpan_core_str)
+            channel_type_str = _get_field(values, 2, "Channel Type")
+            channel_type = CHANNEL_LOOKUP[channel_type_str]
+            start_day_ct_str = _get_field(values, 3, "Day")
+            start_day_ct = to_ct(Datetime.strptime(start_day_ct_str, "%d-%m-%Y"))
+
+            for i in range(50):
+                val_idx = i + 4
+                value_str = values[val_idx]
+                if value_str == "-":
+                    break
+
+                status_idx = val_idx + 50
+                status_str = values[status_idx]
+                try:
+                    status = STATUS_LOOKUP[status_str]
+                except KeyError:
+                    raise BadRequest(
+                        f"Unrecognized status {status_str} at index {status_idx}."
+                    )
+                yield {
+                    "mpan_core": mpan_core,
+                    "channel_type": channel_type,
+                    "start_date": to_utc(start_day_ct + HH * i),
+                    "value": Decimal(value_str),
+                    "status": status,
+                }
+    except BadRequest as e:
+        e.description = (
+            f"Problem at line number: {line_number} : {values} : {e.description}"
+        )
+        raise e
+
+
+class HhParserEdfCsv:
+    def __init__(self, reader, mpan_map, messages):
+        s = iterdecode(reader, "utf-8")
+        self.reader = csv.reader(s)
+        next(self.reader)  # skip the title line
+        self.data = iter(_find_data(self.reader))
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        return next(self.data)
+
+    def close(self):
+        self.shredder.close()

{chellow-1728924490.0.0 → chellow-1729012049.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-1728924490.0.0 → chellow-1729012049.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-1728924490.0.0/VERSION

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