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

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/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/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/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: {
 		},
   },

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1729760318.0.0
+Version: 1729849426.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-1729760318.0.0.dist-info → chellow-1729849426.0.0.dist-info}/RECORD

@@ -70,7 +70,7 @@ chellow/gas/bill_parser_total_edi.py,sha256=bMAeIkzHwNhv0qdKYXtRl-tzUUYtjNkbM3PM
 chellow/gas/ccl.py,sha256=DMlcPUELZi00CaDekVJINYk3GgH5apFrImVdmkbyba0,2913
 chellow/gas/cv.py,sha256=4cdYYQ8Qak6NeYdBCB4YaQ0jX8-UkaydIIdibCQuXxM,7344
 chellow/gas/dn_rate_parser.py,sha256=Mq8rAcUEUxIQOks59bsCKl8GrefvoHbrTCHqon9N0z0,11340
-chellow/gas/engine.py,sha256=jT7m6vddi5GnWd51wCYEVhBS-LZEn1T9ggZX7Y9HGK0,25263
+chellow/gas/engine.py,sha256=NR96BtZKVYQ8hnZVb5oZelb8IhaxupyovNWoHK5ZhTk,25355
 chellow/gas/transportation.py,sha256=Bkg8TWOs-v0ES-4qqwbleiOhqbE_t2KauUx9JYMZELM,5300
 chellow/gas/views.py,sha256=R4Ky8syioWSQJLTuSKVLsc266eDv8a6WEo_e60u_4ug,59021
 chellow/reports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -101,7 +101,7 @@ chellow/reports/report_csv_llfcs.py,sha256=OHSbP64lQ6dlAMcQYgvdANlA4lQyF0iBlwk7V
 chellow/reports/report_csv_site_hh_data.py,sha256=yWhEoGGyg_ctM8T55raksTPRJ5ycVO6lVfUx5tRBzTQ,4372
 chellow/reports/report_csv_site_snags.py,sha256=gG2sYQrLoIBwCoMUC8rhmAL7Kffh_rvNb9UOX7cYDko,2668
 chellow/reports/report_ecoes_comparison.py,sha256=CaeMCpLifP-kh2O9MZPs0EYf4UqksL-xFjwki41DTRA,21444
-chellow/reports/report_g_monthly_duration.py,sha256=0b2ze1qW0jSVTEGQhJAg0s42AvkeqjMGNge4OQTIm7s,15919
+chellow/reports/report_g_monthly_duration.py,sha256=I1MsLr-VD6VczRB8YrDGuTXVXv_iKpBZiCA7DLqZQQc,18305
 chellow/reports/report_g_supplies_snapshot.py,sha256=0M0x_0o0985Hu45gUJJJwzfx0DDOAuXBJ1UVUDbQ36g,4718
 chellow/reports/report_g_supply_virtual_bill.py,sha256=x_KtQ02dwgmXvAEUXJ1poK0BRwqxa-GcbJ5pddEina0,3694
 chellow/reports/report_g_virtual_bills.py,sha256=t3hmTiURk1E_mPucIboCdPBlSLapDIUdHYRpVTFtJgw,4569
@@ -147,9 +147,9 @@ chellow/templates/report_run_row.html,sha256=bmtcdqJaS1CXpL0i8PuqvmeF98jKNYX5-mn
 chellow/templates/report_run_row_bill_check.html,sha256=aC2LMu_6NvmTN3ZdxHJPPPczyxPN6hg0F-PPcqIWUws,4683
 chellow/templates/report_run_supply_contacts.html,sha256=JNzwz9M6qbLRDMkCzFCxxANapUer5klxo7t5a48nAzg,2117
 chellow/templates/report_runs.html,sha256=ecoIkl2WtfYtifiTxnslmpMGYYGVQW-CVSBpqhXyiE4,1131
-chellow/templates/scenario.html,sha256=eHXgCszqyPW7fzBH-nr25XpKbPj4FIobKRFv3G8uJFY,2010
+chellow/templates/scenario.html,sha256=tCoq1wBq4l9PRS-zFtPcCWXlxD_SSFvFFkERf4FWVNU,2055
 chellow/templates/scenario_add.html,sha256=xFTb9CaA-qV2iwnVqcS44vD8JlYatBQet8Rat4daU7A,512
-chellow/templates/scenario_docs.html,sha256=901ug6cOmcErEGOqY1H2wcVxl4KavD7-mZz12h3RRB4,6508
+chellow/templates/scenario_docs.html,sha256=0YP_h8GYkqCFLBoCj2w4PE4Js15DT_WoxYlK9nRSMlA,6949
 chellow/templates/scenario_edit.html,sha256=x2Eicq_eFs7ax2EtL4GrD73qKF-LhN41OQdPFbDivrc,1060
 chellow/templates/scenarios.html,sha256=FIDOSWs9VO_3bJkQoNHh-DdRzVfUyJGK9WbdEHRxxdM,841
 chellow/templates/site.html,sha256=dj0VgcmjaKJHuTOZDESO2E2MOyluYJtx4YaSOaWOkwU,10024
@@ -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-1729760318.0.0.dist-info/METADATA,sha256=cFK5LJ_vPjWeg5bxXRe_rjFj0EZVUMaR6PP9UKfrwAs,12204
-chellow-1729760318.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1729760318.0.0.dist-info/RECORD,,
+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,,