chellow 1729760318.0.0__tar.gz → 1730108364.0.0__tar.gz

{chellow-1729760318.0.0 → chellow-1730108364.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1729760318.0.0
+Version: 1730108364.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-1730108364.0.0/VERSION

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

{chellow-1729760318.0.0 → chellow-1730108364.0.0}/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-1729760318.0.0 → chellow-1730108364.0.0}/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-1729760318.0.0 → chellow-1730108364.0.0}/chellow/gas/engine.py

@@ -76,8 +76,14 @@ def get_g_engine_cache(caches, name):
     try:
         return caches["g_engine"][name]
     except KeyError:
-        caches["g_engine"] = defaultdict(dict)
-        return caches["g_engine"][name]
+        try:
+            gcache = caches["g_engine"]
+        except KeyError:
+            gcache = caches["g_enine"] = {}
+
+        cache = gcache[name] = {}
+
+        return cache
 
 
 def g_contract_func(caches, contract, func_name):

{chellow-1729760318.0.0 → chellow-1730108364.0.0}/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-1729760318.0.0 → chellow-1730108364.0.0}/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-1729760318.0.0 → chellow-1730108364.0.0}/chellow/reports/report_g_monthly_duration.py

@@ -14,7 +14,7 @@ from werkzeug.exceptions import BadRequest
 import chellow.e.computer
 from chellow.dloads import open_file
 from chellow.e.computer import contract_func, forecast_date
-from chellow.gas.engine import GDataSource
+from chellow.gas.engine import GDataSource, g_rates
 from chellow.models import (
     GBill,
     GContract,
@@ -28,11 +28,13 @@ from chellow.models import (
     User,
 )
 from chellow.utils import (
+    PropDict,
     c_months_c,
     c_months_u,
     hh_format,
     hh_max,
     hh_min,
+    hh_range,
     make_val,
     req_bool,
     req_int,
@@ -162,6 +164,16 @@ def _process_era(
 
 def content(scenario_props, user_id, compression, now, base_name):
     report_context = {}
+    try:
+        eng = report_context["g_engine"]
+    except KeyError:
+        eng = report_context["g_engine"] = {}
+
+    try:
+        rss_cache = eng["rates"]
+    except KeyError:
+        rss_cache = eng["rates"] = {}
+
     try:
         with RSession() as sess:
             start_year = scenario_props["scenario_start_year"]
@@ -197,7 +209,7 @@ def content(scenario_props, user_id, compression, now, base_name):
             else:
                 forecast_from = to_utc(forecast_from)
 
-            sites = sess.query(Site).distinct().order_by(Site.code)
+            sites = select(Site).join(SiteGEra).distinct().order_by(Site.code)
 
             mprns = scenario_props.get("mprns")
             g_supply_ids = None
@@ -214,10 +226,7 @@ def content(scenario_props, user_id, compression, now, base_name):
                     base_name.append("mprns")
 
                 sites = (
-                    sites.join(SiteGEra)
-                    .join(GEra)
-                    .join(GSupply)
-                    .where(GSupply.id.in_(g_supply_ids))
+                    sites.join(GEra).join(GSupply).where(GSupply.id.in_(g_supply_ids))
                 )
 
             site_codes = scenario_props.get("site_codes")
@@ -229,6 +238,53 @@ def content(scenario_props, user_id, compression, now, base_name):
                     base_name.append("sitecodes")
                 sites = sites.where(Site.code.in_(site_codes))
 
+            for is_industry, rates_prop in (
+                (True, "industry_rates"),
+                (False, "supplier_rates"),
+            ):
+
+                for rate_script in scenario_props.get(rates_prop, []):
+                    g_contract_id = rate_script["g_contract_id"]
+                    try:
+                        i_cache = rss_cache[is_industry]
+                    except KeyError:
+                        i_cache = rss_cache[is_industry] = {}
+
+                    try:
+                        cont_cache = i_cache[g_contract_id]
+                    except KeyError:
+                        cont_cache = i_cache[g_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 {g_contract_id} in the "
+                            f"'{rates_prop}' map."
+                        )
+
+                    try:
+                        rate_script_finish = rate_script["finish_date"]
+                    except KeyError:
+                        raise BadRequest(
+                            f"Problem in the scenario properties. Can't find the "
+                            f"'finish_date' key of the contract {g_contract_id} in the "
+                            f"'{rates_prop}' map."
+                        )
+
+                    for dt in hh_range(
+                        report_context, rate_script_start, rate_script_finish
+                    ):
+                        g_rates(sess, report_context, g_contract_id, dt, is_industry)
+
+                    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)
+
             user = User.get_by_id(sess, user_id)
             fname = "_".join(base_name) + ".ods"
             rf = open_file(fname, user, mode="wb")
@@ -279,7 +335,7 @@ def content(scenario_props, user_id, compression, now, base_name):
                 sess.query(GContract)
                 .join(GEra)
                 .join(GSupply)
-                .filter(
+                .where(
                     GEra.start_date <= finish_date,
                     or_(GEra.finish_date == null(), GEra.finish_date >= start_date),
                 )
@@ -318,9 +374,13 @@ def content(scenario_props, user_id, compression, now, base_name):
                     "billed_vat_gbp": 0,
                     "billed_gross_gbp": 0,
                 }
-                for site in sites.filter(
-                    GEra.start_date <= month_finish,
-                    or_(GEra.finish_date == null(), GEra.finish_date >= month_start),
+                for site in sess.scalars(
+                    sites.where(
+                        GEra.start_date <= month_finish,
+                        or_(
+                            GEra.finish_date == null(), GEra.finish_date >= month_start
+                        ),
+                    )
                 ):
                     linked_sites = {
                         s.code

{chellow-1729760318.0.0 → chellow-1730108364.0.0}/chellow/templates/scenario.html

@@ -15,9 +15,9 @@
 			<legend>Run With Monthly Duration</legend>
 			<fieldset>
 				<input type="hidden" name="scenario_id" value="{{scenario.id}}">
-				<label>Months</label> {{input_text('months', '1', 2, 2)}}
+				<label>Months</label> {{input_text('months', initial=scenario_duration, size=2, maxlength=2)}}
 				<label>Finish Month</label>
-				{{input_date('finish', month_finish, resolution='month')}}
+				{{input_date('finish', scenario_finish_date, resolution='month')}}
 				<input type="submit" value="Run">
 			</fieldset>
 		</form>

{chellow-1729760318.0.0 → chellow-1730108364.0.0}/chellow/templates/scenario_docs.html

@@ -224,11 +224,11 @@
       "XJJK4",
   ],
 
-  /* Rates */
+  /* Supplier Rates */
 
-  "rates": [
+  "supplier_rates": [
     {
-      "contract_id": 46,
+      "g_contract_id": 46,
       "start_date": 2014-10-01T00:00:00Z,
       "finish_date": 2015-05-01T00:00:00Z,
       "script": {
@@ -237,7 +237,7 @@
     },
 
     {
-      "contract_id": 3,
+      "g_contract_id": 3,
       "start_date": 2015-01-01T00:00:00Z,
       "finish_date": 2015-03-01T00:00:00Z,
       "script": {
@@ -246,8 +246,29 @@
     }
   ],
 
+  /* Industry Rates */
 
-  "era_maps": {
+  "industry_rates": [
+    {
+      "g_contract_id": 46,
+      "start_date": 2014-10-01T00:00:00Z,
+      "finish_date": 2015-05-01T00:00:00Z,
+      "script": {
+        "gbp_per_msp_kwh": 0.667
+      }
+    },
+
+    {
+      "g_contract_id": 3,
+      "start_date": 2015-01-01T00:00:00Z,
+      "finish_date": 2015-03-01T00:00:00Z,
+      "script": {
+        "gbp_per_gsp_kwh": 5.77
+      }
+    }
+  ],
+
+  "g_era_maps": {
     2012-09-01T00:00:00Z: {
 		},
   },