chellow 1716370405.0.0__py3-none-any.whl → 1716452334.0.0__py3-none-any.whl

chellow/models.py

@@ -6400,8 +6400,23 @@ class ReportRun(Base, PersistentClass):
     def insert(sess, name, user, title, data):
         report_run = ReportRun(name, user, title, data)
         sess.add(report_run)
+        sess.flush()
         return report_run
 
+    @staticmethod
+    def w_update(report_run_id, state):
+        with Session() as wsess:
+            report_run = ReportRun.get_by_id(wsess, report_run_id)
+            report_run.update(state)
+            wsess.commit()
+
+    @staticmethod
+    def w_insert_row(report_run_id, tab, titles, values, properties):
+        with Session() as wsess:
+            report_run = ReportRun.get_by_id(wsess, report_run_id)
+            report_run.insert_row(wsess, tab, titles, values, properties)
+            wsess.commit()
+
 
 def _jsonize(val):
     if isinstance(val, dict):

chellow/reports/report_111.py

@@ -29,9 +29,9 @@ from chellow.models import (
     Llfc,
     MarketRole,
     MtcParticipant,
+    RSession,
     RegisterRead,
     ReportRun,
-    Session,
     Site,
     SiteEra,
     Supply,
@@ -102,19 +102,17 @@ def content(
     report_run_id,
 ):
     caches = {}
-    tmp_file = sess = supply_id = report_run = None
+    tmp_file = sess = supply_id = None
     forecast_date = to_utc(Datetime.max)
 
     try:
-        with Session() as sess:
+        with RSession() as sess:
             user = User.get_by_id(sess, user_id)
             tmp_file = open_file(
                 f"bill_check_{fname_additional}.csv", user, mode="w", newline=""
             )
             writer = csv.writer(tmp_file, lineterminator="\n")
 
-            report_run = ReportRun.get_by_id(sess, report_run_id)
-
             bills = (
                 sess.query(Bill)
                 .order_by(Bill.supply_id, Bill.reference)
@@ -216,30 +214,26 @@ def content(
                     virtual_bill_titles,
                     writer,
                     titles,
-                    report_run,
+                    report_run_id,
                 )
-
-            report_run.update("finished")
-            sess.commit()
+        ReportRun.w_update(report_run_id, "finished")
 
     except BadRequest as e:
-        if report_run is not None:
-            report_run.update("problem")
         if supply_id is None:
             prefix = "Problem: "
         else:
             prefix = f"Problem with supply {supply_id}:"
         tmp_file.write(prefix + e.description)
+        ReportRun.w_update(report_run_id, "problem")
     except BaseException:
-        if report_run is not None:
-            report_run.update("interrupted")
+        msg = traceback.format_exc()
+        sys.stderr.write(msg + "\n")
         if supply_id is None:
             prefix = "Problem: "
         else:
             prefix = f"Problem with supply {supply_id}:"
-        msg = traceback.format_exc()
-        sys.stderr.write(msg + "\n")
         tmp_file.write(prefix + msg)
+        ReportRun.w_update(report_run_id, "interrupted")
     finally:
         if tmp_file is not None:
             tmp_file.close()
@@ -318,7 +312,7 @@ def _process_supply(
     virtual_bill_titles,
     writer,
     titles,
-    report_run,
+    report_run_id,
 ):
     gaps = {}
     data_sources = {}
@@ -761,8 +755,8 @@ def _process_supply(
         values["batch_id"] = bill.batch.id
         values["supply_id"] = supply.id
         values["site_id"] = None if site_code is None else site.id
-        report_run.insert_row(
-            sess, "", report_run_titles, values, {"is_checked": False}
+        ReportRun.w_insert_row(
+            report_run_id, "", report_run_titles, values, {"is_checked": False}
         )
 
         for bill in sess.query(Bill).filter(
@@ -783,7 +777,7 @@ def _process_supply(
                     )
 
         # Avoid long-running transactions
-        sess.commit()
+        sess.rollback()
 
     clumps = []
     for element, elgap in sorted(gaps.items()):
@@ -837,7 +831,7 @@ def _process_supply(
         vals["supply_id"] = supply.id
         vals["site_id"] = None if site_code is None else site.id
 
-        report_run.insert_row(sess, "", titles, vals, {"is_checked": False})
+        ReportRun.w_insert_row(report_run_id, "", titles, vals, {"is_checked": False})
 
     # Avoid long-running transactions
-    sess.commit()
+    sess.rollback()

chellow/reports/report_387.py

@@ -10,7 +10,7 @@ from sqlalchemy.sql.expression import null, true
 
 from chellow.dloads import open_file
 from chellow.e.computer import SupplySource, forecast_date
-from chellow.models import Era, Session, Site, SiteEra, Supply
+from chellow.models import Era, RSession, Site, SiteEra, Supply
 from chellow.utils import (
     csv_make_val,
     hh_format,
@@ -25,7 +25,7 @@ def content(supply_id, start_date, finish_date, user):
     caches = {}
     f = None
     try:
-        with Session() as sess:
+        with RSession() as sess:
             supply = Supply.get_by_id(sess, supply_id)
 
             f_date = forecast_date()

{chellow-1716370405.0.0.dist-info → chellow-1716452334.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1716370405.0.0
+Version: 1716452334.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)
@@ -9,7 +9,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
 Requires-Dist: flask-restx==1.2.0
 Requires-Dist: flask==2.3.3
-Requires-Dist: odio==0.0.22
+Requires-Dist: odio==0.0.23
 Requires-Dist: openpyxl==3.1.2
 Requires-Dist: paramiko==3.4.0
 Requires-Dist: pep3143daemon==0.0.6
@@ -21,7 +21,7 @@ Requires-Dist: pypdf==3.17.0
 Requires-Dist: python-dateutil==2.8.2
 Requires-Dist: pytz==2022.6
 Requires-Dist: requests==2.32.2
-Requires-Dist: sqlalchemy==2.0.28
+Requires-Dist: sqlalchemy==2.0.30
 Requires-Dist: waitress==2.1.2
 Requires-Dist: xlrd==2.0.1
 Requires-Dist: zish==0.1.11

{chellow-1716370405.0.0.dist-info → chellow-1716452334.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=alu20x9ZX06iPfnNI9dEJzuP6RIf4We3Y_M_bl7RrcY,51789
 chellow/general_import.py,sha256=l3EHq9zG9Vfl5Ee6XTVrC1nusXo4YGGB4VBmZ_JaJR8,65798
-chellow/models.py,sha256=2YSRKOt89mgawuz1CV02FsjLi5ue9Np38PGOIS-yoc4,242202
+chellow/models.py,sha256=uS4GHh4RF6yD7aSsN4nOC3hdNakHUjW1nVzrhM_79mQ,242736
 chellow/national_grid.py,sha256=uxcv0qisHPyzw9AVIYPzsRqwt2XPAcZL-SBR12qcrS0,4364
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 chellow/rate_server.py,sha256=fg-Pf_9Hk3bXmC9riPQNGQxBvLvBa_WtNYdwDCjnCSg,5678
@@ -68,7 +68,7 @@ chellow/gas/transportation.py,sha256=Bkg8TWOs-v0ES-4qqwbleiOhqbE_t2KauUx9JYMZELM
 chellow/gas/views.py,sha256=ZIMqByN0uBpf3y9wkMi-VogC1-NaHs-oO7WRVDk9Kkw,57428
 chellow/reports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/reports/report_109.py,sha256=S8fsOwh-jVWGL0RsgyYLdqn00BAvlkBbi4VfTSGI-Mc,11181
-chellow/reports/report_111.py,sha256=qU5MYPQzZ_cEvuERE8bxq93D-dN1yd4oML6FIqd0Jdk,28278
+chellow/reports/report_111.py,sha256=AlYjvCDpGNe1qBuzW52EONWDsFaIVElug0Vpe9qm1PY,28169
 chellow/reports/report_169.py,sha256=tnTiHmhigcgZ7E8rUSfgzsVYUCW947xBZZq04-KqfK8,9287
 chellow/reports/report_181.py,sha256=mCL6vXfrj8r0kL-LilDS0SnSu5tJOzCq7eMJVx9zpEw,4999
 chellow/reports/report_183.py,sha256=DZX-hHJPl_Tbgkt31C_cuLZg_5L2b6iCPQ5foOZizR0,8817
@@ -81,7 +81,7 @@ chellow/reports/report_247.py,sha256=ozgCcee8XeqYbOpZCyU2STJKaz6h2x7TYQogagTaYLw
 chellow/reports/report_29.py,sha256=KDFjgrLBv4WbG9efCdu_geMR7gT_QV9N97Wfdt7aDc4,2736
 chellow/reports/report_291.py,sha256=rqBXy6s7hMeYWw-yNX6w_L5t2yz6rNEeos_4xO7wf90,7519
 chellow/reports/report_33.py,sha256=laVz-itDbJTdvC6LxLEeuY0eKpYx43Un4adiExPTEEE,16730
-chellow/reports/report_387.py,sha256=KcClrEOK5IRvePp0Jgbzs1Gwf-_CqYmEtFFlXrr_Z3E,5670
+chellow/reports/report_387.py,sha256=kmBZopb0AOivcowO2nPjRj6LnV0_QjCDXLwqPL7IGVE,5672
 chellow/reports/report_41.py,sha256=QQeTshA1Og7N3wPaoZ8ynJzwsvZ1mgSFc7DDkVqIZoM,7447
 chellow/reports/report_429.py,sha256=0GCc0rQnOSG0fusw69yMMOCxnWApBd3P2sGWIg1py9M,12359
 chellow/reports/report_59.py,sha256=CCFPUspUFgoMt6sMFsdtLYW-inA9rN6D-6Kted6vskA,45458
@@ -364,6 +364,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-1716370405.0.0.dist-info/METADATA,sha256=TuaScYTcnRt-YAdvw014lKjfOAS9GaelicnQ1FPdkjI,12205
-chellow-1716370405.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-chellow-1716370405.0.0.dist-info/RECORD,,
+chellow-1716452334.0.0.dist-info/METADATA,sha256=pjgx-WKJRzgK4cjpaGC2sDSgRDU2AQS0gxnApoP6NnI,12205
+chellow-1716452334.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+chellow-1716452334.0.0.dist-info/RECORD,,