chellow 1751980348.0.0__py3-none-any.whl → 1752483970.0.0__py3-none-any.whl

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/e/bill_parsers/drax_edi.py

@@ -51,7 +51,11 @@ ELEMENT_MAP = {
                 "cfd-operational-kwh",
             ),
             "954379": ("cfd-interim-gbp", "cfd-interim-rate", "cfd-interim-kwh"),
-            "538249": ("capacity-gbp", "capacity-rate", "capacity-kwh"),
+            "538249": (
+                "cm-settlement-levy-gbp",
+                "cm-settlement-levy-rate",
+                "cm-settlement-levy-kwh",
+            ),
             "568307": ("capacity-gbp", "capacity-rate", "capacity-kwh"),
         },
     },
@@ -104,6 +108,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 +154,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/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/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.dist-info → chellow-1752483970.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1751980348.0.0
+Version: 1752483970.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-1751980348.0.0.dist-info → chellow-1752483970.0.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-chellow/__init__.py,sha256=yBjAoOWh4NlA847_j4hiI7O6YyiEysf2X1y873JS-aA,9792
+chellow/__init__.py,sha256=9aoSbGmHCIHwzI_c_TLSg5CeKwqAq0I6kKaMvTrTMqg,10936
 chellow/api.py,sha256=mk17TfweR76DPFC8lX2SArTjai6y6YshASxqO1w-_-s,11036
 chellow/bank_holidays.py,sha256=T_utYMwe_g1dz5X-aOTdIPryg49SvB7QsWM1yphlqG8,4423
 chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
@@ -13,7 +13,7 @@ chellow/rate_server.py,sha256=fg-Pf_9Hk3bXmC9riPQNGQxBvLvBa_WtNYdwDCjnCSg,5678
 chellow/rrun.py,sha256=1Kt2q_K9UoDG_nsZz-Q6XJiMNKroWqlqFdxn2M6Q8CA,2088
 chellow/testing.py,sha256=Dj2c1NX8lVlygueOrh2eyYawLW6qKEHxNhXVVUaNRO0,3637
 chellow/utils.py,sha256=i3GQK9MIcweosZk2gi-nX_IFq2DxURAJDyNoLBg6YwM,19421
-chellow/views.py,sha256=7nk7kZALoSGeyMSVU-_DzYSLt7ypPFQ6zBpx8--AER4,85354
+chellow/views.py,sha256=fPCuYTWXAAWnu1Cwt4Dk3k7PHNj9gw9HeQRiXgRIn60,85459
 chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/aahedc.py,sha256=d2usudp7KYWpU6Pk3fal5EQ47EbvkvKeaFGylnb3NWw,606
 chellow/e/bill_importer.py,sha256=7UcnqNlKbJc2GhW9gy8sDp9GuqambJVpZLvbafOZztA,7411
@@ -50,7 +50,7 @@ chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=opjXRrqrgBTbSKzL0JfTLP0
 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=U5zcIaZ6B5QTTpFDAcBnk4G2r8B3j5kJhDPL4AJNkEk,5640
-chellow/e/bill_parsers/drax_edi.py,sha256=cqd1YhW_IsxUMsW5xcyC_0CHpqkMRWKQgcXERZoIqGM,15083
+chellow/e/bill_parsers/drax_edi.py,sha256=vAVH8nnHqkwacmHiP88vFGHBKlH9k59YIf1G-7P05Yg,15184
 chellow/e/bill_parsers/drax_element_edi.py,sha256=kxjg1KA4UheMa8doGp9skXtQYrNK8Eisy9ksafR5TQo,13661
 chellow/e/bill_parsers/edf_export_xlsx.py,sha256=J4lY8epiSTIePZ6D1SGD76TXRoev35KrUC2sjHkNqlE,6632
 chellow/e/bill_parsers/engie_edi.py,sha256=PDMDI0aqUM1lalgzxih1YmMho11n1rMqE0vyL-aEIs8,15840
@@ -61,7 +61,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=i1TcEo3eY6_i_1DfRP3fIX7kIsx5cVx_FZPFG6S-FNo,11252
+chellow/e/bill_parsers/mm.py,sha256=1myKrms3yVAhKFCzk3swWJjCwepZYk8GkD0wK0bpsj4,11184
 chellow/e/bill_parsers/nonsettlement_dc_stark_xlsx.py,sha256=YvQ0Q6HlZ4XSk6Phx1UWaTSj8FREVjwQe8nrpiLVzbU,5458
 chellow/e/bill_parsers/settlement_dc_stark_xlsx.py,sha256=osCpUYUdLcPtlo7ngXWGw0ImnxssLa1fOSejMwe51-k,6381
 chellow/e/bill_parsers/sse_edi.py,sha256=L85DOfNkqexeEIEr8pCBn_2sHJI-zEaw6cogpE3YyYM,15204
@@ -385,6 +385,6 @@ chellow/templates/g/supply_note_edit.html,sha256=b8mB6_ucBwoljp03iy6AgVaZUhGw3-1
 chellow/templates/g/supply_notes.html,sha256=6epNmZ3NKdXZz27fvmRUGeffg_oc1kmwuBeyRzQe3Rg,854
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1751980348.0.0.dist-info/METADATA,sha256=cQNBuWTEa9-hyJkd1XVznNi0ItxpmbWKgYp3PB6V2qY,12585
-chellow-1751980348.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1751980348.0.0.dist-info/RECORD,,
+chellow-1752483970.0.0.dist-info/METADATA,sha256=2YZ1h5mTfgfRUr2ArLYeDbtIli2e5Mbvn5TaFKA1PY8,12585
+chellow-1752483970.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1752483970.0.0.dist-info/RECORD,,