chellow 1716906655.0.0__py3-none-any.whl → 1716928285.0.0__py3-none-any.whl

chellow/e/bill_parsers/mm.py

@@ -73,7 +73,7 @@ CHARGE_UNITS_LOOKUP = {
 ELEMENT_LOOKUP = {
     "10ANNUAL": "standing",
     "20RS0108": "unrestricted",
-    "9WANNUAL": "site_fee",
+    "9WANNUAL": "site-fee",
     "20RS0123": "day",
     "30RS0123": "night",
     "90ANNUAL": "duos-fixed",
@@ -123,7 +123,7 @@ def _handle_0460(headers, pre_record, record):
         breakdown[f"{element_name}-days"] += Decimal(parts["days"])
 
 
-CONSUMPTION_UNITS_LOOKUP = {"KWH": "kwh", "KVA": "kva", "KVARH": "kvarh", "KW": "kw"}
+CONSUMPTION_UNITS_LOOKUP = {"KWH": "kWh", "KVA": "kVA", "KVARH": "kVArh", "KW": "kW"}
 
 REGISTER_CODE_LOOKUP = {"DAY": "00040", "NIGHT": "00206", "SINGLE": "00001"}
 
@@ -150,7 +150,7 @@ def _handle_0461(headers, pre_record, record):
     mpan_core = parse_mpan_core(parts["mpan_core"])
     headers["mpan_core"] = mpan_core
     units = CONSUMPTION_UNITS_LOOKUP[parts["units"].strip()]
-    if units == "kwh":
+    if units == "kWh":
         headers["kwh"] += Decimal(parts["quantity"])
 
     prev_read_date_str = parts["prev_read_date"].strip()
@@ -181,14 +181,14 @@ def _handle_0470(headers, pre_record, record):
 def _handle_1455(headers, pre_record, record):
     parts = _chop_record(record, ccl_kwh=13, unknown_1=8, ccl_rate=15, ccl_gbp=13)
     bd = headers["breakdown"]
-    bd["ccl_kwh"] += Decimal(parts["ccl_kwh"])
-    if "ccl_rate" in bd:
-        ccl_rates = bd["ccl_rate"]
+    bd["ccl-kwh"] += Decimal(parts["ccl_kwh"])
+    if "ccl-rate" in bd:
+        ccl_rates = bd["ccl-rate"]
     else:
-        ccl_rates = bd["ccl_rate"] = set()
+        ccl_rates = bd["ccl-rate"] = set()
 
     ccl_rates.add(Decimal(parts["ccl_rate"]) / Decimal("100"))
-    bd["ccl_gbp"] += Decimal(parts["ccl_gbp"]) / Decimal("100")
+    bd["ccl-gbp"] += Decimal(parts["ccl_gbp"]) / Decimal("100")
 
 
 def _handle_1460(headers, pre_record, record):

chellow/models.py

@@ -567,7 +567,7 @@ class RegisterRead(Base, PersistentClass):
         try:
             return RegisterRead.UNITS_STR[units_str]
         except KeyError:
-            raise BadRequest("The units '" + str(units_str) + " isn't recognized.")
+            raise BadRequest(f"The units '{units_str}' isn't recognized.")
 
     __tablename__ = "register_read"
     id = Column(Integer, primary_key=True)

{chellow-1716906655.0.0.dist-info → chellow-1716928285.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1716906655.0.0
+Version: 1716928285.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-1716906655.0.0.dist-info → chellow-1716928285.0.0.dist-info}/RECORD

@@ -5,7 +5,7 @@ chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=5SmP-0QPK6xCkd_wjIWh_8FAzN5OxNHCzyEQ1Xb-Y-M,5256
 chellow/edi_lib.py,sha256=alu20x9ZX06iPfnNI9dEJzuP6RIf4We3Y_M_bl7RrcY,51789
 chellow/general_import.py,sha256=l3EHq9zG9Vfl5Ee6XTVrC1nusXo4YGGB4VBmZ_JaJR8,65798
-chellow/models.py,sha256=uS4GHh4RF6yD7aSsN4nOC3hdNakHUjW1nVzrhM_79mQ,242736
+chellow/models.py,sha256=l2bFiDgU_Wv6jpyRjAlOKMbO2AEMtka-dTigNFENNeY,242727
 chellow/national_grid.py,sha256=uxcv0qisHPyzw9AVIYPzsRqwt2XPAcZL-SBR12qcrS0,4364
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 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
 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=ZVX9CCqUybsot_Z0BEOJPvl9x5kSr7fEWyuJXvZDcz4,11841
-chellow/e/bill_parsers/mm.py,sha256=faCT5ZiMSDgIg5iiqXuL7c_t3PJBaVGvrndxr17A-bw,8528
+chellow/e/bill_parsers/mm.py,sha256=5ChR3uVImZ6pJe_wZFeDkA06uxcVlyWWizwKJnMR_gg,8528
 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
 chellow/e/bill_parsers/sse_edi.py,sha256=L85DOfNkqexeEIEr8pCBn_2sHJI-zEaw6cogpE3YyYM,15204
@@ -364,6 +364,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-1716906655.0.0.dist-info/METADATA,sha256=0u8nBykmCixKsJ9gwZ2VIgj-2Ho1X5kTgovATHvJiuQ,12205
-chellow-1716906655.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-chellow-1716906655.0.0.dist-info/RECORD,,
+chellow-1716928285.0.0.dist-info/METADATA,sha256=lq5aS6s7xy1rEuw15YFDiVcv3oNv-OeA3IM1cyaKgqc,12205
+chellow-1716928285.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+chellow-1716928285.0.0.dist-info/RECORD,,