chellow 1736431515.0.0__py3-none-any.whl → 1737990669.0.0__py3-none-any.whl

chellow/e/bill_parsers/edf_export_xlsx.py

@@ -83,6 +83,12 @@ ELEM_LOOKUP = {
         "units": "duos-red-kwh",
         "rate": "duos-red-gbp-per-kwh",
     },
+    "Unit Rate Super Red": {
+        "name": "duos-super-red",
+        "gbp": "duos-super-red-gbp",
+        "units": "duos-super-red-kwh",
+        "rate": "duos-super-red-gbp-per-kwh",
+    },
 }
 
 

chellow/e/bill_parsers/mm.py

@@ -114,6 +114,7 @@ ELEMENT_LOOKUP = {
     "20RS0050": "duos-amber",
     "30RS0050": "duos-red",
     "9CANNUAL": "duos-reactive",
+    "40RS0050": "duos-super-red",
 }
 
 
@@ -186,7 +187,9 @@ def _handle_0461(headers, pre_record, record):
     headers["mpan_core"] = mpan_core
     units = CONSUMPTION_UNITS_LOOKUP[parts["units"].strip()]
     register_code = parts["register_code"].strip()
-    if units == "kWh" and not register_code.startswith("NOCHARGE"):
+    if units == "kWh" and not (
+        register_code.startswith("NOCHARGE") or register_code.endswith("XXXX")
+    ):
         headers["kwh"] += Decimal(parts["quantity"])
 
     prev_read_date_str = parts["prev_read_date"].strip()

chellow/reports/report_247.py

@@ -772,7 +772,7 @@ def content(scenario_props, base_name, user_id, compression, now):
             else:
                 forecast_from = to_utc(forecast_from)
 
-            sites = sess.query(Site).distinct().order_by(Site.code)
+            base_site_set = set()
 
             mpan_cores = scenario_props.get("mpan_cores")
             supply_ids = None
@@ -788,12 +788,14 @@ def content(scenario_props, base_name, user_id, compression, now):
                 else:
                     base_name.append("mpan_cores")
 
-                sites = (
-                    sites.join(SiteEra)
+                for site in sess.scalars(
+                    select(Site)
+                    .join(SiteEra)
                     .join(Era)
                     .join(Supply)
                     .where(Supply.id.in_(supply_ids))
-                )
+                ):
+                    base_site_set.add(site.id)
 
             site_codes = scenario_props.get("site_codes")
             if site_codes is not None:
@@ -802,7 +804,10 @@ def content(scenario_props, base_name, user_id, compression, now):
                     base_name.append(site_codes[0])
                 else:
                     base_name.append("sitecodes")
-                sites = sites.where(Site.code.in_(site_codes))
+
+                for site_code in site_codes:
+                    site = Site.get_by_code(sess, site_code)
+                    base_site_set.add(site.id)
 
             user = User.get_by_id(sess, user_id)
 
@@ -969,7 +974,6 @@ def content(scenario_props, base_name, user_id, compression, now):
             site_rows.append(site_header_titles + summary_titles)
             era_rows.append(era_titles)
 
-            sites = sites.all()
             normal_reads = set()
 
             for month_start, month_finish in month_pairs:
@@ -980,7 +984,40 @@ def content(scenario_props, base_name, user_id, compression, now):
                 else:
                     data_source_bill = None
                 org_month_data = defaultdict(int)
-                for site in sites:
+
+                if len(base_site_set) > 0:
+                    site_set = base_site_set
+                else:
+                    site_set = set()
+                    for site in sess.scalars(
+                        select(Site)
+                        .join(SiteEra)
+                        .join(Era)
+                        .where(
+                            Era.start_date <= month_finish,
+                            or_(
+                                Era.finish_date == null(),
+                                Era.finish_date >= month_start,
+                            ),
+                        )
+                    ):
+                        site_set.add(site.id)
+                    for site in sess.scalars(
+                        select(Site)
+                        .join(SiteEra)
+                        .join(Era)
+                        .join(Supply)
+                        .join(Bill)
+                        .where(
+                            Bill.start_date <= month_finish,
+                            Bill.finish_date >= month_start,
+                        )
+                    ):
+                        site_set.add(site.id)
+
+                for site in sess.scalars(
+                    select(Site).where(Site.id.in_(site_set)).order_by(Site.code)
+                ):
                     if by_hh:
                         sf = [
                             (d, d)

{chellow-1736431515.0.0.dist-info → chellow-1737990669.0.0.dist-info}/METADATA

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

@@ -49,7 +49,7 @@ chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=UgWXDPzQkQghyj_lfgBqoSJ
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=-HMoIfa_utXYKA44RuC0Xqv3vd2HLeQU_4P0iBUd3WA,4219
 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=weVvtnXVBSNtz-CMiUHCTI2W8kV19lX7UDMZilxybKk,6440
+chellow/e/bill_parsers/edf_export_xlsx.py,sha256=J4lY8epiSTIePZ6D1SGD76TXRoev35KrUC2sjHkNqlE,6632
 chellow/e/bill_parsers/engie_edi.py,sha256=CTobTskDjzdcqqf_qk2ukDSaTLrVpGZMM0sYlwehog4,14985
 chellow/e/bill_parsers/engie_export_xlsx.py,sha256=oZO0qHdDlOxjJ6J5Ate82CkAoX4bxed1EJyUKHxBcpk,4690
 chellow/e/bill_parsers/engie_xls.py,sha256=jrut2heH_ZWmSjcn7celOydZS9Y49GfpYjDk_EKwamI,14453
@@ -58,7 +58,7 @@ chellow/e/bill_parsers/gdf_csv.py,sha256=ZfK3Oc6oP28p_P9DIevLNB_zW2WLcEJ3Lvb1gL3
 chellow/e/bill_parsers/haven_csv.py,sha256=0uENq8IgVNqdxfBQMBxLTSZWCOuDHXZC0xzk52SbfyE,13652
 chellow/e/bill_parsers/haven_edi.py,sha256=YGPHRxPOhje9s32jqPHHELni2tooOYj3cMC_qaZVPq4,16107
 chellow/e/bill_parsers/haven_edi_tprs.py,sha256=ZVX9CCqUybsot_Z0BEOJPvl9x5kSr7fEWyuJXvZDcz4,11841
-chellow/e/bill_parsers/mm.py,sha256=CdYVV3OI-BCtpd9PohOPkY3127dhz0wOCtXOLCDRVsw,10724
+chellow/e/bill_parsers/mm.py,sha256=5909bJe_zwRItqkMYnq5bdZA6XhBBMquvBqsC6bbnqU,10808
 chellow/e/bill_parsers/nonsettlement_dc_stark_xlsx.py,sha256=yogXTuQHGRL7IiqvRWr2C9V24ez1j9Yx0128UygPE_k,4723
 chellow/e/bill_parsers/settlement_dc_stark_xlsx.py,sha256=PlEqCZuJ9DfQXeeYQ64jtf3ML7sUt_tt61QOOTnkE5c,6380
 chellow/e/bill_parsers/sse_edi.py,sha256=L85DOfNkqexeEIEr8pCBn_2sHJI-zEaw6cogpE3YyYM,15204
@@ -84,7 +84,7 @@ chellow/reports/report_219.py,sha256=3Zs16ka6dWWY_lCDoA-ZFrlPb4vHk1LQoa2yrlTMntA
 chellow/reports/report_231.py,sha256=WARLztV2HzBFSi5_xvY_DTXVyuBBbBYiU0RazfjKw-Y,5270
 chellow/reports/report_233.py,sha256=qJdPFuBgQAWD24BsljgGJ44L_RGdHOA1RqsxGjTWhFc,4975
 chellow/reports/report_241.py,sha256=lfivElRkV_CZAhck0rxAuhqzgponj3aWwmwGMNQvUxg,5343
-chellow/reports/report_247.py,sha256=Hhhk0XcDdS3SaA-BJxw6BtN7mOhdKjBdtBNV7zqqaAI,44509
+chellow/reports/report_247.py,sha256=A74EfUihmV4Pa3NyrJfkf28HJn61Ai4wN694ETfbO4Q,45894
 chellow/reports/report_29.py,sha256=ZXnq6Kg5on-IPquUsH4bn46mBVESY_WhwqDWZPXOJwo,2695
 chellow/reports/report_291.py,sha256=BnWtxe0eWN2QKKWpwjs5-RI5LbReBKL119QbkrkNhV8,7478
 chellow/reports/report_33.py,sha256=lt1EN_LNx6u-AgdaS3YRkPMZA33JgMcELolHF4oJUMw,16689
@@ -376,6 +376,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-1736431515.0.0.dist-info/METADATA,sha256=78QJHzK7SfEhS31W3L2h1zcoNfkEVk9udgaEMeqXepU,12204
-chellow-1736431515.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1736431515.0.0.dist-info/RECORD,,
+chellow-1737990669.0.0.dist-info/METADATA,sha256=OP4AXY6aiOoNzLbNqmIfNoVtrpaEbzQtqBuS5VSzG7Y,12204
+chellow-1737990669.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1737990669.0.0.dist-info/RECORD,,