chellow 1743596801.0.0__py3-none-any.whl → 1744121701.0.0__py3-none-any.whl

chellow/e/cfd.py

@@ -48,7 +48,7 @@ def hh(data_source, use_bill_check=False):
 
     for h in data_source.hh_data:
         try:
-            h["cfd-rate"] = cfd_cache[h["start-date"]]
+            h["cfd-rates"] = cfd_cache[h["start-date"]]
         except KeyError:
             h_start = h["start-date"]
             if use_bill_check:
@@ -104,7 +104,10 @@ def hh(data_source, use_bill_check=False):
                 levy_rate_str = effective_ocl_rate
             levy_rate = float(levy_rate_str) / 1000
 
-            h["cfd-rate"] = cfd_cache[h_start] = base_rate + levy_rate
+            h["cfd-rates"] = cfd_cache[h_start] = {
+                "interim": base_rate,
+                "operational": levy_rate,
+            }
 
 
 def lcc_import(sess, log, set_progress, s):

chellow/testing.py

@@ -8,8 +8,8 @@ from sqlalchemy.sql.expression import select
 from chellow.models import (
     Contract,
     GContract,
+    RSession,
     Report,
-    Session,
 )
 from chellow.utils import ct_datetime_now
 
@@ -62,7 +62,7 @@ class Tester(threading.Thread):
         while not self.stopped.isSet():
             if self.lock.acquire(False):
                 self.global_alert = None
-                with Session() as sess:
+                with RSession() as sess:
                     try:
                         _run(self.log, sess)
                     except BaseException:

{chellow-1743596801.0.0.dist-info → chellow-1744121701.0.0.dist-info}/METADATA

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

@@ -10,7 +10,7 @@ chellow/national_grid.py,sha256=czwIZqzJndSGhEMQ5YzI6hRBhvjkM6VRVYXybf4_KXg,4377
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 chellow/rate_server.py,sha256=fg-Pf_9Hk3bXmC9riPQNGQxBvLvBa_WtNYdwDCjnCSg,5678
 chellow/rrun.py,sha256=1Kt2q_K9UoDG_nsZz-Q6XJiMNKroWqlqFdxn2M6Q8CA,2088
-chellow/testing.py,sha256=Od4HHH6pZrhJ_De118_F55RJEKmAvhUH2S24QE9qFQk,3635
+chellow/testing.py,sha256=Dj2c1NX8lVlygueOrh2eyYawLW6qKEHxNhXVVUaNRO0,3637
 chellow/utils.py,sha256=Ej7dsbQ6Ee8X2aZ7B2Vs-hUFCsMABioAdOV1DJjwY-0,19293
 chellow/views.py,sha256=2WCU-_8lDuSDROvNlCGsAQVLSMh5qrD2wmeSr2G-umA,83872
 chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -19,7 +19,7 @@ chellow/e/bill_importer.py,sha256=7UcnqNlKbJc2GhW9gy8sDp9GuqambJVpZLvbafOZztA,74
 chellow/e/bmarketidx.py,sha256=9PDY-JKQwcQhGpgJEj8EktQXrUITBvQ35YryzTxwle8,7936
 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/cfd.py,sha256=CWLdYeNjgqT6Ro8YRf4vhwXIAJ2aV4Wi6HLNClVSeaQ,14260
 chellow/e/computer.py,sha256=aGti5aXRTdC85M-WRiAoZkC_76sqfAiP-79ggWZF09Q,68020
 chellow/e/dno_rate_parser.py,sha256=A5TP6KjyfT5lVWh7dX4SiXRi6wnf2lGv-H_T4Sod8CI,21731
 chellow/e/duos.py,sha256=RHrn93I1ASO2uYkuF18qlhG4p-jpuJhd_g3o69wtP4U,31004
@@ -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-1743596801.0.0.dist-info/METADATA,sha256=dA5iSa2RlUjZr0s1E1rpNaVAu6cXlYqtSsVyKtjES-g,12238
-chellow-1743596801.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1743596801.0.0.dist-info/RECORD,,
+chellow-1744121701.0.0.dist-info/METADATA,sha256=3qnfj66kvEvOu60QenxZ7VRSjLo3LKhz-soJMqn8zTo,12238
+chellow-1744121701.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1744121701.0.0.dist-info/RECORD,,