chellow 1729269304.0.0__tar.gz → 1729760318.0.0__tar.gz

{chellow-1729269304.0.0 → chellow-1729760318.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1729269304.0.0
+Version: 1729760318.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-1729760318.0.0/VERSION

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

{chellow-1729269304.0.0 → chellow-1729760318.0.0}/chellow/e/hh_importer.py

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

chellow-1729760318.0.0/chellow/e/hh_parser_schneider_csv.py

@@ -0,0 +1,75 @@
+import csv
+import itertools
+from codecs import iterdecode
+from datetime import datetime as Datetime
+from decimal import Decimal, InvalidOperation
+
+from werkzeug.exceptions import BadRequest
+
+from chellow.utils import parse_mpan_core, to_utc, validate_hh_start
+
+# "Time stamp","Value","Events","Comment","User"
+# "18/10/2024 09:30:00","88.0","","",""
+# "18/10/2024 09:00:00","89.1","","",""
+
+
+def create_parser(reader, mpan_map, messages):
+    return HhParserSchneiderCsv(reader, mpan_map, messages)
+
+
+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 parse_values(values):
+    start_date_str = get_field(values, 0, "Timestamp")
+    start_date = validate_hh_start(
+        to_utc(Datetime.strptime(start_date_str, "%d/%m/%Y %H:%M:%S"))
+    )
+
+    reading_str = get_field(values, 1, "Reading")
+    reading_str = reading_str.replace(",", "")
+    try:
+        reading = Decimal(reading_str)
+    except InvalidOperation as e:
+        raise BadRequest(f"Problem parsing the number {reading_str}. {e}")
+    return start_date, reading
+
+
+class HhParserSchneiderCsv:
+    def __init__(self, reader, mpan_map, messages):
+        s = iterdecode(reader, "utf-8")
+        self.shredder = zip(itertools.count(1), csv.reader(s))
+        next(self.shredder)  # skip the title line
+        self.line_number, self.values = next(self.shredder)
+        _, self.pres_reading = parse_values(self.values)
+        self.mpan_core = parse_mpan_core(next(iter(mpan_map.values())))
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        try:
+            self.line_number, self.values = next(self.shredder)
+            start_date, reading = parse_values(self.values)
+            datum = {
+                "mpan_core": self.mpan_core,
+                "channel_type": "ACTIVE",
+                "start_date": start_date,
+                "value": self.pres_reading - reading,
+                "status": "A",
+            }
+            self.pres_reading = reading
+            return datum
+        except BadRequest as e:
+            e.description = (
+                f"Problem at line number: {self.line_number}: {self.values}: "
+                f"{e.description}"
+            )
+            raise e
+
+    def close(self):
+        self.shredder.close()

chellow-1729760318.0.0/chellow/e/hh_parser_schneider_xlsx.py

@@ -0,0 +1,118 @@
+from datetime import datetime as Datetime
+from decimal import Decimal, InvalidOperation
+
+from openpyxl import load_workbook
+
+from werkzeug.exceptions import BadRequest
+
+from chellow.utils import parse_mpan_core, to_ct, to_utc, validate_hh_start
+
+# "Time stamp","Value","Events","Comment","User"
+# "18/10/2024 09:30:00","88.0","","",""
+# "18/10/2024 09:00:00","89.1","","",""
+
+
+def create_parser(reader, mpan_map, messages):
+    return HhParserSchneiderXlsx(reader, mpan_map, messages)
+
+
+def get_cell(sheet, col, row):
+    try:
+        coordinates = f"{col}{row}"
+        return sheet[coordinates]
+    except IndexError:
+        raise BadRequest(f"Can't find the cell {coordinates} on sheet {sheet}.")
+
+
+def get_date(sheet, col, row):
+    cell = get_cell(sheet, col, row)
+    val = cell.value
+    if not isinstance(val, Datetime):
+        raise BadRequest(
+            f"Problem reading {val} (of type {type(val)}) as a timestamp at "
+            f"{cell.coordinate}."
+        )
+    return val
+
+
+def get_str(sheet, col, row):
+    return get_cell(sheet, col, row).value.strip()
+
+
+def get_dec(sheet, col, row):
+    return get_dec_from_cell(get_cell(sheet, col, row))
+
+
+def get_dec_from_cell(cell):
+    try:
+        return Decimal(str(cell.value))
+    except InvalidOperation as e:
+        raise BadRequest(f"Problem parsing the number at {cell.coordinate}. {e}")
+
+
+def get_int(sheet, col, row):
+    return int(get_cell(sheet, col, row).value)
+
+
+def find_hhs(sheet, set_line_number, mpan_core):
+    pres_reading = None
+    for row in range(2, len(sheet["A"]) + 1):
+        set_line_number(row)
+        try:
+            timestamp_cell = get_cell(sheet, "A", row)
+            timestamp_str = timestamp_cell.value
+            if timestamp_str is None:
+                continue
+
+            # 2024-10-02 00:00:00 +1H, DST
+            ts_str = timestamp_str.split(",")[0]
+            ts_naive = Datetime.strptime(ts_str[:19], "%Y-%m-%d %H:%M:%S")
+            # Sometimes has seconds
+            ts_naive = Datetime(
+                ts_naive.year,
+                ts_naive.month,
+                ts_naive.day,
+                ts_naive.hour,
+                ts_naive.minute,
+            )
+            is_dst = ts_str[21] == 1
+            if is_dst:
+                start_date = to_utc(to_ct(ts_naive))
+            else:
+                start_date = to_utc(ts_naive)
+            start_date = validate_hh_start(start_date)
+
+            reading = get_dec(sheet, "B", row)
+
+            if pres_reading is not None:
+                value = pres_reading - reading
+                if value >= 0:
+                    yield {
+                        "mpan_core": mpan_core,
+                        "channel_type": "ACTIVE",
+                        "start_date": start_date,
+                        "value": value,
+                        "status": "A",
+                    }
+            pres_reading = reading
+        except BadRequest as e:
+            e.description = f"Problem at line number: {row}: {e.description}"
+            raise e
+
+
+class HhParserSchneiderXlsx:
+    def __init__(self, input_stream, mpan_map, messages):
+        book = load_workbook(input_stream, data_only=True)
+        self.sheet = book.worksheets[0]
+        imp_name = get_str(self.sheet, "B", 1).strip()
+        self.mpan_core = parse_mpan_core(mpan_map[imp_name])
+        self.line_number = 0
+
+    def _set_line_number(self, line_number):
+        self.line_number = line_number
+
+    def __iter__(self):
+        return find_hhs(self.sheet, self._set_line_number, self.mpan_core)
+
+    def close(self):
+        self.shredder.close()

{chellow-1729269304.0.0 → chellow-1729760318.0.0}/chellow/e/views.py

@@ -68,7 +68,6 @@ from chellow.models import (
     ReadType,
     RegisterRead,
     Report,
-    Scenario,
     Site,
     SiteEra,
     Snag,
@@ -80,7 +79,6 @@ from chellow.models import (
 )
 from chellow.utils import (
     HH,
-    c_months_c,
     c_months_u,
     csv_make_val,
     ct_datetime,
@@ -1220,7 +1218,7 @@ def dc_contract_edit_post(contract_id):
 
 
 @e.route("/dc_contracts/<int:contract_id>/hh_imports")
-def dc_contracts_hh_imports_get(contract_id):
+def dc_contract_hh_imports_get(contract_id):
     contract = Contract.get_dc_by_id(g.sess, contract_id)
     processes = chellow.e.hh_importer.get_hh_import_processes(contract.id)
     return render_template(
@@ -1232,7 +1230,7 @@ def dc_contracts_hh_imports_get(contract_id):
 
 
 @e.route("/dc_contracts/<int:contract_id>/hh_imports", methods=["POST"])
-def dc_contracts_hh_imports_post(contract_id):
+def dc_contract_hh_imports_post(contract_id):
     try:
         contract = Contract.get_dc_by_id(g.sess, contract_id)
 
@@ -3910,142 +3908,6 @@ def read_type_get(read_type_id):
     return render_template("read_type.html", read_type=read_type)
 
 
-@e.route("/scenarios")
-def scenarios_get():
-    scenarios = g.sess.query(Scenario).order_by(Scenario.name).all()
-    return render_template("scenarios.html", scenarios=scenarios)
-
-
-@e.route("/scenarios/add", methods=["POST"])
-def scenario_add_post():
-    try:
-        name = req_str("name")
-        properties = req_zish("properties")
-        scenario = Scenario.insert(g.sess, name, properties)
-        g.sess.commit()
-        return chellow_redirect(f"/scenarios/{scenario.id}", 303)
-    except BadRequest as e:
-        g.sess.rollback()
-        flash(e.description)
-        scenarios = g.sess.query(Scenario).order_by(Scenario.name)
-        return make_response(
-            render_template("scenario_add.html", scenarios=scenarios), 400
-        )
-
-
-@e.route("/scenarios/add")
-def scenario_add_get():
-    now = utc_datetime_now()
-    props = {
-        "scenario_start_month": now.month,
-        "scenario_start_year": now.year,
-        "scenario_duration": 1,
-    }
-    return render_template("scenario_add.html", initial_props=dumps(props))
-
-
-@e.route("/scenarios/<int:scenario_id>")
-def scenario_get(scenario_id):
-    start_date = None
-    finish_date = None
-    duration = 1
-
-    scenario = Scenario.get_by_id(g.sess, scenario_id)
-    props = scenario.props
-    site_codes = "\n".join(props.get("site_codes", []))
-    try:
-        duration = props["scenario_duration"]
-        _, finish_date_ct = list(
-            c_months_c(
-                start_year=props["scenario_start_year"],
-                start_month=props["scenario_start_month"],
-                months=duration,
-            )
-        )[-1]
-        finish_date = to_utc(finish_date_ct)
-    except KeyError:
-        pass
-
-    try:
-        start_date = to_utc(
-            ct_datetime(
-                props["scenario_start_year"],
-                props["scenario_start_month"],
-                props["scenario_start_day"],
-                props["scenario_start_hour"],
-                props["scenario_start_minute"],
-            )
-        )
-    except KeyError:
-        pass
-
-    try:
-        finish_date = to_utc(
-            ct_datetime(
-                props["scenario_finish_year"],
-                props["scenario_finish_month"],
-                props["scenario_finish_day"],
-                props["scenario_finish_hour"],
-                props["scenario_finish_minute"],
-            )
-        )
-    except KeyError:
-        pass
-    return render_template(
-        "scenario.html",
-        scenario=scenario,
-        scenario_start_date=start_date,
-        scenario_finish_date=finish_date,
-        scenario_duration=duration,
-        site_codes=site_codes,
-    )
-
-
-@e.route("/scenarios/<int:scenario_id>/edit")
-def scenario_edit_get(scenario_id):
-    scenario = Scenario.get_by_id(g.sess, scenario_id)
-    return render_template("scenario_edit.html", scenario=scenario)
-
-
-@e.route("/scenarios/<int:scenario_id>/edit", methods=["POST"])
-def scenario_edit_post(scenario_id):
-    try:
-        scenario = Scenario.get_by_id(g.sess, scenario_id)
-        name = req_str("name")
-        properties = req_zish("properties")
-        scenario.update(name, properties)
-        g.sess.commit()
-        return chellow_redirect(f"/scenarios/{scenario.id}", 303)
-    except BadRequest as e:
-        g.sess.rollback()
-        description = e.description
-        flash(description)
-        return make_response(
-            render_template(
-                "scenario_edit.html",
-                scenario=scenario,
-            ),
-            400,
-        )
-
-
-@e.route("/scenarios/<int:scenario_id>/edit", methods=["DELETE"])
-def scenario_edit_delete(scenario_id):
-    try:
-        scenario = Scenario.get_by_id(g.sess, scenario_id)
-        scenario.delete(g.sess)
-        g.sess.commit()
-        res = make_response()
-        res.headers["HX-Redirect"] = f"{chellow.utils.url_root}/e/scenarios"
-        return res
-    except BadRequest as e:
-        g.sess.rollback()
-        flash(e.description)
-        return make_response(
-            render_template("scenario_edit.html", scenario=scenario), 400
-        )
-
-
 @e.route("/sites/<int:site_id>/energy_management")
 def site_energy_management_get(site_id):
     site = Site.get_by_id(g.sess, site_id)