chellow 1714148308.0.0__tar.gz → 1714396467.0.0__tar.gz

{chellow-1714148308.0.0 → chellow-1714396467.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1714148308.0.0
+Version: 1714396467.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-1714396467.0.0/VERSION

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

chellow-1714396467.0.0/chellow/e/ccl.py

@@ -0,0 +1,95 @@
+import json
+from decimal import Decimal
+from io import BytesIO
+from sqlalchemy import select
+
+from chellow.models import Contract, RateScript
+from chellow.rate_server import download
+from chellow.utils import ct_datetime, hh_format, to_utc
+
+
+def ccl(data_source):
+    try:
+        ccl_cache = data_source.caches["ccl"]
+    except KeyError:
+        ccl_cache = data_source.caches["ccl"] = {}
+
+    for hh in data_source.hh_data:
+        try:
+            rate = ccl_cache[hh["start-date"]]
+        except KeyError:
+            hh_start = hh["start-date"]
+            rates = data_source.non_core_rate("ccl", hh_start)
+            rate = ccl_cache[hh_start] = float(rates["ccl_gbp_per_msp_kwh"])
+
+        hh["ccl-kwh"] = hh["msp-kwh"]
+        hh["ccl-rate"] = rate
+        hh["ccl-gbp"] = hh["msp-kwh"] * rate
+
+
+def rate_server_import(sess, log, set_progress, s, paths):
+    log("Starting to check for new electricity CCL rates")
+    contract_name = "ccl"
+    contract = Contract.find_non_core_by_name(sess, contract_name)
+    if contract is None:
+        contract = Contract.insert_non_core(
+            sess,
+            contract_name,
+            "",
+            {"enabled": True},
+            to_utc(ct_datetime(1996, 4, 1)),
+            None,
+            {},
+        )
+        sess.commit()
+    contract_props = contract.make_properties()
+
+    if not contract_props.get("enabled", False):
+        log(
+            "The automatic importer is disabled. To enable it, edit "
+            "the contract properties to set 'enabled' to true."
+        )
+        return
+
+    year_entries = {}
+    for path, url in paths:
+        if len(path) == 4:
+            year, utility, rate_type, file_name = path
+            if utility == "electricity" and rate_type == "ccl":
+                try:
+                    fl_entries = year_entries[year]
+                except KeyError:
+                    fl_entries = year_entries[year] = {}
+
+                fl_entries[file_name] = url
+
+    for year, year_files in sorted(year_entries.items()):
+        year_start = to_utc(ct_datetime(year, 4, 1))
+        if year_start < contract.start_rate_script.start_date:
+            continue
+        rs = sess.execute(
+            select(RateScript).where(
+                RateScript.contract == contract,
+                RateScript.start_date == year_start,
+            )
+        ).scalar_one_or_none()
+        if rs is None:
+            rs = contract.insert_rate_script(sess, year_start, {})
+
+        if len(year_files) > 0:
+            file_name, url = sorted(year_files.items())[-1]
+
+            rs_script = rs.make_script()
+            if rs_script.get("a_file_name") != file_name:
+                log(
+                    f"Found new file {file_name} for rate script starting "
+                    f"{hh_format(year_start)}"
+                )
+                script = {"a_file_name": file_name}
+                server_j = json.load(BytesIO(download(s, url)))
+                script["ccl_gbp_per_msp_kwh"] = Decimal(server_j["ccl_gbp_per_msp_kwh"])
+                rs.update(script)
+                log(f"Updated CCL rate script for {hh_format(year_start)}")
+
+    log("Finished CCL rates")
+    sess.commit()

chellow-1714396467.0.0/chellow/gas/ccl.py

@@ -0,0 +1,92 @@
+import json
+from decimal import Decimal
+from io import BytesIO
+
+from sqlalchemy import select
+
+from chellow.gas.engine import g_rates
+from chellow.models import GContract, GRateScript
+from chellow.rate_server import download
+from chellow.utils import ct_datetime, hh_format, to_utc
+
+
+DAILY_THRESHOLD = 145
+
+
+def vb(ds):
+    for hh in ds.hh_data:
+        rate = float(
+            g_rates(ds.sess, ds.caches, "ccl", hh["start_date"], True)[
+                "ccl_gbp_per_kwh"
+            ]
+        )
+
+        hh["ccl"] = rate
+
+
+def rate_server_import(sess, log, set_progress, s, paths):
+    log("Starting to check for new gas CCL rates")
+    g_contract_name = "ccl"
+    g_contract = GContract.find_industry_by_name(sess, g_contract_name)
+    if g_contract is None:
+        g_contract = GContract.insert_industry(
+            sess,
+            g_contract_name,
+            "",
+            {"enabled": True},
+            to_utc(ct_datetime(1996, 4, 1)),
+            None,
+            {},
+        )
+        sess.commit()
+    g_contract_props = g_contract.make_properties()
+
+    if not g_contract_props.get("enabled", False):
+        log(
+            "The automatic importer is disabled. To enable it, edit "
+            "the contract properties to set 'enabled' to true."
+        )
+        return
+
+    year_entries = {}
+    for path, url in paths:
+        if len(path) == 4:
+            year, utility, rate_type, file_name = path
+            if utility == "gas" and rate_type == "ccl":
+                try:
+                    fl_entries = year_entries[year]
+                except KeyError:
+                    fl_entries = year_entries[year] = {}
+
+                fl_entries[file_name] = url
+
+    for year, year_files in sorted(year_entries.items()):
+        year_start = to_utc(ct_datetime(year, 4, 1))
+        if year_start < g_contract.start_g_rate_script.start_date:
+            continue
+        rs = sess.execute(
+            select(GRateScript).where(
+                GRateScript.g_contract == g_contract,
+                GRateScript.start_date == year_start,
+            )
+        ).scalar_one_or_none()
+        if rs is None:
+            rs = g_contract.insert_g_rate_script(sess, year_start, {})
+
+        if len(year_files) > 0:
+            file_name, url = sorted(year_files.items())[-1]
+
+            rs_script = rs.make_script()
+            if rs_script.get("a_file_name") != file_name:
+                log(
+                    f"Found new file {file_name} for rate script starting "
+                    f"{hh_format(year_start)}"
+                )
+                script = {"a_file_name": file_name}
+                server_j = json.load(BytesIO(download(s, url)))
+                script["ccl_gbp_per_kwh"] = Decimal(server_j["ccl_gbp_per_kwh"])
+                rs.update(script)
+                log(f"Updated CCL rate script for {hh_format(year_start)}")
+
+    log("Finished CCL rates")
+    sess.commit()

{chellow-1714148308.0.0 → chellow-1714396467.0.0}/chellow/gas/views.py

@@ -1213,7 +1213,7 @@ def industry_contract_edit_patch(g_contract_id):
             g_contract.update(name, charge_script, properties)
 
         g.sess.commit()
-        return chellow_redirect(f"/industry_contracts/{g_contract.id}", 204)
+        return hx_redirect(f"/industry_contracts/{g_contract.id}", 303)
     except BadRequest as e:
         flash(e.description)
         g.sess.rollback()

{chellow-1714148308.0.0 → chellow-1714396467.0.0}/chellow/rate_server.py

@@ -85,9 +85,11 @@ def run_import(sess, log, set_progress):
     for mod_name in (
         "chellow.e.mdd_importer",
         "chellow.e.bsuos",
+        "chellow.e.ccl",
         "chellow.e.dno_rate_parser",
         "chellow.e.laf_import",
         "chellow.e.triad",
+        "chellow.gas.ccl",
         "chellow.gas.dn_rate_parser",
     ):
         mod = import_module(mod_name)

{chellow-1714148308.0.0 → chellow-1714396467.0.0}/chellow/templates/base.html

@@ -97,7 +97,7 @@
 									</li>
 									<li><a href="/e/meter_types" title="Meter Types">Meter Types</a></li>
 									<li>
-										<a href="/dtc_meter_types" title="DTC Meter Types">DTC Meter Types</a>
+										<a href="/e/dtc_meter_types" title="DTC Meter Types">DTC Meter Types</a>
 									</li>
 									<li>
 										<a href="/e/meter_payment_types" title="Meter Payments Types"

{chellow-1714148308.0.0 → chellow-1714396467.0.0}/chellow/templates/rate_server.html

@@ -143,6 +143,28 @@
 						</table>
 					</td>
 				</tr>
+				<tr>
+					<th>CCL</th>
+					<td>
+						<table>
+							<thead>
+								<tr>
+									<th>Start Date</th>
+									<th>File Name</th>
+								</tr>
+							</thead>
+							<tbody>
+								{% for rs in ccl_rs %}
+									{% set script = rs.make_script() %}
+									<tr>
+										<td>{{rs.start_date|hh_format}}</td>
+										<td>{{script.a_file_name}}</td>
+									</tr>
+								{% endfor %}
+							</tbody>
+						</table>
+					</td>
+				</tr>
 			</tbody>
 		</table>
 
@@ -193,6 +215,28 @@
 						</table>
 					</td>
 				</tr>
+				<tr>
+					<th>CCL</th>
+					<td>
+						<table>
+							<thead>
+								<tr>
+									<th>Start Date</th>
+									<th>File Name</th>
+								</tr>
+							</thead>
+							<tbody>
+								{% for rs in gas_ccl_rs %}
+									{% set script = rs.make_script() %}
+									<tr>
+										<td>{{rs.start_date|hh_format}}</td>
+										<td>{{script.a_file_name}}</td>
+									</tr>
+								{% endfor %}
+							</tbody>
+						</table>
+					</td>
+				</tr>
 			</tbody>
 		</table>
 

{chellow-1714148308.0.0 → chellow-1714396467.0.0}/chellow/views.py

@@ -2056,6 +2056,17 @@ def rate_server_get():
         )
         .order_by(RateScript.start_date.desc())
     ).scalars()
+    ccl_rs = g.sess.execute(
+        select(RateScript)
+        .join(RateScript.contract)
+        .join(MarketRole)
+        .where(
+            MarketRole.code == "Z",
+            RateScript.start_date >= fy_start,
+            Contract.name == "ccl",
+        )
+        .order_by(RateScript.start_date.desc())
+    ).scalars()
     triad_dates_rs = g.sess.execute(
         select(RateScript)
         .join(RateScript.contract)
@@ -2067,6 +2078,16 @@ def rate_server_get():
         )
         .order_by(RateScript.start_date.desc())
     ).scalars()
+    gas_ccl_rs = g.sess.execute(
+        select(GRateScript)
+        .join(GRateScript.g_contract)
+        .where(
+            GContract.is_industry == true(),
+            GRateScript.start_date >= fy_start,
+            GContract.name == "ccl",
+        )
+        .order_by(GRateScript.start_date.desc())
+    ).scalars()
 
     return render_template(
         "rate_server.html",
@@ -2078,6 +2099,8 @@ def rate_server_get():
         dn_rs=dn_rs,
         bsuos_rs=bsuos_rs,
         triad_dates_rs=triad_dates_rs,
+        gas_ccl_rs=gas_ccl_rs,
+        ccl_rs=ccl_rs,
     )
 
 

{chellow-1714148308.0.0 → chellow-1714396467.0.0}/test/gas/test_gas_views.py

@@ -662,7 +662,7 @@ def test_industry_contract_edit_patch(client, sess):
         "state": '{"hinderance": "sloth"}',
     }
     response = client.patch(f"/g/industry_contracts/{contract.id}/edit", data=data)
-    match(response, 204)
+    match(response, 303)
     response = client.get(f"/g/industry_contracts/{contract.id}")
     match(response, 200, ""hinderance": "sloth"")
 

chellow-1714148308.0.0/VERSION

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

chellow-1714148308.0.0/chellow/e/ccl.py

@@ -1,17 +0,0 @@
-def ccl(data_source):
-    try:
-        ccl_cache = data_source.caches["ccl"]
-    except KeyError:
-        ccl_cache = data_source.caches["ccl"] = {}
-
-    for hh in data_source.hh_data:
-        try:
-            rate = ccl_cache[hh["start-date"]]
-        except KeyError:
-            hh_start = hh["start-date"]
-            rates = data_source.non_core_rate("ccl", hh_start)
-            rate = ccl_cache[hh_start] = float(rates["ccl_gbp_per_msp_kwh"])
-
-        hh["ccl-kwh"] = hh["msp-kwh"]
-        hh["ccl-rate"] = rate
-        hh["ccl-gbp"] = hh["msp-kwh"] * rate

chellow-1714148308.0.0/chellow/gas/ccl.py

@@ -1,15 +0,0 @@
-from chellow.gas.engine import g_rates
-
-
-DAILY_THRESHOLD = 145
-
-
-def vb(ds):
-    for hh in ds.hh_data:
-        rate = float(
-            g_rates(ds.sess, ds.caches, "ccl", hh["start_date"], True)[
-                "ccl_gbp_per_kwh"
-            ]
-        )
-
-        hh["ccl"] = rate