chellow 1733501869.0.0__tar.gz → 1736431515.0.0__tar.gz

chellow-1736431515.0.0/.github/workflows/chellow.yml

@@ -0,0 +1,95 @@
+name: Chellow
+
+on:
+  push:
+    branches: [main, test]
+  pull_request:
+    branches: [main, test]
+
+jobs:
+  # Label of the container job
+  test:
+    runs-on: ubuntu-latest
+    container: python:3.9
+
+    services:
+      postgres:
+        image: postgres:12
+        env:
+          POSTGRES_PASSWORD: postgres
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install tox
+      - name: Run Tox
+        run: |
+          tox
+        env:
+          PGHOST: postgres
+          PGPORT: 5432
+
+  build:
+    runs-on: ubuntu-latest
+    container: python:3.9
+    needs: test
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install build
+    - name: Build a binary wheel and a source tarball
+      run: |
+        echo "__version__ = \"$(date +%s).0.0\"" > VERSION
+        python -m build 
+    - name: Store the distribution packages
+      uses: actions/upload-artifact@v4
+      with:
+        name: python-package-distributions
+        path: dist/
+
+  deploy_main:
+    runs-on: ubuntu-latest
+    needs: build
+    permissions:
+      id-token: write
+    if: github.ref == 'refs/heads/main'
+    environment:
+      name: pypi
+      url: https://pypi.org/p/chellow
+    steps:
+    - name: Download all the dists
+      uses: actions/download-artifact@v4
+      with:
+        name: python-package-distributions
+        path: dist/
+    - name: Publish distribution to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+
+  deploy_test:
+    runs-on: ubuntu-latest
+    needs: build
+    permissions:
+      id-token: write
+    if: github.ref == 'refs/heads/test'
+    environment:
+      name: testpypi
+      url: https://test.pypi.org/p/chellow
+    steps:
+    - name: Download all the dists
+      uses: actions/download-artifact@v4
+      with:
+        name: python-package-distributions
+        path: dist/
+    - name: Publish distribution to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        repository-url: https://test.pypi.org/legacy/

{chellow-1733501869.0.0 → chellow-1736431515.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: chellow
-Version: 1733501869.0.0
+Version: 1736431515.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-1736431515.0.0/VERSION

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

{chellow-1733501869.0.0 → chellow-1736431515.0.0}/chellow/e/bill_parsers/edf_export_xlsx.py

@@ -7,7 +7,7 @@ from openpyxl import load_workbook
 
 from werkzeug.exceptions import BadRequest
 
-from chellow.utils import HH, ct_datetime, parse_mpan_core, to_ct, to_utc
+from chellow.utils import c_months_u, ct_datetime, parse_mpan_core, to_ct, to_utc
 
 
 def get_cell(sheet, col, row):
@@ -86,6 +86,63 @@ ELEM_LOOKUP = {
 }
 
 
+def _parse_gduos_sheet(sheet, mpan_core, issue_date):
+    bills = []
+    for row in range(2, len(sheet["A"]) + 1):
+        val = get_cell(sheet, "A", row).value
+        if val is None or val == "":
+            break
+
+        start_date_str = get_str(sheet, "B", row)
+        start_date_ct = to_ct(Datetime.strptime(start_date_str, "%Y-%m"))
+        start_date, finish_date = next(
+            c_months_u(
+                start_year=start_date_ct.year, start_month=start_date_ct.month, months=1
+            )
+        )
+
+        element_desc = get_str(sheet, "D", row).strip()
+        units = get_dec(sheet, "E", row)
+        rate = get_dec(sheet, "F", row)
+        net = round(get_dec(sheet, "G", row), 2)
+
+        titles = ELEM_LOOKUP[element_desc]
+        if titles is None:
+            continue
+
+        breakdown = {
+            titles["gbp"]: net,
+            titles["units"]: units,
+            titles["rate"]: [rate],
+        }
+        bill = {
+            "bill_type_code": "N",
+            "kwh": Decimal(0),
+            "vat": Decimal("0.00"),
+            "net": net,
+            "gross": net,
+            "reads": [],
+            "breakdown": breakdown,
+            "account": mpan_core,
+            "issue_date": issue_date,
+            "start_date": start_date,
+            "finish_date": finish_date,
+            "mpan_core": mpan_core,
+            "reference": "_".join(
+                (
+                    to_ct(start_date).strftime("%Y%m%d"),
+                    to_ct(finish_date).strftime("%Y%m%d"),
+                    to_ct(issue_date).strftime("%Y%m%d"),
+                    mpan_core,
+                    titles["name"],
+                )
+            ),
+        }
+
+        bills.append(bill)
+    return bills
+
+
 def _make_raw_bills(book):
     bills = []
     sheet = book.worksheets[0]
@@ -135,56 +192,8 @@ def _make_raw_bills(book):
         }
     )
     sheet = book.worksheets[3]
-    for row in range(2, len(sheet["A"]) + 1):
-        val = get_cell(sheet, "A", row).value
-        if val is None or val == "":
-            break
+    bills.extend(_parse_gduos_sheet(sheet, mpan_core, issue_date))
 
-        start_date_str = get_str(sheet, "B", row)
-        start_date_ct = to_ct(Datetime.strptime(start_date_str, "%Y-%m"))
-        start_date = to_utc(start_date_ct)
-        finish_date = to_utc(start_date_ct + relativedelta(months=1) - HH)
-
-        element_desc = get_str(sheet, "D", row).strip()
-        units = get_dec(sheet, "E", row)
-        rate = get_dec(sheet, "F", row)
-        net = round(get_dec(sheet, "G", row), 2)
-
-        titles = ELEM_LOOKUP[element_desc]
-        if titles is None:
-            continue
-
-        breakdown = {
-            titles["gbp"]: net,
-            titles["units"]: units,
-            titles["rate"]: [rate],
-        }
-
-        bills.append(
-            {
-                "bill_type_code": "N",
-                "kwh": Decimal(0),
-                "vat": Decimal("0.00"),
-                "net": net,
-                "gross": net,
-                "reads": [],
-                "breakdown": breakdown,
-                "account": mpan_core,
-                "issue_date": issue_date,
-                "start_date": start_date,
-                "finish_date": finish_date,
-                "mpan_core": mpan_core,
-                "reference": "_".join(
-                    (
-                        to_ct(start_date).strftime("%Y%m%d"),
-                        to_ct(finish_date).strftime("%Y%m%d"),
-                        to_ct(issue_date).strftime("%Y%m%d"),
-                        mpan_core,
-                        titles["name"],
-                    )
-                ),
-            }
-        )
     return bills
 
 

{chellow-1733501869.0.0 → chellow-1736431515.0.0}/chellow/e/views.py

@@ -3,6 +3,7 @@ import os
 import threading
 from collections import defaultdict
 from datetime import datetime as Datetime
+from decimal import Decimal
 from io import BytesIO, StringIO
 from itertools import chain, islice
 from random import random
@@ -4729,6 +4730,127 @@ def site_add_e_supply_post(site_id):
         )
 
 
+@e.route("/sites/<int:site_id>/hh_data")
+def site_hh_data_get(site_id):
+    caches = {}
+    site = Site.get_by_id(g.sess, site_id)
+
+    start_year = req_int("start_year")
+    start_month = req_int("start_month")
+    start_date, finish_date = next(
+        c_months_u(start_year=start_year, start_month=start_month, months=1)
+    )
+
+    supplies = (
+        g.sess.query(Supply)
+        .join(Era)
+        .join(SiteEra)
+        .join(Source)
+        .filter(
+            SiteEra.site == site,
+            SiteEra.is_physical == true(),
+            Era.start_date <= finish_date,
+            or_(Era.finish_date == null(), Era.finish_date >= start_date),
+            Source.code != "sub",
+        )
+        .order_by(Supply.id)
+        .distinct()
+        .options(joinedload(Supply.source), joinedload(Supply.generator_type))
+        .all()
+    )
+
+    data = iter(
+        g.sess.query(HhDatum)
+        .join(Channel)
+        .join(Era)
+        .filter(
+            Channel.channel_type == "ACTIVE",
+            Era.supply_id.in_([s.id for s in supplies]),
+            HhDatum.start_date >= start_date,
+            HhDatum.start_date <= finish_date,
+        )
+        .order_by(HhDatum.start_date, Era.supply_id)
+        .options(
+            joinedload(HhDatum.channel)
+            .joinedload(Channel.era)
+            .joinedload(Era.supply)
+            .joinedload(Supply.source)
+        )
+    )
+    datum = next(data, None)
+
+    hh_data = []
+    for hh_date in hh_range(caches, start_date, finish_date):
+        sups = []
+        hh_dict = {
+            "start_date": hh_date,
+            "supplies": sups,
+            "export_kwh": Decimal(0),
+            "import_kwh": Decimal(0),
+            "parasitic_kwh": Decimal(0),
+            "generated_kwh": Decimal(0),
+            "third_party_import_kwh": Decimal(0),
+            "third_party_export_kwh": Decimal(0),
+        }
+        hh_data.append(hh_dict)
+        for supply in supplies:
+            sup_hh = {}
+            sups.append(sup_hh)
+            while (
+                datum is not None
+                and datum.start_date == hh_date
+                and datum.channel.era.supply_id == supply.id
+            ):
+                channel = datum.channel
+                imp_related = channel.imp_related
+                source_code = channel.era.supply.source.code
+
+                prefix = "import_" if imp_related else "export_"
+                sup_hh[f"{prefix}kwh"] = datum.value
+                sup_hh[f"{prefix}status"] = datum.status
+
+                if not imp_related and source_code in ("grid", "gen-grid"):
+                    hh_dict["export_kwh"] += datum.value
+                if imp_related and source_code in ("grid", "gen-grid"):
+                    hh_dict["import_kwh"] += datum.value
+                if (imp_related and source_code == "gen") or (
+                    not imp_related and source_code == "gen-grid"
+                ):
+                    hh_dict["generated_kwh"] += datum.value
+                if (not imp_related and source_code == "gen") or (
+                    imp_related and source_code == "gen-grid"
+                ):
+                    hh_dict["parasitic_kwh"] += datum.value
+                if (imp_related and source_code == "3rd-party") or (
+                    not imp_related and source_code == "3rd-party-reverse"
+                ):
+                    hh_dict["third_party_import_kwh"] += datum.value
+                if (not imp_related and source_code == "3rd-party") or (
+                    imp_related and source_code == "3rd-party-reverse"
+                ):
+                    hh_dict["third_party_export_kwh"] += datum.value
+                datum = next(data, None)
+
+        hh_dict["displaced_kwh"] = (
+            hh_dict["generated_kwh"] - hh_dict["export_kwh"] - hh_dict["parasitic_kwh"]
+        )
+        hh_dict["used_kwh"] = sum(
+            (
+                hh_dict["import_kwh"],
+                hh_dict["displaced_kwh"],
+                hh_dict["third_party_import_kwh"] - hh_dict["third_party_export_kwh"],
+            )
+        )
+
+    return render_template(
+        "site_hh_data.html",
+        site=site,
+        supplies=supplies,
+        hh_data=hh_data,
+        start_date=start_date,
+    )
+
+
 @e.route("/sources")
 def sources_get():
     sources = g.sess.query(Source).order_by(Source.code)

{chellow-1733501869.0.0/chellow/templates → chellow-1736431515.0.0/chellow/templates/e}/site_hh_data.html

@@ -22,12 +22,13 @@
 {% endblock %}
 
 {% block content %}
-	<form>
+	<form action="/e/sites/{{site.id}}/hh_data">
 		<fieldset>						
-			<label>Month</label> {{input_date(resolution='month')}}
+			<label>Month</label> {{input_date(prefix='start', initial=start_date, resolution='month')}}
 			<input type="submit" value="Show">
 		</fieldset>
 	</form>
+
 	<table class="sticky">
 		<caption>HH Data</caption>
 		<thead>

{chellow-1733501869.0.0 → chellow-1736431515.0.0}/chellow/templates/e/supply.html

@@ -218,8 +218,6 @@
 				{{ input_number('months', initial='1', size='2', maxlength='2', required=True) }}
 				<label>Final Month</label>
 				{{ input_date('finish', last_month_finish, 'month') }}
-				<label>Include bill check tabs?</label>
-				{{input_checkbox('is_bill_check')}}
 				<input type="submit" value="Download">
 			</fieldset>
 		</form>

{chellow-1733501869.0.0 → chellow-1736431515.0.0}/chellow/templates/g/supply.html

@@ -366,10 +366,8 @@
 		<fieldset>
 			<input type="hidden" name="g_supply_id" value="{{g_supply.id}}">
 			<legend>Monthly Duration</legend>
-			<br>
-			For <input name="months" maxlength="2" size="2" value="1">
-			month(s) finishing at the end of
-			{{ input_date('finish', last_month_finish, 'month') }}
+			<label>Months Long</label> <input name="months" maxlength="2" size="2" value="1">
+			<label>Last Month</label> {{ input_date('finish', last_month_finish, 'month') }}
 			<input type="submit" value="Download">
 		</fieldset>
 	</form>

{chellow-1733501869.0.0 → chellow-1736431515.0.0}/chellow/templates/site.html

@@ -161,7 +161,7 @@
 Table of site level monthly kWh, MD kWh etc.</a>
 		</li>
 		<li>
-			<a href="/sites/{{site.id}}/hh_data?year={{month_finish.year}}&amp;month={{month_finish.month}}">Table of hh data</a>
+			<a href="/e/sites/{{site.id}}/hh_data?start_year={{month_finish.year}}&amp;start_month={{month_finish.month}}">Table of hh data</a>
 		</li>
 		<li>
 			<a href="/e/sites/{{site.id}}/site_snags">Site Snags</a>

{chellow-1733501869.0.0 → chellow-1736431515.0.0}/chellow/views.py

@@ -10,7 +10,6 @@ import traceback
 import types
 from collections import OrderedDict
 from datetime import datetime as Datetime
-from decimal import Decimal
 from functools import wraps
 from importlib import import_module
 from io import DEFAULT_BUFFER_SIZE, StringIO
@@ -50,7 +49,6 @@ from sqlalchemy import (
     true,
 )
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import joinedload
 from sqlalchemy.orm.attributes import flag_modified
 
 from werkzeug.exceptions import BadRequest, Forbidden
@@ -1155,123 +1153,6 @@ def report_post(report_id):
     return report_module.do_post(g.sess)
 
 
-@home.route("/sites/<int:site_id>/hh_data")
-def site_hh_data_get(site_id):
-    caches = {}
-    site = Site.get_by_id(g.sess, site_id)
-
-    year = req_int("year")
-    month = req_int("month")
-    start_date, finish_date = next(
-        c_months_u(start_year=year, start_month=month, months=1)
-    )
-
-    supplies = (
-        g.sess.query(Supply)
-        .join(Era)
-        .join(SiteEra)
-        .join(Source)
-        .filter(
-            SiteEra.site == site,
-            SiteEra.is_physical == true(),
-            Era.start_date <= finish_date,
-            or_(Era.finish_date == null(), Era.finish_date >= start_date),
-            Source.code != "sub",
-        )
-        .order_by(Supply.id)
-        .distinct()
-        .options(joinedload(Supply.source), joinedload(Supply.generator_type))
-        .all()
-    )
-
-    data = iter(
-        g.sess.query(HhDatum)
-        .join(Channel)
-        .join(Era)
-        .filter(
-            Channel.channel_type == "ACTIVE",
-            Era.supply_id.in_([s.id for s in supplies]),
-            HhDatum.start_date >= start_date,
-            HhDatum.start_date <= finish_date,
-        )
-        .order_by(HhDatum.start_date, Era.supply_id)
-        .options(
-            joinedload(HhDatum.channel)
-            .joinedload(Channel.era)
-            .joinedload(Era.supply)
-            .joinedload(Supply.source)
-        )
-    )
-    datum = next(data, None)
-
-    hh_data = []
-    for hh_date in hh_range(caches, start_date, finish_date):
-        sups = []
-        hh_dict = {
-            "start_date": hh_date,
-            "supplies": sups,
-            "export_kwh": Decimal(0),
-            "import_kwh": Decimal(0),
-            "parasitic_kwh": Decimal(0),
-            "generated_kwh": Decimal(0),
-            "third_party_import_kwh": Decimal(0),
-            "third_party_export_kwh": Decimal(0),
-        }
-        hh_data.append(hh_dict)
-        for supply in supplies:
-            sup_hh = {}
-            sups.append(sup_hh)
-            while (
-                datum is not None
-                and datum.start_date == hh_date
-                and datum.channel.era.supply_id == supply.id
-            ):
-                channel = datum.channel
-                imp_related = channel.imp_related
-                source_code = channel.era.supply.source.code
-
-                prefix = "import_" if imp_related else "export_"
-                sup_hh[f"{prefix}kwh"] = datum.value
-                sup_hh[f"{prefix}status"] = datum.status
-
-                if not imp_related and source_code in ("grid", "gen-grid"):
-                    hh_dict["export_kwh"] += datum.value
-                if imp_related and source_code in ("grid", "gen-grid"):
-                    hh_dict["import_kwh"] += datum.value
-                if (imp_related and source_code == "gen") or (
-                    not imp_related and source_code == "gen-grid"
-                ):
-                    hh_dict["generated_kwh"] += datum.value
-                if (not imp_related and source_code == "gen") or (
-                    imp_related and source_code == "gen-grid"
-                ):
-                    hh_dict["parasitic_kwh"] += datum.value
-                if (imp_related and source_code == "3rd-party") or (
-                    not imp_related and source_code == "3rd-party-reverse"
-                ):
-                    hh_dict["third_party_import_kwh"] += datum.value
-                if (not imp_related and source_code == "3rd-party") or (
-                    imp_related and source_code == "3rd-party-reverse"
-                ):
-                    hh_dict["third_party_export_kwh"] += datum.value
-                datum = next(data, None)
-
-        hh_dict["displaced_kwh"] = (
-            hh_dict["generated_kwh"] - hh_dict["export_kwh"] - hh_dict["parasitic_kwh"]
-        )
-        hh_dict["used_kwh"] = sum(
-            (
-                hh_dict["import_kwh"],
-                hh_dict["displaced_kwh"],
-                hh_dict["third_party_import_kwh"] - hh_dict["third_party_export_kwh"],
-            )
-        )
-
-    return render_template(
-        "site_hh_data.html", site=site, supplies=supplies, hh_data=hh_data
-    )
-
-
 @home.route("/sites/<int:site_id>")
 def site_get(site_id):
     configuration_contract = Contract.get_non_core_by_name(g.sess, "configuration")

{chellow-1733501869.0.0 → chellow-1736431515.0.0}/test/e/bill_parsers/test_bill_parser_edf_export_xlsx.py

@@ -66,3 +66,65 @@ def test_make_raw_bills():
         },
     ]
     assert bills == expected_bills
+
+
+def test_make_raw_bills_october():
+    wb = Workbook()
+    statement_sheet = wb.worksheets[0]
+    wb.create_sheet()  # HH Data
+    wb.create_sheet()  # Calculations
+    gduos_sheet = wb.create_sheet()  # GDUoS
+
+    statement_sheet["D22"] = "01-Oct-2024"
+    statement_sheet["F22"] = "31-Oct-2024"
+    statement_sheet["H24"] = ct_datetime(2024, 8, 4)
+    statement_sheet["D25"] = 1000000000003
+    statement_sheet["D33"] = Decimal("302")
+    statement_sheet["H33"] = Decimal("23.09")
+
+    gduos_sheet["A2"] = 1000000000003
+    gduos_sheet["B2"] = "2024-10"
+    gduos_sheet["D2"] = "Capacity"
+    gduos_sheet["E2"] = Decimal("41")
+    gduos_sheet["F2"] = Decimal("4.97")
+    gduos_sheet["G2"] = Decimal("83.12")
+
+    bills = _make_raw_bills(wb)
+    expected_bills = [
+        {
+            "account": "10 0000 0000 003",
+            "bill_type_code": "N",
+            "breakdown": {"ssp-gbp": Decimal("23.09"), "ssp-kwh": Decimal("302")},
+            "finish_date": to_utc(ct_datetime(2024, 10, 31, 23, 30)),
+            "gross": Decimal("23.09"),
+            "issue_date": to_utc(ct_datetime(2024, 8, 4)),
+            "kwh": Decimal("302"),
+            "mpan_core": "10 0000 0000 003",
+            "net": Decimal("23.09"),
+            "reads": [],
+            "reference": "20241001_20241031_20240804_10 0000 0000 003_ssp",
+            "start_date": to_utc(ct_datetime(2024, 10, 1)),
+            "vat": Decimal("0.00"),
+        },
+        {
+            "account": "10 0000 0000 003",
+            "bill_type_code": "N",
+            "breakdown": {
+                "duos-availability-gbp": Decimal("83.12"),
+                "duos-availability-kva": Decimal("41"),
+                "duos-availability-rate": [Decimal("4.97")],
+            },
+            "finish_date": to_utc(ct_datetime(2024, 10, 31, 23, 30)),
+            "gross": Decimal("83.12"),
+            "issue_date": to_utc(ct_datetime(2024, 8, 4)),
+            "kwh": Decimal("0"),
+            "mpan_core": "10 0000 0000 003",
+            "net": Decimal("83.12"),
+            "reads": [],
+            "reference": "20241001_20241031_20240804_10 0000 0000 "
+            "003_duos-availability",
+            "start_date": to_utc(ct_datetime(2024, 10, 1)),
+            "vat": Decimal("0.00"),
+        },
+    ]
+    assert bills == expected_bills

{chellow-1733501869.0.0 → chellow-1736431515.0.0}/test/e/test_e_views.py

@@ -3059,6 +3059,23 @@ def test_site_add_e_supply_post_fail(client, sess):
     match(response, 400)
 
 
+def test_site_hh_data(sess, client):
+    site = Site.insert(sess, "CI017", "Water Works")
+    sess.commit()
+
+    query_string = {
+        "start_year": "2022",
+        "start_month": "3",
+    }
+    response = client.get(f"/e/sites/{site.id}/hh_data", query_string=query_string)
+
+    patterns = [
+        r'<input type="hidden" name="start_year" value="2022">',
+        r'<input type="hidden" name="start_month" value="3">',
+    ]
+    match(response, 200, *patterns)
+
+
 def test_supplier_batches_get(sess, client):
     vf = to_utc(ct_datetime(1996, 1, 1))
     participant = Participant.insert(sess, "hhak", "AK Industries")

{chellow-1733501869.0.0 → chellow-1736431515.0.0}/test/test_views.py

@@ -462,19 +462,6 @@ def test_site_get_dumb(client, sess):
     match(response, 200, *patterns)
 
 
-def test_site_hh_data(sess, client):
-    site = Site.insert(sess, "CI017", "Water Works")
-    sess.commit()
-
-    query_string = {
-        "year": "2022",
-        "month": "3",
-    }
-    response = client.get(f"/sites/{site.id}/hh_data", query_string=query_string)
-
-    match(response, 200)
-
-
 def test_supplies_get_e(sess, client):
     valid_from = to_utc(ct_datetime(1996, 1, 1))
     site = Site.insert(sess, "CI017", "Water Works")