chellow 1711032714.0.0__py3-none-any.whl → 1712838153.0.0__py3-none-any.whl

chellow/e/elexon.py

@@ -120,13 +120,6 @@ class Elexon(threading.Thread):
                 with Session() as sess:
                     try:
                         config = Contract.get_non_core_by_name(sess, "configuration")
-                        props = config.make_properties()
-                        scripting_key = props.get(ELEXON_PORTAL_SCRIPTING_KEY_KEY)
-                        if scripting_key is None:
-                            raise BadRequest(
-                                f"The property {ELEXON_PORTAL_SCRIPTING_KEY_KEY} "
-                                f"cannot be found in the configuration properties."
-                            )
                         state = config.make_state()
                         try:
                             elexon_state = state[ELEXON_STATE_KEY]
@@ -135,7 +128,14 @@ class Elexon(threading.Thread):
 
                         elexon_state[LAST_RUN_KEY] = utc_datetime_now()
                         config.update_state(state)
+                        props = config.make_properties()
+                        scripting_key = props.get(ELEXON_PORTAL_SCRIPTING_KEY_KEY)
                         sess.commit()
+                        if scripting_key is None:
+                            raise BadRequest(
+                                f"The property {ELEXON_PORTAL_SCRIPTING_KEY_KEY} "
+                                f"cannot be found in the configuration properties."
+                            )
                         run_import(sess, self.log, self.set_progress, scripting_key)
                     except BaseException as e:
                         msg = f"{e.description} " if isinstance(e, BadRequest) else ""

chellow/e/views.py

@@ -1569,7 +1569,6 @@ def era_edit_form_get(era_id):
     try:
         era = Era.get_by_id(g.sess, era_id)
         ct_now = ct_datetime_now()
-        cops = g.sess.scalars(select(Cop).order_by(Cop.code))
         comms = g.sess.scalars(select(Comm).order_by(Comm.code))
         energisation_statuses = g.sess.scalars(
             select(EnergisationStatus).order_by(EnergisationStatus.code)
@@ -1781,6 +1780,11 @@ def era_edit_form_get(era_id):
         else:
             mtc_participant = None
 
+        if mtc_participant is None:
+            cops = g.sess.scalars(select(Cop).order_by(Cop.code))
+        else:
+            cops = Cop.get_valid(g.sess, mtc_participant.meter_type)
+
         if pc.code == "00":
             imp_llfcs_q = (
                 select(Llfc)

chellow/models.py

@@ -510,6 +510,17 @@ class Cop(Base, PersistentClass):
             raise BadRequest(f"The CoP with code {code} can't be found.")
         return typ
 
+    @staticmethod
+    def get_valid(sess, meter_type):
+
+        if meter_type.code == "C5":
+            q = select(Cop).where(Cop.code.in_(["1", "2", "3", "4", "5"]))
+        elif meter_type.code in ["6A", "6B", "6C", "6D"]:
+            q = select(Cop).where(Cop.code == meter_type.code.lower())
+        else:
+            q = select(Cop)
+        return sess.scalars(q.order_by(Cop.code))
+
     __tablename__ = "cop"
     id = Column(Integer, primary_key=True)
     code = Column(String, unique=True, nullable=False)
@@ -3700,12 +3711,9 @@ class Era(Base, PersistentClass):
                             f"{hh_format(finish_date)}."
                         )
 
-        if (
-            self.mtc_participant.meter_type.code == "C5"
-            and cop.code not in ["1", "2", "3", "4", "5"]
-            or self.mtc_participant.meter_type.code in ["6A", "6B", "6C", "6D"]
-            and cop.code.upper() != self.mtc_participant.meter_type.code
-        ):
+        if cop.code not in [
+            c.code for c in Cop.get_valid(sess, self.mtc_participant.meter_type)
+        ]:
             raise BadRequest(
                 f"The CoP of {cop.code} is not compatible with the meter type code "
                 f"of {self.mtc_participant.meter_type.code}."
@@ -6809,9 +6817,9 @@ def db_init(sess, root_path):
         GContract.insert_industry(sess, name, "", props, last_month_start, None, rs)
 
     sess.execute(
-        text(f"alter database {db_name} set default_transaction_deferrable = on")
+        text(f'alter database "{db_name}" set default_transaction_deferrable = on')
     )
-    sess.execute(text(f"alter database {db_name} SET DateStyle TO 'ISO, YMD'"))
+    sess.execute(text(f"""alter database "{db_name}" SET DateStyle TO 'ISO, YMD'"""))
     sess.commit()
     sess.close()
     engine.dispose()

{chellow-1711032714.0.0.dist-info → chellow-1712838153.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1711032714.0.0
+Version: 1712838153.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)
@@ -12,7 +12,7 @@ Requires-Dist: flask==2.3.3
 Requires-Dist: odio==0.0.22
 Requires-Dist: openpyxl==3.1.2
 Requires-Dist: pep3143daemon==0.0.6
-Requires-Dist: pg8000==1.30.5
+Requires-Dist: pg8000==1.31.1
 Requires-Dist: pip>=9.0.1
 Requires-Dist: psutil==5.9.5
 Requires-Dist: pympler==1.0.1

{chellow-1711032714.0.0.dist-info → chellow-1712838153.0.0.dist-info}/RECORD

@@ -5,7 +5,7 @@ chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=5SmP-0QPK6xCkd_wjIWh_8FAzN5OxNHCzyEQ1Xb-Y-M,5256
 chellow/edi_lib.py,sha256=het3R0DBGtXEo-Sy1zvXQuX9EWQ1X6Y33G4l1hYYuds,51859
 chellow/general_import.py,sha256=4LduwzNipxOiHYHQLb0x96_m3RPuDnQMbJzOFDbOqTg,65039
-chellow/models.py,sha256=5ZWG1IexWNfwdq_ZlAjTyl0BlG2w682ydF09pEl31CY,237109
+chellow/models.py,sha256=9SDx150OdxFnw4tfpvLn2fB0NsqlrE57VqdRPYz9OnE,237335
 chellow/national_grid.py,sha256=uxcv0qisHPyzw9AVIYPzsRqwt2XPAcZL-SBR12qcrS0,4364
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 chellow/rate_server.py,sha256=vNuKzlr0lkAzZ4zG7zboStoo92_6iLKAxbw1yZ-ucII,5626
@@ -22,7 +22,7 @@ chellow/e/cfd.py,sha256=V1DTT5XBQbt8hO1gae1u3315fZ4iuYk3XC7J2sUbhKQ,14352
 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
+chellow/e/elexon.py,sha256=ALhXS9Es7PV0z9ukPbIramn3cf3iLyFi-PMWPSm5iOs,5487
 chellow/e/energy_management.py,sha256=aXC2qlGt3FAODlNl_frWzVYAQrJLP8FFOiNX3m-QE_Y,12388
 chellow/e/hh_importer.py,sha256=nhmlWDNBm8U4salBud8ivdaDGF1lkY82NqQCrGuPYRI,20483
 chellow/e/hh_parser_bg_csv.py,sha256=W5SU2MSpa8BGA0VJw1JXF-IwbCNLFy8fe35yxLZ7gEw,2453
@@ -38,7 +38,7 @@ chellow/e/system_price.py,sha256=3cPWohHmmBI9v7fENLBzXQkpAeC3r0s5xV29Nmr6k_E,583
 chellow/e/tlms.py,sha256=kHAy2A2d1Mma7x4GdNDyrzscJd5DpJtDBYiZEg241Dw,8538
 chellow/e/tnuos.py,sha256=KoMPJDIXfE4zwhSDuywGF1ooxjTYLVjtF7BkSFm6X24,4158
 chellow/e/triad.py,sha256=S6LEMHvUKhAZe0-yfLIRciYDZ8IKMn1jh1TmmsbQD3s,13588
-chellow/e/views.py,sha256=aZecpfM1sVn3xMwlKuiw9pE2f6s4uyd98obQXToKtqA,212466
+chellow/e/views.py,sha256=p-zQa24HtNVLTHILqfiZ8UrixuljHSC163SrJuLQ3Ik,212590
 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
@@ -361,6 +361,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-1711032714.0.0.dist-info/METADATA,sha256=a9YFyBU_CMj0Zl39q_J8IwXQcQDRiNh70Yy8jR0QjEQ,12203
-chellow-1711032714.0.0.dist-info/WHEEL,sha256=bq9SyP5NxIRA9EpQgMCd-9RmPHWvbH-4lTDGwxgIR64,87
-chellow-1711032714.0.0.dist-info/RECORD,,
+chellow-1712838153.0.0.dist-info/METADATA,sha256=Xtd86NDSwOVRdtBadWm_V5D9VIJ2WCa2T17MD_rBvG0,12203
+chellow-1712838153.0.0.dist-info/WHEEL,sha256=as-1oFTWSeWBgyzh0O_qF439xqBe6AbBgt4MfYe5zwY,87
+chellow-1712838153.0.0.dist-info/RECORD,,

{chellow-1711032714.0.0.dist-info → chellow-1712838153.0.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.22.3
+Generator: hatchling 1.22.5
 Root-Is-Purelib: true
 Tag: py3-none-any