chellow 1724831616.0.0__tar.gz → 1725527086.0.0__tar.gz

{chellow-1724831616.0.0 → chellow-1725527086.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1724831616.0.0
+Version: 1725527086.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-1725527086.0.0/VERSION

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

{chellow-1724831616.0.0 → chellow-1725527086.0.0}/chellow/e/mdd_importer.py

@@ -247,8 +247,6 @@ def _import_Market_Participant_Role(sess, rows, ctx):
         name = values[4]
         dno_code_str = values[14]
         dno_code = None if len(dno_code_str) == 0 else dno_code_str
-        if dno_code == "99":
-            continue
 
         if party is None:
             participant.insert_party(
@@ -324,7 +322,7 @@ def _import_Meter_Timeswitch_Class(sess, rows, ctx):
             has_comms_str = values[8]  # MTC Communication Indicator
             has_comms = parse_bool(has_comms_str)
             is_hh_str = values[9]  # MTC Type Indicator
-            is_hh = parse_bool(is_hh_str)
+            is_hh = is_hh_str == "H"
             tpr_count_str = values[10]  # TPR Count
             tpr_count = None if tpr_count_str == "" else int(tpr_count_str)
 
@@ -837,7 +835,101 @@ def _import_Valid_MTC_LLFC_SSC_PC_Combination(sess, rows, ctx):
             )
 
 
-def rate_server_import(sess, log, set_progress, s, paths):
+def add_88_99(sess, ctx):
+    rows = [
+        [
+            "CIDC",
+            "R",
+            "01/01/2000",
+            "",
+            "Virtual",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "88",
+        ],
+        [
+            "CROW",
+            "R",
+            "01/04/1996",
+            "",
+            "Non-settlement",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "99",
+        ],
+    ]
+    _import_Market_Participant_Role(sess, rows, ctx)
+    rows = [
+        ["845", "01/04/1996", "CIDC", "01/04/1996", ""],
+        ["845", "01/04/1996", "CROW", "01/04/1996", ""],
+    ]
+    _import_MTC_in_PES_Area(sess, rows, ctx)
+    rows = [
+        ["CIDC", "", "", "005", "01/04/2010", "EG_HV_Intermittent", "C", ""],
+        ["CIDC", "", "", "006", "01/04/2010", "EG_HV_Non_Intermittent", "C", ""],
+        ["CIDC", "", "", "110", "01/01/2000", "Profile 3 Unrestricted", "A", ""],
+        ["CIDC", "", "", "210", "01/01/2000", "Profile 4 Economy 7", "A", ""],
+        ["CIDC", "", "", "510", "01/01/2000", "PC 5-8 & HH HV", "A", ""],
+        ["CIDC", "", "", "521", "01/01/2000", "Export (HV)", "C", ""],
+        [
+            "CIDC",
+            "",
+            "",
+            "524",
+            "01/04/2010",
+            "HV Generation Non intermittent",
+            "C",
+            "",
+        ],
+        ["CIDC", "", "", "570", "01/01/2000", "PC 5-8 & HH LV", "A", ""],
+        ["CIDC", "", "", "581", "01/01/2000", "Export (LV)", "C", ""],
+        ["CIDC", "", "", "658", "01/04/1996", "HV HH metered", "A", ""],
+        ["CROW", "", "", "510", "01/04/1996", "PC 5-8 & HH HV", "A", ""],
+        ["CROW", "", "", "521", "01/04/1996", "Export (HV)", "C", ""],
+        ["CROW", "", "", "570", "01/04/1996", "PC 5-8 & HH LV", "A", ""],
+        ["CROW", "", "", "581", "01/04/1996", "Export (LV)", "C", ""],
+    ]
+
+    _import_Line_Loss_Factor_Class(sess, rows, ctx)
+    rows = [
+        ["845", "01/04/1996", "CIDC", "01/04/1996", "005", "01/04/2010", ""],
+        ["845", "01/04/1996", "CIDC", "01/04/1996", "006", "01/04/2010", ""],
+        ["845", "01/04/1996", "CIDC", "01/04/1996", "110", "01/01/2000", ""],
+        ["845", "01/04/1996", "CIDC", "01/04/1996", "210", "01/01/2000", ""],
+        ["845", "01/04/1996", "CIDC", "01/04/1996", "510", "01/01/2000", ""],
+        ["845", "01/04/1996", "CIDC", "01/04/1996", "521", "01/01/2000", ""],
+        ["845", "01/04/1996", "CIDC", "01/04/1996", "524", "01/04/2010", ""],
+        ["845", "01/04/1996", "CIDC", "01/04/1996", "570", "01/01/2000", ""],
+        ["845", "01/04/1996", "CIDC", "01/04/1996", "581", "01/01/2000", ""],
+        ["845", "01/04/1996", "CIDC", "01/04/1996", "658", "01/01/2000", ""],
+        ["845", "01/04/1996", "CROW", "01/04/1996", "510", "01/04/1996", ""],
+        ["845", "01/04/1996", "CROW", "01/04/1996", "521", "01/04/1996", ""],
+        ["845", "01/04/1996", "CROW", "01/04/1996", "570", "01/04/1996", ""],
+        ["845", "01/04/1996", "CROW", "01/04/1996", "581", "01/04/1996", ""],
+    ]
+    _import_Valid_MTC_LLFC_Combination(sess, rows, ctx)
+
+
+def _get_csv_reader(s, url):
+    csv_file = StringIO(download(s, url).decode("utf8"))
+    return csv.reader(csv_file)
+
+
+def rate_server_import(sess, log, set_progress, s, paths, with_88_99=True):
     log("Starting to check for a new MDD version")
     mdd_entries = {}
     for path, url in paths:
@@ -872,8 +964,7 @@ def rate_server_import(sess, log, set_progress, s, paths):
     version = None
 
     for file_name, url in fl_entries.items():
-        csv_file = StringIO(download(s, url).decode("utf8"))
-        csv_reader = iter(csv.reader(csv_file))
+        csv_reader = iter(_get_csv_reader(s, url))
         next(csv_reader)  # Skip titles
 
         table_name_elements = file_name.split("_")
@@ -929,7 +1020,10 @@ def rate_server_import(sess, log, set_progress, s, paths):
             func(sess, gnames[tname], ctx)
         else:
             raise BadRequest(f"Can't find {tname} on the rate server.")
-
+    if with_88_99:
+        log("Starting to add MDD data for 88 and 99 DNOs")
+        add_88_99(sess, ctx)
+        log("Finished adding MDD data for 88 and 99 DNOs")
     config = Contract.get_non_core_by_name(sess, "configuration")
     state = config.make_state()
     state["mdd_version"] = version

{chellow-1724831616.0.0 → chellow-1725527086.0.0}/chellow/e/views.py

@@ -4354,29 +4354,15 @@ def site_add_e_supply_form_get(site_id):
             EnergisationStatus.code
         )
         default_energisation_status = EnergisationStatus.get_by_code(g.sess, "E")
-
+        gsp_groups_q = select(GspGroup).order_by(GspGroup.code)
+        gsp_groups = g.sess.scalars(gsp_groups_q)
+        RateScriptAliasStart = aliased(RateScript)
+        RateScriptAliasFinish = aliased(RateScript)
         if "start_year" in request.values:
             start_date = req_date("start")
         else:
             start_date = to_utc(ct_datetime(ct_now.year, ct_now.month, ct_now.day))
 
-        site = Site.get_by_id(g.sess, site_id)
-        sources = g.sess.scalars(select(Source).order_by(Source.code))
-        source_id = req_int_none("source_id")
-        if source_id is None:
-            source = Source.get_by_code(g.sess, "grid")
-        else:
-            source = Source.get_by_id(g.sess, source_id)
-        generator_types = g.sess.query(GeneratorType).order_by(GeneratorType.code)
-        gsp_groups = g.sess.query(GspGroup).order_by(GspGroup.code)
-        eras = (
-            g.sess.query(Era)
-            .join(SiteEra)
-            .filter(SiteEra.site == site)
-            .order_by(Era.start_date.desc())
-        )
-        RateScriptAliasStart = aliased(RateScript)
-        RateScriptAliasFinish = aliased(RateScript)
         mop_contracts = g.sess.scalars(
             select(Contract)
             .join(MarketRole)
@@ -4431,12 +4417,15 @@ def site_add_e_supply_form_get(site_id):
             )
             .order_by(Contract.name)
         ).all()
-        pcs = g.sess.query(Pc).order_by(Pc.code)
-        pc_id = req_int_none("pc_id")
-        if pc_id is None:
-            pc = Pc.get_by_code(g.sess, "00")
+
+        site = Site.get_by_id(g.sess, site_id)
+        sources = g.sess.scalars(select(Source).order_by(Source.code))
+        source_id = req_int_none("source_id")
+        if source_id is None:
+            source = Source.get_by_code(g.sess, "grid")
         else:
-            pc = Pc.get_by_id(g.sess, pc_id)
+            source = Source.get_by_id(g.sess, source_id)
+        generator_types = g.sess.query(GeneratorType).order_by(GeneratorType.code)
 
         dnos = g.sess.scalars(
             select(Party)
@@ -4444,12 +4433,36 @@ def site_add_e_supply_form_get(site_id):
             .where(MarketRole.code == "R")
             .order_by(Party.dno_code)
         ).all()
+        pcs = g.sess.query(Pc).order_by(Pc.code)
         dno_id = req_int_none("dno_id")
         if dno_id is None:
             dno = dnos[0]
         else:
             dno = Party.get_by_id(g.sess, dno_id)
 
+        dno_contract = Contract.get_dno_by_name(g.sess, dno.dno_code)
+        dno_rate_script = dno_contract.find_rate_script_at(g.sess, start_date)
+        dno_props = dno_rate_script.make_script()
+        allowed_gsp_group_codes = list(dno_props.keys())
+
+        gsp_groups = g.sess.scalars(
+            select(GspGroup)
+            .where(GspGroup.code.in_(allowed_gsp_group_codes))
+            .order_by(GspGroup.code)
+        )
+
+        eras = (
+            g.sess.query(Era)
+            .join(SiteEra)
+            .filter(SiteEra.site == site)
+            .order_by(Era.start_date.desc())
+        )
+        pc_id = req_int_none("pc_id")
+        if pc_id is None:
+            pc = Pc.get_by_code(g.sess, "00")
+        else:
+            pc = Pc.get_by_id(g.sess, pc_id)
+
         participant = dno.participant
 
         if pc.code == "00":

{chellow-1724831616.0.0 → chellow-1725527086.0.0}/chellow/models.py

@@ -1598,15 +1598,13 @@ class Contract(Base, PersistentClass):
         sess.delete(self)
 
     def find_rate_script_at(self, sess, date):
-        return (
-            sess.query(RateScript)
-            .filter(
+        return sess.scalars(
+            select(RateScript).where(
                 RateScript.contract == self,
                 RateScript.start_date <= date,
                 or_(RateScript.finish_date == null(), RateScript.finish_date >= date),
             )
-            .first()
-        )
+        ).first()
 
     def start_date(self):
         return self.start_rate_script.start_date

{chellow-1724831616.0.0 → chellow-1725527086.0.0}/chellow/reports/report_59.py

@@ -57,17 +57,7 @@ from chellow.views import chellow_redirect
 CATEGORY_ORDER = {None: 0, "unmetered": 1, "nhh": 2, "amr": 3, "hh": 4}
 
 
-def write_spreadsheet(
-    fl,
-    compressed,
-    site_rows,
-    supply_rows,
-    era_rows,
-    read_rows,
-    bill_check_site_rows,
-    bill_check_era_rows,
-    is_bill_check,
-):
+def write_spreadsheet(fl, compressed, site_rows, supply_rows, era_rows, read_rows):
     fl.seek(0)
     fl.truncate()
     with odio.create_spreadsheet(fl, "1.2", compressed=compressed) as f:
@@ -75,9 +65,6 @@ def write_spreadsheet(
         f.append_table("Supply Level", supply_rows)
         f.append_table("Era Level", era_rows)
         f.append_table("Normal Reads", read_rows)
-        if is_bill_check:
-            f.append_table("Bill Check Site", bill_check_site_rows)
-            f.append_table("Bill Check Era", bill_check_era_rows)
 
 
 def make_bill_row(titles, bill):
@@ -627,8 +614,41 @@ def _process_site(
                     .scalars()
                     .all()
                 )
+                imp_supplier_contract = first_era.imp_supplier_contract
+                exp_supplier_contract = first_era.exp_supplier_contract
                 if len(bills) > 0:
-                    month_data = {}
+                    era_vals = {
+                        "creation-date": now,
+                        "start-date": start_date,
+                        "finish-date": finish_date,
+                        "imp-mpan-core": last_era.imp_mpan_core,
+                        "exp-mpan-core": last_era.exp_mpan_core,
+                        "site-code": site.code,
+                        "site-name": site.name,
+                        "associated-site-codes": None,
+                        "era-start-date": None,
+                        "era-finish-date": None,
+                        "imp-supplier-contract": (
+                            None
+                            if imp_supplier_contract is None
+                            else imp_supplier_contract.name
+                        ),
+                        "imp-non-actual-hhs": None,
+                        "imp-non-actual-kwh": None,
+                        "exp-supplier-contract": (
+                            None
+                            if exp_supplier_contract is None
+                            else exp_supplier_contract.name
+                        ),
+                        "exp-non-actual-hhs": None,
+                        "exp-non-actual-kwh": None,
+                        "metering-type": last_era.meter_category,
+                        "source": last_era.supply.source.code,
+                        "generator-type": None,
+                        "supply-name": last_era.supply.name,
+                        "msn": last_era.msn,
+                        "pc": last_era.pc.code,
+                    }
                     for name in (
                         "import-grid",
                         "export-grid",
@@ -641,48 +661,18 @@ def _process_site(
                         "used-3rd-party",
                     ):
                         for sname in ("kwh", "net-gbp"):
-                            month_data[f"{name}-{sname}"] = 0
+                            era_vals[f"{name}-{sname}"] = 0
                     for suf in ("kwh", "net-gbp", "vat-gbp", "gross-gbp"):
-                        month_data[f"billed-import-{suf}"] = 0
-                        month_data[f"billed-import-supplier-{suf}"] = 0
-                        month_data[f"billed-import-dc-{suf}"] = 0
-                        month_data[f"billed-import-mop-{suf}"] = 0
-
-                    _add_bills(month_data, bills, chunk_start, chunk_finish)
-
-                    imp_supplier_contract = first_era.imp_supplier_contract
-                    exp_supplier_contract = first_era.exp_supplier_contract
-                    out = [
-                        now,
-                        last_era.imp_mpan_core,
-                        (
-                            None
-                            if imp_supplier_contract is None
-                            else imp_supplier_contract.name
-                        ),
-                        last_era.exp_mpan_core,
-                        (
-                            None
-                            if exp_supplier_contract is None
-                            else exp_supplier_contract.name
-                        ),
-                        None,
-                        last_era.meter_category,
-                        last_era.supply.source.code,
-                        None,
-                        last_era.supply.name,
-                        last_era.msn,
-                        last_era.pc.code,
-                        site.code,
-                        site.name,
-                        None,
-                        start_date,
-                        finish_date,
-                    ] + [month_data[t] for t in summary_titles]
-
-                    era_rows.append([make_val(v) for v in out])
+                        era_vals[f"billed-import-{suf}"] = 0
+                        era_vals[f"billed-import-supplier-{suf}"] = 0
+                        era_vals[f"billed-import-dc-{suf}"] = 0
+                        era_vals[f"billed-import-mop-{suf}"] = 0
+
+                    _add_bills(era_vals, bills, chunk_start, chunk_finish)
+
+                    era_rows.append([make_val(vals.get(t)) for t in era_titles])
                     for t in summary_titles:
-                        v = month_data.get(t)
+                        v = era_vals.get(t)
                         if v is not None:
                             site_data[t] += v
 
@@ -746,9 +736,6 @@ def content(
     supply_rows = []
     era_rows = []
     normal_read_rows = []
-    bill_check_site_rows = []
-    bill_check_supply_rows = []
-    bill_check_era_rows = []
 
     try:
         with RSession() as rsess:
@@ -850,6 +837,7 @@ def content(
                     )
 
             by_hh = scenario_props.get("by_hh", False)
+            is_bill_check = scenario_props.get("is_bill_check", False)
 
             era_header_titles = [
                 "creation-date",
@@ -1009,14 +997,15 @@ def content(
             supply_titles = supply_header_titles + summary_titles
             supply_rows.append(supply_titles)
             era_rows.append(era_titles)
-            bill_check_site_rows.append(site_header_titles + summary_titles)
-            bill_check_era_rows.append(era_titles)
 
             normal_reads = set()
 
-            data_source_bill = Object()
-            data_source_bill.start_date = start_date
-            data_source_bill.finish_date = finish_date
+            if is_bill_check:
+                data_source_bill = Object()
+                data_source_bill.start_date = start_date
+                data_source_bill.finish_date = finish_date
+            else:
+                data_source_bill = None
 
             for site in rsess.scalars(sites):
                 if by_hh:
@@ -1046,28 +1035,8 @@ def content(
                             supply_titles,
                             supply_rows,
                             site_rows,
-                            None,
+                            data_source_bill,
                         )
-                        if is_bill_check:
-                            _process_site(
-                                rsess,
-                                report_context,
-                                forecast_from,
-                                start,
-                                finish,
-                                site,
-                                scenario_props,
-                                supply_ids,
-                                now,
-                                summary_titles,
-                                title_dict,
-                                era_titles,
-                                bill_check_era_rows,
-                                supply_titles,
-                                bill_check_supply_rows,
-                                bill_check_site_rows,
-                                data_source_bill,
-                            )
                     except BadRequest as e:
                         raise BadRequest(f"Site Code {site.code}: {e.description}")
 
@@ -1078,31 +1047,14 @@ def content(
 
                 rsess.rollback()  # Evict from cache
             write_spreadsheet(
-                rf,
-                compression,
-                site_rows,
-                supply_rows,
-                era_rows,
-                normal_read_rows,
-                bill_check_site_rows,
-                bill_check_era_rows,
-                is_bill_check,
+                rf, compression, site_rows, supply_rows, era_rows, normal_read_rows
             )
     except BadRequest as e:
         msg = e.description + traceback.format_exc()
         sys.stderr.write(msg + "\n")
         site_rows.append(["Problem " + msg])
         write_spreadsheet(
-            rf,
-            compression,
-            site_rows,
-            supply_rows,
-            era_rows,
-            normal_read_rows,
-            bill_check_site_rows,
-            bill_check_supply_rows,
-            bill_check_era_rows,
-            is_bill_check,
+            rf, compression, site_rows, supply_rows, era_rows, normal_read_rows
         )
     except BaseException:
         msg = traceback.format_exc()
@@ -1114,17 +1066,7 @@ def content(
             ef.write(msg + "\n")
             ef.close()
         else:
-            write_spreadsheet(
-                rf,
-                compression,
-                site_rows,
-                era_rows,
-                normal_read_rows,
-                bill_check_site_rows,
-                bill_check_supply_rows,
-                bill_check_era_rows,
-                is_bill_check,
-            )
+            write_spreadsheet(rf, compression, site_rows, era_rows, normal_read_rows)
     finally:
         if rf is not None:
             rf.close()

{chellow-1724831616.0.0 → chellow-1725527086.0.0}/chellow/templates/e/dno.html

@@ -28,12 +28,12 @@
 				</td>
 			</tr>
 			<tr>
-				<td>Start Date</td>
-				<td>{{dno_contract.start_rate_script.start_date|hh_format }}</td>
+				<td>Valid From</td>
+				<td>{{dno.valid_from|hh_format }}</td>
 			</tr>
 			<tr>
-				<td>Finish Date</td>
-				<td>{{dno_contract.finish_rate_script.finish_date|hh_format }}</td>
+				<td>Valid To</td>
+				<td>{{dno.valid_to|hh_format }}</td>
 			</tr>
 			<tr>
 				<td>Custom Reports</td>

{chellow-1724831616.0.0 → chellow-1725527086.0.0}/chellow/templates/e/site_add_e_supply_form.html

@@ -32,6 +32,14 @@
 		</select>
 	{% endif %}
 	<label>Meter Serial Number</label> {{input_text('msn')}}
+
+	<label>DNO</label>
+	<select name="dno_id">
+		{% for dno in dnos %}
+			{{input_option( 'dno_id', dno.id, dno.dno_code + ' ' + dno.name)}}
+		{% endfor %}
+	</select>
+
 	<label>GSP Group</label>
 	<select name="gsp_group_id">
 		{% for gsp_group in gsp_groups %}
@@ -90,13 +98,6 @@
 		{% endfor %}
 	</select>
 
-	<label>DNO</label>
-	<select name="dno_id">
-		{% for dno in dnos %}
-			{{input_option( 'dno_id', dno.id, dno.dno_code + ' ' + dno.name)}}
-		{% endfor %}
-	</select>
-
 	{% if pc.code == '00' %}
 		<input type="hidden" name="ssc_id" value="">
 	{% else %}

{chellow-1724831616.0.0 → chellow-1725527086.0.0}/chellow/templates/site.html

@@ -181,8 +181,6 @@ Table of site level monthly kWh, MD kWh etc.</a>
 			{{ input_number('months', initial='1', size='2', maxlength='2', required=True) }}
 			<label>Final Month</label>
 			{{ input_date('finish', last_month_finish, resolution='month') }}
-			<label>Include bill check tabs?</label>
-			{{input_checkbox('is_bill_check')}}
 			<input type="submit" value="Download">
 		</fieldset>
 	</form>			

{chellow-1724831616.0.0 → chellow-1725527086.0.0}/test/e/test_e_views.py

@@ -2724,6 +2724,7 @@ def test_site_add_e_supply_form_get(client, sess):
         sess, "Fusion Supplier 2000", participant, "", {}, vf, None, {}
     )
     dno = participant.insert_party(sess, market_role_R, "WPD", vf, None, "22")
+    Contract.insert_dno(sess, dno.dno_code, participant, "", {}, vf, None, {})
     meter_type = MeterType.insert(sess, "C5", "COP 1-5", utc_datetime(2000, 1, 1), None)
     meter_payment_type = MeterPaymentType.insert(sess, "CR", "Credit", vf, None)
     mtc = Mtc.insert(sess, "845", False, True, vf, None)