chellow 1714470909.0.0__tar.gz → 1715252645.0.0__tar.gz

{chellow-1714470909.0.0 → chellow-1715252645.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1714470909.0.0
+Version: 1715252645.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-1715252645.0.0/VERSION

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

{chellow-1714470909.0.0 → chellow-1715252645.0.0}/chellow/e/computer.py

@@ -552,6 +552,7 @@ class DataSource:
         self.era_map_mop_contracts = self.era_map.get("mop_contracts", {})
         self.era_map_cops = self.era_map.get("cops", {})
         self.era_map_comms = self.era_map.get("comms", {})
+        self.era_map_dtc_meter_types = self.era_map.get("dtc_meter_types", {})
         self.era_map_mpan_cores = self.era_map.get("mpan_cores", {})
         self.era_map_dnos = self.era_map.get("dnos", {})
         self.era_map_gsp_groups = self.era_map.get("gsp_groups", {})
@@ -672,9 +673,16 @@ class SiteSource(DataSource):
             else:
                 self.sc = era.imp_sc
 
-            self.properties = self.era_map.get("properties_overwritten", {})
-            self.properties.update(era.props)
-            self.properties.update(self.era_map.get("properties_overwrite", {}))
+            if era.dtc_meter_type is None:
+                era_dtc_meter_type_code = None
+            else:
+                era_dtc_meter_type_code = era.dtc_meter_type.code
+            if era_dtc_meter_type_code in self.era_map_dtc_meter_types:
+                self.dtc_meter_type_code = self.era_map_dtc_meter_types[
+                    era_dtc_meter_type_code
+                ]
+            else:
+                self.dtc_meter_type_code = era_dtc_meter_type_code
 
             self.is_import = True
             self.voltage_level_code = self.llfc.voltage_level.code
@@ -1051,9 +1059,16 @@ class SupplySource(DataSource):
         else:
             self.comm_code = era.comm.code
 
-        self.properties = dict(self.era_map.get("properties_overwritten", {}))
-        self.properties.update(era.props)
-        self.properties.update(self.era_map.get("properties_overwrite", {}))
+        if era.dtc_meter_type is None:
+            era_dtc_meter_type_code = None
+        else:
+            era_dtc_meter_type_code = era.dtc_meter_type.code
+        if era_dtc_meter_type_code in self.era_map_dtc_meter_types:
+            self.dtc_meter_type_code = self.era_map_dtc_meter_types[
+                era_dtc_meter_type_code
+            ]
+        else:
+            self.dtc_meter_type_code = era_dtc_meter_type_code
 
         self.id = self.mpan_core
         self.msn = era.msn
@@ -1632,18 +1647,6 @@ def _read_generator(sess, supply, start, is_forwards, is_prev):
         if bill.id != r.bill.id:
             continue
 
-        era = supply.find_era_at(sess, dt)
-        if era is None:
-            era_coeff = None
-        else:
-            era_properties = PropDict(
-                chellow.utils.url_root + "eras/" + str(era.id), loads(era.properties)
-            )
-            try:
-                era_coeff = float(era_properties["coefficient"])
-            except KeyError:
-                era_coeff = None
-
         reads = {}
         coeffs = {}
         for coeff, value, tpr_code in sess.query(
@@ -1656,7 +1659,7 @@ def _read_generator(sess, supply, start, is_forwards, is_prev):
             r_dt == dt,
         ):
             reads[tpr_code] = value
-            coeffs[tpr_code] = coeff if era_coeff is None else era_coeff
+            coeffs[tpr_code] = coeff
 
         yield {
             "date": dt,

{chellow-1714470909.0.0 → chellow-1715252645.0.0}/chellow/e/views.py

@@ -42,6 +42,7 @@ from chellow.models import (
     Comm,
     Contract,
     Cop,
+    DtcMeterType,
     EnergisationStatus,
     Era,
     GeneratorType,
@@ -49,7 +50,6 @@ from chellow.models import (
     HhDatum,
     Laf,
     Llfc,
-    METER_TYPES,
     MarketRole,
     MeasurementRequirement,
     MeterPaymentType,
@@ -1137,6 +1137,14 @@ def dc_contract_edit_get(dc_contract_id):
     )
 
 
+@e.route("/dc_contracts/<int:contract_id>/edit", methods=["DELETE"])
+def dc_contract_edit_delete(contract_id):
+    contract = Contract.get_dc_by_id(g.sess, contract_id)
+    contract.delete(g.sess)
+    g.sess.commit()
+    return hx_redirect("/dc_contracts", 303)
+
+
 @e.route("/dc_contracts/<int:contract_id>/edit", methods=["POST"])
 def dc_contract_edit_post(contract_id):
     contract = None
@@ -1161,10 +1169,6 @@ def dc_contract_edit_post(contract_id):
             )
             g.sess.commit()
             return chellow_redirect(f"/dc_contracts/{contract.id}", 303)
-        elif "delete" in request.form:
-            contract.delete(g.sess)
-            g.sess.commit()
-            return chellow_redirect("/dc_contracts", 303)
         else:
             party_id = req_int("party_id")
             name = req_str("name")
@@ -1501,15 +1505,14 @@ def dno_get(dno_id):
 
 @e.route("/dtc_meter_types")
 def dtc_meter_types_get():
-    return render_template("dtc_meter_types.html", dtc_meter_types=METER_TYPES)
+    dtc_meter_types = g.sess.scalars(select(DtcMeterType).order_by(DtcMeterType.code))
+    return render_template("dtc_meter_types.html", dtc_meter_types=dtc_meter_types)
 
 
-@e.route("/dtc_meter_types/<code>")
-def dtc_meter_type_get(code):
-    desc = METER_TYPES[code]
-    return render_template(
-        "dtc_meter_type.html", dtc_meter_type_code=code, dtc_meter_type_description=desc
-    )
+@e.route("/dtc_meter_types/<int:dtc_meter_type_id>")
+def dtc_meter_type_get(dtc_meter_type_id):
+    dtc_meter_type = DtcMeterType.get_by_id(g.sess, dtc_meter_type_id)
+    return render_template("dtc_meter_type.html", dtc_meter_type=dtc_meter_type)
 
 
 @e.route("/duration_report")
@@ -1565,6 +1568,7 @@ def era_edit_get(era_id):
     cops = g.sess.query(Cop).order_by(Cop.code)
     comms = g.sess.query(Comm).order_by(Comm.code)
     gsp_groups = g.sess.query(GspGroup).order_by(GspGroup.code)
+    dtc_meter_types = g.sess.scalars(select(DtcMeterType).order_by(DtcMeterType.code))
     mop_contracts = (
         g.sess.query(Contract)
         .join(MarketRole)
@@ -1598,6 +1602,7 @@ def era_edit_get(era_id):
         cops=cops,
         comms=comms,
         gsp_groups=gsp_groups,
+        dtc_meter_types=dtc_meter_types,
         mop_contracts=mop_contracts,
         dc_contracts=dc_contracts,
         supplier_contracts=supplier_contracts,
@@ -1615,6 +1620,9 @@ def era_edit_form_get(era_id):
             select(EnergisationStatus).order_by(EnergisationStatus.code)
         )
         default_energisation_status = EnergisationStatus.get_by_code(g.sess, "E")
+        dtc_meter_types = g.sess.scalars(
+            select(DtcMeterType).order_by(DtcMeterType.code)
+        )
 
         if "start_year" in request.values:
             start_date = req_date("start")
@@ -1934,6 +1942,7 @@ def era_edit_form_get(era_id):
             start_date=start_date,
             imp_llfcs=imp_llfcs,
             exp_llfcs=exp_llfcs,
+            dtc_meter_types=dtc_meter_types,
         )
     except BadRequest as e:
         g.sess.rollback()
@@ -1950,6 +1959,7 @@ def era_edit_form_get(era_id):
             sscs=sscs,
             mtc_participants=mtc_participants,
             mtc_participant=mtc_participant,
+            dtc_meter_types=dtc_meter_types,
         )
 
 
@@ -2009,7 +2019,11 @@ def era_edit_post(era_id):
             energisation_status = EnergisationStatus.get_by_id(
                 g.sess, energisation_status_id
             )
-            properties = req_zish("properties")
+            dtc_meter_type_id = req_int_none("dtc_meter_type_id")
+            if dtc_meter_type_id is None:
+                dtc_meter_type = None
+            else:
+                dtc_meter_type = DtcMeterType.get_by_id(g.sess, dtc_meter_type_id)
 
             has_imp_mpan = req_bool("has_imp_mpan")
             has_exp_mpan = req_bool("has_exp_mpan")
@@ -2068,7 +2082,7 @@ def era_edit_post(era_id):
                 comm,
                 ssc_code,
                 energisation_status,
-                properties,
+                dtc_meter_type,
                 imp_mpan_core,
                 imp_llfc_code,
                 imp_supplier_contract,
@@ -3059,6 +3073,14 @@ def mop_contract_edit_get(contract_id):
     )
 
 
+@e.route("/mop_contracts/<int:contract_id>/edit", methods=["DELETE"])
+def mop_contract_edit_delete(contract_id):
+    contract = Contract.get_mop_by_id(g.sess, contract_id)
+    contract.delete(g.sess)
+    g.sess.commit()
+    return hx_redirect("/mop_contracts", 303)
+
+
 @e.route("/mop_contracts/<int:contract_id>/edit", methods=["POST"])
 def mop_contract_edit_post(contract_id):
     try:
@@ -3082,10 +3104,6 @@ def mop_contract_edit_post(contract_id):
             )
             g.sess.commit()
             return chellow_redirect(f"/mop_contracts/{contract.id}", 303)
-        elif "delete" in request.form:
-            contract.delete(g.sess)
-            g.sess.commit()
-            return chellow_redirect("/mop_contracts", 303)
         else:
             party_id = req_int("party_id")
             name = req_str("name")
@@ -4618,7 +4636,12 @@ def site_add_e_supply_post(site_id):
         energisation_status = EnergisationStatus.get_by_id(
             g.sess, energisation_status_id
         )
-        properties = req_zish("properties")
+        dtc_meter_type_id = req_int_none("dtc_meter_type_id")
+        if dtc_meter_type_id is None:
+            dtc_meter_type = None
+        else:
+            dtc_meter_type = DtcMeterType.get_by_id(g.sess, dtc_meter_type_id)
+
         if "generator_type_id" in request.form:
             generator_type_id = req_int("generator_type_id")
             generator_type = GeneratorType.get_by_id(g.sess, generator_type_id)
@@ -4695,7 +4718,7 @@ def site_add_e_supply_post(site_id):
             comm,
             None if ssc is None else ssc.code,
             energisation_status,
-            properties,
+            dtc_meter_type,
             imp_mpan_core,
             imp_llfc_code,
             imp_supplier_contract,

{chellow-1714470909.0.0 → chellow-1715252645.0.0}/chellow/general_import.py

@@ -9,7 +9,7 @@ from sqlalchemy.sql.expression import false
 
 from werkzeug.exceptions import BadRequest
 
-from zish import ZishException, loads
+from zish import loads
 
 from chellow.models import (
     Bill,
@@ -18,6 +18,7 @@ from chellow.models import (
     Comm,
     Contract,
     Cop,
+    DtcMeterType,
     EnergisationStatus,
     Era,
     GContract,
@@ -389,11 +390,11 @@ def general_import_era(sess, action, vals, args):
         else:
             energisation_status = EnergisationStatus.get_by_code(sess, es_code)
 
-        properties_str = add_arg(args, "Properties", vals, 14)
-        if properties_str == NO_CHANGE:
-            properties = loads(existing_era.properties)
+        dtc_meter_type_code = add_arg(args, "DTC Meter Type", vals, 14)
+        if dtc_meter_type_code == NO_CHANGE:
+            dtc_meter_type = existing_era.dtc_meter_type
         else:
-            properties = loads(properties_str)
+            dtc_meter_type = DtcMeterType.get_by_code(sess, dtc_meter_type_code)
 
         imp_mpan_core = add_arg(args, "Import MPAN Core", vals, 15)
         if imp_mpan_core == NO_CHANGE:
@@ -519,7 +520,7 @@ def general_import_era(sess, action, vals, args):
             comm,
             ssc_code,
             energisation_status,
-            properties,
+            dtc_meter_type,
             imp_mpan_core,
             imp_llfc_code,
             imp_supplier_contract,
@@ -1275,11 +1276,8 @@ def general_import_supply(sess, action, vals, args):
         energisation_status = EnergisationStatus.get_by_code(
             sess, energisation_status_code
         )
-        properties_str = add_arg(args, "Properties", vals, 19)
-        try:
-            properties = loads(properties_str)
-        except ZishException as e:
-            raise BadRequest(f"Can't parse the properties field. {e}")
+        dtc_meter_type_code = add_arg(args, "DTC Meter Type", vals, 19)
+        dtc_meter_type = DtcMeterType.get_by_code(sess, dtc_meter_type_code)
         imp_mpan_core = add_arg(args, "Import MPAN Core", vals, 20)
         if len(imp_mpan_core) == 0:
             imp_mpan_core = None
@@ -1356,7 +1354,7 @@ def general_import_supply(sess, action, vals, args):
             comm,
             ssc_code,
             energisation_status,
-            properties,
+            dtc_meter_type,
             imp_mpan_core,
             imp_llfc_code,
             imp_supplier_contract,