chellow 1707396281.0.0__tar.gz → 1708358861.0.0__tar.gz

{chellow-1707396281.0.0 → chellow-1708358861.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chellow
-Version: 1707396281.0.0
+Version: 1708358861.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-1708358861.0.0/VERSION

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

{chellow-1707396281.0.0 → chellow-1708358861.0.0}/chellow/e/hh_importer.py

@@ -48,6 +48,7 @@ class HhDataImportProcess(threading.Thread):
         super().__init__(name=f"HH Manual Import: contract {dc_contract_id}")
 
         self.messages = []
+        self.error = None
         self.istream = istream
         self.dc_contract_id = dc_contract_id
         self.id = process_id
@@ -74,14 +75,16 @@ class HhDataImportProcess(threading.Thread):
                 parser_module = importlib.import_module(
                     f"chellow.e.hh_parser_{mod_name}"
                 )
-                self.converter = parser_module.create_parser(self.istream, mpan_map)
+                self.converter = parser_module.create_parser(
+                    self.istream, mpan_map, self.messages
+                )
                 sess.rollback()
                 HhDatum.insert(sess, self.converter, contract)
                 sess.commit()
             except BadRequest as e:
-                self.messages.append(e.description)
+                self.error = e.description
             except BaseException:
-                self.messages.append(f"Outer problem {traceback.format_exc()}")
+                self.error = f"Outer problem {traceback.format_exc()}"
 
     def get_status(self):
         return (
@@ -281,8 +284,8 @@ class HhImportTask(threading.Thread):
             for message in self.importer.messages:
                 self.log(message)
 
-            if len(self.importer.messages) > 0:
-                raise BadRequest("Problem loading file.")
+            if self.importer.error is not None:
+                raise BadRequest(f"Problem loading file. {self.importer.error}")
 
             contract = Contract.get_dc_by_id(sess, self.contract_id)
             contract.update_state(state)
@@ -384,12 +387,12 @@ class HhImportTask(threading.Thread):
 
             self.importer.run()
             messages = self.importer.messages
-            self.importer = None
             for message in messages:
                 self.log(message)
 
-            if len(messages) > 0:
-                raise BadRequest("Problem loading file.")
+            if self.importer.error is not None:
+                raise BadRequest(f"Problem loading file. {self.importer.error}")
+            self.importer = None
 
             contract = Contract.get_dc_by_id(sess, self.contract_id)
             contract.update_state(state)

{chellow-1707396281.0.0 → chellow-1708358861.0.0}/chellow/e/hh_parser_bg_csv.py

@@ -8,12 +8,12 @@ from werkzeug.exceptions import BadRequest
 from chellow.utils import parse_mpan_core, utc_datetime
 
 
-def create_parser(reader, mpan_map):
-    return HhParserBglobal(reader, mpan_map)
+def create_parser(reader, mpan_map, messages):
+    return HhParserBglobal(reader, mpan_map, messages)
 
 
 class HhParserBglobal:
-    def __init__(self, reader, mpan_map):
+    def __init__(self, reader, mpan_map, messages):
         self.shredder = zip(itertools.count(1), csv.reader(reader))
         self.line_number, self.values = next(self.shredder)
         self.mpan_map = mpan_map

{chellow-1707396281.0.0 → chellow-1708358861.0.0}/chellow/e/hh_parser_df2.py

@@ -6,12 +6,12 @@ from werkzeug.exceptions import BadRequest
 from chellow.utils import HH, parse_mpan_core, utc_datetime
 
 
-def create_parser(reader, mpan_map):
-    return StarkDf2HhParser(reader, mpan_map)
+def create_parser(reader, mpan_map, messages):
+    return StarkDf2HhParser(reader, mpan_map, messages)
 
 
 class StarkDf2HhParser:
-    def __init__(self, reader, mpan_map):
+    def __init__(self, reader, mpan_map, messages):
         self.line = self.line_number = None
         self.reader = zip(itertools.count(1), reader)
 
@@ -25,6 +25,9 @@ class StarkDf2HhParser:
             4: "REACTIVE_EXP",
         }
 
+        self.mpan_map = mpan_map
+        self.messages = messages
+
     def __iter__(self):
         return self
 
@@ -36,6 +39,15 @@ class StarkDf2HhParser:
                 lline = self.line.strip().upper()
                 if lline.startswith("#O"):
                     self.core = parse_mpan_core(lline[2:])
+                    if self.core in self.mpan_map and self.mpan_map[self.core] is None:
+                        msg = f"The MPAN core {self.core} has been ignored"
+                        if len(self.messages) == 0 or self.messages[-1] != msg:
+                            self.messages.append(
+                                f"The MPAN core {self.core} has been ignored"
+                            )
+                        self.core = None
+                        continue
+
                 elif lline.startswith("#S"):
                     sensor = int(lline[2:].strip())
                     try:
@@ -72,6 +84,10 @@ class StarkDf2HhParser:
                     except ValueError:
                         raise BadRequest("Problem parsing the value: " + fields[2])
                     status = fields[3][-1]
+
+                    if self.core is None:
+                        continue
+
                     local_datum = {
                         "mpan_core": self.core,
                         "channel_type": self.channel_type,

{chellow-1707396281.0.0 → chellow-1708358861.0.0}/chellow/e/hh_parser_simple_csv.py

@@ -8,12 +8,12 @@ from werkzeug.exceptions import BadRequest
 from chellow.utils import parse_channel_type, parse_mpan_core, to_utc, validate_hh_start
 
 
-def create_parser(reader, mpan_map):
-    return HhParserCsvSimple(reader, mpan_map)
+def create_parser(reader, mpan_map, messages):
+    return HhParserCsvSimple(reader, mpan_map, messages)
 
 
 class HhParserCsvSimple:
-    def __init__(self, reader, mpan_map):
+    def __init__(self, reader, mpan_map, messages):
         self.shredder = zip(itertools.count(1), csv.reader(reader))
         next(self.shredder)  # skip the title line
         self.values = None

{chellow-1707396281.0.0 → chellow-1708358861.0.0}/chellow/reports/report_233.py

@@ -1,5 +1,4 @@
 import csv
-import os
 import sys
 import threading
 import traceback
@@ -10,20 +9,28 @@ from flask import g
 
 from sqlalchemy.sql.expression import true
 
-import chellow.dloads
-from chellow.models import Channel, Contract, Era, Session, Site, SiteEra, Snag, Supply
+from chellow.dloads import open_file
+from chellow.models import (
+    Channel,
+    Contract,
+    Era,
+    Session,
+    Site,
+    SiteEra,
+    Snag,
+    Supply,
+    User,
+)
 from chellow.utils import csv_make_val, hh_before, req_int, utc_datetime_now
 from chellow.views import chellow_redirect
 
 
-def content(contract_id, days_hidden, user):
+def content(contract_id, days_hidden, user_id):
     f = writer = None
     try:
         with Session() as sess:
-            running_name, finished_name = chellow.dloads.make_names(
-                "channel_snags.csv", user
-            )
-            f = open(running_name, mode="w", newline="")
+            user = User.get_by_id(sess, user_id)
+            f = open_file("channel_snags.csv", user, mode="w", newline="")
             writer = csv.writer(f, lineterminator="\n")
             titles = (
                 "Hidden Days",
@@ -111,13 +118,12 @@ def content(contract_id, days_hidden, user):
     finally:
         if f is not None:
             f.close()
-            os.rename(running_name, finished_name)
 
 
 def do_get(sess):
     contract_id = req_int("dc_contract_id")
     days_hidden = req_int("days_hidden")
 
-    args = (contract_id, days_hidden, g.user)
+    args = contract_id, days_hidden, g.user.id
     threading.Thread(target=content, args=args).start()
     return chellow_redirect("/downloads", 303)