chellow 1759411815.0.0__tar.gz → 1759823276.0.0__tar.gz

{chellow-1759411815.0.0 → chellow-1759823276.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1759411815.0.0
+Version: 1759823276.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)
@@ -14,7 +14,7 @@ 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: pg8000==1.31.1
+Requires-Dist: pg8000==1.31.5
 Requires-Dist: pip>=9.0.1
 Requires-Dist: psutil==5.9.5
 Requires-Dist: pympler==1.0.1
@@ -47,7 +47,7 @@ Chellow is a web application for checking UK electricity and gas bills. It's des
 for organizations with high electricity consumption. The software is hosted at
 https://github.com/WessexWater/chellow.
 
-[![Build Status](https://github.com/WessexWater/chellow/workflows/chellow/badge.svg)](https://github.com/WessexWater/chellow/workflows/chellow)
+[![Build Status](https://github.com/WessexWater/chellow/actions/workflows/chellow.yml/badge.svg)](https://github.com/WessexWater/chellow/actions/workflows/chellow.yml)
 
 
 ## Installation
@@ -55,8 +55,7 @@ https://github.com/WessexWater/chellow.
 Chellow is a Python web application that uses the PostgreSQL database. To install
 Chellow, follow these steps:
 
-* Install [PostgreSQL](http://www.postgresql.org/) 12
-  * Set the PostgreSQL time zone to 'UTC'.
+* Install [PostgreSQL](http://www.postgresql.org/) 15
 * Create a PostgreSQL database: `createdb --encoding=UTF8 chellow`
 * Set up the following environment variables to configure Chellow:
 

{chellow-1759411815.0.0 → chellow-1759823276.0.0}/README.md

@@ -17,7 +17,7 @@ Chellow is a web application for checking UK electricity and gas bills. It's des
 for organizations with high electricity consumption. The software is hosted at
 https://github.com/WessexWater/chellow.
 
-[![Build Status](https://github.com/WessexWater/chellow/workflows/chellow/badge.svg)](https://github.com/WessexWater/chellow/workflows/chellow)
+[![Build Status](https://github.com/WessexWater/chellow/actions/workflows/chellow.yml/badge.svg)](https://github.com/WessexWater/chellow/actions/workflows/chellow.yml)
 
 
 ## Installation
@@ -25,8 +25,7 @@ https://github.com/WessexWater/chellow.
 Chellow is a Python web application that uses the PostgreSQL database. To install
 Chellow, follow these steps:
 
-* Install [PostgreSQL](http://www.postgresql.org/) 12
-  * Set the PostgreSQL time zone to 'UTC'.
+* Install [PostgreSQL](http://www.postgresql.org/) 15
 * Create a PostgreSQL database: `createdb --encoding=UTF8 chellow`
 * Set up the following environment variables to configure Chellow:
 

chellow-1759823276.0.0/VERSION

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

chellow-1759823276.0.0/bin/chellow_upgrader.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+cd /var/www/chellow
+source venv/bin/activate
+
+if [[ $* == *--test* ]] ; then
+	if pip list --outdated --extra-index-url https://test.pypi.org/simple/ | grep chellow ; then
+		echo "Found a new Chellow version."
+
+		echo "Stopping Chellow"
+		/usr/bin/systemctl stop chellow
+
+		echo "Doing a pip upgrade of Chellow."
+		pip install chellow --upgrade --extra-index-url https://test.pypi.org/simple/
+
+		echo "Starting Chellow"
+		/usr/bin/systemctl start chellow
+	else
+		echo "No new version found."
+	fi
+else
+	if pip list --outdated | grep chellow ; then
+		echo "Found a new Chellow version."
+
+		echo "Stopping Chellow"
+		/usr/bin/systemctl stop chellow
+
+		echo "Doing a pip upgrade of Chellow."
+		pip install chellow --upgrade
+
+		echo "Starting Chellow"
+		/usr/bin/systemctl start chellow
+	else
+		echo "No new version found."
+	fi
+fi

{chellow-1759411815.0.0 → chellow-1759823276.0.0}/chellow/general_import.py

@@ -942,47 +942,70 @@ def general_import_bill(sess, action, vals, args):
             supply,
         )
 
-        for i in range(15, len(vals), 11):
-            msn = add_arg(args, "Meter Serial Number", vals, i)
-            mpan_str = add_arg(args, "MPAN", vals, i + 1)
-            coefficient_str = add_arg(args, "Coefficient", vals, i + 2)
-            coefficient = Decimal(coefficient_str)
-            units = add_arg(args, "Units", vals, i + 3)
-            tpr_code = add_arg(args, "TPR", vals, i + 4)
-            if len(tpr_code) > 0:
-                tpr = Tpr.get_by_code(sess, tpr_code)
-            else:
-                tpr = None
-
-            prev_date_str = add_arg(args, "Previous Date", vals, i + 5)
-            prev_date = parse_hh_start(prev_date_str)
-            prev_value_str = add_arg(args, "Previous Value", vals, i + 6)
-            prev_value = Decimal(prev_value_str)
-
-            prev_type_str = add_arg(args, "Previous Type", vals, i + 7)
-            prev_type = ReadType.get_by_code(sess, prev_type_str)
-
-            pres_date_str = add_arg(args, "Present Date", vals, i + 8)
-            pres_date = parse_hh_start(pres_date_str)
-            pres_value_str = add_arg(args, "Present Value", vals, i + 9)
-            pres_value = Decimal(pres_value_str)
-
-            pres_type_str = add_arg(args, "Present Type", vals, i + 10)
-            pres_type = ReadType.get_by_code(sess, pres_type_str)
-            bill.insert_read(
-                sess,
-                tpr,
-                coefficient,
-                units,
-                msn,
-                mpan_str,
-                prev_date,
-                prev_value,
-                prev_type,
-                pres_date,
-                pres_value,
-                pres_type,
-            )
+        i = 15
+        while i < len(vals):
+            typ = add_arg(args, "read or element", vals, i)
+            if typ == "read":
+                msn = add_arg(args, "Meter Serial Number", vals, i + 1)
+                mpan_str = add_arg(args, "MPAN", vals, i + 2)
+                coefficient_str = add_arg(args, "Coefficient", vals, i + 3)
+                coefficient = Decimal(coefficient_str)
+                units = add_arg(args, "Units", vals, i + 4)
+                tpr_code = add_arg(args, "TPR", vals, i + 5)
+                if len(tpr_code) > 0:
+                    tpr = Tpr.get_by_code(sess, tpr_code)
+                else:
+                    tpr = None
+
+                prev_date_str = add_arg(args, "Previous Date", vals, i + 6)
+                prev_date = parse_hh_start(prev_date_str)
+                prev_value_str = add_arg(args, "Previous Value", vals, i + 7)
+                prev_value = Decimal(prev_value_str)
+
+                prev_type_str = add_arg(args, "Previous Type", vals, i + 8)
+                prev_type = ReadType.get_by_code(sess, prev_type_str)
+
+                pres_date_str = add_arg(args, "Present Date", vals, i + 9)
+                pres_date = parse_hh_start(pres_date_str)
+                pres_value_str = add_arg(args, "Present Value", vals, i + 10)
+                pres_value = Decimal(pres_value_str)
+
+                pres_type_str = add_arg(args, "Present Type", vals, i + 11)
+                pres_type = ReadType.get_by_code(sess, pres_type_str)
+                bill.insert_read(
+                    sess,
+                    tpr,
+                    coefficient,
+                    units,
+                    msn,
+                    mpan_str,
+                    prev_date,
+                    prev_value,
+                    prev_type,
+                    pres_date,
+                    pres_value,
+                    pres_type,
+                )
+                i += 12
+            elif typ == "element":
+                name = add_arg(args, "Name", vals, i + 1)
+                start_date_str = add_arg(args, "Start Date", vals, i + 2)
+                start_date = parse_hh_start(start_date_str)
+                finish_date_str = add_arg(args, "Finish Date", vals, i + 3)
+                finish_date = parse_hh_start(finish_date_str)
+                net_str = add_arg(args, "Net", vals, i + 4)
+                net = Decimal(net_str)
+                breakdown_str = add_arg(args, "Breakdown", vals, i + 5)
+                breakdown = _parse_breakdown(breakdown_str)
+                bill.insert_element(
+                    sess,
+                    name,
+                    start_date,
+                    finish_date,
+                    net,
+                    breakdown,
+                )
+                i += 6
 
     elif action == "update":
         bill_id_str = add_arg(args, "Bill Id", vals, 0)

{chellow-1759411815.0.0 → chellow-1759823276.0.0}/chellow/templates/general_imports.html

@@ -306,6 +306,7 @@
 				<td>Type</td>
 				<td>Breakdown</td>
 				<td>Kwh</td>
+				<td>'read' or 'element'</td>
 				<td>(Meter Serial Number</td>
 				<td>Mpan</td>
 				<td>Coefficient</td>
@@ -317,6 +318,12 @@
 				<td>Present Date</td>
 				<td>Present Value</td>
 				<td>Present Type)*</td>
+				<td>'read' or 'element'</td>
+				<td>(Name</td>
+				<td>Start Date</td>
+				<td>Finish Date</td>
+				<td>Net</td>
+				<td>Breakdown)*</td>
 			</tr>
 			<tr>
 				<td><em>update</em></td>

{chellow-1759411815.0.0 → chellow-1759823276.0.0}/pyproject.toml

@@ -16,7 +16,7 @@ classifiers = [
 dependencies = [
 	"odio==0.0.23",
 	"pypdf==6.0.0",
-	"pg8000==1.31.1",
+	"pg8000==1.31.5",
 	"Flask==3.1.1",
 	"SQLAlchemy==2.0.41",
 	"flask-restx==1.3.0",

chellow-1759411815.0.0/VERSION

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

chellow-1759411815.0.0/bin/chellow_service_monitor.sh

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-if pip list --outdated --format=columns | grep chellow ; then
-        echo "Found a new Chellow version."
-
-        echo "Stopping Chellow"
-        /usr/sbin/systemctl stop chellow
-
-        echo "Doing a pip upgrade of Chellow."
-        pip install chellow --upgrade
-
-        echo "Starting Chellow"
-        /usr/sbin/systemctl start chellow
-else
-        echo "No new version found."
-fi