chellow 1739889885.0.0__py3-none-any.whl → 1740066311.0.0__py3-none-any.whl

chellow/e/computer.py

@@ -119,11 +119,15 @@ def contract_func(caches, contract, func_name):
     return ns.get(func_name, None)
 
 
-def non_core_rate(sess, caches, contract_id_or_name, date):
-    return hh_rate(sess, caches, contract_id_or_name, date, market_role_code="Z")
+def non_core_rate(sess, caches, contract_id_or_name, date, exact=False):
+    return hh_rate(
+        sess, caches, contract_id_or_name, date, market_role_code="Z", exact=exact
+    )
 
 
-def hh_rate(sess, caches, contract_id_or_name, date, market_role_code=None):
+def hh_rate(
+    sess, caches, contract_id_or_name, date, market_role_code=None, exact=False
+):
     try:
         ccache = caches["computer"]
     except KeyError:
@@ -181,18 +185,20 @@ def hh_rate(sess, caches, contract_id_or_name, date, market_role_code=None):
             )
 
             if rs is None:
-                rs = (
+                last_rs = (
                     sess.query(RateScript)
                     .filter(RateScript.contract == contract)
                     .order_by(RateScript.start_date.desc())
                     .first()
                 )
-                if date < rs.start_date:
+                if date < last_rs.start_date:
                     cstart = year_before
-                    cfinish = min(year_after, rs.start_date - HH)
+                    cfinish = min(year_after, last_rs.start_date - HH)
                 else:
-                    cstart = max(rs.finish_date + HH, year_before)
+                    cstart = max(last_rs.finish_date + HH, year_before)
                     cfinish = year_after
+                if not exact:
+                    rs = last_rs
             else:
                 cstart = max(rs.start_date, year_before)
                 if rs.finish_date is None:
@@ -200,23 +206,26 @@ def hh_rate(sess, caches, contract_id_or_name, date, market_role_code=None):
                 else:
                     cfinish = min(rs.finish_date, year_after)
 
-            market_role_code = rs.contract.market_role.code
-            if market_role_code == "M":
-                seg = "/e/mop_rate_scripts/"
-            elif market_role_code == "C":
-                seg = "/e/dc_rate_scripts/"
-            elif market_role_code == "X":
-                seg = "/e/supplier_rate_scripts/"
-            elif market_role_code == "Z":
-                seg = "/non_core_rate_scripts/"
-            elif market_role_code == "R":
-                seg = "/e/dno_rate_scripts/"
+            if rs is None:
+                vals = None
             else:
-                raise Exception(
-                    f"The market role code {market_role_code} isn't recognized."
-                )
+                market_role_code = rs.contract.market_role.code
+                if market_role_code == "M":
+                    seg = "/e/mop_rate_scripts/"
+                elif market_role_code == "C":
+                    seg = "/e/dc_rate_scripts/"
+                elif market_role_code == "X":
+                    seg = "/e/supplier_rate_scripts/"
+                elif market_role_code == "Z":
+                    seg = "/non_core_rate_scripts/"
+                elif market_role_code == "R":
+                    seg = "/e/dno_rate_scripts/"
+                else:
+                    raise Exception(
+                        f"The market role code {market_role_code} isn't recognized."
+                    )
 
-            vals = PropDict(f"the rate script {seg}{rs.id} ", loads(rs.script), [])
+                vals = PropDict(f"the rate script {seg}{rs.id} ", loads(rs.script), [])
             for dt in hh_range(caches, cstart, cfinish):
                 if dt not in cont_cache:
                     cont_cache[dt] = vals
@@ -572,8 +581,10 @@ class DataSource:
             self.rate_cache = self.caches["computer"]["rates"]
             return val
 
-    def non_core_rate(self, contract_name_or_id, date):
-        return non_core_rate(self.sess, self.caches, contract_name_or_id, date)
+    def non_core_rate(self, contract_name_or_id, date, exact=False):
+        return non_core_rate(
+            self.sess, self.caches, contract_name_or_id, date, exact=exact
+        )
 
     def _add_problem(self, problem):
         self.supplier_bill["problem"] += problem

chellow/e/tlms.py

@@ -36,7 +36,11 @@ def hh(data_source, run="DF"):
             h["tlm"] = tlm = cache[h["start-date"]][gsp_group_code][run]
         except KeyError:
             h_start = h["start-date"]
-            rates = data_source.non_core_rate("tlms", h_start)["tlms"]
+            vals = data_source.non_core_rate("tlms", h_start, exact=True)
+            if vals is None:
+                vals = data_source.non_core_rate("tlms", h["hist-start"])
+
+            rates = vals["tlms"]
 
             key = key_format(h_start)
             try:

{chellow-1739889885.0.0.dist-info → chellow-1740066311.0.0.dist-info}/METADATA

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

@@ -20,7 +20,7 @@ chellow/e/bmarketidx.py,sha256=C0BaHn2RxIuWH2QzA-OmSP0fbUGvW9tqEUhLnzOEdmA,7968
 chellow/e/bsuos.py,sha256=hdP9vnOJSuZl46OAkJeUg1XJYvYIBj4J6Sqce1Hy9Vs,15542
 chellow/e/ccl.py,sha256=30dh_SvlgzsTQPPAJNZWILaMvbeDsv9-P-S1JxS5_SQ,3184
 chellow/e/cfd.py,sha256=Gm435c42LFwZx1n-1UY1Tdx6mL1is7E0vRLWQe8RPOo,14184
-chellow/e/computer.py,sha256=Fq4SpEvCLArZHOGgSGqvm7mdAVLiswnNWspuuft4h70,67460
+chellow/e/computer.py,sha256=KkYNaD4W13s_BvtyPrYbfZ9MU73hKi-IIL-g4OOQxBA,67787
 chellow/e/dno_rate_parser.py,sha256=A5TP6KjyfT5lVWh7dX4SiXRi6wnf2lGv-H_T4Sod8CI,21731
 chellow/e/duos.py,sha256=nwviRjz-qIt3GxIMHk0hItIT4dtKsxOWq9TUC1z-hO8,30864
 chellow/e/elexon.py,sha256=ALhXS9Es7PV0z9ukPbIramn3cf3iLyFi-PMWPSm5iOs,5487
@@ -40,7 +40,7 @@ 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=M33D6YpMixu2KkwSCzDRM3kThLgShg8exp63Obo75l8,8905
+chellow/e/tlms.py,sha256=Wb9ZuxscMzxXs0FT06Iu5YXeccmO6ai_mUjnJGJwTM4,9045
 chellow/e/tnuos.py,sha256=NBmc-f3oezrl4gviAKobljHfICTpBKxxxEGBGJi_lRk,4927
 chellow/e/triad.py,sha256=lIQj7EdUrcFwEqleuHZXYU_bfzIwNOqUVVxB3NPQt4A,13710
 chellow/e/views.py,sha256=ZDVUirf0fMLO8aS5gF3xpPnRDmNqYxxGHkGjxm0_AY4,220901
@@ -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-1739889885.0.0.dist-info/METADATA,sha256=iQJxsDUYm0NRHUc8O70ShLjSedd-0j5cjZh_5ojdJuw,12204
-chellow-1739889885.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1739889885.0.0.dist-info/RECORD,,
+chellow-1740066311.0.0.dist-info/METADATA,sha256=Ptkn8LQ0lzGXaW-pi11oteZKiDLxBJuK0WvC7HpscYY,12204
+chellow-1740066311.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1740066311.0.0.dist-info/RECORD,,