chellow 1742469647.0.0__py3-none-any.whl → 1742896763.0.0__py3-none-any.whl

chellow/e/bill_parsers/engie_edi.py

@@ -104,13 +104,15 @@ TCOD_MAP = {
     "220894": ("winter-night-gbp", "winter-night-rate", "winter-night-kwh"),
     "264929": ("winter-weekday-gbp", "winter-weekday-rate", "winter-weekday-kwh"),
     "638187": ("winter-weekend-gbp", "winter-weekend-rate", "winter-weekend-kwh"),
-    "700285": ("duo-fixed-gbp", "duos-fixed-rate", "duos-fixed-days"),
+    "700285": ("duos-fixed-gbp", "duos-fixed-rate", "duos-fixed-days"),
 }
 
 TPR_LOOKUP = {
     "Day": "00043",
     "Off Peak / Weekends": "00210",
     "Night": "00210",
+    "Default Rate": "00043",
+    "Single": "00210",
 }
 
 

chellow/reports/report_g_supplies_snapshot.py

@@ -9,11 +9,7 @@ from sqlalchemy import or_
 from sqlalchemy.orm import joinedload
 from sqlalchemy.sql.expression import null
 
-from werkzeug.exceptions import BadRequest
-
 from chellow.dloads import open_file
-from chellow.e.computer import contract_func
-from chellow.gas.engine import GDataSource, forecast_date
 from chellow.models import GEra, GSupply, Session
 from chellow.utils import csv_make_val, req_date, req_int
 
@@ -44,8 +40,6 @@ def content(date, g_supply_id, user):
                     "soq",
                 )
             )
-            fdate = forecast_date()
-            caches = {}
 
             g_eras = (
                 sess.query(GEra, GSupply)
@@ -83,16 +77,7 @@ def content(date, g_supply_id, user):
                 g_supply_start_date = sup_g_eras[0].start_date
                 g_supply_finish_date = sup_g_eras[-1].finish_date
 
-                ds = GDataSource(sess, date, date, fdate, g_era, caches, None)
                 g_supplier_contract = g_era.g_contract
-                vb_function = contract_func(caches, g_supplier_contract, "virtual_bill")
-                if vb_function is None:
-                    raise BadRequest(
-                        f"The contract {g_supplier_contract.name} doesn't have the "
-                        f"virtual_bill() function."
-                    )
-                vb_function(ds)
-                bill = ds.bill
 
                 writer.writerow(
                     csv_make_val(value)
@@ -112,8 +97,8 @@ def content(date, g_supply_id, user):
                         g_supply_start_date,
                         g_supply_finish_date,
                         g_era.g_reading_frequency.code,
-                        bill["aq"],
-                        bill["soq"],
+                        g_era.aq,
+                        g_era.soq,
                     ]
                 )
     except BaseException:

{chellow-1742469647.0.0.dist-info → chellow-1742896763.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1742469647.0.0
+Version: 1742896763.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-1742469647.0.0.dist-info → chellow-1742896763.0.0.dist-info}/RECORD

@@ -50,7 +50,7 @@ chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=-HMoIfa_utXYKA44RuC0Xqv3v
 chellow/e/bill_parsers/bgb_edi.py,sha256=GuwHeYbAGk7BVg5n19FcTANFDyKI-y0z3f9niQaPSSw,4828
 chellow/e/bill_parsers/csv.py,sha256=U5zcIaZ6B5QTTpFDAcBnk4G2r8B3j5kJhDPL4AJNkEk,5640
 chellow/e/bill_parsers/edf_export_xlsx.py,sha256=J4lY8epiSTIePZ6D1SGD76TXRoev35KrUC2sjHkNqlE,6632
-chellow/e/bill_parsers/engie_edi.py,sha256=-DXbOKo0wNiCn-OVMaTFUJyVeGFA5NEUfDzrv3-tQi0,15555
+chellow/e/bill_parsers/engie_edi.py,sha256=jex-hVndgbr-y72_mNS84feA-Gpy15k9xMITFLspVbQ,15608
 chellow/e/bill_parsers/engie_export_xlsx.py,sha256=oZO0qHdDlOxjJ6J5Ate82CkAoX4bxed1EJyUKHxBcpk,4690
 chellow/e/bill_parsers/engie_xls.py,sha256=jrut2heH_ZWmSjcn7celOydZS9Y49GfpYjDk_EKwamI,14453
 chellow/e/bill_parsers/engie_xlsx.py,sha256=4Hu3ls1uNMH7vjDHgcP6QARlGlvb616CqG3xZVjAKWo,16888
@@ -102,7 +102,7 @@ chellow/reports/report_csv_site_hh_data.py,sha256=ik0OkGVo1bfTXLdcT3gPUHnxSkSdor
 chellow/reports/report_csv_site_snags.py,sha256=AuAy6vjL0g7vwPPAZhBqxOyITL9_jnyFj012MnUcxxk,2627
 chellow/reports/report_ecoes_comparison.py,sha256=wEwJrFMOz74CidONkTmgWD1Ghhgo9DT0V7Vddkspkqg,21403
 chellow/reports/report_g_monthly_duration.py,sha256=VQq5xTLvdu9Z_vqrgWNP2S4xm2uCSSZA9HVNiQv9Dus,18264
-chellow/reports/report_g_supplies_snapshot.py,sha256=f6yuds1_X3j3domC1lCyA788RdxCgFZSee-4L7BhwU8,4677
+chellow/reports/report_g_supplies_snapshot.py,sha256=9xB6RDrnbgxuomMcP1b1yEP4kOnEJ34WgKpyxLTprOQ,3998
 chellow/reports/report_g_supply_virtual_bill.py,sha256=EaYrB8PHJIXrUuhiZ7dwUlbNBkuyJebQHrdc308_z1o,3653
 chellow/reports/report_g_virtual_bills.py,sha256=20vHa5LGQwOAlJlaGJaGszZrrbT0PMOZJf6hSxU2hIQ,4528
 chellow/reports/report_g_virtual_bills_hh.py,sha256=gaiLEmKTpq6JsfZ1p0SdCDuPvzvigXp6z88gHRCA63w,3416
@@ -378,6 +378,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-1742469647.0.0.dist-info/METADATA,sha256=h2cMM3e98XS32aO0HYuIC6wJGIrSXOIJyFIOK4b_kj8,12238
-chellow-1742469647.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1742469647.0.0.dist-info/RECORD,,
+chellow-1742896763.0.0.dist-info/METADATA,sha256=4JSYUHtJTBvxXihV9h4fYzFMnp0XlwQahYaaf61_98E,12238
+chellow-1742896763.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1742896763.0.0.dist-info/RECORD,,