chellow 1712932880.0.0__py3-none-any.whl → 1713259114.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/bill_parsers/haven_edi_tprs.py

@@ -15,7 +15,7 @@ read_type_map = {
     "02": "E",
     "11": "E3",
     "01": "EM",
-    "03": "W",
+    "03": "F",
     "06": "X",
     "05": "CP",
     "12": "IF",

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1712932880.0.0
+Version: 1713259114.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-1712932880.0.0.dist-info → chellow-1713259114.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
@@ -43,14 +43,14 @@ chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 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
 chellow/e/bill_parsers/gdf_csv.py,sha256=ZfK3Oc6oP28p_P9DIevLNB_zW2WLcEJ3Lvb1gL310YU,7382
 chellow/e/bill_parsers/haven_csv.py,sha256=0uENq8IgVNqdxfBQMBxLTSZWCOuDHXZC0xzk52SbfyE,13652
 chellow/e/bill_parsers/haven_edi.py,sha256=YGPHRxPOhje9s32jqPHHELni2tooOYj3cMC_qaZVPq4,16107
-chellow/e/bill_parsers/haven_edi_tprs.py,sha256=2JciFf8LdNSiKCsNVWb4q4YLSn4Z3EqhvcdXyIieKdc,11841
+chellow/e/bill_parsers/haven_edi_tprs.py,sha256=ZVX9CCqUybsot_Z0BEOJPvl9x5kSr7fEWyuJXvZDcz4,11841
 chellow/e/bill_parsers/mm.py,sha256=P4CdkskDrjmFMSDp0ehE_ichTBHGywbT_dckMxuAqQQ,1929
 chellow/e/bill_parsers/nonsettlement_dc_stark_xlsx.py,sha256=yogXTuQHGRL7IiqvRWr2C9V24ez1j9Yx0128UygPE_k,4723
 chellow/e/bill_parsers/settlement_dc_stark_xlsx.py,sha256=gKeYMdUO4bVycV8n1lWs5AIfF3bHZLkM6tkasD4rhHs,6239
@@ -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
@@ -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-1712932880.0.0.dist-info/METADATA,sha256=oHh-59J755aWAfb1nD6BJAZUceWIUw2SO7RhBSHKdzk,12205
-chellow-1712932880.0.0.dist-info/WHEEL,sha256=as-1oFTWSeWBgyzh0O_qF439xqBe6AbBgt4MfYe5zwY,87
-chellow-1712932880.0.0.dist-info/RECORD,,
+chellow-1713259114.0.0.dist-info/METADATA,sha256=0JTJ-zEXssG25w46B8KcvxriKareIsEE-kKNQW4JvuI,12205
+chellow-1713259114.0.0.dist-info/WHEEL,sha256=K0BPUNF1N3kQ9olb8aVEtkObePEjdr2JOLT1N83EVws,87
+chellow-1713259114.0.0.dist-info/RECORD,,

{chellow-1712932880.0.0.dist-info → chellow-1713259114.0.0.dist-info}/WHEEL

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