chellow 1729849426.0.0__py3-none-any.whl → 1730296955.0.0__py3-none-any.whl

chellow/e/computer.py

@@ -127,12 +127,30 @@ def non_core_rate(sess, caches, contract_id_or_name, date):
 
 def hh_rate(sess, caches, contract_id_or_name, date, market_role_code=None):
     try:
-        return caches["computer"]["rates"][market_role_code][contract_id_or_name][date]
+        ccache = caches["computer"]
+    except KeyError:
+        ccache = caches["computer"] = {}
+
+    try:
+        contract_id = ccache[market_role_code][contract_id_or_name]
     except KeyError:
         try:
-            ccache = caches["computer"]
+            mr_cache = ccache[market_role_code]
         except KeyError:
-            ccache = caches["computer"] = {}
+            mr_cache = ccache[market_role_code] = {}
+
+        if market_role_code is None:
+            contract_id = Contract.get_by_id(sess, contract_id_or_name).id
+        else:
+            contract_id = Contract.get_by_role_code_name(
+                sess, market_role_code, contract_id_or_name
+            ).id
+
+        mr_cache[contract_id_or_name] = contract_id
+
+    try:
+        return ccache["rates"][contract_id][date]
+    except KeyError:
 
         try:
             rss_cache = ccache["rates"]
@@ -140,24 +158,14 @@ def hh_rate(sess, caches, contract_id_or_name, date, market_role_code=None):
             rss_cache = ccache["rates"] = {}
 
         try:
-            mr_cache = rss_cache[market_role_code]
-        except KeyError:
-            mr_cache = rss_cache[market_role_code] = {}
-
-        try:
-            cont_cache = mr_cache[contract_id_or_name]
+            cont_cache = rss_cache[contract_id]
         except KeyError:
-            cont_cache = mr_cache[contract_id_or_name] = {}
+            cont_cache = rss_cache[contract_id] = {}
 
         try:
             return cont_cache[date]
         except KeyError:
-            if market_role_code is None:
-                contract = Contract.get_by_id(sess, contract_id_or_name)
-            else:
-                contract = Contract.get_by_role_code_name(
-                    sess, market_role_code, contract_id_or_name
-                )
+            contract = Contract.get_by_id(sess, contract_id)
 
             year_after = date + YEAR
             year_before = date - YEAR

chellow/e/scenario.py

@@ -15,13 +15,16 @@ from chellow.e.computer import (
     contract_func,
     datum_range,
     displaced_era,
+    hh_rate,
 )
 from chellow.models import Era, Llfc, MtcParticipant, Pc, SiteEra, Source, Supply
 from chellow.utils import (
+    PropDict,
     c_months_u,
     hh_format,
     hh_max,
     hh_min,
+    hh_range,
     parse_hh_start,
     to_ct,
     to_utc,
@@ -661,3 +664,46 @@ class ScenarioSource:
 
                 hh["msp-kwh"] += delt
                 hh["msp-kw"] += delt * 2
+
+
+def scenario_fill_cache(report_context, sess, scenario_props):
+    try:
+        comp = report_context["computer"]
+    except KeyError:
+        comp = report_context["computer"] = {}
+
+    try:
+        rate_cache = comp["rates"]
+    except KeyError:
+        rate_cache = comp["rates"] = {}
+
+    for rate_script in scenario_props.get("rates", []):
+        contract_id = rate_script["contract_id"]
+        try:
+            cont_cache = rate_cache[contract_id]
+        except KeyError:
+            cont_cache = rate_cache[contract_id] = {}
+
+        try:
+            rate_script_start = rate_script["start_date"]
+        except KeyError:
+            raise BadRequest(
+                f"Problem in the scenario properties. Can't find the 'start_date' key "
+                f"of the contract {contract_id} in the 'rates' map."
+            )
+
+        try:
+            rate_script_finish = rate_script["finish_date"]
+        except KeyError:
+            raise BadRequest(
+                f"Problem in the scenario properties. Can't find the 'finish_date' "
+                f"key of the contract {contract_id} in the 'rates' map."
+            )
+
+        for dt in hh_range(report_context, rate_script_start, rate_script_finish):
+            hh_rate(sess, report_context, contract_id, dt)
+
+        for dt in hh_range(report_context, rate_script_start, rate_script_finish):
+            storage = cont_cache[dt]._storage.copy()
+            storage.update(rate_script["script"])
+            cont_cache[dt] = PropDict("scenario properties", storage)

chellow/e/tnuos.py

@@ -21,6 +21,7 @@ def hh(ds):
 BAND_LOOKUP = {
     "Domestic Aggregated (Related MPAN)": "Domestic",
     "Domestic Aggregated with Residual": "Domestic",
+    "Domestic Aggregated or CT with Residual": "Domestic",
     "HV Generation Site Specific": "HV1",
     "HV Generation Site Specific no RP charge": "HV1",
     "HV Site Specific Band 1": "HV1",
@@ -46,11 +47,21 @@ BAND_LOOKUP = {
     "LV Sub Site Specific No Residual": "LV1",
     "Non-Domestic Aggregated (related MPAN)": "LV_NoMIC_1",
     "Non-Domestic Aggregated Band 1": "LV_NoMIC_1",
+    "Non-Domestic Aggregated or CT Band 1": "LV_NoMIC_1",
     "Non-Domestic Aggregated Band 2": "LV_NoMIC_2",
+    "Non-Domestic Aggregated or CT Band 2": "LV_NoMIC_2",
     "Non-Domestic Aggregated Band 3": "LV_NoMIC_3",
+    "Non-Domestic Aggregated or CT Band 3": "LV_NoMIC_3",
     "Non-Domestic Aggregated Band 4": "LV_NoMIC_4",
+    "Non-Domestic Aggregated or CT Band 4": "LV_NoMIC_4",
     "Non-Domestic Aggregated No Residual": "LV_NoMIC_1",
+    "Non-Domestic Aggregated or CT No Residual": "LV_NoMIC_1",
     "Unmetered Supplies": "Unmetered",
+    "Designated EHV Site Specific No Residual": "EHV1",
+    "Designated EHV Site Specific Band 1": "EHV1",
+    "Designated EHV Site Specific Band 2": "EHV2",
+    "Designated EHV Site Specific Band 3": "EHV3",
+    "Designated EHV Site Specific Band 4": "EHV4",
     "Designated EHV0": "EHV1",
     "Designated EHV1": "EHV1",
     "Designated EHV2": "EHV2",

chellow/reports/report_247.py

@@ -17,7 +17,7 @@ from werkzeug.exceptions import BadRequest
 
 from chellow.dloads import open_file
 from chellow.e.computer import contract_func, forecast_date
-from chellow.e.scenario import make_calcs, make_site_deltas
+from chellow.e.scenario import make_calcs, make_site_deltas, scenario_fill_cache
 from chellow.models import (
     Bill,
     Contract,
@@ -36,7 +36,6 @@ from chellow.models import (
 )
 from chellow.utils import (
     HH,
-    PropDict,
     c_months_c,
     c_months_u,
     hh_format,
@@ -734,21 +733,6 @@ class Object:
 def content(scenario_props, base_name, user_id, compression, now):
     report_context = {}
 
-    try:
-        comp = report_context["computer"]
-    except KeyError:
-        comp = report_context["computer"] = {}
-
-    try:
-        rate_cache = comp["rates"]
-    except KeyError:
-        rate_cache = comp["rates"] = {}
-
-    try:
-        ind_cont = report_context["contract_names"]
-    except KeyError:
-        ind_cont = report_context["contract_names"] = {}
-
     sess = rf = None
     org_rows = []
     site_rows = []
@@ -826,54 +810,7 @@ def content(scenario_props, base_name, user_id, compression, now):
             fname = "_".join(base_name) + ".ods"
             rf = open_file(fname, user, mode="wb")
 
-            for rate_script in scenario_props.get("rates", []):
-                contract_id = rate_script["contract_id"]
-                try:
-                    cont_cache = rate_cache[contract_id]
-                except KeyError:
-                    cont_cache = rate_cache[contract_id] = {}
-
-                try:
-                    rate_script_start = rate_script["start_date"]
-                except KeyError:
-                    raise BadRequest(
-                        f"Problem in the scenario properties. Can't find the "
-                        f"'start_date' key of the contract {contract_id} in the "
-                        f"'rates' map."
-                    )
-
-                try:
-                    rate_script_start = rate_script["start_date"]
-                except KeyError:
-                    raise BadRequest(
-                        f"Problem in the scenario properties. Can't find the "
-                        f"'start_date' key of the contract {contract_id} in the "
-                        f"'rates' map."
-                    )
-
-                props = PropDict("scenario properties", rate_script["script"])
-                for dt in hh_range(
-                    report_context, rate_script_start, rate_script["finish_date"]
-                ):
-                    cont_cache[dt] = props
-
-            for rate_script in scenario_props.get("industry_rates", []):
-                contract_name = rate_script["contract_name"]
-                try:
-                    cont_cache = ind_cont[contract_name]
-                except KeyError:
-                    cont_cache = ind_cont[contract_name] = {}
-
-                rfinish = rate_script["finish_date"]
-                if rfinish is None:
-                    raise BadRequest(
-                        f"For the industry rate {contract_name} the finish_date can't "
-                        f"be null."
-                    )
-                for dt in hh_range(report_context, rate_script["start_date"], rfinish):
-                    cont_cache[dt] = PropDict(
-                        "scenario properties", rate_script["script"]
-                    )
+            scenario_fill_cache(report_context, sess, scenario_props)
 
             by_hh = scenario_props.get("by_hh", False)
             org_header_titles = [

chellow/reports/report_59.py

@@ -16,7 +16,7 @@ from werkzeug.exceptions import BadRequest
 
 from chellow.dloads import open_file
 from chellow.e.computer import contract_func, forecast_date
-from chellow.e.scenario import make_calcs, make_site_deltas
+from chellow.e.scenario import make_calcs, make_site_deltas, scenario_fill_cache
 from chellow.models import (
     Bill,
     Contract,
@@ -34,7 +34,6 @@ from chellow.models import (
 )
 from chellow.utils import (
     HH,
-    PropDict,
     c_months_u,
     ct_datetime,
     ct_datetime_now,
@@ -716,21 +715,6 @@ def content(
 ):
     report_context = {}
 
-    try:
-        comp = report_context["computer"]
-    except KeyError:
-        comp = report_context["computer"] = {}
-
-    try:
-        rate_cache = comp["rates"]
-    except KeyError:
-        rate_cache = comp["rates"] = {}
-
-    try:
-        ind_cont = report_context["contract_names"]
-    except KeyError:
-        ind_cont = report_context["contract_names"] = {}
-
     rsess = rf = None
     site_rows = []
     supply_rows = []
@@ -786,55 +770,7 @@ def content(
 
             user = User.get_by_id(rsess, user_id)
             rf = open_file("_".join(base_name) + ".ods", user, mode="wb")
-
-            for rate_script in scenario_props.get("rates", []):
-                contract_id = rate_script["contract_id"]
-                try:
-                    cont_cache = rate_cache[contract_id]
-                except KeyError:
-                    cont_cache = rate_cache[contract_id] = {}
-
-                try:
-                    rate_script_start = rate_script["start_date"]
-                except KeyError:
-                    raise BadRequest(
-                        f"Problem in the scenario properties. Can't find the "
-                        f"'start_date' key of the contract {contract_id} in the "
-                        f"'rates' map."
-                    )
-
-                try:
-                    rate_script_start = rate_script["start_date"]
-                except KeyError:
-                    raise BadRequest(
-                        f"Problem in the scenario properties. Can't find the "
-                        f"'start_date' key of the contract {contract_id} in the "
-                        f"'rates' map."
-                    )
-
-                props = PropDict("scenario properties", rate_script["script"])
-                for dt in hh_range(
-                    report_context, rate_script_start, rate_script["finish_date"]
-                ):
-                    cont_cache[dt] = props
-
-            for rate_script in scenario_props.get("industry_rates", []):
-                contract_name = rate_script["contract_name"]
-                try:
-                    cont_cache = ind_cont[contract_name]
-                except KeyError:
-                    cont_cache = ind_cont[contract_name] = {}
-
-                rfinish = rate_script["finish_date"]
-                if rfinish is None:
-                    raise BadRequest(
-                        f"For the industry rate {contract_name} the finish_date can't "
-                        f"be null."
-                    )
-                for dt in hh_range(report_context, rate_script["start_date"], rfinish):
-                    cont_cache[dt] = PropDict(
-                        "scenario properties", rate_script["script"]
-                    )
+            scenario_fill_cache(report_context, rsess, scenario_props)
 
             by_hh = scenario_props.get("by_hh", False)
             is_bill_check = scenario_props.get("is_bill_check", False)

{chellow-1729849426.0.0.dist-info → chellow-1730296955.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1729849426.0.0
+Version: 1730296955.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)
@@ -22,7 +22,7 @@ Requires-Dist: python-dateutil==2.8.2
 Requires-Dist: pytz==2022.6
 Requires-Dist: requests==2.32.2
 Requires-Dist: sqlalchemy==2.0.30
-Requires-Dist: waitress==2.1.2
+Requires-Dist: waitress==3.0.1
 Requires-Dist: xlrd==2.0.1
 Requires-Dist: zish==0.1.11
 Description-Content-Type: text/markdown

{chellow-1729849426.0.0.dist-info → chellow-1730296955.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=24aBfC-aYoTseRwQSNRAb1PwTKp0zL9aispceL8drcU,67469
+chellow/e/computer.py,sha256=jslEeLsSHbu4l95WDIHCytL2Fced-kLtyxZtvm2WEtg,67597
 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
@@ -38,10 +38,10 @@ chellow/e/lcc.py,sha256=OkpynN8_iAdHRlu-yyU6BhRUqYYOZsUnl0HbHULYo_4,4670
 chellow/e/mdd_importer.py,sha256=NugJr2JhuzkPTsEMl_5UdQuw5K2p8lVJ-hyz4MK6Hfg,35762
 chellow/e/rcrc.py,sha256=92CA1uIotIHd1epQ_jEPdJKzXqDFV-AoJOJeRO6MEyA,4274
 chellow/e/ro.py,sha256=dZKZv_9wXSWuwcb3jiKavoD_9ot-PZseNVeEEe0siLo,596
-chellow/e/scenario.py,sha256=86DQIJ6ZK2XYIisHw6DafGcfwo1iPWF1t9rByy2yxbg,23396
+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/tnuos.py,sha256=XseYztPUsQXNKuBmystO2kzzwAG9ehCZgpGBTdgSk-A,4313
+chellow/e/tnuos.py,sha256=NBmc-f3oezrl4gviAKobljHfICTpBKxxxEGBGJi_lRk,4927
 chellow/e/triad.py,sha256=lIQj7EdUrcFwEqleuHZXYU_bfzIwNOqUVVxB3NPQt4A,13710
 chellow/e/views.py,sha256=ZISAhDQZHM8j0VKdMOqfNBtwSLTE9c0OtnsGVCaT0kE,216706
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -84,14 +84,14 @@ chellow/reports/report_219.py,sha256=cA0lfJKnJg41Zc4_gZB1KUXZ9JeJo0TiTlu5jm1bdDM
 chellow/reports/report_231.py,sha256=uhO1algP7sibpZVaniqGs56HOCPCQeDO-Y-UfvFQwnI,5311
 chellow/reports/report_233.py,sha256=HJRn4wH7RsYIduD2MNZYjFTbgb5LIu8_-jmUuRc0Q6Y,5016
 chellow/reports/report_241.py,sha256=AlFmSHnfG2HWv_ICmWX7fNpPwLHjq7mo1QtOTjSKO3k,5384
-chellow/reports/report_247.py,sha256=kIHXNyXnmL0eZe-o8YvgiF0ZnlzdXF7KDz4r0pcHszk,46965
+chellow/reports/report_247.py,sha256=eQurEZB51uucdpvBRZ8riOTRs55px4hMo1r3BBeo4Uw,44550
 chellow/reports/report_29.py,sha256=KDFjgrLBv4WbG9efCdu_geMR7gT_QV9N97Wfdt7aDc4,2736
 chellow/reports/report_291.py,sha256=rqBXy6s7hMeYWw-yNX6w_L5t2yz6rNEeos_4xO7wf90,7519
 chellow/reports/report_33.py,sha256=laVz-itDbJTdvC6LxLEeuY0eKpYx43Un4adiExPTEEE,16730
 chellow/reports/report_387.py,sha256=kmBZopb0AOivcowO2nPjRj6LnV0_QjCDXLwqPL7IGVE,5672
 chellow/reports/report_41.py,sha256=QQeTshA1Og7N3wPaoZ8ynJzwsvZ1mgSFc7DDkVqIZoM,7447
 chellow/reports/report_429.py,sha256=8WlLqyfMyvIF5Kc6CE0MKwcT5xwmR_Ao99Ef72yAOVc,12668
-chellow/reports/report_59.py,sha256=BPeXKF3BJFDY6tsP2-SehBGKXO_t_uRX7MwVgyNbDpo,44677
+chellow/reports/report_59.py,sha256=3N5I9U-nqNGKz39IdBTyDMlb_-srwpo_0kwn9viQnYs,42262
 chellow/reports/report_81.py,sha256=NkT6dZeMo7Z0AkJemD_Xv8Ut5PIZ9vn8Ia1Q_DS9v54,5611
 chellow/reports/report_87.py,sha256=j2gdBOapaVY1ZnlNlw14RPx58_k8eUkc3oRSnKuCsNA,7057
 chellow/reports/report_asset_comparison.py,sha256=UN298MHuzyUDUiiZr7F_Ua6SrdVOlFLjgKjnIbrA-14,6118
@@ -377,6 +377,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-1729849426.0.0.dist-info/METADATA,sha256=l0ROSjJXuLVti1C4484g9I-i6_O6pR1RNfgQk2uICCM,12204
-chellow-1729849426.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1729849426.0.0.dist-info/RECORD,,
+chellow-1730296955.0.0.dist-info/METADATA,sha256=EWZqlbrVtZnK0QYT9y6umoxEQNWbIAPMBYFWvnPr9WU,12204
+chellow-1730296955.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1730296955.0.0.dist-info/RECORD,,