chellow 1682689432.0.0__py3-none-any.whl → 1682692302.0.0__py3-none-any.whl

chellow/e/tnuos.py

@@ -1,7 +1,10 @@
+from datetime import datetime as Datetime, timedelta as Timedelta
 from decimal import Decimal, InvalidOperation
+from io import BytesIO
 
 from dateutil.relativedelta import relativedelta
 
+from pypdf import PdfReader
 
 from sqlalchemy import null, or_, select
 
@@ -11,10 +14,12 @@ import chellow.e.computer
 import chellow.e.duos
 from chellow.models import Contract, RateScript
 from chellow.national_grid import api_get
+from chellow.rate_server import download
 from chellow.utils import (
     c_months_u,
     ct_datetime,
     hh_after,
+    hh_format,
     hh_min,
     to_ct,
     to_utc,
@@ -514,3 +519,66 @@ def ng_import_triad(sess, log, set_progress, s):
 
     log("Finished TNUoS TRIAD Tariffs")
     sess.commit()
+
+
+def _find_triad_dates(file_name, file_like):
+    dates = []
+    rate_script = {"a_file_name": file_name, "triad_dates": dates}
+
+    reader = PdfReader(file_like)
+    in_table = False
+    for page in reader.pages:
+        for line in page.extract_text().splitlines():
+            if in_table:
+                date_str, period_str, _ = line.split()
+                date = Datetime.strptime(date_str, "%d/%m/%Y")
+                delta = Timedelta(minutes=30) * (int(period_str) - 1)
+                dates.append(to_utc(to_ct(date + delta)))
+                if len(dates) == 3:
+                    in_table = False
+            else:
+                if "Demand (MW)" in line:
+                    in_table = True
+
+    return rate_script
+
+
+def rate_server_import(sess, log, set_progress, s, paths):
+    log("Starting to check for new TNUoS triad date PDFs")
+
+    year_entries = {}
+    for path, url in paths:
+        if len(path) == 4:
+            year, utility, rate_type, file_name = path
+            if utility == "electricity" and rate_type == "tnuos":
+                try:
+                    fl_entries = year_entries[year]
+                except KeyError:
+                    fl_entries = year_entries[year] = {}
+
+                fl_entries[file_name] = url
+
+    for year, year_pdfs in sorted(year_entries.items()):
+        year_start = to_utc(ct_datetime(year, 4, 1))
+        contract = Contract.get_non_core_by_name(sess, "triad_dates")
+        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_pdfs) > 0:
+            file_name, url = sorted(year_pdfs.items())[-1]
+
+            rs_script = rs.make_script()
+            if rs_script.get("a_file_name") != file_name:
+                rs.update(_find_triad_dates(file_name, BytesIO(download(s, url))))
+                log(f"Updated triad dates rate script for {hh_format(year_start)}")
+
+    log("Finished TNUoS triad dates PDFs")
+    sess.commit()

chellow/rate_server.py

@@ -72,8 +72,13 @@ def run_import(sess, log, set_progress):
     paths_list = []
     for sub_entry in tree_entry["tree"]:
         path = sub_entry["path"].split("/")
-        if path[-1] != "README.md":
-            paths_list.append((path, sub_entry["url"]))
+        if path[-1] == "README.md":
+            continue
+        if len(path) == 1 and path[0] == "LICENSE":
+            continue
+
+        path[0] = int(path[0])
+        paths_list.append((tuple(path), sub_entry["url"]))
 
     paths = tuple(paths_list)
 
@@ -82,6 +87,7 @@ def run_import(sess, log, set_progress):
         "chellow.e.dno_rate_parser",
         "chellow.e.laf_import",
         "chellow.e.mdd_importer",
+        "chellow.e.tnuos",
         "chellow.gas.dn_rate_parser",
     ):
         mod = import_module(mod_name)

chellow/templates/non_core_contract.html

@@ -19,6 +19,10 @@
 		<p>
 			<a href="/national_grid">Automatic Importer</a>
 		</p>
+	{% elif contract.name == 'triad_dates' %}
+		<p>
+			<a href="/rate_server">Automatic Importer</a>
+		</p>
 	{% endif %}
 
 

chellow/templates/rate_server.html

@@ -100,7 +100,7 @@
 					</td>
 				</tr>
 				<tr>
-					<th>TNUoS Spreadsheet</th>
+					<th>TRIAD Dates PDFs</th>
 					<td>
 						<table>
 							<thead>
@@ -110,7 +110,7 @@
 								</tr>
 							</thead>
 							<tbody>
-								{% for rs in tnuos_rs %}
+								{% for rs in triad_dates_rs %}
 									{% set script = rs.make_script() %}
 									<tr>
 										<td>{{rs.start_date|hh_format}}</td>

chellow/views.py

@@ -2176,17 +2176,6 @@ def rate_server_get():
         .where(MarketRole.code == "R", RateScript.start_date >= fy_start)
         .order_by(Contract.name, RateScript.start_date.desc())
     ).scalars()
-    tnuos_rs = g.sess.execute(
-        select(RateScript)
-        .join(RateScript.contract)
-        .join(MarketRole)
-        .where(
-            MarketRole.code == "Z",
-            RateScript.start_date >= fy_start,
-            Contract.name == "tnuos",
-        )
-        .order_by(RateScript.start_date.desc())
-    ).scalars()
     nts_rs = g.sess.execute(
         select(GRateScript)
         .join(GRateScript.g_contract)
@@ -2218,6 +2207,17 @@ def rate_server_get():
         )
         .order_by(RateScript.start_date.desc())
     ).scalars()
+    triad_dates_rs = g.sess.execute(
+        select(RateScript)
+        .join(RateScript.contract)
+        .join(MarketRole)
+        .where(
+            MarketRole.code == "Z",
+            RateScript.start_date >= fy_start,
+            Contract.name == "triad_dates",
+        )
+        .order_by(RateScript.start_date.desc())
+    ).scalars()
 
     return render_template(
         "rate_server.html",
@@ -2225,10 +2225,10 @@ def rate_server_get():
         config_state=config.make_state(),
         config_properties=props.get("rate_server", {}),
         dno_rs=dno_rs,
-        tnuos_rs=tnuos_rs,
         nts_rs=nts_rs,
         dn_rs=dn_rs,
         bsuos_rs=bsuos_rs,
+        triad_dates_rs=triad_dates_rs,
     )
 
 

{chellow-1682689432.0.0.dist-info → chellow-1682692302.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chellow
-Version: 1682689432.0.0
+Version: 1682692302.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-1682689432.0.0.dist-info → chellow-1682692302.0.0.dist-info}/RECORD

@@ -8,10 +8,10 @@ chellow/general_import.py,sha256=Xuiwl-yeM0MCmPstzQR2E6ASs8sYE8b1GNeDLStnizY,584
 chellow/models.py,sha256=UhVekL4GM_4zs6ZGu83QFssyEMbwLHWerT1dWcby-ps,233497
 chellow/national_grid.py,sha256=0lckRMF-udVa0VWzCOlcHx36Su0628fI4Fkvk2ttUWo,4409
 chellow/proxy.py,sha256=Mzssi9nTf6s_G4RSn8k5oAHqzVYIxMsfbudj1amYucI,1387
-chellow/rate_server.py,sha256=iW8cIDSr_fHvxJz5506ua6UxWnJ92zb2vRBmeoP36qk,5540
+chellow/rate_server.py,sha256=xVk15pdSovcD8K8BWcOmjwo_L3a8LYry7L2Gvw56OEQ,5696
 chellow/testing.py,sha256=1TvNEPjX_VRPDifJWRFJw_8gg0RCsEpYVHkspQ1diJw,3913
 chellow/utils.py,sha256=IHC4Pcd_9CRbmJXAOlDvTyAcUoaWeLSH37zgjqVYYl4,18981
-chellow/views.py,sha256=EB4Af5F3alq-98iPdlTUh09bJWP9a1SMNX-vhmJr2AQ,83449
+chellow/views.py,sha256=27TKAL-nYQg26I4bMaTW3r4U8x2eDwhzBlVJR9_y2VY,83473
 chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/aahedc.py,sha256=DUrYAlrn4jzf6y6C2wivxlFosdVIibG69BWy_KMekGM,706
 chellow/e/bill_importer.py,sha256=BHrQkcvlOh27k0KexHA8nWJGcHGGpewbkkpncmxbAc4,7183
@@ -33,7 +33,7 @@ chellow/e/ro.py,sha256=A74nFxitFCZ-oLmYzPza54e328VKcqv8L2wVGilaUjA,696
 chellow/e/scenario.py,sha256=IuyE494XaBLq3FW7NdJePD6J4cTzPogfACO6dThiY00,23239
 chellow/e/system_price.py,sha256=IPBLSRPzGA3yca4tpR8PJemwPbgqVjn1WnljOMUyWnA,8145
 chellow/e/tlms.py,sha256=gXBZTHXqGVcaTGHaYGVA5Ir5pzoBDqFC1Kl1mQ0IDqU,9549
-chellow/e/tnuos.py,sha256=6T44N6Qg-w3lKnfl8R1vA1cwDZxnbVpce7L1G9u9FDU,16527
+chellow/e/tnuos.py,sha256=gFvNgibycspsyD3I8xxBWPjvyWJfkAiDRMbLenCpEgQ,18947
 chellow/e/views.py,sha256=5pp-sbUHaiQ1N0RgY73XQbHlqrZP3y64HrZgPTmFxE4,180225
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=v1s4O8phVJVn9sOs9HKrKYcECAP0ApnUgqCaa2ARYiQ,4234
@@ -117,14 +117,14 @@ chellow/templates/local_report.html,sha256=pV7_0QwyQ-D3OS9LXrly5pq3qprZnwTCoq6vC
 chellow/templates/local_reports.html,sha256=4wbfVkY4wUfSSfWjxqIsvCpIsa9k7H_dGAjznrG5jNM,701
 chellow/templates/national_grid.html,sha256=8W92tsjlqPSB0J--nyFIi-wzFae9CyDr6fODXLZp8ic,991
 chellow/templates/non_core_auto_importer.html,sha256=s9SluRN1bHTHjd8GP6uFhk6LrZYG8dqBG3y94zUKe5Q,944
-chellow/templates/non_core_contract.html,sha256=KXvAeOAmdHQ2bmtxX6UKEZ6yZEj29HmrvzCzBBQk2d8,1275
+chellow/templates/non_core_contract.html,sha256=BDld-pGs7OnBqc99i9H7WsPc5iBuyXY2AbIM3oUwxRE,1380
 chellow/templates/non_core_contract_edit.html,sha256=_EWwJdrez2uI2mA58Jf5WIYs7UfBw1xWV-Bpgliyurw,3005
 chellow/templates/non_core_contracts.html,sha256=vIrVdn4NUj58Uy17REs_fy2JBQzPkjcg63bg7q6kELg,661
 chellow/templates/non_core_rate_script.html,sha256=CqGnuWdzhk_o_2xNFcF8rgk0p7SNh0B0c3k1JzOtn98,1283
 chellow/templates/non_core_rate_script_add.html,sha256=Qx8_cYFRQZrXSyR3uf_8OxUAUz3PqyYc4V11lTU18sE,690
 chellow/templates/non_core_rate_script_edit.html,sha256=14jFqalqmFg9_2LUlEy7Q4yUx4pVGTHc9fbYnpm-3Y8,1868
 chellow/templates/object_summary.html,sha256=VGCAAYcWTzgNfL0mxEef2Fa8dP3FcBhzj0fmF82_S4I,244
-chellow/templates/rate_server.html,sha256=ISul3S3C5_TYtMXJeHMqpcsPEa5Ky7uoRw0DPcR65Wc,4455
+chellow/templates/rate_server.html,sha256=4f6V8PRW-bn2BQxX-BZqNQZf1w6GJPD-L4AxpSGQWZE,4460
 chellow/templates/report_run.html,sha256=O_wjIu43S-mKVyZyku3dJJdvyck3rAgEdhw59TsCcK0,4040
 chellow/templates/report_run_asset_comparison.html,sha256=VYCCUmIC7Mfe7uuaAHb6ihiK6zsqeTlQbzgtzLqR3zg,2305
 chellow/templates/report_run_bill_check.html,sha256=yAVFBi0zdamnlRpO2VqKY3UAmAJchSjwSmrmaITLmEA,5055
@@ -350,6 +350,6 @@ chellow/templates/g/supply_note_edit.html,sha256=6UQf_qbhFDys3cVsTp-c7ABWZpggW9R
 chellow/templates/g/supply_notes.html,sha256=WR3YwGh_qqTklSJ7JqWX6BKBc9rk_jMff4RiWZiF2CM,936
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1682689432.0.0.dist-info/METADATA,sha256=0geMd95rEXV3TRUMqtqJKO7sbtaeaOvE8JmQK90raKg,12160
-chellow-1682689432.0.0.dist-info/WHEEL,sha256=9MIigYJ7D5sOqAPqr0-o6tSMY_nQ7c6kvtvyeUB99YQ,87
-chellow-1682689432.0.0.dist-info/RECORD,,
+chellow-1682692302.0.0.dist-info/METADATA,sha256=26vUz8SeW-KBWcrEPeavVVdz4UXj1bBrTswrLk4Dytw,12160
+chellow-1682692302.0.0.dist-info/WHEEL,sha256=9MIigYJ7D5sOqAPqr0-o6tSMY_nQ7c6kvtvyeUB99YQ,87
+chellow-1682692302.0.0.dist-info/RECORD,,