chellow 1713292610.0.0__tar.gz → 1713300425.0.0__tar.gz

{chellow-1713292610.0.0 → chellow-1713300425.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1713292610.0.0
+Version: 1713300425.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-1713300425.0.0/VERSION

@@ -0,0 +1 @@
+__version__ = "1713300425.0.0"

{chellow-1713292610.0.0 → chellow-1713300425.0.0}/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-1713292610.0.0 → chellow-1713300425.0.0}/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-1713292610.0.0/VERSION

@@ -1 +0,0 @@
-__version__ = "1713292610.0.0"