chellow 1751980348.0.0__tar.gz → 1752157293.0.0__tar.gz

{chellow-1751980348.0.0 → chellow-1752157293.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1751980348.0.0
+Version: 1752157293.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)
@@ -22,7 +22,7 @@ Requires-Dist: pypdf==4.3.1
 Requires-Dist: python-dateutil==2.8.2
 Requires-Dist: pytz==2022.6
 Requires-Dist: requests==2.32.4
-Requires-Dist: sqlalchemy==2.0.30
+Requires-Dist: sqlalchemy==2.0.41
 Requires-Dist: waitress==3.0.1
 Requires-Dist: xlrd==2.0.1
 Requires-Dist: zish==0.1.12

chellow-1752157293.0.0/VERSION

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

{chellow-1751980348.0.0 → chellow-1752157293.0.0}/chellow/__init__.py

@@ -1,4 +1,6 @@
+import json
 import os
+from base64 import b64decode
 from datetime import datetime as Datetime
 from importlib.metadata import version
 from pathlib import Path
@@ -127,17 +129,45 @@ def create_app(testing=False, instance_path=None):
             g.config = {}
         ad_props = g.config.get("ad_authentication", {})
         ad_auth_on = ad_props.get("on", False)
+        easy_auth_props = g.config.get("easy_auth", {})
+        easy_auth_on = easy_auth_props.get("on", False)
+        path = request.path
+        if path in ("/health", "/robots933456.txt"):
+            return
         if ad_auth_on:
             username = request.headers["X-Isrw-Proxy-Logon-User"].upper()
-            user = g.sess.query(User).filter(User.email_address == username).first()
+            user = g.sess.scalars(
+                select(User).where(User.email_address == username)
+            ).first()
             if user is None:
                 try:
                     username = ad_props["default_user"]
-                    user = (
-                        g.sess.query(User)
-                        .filter(User.email_address == username)
-                        .first()
-                    )
+                    user = g.sess.scalars(
+                        select(User).where(User.email_address == username)
+                    ).first()
+                except KeyError:
+                    user = None
+            if user is not None:
+                g.user = user
+        elif easy_auth_on:
+            jwt_enc = request.headers["X-MS-CLIENT-PRINCIPAL"]
+            jwt = json.loads(b64decode(jwt_enc))
+            for claim in jwt["claims"]:
+                if claim["typ"] == (
+                    "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/"
+                    "emailaddress"
+                ):
+                    username = claim["val"]
+                    user = g.sess.scalars(
+                        select(User).where(User.email_address == username)
+                    ).first()
+                    break
+            if user is None:
+                try:
+                    username = easy_auth_props["default_user"]
+                    user = g.sess.scalars(
+                        select(User).where(User.email_address == username)
+                    ).first()
                 except KeyError:
                     user = None
             if user is not None:
@@ -156,25 +186,20 @@ def create_app(testing=False, instance_path=None):
                         key = None
 
                     email = ips[key]
-                    g.user = (
-                        g.sess.query(User).filter(User.email_address == email).first()
-                    )
+                    g.user = g.sess.scalars(
+                        select(User).where(User.email_address == email)
+                    ).first()
                 except KeyError:
                     pass
             else:
-                user = (
-                    g.sess.query(User)
-                    .filter(User.email_address == auth.username)
-                    .first()
-                )
+                user = g.sess.scalars(
+                    select(User).where(User.email_address == auth.username)
+                ).first()
                 if user is not None and user.password_matches(auth.password):
                     g.user = user
 
         # Got our user
-        path = request.path
         method = request.method
-        if path in ("/health",):
-            return
 
         if g.user is not None:
             if "X-Isrw-Proxy-Logon-User" in request.headers:
@@ -227,7 +252,9 @@ def create_app(testing=False, instance_path=None):
             g.sess.commit()
             return
 
-        if g.user is None or (not ad_auth_on and auth is None):
+        if (not easy_auth_on) and (
+            (g.user is None) or (not ad_auth_on and auth is None)
+        ):
             return Response(
                 "Could not verify your access level for that URL.\n"
                 "You have to login with proper credentials",

{chellow-1751980348.0.0 → chellow-1752157293.0.0}/chellow/e/bill_parsers/drax_edi.py

@@ -104,6 +104,7 @@ ELEMENT_MAP = {
                 "duos-availability-kva",
             ),
             "209269": ("tnuos-gbp", "tnuos-rate", "tnuos-days"),
+            "065950": ("eii-gbp", "eii-rate", "eii-kwh"),
         },
         "DUSDIS": {
             "122568": ("nrg-gsp-losses-gbp", "nrg-rate", "nrg-gsp-losses-kwh"),
@@ -149,7 +150,6 @@ ELEMENT_MAP = {
     "930504": ("eii-gbp", None, None),
     "331201": ("eii-gbp", None, None),
     "307253": ("eii-gbp", "eii-rate", "eii-kwh"),
-    "065950": ("eii-gbp", "eii-rate", "eii-kwh"),
 }
 
 TPR_LOOKUP = {

{chellow-1751980348.0.0 → chellow-1752157293.0.0}/chellow/e/bill_parsers/mm.py

@@ -47,7 +47,9 @@ def _handle_0050(headers, pre_record, record):
         unknown_4=12,
         late_payment=12,
     )
-    headers["late_payment"] = Decimal(parts["late_payment"]) / Decimal(100)
+    headers["breakdown"]["late_payment"] += Decimal(parts["late_payment"]) / Decimal(
+        100
+    )
     """
 
 
@@ -57,13 +59,10 @@ def _handle_0051(headers, pre_record, record):
 
 def _handle_0100(headers, pre_record, record):
     issue_date = headers["issue_date"]
-    late_payment = headers.get("late_payment")
     headers.clear()
     headers["issue_date"] = issue_date
-    if late_payment is not None:
-        headers["late_payment"] = late_payment
-    headers["account"] = pre_record[43:52]
-    headers["reference"] = pre_record[41:46]
+    headers["account"] = pre_record[42:52]
+    headers["reference"] = pre_record[52:64]
     headers["kwh"] = Decimal("0")
     headers["breakdown"] = defaultdict(int, {"vat": {}})
     headers["reads"] = []
@@ -245,6 +244,17 @@ def _handle_0860(headers, pre_record, record):
     bd["metering-gbp"] += Decimal(parts["metering_gbp"]) / Decimal("100")
 
 
+def _handle_0960(headers, pre_record, record):
+    parts = _chop_record(
+        record,
+        days=3,
+        payment=12,
+        rate=6,
+    )
+    bd = headers["breakdown"]
+    bd["late_payment_gbp"] += Decimal(parts["payment"]) / Decimal(100)
+
+
 def _handle_1455(headers, pre_record, record):
     parts = _chop_record(
         record, ccl_kwh=13, unknown_1=10, ccl_rate=13, ccl_gbp=12, unkown_2=8
@@ -294,12 +304,6 @@ def _handle_1500(headers, pre_record, record):
     breakdown = headers["breakdown"]
     net = Decimal("0.00") + Decimal(parts["net"]) / Decimal("100")
     gross = Decimal("0.00") + Decimal(parts["gross"]) / Decimal("100")
-    if "late_payment" in headers:
-        late_payment_gbp = headers["late_payment"]
-        net += late_payment_gbp
-        gross += late_payment_gbp
-        breakdown["late-payment-gbp"] += late_payment_gbp
-        del headers["late_payment"]
 
     return {
         "bill_type_code": "W" if net < 0 else "N",
@@ -354,6 +358,7 @@ LINE_HANDLERS = {
     "0461": _handle_0461,
     "0470": _handle_0470,
     "0860": _handle_0860,
+    "0960": _handle_0960,
     "1455": _handle_1455,
     "1460": _handle_1460,
     "1500": _handle_1500,

{chellow-1751980348.0.0 → chellow-1752157293.0.0}/chellow/views.py

@@ -198,6 +198,11 @@ def health():
     return Response("healthy\n", mimetype="text/plain")
 
 
+@home.route("/robots933456.txt")
+def robots():
+    return Response("healthy\n", mimetype="text/plain")
+
+
 @home.route("/local_reports/<int:report_id>/output")
 def local_report_output_get(report_id):
     report = g.sess.execute(select(Report).where(Report.id == report_id)).scalar_one()

{chellow-1751980348.0.0 → chellow-1752157293.0.0}/pyproject.toml

@@ -18,7 +18,7 @@ dependencies = [
 	"pypdf==4.3.1",
 	"pg8000==1.31.1",
 	"Flask==3.1.1",
-	"SQLAlchemy==2.0.30",
+	"SQLAlchemy==2.0.41",
 	"flask-restx==1.3.0",
   "jsonschema==4.17.3",  # Temporarily needed until RestX updated
 	"openpyxl==3.1.5",

{chellow-1751980348.0.0 → chellow-1752157293.0.0}/test/e/bill_parsers/test_bill_parser_mm.py

@@ -27,11 +27,11 @@ def test_handle_0100():
     _handle_0100(headers, pre_record, record)
     assert headers == {
         "issue_date": to_utc(ct_datetime(2023, 5, 2)),
-        "account": "023719050",
+        "account": "0023719050",
         "breakdown": {"vat": {}},
         "kwh": Decimal("0"),
         "reads": [],
-        "reference": " 0023",
+        "reference": "000023905961",
     }
 
 

chellow-1751980348.0.0/VERSION

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