chellow 1705585731.0.0__py3-none-any.whl → 1706020835.0.0__py3-none-any.whl

chellow/e/cfd.py

@@ -1,14 +1,17 @@
 from datetime import datetime as Datetime
 
 from dateutil.relativedelta import relativedelta
+
 from sqlalchemy import null, or_, select
 
+from werkzeug.exceptions import BadRequest
+
 from chellow.e.lcc import api_search, api_sql
 from chellow.models import Contract, RateScript
 from chellow.utils import ct_datetime, hh_format, to_ct, to_utc
 
 
-def hh(data_source):
+def hh(data_source, use_bill_check=False):
     try:
         cfd_cache = data_source.caches["cfd"]
     except KeyError:
@@ -19,47 +22,60 @@ def hh(data_source):
             h["cfd-rate"] = cfd_cache[h["start-date"]]
         except KeyError:
             h_start = h["start-date"]
-            daily_contract = Contract.get_non_core_by_name(
-                data_source.sess, "cfd_reconciled_daily_levy_rates"
-            )
-            daily_rs = data_source.sess.scalars(
-                select(RateScript).where(
-                    RateScript.contract == daily_contract,
-                    RateScript.start_date <= h_start,
-                    or_(
-                        RateScript.finish_date == null(),
-                        RateScript.finish_date >= h_start,
-                    ),
+            if use_bill_check:
+                base_rate = (
+                    float(
+                        data_source.non_core_rate("cfd_forecast_ilr_tra", h_start)[
+                            "record"
+                        ]["Interim_Levy_Rate_GBP_Per_MWh"]
+                    )
+                    / 1000
                 )
-            ).one_or_none()
-            if daily_rs.finish_date is None and h_start >= to_utc(
-                to_ct(daily_rs.start_date) + relativedelta(months=3)
-            ):
-                base_rate = data_source.non_core_rate(
-                    "cfd_in_period_tracking", h_start
-                )["rate_gbp_per_kwh"]
             else:
-                base_rate = data_source.non_core_rate(
-                    "cfd_reconciled_daily_levy_rates", h_start
-                )["rate_gbp_per_kwh"]
+                daily_contract = Contract.get_non_core_by_name(
+                    data_source.sess, "cfd_reconciled_daily_levy_rates"
+                )
+                daily_rs = data_source.sess.scalars(
+                    select(RateScript).where(
+                        RateScript.contract == daily_contract,
+                        RateScript.start_date <= h_start,
+                        or_(
+                            RateScript.finish_date == null(),
+                            RateScript.finish_date >= h_start,
+                        ),
+                    )
+                ).one_or_none()
+                if daily_rs.finish_date is None and h_start >= to_utc(
+                    to_ct(daily_rs.start_date) + relativedelta(months=3)
+                ):
+                    base_rate_dec = data_source.non_core_rate(
+                        "cfd_in_period_tracking", h_start
+                    )["rate_gbp_per_kwh"]
+                else:
+                    base_rate_dec = data_source.non_core_rate(
+                        "cfd_reconciled_daily_levy_rates", h_start
+                    )["rate_gbp_per_kwh"]
+                base_rate = float(base_rate_dec)
 
             effective_ocl_rate = data_source.non_core_rate(
                 "cfd_operational_costs_levy", h["start-date"]
             )["record"]["Effective_OCL_Rate_GBP_Per_MWh"]
             if effective_ocl_rate == "":
                 levy_rate_str = data_source.non_core_rate(
-                    "cfd_operational_costs_levy", h["start-date"]
+                    "cfd_operational_costs_levy", h_start
                 )["record"]["OCL_Rate_GBP_Per_MWh"]
             else:
                 levy_rate_str = effective_ocl_rate
             levy_rate = float(levy_rate_str) / 1000
-            h["cfd-rate"] = cfd_cache[h["start-date"]] = float(base_rate) + levy_rate
+
+            h["cfd-rate"] = cfd_cache[h_start] = base_rate + levy_rate
 
 
 def lcc_import(sess, log, set_progress, s):
     import_in_period_tracking(sess, log, set_progress, s)
     import_operational_costs_levy(sess, log, set_progress, s)
     import_reconciled_daily_levy_rates(sess, log, set_progress, s)
+    import_forecast_ilr_tra(sess, log, set_progress, s)
 
 
 def _quarters(s):
@@ -93,6 +109,16 @@ def _parse_date(date_str):
     return to_utc(to_ct(Datetime.strptime(date_str[:10], "%Y-%m-%d")))
 
 
+def _parse_varying_date(date_str):
+    if "-" in date_str:
+        pattern = "%Y-%m-%d"
+    elif "/" in date_str:
+        pattern = "%d/%m/%Y"
+    else:
+        raise BadRequest(f"The date {date_str} is not recognized.")
+    return Datetime.strptime(date_str, pattern)
+
+
 def import_in_period_tracking(sess, log, set_progress, s):
     log("Starting to check for new LCC CfD In-Period Tracking")
 
@@ -303,3 +329,34 @@ def import_reconciled_daily_levy_rates(sess, log, set_progress, s):
 
     log("Finished LCC CfD Reconciled Daily Levy Rates")
     sess.commit()
+
+
+def import_forecast_ilr_tra(sess, log, set_progress, s):
+    log("Starting to check for new LCC CfD Forecast ILR TRA")
+
+    contract_name = "cfd_forecast_ilr_tra"
+    contract = Contract.find_non_core_by_name(sess, contract_name)
+    if contract is None:
+        contract = Contract.insert_non_core(
+            sess, contract_name, "", {}, to_utc(ct_datetime(1996, 4, 1)), None, {}
+        )
+
+    res_j = api_search(s, "fbece4ce-7cfc-42b7-8fb2-387cf59a3c32", sort="Period_Start")
+    for record in res_j["result"]["records"]:
+        period_start_str = record["Period_Start"]
+        period_start = to_utc(to_ct(_parse_varying_date(period_start_str)))
+
+        rs = sess.execute(
+            select(RateScript).where(
+                RateScript.contract == contract,
+                RateScript.start_date == period_start,
+            )
+        ).scalar_one_or_none()
+        if rs is None:
+            rs = contract.insert_rate_script(sess, period_start, {})
+
+        rs_script = rs.make_script()
+        rs_script["record"] = record
+        rs.update(rs_script)
+        sess.commit()
+    log("Finished LCC CfD Forecast ILR TRA")

chellow/e/triad.py

@@ -8,6 +8,8 @@ from pypdf import PdfReader
 
 from sqlalchemy import null, or_, select
 
+from werkzeug.exceptions import BadRequest
+
 import chellow.e.duos
 from chellow.models import Contract, RateScript
 from chellow.national_grid import api_get
@@ -276,6 +278,16 @@ GSP_LOOKUP = {
 }
 
 
+def _parse_varying_date(date_str):
+    if "-" in date_str:
+        pattern = "%Y-%m-%d"
+    elif "/" in date_str:
+        pattern = "%d/%m/%Y"
+    else:
+        raise BadRequest(f"The date {date_str} is not recognized.")
+    return Datetime.strptime(date_str, pattern)
+
+
 def national_grid_import(sess, log, set_progress, s):
     log("Starting to check for new TNUoS TRIAD Tariffs")
 
@@ -317,10 +329,13 @@ def national_grid_import(sess, log, set_progress, s):
                 rates = tr[polarity] = {}
 
             record_key = GSP_LOOKUP[record["Zone_No"]]
-            record_published_date = record["Published_Date"]
+            record_published_date = _parse_varying_date(record["Published_Date"])
 
             rate = rates.get(record_key)
-            if rate is None or rate["Published_Date"] > record_published_date:
+            if (
+                rate is None
+                or _parse_varying_date(rate["Published_Date"]) < record_published_date
+            ):
                 rates[record_key] = record
                 rs.update(rs_script)
                 sess.commit()

{chellow-1705585731.0.0.dist-info → chellow-1706020835.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chellow
-Version: 1705585731.0.0
+Version: 1706020835.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-1705585731.0.0.dist-info → chellow-1706020835.0.0.dist-info}/RECORD

@@ -18,7 +18,7 @@ chellow/e/bill_importer.py,sha256=y1bpn49xDwltj0PRFowWsjAVamcD8eyxUbCTdGxEZiE,73
 chellow/e/bmarketidx.py,sha256=0JCBBnP3xfLq2eFjXO_u-gzHyTizab4Pp6PRK6OZLcw,7134
 chellow/e/bsuos.py,sha256=YtEhce5589kJWNp0HlA7N9L1hHl2KjYkUm54cUCOB8w,15080
 chellow/e/ccl.py,sha256=CYeFrg0TNF7Av49nqxa0guA8CMcJhdMpBRmOq8PH6G0,564
-chellow/e/cfd.py,sha256=K0aF-ch20ZlX0XkTxqqjAGDrP-ZzNeWcGssikU7ObLc,10413
+chellow/e/cfd.py,sha256=eWN1U6_q4OqlLuXOo131jC5536Q3KU2S6Bl6uUv379E,12420
 chellow/e/computer.py,sha256=J8VvYjcSeJNrG2Ak8Zi2t2bb_8tMrkHWny4JQlgIyy8,67032
 chellow/e/dno_rate_parser.py,sha256=3IqGM2v6Str7S3Rc9FZ7lRWBKthfb3zSjpJLSETPcEE,20631
 chellow/e/duos.py,sha256=ISTcNqe9KNjVNM2Qs8IBoQxnmSXOt5W_G7tZxp4T78M,28870
@@ -36,7 +36,7 @@ chellow/e/scenario.py,sha256=1tUxnvwTzr6cKqiw2wphdv5XDzV6JO6UVYkyQa67vHs,23263
 chellow/e/system_price.py,sha256=F2GF_TNapfpbhoYjuGYAUCtD4JnccOUfd3w2ClG55qc,8032
 chellow/e/tlms.py,sha256=m6bUY1LNRlPoZ8va7Y3TlXAIktlTz36UVygFoDqwXIc,9586
 chellow/e/tnuos.py,sha256=qybrPCVukQ2l0RIdqn8XtHEbAU0izGoqUrFLoLVUoVI,4126
-chellow/e/triad.py,sha256=gR4tyPVlbwcrOvUaOgzUUzDtmWPOLoXRwzBilKIRlTo,13183
+chellow/e/triad.py,sha256=S6LEMHvUKhAZe0-yfLIRciYDZ8IKMn1jh1TmmsbQD3s,13588
 chellow/e/views.py,sha256=HIoyHeKR-j8wvxoyk3ZytTsCjU7g3ejFYVh56e6MxKE,212153
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=UgWXDPzQkQghyj_lfgBqoSJpHB-t-qOdSaB8qY6GLog,4071
@@ -361,6 +361,6 @@ chellow/templates/g/supply_note_edit.html,sha256=6UQf_qbhFDys3cVsTp-c7ABWZpggW9R
 chellow/templates/g/supply_notes.html,sha256=WR3YwGh_qqTklSJ7JqWX6BKBc9rk_jMff4RiWZiF2CM,936
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1705585731.0.0.dist-info/METADATA,sha256=ZDTCqHhMHVtFiAbtdq07DCo3uAmfHY6zX_bQdJuNgeE,12160
-chellow-1705585731.0.0.dist-info/WHEEL,sha256=mRYSEL3Ih6g5a_CVMIcwiF__0Ae4_gLYh01YFNwiq1k,87
-chellow-1705585731.0.0.dist-info/RECORD,,
+chellow-1706020835.0.0.dist-info/METADATA,sha256=ArRKTKkqPCuPDcnv7ta2OVMFShUtAaPkT1XJm_iwFm4,12160
+chellow-1706020835.0.0.dist-info/WHEEL,sha256=mRYSEL3Ih6g5a_CVMIcwiF__0Ae4_gLYh01YFNwiq1k,87
+chellow-1706020835.0.0.dist-info/RECORD,,