chellow 1682692302.0.0__tar.gz → 1683187792.0.0__tar.gz

{chellow-1682692302.0.0 → chellow-1683187792.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chellow
-Version: 1682692302.0.0
+Version: 1683187792.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)
@@ -8,7 +8,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
 Requires-Dist: flask-restx==1.0.3
-Requires-Dist: flask==2.2.2
+Requires-Dist: flask==2.3.2
 Requires-Dist: odio==0.0.22
 Requires-Dist: openpyxl==3.0.10
 Requires-Dist: pep3143daemon==0.0.6

chellow-1683187792.0.0/VERSION

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

{chellow-1682692302.0.0 → chellow-1683187792.0.0}/chellow/e/bill_parsers/haven_edi_tprs.py

@@ -29,7 +29,6 @@ def _process_BCD(elements, headers):
     invn = elements["INVN"]
     reference = invn[0]
     headers["reference"] = reference
-    headers["account"] = "SA" + reference[:9]
 
     btcd = elements["BTCD"]
     headers["bill_type_code"] = btcd[0]
@@ -248,6 +247,11 @@ def _process_CCD4(elements, headers):
         breakdown["standing-gbp"] += to_decimal(ctot) / Decimal("100")
 
 
+def _process_CLO(elements, headers):
+    cloc = elements["CLOC"]
+    headers["account"] = cloc[1]
+
+
 def _process_MTR(elements, headers):
     if headers["message_type"] == "UTLBIL":
         if headers["mpan_core"] is None:
@@ -311,7 +315,7 @@ CODE_FUNCS = {
     "CCD4": _process_CCD4,
     "CDA": _process_NOOP,
     "CDT": _process_NOOP,
-    "CLO": _process_NOOP,
+    "CLO": _process_CLO,
     "DNA": _process_NOOP,
     "END": _process_NOOP,
     "FIL": _process_NOOP,

{chellow-1682692302.0.0 → chellow-1683187792.0.0}/chellow/e/views.py

@@ -3963,56 +3963,6 @@ def supplier_batch_edit_post(batch_id):
         )
 
 
-@e.route("/supplier_batches/<int:batch_id>/csv")
-def supplier_batch_csv_get(batch_id):
-    batch = Batch.get_by_id(g.sess, batch_id)
-    si = StringIO()
-    cw = csv.writer(si)
-    cw.writerow(
-        [
-            "Supplier Contract",
-            "Batch Reference",
-            "Bill Reference",
-            "Account",
-            "Issued",
-            "From",
-            "To",
-            "kWh",
-            "Net",
-            "VAT",
-            "Gross",
-            "Type",
-        ]
-    )
-    for bill in (
-        g.sess.query(Bill)
-        .filter(Bill.batch == batch)
-        .order_by(Bill.reference, Bill.start_date)
-        .options(joinedload(Bill.bill_type))
-    ):
-        cw.writerow(
-            [
-                batch.contract.name,
-                batch.reference,
-                bill.reference,
-                bill.account,
-                hh_format(bill.issue_date),
-                hh_format(bill.start_date),
-                hh_format(bill.finish_date),
-                str(bill.kwh),
-                str(bill.net),
-                str(bill.vat),
-                str(bill.gross),
-                bill.bill_type.code,
-            ]
-        )
-
-    output = make_response(si.getvalue())
-    output.headers["Content-Disposition"] = 'attachment; filename="batch.csv"'
-    output.headers["Content-type"] = "text/csv"
-    return output
-
-
 @e.route("/supplier_batches/<int:batch_id>", methods=["POST"])
 def supplier_batch_post(batch_id):
     try:

chellow-1683187792.0.0/chellow/reports/report_bills.py

@@ -0,0 +1,86 @@
+import csv
+import os
+import threading
+import traceback
+
+from flask import g
+
+from sqlalchemy import select
+from sqlalchemy.orm import joinedload
+
+import chellow.dloads
+from chellow.models import Batch, Bill, Session, User
+from chellow.utils import csv_make_val, req_int
+from chellow.views import chellow_redirect
+
+
+def content(user_id, batch_id):
+    sess = f = writer = None
+    try:
+        sess = Session()
+        user = User.get_by_id(sess, user_id)
+        running_name, finished_name = chellow.dloads.make_names(
+            f"bills_batch_{batch_id}.csv", user
+        )
+        f = open(running_name, mode="w", newline="")
+        writer = csv.writer(f, lineterminator="\n")
+        batch = Batch.get_by_id(sess, batch_id)
+        titles = [
+            "supplier_contract",
+            "batch_reference",
+            "bill_reference",
+            "imp_mpan_core",
+            "account",
+            "issued",
+            "from",
+            "to",
+            "kwh",
+            "net",
+            "vAT",
+            "gross",
+            "type",
+        ]
+        writer.writerow(titles)
+
+        for bill in sess.execute(
+            select(Bill)
+            .where(Bill.batch == batch)
+            .order_by(Bill.reference, Bill.start_date)
+            .options(joinedload(Bill.bill_type), joinedload(Bill.supply))
+        ).scalars():
+            era = bill.supply.find_era_at(sess, bill.start_date)
+            vals = [
+                batch.contract.name,
+                batch.reference,
+                bill.reference,
+                None if era is None else era.imp_mpan_core,
+                bill.account,
+                bill.issue_date,
+                bill.start_date,
+                bill.finish_date,
+                bill.kwh,
+                bill.net,
+                bill.vat,
+                bill.gross,
+                bill.bill_type.code,
+            ]
+            writer.writerow(csv_make_val(v) for v in vals)
+
+    except BaseException:
+        msg = traceback.format_exc()
+        print(msg)
+        if f is not None:
+            f.write(msg)
+    finally:
+        if sess is not None:
+            sess.close()
+        if f is not None:
+            f.close()
+            os.rename(running_name, finished_name)
+
+
+def do_get(sess):
+    batch_id = req_int("batch_id")
+    args = g.user.id, batch_id
+    threading.Thread(target=content, args=args).start()
+    return chellow_redirect("/downloads", 303)

{chellow-1682692302.0.0 → chellow-1683187792.0.0}/chellow/reports/report_ecoes_comparison.py

@@ -97,7 +97,7 @@ def content(user_id, show_ignored, report_run_id):
             )
 
         r = s.get(
-            f"{url_prefix}NonDomesticCustomer/ExportPortfolioMPANs?fileType=csv",
+            f"{url_prefix}PortfolioAccess/ExportPortfolioMPANs?fileType=csv",
             proxies=proxies,
         )
 

{chellow-1682692302.0.0 → chellow-1683187792.0.0}/chellow/templates/e/supplier_batch.html

@@ -78,7 +78,7 @@
 					<td>{{ "£{:,}".format(sum_vat_gbp) }}</td>
 					<td>{{ "£{:,}".format(sum_gross_gbp) }}</td>
 					<td>{{ "{:,}".format(sum_kwh) }}</td>
-					<td><a href="/e/supplier_batches/{{batch.id}}/csv" >Download</a></td>
+					<td><a href="/reports/bills?batch_id={{batch.id}}" >Download</a></td>
 					<td>
 						{% if batch_reports %}
 							<ul>

{chellow-1682692302.0.0 → chellow-1683187792.0.0}/chellow/views.py

@@ -127,7 +127,7 @@ from chellow.utils import (
     utc_datetime_now,
 )
 
-home = Blueprint("", __name__, template_folder="templates")
+home = Blueprint("home", __name__, url_prefix="", template_folder="templates")
 
 
 def chellow_redirect(path, code=None):

{chellow-1682692302.0.0 → chellow-1683187792.0.0}/pyproject.toml

@@ -17,7 +17,7 @@ dependencies = [
 	"odio==0.0.22",
 	"pypdf==3.6.0",
 	"pg8000==1.29.3",
-	"Flask==2.2.2",
+	"Flask==2.3.2",
 	"SQLAlchemy==1.4.44",
 	"flask-restx==1.0.3",
 	"openpyxl==3.0.10",

chellow-1682692302.0.0/VERSION

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

chellow-1682692302.0.0/chellow/reports/report_155.py

@@ -1,11 +0,0 @@
-from datetime import datetime as Datetime
-
-from dateutil.relativedelta import relativedelta
-
-from flask import render_template
-
-
-def do_get(sess):
-    init = Datetime.utcnow()
-    init = Datetime(init.year, init.month, 1) - relativedelta(months=1)
-    return render_template("report_155.html", init=init)