chellow 1761056531.0.0__tar.gz → 1761300128.0.0__tar.gz

{chellow-1761056531.0.0 → chellow-1761300128.0.0}/PKG-INFO

@@ -1,30 +1,28 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1761056531.0.0
+Version: 1761300128.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-1761300128.0.0/VERSION

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

{chellow-1761056531.0.0 → chellow-1761300128.0.0}/chellow/e/views.py

@@ -1348,6 +1348,7 @@ def dc_contract_hh_imports_post(contract_id):
                     "dc_contract_hh_imports.html",
                     contract=contract,
                     processes=processes,
+                    parser_names=", ".join(chellow.e.hh_importer.extensions),
                 ),
                 400,
             )
@@ -5711,7 +5712,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 +5883,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-1761056531.0.0 → chellow-1761300128.0.0}/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-1761300128.0.0/chellow/templates/e/supplier_contract_edit.html

@@ -0,0 +1,40 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» Supplier Contracts » {{contract.name}}
+{% endblock %}
+
+{% block nav %}
+		<a href="/e/supplier_contracts">Supplier Contracts</a> &raquo; 
+		<a href="/e/supplier_contracts/{{contract.id}}">{{contract.name}}</a>
+		&raquo; Edit
+{% endblock %}
+
+{% block content %}
+
+	<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 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-1761300128.0.0/chellow/templates/e/supplier_rate_script_edit.html

@@ -0,0 +1,50 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» Supplier Contracts » {{supplier_rate_script.contract.name}} » 
+ 	Rate Scripts » {{supplier_rate_script.start_date|hh_format}} » Edit
+{% endblock %}
+
+{% block nav %}
+	<a href="/e/supplier_contracts">Supplier Contracts</a> &raquo; 
+	<a href="/e/supplier_contracts/{{supplier_rate_script.contract.id}}"
+		>{{supplier_rate_script.contract.name}}</a> &raquo; 
+	<a href="/e/supplier_rate_scripts/{{supplier_rate_script.id}}"
+		>Rate Script {{supplier_rate_script.start_date|hh_format}}</a> &raquo; Edit
+{% endblock %}
+
+{% block content %}
+	<form action="/e/supplier_rate_scripts/{{supplier_rate_script.id}}/edit" method="post">
+		<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">
+		</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 → chellow-1761300128.0.0}/pyproject.toml

@@ -15,23 +15,21 @@ classifiers = [
 ]
 dependencies = [
 	"odio==0.0.23",
-	"pypdf==6.0.0",
+	"pypdf==6.1.3",
 	"pg8000==1.31.5",
-	"Flask==3.1.1",
-	"SQLAlchemy==2.0.41",
-	"flask-restx==1.3.0",
-  "jsonschema==4.17.3",  # Temporarily needed until RestX updated
+	"Flask==3.1.2",
+	"SQLAlchemy==2.0.44",
+	"flask-restx==1.3.2",
 	"openpyxl==3.1.5",
 	"python-dateutil==2.8.2",
-	"pytz==2022.6",
-	"requests==2.32.4",
-	"waitress==3.0.1",
-	"pep3143daemon==0.1.0",
+	"pytz==2025.2",
+	"requests==2.32.5",
+	"waitress==3.0.2",
 	"pip>=9.0.1",
-	"paramiko==3.4.1",
-	"pympler==1.0.1",
-	"psutil==5.9.5",
-	"xlrd==2.0.1",
+	"paramiko==4.0.0",
+	"pympler==1.1",
+	"psutil==7.1.1",
+	"xlrd==2.0.2",
 	"zish==0.1.12",
 ]
 

{chellow-1761056531.0.0 → chellow-1761300128.0.0}/test/reports/test_report_channel_snags.py

@@ -58,6 +58,7 @@ def test_do_get_as_csv(mocker, sess, client):
     only_ongoing = True
     as_csv = True
     days_long_hidden = ""
+    now = to_utc(ct_datetime(2025, 10, 31, 0, 0))
     query_string = {
         "days_hidden": days_hidden,
         "show_settlement": show_settlement,
@@ -66,6 +67,11 @@ def test_do_get_as_csv(mocker, sess, client):
         "dc_contract_id": dc_contract_id,
         "as_csv": as_csv,
         "days_long_hidden": days_long_hidden,
+        "now_year": 2025,
+        "now_month": 10,
+        "now_day": 31,
+        "now_hour": 0,
+        "now_minute": 0,
     }
     response = client.get("/reports/channel_snags", query_string=query_string)
     match(response, 303)
@@ -77,6 +83,7 @@ def test_do_get_as_csv(mocker, sess, client):
         user_id,
         only_ongoing,
         show_settlement,
+        now,
     )
     mock_Thread.assert_called_with(target=content, args=args)
 
@@ -309,6 +316,7 @@ def test_content(mocker, sess):
     days_since_finished = ""
     show_settlement = "both"
     days_long_hidden = None
+    now = to_utc(ct_datetime(2025, 10, 30, 0, 0))
     content(
         dc_contract_id,
         days_hidden,
@@ -317,6 +325,7 @@ def test_content(mocker, sess):
         days_since_finished,
         show_settlement,
         days_long_hidden,
+        now,
     )
     f.seek(0)
     actual = list(csv.reader(f))
@@ -351,7 +360,7 @@ def test_content(mocker, sess):
             "",
             "False",
             "",
-            "9425",
+            "9434",
         ],
     ]
     match_tables(expected, actual)
@@ -381,6 +390,7 @@ def test_content_not_show_settlement(mocker, sess):
     days_since_finished = ""
     show_settlement = "no"
     days_long_hidden = ""
+    now = to_utc(ct_datetime(2025, 10, 30, 0, 0))
     content(
         dc_contract_id,
         days_hidden,
@@ -389,6 +399,7 @@ def test_content_not_show_settlement(mocker, sess):
         days_since_finished,
         show_settlement,
         days_long_hidden,
+        now,
     )
     f.seek(0)
     actual = list(csv.reader(f))

chellow-1761056531.0.0/VERSION

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

chellow-1761056531.0.0/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)

chellow-1761056531.0.0/chellow/templates/e/supplier_contract_edit.html

@@ -1,52 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}
-	» Supplier Contracts » {{contract.name}}
-{% endblock %}
-
-{% block nav %}
-		<a href="/e/supplier_contracts">Supplier Contracts</a> &raquo; 
-		<a href="/e/supplier_contracts/{{contract.id}}">{{contract.name}}</a>
-		&raquo; Edit
-{% endblock %}
-
-{% 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>
-			<fieldset>
-				<legend>Delete this contract</legend>	
-				<input type="submit" name="delete" value="Delete">
-			</fieldset>
-		</form>
-	{% endif %}
-{% endblock %}

chellow-1761056531.0.0/chellow/templates/e/supplier_rate_script_edit.html

@@ -1,65 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}
-	» Supplier Contracts » {{supplier_rate_script.contract.name}} » 
- 	Rate Scripts » {{supplier_rate_script.start_date|hh_format}} » Edit
-{% endblock %}
-
-{% block nav %}
-	<a href="/e/supplier_contracts">Supplier Contracts</a> &raquo; 
-	<a href="/e/supplier_contracts/{{supplier_rate_script.contract.id}}"
-		>{{supplier_rate_script.contract.name}}</a> &raquo; 
-	<a href="/e/supplier_rate_scripts/{{supplier_rate_script.id}}"
-		>Rate Script {{supplier_rate_script.start_date|hh_format}}</a> &raquo; Edit
-{% 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">
-			<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">
-			</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">
-			</fieldset>
-		</form>
-
-	{% endif %}
-{% endblock %}