chellow 1708506090.0.0__py3-none-any.whl → 1708963708.0.0__py3-none-any.whl

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/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/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.dist-info → chellow-1708963708.0.0.dist-info}/METADATA

@@ -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-1708506090.0.0.dist-info → chellow-1708963708.0.0.dist-info}/RECORD

@@ -16,10 +16,10 @@ chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/aahedc.py,sha256=d2usudp7KYWpU6Pk3fal5EQ47EbvkvKeaFGylnb3NWw,606
 chellow/e/bill_importer.py,sha256=y1bpn49xDwltj0PRFowWsjAVamcD8eyxUbCTdGxEZiE,7389
 chellow/e/bmarketidx.py,sha256=0JCBBnP3xfLq2eFjXO_u-gzHyTizab4Pp6PRK6OZLcw,7134
-chellow/e/bsuos.py,sha256=YtEhce5589kJWNp0HlA7N9L1hHl2KjYkUm54cUCOB8w,15080
+chellow/e/bsuos.py,sha256=aqteIr0YdkWDLlfJIQ8bW4mDsUxffi5zhsUAzykkqtk,15442
 chellow/e/ccl.py,sha256=CYeFrg0TNF7Av49nqxa0guA8CMcJhdMpBRmOq8PH6G0,564
 chellow/e/cfd.py,sha256=3yRchycC-WZwgqryGQK3B59OcMGVIWgbxrkekUOy-9k,14914
-chellow/e/computer.py,sha256=J8VvYjcSeJNrG2Ak8Zi2t2bb_8tMrkHWny4JQlgIyy8,67032
+chellow/e/computer.py,sha256=YL1JFUYfFW-i9DODfvSnp6gTL_MwIfwoWj1TWtOsxPg,67105
 chellow/e/dno_rate_parser.py,sha256=5MYEbcYngh7n6Szn2h9zLTwQKXH-WHKy6c80PYwNLLQ,20983
 chellow/e/duos.py,sha256=ISTcNqe9KNjVNM2Qs8IBoQxnmSXOt5W_G7tZxp4T78M,28870
 chellow/e/elexon.py,sha256=s8QdLUQMeylLhghxvvhLyOL3-0ifUnMfmo3vcbot_DY,5487
@@ -78,7 +78,7 @@ chellow/reports/report_219.py,sha256=o2eEg3mX9_raP2b4gjc2Gu4vqnMqcvvJBYQ1oQjxvpE
 chellow/reports/report_231.py,sha256=jE68IXQrk71gqVLTDMGvhndUbxcf2_HkC4ApUF6Mv-Q,4100
 chellow/reports/report_233.py,sha256=DLAmkoHFKH-N8OEIoX4jeCxAaCfJK0e7ssjFJJpPqzw,4334
 chellow/reports/report_241.py,sha256=se2V1tb5scvH9-RRuGG3U-IbqUYd-BZcNFwvTRjkbsw,5625
-chellow/reports/report_247.py,sha256=m2YgZY1YkAkSI2Qn3cNlFe2Gv8ToXfFs1zHiQd9RwbM,41556
+chellow/reports/report_247.py,sha256=ozgCcee8XeqYbOpZCyU2STJKaz6h2x7TYQogagTaYLw,46626
 chellow/reports/report_29.py,sha256=KDFjgrLBv4WbG9efCdu_geMR7gT_QV9N97Wfdt7aDc4,2736
 chellow/reports/report_291.py,sha256=q04Y9EfMhQuEX4ObpmUs8vJTL76QwdG1A2-2HDVWhHQ,7587
 chellow/reports/report_33.py,sha256=3WXPN0xV6PGMKY_Oc5bKR84JuiXirYlYdrghqIgYY_s,16675
@@ -363,6 +363,6 @@ chellow/templates/g/supply_note_edit.html,sha256=6UQf_qbhFDys3cVsTp-c7ABWZpggW9R
 chellow/templates/g/supply_notes.html,sha256=WR3YwGh_qqTklSJ7JqWX6BKBc9rk_jMff4RiWZiF2CM,936
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1708506090.0.0.dist-info/METADATA,sha256=wp5GvZ_7hSjlE2jkjOabQPR1gHXug70SwlYb1YF2mTg,12203
-chellow-1708506090.0.0.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
-chellow-1708506090.0.0.dist-info/RECORD,,
+chellow-1708963708.0.0.dist-info/METADATA,sha256=DltGdJaV-zsWDI7LROQ05hzCQtV2-LCKYzhQLN5DKZQ,12203
+chellow-1708963708.0.0.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
+chellow-1708963708.0.0.dist-info/RECORD,,