chellow 1692616986.0.0__tar.gz → 1692867503.0.0__tar.gz

{chellow-1692616986.0.0 → chellow-1692867503.0.0}/PKG-INFO

@@ -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-1692867503.0.0/VERSION

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

{chellow-1692616986.0.0 → chellow-1692867503.0.0}/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-1692616986.0.0 → chellow-1692867503.0.0}/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 → chellow-1692867503.0.0}/pyproject.toml

@@ -15,12 +15,12 @@ classifiers = [
 ]
 dependencies = [
 	"odio==0.0.22",
-	"pypdf==3.12.0",
-	"pg8000==1.29.8",
-	"Flask==2.3.2",
-	"SQLAlchemy==2.0.19",
-	"flask-restx==1.0.3",
-	"openpyxl==3.0.10",
+	"pypdf==3.15.2",
+	"pg8000==1.30.1",
+	"Flask==2.3.3",
+	"SQLAlchemy==2.0.20",
+	"flask-restx==1.1.0",
+	"openpyxl==3.1.2",
 	"python-dateutil==2.8.2",
 	"pytz==2022.6",
 	"requests==2.31.0",
@@ -29,7 +29,7 @@ dependencies = [
 	"pip>=9.0.1",
 	"pysftp==0.2.9",
 	"pympler==1.0.1",
-	"psutil==5.9.4",
+	"psutil==5.9.5",
 	"xlrd==2.0.1",
 	"zish==0.1.10",
 ]
@@ -64,7 +64,7 @@ setenv =
 commands =
     black --check .
     flake8 .
-    pytest --exitfirst test
+    pytest --exitfirst -W error -W ignore::DeprecationWarning test/test_models.py
     echo PGPORT is {env:PGPORT:unset}
     echo PGUSER is {env:PGUSER:unset}
     echo Test database is {env:PGDATABASE:unset} on {env:PGHOST:unset}

chellow-1692867503.0.0/test/test_edi_viewer.py

@@ -0,0 +1,13 @@
+from io import BytesIO
+from utils import match
+
+
+def test_edit_viewer_post(client, mocker):
+    file_name = "sample.edi"
+    file_bytes = "MHD=1+UTLHDR:3'".encode("utf8")
+    f = BytesIO(file_bytes)
+
+    data = {"edi_file": (f, file_name)}
+    response = client.post("/edi_viewer", data=data)
+
+    match(response, 200)

{chellow-1692616986.0.0 → chellow-1692867503.0.0}/test/test_models.py

@@ -151,7 +151,6 @@ def test_Bill_update(sess):
     bill_type = BillType.get_by_code(sess, "N")
 
     sess.commit()
-    sess.expire_all()
 
     batch.insert_bill(
         sess,

chellow-1692616986.0.0/VERSION

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