chellow 1724868336.0.0__py3-none-any.whl → 1725528079.0.0__py3-none-any.whl

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

@@ -1,24 +1,23 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1724868336.0.0
+Version: 1725528079.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)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
-Requires-Dist: cryptography==42.0.8
 Requires-Dist: flask-restx==1.2.0
 Requires-Dist: flask==2.3.3
 Requires-Dist: odio==0.0.23
 Requires-Dist: openpyxl==3.1.2
-Requires-Dist: paramiko==3.4.0
+Requires-Dist: paramiko==3.4.1
 Requires-Dist: pep3143daemon==0.0.6
 Requires-Dist: pg8000==1.31.1
 Requires-Dist: pip>=9.0.1
 Requires-Dist: psutil==5.9.5
 Requires-Dist: pympler==1.0.1
-Requires-Dist: pypdf==3.17.0
+Requires-Dist: pypdf==4.3.1
 Requires-Dist: python-dateutil==2.8.2
 Requires-Dist: pytz==2022.6
 Requires-Dist: requests==2.32.2

{chellow-1724868336.0.0.dist-info → chellow-1725528079.0.0.dist-info}/RECORD

@@ -5,7 +5,7 @@ chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=dixp-O0MF2_mlwrnKx3D9DH09Qu05BjTo0rZfigTjR4,5534
 chellow/edi_lib.py,sha256=alu20x9ZX06iPfnNI9dEJzuP6RIf4We3Y_M_bl7RrcY,51789
 chellow/general_import.py,sha256=l3EHq9zG9Vfl5Ee6XTVrC1nusXo4YGGB4VBmZ_JaJR8,65798
-chellow/models.py,sha256=YtU1lnJWdNKB4z5shDsNXSHJROpiuuJ5K5UUH-X22to,243510
+chellow/models.py,sha256=pBaFnTUIyThyg7iGIrbh4v8MW3LuEAwe1-4LAF4G7Q4,243491
 chellow/national_grid.py,sha256=czwIZqzJndSGhEMQ5YzI6hRBhvjkM6VRVYXybf4_KXg,4377
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 chellow/rate_server.py,sha256=fg-Pf_9Hk3bXmC9riPQNGQxBvLvBa_WtNYdwDCjnCSg,5678
@@ -30,7 +30,7 @@ chellow/e/hh_parser_df2.py,sha256=7gaVidyIqeqprm3zYPtHvRLLn08nph04N0cKlveNTV0,42
 chellow/e/hh_parser_simple_csv.py,sha256=RN4QOLvTQeoPrpvXvQ9hkOBZnR5piybLfjCiSJdjpjs,2112
 chellow/e/laf_import.py,sha256=aqkcbjnvfBPszBLSNg6getP7iW1uWiTVHy6N5Z5x39U,5514
 chellow/e/lcc.py,sha256=OkpynN8_iAdHRlu-yyU6BhRUqYYOZsUnl0HbHULYo_4,4670
-chellow/e/mdd_importer.py,sha256=n9YMR1XD8Wm_5vHo-pydpoLJKRhUds_TcqELGxujcvg,32184
+chellow/e/mdd_importer.py,sha256=wq5Fw-MSe17WNuPzeWdCmJvX0NKV3Y501t6z2tqd92Q,35638
 chellow/e/rcrc.py,sha256=92CA1uIotIHd1epQ_jEPdJKzXqDFV-AoJOJeRO6MEyA,4274
 chellow/e/ro.py,sha256=dZKZv_9wXSWuwcb3jiKavoD_9ot-PZseNVeEEe0siLo,596
 chellow/e/scenario.py,sha256=fBDZVOdrI1I3XQG-RdpB0-lDF9VYENBu_9bBXJxmvWk,23362
@@ -38,7 +38,7 @@ chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,623
 chellow/e/tlms.py,sha256=M33D6YpMixu2KkwSCzDRM3kThLgShg8exp63Obo75l8,8905
 chellow/e/tnuos.py,sha256=XseYztPUsQXNKuBmystO2kzzwAG9ehCZgpGBTdgSk-A,4313
 chellow/e/triad.py,sha256=lIQj7EdUrcFwEqleuHZXYU_bfzIwNOqUVVxB3NPQt4A,13710
-chellow/e/views.py,sha256=-0Ys7XVdBgFYaWWnKfRRwcVeQ7YyrHNS1HVXuFNk8wY,216190
+chellow/e/views.py,sha256=Ue11tdJSjXni4sFobzlvnrTI5evSja_qUuTQ_JusPdU,216671
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=UgWXDPzQkQghyj_lfgBqoSJpHB-t-qOdSaB8qY6GLog,4071
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=-HMoIfa_utXYKA44RuC0Xqv3vd2HLeQU_4P0iBUd3WA,4219
@@ -196,7 +196,7 @@ chellow/templates/e/dc_contracts_add.html,sha256=2lrGrNqAoKp16OiMoNDNlJxBMW3QdSP
 chellow/templates/e/dc_rate_script.html,sha256=gfKUHV2IMsTQT-cYfjl4aiEBqGEWSj3uW22UZpoyGq4,1219
 chellow/templates/e/dc_rate_script_add.html,sha256=5MlE4r5eLww3xI9qZRlu8hE8bU7RVwyDJcr20-0e4uY,644
 chellow/templates/e/dc_rate_script_edit.html,sha256=RytAio6WbORye2iEETorC_80lyo7ZqY7qbulmRPo9m8,1955
-chellow/templates/e/dno.html,sha256=dMIkSPkYF81wWBO0OxEBX0xf7uWyk_AtdEQu_TuE6gs,2515
+chellow/templates/e/dno.html,sha256=dex343gChjoB8HOM3h4rUm-Gn8_Q_fDeAQT1pNWe-H0,2454
 chellow/templates/e/dno_rate_script.html,sha256=8wK2GqDyPAPxLsK3waEuGwqerGtWPCu-RQdg-XCJw2o,753
 chellow/templates/e/dno_rate_script_add.html,sha256=LRHN86z1oBceQLtzVbLs9rrcav8DfcDrPYzyvvc7cQA,559
 chellow/templates/e/dno_rate_script_edit.html,sha256=5hNwZWMdesZywOiUAS_OIAapT8jjebc9qp_U9pkXUgs,1275
@@ -278,7 +278,7 @@ chellow/templates/e/scenario_docs.html,sha256=hOg6hrrnOcvdk7jXRsMrk1wtwK7K0IpqcB
 chellow/templates/e/scenario_edit.html,sha256=Uf64v_qsBP0BxaFEIz214CC_dZXlvro4zvQXH_towhA,1070
 chellow/templates/e/scenarios.html,sha256=zlNhZvQEcuwLgHObVHS-4THur5Lz9Jf1G6xD98-jamI,847
 chellow/templates/e/site_add_e_supply.html,sha256=_gi1ejI4TMTMX9vCW7z2kToR2XKR6qoVh67qp_VrDsM,2731
-chellow/templates/e/site_add_e_supply_form.html,sha256=e6jovPUzquy5E-jsdGD1zt_-62NAgc1rhmbP2M5FoM0,5552
+chellow/templates/e/site_add_e_supply_form.html,sha256=q5LfSmp_eamph4FLKslMrxKGOtGCkSFRe9I5AVn-hgM,5553
 chellow/templates/e/site_hh_data.html,sha256=1Ld5IIM3G84tVCAwtlJNGJTnrASS7d84AgaPwwHNEMI,1413
 chellow/templates/e/site_site_snags.html,sha256=vWpsFyxZj7GOrMXQz2rKq9zOQdVsqeUVtdBzehp9J5w,847
 chellow/templates/e/site_snag.html,sha256=eZt1H-t-hsoKZBteU9ILpKqKLD0Pf0Uybp8pPQYuTAc,924
@@ -365,6 +365,6 @@ chellow/templates/g/supply_note_edit.html,sha256=b8mB6_ucBwoljp03iy6AgVaZUhGw3-1
 chellow/templates/g/supply_notes.html,sha256=6epNmZ3NKdXZz27fvmRUGeffg_oc1kmwuBeyRzQe3Rg,854
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1724868336.0.0.dist-info/METADATA,sha256=tSIH1BFEVhIB3kTzEPeIrYlTSVM5bdKcwDmURrsSKH4,12241
-chellow-1724868336.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1724868336.0.0.dist-info/RECORD,,
+chellow-1725528079.0.0.dist-info/METADATA,sha256=T1o-2gNx1BoRjojAEb0dP7MAPEAnrewUDUWM_s0ol1A,12204
+chellow-1725528079.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1725528079.0.0.dist-info/RECORD,,