chellow 1692616986.0.0__py3-none-any.whl → 1692867503.0.0__py3-none-any.whl

chellow/models.py

@@ -932,23 +932,19 @@ class Batch(Base, PersistentClass):
 
     def __init__(self, sess, contract, reference, description):
         self.contract = contract
-        self.update(sess, reference, description)
+        self._update(sess, reference, description)
 
-    def update(self, sess, reference, description):
+    def _update(self, sess, reference, description):
         reference = reference.strip()
         if len(reference) == 0:
             raise BadRequest("The batch reference can't be blank.")
 
         self.reference = reference
         self.description = description.strip()
-        try:
-            sess.flush()
-        except SQLAlchemyError:
-            sess.rollback()
-            raise BadRequest(
-                f"There's already a batch attached to the contract "
-                f"{self.contract.name} with the reference {reference}."
-            )
+
+    def update(self, sess, reference, description):
+        self._update(sess, reference, description)
+        sess.flush()
 
     def delete(self, sess):
         sess.execute(delete(Bill).where(Bill.batch == self))
@@ -5289,25 +5285,13 @@ class GEra(Base, PersistentClass):
         self.account = account
         self.g_reading_frequency = g_reading_frequency
 
-        if g_contract.start_g_rate_script.start_date > start_date:
-            raise BadRequest("The contract starts after the era.")
+        with sess.no_autoflush:
+            if g_contract.start_g_rate_script.start_date > start_date:
+                raise BadRequest("The contract starts after the era.")
 
         if hh_before(g_contract.finish_g_rate_script.finish_date, finish_date):
             raise BadRequest("The contract finishes before the era.")
 
-        try:
-            sess.flush()
-        except ProgrammingError as e:
-            if (
-                e.orig.args[2]
-                == 'null value in column "start_date" ' + "violates not-null constraint"
-            ):
-                raise BadRequest("The start date cannot be blank.")
-            else:
-                raise e
-
-        sess.flush()
-
     def set_physical_location(self, sess, site):
         target_ssgen = (
             sess.query(SiteGEra)
@@ -5435,7 +5419,6 @@ class GSupply(Base, PersistentClass):
 
                 finish_date = covered_g_era.finish_date
 
-        sess.flush()
         g_era = GEra(
             sess,
             self,
@@ -5449,14 +5432,11 @@ class GSupply(Base, PersistentClass):
             g_reading_frequency,
         )
         sess.add(g_era)
-        sess.flush()
 
-        sess.flush()
         g_era.attach_site(sess, physical_site, True)
         for site in logical_sites:
             g_era.attach_site(sess, site, False)
 
-        sess.flush()
         if covered_g_era is not None:
             covered_g_era.update_dates(sess, covered_g_era.start_date, start_date - HH)
         return g_era
@@ -5746,15 +5726,18 @@ class GBatch(Base, PersistentClass):
 
     def __init__(self, sess, g_contract, reference, description):
         self.g_contract = g_contract
-        self.update(sess, reference, description)
+        self._update(sess, reference, description)
 
-    def update(self, sess, reference, description):
+    def _update(self, sess, reference, description):
         reference = reference.strip()
         if len(reference) == 0:
             raise BadRequest("The batch reference can't be blank.")
 
         self.reference = reference
         self.description = description.strip()
+
+    def update(self, sess, reference, description):
+        self._update(sess, reference, description)
         try:
             sess.flush()
         except SQLAlchemyError:

chellow/views.py

@@ -621,8 +621,9 @@ def edi_viewer_get():
 @home.route("/edi_viewer", methods=["POST"])
 def edi_viewer_post():
     segments = []
+    file_name = None
     try:
-        if "edi_file" in request.values:
+        if "edi_file" in request.files:
             file_item = req_file("edi_file")
             edi_str = str(
                 file_item.stream.read(), encoding="utf-8-sig", errors="ignore"
@@ -630,7 +631,6 @@ def edi_viewer_post():
             file_name = file_item.filename
         else:
             edi_str = req_str("edi_fragment")
-            file_name = None
 
         f = StringIO(edi_str)
         f.seek(0)
@@ -723,8 +723,9 @@ def edi_viewer_post():
         )
     except BadRequest as e:
         flash(e.description)
-        return render_template(
-            "edi_viewer.html", segments=segments, file_name=file_name
+        return make_response(
+            render_template("edi_viewer.html", segments=segments, file_name=file_name),
+            400,
         )
 
 

{chellow-1692616986.0.0.dist-info → chellow-1692867503.0.0.dist-info}/METADATA

@@ -1,27 +1,27 @@
 Metadata-Version: 2.1
 Name: chellow
-Version: 1692616986.0.0
+Version: 1692867503.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: flask-restx==1.0.3
-Requires-Dist: flask==2.3.2
+Requires-Dist: flask-restx==1.1.0
+Requires-Dist: flask==2.3.3
 Requires-Dist: odio==0.0.22
-Requires-Dist: openpyxl==3.0.10
+Requires-Dist: openpyxl==3.1.2
 Requires-Dist: pep3143daemon==0.0.6
-Requires-Dist: pg8000==1.29.8
+Requires-Dist: pg8000==1.30.1
 Requires-Dist: pip>=9.0.1
-Requires-Dist: psutil==5.9.4
+Requires-Dist: psutil==5.9.5
 Requires-Dist: pympler==1.0.1
-Requires-Dist: pypdf==3.12.0
+Requires-Dist: pypdf==3.15.2
 Requires-Dist: pysftp==0.2.9
 Requires-Dist: python-dateutil==2.8.2
 Requires-Dist: pytz==2022.6
 Requires-Dist: requests==2.31.0
-Requires-Dist: sqlalchemy==2.0.19
+Requires-Dist: sqlalchemy==2.0.20
 Requires-Dist: waitress==2.1.2
 Requires-Dist: xlrd==2.0.1
 Requires-Dist: zish==0.1.10

{chellow-1692616986.0.0.dist-info → chellow-1692867503.0.0.dist-info}/RECORD

@@ -5,13 +5,13 @@ chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=ZeHIu75t71FWJBfew_8sqi03KcMZmDlTWVn7QyyADu4,3942
 chellow/edi_lib.py,sha256=het3R0DBGtXEo-Sy1zvXQuX9EWQ1X6Y33G4l1hYYuds,51859
 chellow/general_import.py,sha256=BIv7SLjNVQuDSclWG1-ePCUsethlwm7_NVHI4SlyI8g,58612
-chellow/models.py,sha256=-80hNamcKEjOsneQfy-Prep0_wDf71r2zytTiC5cR7Q,234913
+chellow/models.py,sha256=as05fRmAonpuve_RCeaQsnA209_nCmfzhFW8y4zgat4,234458
 chellow/national_grid.py,sha256=Y0ckPONIpMnip2qB9ptXBLxs6jJCk14c98eCkyd2fNM,4427
 chellow/proxy.py,sha256=Mzssi9nTf6s_G4RSn8k5oAHqzVYIxMsfbudj1amYucI,1387
 chellow/rate_server.py,sha256=xVk15pdSovcD8K8BWcOmjwo_L3a8LYry7L2Gvw56OEQ,5696
 chellow/testing.py,sha256=1TvNEPjX_VRPDifJWRFJw_8gg0RCsEpYVHkspQ1diJw,3913
 chellow/utils.py,sha256=IHC4Pcd_9CRbmJXAOlDvTyAcUoaWeLSH37zgjqVYYl4,18981
-chellow/views.py,sha256=UTQfC_dcs-J-uZ7FVszmO7MYLE8NRCisfcfEzEO1iGE,83636
+chellow/views.py,sha256=fNHCxCdws07jxaveclIspJIOb8tiXf4Xqo0PkZDs2Ak,83660
 chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/aahedc.py,sha256=DUrYAlrn4jzf6y6C2wivxlFosdVIibG69BWy_KMekGM,706
 chellow/e/bill_importer.py,sha256=BHrQkcvlOh27k0KexHA8nWJGcHGGpewbkkpncmxbAc4,7183
@@ -352,6 +352,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-1692616986.0.0.dist-info/METADATA,sha256=k2UORjuSyN2KJgTojw4qGbiEaVVid0XueywbUu4XjGc,12161
-chellow-1692616986.0.0.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
-chellow-1692616986.0.0.dist-info/RECORD,,
+chellow-1692867503.0.0.dist-info/METADATA,sha256=lIdX4pYwSAUf3e8vpQ85B9jxXn9-Bm_bfb2VO4zSZ9s,12160
+chellow-1692867503.0.0.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
+chellow-1692867503.0.0.dist-info/RECORD,,