chellow 1721045482.0.0__tar.gz → 1722002880.0.0__tar.gz

{chellow-1721045482.0.0 → chellow-1722002880.0.0}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1721045482.0.0
+Version: 1722002880.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)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
+Requires-Dist: cryptography==42.0.8
 Requires-Dist: flask-restx==1.2.0
 Requires-Dist: flask==2.3.3
 Requires-Dist: odio==0.0.23

chellow-1722002880.0.0/VERSION

@@ -0,0 +1 @@
+__version__ = "1722002880.0.0"

{chellow-1721045482.0.0 → chellow-1722002880.0.0}/chellow/e/bill_parsers/mm.py

@@ -3,9 +3,11 @@ from collections import defaultdict
 from decimal import Decimal
 from io import StringIO
 
+from dateutil.relativedelta import relativedelta
+
 from werkzeug.exceptions import BadRequest
 
-from chellow.utils import HH, parse_mpan_core, to_ct, to_utc
+from chellow.utils import parse_mpan_core, to_ct, to_utc
 
 
 def parse_date(date_str):
@@ -55,7 +57,11 @@ def _handle_0100(headers, pre_record, record):
 def _handle_0101(headers, pre_record, record):
     parts = _chop_record(record, start_date=DATE_LENGTH, finish_date=DATE_LENGTH)
     headers["start_date"] = parse_date(parts["start_date"])
-    headers["finish_date"] = to_utc(to_ct(parse_date_naive(parts["finish_date"]) - HH))
+    headers["finish_date"] = to_utc(
+        to_ct(
+            parse_date_naive(parts["finish_date"]) + relativedelta(hours=23, minutes=30)
+        )
+    )
 
 
 CHARGE_UNITS_LOOKUP = {
@@ -132,6 +138,12 @@ CONSUMPTION_UNITS_LOOKUP = {"KWH": "kWh", "KVA": "kVA", "KVARH": "kVArh", "KW":
 
 REGISTER_CODE_LOOKUP = {"DAY": "00040", "NIGHT": "00206", "SINGLE": "00001"}
 
+READ_TYPE_LOOKUP = {
+    " ": "E",
+    "E": "E",
+    "N": "N",
+}
+
 
 def _handle_0461(headers, pre_record, record):
     parts = _chop_record(
@@ -161,6 +173,8 @@ def _handle_0461(headers, pre_record, record):
     prev_read_date_str = parts["prev_read_date"].strip()
     if len(prev_read_date_str) > 0:
         tpr_code = REGISTER_CODE_LOOKUP[parts["register_code"].strip()]
+        prev_type_code = READ_TYPE_LOOKUP[parts["prev_read_type"]]
+        pres_type_code = READ_TYPE_LOOKUP[parts["pres_read_type"]]
 
         headers["reads"].append(
             {
@@ -171,10 +185,10 @@ def _handle_0461(headers, pre_record, record):
                 "tpr_code": tpr_code,
                 "prev_date": parse_date(parts["prev_read_date"]),
                 "prev_value": Decimal(parts["prev_read_value"]),
-                "prev_type_code": parts["prev_read_type"],
+                "prev_type_code": prev_type_code,
                 "pres_date": parse_date(parts["pres_read_date"]),
                 "pres_value": Decimal(parts["pres_read_value"]),
-                "pres_type_code": parts["pres_read_type"],
+                "pres_type_code": pres_type_code,
             }
         )
 
@@ -183,8 +197,23 @@ def _handle_0470(headers, pre_record, record):
     pass
 
 
+def _handle_0860(headers, pre_record, record):
+    parts = _chop_record(
+        record,
+        metering_gbp=12,
+        unknown_1=12,
+        unknown_2=12,
+        metering_date=DATE_LENGTH,
+        description=80,
+    )
+    bd = headers["breakdown"]
+    bd["metering-gbp"] += Decimal(parts["metering_gbp"]) / Decimal("100")
+
+
 def _handle_1455(headers, pre_record, record):
-    parts = _chop_record(record, ccl_kwh=13, unknown_1=8, ccl_rate=15, ccl_gbp=13)
+    parts = _chop_record(
+        record, ccl_kwh=13, unknown_1=8, ccl_rate=15, ccl_gbp=12, unkown_2=8
+    )
     bd = headers["breakdown"]
     bd["ccl-kwh"] += Decimal(parts["ccl_kwh"])
     if "ccl-rate" in bd:
@@ -261,6 +290,7 @@ LINE_HANDLERS = {
     "0460": _handle_0460,
     "0461": _handle_0461,
     "0470": _handle_0470,
+    "0860": _handle_0860,
     "1455": _handle_1455,
     "1460": _handle_1460,
     "1500": _handle_1500,

{chellow-1721045482.0.0 → chellow-1722002880.0.0}/chellow/national_grid.py

@@ -21,7 +21,7 @@ importer = None
 
 def api_get(s, path, params=None):
     url = f"https://api.nationalgrideso.com/api/3/action/{path}"
-    res = s.get(url, params=params)
+    res = s.get(url, params=params, timeout=120)
     try:
         res_j = res.json()
     except requests.exceptions.JSONDecodeError as e:

{chellow-1721045482.0.0 → chellow-1722002880.0.0}/chellow/reports/report_g_monthly_duration.py

@@ -110,7 +110,7 @@ def _process_era(
             f"contain the 'kwh' key."
         )
 
-    billed_kwh = billed_gbp = 0
+    billed_kwh = billed_net_gbp = billed_vat_gbp = billed_gross_gbp = 0
 
     g_era_associates = {s.site.code for s in g_era.site_g_eras if not s.is_physical}
 
@@ -127,7 +127,9 @@ def _process_era(
         ).total_seconds() + (30 * 60)
         overlap_proportion = overlap_duration / bill_duration
         billed_kwh += overlap_proportion * float(g_bill.kwh)
-        billed_gbp += overlap_proportion * float(g_bill.net)
+        billed_net_gbp += overlap_proportion * float(g_bill.net)
+        billed_vat_gbp += overlap_proportion * float(g_bill.vat)
+        billed_gross_gbp += overlap_proportion * float(g_bill.gross)
 
     associated_site_ids = ",".join(sorted(g_era_associates))
     g_era_rows.append(
@@ -149,12 +151,14 @@ def _process_era(
                 kwh,
                 gbp,
                 billed_kwh,
-                billed_gbp,
+                billed_net_gbp,
+                billed_vat_gbp,
+                billed_gross_gbp,
             ]
         ]
         + [make_val(bill.get(t)) for t in vb_titles]
     )
-    return kwh, gbp, billed_kwh, billed_gbp
+    return kwh, gbp, billed_kwh, billed_net_gbp, billed_vat_gbp, billed_gross_gbp
 
 
 def content(
@@ -227,7 +231,14 @@ def content(
                 "associated_site_ids",
                 "month",
             ]
-            summary_titles = ["kwh", "gbp", "billed_kwh", "billed_gbp"]
+            summary_titles = [
+                "kwh",
+                "gbp",
+                "billed_kwh",
+                "billed_net_gbp",
+                "billed_vat_gbp",
+                "billed_gross_gbp",
+            ]
 
             vb_titles = []
             conts = (
@@ -264,7 +275,8 @@ def content(
                     GEra.start_date <= month_finish,
                     or_(GEra.finish_date == null(), GEra.finish_date >= month_start),
                 ):
-                    site_kwh = site_gbp = site_billed_kwh = site_billed_gbp = 0
+                    site_kwh = site_gbp = site_billed_kwh = site_billed_net_gbp = 0
+                    site_billed_vat_gbp = site_billed_gross_gbp = 0
 
                     g_eras_q = (
                         select(GEra)
@@ -290,7 +302,14 @@ def content(
 
                     for g_era in sess.scalars(g_eras_q):
                         try:
-                            kwh, gbp, billed_kwh, billed_gbp = _process_era(
+                            (
+                                kwh,
+                                gbp,
+                                billed_kwh,
+                                billed_net_gbp,
+                                billed_vat_gbp,
+                                billed_gross_gbp,
+                            ) = _process_era(
                                 report_context,
                                 sess,
                                 site,
@@ -305,7 +324,9 @@ def content(
                             site_kwh += kwh
                             site_gbp += gbp
                             site_billed_kwh += billed_kwh
-                            site_billed_gbp += billed_gbp
+                            site_billed_net_gbp += billed_net_gbp
+                            site_billed_vat_gbp += billed_vat_gbp
+                            site_billed_gross_gbp += billed_gross_gbp
                         except BadRequest as e:
                             raise BadRequest(
                                 f"Problem with g_era {g_era.id}: {e.description}"
@@ -328,7 +349,9 @@ def content(
                                 site_kwh,
                                 site_gbp,
                                 site_billed_kwh,
-                                site_billed_gbp,
+                                site_billed_net_gbp,
+                                site_billed_vat_gbp,
+                                site_billed_gross_gbp,
                             ]
                         ]
                     )

{chellow-1721045482.0.0 → chellow-1722002880.0.0}/pyproject.toml

@@ -28,6 +28,7 @@ dependencies = [
 	"pep3143daemon==0.0.6",
 	"pip>=9.0.1",
 	"paramiko==3.4.0",
+  "cryptography==42.0.8", # Remove this when paramiko upgraded
 	"pympler==1.0.1",
 	"psutil==5.9.5",
 	"xlrd==2.0.1",

{chellow-1721045482.0.0 → chellow-1722002880.0.0}/test/e/bill_parsers/test_bill_parser_mm.py

@@ -1,8 +1,29 @@
 from collections import defaultdict
 from decimal import Decimal
 
-from chellow.e.bill_parsers.mm import _handle_0461, _handle_1455
-from chellow.utils import utc_datetime
+from chellow.e.bill_parsers.mm import (
+    _handle_0101,
+    _handle_0461,
+    _handle_0860,
+    _handle_1455,
+)
+from chellow.utils import ct_datetime, to_utc, utc_datetime
+
+
+def test_handle_0101():
+    headers = {}
+    pre_record = ""
+    record = "".join(
+        (
+            "20240618",  # start_date=DATE_LENGTH
+            "20240618",  # finish_date=DATE_LENGTH)
+        )
+    )
+    _handle_0101(headers, pre_record, record)
+    assert headers == {
+        "start_date": to_utc(ct_datetime(2024, 6, 18)),
+        "finish_date": to_utc(ct_datetime(2024, 6, 18, 23, 30)),
+    }
 
 
 def test_handle_0461():
@@ -18,7 +39,7 @@ def test_handle_0461():
             "   KWH",  # units=6,
             "000000000084",  # quantity=12,
             "UNIT  ",  # charge=6,
-            "A",  # prev_read_type=1,
+            "N",  # prev_read_type=1,
             "E",  # pres_read_type=1,
             "2276425654120",  # mpan_core=13,
             "11111111",  # mpan_top=8,
@@ -39,7 +60,7 @@ def test_handle_0461():
                 "tpr_code": "00001",
                 "prev_date": utc_datetime(2024, 3, 1, 0, 0),
                 "prev_value": Decimal("539"),
-                "prev_type_code": "A",
+                "prev_type_code": "N",
                 "pres_date": utc_datetime(2024, 3, 31, 23, 0),
                 "pres_value": Decimal("643"),
                 "pres_type_code": "E",
@@ -49,6 +70,26 @@ def test_handle_0461():
     }
 
 
+def test_handle_0860():
+    headers = {"breakdown": defaultdict(int, {})}
+    pre_record = ""
+    record = "".join(
+        (
+            "000000000456",  # metering_gbp=12
+            "xxxxxxxxxxxx",  # unknown_1=12
+            "xxxxxxxxxxxx",  # unknown_2=12
+            "20240613",  # metering_date=DATE_LENGTH
+            "x" * 80,  # description=80
+        )
+    )
+    _handle_0860(headers, pre_record, record)
+    assert headers == {
+        "breakdown": {
+            "metering-gbp": Decimal("4.56"),
+        }
+    }
+
+
 def test_handle_1455():
     headers = {"breakdown": defaultdict(int, {})}
     pre_record = ""
@@ -57,7 +98,8 @@ def test_handle_1455():
             "0000000000034",  # ccl_kwh=13
             "xxxxxxxx",  # unknown_1=8
             "000000000003.00",  # ccl_rate=15
-            "0000000000876",  # ccl_gbp=13
+            "000000000876",  # ccl_gbp=12
+            "0       ",  # unknown_2=8
         )
     )
     _handle_1455(headers, pre_record, record)

{chellow-1721045482.0.0 → chellow-1722002880.0.0}/test/reports/test_g_monthly_duration.py

@@ -240,7 +240,9 @@ def virtual_bill(ds):
             "kwh",
             "gbp",
             "billed_kwh",
-            "billed_gbp",
+            "billed_net_gbp",
+            "billed_vat_gbp",
+            "billed_gross_gbp",
             "units_consumed",
             "correction_factor",
             "unit_code",
@@ -274,6 +276,8 @@ def virtual_bill(ds):
             1146.1869155555785,
             45.0,
             12.4,
+            1.2,
+            14.52,
             1000.0000000000156,
             1.0,
             "M3",

chellow-1721045482.0.0/VERSION

@@ -1 +0,0 @@
-__version__ = "1721045482.0.0"