chellow 1751477752.0.0__py3-none-any.whl → 1751619264.0.0__py3-none-any.whl

chellow/e/bill_parsers/drax_edi.py

@@ -167,7 +167,7 @@ def _process_BCD(elements, headers):
     bill_type_code = elements["BTCD"][0]
     sumo = elements["SUMO"]
     headers["start_date"] = to_date(sumo[0])
-    headers["finish_date"] = to_date(sumo[1]) - HH
+    headers["finish_date"] = to_finish_date(sumo[1])
 
     headers["issue_date"] = issue_date
     headers["bill_type_code"] = bill_type_code

chellow/e/tlms.py

@@ -89,7 +89,10 @@ def _find_complete_date(caches, sess, contract, cache):
         rates["id"] = rs.id
         cache["rate_scripts"].append(rates)
         timestamps = cache["timestamps"]
-        tlms = rates["tlms"]
+        try:
+            tlms = rates["tlms"]
+        except KeyError:
+            tlms = rates["tlms"] = {}
         complete = True
         for dt in hh_range(caches, rs.start_date, rs.finish_date):
             timestamps[dt] = rates
@@ -236,6 +239,11 @@ def _process_line(cache, sess, contract, log_func, values, complete_date, caches
                     .order_by(RateScript.start_date.desc())
                     .first()
                 )
+                if hh_date < latest_rs.start_date:
+                    raise BadRequest(
+                        f"The start of the latest rate script must be before "
+                        f"{hh_format(hh_date)}"
+                    )
                 contract.update_rate_script(
                     sess,
                     latest_rs,

chellow/e/triad.py

@@ -94,10 +94,8 @@ def _process_triad_hh(ds, rate_period, est_kw, hh):
     if ds.site is None:
         era = ds.supply.find_era_at(ds.sess, earliest_triad)
         if (
-            era is None
-            or era.get_channel(ds.sess, ds.is_import, "ACTIVE") is None
-            and est_kw is None
-        ):
+            era is None or era.get_channel(ds.sess, ds.is_import, "ACTIVE") is None
+        ) and est_kw is None:
             est_kw = 0.85 * max(datum["msp-kwh"] for datum in ds.hh_data) * 2
         if est_kw is not None:
             for est_datum in est_triad_kws:

{chellow-1751477752.0.0.dist-info → chellow-1751619264.0.0.dist-info}/METADATA

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

@@ -41,16 +41,16 @@ chellow/e/rcrc.py,sha256=92CA1uIotIHd1epQ_jEPdJKzXqDFV-AoJOJeRO6MEyA,4274
 chellow/e/ro.py,sha256=dZKZv_9wXSWuwcb3jiKavoD_9ot-PZseNVeEEe0siLo,596
 chellow/e/scenario.py,sha256=FLgh03r_SgXx0hMWFbAvwsz2ScDL8LUwYWSWVv2rQlg,24973
 chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,6232
-chellow/e/tlms.py,sha256=Wb9ZuxscMzxXs0FT06Iu5YXeccmO6ai_mUjnJGJwTM4,9045
+chellow/e/tlms.py,sha256=K2n-dF6qNW7VQp4m_sVK1HWnXarmAIzpotWXYqWQacY,9363
 chellow/e/tnuos.py,sha256=NBmc-f3oezrl4gviAKobljHfICTpBKxxxEGBGJi_lRk,4927
-chellow/e/triad.py,sha256=lIQj7EdUrcFwEqleuHZXYU_bfzIwNOqUVVxB3NPQt4A,13710
+chellow/e/triad.py,sha256=NSIIDsj6mPLr_jIFxce-cXzh7bxLTv5cFsNBJhY4CH0,13686
 chellow/e/views.py,sha256=e5rMZFT2fNO3P14_0nCyOEwNWnMiayx2wqo4PJmBwRM,220111
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=opjXRrqrgBTbSKzL0JfTLP0fnz3DL3oRZZ4P0DifQ3I,4119
 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/drax_edi.py,sha256=syHvC-q1DK3fuSfI1IgMejNlVa7zEnrr4H9zU2mxqlA,15081
+chellow/e/bill_parsers/drax_edi.py,sha256=cqd1YhW_IsxUMsW5xcyC_0CHpqkMRWKQgcXERZoIqGM,15083
 chellow/e/bill_parsers/drax_element_edi.py,sha256=kxjg1KA4UheMa8doGp9skXtQYrNK8Eisy9ksafR5TQo,13661
 chellow/e/bill_parsers/edf_export_xlsx.py,sha256=J4lY8epiSTIePZ6D1SGD76TXRoev35KrUC2sjHkNqlE,6632
 chellow/e/bill_parsers/engie_edi.py,sha256=PDMDI0aqUM1lalgzxih1YmMho11n1rMqE0vyL-aEIs8,15840
@@ -385,6 +385,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-1751477752.0.0.dist-info/METADATA,sha256=SMC0kIII5STfrFFJtcp-1ItxYWQwx9OunE-nbBb3WNQ,12238
-chellow-1751477752.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1751477752.0.0.dist-info/RECORD,,
+chellow-1751619264.0.0.dist-info/METADATA,sha256=xlK5YqUwEKANf3zGXV4UcDjBQRjqy22tD54jbvo4XS4,12238
+chellow-1751619264.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1751619264.0.0.dist-info/RECORD,,