chellow 1718904221.0.0__py3-none-any.whl → 1720006293.0.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of chellow might be problematic. Click here for more details.

Files changed (9) hide show
  1. chellow/e/bill_parsers/mm.py +5 -0
  2. chellow/models.py +13 -0
  3. chellow/reports/report_231.py +26 -25
  4. chellow/reports/report_81.py +30 -29
  5. chellow/reports/report_87.py +27 -28
  6. chellow/templates/supplies.html +2 -7
  7. {chellow-1718904221.0.0.dist-info → chellow-1720006293.0.0.dist-info}/METADATA +1 -1
  8. {chellow-1718904221.0.0.dist-info → chellow-1720006293.0.0.dist-info}/RECORD +9 -9
  9. {chellow-1718904221.0.0.dist-info → chellow-1720006293.0.0.dist-info}/WHEEL +1 -1
chellow/e/bill_parsers/mm.py CHANGED
@@ -68,11 +68,16 @@ CHARGE_UNITS_LOOKUP = {
68
68
  "SAG": "days",
69
69
  "TNUOS": "days",
70
70
  "REAP": "kvarh",
71
+ "DCDA": "days",
72
+ "MOP1": "days",
73
+ "COMM": "days",
71
74
  }
72
75
 
73
76
  ELEMENT_LOOKUP = {
74
77
  "10ANNUAL": "standing",
75
78
  "20RS0108": "single",
79
+ "30ANNUAL": "mop",
80
+ "50ANNUAL": "dc",
76
81
  "9WANNUAL": "site-fee",
77
82
  "20RS0123": "day",
78
83
  "30RS0123": "night",
chellow/models.py CHANGED
@@ -7486,6 +7486,18 @@ def db_upgrade_47_to_48(sess, root_path):
7486
7486
  DtcMeterType.insert(sess, code, desc)
7487
7487
 
7488
7488
 
7489
+ def db_upgrade_48_to_49(sess, root_path):
7490
+ for code, factor_str in (
7491
+ ("MCUF", "28.316846592"),
7492
+ ("HCUF", "2.8316846592"),
7493
+ ("TCUF", "0.28316846592"),
7494
+ ("OCUF", "0.028316846592"),
7495
+ ):
7496
+ g_unit = GUnit.get_by_code(sess, code)
7497
+ g_unit.factor = Decimal(factor_str)
7498
+ sess.flush()
7499
+
7500
+
7489
7501
  upgrade_funcs = [None] * 18
7490
7502
  upgrade_funcs.extend(
7491
7503
  [
@@ -7519,6 +7531,7 @@ upgrade_funcs.extend(
7519
7531
  db_upgrade_45_to_46,
7520
7532
  db_upgrade_46_to_47,
7521
7533
  db_upgrade_47_to_48,
7534
+ db_upgrade_48_to_49,
7522
7535
  ]
7523
7536
  )
7524
7537
 
chellow/reports/report_231.py CHANGED
@@ -36,6 +36,9 @@ def content(user_id, start_date, finish_date, contract_id):
36
36
  "energisation_status",
37
37
  "gsp_group",
38
38
  "dno",
39
+ "era_start",
40
+ "pc",
41
+ "meter_type",
39
42
  "site_code",
40
43
  "imp_is_substation",
41
44
  "imp_llfc_code",
@@ -46,7 +49,8 @@ def content(user_id, start_date, finish_date, contract_id):
46
49
  ]
47
50
 
48
51
  bill_titles = contract_func(caches, contract, "virtual_bill_titles")()
49
- writer.writerow(header_titles + bill_titles)
52
+ titles = header_titles + bill_titles
53
+ writer.writerow(titles)
50
54
  vb_func = contract_func(caches, contract, "virtual_bill")
51
55
 
52
56
  for era in (
@@ -77,34 +81,31 @@ def content(user_id, start_date, finish_date, contract_id):
77
81
  exp_llfc_description = supply_source.llfc.description
78
82
  imp_is_substation = imp_llfc_code = imp_llfc_description = None
79
83
 
80
- out = [
81
- era.imp_mpan_core,
82
- era.exp_mpan_core,
83
- chunk_start,
84
- chunk_finish,
85
- supply_source.energisation_status_code,
86
- supply_source.gsp_group_code,
87
- supply_source.dno_code,
88
- era.get_physical_site(sess).code,
89
- imp_is_substation,
90
- imp_llfc_code,
91
- imp_llfc_description,
92
- exp_is_substation,
93
- exp_llfc_code,
94
- exp_llfc_description,
95
- ]
84
+ out = {
85
+ "imp_mpan_core": era.imp_mpan_core,
86
+ "exp_mpan_core": era.exp_mpan_core,
87
+ "start_date": chunk_start,
88
+ "finish_date": chunk_finish,
89
+ "energisation_status": supply_source.energisation_status_code,
90
+ "gsp_group": supply_source.gsp_group_code,
91
+ "dno": supply_source.dno_code,
92
+ "era_start": era.start_date,
93
+ "pc": supply_source.pc_code,
94
+ "meter_type": supply_source.meter_type_code,
95
+ "site_code": era.get_physical_site(sess).code,
96
+ "imp_is_substation": imp_is_substation,
97
+ "imp_llfc_code": imp_llfc_code,
98
+ "imp_llfc_description": imp_llfc_description,
99
+ "exp_is_substation": exp_is_substation,
100
+ "exp_llfc_code": exp_llfc_code,
101
+ "exp_llfc_description": exp_llfc_description,
102
+ }
96
103
  vb_func(supply_source)
97
104
  bill = supply_source.mop_bill
98
105
  for title in bill_titles:
99
106
  if title in bill:
100
- out.append(bill[title])
101
- del bill[title]
102
- else:
103
- out.append("")
104
- for k in sorted(bill.keys()):
105
- out.append(k)
106
- out.append(bill[k])
107
- writer.writerow(csv_make_val(v) for v in out)
107
+ out[title] = bill[title]
108
+ writer.writerow(csv_make_val(out.get(t)) for t in titles)
108
109
 
109
110
  sess.rollback() # Avoid long-running transactions
110
111
  except BadRequest as e:
chellow/reports/report_81.py CHANGED
@@ -37,13 +37,16 @@ def content(user_id, contract_id, end_year, end_month, months):
37
37
 
38
38
  bill_titles = contract_func(caches, contract, "virtual_bill_titles")()
39
39
  header_titles = [
40
- "Import MPAN Core",
41
- "Export MPAN Core",
42
- "Start Date",
43
- "Finish Date",
40
+ "imp_mpan_core",
41
+ "exp_mpan_core",
42
+ "start_date",
43
+ "finish_date",
44
44
  "energisation_status",
45
45
  "gsp_group",
46
46
  "dno",
47
+ "era_start",
48
+ "pc",
49
+ "meter_type",
47
50
  "site_code",
48
51
  "imp_is_substation",
49
52
  "imp_llfc_code",
@@ -55,7 +58,8 @@ def content(user_id, contract_id, end_year, end_month, months):
55
58
 
56
59
  vb_func = contract_func(caches, contract, "virtual_bill")
57
60
 
58
- writer.writerow(header_titles + bill_titles)
61
+ titles = header_titles + bill_titles
62
+ writer.writerow(titles)
59
63
 
60
64
  for era in (
61
65
  sess.query(Era)
@@ -86,36 +90,33 @@ def content(user_id, contract_id, end_year, end_month, months):
86
90
  exp_llfc_description = supply_source.llfc.description
87
91
  imp_is_substation = imp_llfc_code = imp_llfc_description = None
88
92
 
89
- vals = [
90
- era.imp_mpan_core,
91
- era.exp_mpan_core,
92
- chunk_start,
93
- chunk_finish,
94
- supply_source.energisation_status_code,
95
- supply_source.gsp_group_code,
96
- supply_source.dno_code,
97
- era.get_physical_site(sess).code,
98
- imp_is_substation,
99
- imp_llfc_code,
100
- imp_llfc_description,
101
- exp_is_substation,
102
- exp_llfc_code,
103
- exp_llfc_description,
104
- ]
93
+ vals = {
94
+ "imp_mpan_core": era.imp_mpan_core,
95
+ "exp_mpan_core": era.exp_mpan_core,
96
+ "start_date": chunk_start,
97
+ "finish_date": chunk_finish,
98
+ "energisation_status": supply_source.energisation_status_code,
99
+ "gsp_group": supply_source.gsp_group_code,
100
+ "dno": supply_source.dno_code,
101
+ "era_start": era.start_date,
102
+ "pc": supply_source.pc_code,
103
+ "meter_type": supply_source.meter_type_code,
104
+ "site_code": era.get_physical_site(sess).code,
105
+ "imp_is_substation": imp_is_substation,
106
+ "imp_llfc_code": imp_llfc_code,
107
+ "imp_llfc_description": imp_llfc_description,
108
+ "exp_is_substation": exp_is_substation,
109
+ "exp_llfc_code": exp_llfc_code,
110
+ "exp_llfc_description": exp_llfc_description,
111
+ }
105
112
 
106
113
  vb_func(supply_source)
107
114
  bill = supply_source.dc_bill
108
115
 
109
116
  for title in bill_titles:
110
- vals.append(bill.get(title))
111
- if title in bill:
112
- del bill[title]
117
+ vals[title] = bill.get(title)
113
118
 
114
- for k in sorted(bill.keys()):
115
- vals.append(k)
116
- vals.append(bill[k])
117
-
118
- writer.writerow(csv_make_val(v) for v in vals)
119
+ writer.writerow(csv_make_val(vals.get(t)) for t in titles)
119
120
 
120
121
  # Avoid long-running transactions
121
122
  sess.rollback()
chellow/reports/report_87.py CHANGED
@@ -83,37 +83,32 @@ def _process_era(
83
83
  exp_llfc_description = data_source.llfc.description
84
84
  imp_is_substation = imp_llfc_code = imp_llfc_description = None
85
85
 
86
- vals = [
87
- data_source.mpan_core,
88
- site.code,
89
- site.name,
90
- data_source.supplier_account,
91
- data_source.start_date,
92
- data_source.finish_date,
93
- data_source.energisation_status_code,
94
- data_source.gsp_group_code,
95
- data_source.dno_code,
96
- imp_is_substation,
97
- imp_llfc_code,
98
- imp_llfc_description,
99
- exp_is_substation,
100
- exp_llfc_code,
101
- exp_llfc_description,
102
- ]
86
+ vals = {
87
+ "mpan_core": data_source.mpan_core,
88
+ "site_code": site.code,
89
+ "site_name": site.name,
90
+ "account": data_source.supplier_account,
91
+ "from": data_source.start_date,
92
+ "to": data_source.finish_date,
93
+ "energisation_status": data_source.energisation_status_code,
94
+ "gsp_group": data_source.gsp_group_code,
95
+ "dno": data_source.dno_code,
96
+ "era_start": era.start_date,
97
+ "pc": data_source.pc_code,
98
+ "meter_type": data_source.meter_type_code,
99
+ "imp_is_substation": imp_is_substation,
100
+ "imp_llfc_code": imp_llfc_code,
101
+ "imp_llfc_description": imp_llfc_description,
102
+ "exp_is_substation": exp_is_substation,
103
+ "exp_llfc_code": exp_llfc_code,
104
+ "exp_llfc_description": exp_llfc_description,
105
+ }
103
106
 
104
107
  vb_func(data_source)
105
108
  bill = data_source.supplier_bill
106
109
  for title in bill_titles:
107
110
  if title in bill:
108
- val = bill[title]
109
- del bill[title]
110
- else:
111
- val = ""
112
- vals.append(val)
113
-
114
- for k in sorted(bill.keys()):
115
- vals.append(k)
116
- vals.append(str(bill[k]))
111
+ vals[title] = bill[title]
117
112
 
118
113
  return vals
119
114
 
@@ -163,6 +158,9 @@ def create_csv(f, sess, start_date, finish_date, contract_id):
163
158
  "energisation_status",
164
159
  "gsp_group",
165
160
  "dno",
161
+ "era_start",
162
+ "pc",
163
+ "meter_type",
166
164
  "imp_is_substation",
167
165
  "imp_llfc_code",
168
166
  "imp_llfc_description",
@@ -170,7 +168,8 @@ def create_csv(f, sess, start_date, finish_date, contract_id):
170
168
  "exp_llfc_code",
171
169
  "exp_llfc_description",
172
170
  ]
173
- writer.writerow(header_titles + bill_titles)
171
+ titles = header_titles + bill_titles
172
+ writer.writerow(titles)
174
173
  vb_func = contract_func(caches, contract, "virtual_bill")
175
174
 
176
175
  for month_start, month_finish in month_pairs:
@@ -201,7 +200,7 @@ def create_csv(f, sess, start_date, finish_date, contract_id):
201
200
  period_finish,
202
201
  era,
203
202
  )
204
- writer.writerow(csv_make_val(v) for v in vals)
203
+ writer.writerow(csv_make_val(vals.get(t)) for t in titles)
205
204
  except BadRequest as e:
206
205
  raise BadRequest(
207
206
  f"Problem with {chellow.utils.url_root}eras/{era.id}/edit "
chellow/templates/supplies.html CHANGED
@@ -126,15 +126,10 @@
126
126
  <tbody>
127
127
  {% for g_era in g_eras %}
128
128
  <tr>
129
- <td>
130
- <a href="/g_supplies/{{g_era.g_supply_id}}">supply</a>
131
- </td>
129
+ <td><a href="/g/supplies/{{g_era.g_supply_id}}">supply</a></td>
132
130
  <td>{{g_era.g_supply.mprn}}</td>
133
131
  <td>{{g_era.msn}}</td>
134
- <td>
135
- <a
136
- href="/g_contracts/{{g_era.g_contract.id}}"
137
- >{{g_era.g_contract.name}}</a>
132
+ <td><a href="/g/contracts/{{g_era.g_contract.id}}">{{g_era.g_contract.name}}</a>
138
133
  </td>
139
134
  <td>{{g_era.account}}</td>
140
135
  </tr>
{chellow-1718904221.0.0.dist-info → chellow-1720006293.0.0.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: chellow
3
- Version: 1718904221.0.0
3
+ Version: 1720006293.0.0
4
4
  Summary: Web Application for checking UK energy bills.
5
5
  Project-URL: Homepage, https://github.com/WessexWater/chellow
6
6
  Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
{chellow-1718904221.0.0.dist-info → chellow-1720006293.0.0.dist-info}/RECORD RENAMED
@@ -5,7 +5,7 @@ chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
5
5
  chellow/dloads.py,sha256=5SmP-0QPK6xCkd_wjIWh_8FAzN5OxNHCzyEQ1Xb-Y-M,5256
6
6
  chellow/edi_lib.py,sha256=alu20x9ZX06iPfnNI9dEJzuP6RIf4We3Y_M_bl7RrcY,51789
7
7
  chellow/general_import.py,sha256=l3EHq9zG9Vfl5Ee6XTVrC1nusXo4YGGB4VBmZ_JaJR8,65798
8
- chellow/models.py,sha256=l2bFiDgU_Wv6jpyRjAlOKMbO2AEMtka-dTigNFENNeY,242727
8
+ chellow/models.py,sha256=SYLBU6olcoYlrqSGeF6YYDHP_1pf4xT_M1QpHDOYCIs,243088
9
9
  chellow/national_grid.py,sha256=uxcv0qisHPyzw9AVIYPzsRqwt2XPAcZL-SBR12qcrS0,4364
10
10
  chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
11
11
  chellow/rate_server.py,sha256=fg-Pf_9Hk3bXmC9riPQNGQxBvLvBa_WtNYdwDCjnCSg,5678
@@ -51,7 +51,7 @@ chellow/e/bill_parsers/gdf_csv.py,sha256=ZfK3Oc6oP28p_P9DIevLNB_zW2WLcEJ3Lvb1gL3
51
51
  chellow/e/bill_parsers/haven_csv.py,sha256=0uENq8IgVNqdxfBQMBxLTSZWCOuDHXZC0xzk52SbfyE,13652
52
52
  chellow/e/bill_parsers/haven_edi.py,sha256=YGPHRxPOhje9s32jqPHHELni2tooOYj3cMC_qaZVPq4,16107
53
53
  chellow/e/bill_parsers/haven_edi_tprs.py,sha256=ZVX9CCqUybsot_Z0BEOJPvl9x5kSr7fEWyuJXvZDcz4,11841
54
- chellow/e/bill_parsers/mm.py,sha256=ShhaVc0IpShpy4Q2pfj3EfjhpjbffQutKsAq6ivNiys,8522
54
+ chellow/e/bill_parsers/mm.py,sha256=WpjKJZ0HW6Yko3aZiq43HQU-i_rrBWgQTqggJB3FIEU,8627
55
55
  chellow/e/bill_parsers/nonsettlement_dc_stark_xlsx.py,sha256=yogXTuQHGRL7IiqvRWr2C9V24ez1j9Yx0128UygPE_k,4723
56
56
  chellow/e/bill_parsers/settlement_dc_stark_xlsx.py,sha256=PlEqCZuJ9DfQXeeYQ64jtf3ML7sUt_tt61QOOTnkE5c,6380
57
57
  chellow/e/bill_parsers/sse_edi.py,sha256=L85DOfNkqexeEIEr8pCBn_2sHJI-zEaw6cogpE3YyYM,15204
@@ -74,7 +74,7 @@ chellow/reports/report_181.py,sha256=mCL6vXfrj8r0kL-LilDS0SnSu5tJOzCq7eMJVx9zpEw
74
74
  chellow/reports/report_183.py,sha256=DZX-hHJPl_Tbgkt31C_cuLZg_5L2b6iCPQ5foOZizR0,8817
75
75
  chellow/reports/report_187.py,sha256=UvpaYHjyJFNV5puYq8_KxfzoBtVrwFgIGUOmC5oGA9A,9956
76
76
  chellow/reports/report_219.py,sha256=cA0lfJKnJg41Zc4_gZB1KUXZ9JeJo0TiTlu5jm1bdDM,7158
77
- chellow/reports/report_231.py,sha256=gOb1AkXZQvwVpRg5cIenO7iR7Se1_zsWnJp9l2BlgpA,5008
77
+ chellow/reports/report_231.py,sha256=uhO1algP7sibpZVaniqGs56HOCPCQeDO-Y-UfvFQwnI,5311
78
78
  chellow/reports/report_233.py,sha256=cIatj-HHYW_GNIRsji-DlsmYjt8rUdm_5xujPLOYL8U,4537
79
79
  chellow/reports/report_241.py,sha256=AlFmSHnfG2HWv_ICmWX7fNpPwLHjq7mo1QtOTjSKO3k,5384
80
80
  chellow/reports/report_247.py,sha256=ozgCcee8XeqYbOpZCyU2STJKaz6h2x7TYQogagTaYLw,46626
@@ -85,8 +85,8 @@ chellow/reports/report_387.py,sha256=kmBZopb0AOivcowO2nPjRj6LnV0_QjCDXLwqPL7IGVE
85
85
  chellow/reports/report_41.py,sha256=QQeTshA1Og7N3wPaoZ8ynJzwsvZ1mgSFc7DDkVqIZoM,7447
86
86
  chellow/reports/report_429.py,sha256=0GCc0rQnOSG0fusw69yMMOCxnWApBd3P2sGWIg1py9M,12359
87
87
  chellow/reports/report_59.py,sha256=CCFPUspUFgoMt6sMFsdtLYW-inA9rN6D-6Kted6vskA,45458
88
- chellow/reports/report_81.py,sha256=UYr0Dm4TmCCYUbIWw3hWNI0GdQRhH27vwVk3Ytdsrcg,5288
89
- chellow/reports/report_87.py,sha256=ZadBo40rUORN0Fi926-dDHeTFn6L-fBzp3b4k7v5MdY,6802
88
+ chellow/reports/report_81.py,sha256=f7sKPZUbl2VDbDHIg7B5rMDxcx_xnV1Y6PbjJyiTPLA,5609
89
+ chellow/reports/report_87.py,sha256=j2gdBOapaVY1ZnlNlw14RPx58_k8eUkc3oRSnKuCsNA,7057
90
90
  chellow/reports/report_asset_comparison.py,sha256=UN298MHuzyUDUiiZr7F_Ua6SrdVOlFLjgKjnIbrA-14,6118
91
91
  chellow/reports/report_batches.py,sha256=7O5TcB9W1sPKS0LQMsC6sUDzx73X5iyoZE0O3zK91zs,4798
92
92
  chellow/reports/report_bills.py,sha256=AHW6tiZAOE0gXDfencPvemE4zqK6eTqfN8_bWQ4RT5o,3323
@@ -147,7 +147,7 @@ chellow/templates/site_hh_data.html,sha256=xmSJ5h_DvI1-bnV7FdBodDUvDCU0-q-UHYj2M
147
147
  chellow/templates/site_months.html,sha256=oXtCN7YD4_QhDkXfRsrmhLAEhIMHaGdK1EmTmECfN6o,6562
148
148
  chellow/templates/site_used_graph.html,sha256=NXuQYcPXnk2mHb2O4mxVPZ1R-X-MWPwneUV-J6z285w,3094
149
149
  chellow/templates/sites.html,sha256=4ouJ5xYqYHjXCv3cDucTjgbOd_whReFPPHopLBdW6Go,621
150
- chellow/templates/supplies.html,sha256=o1BLUlmiuRDlBEVxMIqvlXt2PskggcMrWtk2xBJSy54,3530
150
+ chellow/templates/supplies.html,sha256=Ie_4K4-KwXqrCBwaUcjWxmV27rYjeESI_DCS9gLUipk,3488
151
151
  chellow/templates/system.html,sha256=PP8MN8mieil3AwLS1WlQBcgbl0J61bksN-Cy4toYNqo,1871
152
152
  chellow/templates/tester.html,sha256=4DYrtcnFY0y6o3K6_tSmFpPlCRngZj1zo8nJ1NI4pk8,623
153
153
  chellow/templates/user.html,sha256=7nl_awpvotaaEO1UBA6DL4yjSUNTxgQjFx9dhnwcoFE,3255
@@ -364,6 +364,6 @@ chellow/templates/g/supply_note_edit.html,sha256=b8mB6_ucBwoljp03iy6AgVaZUhGw3-1
364
364
  chellow/templates/g/supply_notes.html,sha256=6epNmZ3NKdXZz27fvmRUGeffg_oc1kmwuBeyRzQe3Rg,854
365
365
  chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
366
366
  chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
367
- chellow-1718904221.0.0.dist-info/METADATA,sha256=IisGBzL1b8FQnHDQYk0fVZH4QA21ue5l6JYZ8K4pVIE,12205
368
- chellow-1718904221.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
369
- chellow-1718904221.0.0.dist-info/RECORD,,
367
+ chellow-1720006293.0.0.dist-info/METADATA,sha256=4Fg3yXTfYZ7JKwEwREZI72dTqsSTGAwudXblzYPbCUY,12205
368
+ chellow-1720006293.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
369
+ chellow-1720006293.0.0.dist-info/RECORD,,
{chellow-1718904221.0.0.dist-info → chellow-1720006293.0.0.dist-info}/WHEEL RENAMED
@@ -1,4 +1,4 @@
1
1
  Wheel-Version: 1.0
2
- Generator: hatchling 1.24.2
2
+ Generator: hatchling 1.25.0
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any