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

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/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/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/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/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/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.dist-info → chellow-1683187792.0.0.dist-info}/METADATA

@@ -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-1682692302.0.0.dist-info → chellow-1683187792.0.0.dist-info}/RECORD

@@ -11,7 +11,7 @@ chellow/proxy.py,sha256=Mzssi9nTf6s_G4RSn8k5oAHqzVYIxMsfbudj1amYucI,1387
 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=27TKAL-nYQg26I4bMaTW3r4U8x2eDwhzBlVJR9_y2VY,83473
+chellow/views.py,sha256=luCwKmgvEk2AFaFC1deBG1nTw6YGXjSJtlwAq2yLJh8,83492
 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
@@ -34,7 +34,7 @@ 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=gFvNgibycspsyD3I8xxBWPjvyWJfkAiDRMbLenCpEgQ,18947
-chellow/e/views.py,sha256=5pp-sbUHaiQ1N0RgY73XQbHlqrZP3y64HrZgPTmFxE4,180225
+chellow/e/views.py,sha256=21VRz7gS1liLxzG1ZOD5hkIbsDCTYhF8KU2wdCEKiHs,178868
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=v1s4O8phVJVn9sOs9HKrKYcECAP0ApnUgqCaa2ARYiQ,4234
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=4dAWjaxsDnnGBnRAjgFe7IZLxIcLMGiTuXh1uqNnnlQ,4382
@@ -45,7 +45,7 @@ chellow/e/bill_parsers/engie_xls.py,sha256=tk5EAZjv5cKuB1R7OVAcLUVvCZTWAs8IsoyGb
 chellow/e/bill_parsers/gdf_csv.py,sha256=ZfK3Oc6oP28p_P9DIevLNB_zW2WLcEJ3Lvb1gL310YU,7382
 chellow/e/bill_parsers/haven_csv.py,sha256=Ft81mqHTbCQl6dMLkLin777vAX2T999Q_4fkNwl-naM,13606
 chellow/e/bill_parsers/haven_edi.py,sha256=eN40WL--JkX7TNIefgZohYv0BQ8vOm6AqkWlJSW5Mmk,16188
-chellow/e/bill_parsers/haven_edi_tprs.py,sha256=2hxOFv7neoh3Q_Q12dp5KpnsnE2NY1imZQk1va6AKAo,10648
+chellow/e/bill_parsers/haven_edi_tprs.py,sha256=e1zVw5sWyGPEO5Ua-vmyUvUO-STn2DSNOxp1s5F914I,10701
 chellow/e/bill_parsers/mm.py,sha256=P4CdkskDrjmFMSDp0ehE_ichTBHGywbT_dckMxuAqQQ,1929
 chellow/e/bill_parsers/nonsettlement_dc_stark_xlsx.py,sha256=MF74mh6gdBb0lqvPyPZIv_7vsqNu_zNXWpIzlNFtl1g,4576
 chellow/e/bill_parsers/settlement_dc_stark_xlsx.py,sha256=4Dfq4N0ZOgD_x3ZJ9CnGzsLbwhS1-7aTJqFx00GCnU0,6007
@@ -63,7 +63,6 @@ chellow/gas/views.py,sha256=5xfNrKDi-lK7alkREu0P_3z7qgWz-fKW1zZ78NrBZh8,54937
 chellow/reports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/reports/report_109.py,sha256=oeoxRX8r8_XjFRCfBb4qN2OAwA_hI6SSRk8V6hKXQhA,10182
 chellow/reports/report_111.py,sha256=ySqF9gYHVVI-CXjfSz6Kfelh7ncmvcUS4WsFE4XvTLk,28029
-chellow/reports/report_155.py,sha256=ZXYEx8wi2FtA5ysjhX2rbMG8CQFjZQV4CrUz6pBBs0o,305
 chellow/reports/report_169.py,sha256=-zSgfrX6NjgMQGwbKaUPvcPqPHbDQ8_pL3EL33u40yA,8331
 chellow/reports/report_177.py,sha256=8-hfejbuwAohwFSbZC_VBtUUazi3hkdgA0oHvqA1St0,11499
 chellow/reports/report_181.py,sha256=oehWcNMTcCUoSRq3eEGMwVraPgB5wucll6WlVj53xHM,5027
@@ -86,10 +85,11 @@ chellow/reports/report_81.py,sha256=xULQ6NDG8yvF7qnUXDgqv4Rv-XikAzJQnBgwpqyFFTc,
 chellow/reports/report_87.py,sha256=0LIGY4gImnHOt7Dno7j4g933yid9NMW8l7WrCl5vR74,5768
 chellow/reports/report_asset_comparison.py,sha256=ictRSzmpH9Z0i67s46SyMhALEg4bYvjr4WNMRaNCQnk,6111
 chellow/reports/report_batches.py,sha256=PTLsWYZI4yJjTqUeZe0ovSDpzTOEU3zG54fkmvutm6Y,4571
+chellow/reports/report_bills.py,sha256=UeKZMK2T-4s9Lj5Ef6M2P3eD4oHmXCjf2LGStYF5saA,2429
 chellow/reports/report_csv_llfcs.py,sha256=d3CWJB7bVinkn6ytu9AvPbB9TMHGg2E7LLjabu3QS3E,1852
 chellow/reports/report_csv_site_hh_data.py,sha256=u8c4n4YFdljsCF0wh_SAnkbTIVVEDhPnccJyCpCVfm8,4067
 chellow/reports/report_csv_site_snags.py,sha256=U_zg4ppg9DRetKAuaxOnirkcwtMhz2iCE3Fbq-o7AVM,2591
-chellow/reports/report_ecoes_comparison.py,sha256=sWQWAVZ_qv4xhAfr5zNzrs0N4m8LFih_sh4VMPaBm2Q,21201
+chellow/reports/report_ecoes_comparison.py,sha256=_8HisTy77misa2beYrlaC51Mp5kI6WaabPQaVjpGkbk,21197
 chellow/reports/report_g_monthly_duration.py,sha256=lS12t4vAZIj-pD22aWPoO-n8EQBCIzzY2Qnx9SawhaQ,12217
 chellow/reports/report_g_supplies_snapshot.py,sha256=wmXsi8EduWyAw4QtpAFH5ZWkcYggKNWO3pEoG63D0LU,4571
 chellow/reports/report_g_supply_virtual_bill.py,sha256=6oRFV2ffryePM-jcabiXO5vo4fLt_wQZ2ejvlwIPa0g,3617
@@ -275,7 +275,7 @@ chellow/templates/e/source.html,sha256=6cLjZWKS2w9Zy1C4hzi1lTKXAdKKFQ8wSxbwAjhP3
 chellow/templates/e/sources.html,sha256=AW_ysj5ZzArTLz0-FWappMsUEU1AO9gw7D4XSHbINu4,453
 chellow/templates/e/ssc.html,sha256=NiTbn9yLYYG_DV4j9S73rnIVmzTAzTbyaXomverHNnI,811
 chellow/templates/e/sscs.html,sha256=Ul0rW5Wa3romdSCV3JL54u3iSxY1J-8RE8yMxANiQAU,918
-chellow/templates/e/supplier_batch.html,sha256=c1S-wdKuf1Q1__6yqpXa7J_iTfres9HBQHsH-AyjqLI,5647
+chellow/templates/e/supplier_batch.html,sha256=jKJR8dKYCy6rA47GI02Sv4c1cuKytvma9_IRU4BtT7U,5647
 chellow/templates/e/supplier_batch_add.html,sha256=RabJ20yLpsF_npSLL5aeLlPDa2tL99fENaIzDYZJy1w,1240
 chellow/templates/e/supplier_batch_edit.html,sha256=imgRWTg4W0Db8BwqYnN8ZYno5SBZxRTj2Mkhi113HQg,1420
 chellow/templates/e/supplier_batch_file.html,sha256=fohdthY3ibO9a_2BJsYWyJhZL369F0gaUV7McFzWhMQ,1226
@@ -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-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,,
+chellow-1683187792.0.0.dist-info/METADATA,sha256=i5MmNce3-lf5Na81v5kkUbwEtH8V1cDKKUbX7vQr1Ig,12160
+chellow-1683187792.0.0.dist-info/WHEEL,sha256=9MIigYJ7D5sOqAPqr0-o6tSMY_nQ7c6kvtvyeUB99YQ,87
+chellow-1683187792.0.0.dist-info/RECORD,,

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)