chellow 1713292610.0.0__py3-none-any.whl → 1713453402.0.0__py3-none-any.whl

chellow/e/dno_rate_parser.py

@@ -316,7 +316,7 @@ def tab_ehv(sheet, gsp_rates):
                     band_col = col_find(title_row, "residual")
                     band = "" if band_col is None else int(get_decimal(row, band_col))
                     tariffs[llfc] = {
-                        "gbp-per-kwh": get_rate(
+                        "super-red-gbp-per-kwh": get_rate(
                             row, col_match(title_row, polarity + " super red")
                         ),
                         "gbp-per-day": get_zero_rate(
@@ -338,10 +338,11 @@ def tab_ehv(sheet, gsp_rates):
                 period_str = " ".join(get_value(row, 0).split()).lower()
                 periods = []
 
-                if (
-                    period_str
-                    == "monday to friday nov to feb (excluding "
-                    + "22nd dec to 4th jan inclusive)"
+                if period_str in (
+                    "monday to friday nov to feb (excluding "
+                    "22nd dec to 4th jan inclusive)",
+                    "monday to friday (including bank holidays) nov to feb inclusive "
+                    "(excluding 22nd dec to 4th jan inclusive)",
                 ):
                     periods.append(
                         {
@@ -381,8 +382,8 @@ def tab_ehv(sheet, gsp_rates):
                         bands.append(
                             {
                                 **period,
-                                "start_hour": slot["start"],
-                                "finish_hour": slot["finish"],
+                                "start-hour": slot["start"],
+                                "finish-hour": slot["finish"],
                             }
                         )
 

chellow/e/duos.py

@@ -16,7 +16,7 @@ from chellow.utils import (
 )
 
 
-BANDS = ("red", "amber", "green")
+BANDS = ("super-red", "red", "amber", "green")
 
 KEYS = dict(
     (
@@ -659,34 +659,83 @@ def datum_2012_02_23(ds, hh):
 
             tariffs[start_date] = tariff
 
-    try:
-        band = gsp_group_cache["bands"][start_date]
-    except KeyError:
+    if KEYS["super-red"]["tariff-rate"] in tariff:
         try:
-            bands_cache = gsp_group_cache["bands"]
+            band = gsp_group_cache["super-red-band"][start_date]
         except KeyError:
-            bands_cache = gsp_group_cache["bands"] = {}
+            try:
+                bands_cache = gsp_group_cache["super-red-band"]
+            except KeyError:
+                bands_cache = gsp_group_cache["super-red-band"] = {}
+
+            try:
+                band = bands_cache[start_date]
+            except KeyError:
+                band = None
+                ct_hr = hh["ct-decimal-hour"]
+                weekend = hh["ct-day-of-week"] > 4
+                try:
+                    slots = ds.hh_rate(ds.dno_contract.id, start_date)[
+                        ds.gsp_group_code
+                    ]["super_red"]
+                except KeyError as e:
+                    raise BadRequest(str(e))
+
+                for slot in slots:
+                    if (
+                        slot["weekend"] == weekend
+                        and slot["start-hour"] <= ct_hr < slot["finish-hour"]
+                        and (
+                            hh["ct-month"] > slot["start-month"]
+                            or (
+                                hh["ct-month"] == slot["start-month"]
+                                and hh["ct-day"] >= slot["start-day"]
+                            )
+                        )
+                        and (
+                            hh["ct-month"] < slot["finish-month"]
+                            or (
+                                hh["ct-month"] == slot["finish-month"]
+                                and hh["ct-day"] <= slot["finish-day"]
+                            )
+                        )
+                    ):
+                        band = "super-red"
+                        break
+
+                bands_cache[start_date] = band
+    else:
 
         try:
-            band = bands_cache[start_date]
+            band = gsp_group_cache["rag-bands"][start_date]
         except KeyError:
-            band = "green"
-            ct_hr = hh["ct-decimal-hour"]
-            weekend = hh["ct-day-of-week"] > 4
             try:
-                slots = ds.hh_rate(ds.dno_contract.id, start_date)[ds.gsp_group_code][
-                    "bands"
-                ]
-            except KeyError as e:
-                raise BadRequest(str(e))
+                bands_cache = gsp_group_cache["rag-bands"]
+            except KeyError:
+                bands_cache = gsp_group_cache["rag-bands"] = {}
 
-            for slot in slots:
-                slot_weekend = slot["weekend"] == 1
-                if slot_weekend == weekend and slot["start"] <= ct_hr < slot["finish"]:
-                    band = slot["band"]
-                    break
+            try:
+                band = bands_cache[start_date]
+            except KeyError:
+                band = "green"
+                ct_hr = hh["ct-decimal-hour"]
+                weekend = hh["ct-day-of-week"] > 4
+                try:
+                    slots = ds.hh_rate(ds.dno_contract.id, start_date)[
+                        ds.gsp_group_code
+                    ]["bands"]
+                except KeyError as e:
+                    raise BadRequest(str(e))
 
-            bands_cache[start_date] = band
+                for slot in slots:
+                    if (
+                        slot["weekend"] == weekend
+                        and slot["start"] <= ct_hr < slot["finish"]
+                    ):
+                        band = slot["band"]
+                        break
+
+                bands_cache[start_date] = band
 
     try:
         laf = dno_cache["lafs"][ds.llfc_code][start_date]
@@ -759,10 +808,11 @@ def datum_2012_02_23(ds, hh):
             hh["duos-reactive-rate"] = duos_reactive_rate
             hh["duos-reactive-gbp"] = kvarh * duos_reactive_rate
 
-    rate = float(tariff[KEYS[band]["tariff-rate"]])
-    hh[KEYS[band]["bill-rate"]] = rate
-    hh[KEYS[band]["kwh"]] = hh["msp-kwh"]
-    hh[KEYS[band]["gbp"]] = rate * hh["msp-kwh"]
+    if band is not None:
+        rate = float(tariff[KEYS[band]["tariff-rate"]])
+        hh[KEYS[band]["bill-rate"]] = rate
+        hh[KEYS[band]["kwh"]] = hh["msp-kwh"]
+        hh[KEYS[band]["gbp"]] = rate * hh["msp-kwh"]
 
     if hh["ct-decimal-hour"] == 23.5 and not ds.is_displaced:
         hh["duos-fixed-days"] = 1

chellow/general_import.py

@@ -557,6 +557,10 @@ def general_import_g_supply(sess, action, vals, args):
         g_reading_frequency = GReadingFrequency.get_by_code(
             sess, g_reading_frequency_code
         )
+        aq_str = add_arg(args, "AQ", vals, 12)
+        aq = Decimal(aq_str)
+        soq_str = add_arg(args, "SOQ", vals, 13)
+        soq = Decimal(soq_str)
 
         site.insert_g_supply(
             sess,
@@ -571,6 +575,8 @@ def general_import_g_supply(sess, action, vals, args):
             g_contract,
             account,
             g_reading_frequency,
+            aq,
+            soq,
         )
         sess.flush()
     elif action == "update":

{chellow-1713292610.0.0.dist-info → chellow-1713453402.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1713292610.0.0
+Version: 1713453402.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-1713292610.0.0.dist-info → chellow-1713453402.0.0.dist-info}/RECORD

@@ -4,7 +4,7 @@ chellow/bank_holidays.py,sha256=T_utYMwe_g1dz5X-aOTdIPryg49SvB7QsWM1yphlqG8,4423
 chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=5SmP-0QPK6xCkd_wjIWh_8FAzN5OxNHCzyEQ1Xb-Y-M,5256
 chellow/edi_lib.py,sha256=het3R0DBGtXEo-Sy1zvXQuX9EWQ1X6Y33G4l1hYYuds,51859
-chellow/general_import.py,sha256=Su_JW28Wb2fG3x8fAbNmvB_YAEPieO_arhlhp31DHD8,65369
+chellow/general_import.py,sha256=_IaxpltSdfjhy1Dn9-pgBIB5PRmGWbDvEJyYHFkcOGU,65558
 chellow/models.py,sha256=POIL0dfwZFuqht7xHZaE6KJ7fk4kxMZC2aXzgg5kEFY,236921
 chellow/national_grid.py,sha256=uxcv0qisHPyzw9AVIYPzsRqwt2XPAcZL-SBR12qcrS0,4364
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
@@ -20,8 +20,8 @@ chellow/e/bsuos.py,sha256=hdP9vnOJSuZl46OAkJeUg1XJYvYIBj4J6Sqce1Hy9Vs,15542
 chellow/e/ccl.py,sha256=CYeFrg0TNF7Av49nqxa0guA8CMcJhdMpBRmOq8PH6G0,564
 chellow/e/cfd.py,sha256=V1DTT5XBQbt8hO1gae1u3315fZ4iuYk3XC7J2sUbhKQ,14352
 chellow/e/computer.py,sha256=YL1JFUYfFW-i9DODfvSnp6gTL_MwIfwoWj1TWtOsxPg,67105
-chellow/e/dno_rate_parser.py,sha256=OeD1flXsyTH6cdP4jlg2aG8yA46pRxQR3dpd8MvzMOA,21347
-chellow/e/duos.py,sha256=0PBSj9QNhV7Q6VadA5Z7NKzgcDDXslyWqStT76prqqg,28878
+chellow/e/dno_rate_parser.py,sha256=thNjT7HeAcvwV5vACvyGZ-yYzCs4keiIJEoCL8FjJ3E,21488
+chellow/e/duos.py,sha256=nwviRjz-qIt3GxIMHk0hItIT4dtKsxOWq9TUC1z-hO8,30864
 chellow/e/elexon.py,sha256=ALhXS9Es7PV0z9ukPbIramn3cf3iLyFi-PMWPSm5iOs,5487
 chellow/e/energy_management.py,sha256=aXC2qlGt3FAODlNl_frWzVYAQrJLP8FFOiNX3m-QE_Y,12388
 chellow/e/hh_importer.py,sha256=-jvJaex756NpygSapsWxXl6RK0Z4ymkz3QA6ETrdnac,21476
@@ -363,6 +363,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-1713292610.0.0.dist-info/METADATA,sha256=M6Z9ItUoC_LupTd_gqv5J42w0HtEW4VyUIPyRS5qAUU,12205
-chellow-1713292610.0.0.dist-info/WHEEL,sha256=K0BPUNF1N3kQ9olb8aVEtkObePEjdr2JOLT1N83EVws,87
-chellow-1713292610.0.0.dist-info/RECORD,,
+chellow-1713453402.0.0.dist-info/METADATA,sha256=RobDE04PcgQzlT8CKH37XijphYEe9f9tRzmv0BYtf4c,12205
+chellow-1713453402.0.0.dist-info/WHEEL,sha256=osohxoshIHTFJFVPhsi1UkZuLRGMHRXZzwEBW2ezjrc,87
+chellow-1713453402.0.0.dist-info/RECORD,,

{chellow-1713292610.0.0.dist-info → chellow-1713453402.0.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.24.0
+Generator: hatchling 1.24.1
 Root-Is-Purelib: true
 Tag: py3-none-any