chellow 1752836620.0.0__tar.gz → 1753175604.0.0__tar.gz

{chellow-1752836620.0.0 → chellow-1753175604.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1752836620.0.0
+Version: 1753175604.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-1753175604.0.0/VERSION

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

{chellow-1752836620.0.0 → chellow-1753175604.0.0}/chellow/e/elexon.py

@@ -62,7 +62,12 @@ def run_import(sess, log, set_progress, scripting_key):
     s = requests.Session()
     s.verify = False
 
-    for mod_name in ("chellow.e.system_price", "chellow.e.tlms", "chellow.e.rcrc"):
+    for mod_name in (
+        "chellow.e.system_price",
+        "chellow.e.tlms",
+        "chellow.e.rcrc",
+        "chellow.e.lafs",
+    ):
         mod = import_module(mod_name)
         mod.elexon_import(sess, log, set_progress, s, scripting_key)
 

chellow-1752836620.0.0/chellow/e/laf_import.py → chellow-1753175604.0.0/chellow/e/lafs.py

@@ -4,10 +4,10 @@ from decimal import Decimal
 from io import BytesIO, StringIO
 from zipfile import ZipFile
 
-# from sqlalchemy.dialects.postgresql import insert
 from sqlalchemy import text
 
 from werkzeug.exceptions import BadRequest
+from werkzeug.http import parse_options_header
 
 from chellow.models import Contract, Party
 from chellow.rate_server import download
@@ -30,7 +30,12 @@ DO UPDATE SET (llfc_id, timestamp, value) =
     )
     fname = name_list[0]
     csv_file = StringIO(zip_file.read(fname).decode("utf-8"))
-    csv_dt = to_utc(to_ct(Datetime.strptime(fname[-12:-4], "%Y%m%d")))
+    try:
+        csv_dt = to_utc(to_ct(Datetime.strptime(fname[-12:-4], "%Y%m%d")))
+    except ValueError as e:
+        log(f"Can't parse the date in the file name {fname} {e}")
+        return
+
     for llfc_ids, timestamps, values in laf_days(
         sess, log, set_progress, csv_file, csv_dt
     ):
@@ -110,6 +115,67 @@ LAF_START = "llf"
 LAF_END = "ptf.zip"
 
 
+def elexon_import(sess, log, set_progress, s, scripting_key):
+    log(
+        "Starting to check for new LAF files for participant codes in "
+        "configuration.properties.laf_importer.participant_codes"
+    )
+    conf = Contract.get_non_core_by_name(sess, "configuration")
+    props = conf.make_properties()
+    state = conf.make_state()
+
+    try:
+        laf_state = state["laf_importer"]
+    except KeyError:
+        laf_state = state["laf_importer"] = {}
+
+    url = "https://downloads.elexonportal.co.uk/svallf/download"
+
+    laf_props = props.get("laf_importer", {})
+    for participant_code in laf_props.get("participant_codes", []):
+        params = {"key": scripting_key, "ldso": participant_code, "format": "PTF"}
+
+        log(
+            f"Downloading from {url}?key={scripting_key}&ldso={participant_code}&"
+            f"format=PTF"
+        )
+        sess.rollback()  # Avoid long-running transactions
+        res = s.get(url, params=params)
+        log(f"Received {res.status_code} {res.reason}")
+        res.raise_for_status()
+        try:
+            cd_header = res.headers["Content-Disposition"]
+        except KeyError:
+            log("No Content-Disposition header found, so skipping.")
+            continue
+
+        cd = parse_options_header(cd_header)
+        file_name = cd[1]["filename"]
+
+        # File name llfetcl20220401ptf.zip
+        if not file_name.startswith(LAF_START):
+            raise BadRequest(f"A laf file must begin with '{LAF_START}'")
+        if not file_name.endswith(LAF_END):
+            raise BadRequest(f"A laf file must end with '{LAF_END}'")
+
+        participant_code = file_name[3:7]
+        timestamp = file_name[7:15]
+        log(f"File name {file_name}")
+
+        if timestamp > laf_state.get(participant_code, ""):
+            data = res.content
+            _process(sess, log, set_progress, BytesIO(data))
+            laf_state[participant_code] = timestamp
+            conf.update_state(state)
+            sess.commit()
+            log(f"Processed file {file_name}.")
+        else:
+            log(f"Already loaded {file_name}.")
+
+    log("Finished LAF files")
+    sess.commit()
+
+
 def find_participant_entries(paths, laf_state):
     participant_entries = {}
     for path, url in paths:

{chellow-1752836620.0.0 → chellow-1753175604.0.0}/chellow/e/views.py

@@ -2344,30 +2344,29 @@ def hh_datum_edit_post(datum_id):
 @e.route("/lafs")
 def lafs_get():
     llfc_id = req_int("llfc_id")
-    year = req_int("year")
-    month = req_int("month")
-
+    month_start = req_date("timestamp", resolution="month")
+    month_start_ct = to_ct(month_start)
     llfc = Llfc.get_by_id(g.sess, llfc_id)
     dno = llfc.dno
 
-    start_date, finish_date = next(
-        c_months_u(start_year=year, start_month=month, months=1)
-    )
-    lafs = (
-        g.sess.execute(
-            select(Laf)
-            .where(
-                Laf.llfc == llfc,
-                Laf.timestamp >= start_date,
-                Laf.timestamp <= finish_date,
-            )
-            .order_by(Laf.timestamp)
+    month_start, month_finish = next(
+        c_months_u(
+            start_year=month_start_ct.year, start_month=month_start_ct.month, months=1
         )
-        .scalars()
-        .all()
     )
+    lafs = g.sess.execute(
+        select(Laf)
+        .where(
+            Laf.llfc == llfc,
+            Laf.timestamp >= month_start,
+            Laf.timestamp <= month_finish,
+        )
+        .order_by(Laf.timestamp)
+    ).scalars()
 
-    return render_template("lafs.html", dno=dno, llfc=llfc, lafs=lafs)
+    return render_template(
+        "lafs.html", dno=dno, llfc=llfc, lafs=lafs, month_start=month_start
+    )
 
 
 @e.route("/lcc")
@@ -5714,20 +5713,34 @@ def supply_post(supply_id):
         if "new_msn" in request.form:
             start_date_str = req_str("start_date")
             start_date = parse_hh_start(start_date_str)
+            if start_date is None:
+                raise BadRequest("The data of the MSN change is blank in ECOES.")
 
             msn = req_str("msn")
+            msg = ""
             era = supply.find_era_at(g.sess, start_date)
             if era is None:
-                raise BadRequest(f"There isn't an era at {start_date}")
-            if era.msn == msn:
-                raise BadRequest(f"The era at {start_date} already has the MSN {msn}")
+                raise BadRequest(f"There are no eras from {start_date|hh_format}")
+            else:
+                if era.start_date != start_date:
+                    era = supply.insert_era_at(g.sess, start_date)
+                    g.sess.commit()
+                for era in supply.find_eras(g.sess, start_date, None):
+                    if era.msn == msn:
+                        msg += (
+                            f"The era at {hh_format(era.start_date)} already has the "
+                            f"MSN {msn}. "
+                        )
+                    else:
+                        era.msn = msn
 
-            if era.start_date != start_date:
-                era = supply.insert_era_at(g.sess, start_date)
-            era.msn = msn
-            g.sess.commit()
-            flash("MSN updated successfully")
-            return render_template("supply_post.html")
+                        g.sess.commit()
+                        msg += (
+                            f"The era at {hh_format(era.start_date)} has been "
+                            f"successfully updated with the MSN {msn}. "
+                        )
+            flash(msg)
+        return render_template("supply_post.html")
 
     except BadRequest as e:
         flash(e.description)

{chellow-1752836620.0.0 → chellow-1753175604.0.0}/chellow/models.py

@@ -4271,16 +4271,16 @@ class Supply(Base, PersistentClass):
 
     def find_eras(self, sess, start, finish):
         eras = (
-            sess.query(Era)
-            .filter(
+            select(Era)
+            .where(
                 Era.supply == self,
                 or_(Era.finish_date == null(), Era.finish_date >= start),
             )
             .order_by(Era.start_date)
         )
         if finish is not None:
-            eras = eras.filter(Era.start_date <= finish)
-        return eras.all()
+            eras = eras.where(Era.start_date <= finish)
+        return sess.scalars(eras).all()
 
     def update_era(
         self,

{chellow-1752836620.0.0 → chellow-1753175604.0.0}/chellow/rate_server.py

@@ -87,8 +87,8 @@ def run_import(sess, log, set_progress):
         "chellow.e.bsuos",
         "chellow.e.ccl",
         "chellow.e.dno_rate_parser",
-        "chellow.e.laf_import",
         "chellow.e.triad",
+        "chellow.e.lafs",
         "chellow.gas.ccl",
         "chellow.gas.dn_rate_parser",
     ):

{chellow-1752836620.0.0 → chellow-1753175604.0.0}/chellow/templates/e/lafs.html

@@ -17,7 +17,7 @@
 		<fieldset>
 			<legend>Show data</legend>	
 			<input type="hidden" name="llfc_id" value="{{llfc.id}}">
-			<label>Month</label> {{input_date(None, None, 'month')}}
+			<label>Month</label> {{input_date(resolution='month')}}
 			<input type="submit" value="Show">
 		</fieldset>
 	</form>

{chellow-1752836620.0.0 → chellow-1753175604.0.0}/chellow/templates/e/llfc.html

@@ -45,7 +45,7 @@
 		<tr>
 			<th>Loss Adjustment Factors</th>
 			<td>
-				<a href="/e/lafs?llfc_id={{llfc.id}}&amp;year={{now.year}}&amp;month={{now.month}}">LAFs</a>
+				<a href="/e/lafs?llfc_id={{llfc.id}}&amp;timestamp_year={{now.year}}&amp;timestamp_month={{now.month}}">LAFs</a>
 			</td>
 		</tr>
 	</table>

{chellow-1752836620.0.0 → chellow-1753175604.0.0}/chellow/views.py

@@ -61,7 +61,6 @@ import chellow.e.bill_importer
 import chellow.e.bsuos
 import chellow.e.computer
 import chellow.e.hh_importer
-import chellow.e.laf_import
 import chellow.e.lcc
 import chellow.e.mdd_importer
 import chellow.e.rcrc

{chellow-1752836620.0.0 → chellow-1753175604.0.0}/test/e/test_e_views.py

@@ -2023,6 +2023,37 @@ def test_get_era_bundles_bill_in_correct_era(sess, client):
     assert len(bundles[1]["imp_bills"]["bill_dicts"]) == 1
 
 
+def test_lafs_get(sess, client):
+    vf = to_utc(ct_datetime(2000, 1, 1))
+
+    market_role_Z = MarketRole.get_by_code(sess, "Z")
+    participant = Participant.insert(sess, "CALB", "AK Industries")
+    participant.insert_party(sess, market_role_Z, "None core", vf, None, None)
+    market_role_R = MarketRole.insert(sess, "R", "Distributor")
+    dno = participant.insert_party(sess, market_role_R, "WPD", vf, None, "22")
+    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,
+    )
+    sess.commit()
+
+    query_string = {
+        "llfc_id": llfc.id,
+        "timestamp_year": 2020,
+        "timestamp_month": 1,
+    }
+    response = client.get("/e/lafs", query_string=query_string)
+    match(response, 200)
+
+
 def test_llfc_eidt_post(sess, client):
     vf = to_utc(ct_datetime(2000, 1, 1))
 
@@ -4246,6 +4277,150 @@ def test_supply_edit_post(client, sess):
     assert rolled_back
 
 
+def test_supply_post(client, sess):
+    valid_from = to_utc(ct_datetime(1996, 1, 1))
+    site = Site.insert(sess, "CI017", "Water Works")
+
+    market_role_Z = MarketRole.get_by_code(sess, "Z")
+    participant = Participant.insert(sess, "CALB", "AK Industries")
+    participant.insert_party(
+        sess, market_role_Z, "None core", utc_datetime(2000, 1, 1), None, None
+    )
+    bank_holiday_rate_script = {"bank_holidays": []}
+    Contract.insert_non_core(
+        sess,
+        "bank_holidays",
+        "",
+        {},
+        utc_datetime(2000, 1, 1),
+        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", utc_datetime(2000, 1, 1), None, None
+    )
+    participant.insert_party(
+        sess, market_role_X, "Fusion Ltc", utc_datetime(2000, 1, 1), None, None
+    )
+    participant.insert_party(
+        sess, market_role_C, "Fusion DC", utc_datetime(2000, 1, 1), None, None
+    )
+    mop_contract = Contract.insert_mop(
+        sess, "Fusion", participant, "", {}, utc_datetime(2000, 1, 1), None, {}
+    )
+    dc_contract = Contract.insert_dc(
+        sess, "Fusion DC 2000", participant, "", {}, utc_datetime(2000, 1, 1), None, {}
+    )
+    pc = Pc.insert(sess, "00", "hh", utc_datetime(2000, 1, 1), None)
+    insert_cops(sess)
+    cop = Cop.get_by_code(sess, "5")
+    imp_supplier_contract = Contract.insert_supplier(
+        sess,
+        "Fusion Supplier 2000",
+        participant,
+        "",
+        {},
+        utc_datetime(2000, 1, 1),
+        None,
+        {},
+    )
+    dno = participant.insert_party(
+        sess, market_role_R, "WPD", utc_datetime(2000, 1, 1), None, "22"
+    )
+    meter_type = MeterType.insert(sess, "C5", "COP 1-5", utc_datetime(2000, 1, 1), None)
+    meter_payment_type = MeterPaymentType.insert(
+        sess, "CR", "Credit", utc_datetime(1996, 1, 1), None
+    )
+    mtc = Mtc.insert(sess, "845", False, True, valid_from, None)
+    mtc_participant = MtcParticipant.insert(
+        sess,
+        mtc,
+        participant,
+        "HH COP5 And Above With Comms",
+        False,
+        True,
+        meter_type,
+        meter_payment_type,
+        0,
+        utc_datetime(1996, 1, 1),
+        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,
+        utc_datetime(1996, 1, 1),
+        None,
+    )
+    MtcLlfc.insert(sess, mtc_participant, llfc, valid_from, 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_comms(sess)
+    comm = Comm.get_by_code(sess, "GSM")
+    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,
+        "22 0470 7514 535",
+        "510",
+        imp_supplier_contract,
+        "7748",
+        361,
+        None,
+        None,
+        None,
+        None,
+        None,
+    )
+    sess.commit()
+
+    new_msn = "764hlhf"
+    data = {
+        "new_msn": "",
+        "msn": new_msn,
+        "start_date": "2010-01-01 00:00",
+    }
+    response = client.post(f"/e/supplies/{supply.id}", data=data)
+
+    match(response, 200)
+
+    sess.rollback()
+    era = supply.find_era_at(sess, to_utc(ct_datetime(2010, 1, 1)))
+
+    assert era.msn == new_msn
+
+
 def test_supply_get(client, sess):
     valid_from = to_utc(ct_datetime(1996, 1, 1))
     site = Site.insert(sess, "CI017", "Water Works")

chellow-1752836620.0.0/test/e/test_laf_importer.py → chellow-1753175604.0.0/test/e/test_lafs.py

@@ -4,7 +4,7 @@ from zipfile import BadZipFile, ZipFile
 
 import pytest
 
-from chellow.e.laf_import import _process, find_participant_entries, laf_days
+from chellow.e.lafs import _process, find_participant_entries, laf_days
 from chellow.models import (
     Contract,
     MarketRole,

{chellow-1752836620.0.0 → chellow-1753175604.0.0}/test/test_rate_server.py

@@ -14,7 +14,7 @@ def test_run_import(mocker, sess):
 
     mocker.patch("chellow.e.bsuos.rate_server_import")
     mocker.patch("chellow.e.dno_rate_parser.rate_server_import")
-    mocker.patch("chellow.e.laf_import.rate_server_import")
+    mocker.patch("chellow.e.lafs.rate_server_import")
     mocker.patch("chellow.e.mdd_importer.rate_server_import")
     mocker.patch("chellow.gas.dn_rate_parser.rate_server_import")
 
@@ -52,7 +52,7 @@ def test_run_import_lowercase_readme(mocker, sess):
 
     mocker.patch("chellow.e.bsuos.rate_server_import")
     mocker.patch("chellow.e.dno_rate_parser.rate_server_import")
-    mocker.patch("chellow.e.laf_import.rate_server_import")
+    mocker.patch("chellow.e.lafs.rate_server_import")
     mocker.patch("chellow.e.mdd_importer.rate_server_import")
     mocker.patch("chellow.gas.dn_rate_parser.rate_server_import")
 

chellow-1752836620.0.0/VERSION

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