chellow 1734005435.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-1734005435.0.0 → chellow-1736431515.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: chellow
-Version: 1734005435.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-1734005435.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-1734005435.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-1734005435.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-1734005435.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-1734005435.0.0/.github/workflows/chellow.yml

@@ -1,79 +0,0 @@
-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
-
-  deploy_main:
-    runs-on: ubuntu-latest
-    container: python:3.9
-    needs: test
-    permissions:
-      id-token: write
-    if: github.ref == 'refs/heads/main'
-    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: Publish distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1.11
-
-  deploy_test:
-    runs-on: ubuntu-latest
-    container: python:3.9
-    needs: test
-    permissions:
-      id-token: write
-    if: github.ref == 'refs/heads/test'
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install --upgrade build packaging
-      - name: Build a binary wheel and a source tarball
-        run: |
-          echo "__version__ = \"$(date +%s).0.0\"" > VERSION
-          python -m build 
-      - name: Publish distribution to Test PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1.11
-        with:
-          repository-url: https://test.pypi.org/legacy/

chellow-1734005435.0.0/VERSION

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