chellow 1713170458.0.0__py3-none-any.whl → 1713268896.0.0__py3-none-any.whl

chellow/e/bill_parsers/csv.py

@@ -6,6 +6,8 @@ from dateutil.relativedelta import relativedelta
 
 from werkzeug.exceptions import BadRequest
 
+from zish import ZishLocationException
+
 from chellow.utils import (
     HH,
     ct_datetime_parse,
@@ -44,7 +46,7 @@ class Parser:
         raw_bills = []
         next(iter(self.reader))  # skip title row
         blank_set = set(("",))
-        for self.line_number, self.vals in enumerate(self.reader, start=1):
+        for self.line_number, self.vals in enumerate(self.reader, start=2):
             try:
                 # skip blank lines
                 if len(self.vals) == 0 or set(self.vals) == blank_set:
@@ -72,7 +74,7 @@ class Parser:
                     else:
                         try:
                             breakdown = loads(breakdown_str)
-                        except SyntaxError as e:
+                        except ZishLocationException as e:
                             raise BadRequest(str(e))
                 else:
                     raise BadRequest("There isn't a 'breakdown' field on the end.")
@@ -117,7 +119,9 @@ class Parser:
                 }
                 raw_bills.append(raw_bill)
             except BadRequest as e:
-                raise BadRequest(f"Problem at line {self.line_number}: {e.description}")
+                raise BadRequest(
+                    f"Problem at line {self.line_number} {self.vals}: {e.description}"
+                )
 
         return raw_bills
 

chellow/e/views.py

@@ -420,7 +420,7 @@ def channel_snag_edit_post(snag_id):
 
 @e.route("/comms")
 def comms_get():
-    comms = g.sess.execute(select(Cop).order_by(Cop.code)).scalars()
+    comms = g.sess.execute(select(Comm).order_by(Comm.code)).scalars()
     return render_template("comms.html", comms=comms)
 
 

chellow/general_import.py

@@ -1247,20 +1247,26 @@ def general_import_supply(sess, action, vals, args):
         dc_account = add_arg(args, "DC Account", vals, 10)
         msn = add_arg(args, "Meter Serial Number", vals, 11)
         dno_code = add_arg(args, "DNO Code", vals, 12)
-        dno = Party.get_dno_by_code(sess, dno_code)
+        dno = Party.get_dno_by_code(sess, dno_code, start_date)
         pc_code = add_arg(args, "Profile Class", vals, 13)
         pc = Pc.get_by_code(sess, parse_pc_code(pc_code))
         mtc_code = add_arg(args, "Meter Timeswitch Class", vals, 14)
         cop_code = add_arg(args, "CoP", vals, 15)
         cop = Cop.get_by_code(sess, cop_code)
-        ssc_code = add_arg(args, "Standard Settlement Configuration", vals, 16)
+        comm_code = add_arg(args, "Comms Type", vals, 16)
+        comm = Comm.get_by_code(sess, comm_code)
+        ssc_code = add_arg(args, "Standard Settlement Configuration", vals, 17)
         ssc = Ssc.get_by_code(sess, ssc_code) if len(ssc_code) > 0 else None
-        properties_str = add_arg(args, "Properties", vals, 17)
+        energisation_status_code = add_arg(args, "Energisation Status", vals, 18)
+        energisation_status = EnergisationStatus.get_by_code(
+            sess, energisation_status_code
+        )
+        properties_str = add_arg(args, "Properties", vals, 19)
         try:
             properties = loads(properties_str)
         except ZishException as e:
-            raise BadRequest("Can't parse the properties field. " + str(e))
-        imp_mpan_core = add_arg(args, "Import MPAN Core", vals, 18)
+            raise BadRequest(f"Can't parse the properties field. {e}")
+        imp_mpan_core = add_arg(args, "Import MPAN Core", vals, 20)
         if len(imp_mpan_core) == 0:
             imp_mpan_core = None
         else:
@@ -1272,55 +1278,48 @@ def general_import_supply(sess, action, vals, args):
             imp_supplier_account = None
             imp_sc = None
         else:
-            imp_llfc_code = add_arg(args, "Import LLFC", vals, 19)
-            imp_sc_str = add_arg(args, "Import Agreed Supply Capacity", vals, 20)
+            imp_llfc_code = add_arg(args, "Import LLFC", vals, 21)
+            imp_sc_str = add_arg(args, "Import Agreed Supply Capacity", vals, 22)
             try:
                 imp_sc = int(imp_sc_str)
             except ValueError as e:
-                raise BadRequest(
-                    "The import supply capacity must be an integer." + str(e)
-                )
+                raise BadRequest(f"The import supply capacity must be an integer. {e}")
 
             imp_supplier_contract_name = add_arg(
-                args, "Import Supplier Contract", vals, 21
+                args, "Import Supplier Contract", vals, 23
             )
-            imp_supplier_account = add_arg(args, "Import Supplier Account", vals, 22)
+            imp_supplier_account = add_arg(args, "Import Supplier Account", vals, 24)
             imp_supplier_contract = Contract.get_supplier_by_name(
                 sess, imp_supplier_contract_name
             )
 
-        exp_supplier_contract = None
-        exp_sc = None
-        exp_llfc_code = None
-        exp_mpan_core = None
+        exp_supplier_contract = exp_sc = exp_llfc_code = exp_mpan_core = None
         exp_supplier_account = None
-        if len(vals) > 22:
-            exp_mpan_core = add_arg(args, "Export MPAN Core", vals, 23)
+        if len(vals) > 25:
+            exp_mpan_core = add_arg(args, "Export MPAN Core", vals, 25)
             if len(exp_mpan_core) == 0:
                 exp_mpan_core = None
             else:
                 exp_mpan_core = parse_mpan_core(exp_mpan_core)
 
             if exp_mpan_core is not None:
-                exp_llfc_code = add_arg(args, "Export LLFC", vals, 24)
-                exp_sc_str = add_arg(args, "Export Agreed Supply Capacity", vals, 25)
+                exp_llfc_code = add_arg(args, "Export LLFC", vals, 26)
+                exp_sc_str = add_arg(args, "Export Agreed Supply Capacity", vals, 27)
                 try:
                     exp_sc = int(exp_sc_str)
                 except ValueError as e:
                     raise BadRequest(
-                        "The export agreed supply capacity "
-                        + "must be an integer."
-                        + str(e)
+                        f"The export agreed supply capacity must be an integer. {e}"
                     )
 
                 exp_supplier_contract_name = add_arg(
-                    args, "Export Supplier Contract", vals, 26
+                    args, "Export Supplier Contract", vals, 28
                 )
                 exp_supplier_contract = Contract.get_supplier_by_name(
                     sess, exp_supplier_contract_name
                 )
                 exp_supplier_account = add_arg(
-                    args, "Export Supplier Account", vals, 27
+                    args, "Export Supplier Account", vals, 29
                 )
 
         supply = site.insert_e_supply(
@@ -1340,7 +1339,9 @@ def general_import_supply(sess, action, vals, args):
             pc,
             mtc_code,
             cop,
+            comm,
             ssc,
+            energisation_status,
             properties,
             imp_mpan_core,
             imp_llfc_code,

chellow/templates/base.html

@@ -107,6 +107,7 @@
 									<li><a href="/e/sscs" title="SSCs">SSCs</a></li>
 									<li><a href="/e/gsp_groups" title="GSP Groups">GSP Groups</a></li>
 									<li><a href="/e/cops" title="CoPs">CoPs</a></li>
+									<li><a href="/e/comms" title="Comms">Comms</a></li>
 									<li><a href="/bill_types" title="Bill Types">Bill Types</a></li>
 									<li><a href="/e/read_types" title="Read Types">Read Types</a></li>
 									<li>

chellow/templates/e/comm.html

@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block nav %}
-	<a href="/comms">Comms</a> &raquo; {{comms.description}}
+	<a href="/e/comms">Comms</a> &raquo; {{comm.description}}
 {% endblock %}
 
 {% block content %}
@@ -13,11 +13,11 @@
 	<table>
 		<tr>
 			<th>Code</th>
-			<td>{{comms.code}}</td>
+			<td>{{comm.code}}</td>
 		</tr>
 		<tr>
 			<th>Description</th>
-			<td>{{comms.description}}</td>
+			<td>{{comm.description}}</td>
 		</tr>
 	</table>
 	

chellow/templates/general_imports.html

@@ -89,6 +89,7 @@
 				<td>Profile Class</td>
 				<td>Meter Timeswitch Class</td>
 				<td>CoP</td>
+				<td>Comms Type</td>
 				<td>
 					Standard Settlement Configuration (blank for HH supplies)
 				</td>

{chellow-1713170458.0.0.dist-info → chellow-1713268896.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1713170458.0.0
+Version: 1713268896.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)

{chellow-1713170458.0.0.dist-info → chellow-1713268896.0.0.dist-info}/RECORD

@@ -4,7 +4,7 @@ chellow/bank_holidays.py,sha256=T_utYMwe_g1dz5X-aOTdIPryg49SvB7QsWM1yphlqG8,4423
 chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=5SmP-0QPK6xCkd_wjIWh_8FAzN5OxNHCzyEQ1Xb-Y-M,5256
 chellow/edi_lib.py,sha256=het3R0DBGtXEo-Sy1zvXQuX9EWQ1X6Y33G4l1hYYuds,51859
-chellow/general_import.py,sha256=4LduwzNipxOiHYHQLb0x96_m3RPuDnQMbJzOFDbOqTg,65039
+chellow/general_import.py,sha256=d_bDfUW8VulF6FqT5q7jiQ0a_NmVpUVyzXNgNBLpn0k,65263
 chellow/models.py,sha256=9SDx150OdxFnw4tfpvLn2fB0NsqlrE57VqdRPYz9OnE,237335
 chellow/national_grid.py,sha256=uxcv0qisHPyzw9AVIYPzsRqwt2XPAcZL-SBR12qcrS0,4364
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
@@ -38,12 +38,12 @@ chellow/e/system_price.py,sha256=3cPWohHmmBI9v7fENLBzXQkpAeC3r0s5xV29Nmr6k_E,583
 chellow/e/tlms.py,sha256=kHAy2A2d1Mma7x4GdNDyrzscJd5DpJtDBYiZEg241Dw,8538
 chellow/e/tnuos.py,sha256=KoMPJDIXfE4zwhSDuywGF1ooxjTYLVjtF7BkSFm6X24,4158
 chellow/e/triad.py,sha256=S6LEMHvUKhAZe0-yfLIRciYDZ8IKMn1jh1TmmsbQD3s,13588
-chellow/e/views.py,sha256=8Rmm6XuNGXACFSSX_LpomyTC4oS2-nljRlisjEyUVJ4,213975
+chellow/e/views.py,sha256=ccA5ebQA8Oefwi9L71rbStvHenDMB4rhAu0iRMandLc,213977
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=UgWXDPzQkQghyj_lfgBqoSJpHB-t-qOdSaB8qY6GLog,4071
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=-HMoIfa_utXYKA44RuC0Xqv3vd2HLeQU_4P0iBUd3WA,4219
 chellow/e/bill_parsers/bgb_edi.py,sha256=GuwHeYbAGk7BVg5n19FcTANFDyKI-y0z3f9niQaPSSw,4828
-chellow/e/bill_parsers/csv.py,sha256=GBsJK0c7_m-9s17LXRuCPfHsVngbeaTs5wsZxL5dLNI,5540
+chellow/e/bill_parsers/csv.py,sha256=U5zcIaZ6B5QTTpFDAcBnk4G2r8B3j5kJhDPL4AJNkEk,5640
 chellow/e/bill_parsers/engie_edi.py,sha256=CTobTskDjzdcqqf_qk2ukDSaTLrVpGZMM0sYlwehog4,14985
 chellow/e/bill_parsers/engie_xls.py,sha256=jrut2heH_ZWmSjcn7celOydZS9Y49GfpYjDk_EKwamI,14453
 chellow/e/bill_parsers/engie_xlsx.py,sha256=L6lmTslsJxtFAWkRn6f4xFHBCwgoH5sW8x4_ckE4T7g,15793
@@ -106,7 +106,7 @@ chellow/static/images/favicon_test.svg,sha256=HnLS_BjNt8M0Ikko5Z-f_E2aed7y6RRU6j
 chellow/static/images/logo.png,sha256=XMW2XwukTicKVJ46E2SnbHJYh77uFLVYlwR4xN43YKg,1569
 chellow/static/js/htmx.min.js,sha256=_TRunIY51GJIk_xFXyQHoJtBgwFzbdGOu7B3ZGN_tHg,42819
 chellow/templates/403.html,sha256=49f75OKp0eS8wi2D1YBhdv7bKTNtfs6BTXZPXlxCbDs,344
-chellow/templates/base.html,sha256=v14n4jr4eGYG9i7IduibJKCgNLbPQrCQLCGc416SK7M,6520
+chellow/templates/base.html,sha256=tilhJHj1oTB7H802TSobnuIDip9o2Ws4zJSleM3bgUM,6581
 chellow/templates/bill_type.html,sha256=dNNEaQ9ZVghLCAvxQ6IDalw0K0-BIjEQap6u1zu6TW8,402
 chellow/templates/bill_types.html,sha256=YKy6cnzzch756dlTnl01ZU0K5NVuTZtBJQV32ZphHvc,471
 chellow/templates/chain.html,sha256=iOnSoDQOO_-1tfcxUHQKDAUnV4QbCYu5PPNmS4RkOg4,775
@@ -114,7 +114,7 @@ chellow/templates/csv_sites_monthly_duration.html,sha256=59gErG6KwA57z-qh2EJsVGv
 chellow/templates/downloads.html,sha256=R9QPcFz-PLJOX7rDlmquIk-Hp9Iq-thzWCTfOexSpXg,937
 chellow/templates/edi_viewer.html,sha256=szUthgHOdph6Of-7f_1LeC_zYlNJaMeS5ctn6xTAeiM,1437
 chellow/templates/general_import.html,sha256=SMemHGu466Be3_cAWSS6Hn-Kv-1psbEMDD6NQG6bfbI,1013
-chellow/templates/general_imports.html,sha256=x6V4xO7gznQR5l3PQKVNZaqvp2S2E8wRz4DysZk17Cw,13026
+chellow/templates/general_imports.html,sha256=9rFbve28ADnfJ4CL45vJbOPG-mAYBETWVa_ctgcXvHg,13050
 chellow/templates/home.html,sha256=_ANKmcnlk_PDyZl6SCmejU8d90f3t8EH_rDDPDyYUwE,5657
 chellow/templates/input_date.html,sha256=rpgB5n0LfN8Y5djN_ZiuSxqdskxzCoKrEqI7hyJkVQo,1248
 chellow/templates/local_report.html,sha256=pV7_0QwyQ-D3OS9LXrly5pq3qprZnwTCoq6vCnMTkS4,1332
@@ -159,7 +159,7 @@ chellow/templates/e/channel_edit.html,sha256=OUkdiS2NBQ_w4gmxRxXAcRToM5BT8DWWJrt
 chellow/templates/e/channel_snag.html,sha256=wBJ5KBfeJdAeRmaB0qu0AD9Z4nM5fn6tJ_8bNqTWtoo,1477
 chellow/templates/e/channel_snag_edit.html,sha256=sUFI4Ml3F1B35x8_t_Pz3hWuQN9Xtxr3kt4u8hdxNwY,1911
 chellow/templates/e/channel_snags.html,sha256=1dzC5FoCJ8bg6PBsQrVqGLn-DbPE2EHQklfm_pg3w0c,2899
-chellow/templates/e/comm.html,sha256=te-e05H2RiVXCgMOFizaL_yAmK_XZXxUUEB4Y9syymo,384
+chellow/templates/e/comm.html,sha256=DSlAaDg1r4KYq9VUgDtt2lgW6apZjZvwhMujIJINmps,383
 chellow/templates/e/comms.html,sha256=bUXZePnMfpKk1E71qLGOSkx8r3GxdPPD_-MosIXXq4s,434
 chellow/templates/e/cop.html,sha256=ULv7ALFJHMUgPX96hQNm2irc3edtKYHS6fYAxvmzj8M,376
 chellow/templates/e/cops.html,sha256=2uFpVZOZtEe8fBE9NU-hElVvT_gTLk9peHNfPKW0PAY,425
@@ -363,6 +363,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-1713170458.0.0.dist-info/METADATA,sha256=jsIhe6SXeJE6_db4xKxZuSbP2Wa-d-cmExura-J5Hyo,12205
-chellow-1713170458.0.0.dist-info/WHEEL,sha256=xl5aZkiJYVTjhVaiADvIe6UeUVylGNomrxKZ0Zda1CE,87
-chellow-1713170458.0.0.dist-info/RECORD,,
+chellow-1713268896.0.0.dist-info/METADATA,sha256=WJKCUej3oxzq27gZWOLH0JBzVZOal2NmaTyMmJSLcnQ,12205
+chellow-1713268896.0.0.dist-info/WHEEL,sha256=K0BPUNF1N3kQ9olb8aVEtkObePEjdr2JOLT1N83EVws,87
+chellow-1713268896.0.0.dist-info/RECORD,,

{chellow-1713170458.0.0.dist-info → chellow-1713268896.0.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.23.0
+Generator: hatchling 1.24.0
 Root-Is-Purelib: true
 Tag: py3-none-any