chellow 1708506090.0.0__tar.gz → 1708963708.0.0__tar.gz

{chellow-1708506090.0.0 → chellow-1708963708.0.0}/.github/workflows/chellow.yml

@@ -68,7 +68,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install build
+          pip install --upgrade build packaging
       - name: Build a binary wheel and a source tarball
         run: |
           echo "__version__ = \"$(date +%s).0.0\"" > VERSION

{chellow-1708506090.0.0 → chellow-1708963708.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chellow
-Version: 1708506090.0.0
+Version: 1708963708.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-1708963708.0.0/VERSION

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

{chellow-1708506090.0.0 → chellow-1708963708.0.0}/chellow/e/bsuos.py

@@ -218,7 +218,13 @@ def _process_url(logger, sess, url, contract, s):
 
     for row in reader:
         date_str = row[0].strip()
-        date_format = "%Y-%m-%dT%H:%M:%S" if len(date_str) == 19 else "%d-%m-%y"
+        len_date_str = len(date_str)
+        if len_date_str == 19:
+            date_format = "%Y-%m-%dT%H:%M:%S"
+        elif len_date_str == 20:
+            date_format = "%Y-%m-%d-T%H:%M:%S"
+        else:
+            date_format = "%d-%m-%y"
         date = Datetime.strptime(date_str, date_format)
         period_str = row[1]
         period = int(period_str)
@@ -403,7 +409,12 @@ def rate_server_import(sess, log, set_progress, s, paths):
 def national_grid_import(sess, log, set_progress, s):
     log("Starting to check for new BSUoS forecast")
 
-    contract = Contract.get_non_core_by_name(sess, "bsuos")
+    CONTRACT_NAME = "bsuos"
+    contract = Contract.find_non_core_by_name(sess, CONTRACT_NAME)
+    if contract is None:
+        contract = Contract.insert_non_core(
+            sess, CONTRACT_NAME, "", {}, to_utc(ct_datetime(1996, 4, 1)), None, {}
+        )
 
     block = None
 

{chellow-1708506090.0.0 → chellow-1708963708.0.0}/chellow/e/computer.py

@@ -682,6 +682,7 @@ class SiteSource(DataSource):
             self.gsp_group_code = self.supply.gsp_group.code
             self.ssc = self.era.ssc
             self.ssc_code = None if self.ssc is None else self.ssc.code
+            self.energisation_status_code = era.energisation_status.code
 
         era_q = (
             select(Era.id)

{chellow-1708506090.0.0 → chellow-1708963708.0.0}/chellow/reports/report_247.py

@@ -165,6 +165,17 @@ def _process_site(
                     None,
                     None,
                     None,
+                    imp_ss.pc_code,
+                    imp_ss.energisation_status_code,
+                    imp_ss.gsp_group_code,
+                    imp_ss.dno_code,
+                    imp_ss.voltage_level_code,
+                    imp_ss.is_substation,
+                    imp_ss.llfc_code,
+                    imp_ss.llfc.description,
+                    None,
+                    None,
+                    None,
                     None,
                     site.code,
                     site.name,
@@ -345,7 +356,8 @@ def _process_site(
                     raise BadRequest("Role code not recognized.")
 
             if imp_ss is None:
-                imp_supplier_contract_name = None
+                imp_supplier_contract_name = imp_voltage_level_code = None
+                imp_is_substation = imp_llfc_code = imp_llfc_description = None
                 pc_code = exp_ss.pc_code
             else:
                 if imp_supplier_contract is None:
@@ -353,14 +365,23 @@ def _process_site(
                 else:
                     imp_supplier_contract_name = imp_supplier_contract.name
                 pc_code = imp_ss.pc_code
+                imp_voltage_level_code = imp_ss.voltage_level_code
+                imp_is_substation = imp_ss.is_substation
+                imp_llfc_code = imp_ss.llfc_code
+                imp_llfc_description = imp_ss.llfc.description
 
             if exp_ss is None:
-                exp_supplier_contract_name = None
+                exp_supplier_contract_name = exp_voltage_level_code = None
+                exp_is_substation = exp_llfc_code = exp_llfc_description = None
             else:
                 if exp_supplier_contract is None:
                     exp_supplier_contract_name = ""
                 else:
                     exp_supplier_contract_name = exp_supplier_contract.name
+                exp_voltage_level_code = exp_ss.voltage_level_code
+                exp_is_substation = exp_ss.is_substation
+                exp_llfc_code = exp_ss.llfc_code
+                exp_llfc_description = exp_ss.llfc.description
 
             out = (
                 [
@@ -376,6 +397,17 @@ def _process_site(
                     sss.supply_name,
                     sss.msn,
                     pc_code,
+                    sss.energisation_status_code,
+                    sss.gsp_group_code,
+                    sss.dno_code,
+                    imp_voltage_level_code,
+                    imp_is_substation,
+                    imp_llfc_code,
+                    imp_llfc_description,
+                    exp_voltage_level_code,
+                    exp_is_substation,
+                    exp_llfc_code,
+                    exp_llfc_description,
                     site.code,
                     site.name,
                     ",".join(sorted(list(era_associates))),
@@ -486,7 +518,26 @@ def _process_site(
                             data[key] += bill_prop_gbp
 
                     imp_supplier_contract = last_era.imp_supplier_contract
+                    imp_llfc = last_era.imp_llfc
+                    if imp_llfc is None:
+                        imp_llfc_code = imp_voltage_level_code = None
+                        imp_is_substation = imp_llfc_description = None
+                    else:
+                        imp_llfc_code = imp_llfc.code
+                        imp_voltage_level_code = imp_llfc.voltage_level.code
+                        imp_is_substation = imp_llfc.is_substation
+                        imp_llfc_description = imp_llfc.description
+
                     exp_supplier_contract = last_era.exp_supplier_contract
+                    exp_llfc = last_era.exp_llfc
+                    if exp_llfc is None:
+                        exp_llfc_code = exp_voltage_level_code = None
+                        exp_is_substation = exp_llfc_description = None
+                    else:
+                        exp_llfc_code = exp_llfc.code
+                        exp_voltage_level_code = exp_llfc.voltage_level.code
+                        exp_is_substation = exp_llfc.is_substation
+                        exp_llfc_description = exp_llfc.description
                     out = [
                         now,
                         last_era.imp_mpan_core,
@@ -508,6 +559,17 @@ def _process_site(
                         last_era.supply.name,
                         last_era.msn,
                         last_era.pc.code,
+                        last_era.energisation_status.code,
+                        last_era.supply.gsp_group.code,
+                        last_era.supply.dno.dno_code,
+                        imp_voltage_level_code,
+                        imp_is_substation,
+                        imp_llfc_code,
+                        imp_llfc_description,
+                        exp_voltage_level_code,
+                        exp_is_substation,
+                        exp_llfc_code,
+                        exp_llfc_description,
                         site.code,
                         site.name,
                         None,
@@ -593,6 +655,25 @@ def _process_site(
                             data[key] += bill_prop_gbp
 
                     imp_supplier_contract = first_era.imp_supplier_contract
+                    imp_llfc = last_era.imp_llfc
+                    if imp_llfc is None:
+                        imp_llfc_code = imp_voltage_level_code = None
+                        imp_is_substation = imp_llfc_description = None
+                    else:
+                        imp_llfc_code = imp_llfc.code
+                        imp_voltage_level_code = imp_llfc.voltage_level.code
+                        imp_is_substation = imp_llfc.is_substation
+                        imp_llfc_description = imp_llfc.description
+
+                    exp_llfc = last_era.exp_llfc
+                    if exp_llfc is None:
+                        exp_llfc_code = exp_voltage_level_code = None
+                        exp_is_substation = exp_llfc_description = None
+                    else:
+                        exp_llfc_code = exp_llfc.code
+                        exp_voltage_level_code = exp_llfc.voltage_level.code
+                        exp_is_substation = exp_llfc.is_substation
+                        exp_llfc_description = exp_llfc.description
                     exp_supplier_contract = first_era.exp_supplier_contract
                     out = [
                         now,
@@ -615,6 +696,17 @@ def _process_site(
                         last_era.supply.name,
                         last_era.msn,
                         last_era.pc.code,
+                        last_era.energisation_status.code,
+                        last_era.supply.gsp_group.code,
+                        last_era.supply.dno.dno_code,
+                        imp_voltage_level_code,
+                        imp_is_substation,
+                        imp_llfc_code,
+                        imp_llfc_description,
+                        exp_voltage_level_code,
+                        exp_is_substation,
+                        exp_llfc_code,
+                        exp_llfc_description,
                         site.code,
                         site.name,
                         None,
@@ -812,6 +904,17 @@ def content(
                 "supply-name",
                 "msn",
                 "pc",
+                "energisation-status",
+                "gsp-group",
+                "dno",
+                "imp-voltage-level",
+                "imp-is-substation",
+                "imp-llfc-code",
+                "imp-llfc-description",
+                "exp-voltage-level",
+                "exp-is-substation",
+                "exp-llfc-code",
+                "exp-llfc-description",
                 "site-id",
                 "site-name",
                 "associated-site-ids",

{chellow-1708506090.0.0 → chellow-1708963708.0.0}/test/reports/test_report_247.py

@@ -674,31 +674,25 @@ def virtual_bill(ds):
 
 
 def test_bill_after_end_supply(mocker, sess):
-    valid_from = to_utc(ct_datetime(1996, 1, 1))
+    vf = to_utc(ct_datetime(1996, 1, 1))
     site = Site.insert(sess, "CI017", "Water Works")
     start_date = utc_datetime(2009, 7, 31, 23, 00)
     months = 1
 
     market_role_Z = MarketRole.insert(sess, "Z", "Non-core")
     participant = Participant.insert(sess, "CALB", "AK Industries")
-    participant.insert_party(sess, market_role_Z, "None core", valid_from, None, None)
+    participant.insert_party(sess, market_role_Z, "None core", vf, None, None)
     bank_holiday_rate_script = {"bank_holidays": []}
     Contract.insert_non_core(
-        sess,
-        "bank_holidays",
-        "",
-        {},
-        utc_datetime(2000, 1, 1),
-        None,
-        bank_holiday_rate_script,
+        sess, "bank_holidays", "", {}, vf, None, bank_holiday_rate_script
     )
     market_role_X = MarketRole.insert(sess, "X", "Supplier")
     market_role_M = MarketRole.insert(sess, "M", "Mop")
     market_role_C = MarketRole.insert(sess, "C", "HH Dc")
     market_role_R = MarketRole.insert(sess, "R", "Distributor")
-    participant.insert_party(sess, market_role_M, "Fusion Mop", valid_from, None, None)
-    participant.insert_party(sess, market_role_X, "Fusion Ltc", valid_from, None, None)
-    participant.insert_party(sess, market_role_C, "Fusion DC", valid_from, None, None)
+    participant.insert_party(sess, market_role_M, "Fusion Mop", vf, None, None)
+    participant.insert_party(sess, market_role_X, "Fusion Ltc", vf, None, None)
+    participant.insert_party(sess, market_role_C, "Fusion DC", vf, None, None)
 
     mop_charge_script = """
 from chellow.utils import reduce_bill_hhs
@@ -754,7 +748,7 @@ def virtual_bill(ds):
         None,
         {},
     )
-    pc = Pc.insert(sess, "00", "hh", utc_datetime(2000, 1, 1), None)
+    pc = Pc.insert(sess, "00", "hh", vf, None)
     insert_cops(sess)
     cop = Cop.get_by_code(sess, "5")
     insert_comms(sess)
@@ -793,10 +787,10 @@ def virtual_bill(ds):
         {},
     )
     batch = imp_supplier_contract.insert_batch(sess, "a b", "")
-    dno = participant.insert_party(sess, market_role_R, "WPD", valid_from, None, "22")
-    meter_type = MeterType.insert(sess, "C5", "COP 1-5", utc_datetime(2000, 1, 1), None)
-    meter_payment_type = MeterPaymentType.insert(sess, "CR", "Credit", valid_from, None)
-    mtc = Mtc.insert(sess, "845", False, True, valid_from, None)
+    dno = participant.insert_party(sess, market_role_R, "WPD", vf, None, "22")
+    meter_type = MeterType.insert(sess, "C5", "COP 1-5", vf, None)
+    meter_payment_type = MeterPaymentType.insert(sess, "CR", "Credit", vf, None)
+    mtc = Mtc.insert(sess, "845", False, True, vf, None)
     mtc_participant = MtcParticipant.insert(
         sess,
         mtc,
@@ -807,22 +801,15 @@ def virtual_bill(ds):
         meter_type,
         meter_payment_type,
         0,
-        utc_datetime(1996, 1, 1),
+        vf,
         None,
     )
     insert_voltage_levels(sess)
     voltage_level = VoltageLevel.get_by_code(sess, "HV")
     llfc = dno.insert_llfc(
-        sess,
-        "510",
-        "PC 5-8 & HH HV",
-        voltage_level,
-        False,
-        True,
-        utc_datetime(1996, 1, 1),
-        None,
+        sess, "510", "PC 5-8 & HH HV", voltage_level, False, True, vf, None
     )
-    MtcLlfc.insert(sess, mtc_participant, llfc, valid_from, None)
+    MtcLlfc.insert(sess, mtc_participant, llfc, vf, None)
     insert_sources(sess)
     source = Source.get_by_code(sess, "net")
     gsp_group = GspGroup.insert(sess, "_L", "South Western")
@@ -1000,6 +987,17 @@ def virtual_bill(ds):
             "supply-name",
             "msn",
             "pc",
+            "energisation-status",
+            "gsp-group",
+            "dno",
+            "imp-voltage-level",
+            "imp-is-substation",
+            "imp-llfc-code",
+            "imp-llfc-description",
+            "exp-voltage-level",
+            "exp-is-substation",
+            "exp-llfc-code",
+            "exp-llfc-description",
             "site-id",
             "site-name",
             "associated-site-ids",
@@ -1045,6 +1043,17 @@ def virtual_bill(ds):
             "Bob",
             "hgjeyhuw",
             "00",
+            "E",
+            "_L",
+            "22",
+            "HV",
+            False,
+            "510",
+            "PC 5-8 & HH HV",
+            None,
+            None,
+            None,
+            None,
             "CI017",
             "Water Works",
             None,
@@ -2053,6 +2062,17 @@ def virtual_bill(ds):
             "supply-name",
             "msn",
             "pc",
+            "energisation-status",
+            "gsp-group",
+            "dno",
+            "imp-voltage-level",
+            "imp-is-substation",
+            "imp-llfc-code",
+            "imp-llfc-description",
+            "exp-voltage-level",
+            "exp-is-substation",
+            "exp-llfc-code",
+            "exp-llfc-description",
             "site-id",
             "site-name",
             "associated-site-ids",
@@ -2111,6 +2131,17 @@ def virtual_bill(ds):
             "Bob",
             "hgjeyhuw",
             "00",
+            "E",
+            "_L",
+            "22",
+            "HV",
+            False,
+            "510",
+            "PC 5-8 & HH HV",
+            None,
+            None,
+            None,
+            None,
             "CI017",
             "Water Works 1",
             "",
@@ -2168,6 +2199,17 @@ def virtual_bill(ds):
             "Bob",
             "hgjeyhuw",
             "00",
+            "E",
+            "_L",
+            "22",
+            "HV",
+            False,
+            "510",
+            "PC 5-8 & HH HV",
+            None,
+            None,
+            None,
+            None,
             "CI017",
             "Water Works 1",
             "",
@@ -2225,6 +2267,17 @@ def virtual_bill(ds):
             "Bob",
             "hgjeyhuw",
             "00",
+            "E",
+            "_L",
+            "22",
+            "HV",
+            False,
+            "510",
+            "PC 5-8 & HH HV",
+            None,
+            None,
+            None,
+            None,
             "CI017",
             "Water Works 1",
             None,
@@ -2602,6 +2655,17 @@ def virtual_bill(ds):
             "supply-name",
             "msn",
             "pc",
+            "energisation-status",
+            "gsp-group",
+            "dno",
+            "imp-voltage-level",
+            "imp-is-substation",
+            "imp-llfc-code",
+            "imp-llfc-description",
+            "exp-voltage-level",
+            "exp-is-substation",
+            "exp-llfc-code",
+            "exp-llfc-description",
             "site-id",
             "site-name",
             "associated-site-ids",
@@ -2647,6 +2711,17 @@ def virtual_bill(ds):
             "Bob",
             "hgjeyhuw",
             "00",
+            "E",
+            "_L",
+            "22",
+            "HV",
+            False,
+            "510",
+            "PC 5-8 & HH HV",
+            None,
+            None,
+            None,
+            None,
             "CI017",
             "Water Works",
             None,
@@ -3294,6 +3369,17 @@ def displaced_virtual_bill(ds):
             "supply-name",
             "msn",
             "pc",
+            "energisation-status",
+            "gsp-group",
+            "dno",
+            "imp-voltage-level",
+            "imp-is-substation",
+            "imp-llfc-code",
+            "imp-llfc-description",
+            "exp-voltage-level",
+            "exp-is-substation",
+            "exp-llfc-code",
+            "exp-llfc-description",
             "site-id",
             "site-name",
             "associated-site-ids",
@@ -3352,6 +3438,17 @@ def displaced_virtual_bill(ds):
             "Bob",
             "hgjeyhuw",
             "00",
+            "E",
+            "_L",
+            "22",
+            "HV",
+            False,
+            "510",
+            "PC 5-8 & HH HV",
+            None,
+            None,
+            None,
+            None,
             "CI017",
             "Water Works",
             "",
@@ -3409,6 +3506,17 @@ def displaced_virtual_bill(ds):
             "Bob",
             "hgjeyhuw",
             "00",
+            "E",
+            "_L",
+            "22",
+            "HV",
+            False,
+            "510",
+            "PC 5-8 & HH HV",
+            None,
+            None,
+            None,
+            None,
             "CI017",
             "Water Works",
             "",
@@ -3465,6 +3573,17 @@ def displaced_virtual_bill(ds):
             None,
             None,
             None,
+            "00",
+            "E",
+            "_L",
+            "22",
+            "HV",
+            False,
+            "510",
+            "PC 5-8 & HH HV",
+            None,
+            None,
+            None,
             None,
             "CI017",
             "Water Works",

chellow-1708506090.0.0/VERSION

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