chellow 1759411815.0.0__py3-none-any.whl → 1760028799.0.0__py3-none-any.whl

chellow/e/lcc.py

@@ -46,7 +46,7 @@ def run_import(sess, log, set_progress):
     s = requests.Session()
     s.verify = False
 
-    for mod_name in ("chellow.e.cfd",):
+    for mod_name in ("chellow.e.cfd", "chellow.e.rab"):
         mod = import_module(mod_name)
         mod.lcc_import(sess, log, set_progress, s)
 

chellow/e/rab.py

@@ -0,0 +1,75 @@
+from datetime import datetime as Datetime
+from decimal import Decimal
+
+
+from sqlalchemy import select
+
+from chellow.e.lcc import api_records
+from chellow.models import Contract, RateScript
+from chellow.utils import ct_datetime, to_ct, to_utc
+
+
+def hh(data_source):
+    try:
+        rab_cache = data_source.caches["rab"]
+    except KeyError:
+        rab_cache = data_source.caches["rab"] = {}
+
+    for h in data_source.hh_data:
+        try:
+            h["rab"] = rab_cache[h["start-date"]]
+        except KeyError:
+            h_start = h["start-date"]
+            rate_str = data_source.non_core_rate("rab_forecast_ilr_tra", h_start)[
+                "record"
+            ]["Interim_Levy_Rate_GBP_MWh"]
+            if rate_str == "":
+                base_rate_dec = Decimal("0")
+            else:
+                base_rate_dec = Decimal(rate_str) / Decimal(1000)
+
+            base_rate = float(base_rate_dec)
+
+            h["rab"] = rab_cache[h_start] = {
+                "interim": base_rate,
+            }
+
+
+def lcc_import(sess, log, set_progress, s):
+    import_forecast_ilr_tra(sess, log, set_progress, s)
+
+
+def _parse_date(date_str):
+    return to_utc(to_ct(Datetime.strptime(date_str[:10], "%Y-%m-%d")))
+
+
+def import_forecast_ilr_tra(sess, log, set_progress, s):
+    log("Starting to check for new LCC RAB Forecast ILR TRA")
+
+    contract_name = "rab_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, {}
+        )
+
+    for record in api_records(log, s, "1231fbb3-93ee-4a33-87a9-f15bb377346d"):
+        period_start_str = record["Month"]
+        if len(period_start_str) == 0:
+            continue
+        period_start = _parse_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 RAB Forecast ILR TRA")

chellow/general_import.py

@@ -942,47 +942,70 @@ def general_import_bill(sess, action, vals, args):
             supply,
         )
 
-        for i in range(15, len(vals), 11):
-            msn = add_arg(args, "Meter Serial Number", vals, i)
-            mpan_str = add_arg(args, "MPAN", vals, i + 1)
-            coefficient_str = add_arg(args, "Coefficient", vals, i + 2)
-            coefficient = Decimal(coefficient_str)
-            units = add_arg(args, "Units", vals, i + 3)
-            tpr_code = add_arg(args, "TPR", vals, i + 4)
-            if len(tpr_code) > 0:
-                tpr = Tpr.get_by_code(sess, tpr_code)
-            else:
-                tpr = None
-
-            prev_date_str = add_arg(args, "Previous Date", vals, i + 5)
-            prev_date = parse_hh_start(prev_date_str)
-            prev_value_str = add_arg(args, "Previous Value", vals, i + 6)
-            prev_value = Decimal(prev_value_str)
-
-            prev_type_str = add_arg(args, "Previous Type", vals, i + 7)
-            prev_type = ReadType.get_by_code(sess, prev_type_str)
-
-            pres_date_str = add_arg(args, "Present Date", vals, i + 8)
-            pres_date = parse_hh_start(pres_date_str)
-            pres_value_str = add_arg(args, "Present Value", vals, i + 9)
-            pres_value = Decimal(pres_value_str)
-
-            pres_type_str = add_arg(args, "Present Type", vals, i + 10)
-            pres_type = ReadType.get_by_code(sess, pres_type_str)
-            bill.insert_read(
-                sess,
-                tpr,
-                coefficient,
-                units,
-                msn,
-                mpan_str,
-                prev_date,
-                prev_value,
-                prev_type,
-                pres_date,
-                pres_value,
-                pres_type,
-            )
+        i = 15
+        while i < len(vals):
+            typ = add_arg(args, "read or element", vals, i)
+            if typ == "read":
+                msn = add_arg(args, "Meter Serial Number", vals, i + 1)
+                mpan_str = add_arg(args, "MPAN", vals, i + 2)
+                coefficient_str = add_arg(args, "Coefficient", vals, i + 3)
+                coefficient = Decimal(coefficient_str)
+                units = add_arg(args, "Units", vals, i + 4)
+                tpr_code = add_arg(args, "TPR", vals, i + 5)
+                if len(tpr_code) > 0:
+                    tpr = Tpr.get_by_code(sess, tpr_code)
+                else:
+                    tpr = None
+
+                prev_date_str = add_arg(args, "Previous Date", vals, i + 6)
+                prev_date = parse_hh_start(prev_date_str)
+                prev_value_str = add_arg(args, "Previous Value", vals, i + 7)
+                prev_value = Decimal(prev_value_str)
+
+                prev_type_str = add_arg(args, "Previous Type", vals, i + 8)
+                prev_type = ReadType.get_by_code(sess, prev_type_str)
+
+                pres_date_str = add_arg(args, "Present Date", vals, i + 9)
+                pres_date = parse_hh_start(pres_date_str)
+                pres_value_str = add_arg(args, "Present Value", vals, i + 10)
+                pres_value = Decimal(pres_value_str)
+
+                pres_type_str = add_arg(args, "Present Type", vals, i + 11)
+                pres_type = ReadType.get_by_code(sess, pres_type_str)
+                bill.insert_read(
+                    sess,
+                    tpr,
+                    coefficient,
+                    units,
+                    msn,
+                    mpan_str,
+                    prev_date,
+                    prev_value,
+                    prev_type,
+                    pres_date,
+                    pres_value,
+                    pres_type,
+                )
+                i += 12
+            elif typ == "element":
+                name = add_arg(args, "Name", vals, i + 1)
+                start_date_str = add_arg(args, "Start Date", vals, i + 2)
+                start_date = parse_hh_start(start_date_str)
+                finish_date_str = add_arg(args, "Finish Date", vals, i + 3)
+                finish_date = parse_hh_start(finish_date_str)
+                net_str = add_arg(args, "Net", vals, i + 4)
+                net = Decimal(net_str)
+                breakdown_str = add_arg(args, "Breakdown", vals, i + 5)
+                breakdown = _parse_breakdown(breakdown_str)
+                bill.insert_element(
+                    sess,
+                    name,
+                    start_date,
+                    finish_date,
+                    net,
+                    breakdown,
+                )
+                i += 6
 
     elif action == "update":
         bill_id_str = add_arg(args, "Bill Id", vals, 0)

chellow/templates/general_imports.html

@@ -306,6 +306,7 @@
 				<td>Type</td>
 				<td>Breakdown</td>
 				<td>Kwh</td>
+				<td>'read' or 'element'</td>
 				<td>(Meter Serial Number</td>
 				<td>Mpan</td>
 				<td>Coefficient</td>
@@ -317,6 +318,12 @@
 				<td>Present Date</td>
 				<td>Present Value</td>
 				<td>Present Type)*</td>
+				<td>'read' or 'element'</td>
+				<td>(Name</td>
+				<td>Start Date</td>
+				<td>Finish Date</td>
+				<td>Net</td>
+				<td>Breakdown)*</td>
 			</tr>
 			<tr>
 				<td><em>update</em></td>

{chellow-1759411815.0.0.dist-info → chellow-1760028799.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1759411815.0.0
+Version: 1760028799.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)
@@ -14,7 +14,7 @@ Requires-Dist: odio==0.0.23
 Requires-Dist: openpyxl==3.1.5
 Requires-Dist: paramiko==3.4.1
 Requires-Dist: pep3143daemon==0.1.0
-Requires-Dist: pg8000==1.31.1
+Requires-Dist: pg8000==1.31.5
 Requires-Dist: pip>=9.0.1
 Requires-Dist: psutil==5.9.5
 Requires-Dist: pympler==1.0.1
@@ -47,7 +47,7 @@ Chellow is a web application for checking UK electricity and gas bills. It's des
 for organizations with high electricity consumption. The software is hosted at
 https://github.com/WessexWater/chellow.
 
-[![Build Status](https://github.com/WessexWater/chellow/workflows/chellow/badge.svg)](https://github.com/WessexWater/chellow/workflows/chellow)
+[![Build Status](https://github.com/WessexWater/chellow/actions/workflows/chellow.yml/badge.svg)](https://github.com/WessexWater/chellow/actions/workflows/chellow.yml)
 
 
 ## Installation
@@ -55,8 +55,7 @@ https://github.com/WessexWater/chellow.
 Chellow is a Python web application that uses the PostgreSQL database. To install
 Chellow, follow these steps:
 
-* Install [PostgreSQL](http://www.postgresql.org/) 12
-  * Set the PostgreSQL time zone to 'UTC'.
+* Install [PostgreSQL](http://www.postgresql.org/) 15
 * Create a PostgreSQL database: `createdb --encoding=UTF8 chellow`
 * Set up the following environment variables to configure Chellow:
 

{chellow-1759411815.0.0.dist-info → chellow-1760028799.0.0.dist-info}/RECORD

@@ -5,7 +5,7 @@ chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=dixp-O0MF2_mlwrnKx3D9DH09Qu05BjTo0rZfigTjR4,5534
 chellow/edi_lib.py,sha256=Lq70TUJuogoP5KGrphzUEUfyfgftEclg_iA3mpNAaDI,51324
 chellow/fake_batch_updater.py,sha256=khAmvSUn9qN04w8C92kRg1UeyQvfLztE7QXv9tUz6nE,11611
-chellow/general_import.py,sha256=bm8FoaC9xUajGvJYShuS5GEwPwcL5eCF9D9g6o_AkB0,68089
+chellow/general_import.py,sha256=ghybbden66VT4q5J0vYwiNg-6G2vg71EgCN_x3fvhW0,69200
 chellow/models.py,sha256=Ws3-jP6x3bSrCmv1umbviaQ3SijpP4R_a6i2Go26gRM,247072
 chellow/national_grid.py,sha256=-c_vqNRtpNIQOcm0F1NDhS3_QUiOaLgEJYWzysSNc5Y,4369
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
@@ -35,8 +35,9 @@ chellow/e/hh_parser_schneider_xlsx.py,sha256=Vtq0TNz-oojoKJm4PeH4ZwBp2I-mjArB9-F
 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/lafs.py,sha256=SUUFtvn_IQQTrZue1zefCYgzuscA0FVX2ySZ9u8BDPw,7776
-chellow/e/lcc.py,sha256=OkpynN8_iAdHRlu-yyU6BhRUqYYOZsUnl0HbHULYo_4,4670
+chellow/e/lcc.py,sha256=VqwKBE6N6wXv_xu0o-1CRtJripoFGCZ8Q8e1hvce_34,4686
 chellow/e/mdd_importer.py,sha256=NugJr2JhuzkPTsEMl_5UdQuw5K2p8lVJ-hyz4MK6Hfg,35762
+chellow/e/rab.py,sha256=8buWWqo7CPzAqenI8zEnKDMVxzXZzQZUFAWY9sdGH3s,2320
 chellow/e/rcrc.py,sha256=92CA1uIotIHd1epQ_jEPdJKzXqDFV-AoJOJeRO6MEyA,4274
 chellow/e/ro.py,sha256=cpeJQMY_6SpVxL1nySSj9we58A6E2KwJEAb6fK7cZKY,626
 chellow/e/scenario.py,sha256=FLgh03r_SgXx0hMWFbAvwsz2ScDL8LUwYWSWVv2rQlg,24973
@@ -128,7 +129,7 @@ chellow/templates/downloads.html,sha256=R9QPcFz-PLJOX7rDlmquIk-Hp9Iq-thzWCTfOexS
 chellow/templates/edi_viewer.html,sha256=szUthgHOdph6Of-7f_1LeC_zYlNJaMeS5ctn6xTAeiM,1437
 chellow/templates/fake_batch_updater.html,sha256=aRQbxtNUlIzxwgSUy2pr-Km5NbhZkse4WSBtlqFIJMg,1885
 chellow/templates/general_import.html,sha256=9ezzieDjaPBZ0nUJkMkzoDxWVzYtr4D-Dr2UCA5xV8U,1370
-chellow/templates/general_imports.html,sha256=-uQRJBtpwZHODcWM1JuECJ_H_AHsu8frtwEFQ6s_7Sk,13690
+chellow/templates/general_imports.html,sha256=h7UC7AWJ3Qw9PH8UPq24PqZ5xQF5b3Ct7LfC_PK78BE,13866
 chellow/templates/home.html,sha256=7xiD6QLju3ugALzMlzTJosRyMUmQGWPK6jDF7oZbnAQ,5781
 chellow/templates/input_date.html,sha256=rpgB5n0LfN8Y5djN_ZiuSxqdskxzCoKrEqI7hyJkVQo,1248
 chellow/templates/local_report.html,sha256=pV7_0QwyQ-D3OS9LXrly5pq3qprZnwTCoq6vCnMTkS4,1332
@@ -399,6 +400,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-1759411815.0.0.dist-info/METADATA,sha256=BDsyDyi0K8znwxoja9PvDrJJCVAIOiddSch-eAR_AU4,12519
-chellow-1759411815.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1759411815.0.0.dist-info/RECORD,,
+chellow-1760028799.0.0.dist-info/METADATA,sha256=zm1x1B_QH5ZI_HiJ4vFBX0RbyndLd_v2iw77jNS4QqU,12500
+chellow-1760028799.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1760028799.0.0.dist-info/RECORD,,