chellow 1761056531.0.0__py3-none-any.whl → 1761297878.0.0__py3-none-any.whl

chellow/e/views.py

@@ -5711,7 +5711,7 @@ def supplier_contract_edit_delete(contract_id):
         contract = Contract.get_supplier_by_id(g.sess, contract_id)
         contract.delete(g.sess)
         g.sess.commit()
-        return chellow_redirect("/supplier_contracts", 303)
+        return hx_redirect("/supplier_contracts", 303)
     except BadRequest as e:
         g.sess.rollback()
         description = e.description
@@ -5882,25 +5882,39 @@ def supplier_rate_script_edit_get(rate_script_id):
     )
 
 
+@e.route("/supplier_rate_scripts/<int:rate_script_id>/edit", methods=["DELETE"])
+def supplier_rate_script_edit_delete(rate_script_id):
+    try:
+        rate_script = RateScript.get_supplier_by_id(g.sess, rate_script_id)
+        contract = rate_script.contract
+        contract.delete_rate_script(g.sess, rate_script)
+        g.sess.commit()
+        return hx_redirect(f"/supplier_contracts/{contract.id}", 303)
+    except BadRequest as e:
+        g.sess.rollback()
+        flash(e.description)
+        return make_response(
+            render_template(
+                "supplier_rate_script_edit.html", supplier_rate_script=rate_script
+            ),
+            400,
+        )
+
+
 @e.route("/supplier_rate_scripts/<int:rate_script_id>/edit", methods=["POST"])
 def supplier_rate_script_edit_post(rate_script_id):
     try:
         rate_script = RateScript.get_supplier_by_id(g.sess, rate_script_id)
         contract = rate_script.contract
-        if "delete" in request.values:
-            contract.delete_rate_script(g.sess, rate_script)
-            g.sess.commit()
-            return chellow_redirect(f"/supplier_contracts/{contract.id}", 303)
-        else:
-            script = req_zish("script")
-            start_date = req_date("start")
-            has_finished = req_bool("has_finished")
-            finish_date = req_date("finish") if has_finished else None
-            contract.update_rate_script(
-                g.sess, rate_script, start_date, finish_date, script
-            )
-            g.sess.commit()
-            return chellow_redirect(f"/supplier_rate_scripts/{rate_script.id}", 303)
+        script = req_zish("script")
+        start_date = req_date("start")
+        has_finished = req_bool("has_finished")
+        finish_date = req_date("finish") if has_finished else None
+        contract.update_rate_script(
+            g.sess, rate_script, start_date, finish_date, script
+        )
+        g.sess.commit()
+        return chellow_redirect(f"/supplier_rate_scripts/{rate_script.id}", 303)
     except BadRequest as e:
         g.sess.rollback()
         flash(e.description)

chellow/reports/report_channel_snags.py

@@ -5,7 +5,7 @@ import traceback
 
 from dateutil.relativedelta import relativedelta
 
-from flask import g, redirect, render_template
+from flask import g, redirect, render_template, request
 
 from sqlalchemy.orm import joinedload
 from sqlalchemy.sql.expression import false, select, true
@@ -29,6 +29,7 @@ from chellow.utils import (
     csv_make_val,
     hh_before,
     req_bool,
+    req_date,
     req_int,
     req_int_none,
     req_str,
@@ -160,6 +161,7 @@ def content(
     only_ongoing,
     show_settlement,
     days_long_hidden,
+    now,
 ):
     f = writer = None
     try:
@@ -192,7 +194,6 @@ def content(
             )
             writer.writerow(titles)
 
-            now = utc_datetime_now()
             for snag_group in _make_rows(
                 sess,
                 now,
@@ -246,6 +247,10 @@ def do_get(sess):
     show_settlement = req_str("show_settlement")
     as_csv = req_bool("as_csv")
     days_long_hidden = req_int_none("days_long_hidden")
+    if "now_year" in request.values:
+        now = req_date("now")
+    else:
+        now = utc_datetime_now()
 
     if as_csv:
         args = (
@@ -255,6 +260,7 @@ def do_get(sess):
             g.user.id,
             only_ongoing,
             show_settlement,
+            now,
         )
         threading.Thread(target=content, args=args).start()
         return redirect("/downloads", 303)

chellow/templates/e/supplier_contract_edit.html

@@ -12,41 +12,29 @@
 
 {% block content %}
 
-	{% if request.method == 'GET' and request.values.delete %}
-		<form method="post">
-			<fieldset>
-				<legend>Are you sure you want to delete this contract?</legend>	
-				<input type="submit" name="delete" value="Delete">
-				<a href="/e/supplier_contracts/{{contract.id}}/edit">Cancel</a>
-			</fieldset>
-		</form>
-	
-	{% else %}
-	
-		<form method="post">
-			<fieldset>
-				<legend>Update Contract</legend>	
-				<label>Party</label>
-				<select name="party_id">
-					{% for party in parties %}
-						{{ input_option('party_id', party.id, party.participant.code + ' : ' + party.name, contract.party.id) }}
-					{% endfor %}
-				</select>
-				<label>Name</label>
-				{{input_text('name', contract.name)}}
-				<label>Charge script</label>
-				{{input_textarea('charge_script', contract.charge_script, 40, 80)}}
-				<label>Properties</label>
-				{{input_textarea('properties', contract.properties, 20, 80)}}
-				<input type="submit" value="Update">
-			</fieldset>
-		</form>
+	<form method="post">
+		<fieldset>
+			<legend>Update Contract</legend>	
+			<label>Party</label>
+			<select name="party_id">
+				{% for party in parties %}
+					{{ input_option('party_id', party.id, party.participant.code + ' : ' + party.name, contract.party.id) }}
+				{% endfor %}
+			</select>
+			<label>Name</label>
+			{{input_text('name', contract.name)}}
+			<label>Charge script</label>
+			{{input_textarea('charge_script', contract.charge_script, 40, 80, show_pos=True)}}
+			<label>Properties</label>
+			{{input_textarea('properties', contract.properties, 20, 80)}}
+			<input type="submit" value="Update">
+		</fieldset>
+	</form>
 
-		<form>
-			<fieldset>
-				<legend>Delete this contract</legend>	
-				<input type="submit" name="delete" value="Delete">
-			</fieldset>
-		</form>
-	{% endif %}
+	<form hx-delete="/e/supplier_contracts/{{contract.id}}/edit" hx-confirm="Are you sure you want to delete this contract?">
+		<fieldset>
+			<legend>Delete this contract</legend>	
+			<input type="submit" name="delete" value="Delete">
+		</fieldset>
+	</form>
 {% endblock %}

chellow/templates/e/supplier_rate_script_edit.html

@@ -14,52 +14,37 @@
 {% endblock %}
 
 {% block content %}
-	{% if request.method == 'GET' and request.values.delete %}
-
-		<form method="post"
-				action="/e/supplier_rate_scripts/{{supplier_rate_script.id}}/edit">
-			<fieldset>
-				<legend>Are you sure you want to delete this rate script?</legend>	
-				<input type="submit" name="delete" value="Delete">
-				<a href="/supplier_rate_scripts/{{supplier_rate_script.id}}/edit">Cancel</a>
-			</fieldset>
-		</form>
-
-	{% else %}
-	
-		<form action="" method="post">
+	<form action="/e/supplier_rate_scripts/{{supplier_rate_script.id}}/edit" method="post">
+		<fieldset>
+			<legend>Update Rate Script</legend>	
 			<fieldset>
-				<legend>Update Rate Script</legend>	
-				<fieldset>
-					<legend>Start date</legend>
-					{{ input_date('start', supplier_rate_script.start_date) }}
-				</fieldset>
-				<fieldset>
-					<legend>Finish date</legend>
-					<label>
-						Ended?
-						{{input_checkbox('has_finished', supplier_rate_script.finish_date != None)}}
-					</label>
-					{{ input_date('finish', supplier_rate_script.finish_date) }}
-				</fieldset>
-				<label>Script</label>
-				{{ input_textarea(
-					'script', supplier_rate_script.script, 40, 80, show_pos=True) }}
-				<input type="submit" value="Update">
+				<legend>Start date</legend>
+				{{ input_date('start', supplier_rate_script.start_date) }}
 			</fieldset>
-		</form>
-
-		{% if rate_script_example %}
-				<h4>Example</h4>
-				<pre>{{rate_script_example}}</pre>
-		{% endif %}
-
-		<form>
 			<fieldset>
-				<legend>Delete this Rate Script</legend>	
-				<input type="submit" name="delete" value="Delete">
+				<legend>Finish date</legend>
+				<label>
+					Ended?
+					{{input_checkbox('has_finished', supplier_rate_script.finish_date != None)}}
+				</label>
+				{{ input_date('finish', supplier_rate_script.finish_date) }}
 			</fieldset>
-		</form>
-
+			<label>Script</label>
+			{{ input_textarea(
+				'script', supplier_rate_script.script, 40, 80, show_pos=True) }}
+			<input type="submit" value="Update">
+		</fieldset>
+	</form>
+
+	{% if rate_script_example %}
+			<h4>Example</h4>
+			<pre>{{rate_script_example}}</pre>
 	{% endif %}
+
+	<form hx-delete="/e/supplier_rate_scripts/{{supplier_rate_script.id}}/edit" hx-confirm="Are you sure you want to delete this rate script?">
+		<fieldset>
+			<legend>Delete this Rate Script</legend>
+			<input type="submit" name="delete" value="Delete">
+		</fieldset>
+	</form>
 {% endblock %}

{chellow-1761056531.0.0.dist-info → chellow-1761297878.0.0.dist-info}/METADATA

@@ -1,30 +1,28 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1761056531.0.0
+Version: 1761297878.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)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.11
-Requires-Dist: flask-restx==1.3.0
-Requires-Dist: flask==3.1.1
-Requires-Dist: jsonschema==4.17.3
+Requires-Dist: flask-restx==1.3.2
+Requires-Dist: flask==3.1.2
 Requires-Dist: odio==0.0.23
 Requires-Dist: openpyxl==3.1.5
-Requires-Dist: paramiko==3.4.1
-Requires-Dist: pep3143daemon==0.1.0
+Requires-Dist: paramiko==4.0.0
 Requires-Dist: pg8000==1.31.5
 Requires-Dist: pip>=9.0.1
-Requires-Dist: psutil==5.9.5
-Requires-Dist: pympler==1.0.1
-Requires-Dist: pypdf==6.0.0
+Requires-Dist: psutil==7.1.1
+Requires-Dist: pympler==1.1
+Requires-Dist: pypdf==6.1.3
 Requires-Dist: python-dateutil==2.8.2
-Requires-Dist: pytz==2022.6
-Requires-Dist: requests==2.32.4
-Requires-Dist: sqlalchemy==2.0.41
-Requires-Dist: waitress==3.0.1
-Requires-Dist: xlrd==2.0.1
+Requires-Dist: pytz==2025.2
+Requires-Dist: requests==2.32.5
+Requires-Dist: sqlalchemy==2.0.44
+Requires-Dist: waitress==3.0.2
+Requires-Dist: xlrd==2.0.2
 Requires-Dist: zish==0.1.12
 Description-Content-Type: text/markdown
 

{chellow-1761056531.0.0.dist-info → chellow-1761297878.0.0.dist-info}/RECORD

@@ -1,7 +1,6 @@
 chellow/__init__.py,sha256=9aoSbGmHCIHwzI_c_TLSg5CeKwqAq0I6kKaMvTrTMqg,10936
 chellow/api.py,sha256=mk17TfweR76DPFC8lX2SArTjai6y6YshASxqO1w-_-s,11036
 chellow/bank_holidays.py,sha256=T_utYMwe_g1dz5X-aOTdIPryg49SvB7QsWM1yphlqG8,4423
-chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=sNAPMe4LeHqfisEubGXvraDsUS0F-ujI3WG0Md8DywM,5565
 chellow/edi_lib.py,sha256=Lq70TUJuogoP5KGrphzUEUfyfgftEclg_iA3mpNAaDI,51324
 chellow/fake_batch_updater.py,sha256=khAmvSUn9qN04w8C92kRg1UeyQvfLztE7QXv9tUz6nE,11611
@@ -45,7 +44,7 @@ chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,623
 chellow/e/tlms.py,sha256=pyL32hPiYd09FbpXVMnBjHsWFEQHs-Az945V7EShGiY,9116
 chellow/e/tnuos.py,sha256=NBmc-f3oezrl4gviAKobljHfICTpBKxxxEGBGJi_lRk,4927
 chellow/e/triad.py,sha256=uQIngSrz8irBXQ0Rp_s8nAUzu-y2Ms7aj4B38_Ff8y8,13720
-chellow/e/views.py,sha256=7WKLrqYtk018oXjmx9YBv72B5hpgOV0eTJYqsIoBYsE,234251
+chellow/e/views.py,sha256=Duvdp5ZjtCHnOrAyk7uZZJr0jZcg0F2h3g1XNN25HtU,234669
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=hcbjxqLOe7qkDjS7enCpmfyGwm3d-pq3u5VQIaUmVTw,3796
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=yoEGQS0qcrv3TWFfxELIIi8f1CyKcIzh0xVaPoz2w2s,4191
@@ -100,7 +99,7 @@ chellow/reports/report_87.py,sha256=udzbCuXcckWD-OHmfJCT6bwg_paYhm4vfDWlL8WM-jA,
 chellow/reports/report_asset_comparison.py,sha256=Cl2NgvbclqhOVvKuUu3sajTVO2JupMfzK3bV0_K8eNs,6077
 chellow/reports/report_batches.py,sha256=MoCv2dE-JgaJzaMjMA-kZrPkYR13uDoXer5UuF12OYc,4757
 chellow/reports/report_bills.py,sha256=LP7XDxzO0Fp10c8xDE67e4tHTEc7nN74ESQBy762Nx4,3401
-chellow/reports/report_channel_snags.py,sha256=RV5L3zRwFmuZws7w9H9VzLCFlQ6U3-ZU6jn4j5VydNc,8626
+chellow/reports/report_channel_snags.py,sha256=qBVmw0q588izKJr6dDOn7jjdFvSa-Ldd2uqtVETqijY,8748
 chellow/reports/report_csv_llfcs.py,sha256=mMB06b6Jems5kcQU4H4Le_fyKgVr8THP8BCx3pkvg5E,1903
 chellow/reports/report_csv_site_hh_data.py,sha256=ik0OkGVo1bfTXLdcT3gPUHnxSkSdorzZheP3qgnOR5c,4331
 chellow/reports/report_csv_site_snags.py,sha256=AuAy6vjL0g7vwPPAZhBqxOyITL9_jnyFj012MnUcxxk,2627
@@ -336,14 +335,14 @@ chellow/templates/e/supplier_bill_import.html,sha256=RXvRkKoH-s1F_Wz---WygiNCmAm
 chellow/templates/e/supplier_bill_import_contract.html,sha256=HySas6Q-1Pi6aZaEZNhKeK4c3d8MFbBIMh0PJ4zvKWQ,3117
 chellow/templates/e/supplier_contract.html,sha256=jz3_2q5HuJaxQhJPaM_dcukigYyI6UmhVYC6nPHY7Ng,3243
 chellow/templates/e/supplier_contract_add.html,sha256=gsozEtF24lzYi_Bb4LTenvh62tCt7dQ4CwaIz7rFck4,899
-chellow/templates/e/supplier_contract_edit.html,sha256=Afwtn0l8XRbt86bMOru2AjjvctoUkieD052aY0B2mDc,1463
+chellow/templates/e/supplier_contract_edit.html,sha256=PciQ91n1PB2-Z8vK4HIRiAc4tH3zwV17tnA-T6sRJu0,1226
 chellow/templates/e/supplier_contracts.html,sha256=VwWD4q88Fynz7vioFSAsyH6RR_1SyQQl6bQwzL-W1m0,1508
 chellow/templates/e/supplier_element.html,sha256=XQXvSVFISC3ZwCRurfpZbppFJgMhzbhqcwDYFT50bok,1370
 chellow/templates/e/supplier_element_add.html,sha256=gSdn3X2BPUclPwbsuvQC-yIejaLykKFhJl_sC1kLB4s,1220
 chellow/templates/e/supplier_element_edit.html,sha256=NrW51twKITht7w4qi8xrxivU3h-jcGpYySBuxq-L5XU,1846
 chellow/templates/e/supplier_rate_script.html,sha256=tjWeCUAgNip3VLHzbXqe19Msiasys3Wm5Vra936qJjI,1245
 chellow/templates/e/supplier_rate_script_add.html,sha256=Yf2LZEIHbL7qT6oxBCtPf0ZX7vJsSo_ZeOKJhJoVh3o,690
-chellow/templates/e/supplier_rate_script_edit.html,sha256=VaYJt8nxHdnuP-zEAuBJC-ibEpjDU1b80hXtdBQH1dg,1968
+chellow/templates/e/supplier_rate_script_edit.html,sha256=Nt2bg78DCXiQpl2SAxIWjJx2nqljOtcqKVDkUnmO9_k,1695
 chellow/templates/e/supply.html,sha256=kFyYPIzMgRZz7tHY_TfmjYzUkc1zXyaJses6X372Ozg,8427
 chellow/templates/e/supply_edit.html,sha256=2BRGU35nb0ZpUHKCi_fgAPMU6SlHI7ve3_Ne8LXHtms,2333
 chellow/templates/e/supply_eras.html,sha256=5lB7_oC-sTWRQoASuPgBWj5XSZa9ajR0s6V6xKHvf6E,19996
@@ -401,6 +400,6 @@ chellow/templates/g/supply_notes.html,sha256=6epNmZ3NKdXZz27fvmRUGeffg_oc1kmwuBe
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
 chellow/templates/reports/channel_snags.html,sha256=_aAgFgMlTkK2HuKFU8YisAIcUYfg6Hqhgyf5MZpdK8c,2629
-chellow-1761056531.0.0.dist-info/METADATA,sha256=x465BtJg_0nCB84ep2IVjHyEpTTyZZixgcyJ_zKU7fk,12500
-chellow-1761056531.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1761056531.0.0.dist-info/RECORD,,
+chellow-1761297878.0.0.dist-info/METADATA,sha256=YJWJBO0S9POBAD-RG5IFnGyCsyecRLSoNm_xWroFfrw,12428
+chellow-1761297878.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1761297878.0.0.dist-info/RECORD,,

chellow/commands.py

@@ -1,52 +0,0 @@
-import argparse
-import os.path
-import signal
-import sys
-import time
-from os import environ
-
-from pep3143daemon import DaemonContext, PidFile
-
-import waitress
-
-from chellow import create_app
-
-app = create_app()
-
-
-def chellow_start(daemon):
-    chellow_port = environ["CHELLOW_PORT"] if "CHELLOW_PORT" in environ else 80
-    daemon.open()
-    waitress.serve(app, host="0.0.0.0", port=chellow_port)
-
-
-def chellow_stop(pidfile_path):
-    with open(pidfile_path) as pidfile:
-        pid = int(pidfile.read())
-        os.kill(pid, signal.SIGTERM)
-    while os.path.exists(pidfile_path):
-        time.sleep(1)
-
-
-def chellow_command():
-    parser = argparse.ArgumentParser()
-    parser.add_argument("action", choices=["start", "stop", "restart"])
-    args = parser.parse_args()
-
-    try:
-        os.makedirs(app.instance_path)
-    except BaseException:
-        pass
-    pidfile_path = os.path.join(app.instance_path, "chellow.pid")
-    pidfile = PidFile(pidfile_path)
-    daemon = DaemonContext(
-        pidfile=pidfile, stdin=sys.stdin, stderr=sys.stderr, stdout=sys.stdout
-    )
-
-    if args.action == "start":
-        chellow_start(daemon)
-    elif args.action == "stop":
-        chellow_stop(pidfile_path)
-    elif args.action == "restart":
-        chellow_stop(pidfile_path)
-        chellow_start(daemon)