chellow 1728660080.0.0__py3-none-any.whl → 1728986476.0.0__py3-none-any.whl

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/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/e/scenario.py

@@ -83,7 +83,8 @@ def make_create_future_func_monthly(contract_name, fnames):
 def make_site_deltas(
     sess, report_context, site, scenario_hh, forecast_from, supply_ids
 ):
-    site_scenario_hh = scenario_hh.get(site.code, {})
+    site_scenario_hh_str = scenario_hh.get(site.code, {})
+    site_scenario_hh = {}
 
     site_deltas = {"hhs": {}}
     delts = site_deltas["supply_deltas"] = {}
@@ -97,7 +98,7 @@ def make_site_deltas(
 
     found_hh = False
     for typ in ("used", "generated", "parasitic", "gen_grid"):
-        hh_str = site_scenario_hh.get(typ, "")
+        hh_str = site_scenario_hh_str.get(typ, "")
         hh_data = site_scenario_hh[typ] = {}
         for row in csv.reader(StringIO(hh_str)):
             cells = [cell.strip() for cell in row]

{chellow-1728660080.0.0.dist-info → chellow-1728986476.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1728660080.0.0
+Version: 1728986476.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-1728660080.0.0.dist-info → chellow-1728986476.0.0.dist-info}/RECORD

@@ -25,9 +25,10 @@ chellow/e/dno_rate_parser.py,sha256=A5TP6KjyfT5lVWh7dX4SiXRi6wnf2lGv-H_T4Sod8CI,
 chellow/e/duos.py,sha256=nwviRjz-qIt3GxIMHk0hItIT4dtKsxOWq9TUC1z-hO8,30864
 chellow/e/elexon.py,sha256=ALhXS9Es7PV0z9ukPbIramn3cf3iLyFi-PMWPSm5iOs,5487
 chellow/e/energy_management.py,sha256=aXC2qlGt3FAODlNl_frWzVYAQrJLP8FFOiNX3m-QE_Y,12388
-chellow/e/hh_importer.py,sha256=vD2PRMSBhxmsyJ4xEq2N7Ib5Ohmf1FmQk8-APw8vBEs,21430
+chellow/e/hh_importer.py,sha256=Bo1kWV2po3VY5DJPlNqgWtz4xaU3h1-R2JtFmCEX37g,21442
 chellow/e/hh_parser_bg_csv.py,sha256=W5SU2MSpa8BGA0VJw1JXF-IwbCNLFy8fe35yxLZ7gEw,2453
 chellow/e/hh_parser_df2.py,sha256=tRAoVUUoJDlfPopm6usEBnhJz7dXMc2_KEWbkW9Gyq4,4330
+chellow/e/hh_parser_edf_csv.py,sha256=CLkkL1Z6BPgVV_3uwS6McmtMzgXkoEIoJnH8FsQk1C8,2839
 chellow/e/hh_parser_simple_csv.py,sha256=lJx9tw9BWFSoBmns1Cws_vY-OIn90LPt2yvIN_CFcTE,2177
 chellow/e/hh_parser_vital_xlsx.py,sha256=g9-CElfH1PPfwpuUcVvD6WQpBlNxCo8j9pq_0Yza0ZM,4125
 chellow/e/laf_import.py,sha256=aqkcbjnvfBPszBLSNg6getP7iW1uWiTVHy6N5Z5x39U,5514
@@ -35,7 +36,7 @@ chellow/e/lcc.py,sha256=OkpynN8_iAdHRlu-yyU6BhRUqYYOZsUnl0HbHULYo_4,4670
 chellow/e/mdd_importer.py,sha256=NugJr2JhuzkPTsEMl_5UdQuw5K2p8lVJ-hyz4MK6Hfg,35762
 chellow/e/rcrc.py,sha256=92CA1uIotIHd1epQ_jEPdJKzXqDFV-AoJOJeRO6MEyA,4274
 chellow/e/ro.py,sha256=dZKZv_9wXSWuwcb3jiKavoD_9ot-PZseNVeEEe0siLo,596
-chellow/e/scenario.py,sha256=fBDZVOdrI1I3XQG-RdpB0-lDF9VYENBu_9bBXJxmvWk,23362
+chellow/e/scenario.py,sha256=86DQIJ6ZK2XYIisHw6DafGcfwo1iPWF1t9rByy2yxbg,23396
 chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,6232
 chellow/e/tlms.py,sha256=M33D6YpMixu2KkwSCzDRM3kThLgShg8exp63Obo75l8,8905
 chellow/e/tnuos.py,sha256=XseYztPUsQXNKuBmystO2kzzwAG9ehCZgpGBTdgSk-A,4313
@@ -368,6 +369,6 @@ chellow/templates/g/supply_note_edit.html,sha256=b8mB6_ucBwoljp03iy6AgVaZUhGw3-1
 chellow/templates/g/supply_notes.html,sha256=6epNmZ3NKdXZz27fvmRUGeffg_oc1kmwuBeyRzQe3Rg,854
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1728660080.0.0.dist-info/METADATA,sha256=35H6CrEAzoMZ04CzYNyl07FqTrIMfAWt7FBsKZKqzss,12204
-chellow-1728660080.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1728660080.0.0.dist-info/RECORD,,
+chellow-1728986476.0.0.dist-info/METADATA,sha256=Ok78n_Nora0YJLcFiP8BesoLcDRKSM8OKZWHFjMZ-Tk,12204
+chellow-1728986476.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1728986476.0.0.dist-info/RECORD,,