chellow 1755078653.0.0__tar.gz → 1755614564.0.0__tar.gz

{chellow-1755078653.0.0 → chellow-1755614564.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1755078653.0.0
+Version: 1755614564.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-1755614564.0.0/VERSION

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

{chellow-1755078653.0.0 → chellow-1755614564.0.0}/chellow/gas/bill_parser_bgs_xlsx.py

@@ -11,7 +11,7 @@ from openpyxl import load_workbook
 
 from werkzeug.exceptions import BadRequest
 
-from chellow.utils import to_ct, to_utc
+from chellow.utils import hh_max, hh_min, to_ct, to_utc
 
 
 class Title(Enum):
@@ -131,11 +131,11 @@ ELEMENT_LOOKUP = {
     "Gas": "admin_variable",
     "Management Fee": "admin_variable",
     "Metering and Data": "metering",
-    "LDZ Customer Capacity": "dn_customer_capacity_fixed",
+    "LDZ Customer Capacity": "dn_customer_capacity",
     "LDZ Customer Fixed": "dn_customer_fixed",
-    "LDZ System Capacity": "dn_system_capacity_fixed",
+    "LDZ System Capacity": "dn_system_capacity",
     "LDZ System Commodity": "dn_system_commodity",
-    "NTS Exit Capacity (ECN)": "dn_ecn_fixed",
+    "NTS Exit Capacity (ECN)": "dn_ecn",
     "NTS SO Exit": "so_exit_commodity",
     "NTS TO Exit": "to_exit_commodity",
     "Unidentified Gas": "ug",
@@ -159,6 +159,12 @@ def _parse_row(bills, sheet, row, title_row):
     charge_period_end_naive = get_date_naive(
         sheet, row, column_map[Title.CHARGE_PERIOD_END]
     )
+    if charge_period_end_naive is None:
+        charge_period_end = None
+    else:
+        charge_period_end = to_utc(
+            to_ct(charge_period_end_naive) + relativedelta(hours=23, minutes=30)
+        )
 
     try:
         mprn_values = bills[mprn]
@@ -174,18 +180,25 @@ def _parse_row(bills, sheet, row, title_row):
             "reference": reference,
             "account": account,
             "issue_date": issue_date,
-            "start_date": charge_period_from,
-            "finish_date": to_utc(
-                to_ct(charge_period_end_naive) + relativedelta(hours=23, minutes=30)
-            ),
             "kwh": Decimal("0"),
             "breakdown": defaultdict(int, {}),
             "net_gbp": Decimal("0.00"),
             "vat_gbp": Decimal("0.00"),
             "gross_gbp": Decimal("0.00"),
-            "raw_lines": str([(c.value) for c in sheet[row]]),
+            "raw_lines": [],
             "reads": [],
         }
+    if charge_period_from is not None:
+        if "start_date" in bill:
+            bill["start_date"] = hh_min(bill["start_date"], charge_period_from)
+        else:
+            bill["start_date"] = charge_period_from
+    if charge_period_end is not None:
+        if "finish_date" in bill:
+            bill["finish_date"] = hh_max(bill["finish_date"], charge_period_end)
+        else:
+            bill["finish_date"] = charge_period_end
+    bill["raw_lines"].append([c.value for c in sheet[row]])
 
     bd = bill["breakdown"]
     element_desc = get_value(sheet, row, column_map[Title.CHARGE_TYPE])

{chellow-1755078653.0.0 → chellow-1755614564.0.0}/chellow/gas/transportation.py

@@ -1,16 +1,4 @@
 def vb(ds):
-    to_exit_commodity_rate_set = ds.rate_sets["to_exit_commodity_rate"]
-    so_exit_commodity_rate_set = ds.rate_sets["so_exit_commodity_rate"]
-    dn_system_commodity_rate_set = ds.rate_sets["dn_system_commodity_rate"]
-    dn_system_capacity_rate_set = ds.rate_sets["dn_system_capacity_rate"]
-    dn_system_capacity_fixed_rate_set = ds.rate_sets["dn_system_capacity_fixed_rate"]
-    dn_customer_capacity_rate_set = ds.rate_sets["dn_customer_capacity_rate"]
-    dn_customer_capacity_fixed_rate_set = ds.rate_sets[
-        "dn_customer_capacity_fixed_rate"
-    ]
-    dn_customer_fixed_rate_set = ds.rate_sets["dn_customer_fixed_rate"]
-    dn_ecn_rate_set = ds.rate_sets["dn_ecn_rate"]
-    dn_ecn_fixed_rate_set = ds.rate_sets["dn_ecn_fixed_rate"]
 
     for hh in ds.hh_data:
         start_date = hh["start_date"]
@@ -19,11 +7,9 @@ def vb(ds):
         nts_rates = ds.g_industry_rates("nts_commodity", start_date)
 
         to_exit_commodity_rate = float(nts_rates["to_exit_gbp_per_kwh"])
-        to_exit_commodity_rate_set.add(to_exit_commodity_rate)
         hh["to_exit_commodity_rate"] = to_exit_commodity_rate
 
         so_exit_commodity_rate = float(nts_rates["so_exit_gbp_per_kwh"])
-        so_exit_commodity_rate_set.add(so_exit_commodity_rate)
         hh["so_exit_commodity_rate"] = so_exit_commodity_rate
 
         rates = ds.g_industry_rates("dn", start_date)
@@ -89,24 +75,18 @@ def vb(ds):
 
             dn_customer_fixed_rate = 0
 
-        dn_system_commodity_rate_set.add(dn_system_commodity_rate)
         hh["dn_system_commodity_rate"] = dn_system_commodity_rate
 
-        dn_system_capacity_rate_set.add(dn_system_capacity_rate)
         hh["dn_system_capacity_rate"] = dn_system_capacity_rate
 
         dn_system_capacity_fixed_rate = soq * dn_system_capacity_rate
-        dn_system_capacity_fixed_rate_set.add(dn_system_capacity_fixed_rate)
         hh["dn_system_capacity_fixed_rate"] = dn_system_capacity_fixed_rate
 
-        dn_customer_capacity_rate_set.add(dn_customer_capacity_rate)
         hh["dn_customer_capacity_rate"] = dn_customer_capacity_rate
 
         dn_customer_capacity_fixed_rate = soq * dn_customer_capacity_rate
-        dn_customer_capacity_fixed_rate_set.add(dn_customer_capacity_fixed_rate)
         hh["dn_customer_capacity_fixed_rate"] = dn_customer_capacity_fixed_rate
 
-        dn_customer_fixed_rate_set.add(dn_customer_fixed_rate)
         hh["dn_customer_fixed_rate"] = dn_customer_fixed_rate
 
         dn_ecn_rate = float(
@@ -114,9 +94,7 @@ def vb(ds):
                 "exit_capacity_gbp_per_kwh_per_day"
             ]
         )
-        dn_ecn_rate_set.add(dn_ecn_rate)
         hh["dn_ecn_rate"] = dn_ecn_rate
 
         dn_ecn_fixed_rate = dn_ecn_rate * soq
-        dn_ecn_fixed_rate_set.add(dn_ecn_fixed_rate)
         hh["dn_ecn_fixed_rate"] = dn_ecn_fixed_rate