chellow 1710934022.0.0__py3-none-any.whl → 1712589951.0.0__py3-none-any.whl

chellow/__init__.py

@@ -63,8 +63,8 @@ def get_importer_modules():
     )
 
 
-def create_app(testing=False):
-    app = Flask("chellow", instance_relative_config=True)
+def create_app(testing=False, instance_path=None):
+    app = Flask("chellow", instance_relative_config=True, instance_path=instance_path)
     app.wsgi_app = MsProxy(app.wsgi_app)
     app.secret_key = os.urandom(24)
     start_sqlalchemy()
@@ -79,7 +79,6 @@ def create_app(testing=False):
 
     if not testing:
         db_upgrade(app.root_path)
-        chellow.dloads.startup(Path(app.instance_path))
         chellow.e.hh_importer.startup()
 
         with Session() as sess:
@@ -90,6 +89,8 @@ def create_app(testing=False):
             api_props = props.get("api", {})
             api.description = api_props.get("description", "Access Chellow data")
 
+    chellow.dloads.startup(Path(app.instance_path), run_deleter=(not testing))
+
     for module in get_importer_modules():
         if not testing:
             module.startup()

chellow/dloads.py

@@ -20,12 +20,14 @@ download_path = None
 SERIAL_DIGITS = 5
 
 
-def startup(instance_path):
+def startup(instance_path, run_deleter=True):
     global file_deleter
     global download_id
     global download_path
-    file_deleter = FileDeleter()
-    file_deleter.start()
+
+    if run_deleter:
+        file_deleter = FileDeleter()
+        file_deleter.start()
 
     download_path = instance_path / "downloads"
     download_path.mkdir(parents=True, exist_ok=True)

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}."

chellow/reports/report_181.py

@@ -1,5 +1,4 @@
 import csv
-import os
 import threading
 import traceback
 
@@ -10,11 +9,11 @@ from sqlalchemy.sql.expression import null
 
 from werkzeug.exceptions import BadRequest
 
-import chellow.dloads
 import chellow.e.computer
 import chellow.e.duos
 import chellow.e.tnuos
-from chellow.models import Era, Pc, Session, Site, SiteEra, Source, Supply
+from chellow.dloads import open_file
+from chellow.models import Era, Pc, Session, Site, SiteEra, Source, Supply, User
 from chellow.utils import (
     HH,
     c_months_u,
@@ -144,28 +143,30 @@ def _write_sites(sess, caches, writer, year, site_id):
         sess.rollback()
 
 
-def content(year, site_id, user):
+def content(year, site_id, user_id):
     caches = {}
     f = writer = None
     try:
         with Session() as sess:
-            running_name, finished_name = chellow.dloads.make_names("output.csv", user)
-            f = open(running_name, mode="w", newline="")
+            user = User.get_by_id(sess, user_id)
+            f = open_file("output.csv", user, mode="w", newline="")
             writer = csv.writer(f, lineterminator="\n")
             _write_sites(sess, caches, writer, year, site_id)
 
     except BadRequest as e:
         writer.writerow([e.description])
     except BaseException:
-        writer.writerow([traceback.format_exc()])
+        msg = traceback.format_exc()
+        print(msg)
+        if writer is not None:
+            writer.writerow([msg])
     finally:
         if f is not None:
             f.close()
-            os.rename(running_name, finished_name)
 
 
 def do_get(sess):
     site_id = req_int("site_id") if "site_id" in request.values else None
     year = req_int("year")
-    threading.Thread(target=content, args=(year, site_id, g.user)).start()
+    threading.Thread(target=content, args=(year, site_id, g.user.id)).start()
     return chellow_redirect("/downloads", 303)

chellow/reports/report_241.py

@@ -1,5 +1,4 @@
 import csv
-import os
 import threading
 import traceback
 from datetime import datetime as Datetime
@@ -14,8 +13,9 @@ from sqlalchemy.sql.expression import null, or_, true
 
 from werkzeug.exceptions import BadRequest
 
-import chellow.computer
-from chellow.models import Era, Session, Site, SiteEra, Supply
+from chellow.dloads import open_file
+from chellow.e.computer import SupplySource, contract_func, forecast_date
+from chellow.models import Era, Session, Site, SiteEra, Supply, User
 from chellow.utils import HH, csv_make_val, hh_format, hh_max, hh_min, req_bool, req_int
 from chellow.views import chellow_redirect
 
@@ -29,15 +29,13 @@ def content(
     finish_day,
     is_import,
     supply_id,
-    user,
+    user_id,
 ):
     caches = {}
     try:
         with Session() as sess:
-            running_name, finished_name = chellow.dloads.make_names(
-                "daily_supplier_virtual_bill.csv", user
-            )
-            f = open(running_name, mode="w", newline="")
+            user = User.get_by_id(sess, user_id)
+            f = open_file("daily_supplier_virtual_bill.csv", user, mode="w", newline="")
             writer = csv.writer(f, lineterminator="\n")
             start_date = Datetime(start_year, start_month, start_day, tzinfo=pytz.utc)
             finish_date = (
@@ -47,7 +45,7 @@ def content(
             )
 
             supply = Supply.get_by_id(sess, supply_id)
-            forecast_date = chellow.computer.forecast_date()
+            fd = forecast_date()
             day_start = start_date
             header_titles = [
                 "MPAN Core",
@@ -71,9 +69,7 @@ def content(
                 else:
                     cont = era.exp_supplier_contract
 
-                for title in chellow.computer.contract_func(
-                    caches, cont, "virtual_bill_titles"
-                )():
+                for title in contract_func(caches, cont, "virtual_bill_titles")():
                     if title not in bill_titles:
                         bill_titles.append(title)
 
@@ -94,11 +90,11 @@ def content(
                     chunk_start = hh_max(era.start_date, day_start)
                     chunk_finish = hh_min(era.finish_date, day_finish)
 
-                    ss = chellow.computer.SupplySource(
+                    ss = SupplySource(
                         sess,
                         chunk_start,
                         chunk_finish,
-                        forecast_date,
+                        fd,
                         era,
                         is_import,
                         caches,
@@ -120,9 +116,7 @@ def content(
                         ss.years_back > 0,
                     ]
 
-                    chellow.computer.contract_func(
-                        caches, ss.supplier_contract, "virtual_bill"
-                    )(ss)
+                    contract_func(caches, ss.supplier_contract, "virtual_bill")(ss)
                     bill = ss.supplier_bill
                     for title in bill_titles:
                         if title in bill:
@@ -144,7 +138,6 @@ def content(
     finally:
         if f is not None:
             f.close()
-            os.rename(running_name, finished_name)
 
 
 def do_get(sess):
@@ -159,18 +152,16 @@ def do_get(sess):
     is_import = req_bool("is_import")
     supply_id = req_int("supply_id")
 
-    threading.Thread(
-        target=content,
-        args=(
-            start_year,
-            start_month,
-            start_day,
-            finish_year,
-            finish_month,
-            finish_day,
-            is_import,
-            supply_id,
-            g.user,
-        ),
-    ).start()
+    args = (
+        start_year,
+        start_month,
+        start_day,
+        finish_year,
+        finish_month,
+        finish_day,
+        is_import,
+        supply_id,
+        g.user.id,
+    )
+    threading.Thread(target=content, args=args).start()
     return chellow_redirect("/downloads", 303)

chellow/reports/report_asset_comparison.py

@@ -1,5 +1,4 @@
 import csv
-import os
 import sys
 import threading
 import traceback
@@ -13,8 +12,8 @@ from sqlalchemy.sql.expression import null
 
 from werkzeug.exceptions import BadRequest
 
-import chellow.dloads
-from chellow.models import Contract, Era, ReportRun, Session, Site, SiteEra
+from chellow.dloads import open_file
+from chellow.models import Contract, Era, ReportRun, Session, Site, SiteEra, User
 from chellow.views import chellow_redirect
 
 STATUSES_ACTIVE = ("IN USE / IN SERVICE", "STORED SPARE")
@@ -147,13 +146,12 @@ def _process_sites(sess, file_like, writer, props, report_run):
 FNAME = "asset_comparison"
 
 
-def content(user, file_like, report_run_id):
+def content(user_id, file_like, report_run_id):
+    f = report_run = writer = None
     try:
         with Session() as sess:
-            running_name, finished_name = chellow.dloads.make_names(
-                f"{FNAME}.csv", user
-            )
-            f = open(running_name, mode="w", newline="")
+            user = User.get_by_id(sess, user_id)
+            f = open_file(f"{FNAME}.csv", user, mode="w", newline="")
             writer = csv.writer(f, lineterminator="\n")
             report_run = ReportRun.get_by_id(sess, report_run_id)
 
@@ -171,11 +169,11 @@ def content(user, file_like, report_run_id):
             report_run.insert_row(sess, "", ["error"], {"error": msg}, {})
             sess.commit()
         sys.stderr.write(msg)
-        writer.writerow([msg])
+        if writer is not None:
+            writer.writerow([msg])
     finally:
         if f is not None:
             f.close()
-            os.rename(running_name, finished_name)
 
 
 def do_post(sess):
@@ -194,6 +192,6 @@ def do_post(sess):
         },
     )
     sess.commit()
-    args = user, StringIO(file_item.read().decode("utf8")), report_run.id
+    args = user.id, StringIO(file_item.read().decode("utf8")), report_run.id
     threading.Thread(target=content, args=args).start()
     return chellow_redirect(f"/report_runs/{report_run.id}", 303)

chellow/reports/report_csv_llfcs.py

@@ -1,5 +1,4 @@
 import csv
-import os
 import threading
 import traceback
 
@@ -7,18 +6,18 @@ from flask import g
 
 from sqlalchemy.orm import joinedload
 
-import chellow.dloads
-from chellow.models import Llfc, Session
+from chellow.dloads import open_file
+from chellow.models import Llfc, Session, User
 from chellow.utils import hh_format
 from chellow.views import chellow_redirect
 
 
-def content(user):
+def content(user_id):
     f = writer = None
     try:
         with Session() as sess:
-            running_name, finished_name = chellow.dloads.make_names("llfcs.csv", user)
-            f = open(running_name, mode="w", newline="")
+            user = User.get_by_id(sess, user_id)
+            f = open_file("llfcs.csv", user, mode="w", newline="")
             writer = csv.writer(f, lineterminator="\n")
             writer.writerow(
                 (
@@ -53,14 +52,16 @@ def content(user):
                     )
                 )
     except BaseException:
-        writer.writerow([traceback.format_exc()])
+        msg = traceback.format_exc()
+        print(msg)
+        if writer is not None:
+            writer.writerow([msg])
     finally:
         if f is not None:
             f.close()
-            os.rename(running_name, finished_name)
 
 
 def do_get(sess):
-    args = (g.user,)
+    args = (g.user.id,)
     threading.Thread(target=content, args=args).start()
     return chellow_redirect("/downloads", 303)

chellow/reports/report_csv_site_snags.py

@@ -1,6 +1,4 @@
 import csv
-import os
-import sys
 import threading
 import traceback
 from datetime import datetime as Datetime, timedelta as Timedelta
@@ -12,20 +10,18 @@ import pytz
 from sqlalchemy.orm import joinedload
 from sqlalchemy.sql.expression import null
 
-import chellow.dloads
-from chellow.models import Session, Site, Snag
+from chellow.dloads import open_file
+from chellow.models import Session, Site, Snag, User
 from chellow.utils import hh_format
 from chellow.views import chellow_redirect
 
 
-def content(user):
+def content(user_id):
     f = writer = None
     try:
         with Session() as sess:
-            running_name, finished_name = chellow.dloads.make_names(
-                "site_snags.csv", user
-            )
-            f = open(running_name, mode="w", newline="")
+            user = User.get_by_id(sess, user_id)
+            f = open_file("site_snags.csv", user, mode="w", newline="")
             writer = csv.writer(f, lineterminator="\n")
             writer.writerow(
                 (
@@ -74,15 +70,15 @@ def content(user):
                 )
     except BaseException:
         msg = traceback.format_exc()
-        sys.stderr.write(msg)
-        writer.writerow([msg])
+        print(msg)
+        if writer is not None:
+            writer.writerow([msg])
     finally:
         if f is not None:
             f.close()
-            os.rename(running_name, finished_name)
 
 
 def do_get(sess):
-    args = (g.user,)
+    args = (g.user.id,)
     threading.Thread(target=content, args=args).start()
     return chellow_redirect("/downloads", 303)

chellow/reports/report_g_virtual_bills.py

@@ -1,5 +1,4 @@
 import csv
-import os
 import sys
 import threading
 import traceback
@@ -12,10 +11,10 @@ from sqlalchemy.sql.expression import null, true
 
 from werkzeug.exceptions import BadRequest
 
-import chellow.dloads
+from chellow.dloads import open_file
 from chellow.e.computer import contract_func, forecast_date
 from chellow.gas.engine import GDataSource
-from chellow.models import GContract, GEra, Session, Site, SiteGEra
+from chellow.models import GContract, GEra, Session, Site, SiteGEra, User
 from chellow.utils import (
     c_months_u,
     hh_format,
@@ -29,14 +28,13 @@ from chellow.utils import (
 from chellow.views import chellow_redirect
 
 
-def content(start_date, finish_date, g_contract_id, user):
+def content(start_date, finish_date, g_contract_id, user_id):
     report_context = {}
+    f = writer = None
     try:
         with Session() as sess:
-            running_name, finished_name = chellow.dloads.make_names(
-                "gas_virtual_bills.csv", user
-            )
-            f = open(running_name, mode="w", newline="")
+            user = User.get_by_id(sess, user_id)
+            f = open_file("gas_virtual_bills.csv", user, mode="w", newline="")
             writer = csv.writer(f, lineterminator="\n")
 
             g_contract = GContract.get_by_id(sess, g_contract_id)
@@ -125,11 +123,11 @@ def content(start_date, finish_date, g_contract_id, user):
     except BaseException:
         msg = traceback.format_exc()
         sys.stderr.write(msg)
-        writer.writerow([msg])
+        if writer is not None:
+            writer.writerow([msg])
     finally:
         if f is not None:
             f.close()
-            os.rename(running_name, finished_name)
 
 
 def do_get(sess):
@@ -137,7 +135,6 @@ def do_get(sess):
     finish_date = req_date("finish")
     g_contract_id = req_int("g_contract_id")
 
-    threading.Thread(
-        target=content, args=(start_date, finish_date, g_contract_id, g.user)
-    ).start()
+    args = start_date, finish_date, g_contract_id, g.user.id
+    threading.Thread(target=content, args=args).start()
     return chellow_redirect("/downloads", 303)

chellow/reports/report_sscs.py

@@ -1,4 +1,3 @@
-import os
 import sys
 import threading
 import traceback
@@ -13,7 +12,7 @@ from sqlalchemy.orm import joinedload
 
 from werkzeug.exceptions import BadRequest
 
-import chellow.dloads
+from chellow.dloads import open_file
 from chellow.models import MeasurementRequirement, Session, Ssc, Tpr, User
 from chellow.utils import req_bool
 from chellow.views import chellow_redirect
@@ -54,9 +53,7 @@ def content(
         with Session() as sess:
             user = User.get_by_id(sess, user_id)
 
-            running_name, finished_name = chellow.dloads.make_names("sscs.ods", user)
-
-            rf = open(running_name, "wb")
+            rf = open_file("sscs.ods", user, "wb")
 
             for ssc in sess.scalars(select(Ssc).order_by(Ssc.code)):
                 ssc_rows.append(
@@ -100,8 +97,7 @@ def content(
         ssc_rows.append(["Problem " + msg])
         if rf is None:
             msg = traceback.format_exc()
-            r_name, f_name = chellow.dloads.make_names("error.txt", None)
-            ef = open(r_name, "w")
+            ef = open_file("error.txt", None, "w")
             ef.write(msg + "\n")
             ef.close()
         else:
@@ -109,7 +105,6 @@ def content(
     finally:
         if rf is not None:
             rf.close()
-            os.rename(running_name, finished_name)
 
 
 def do_get(sess):

chellow/reports/report_supply_contacts.py

@@ -1,5 +1,4 @@
 import csv
-import os
 import sys
 import threading
 import traceback
@@ -10,7 +9,7 @@ from sqlalchemy import select
 from sqlalchemy.orm import joinedload
 from sqlalchemy.sql.expression import null
 
-import chellow.dloads
+from chellow.dloads import open_file
 from chellow.models import (
     Contract,
     Era,
@@ -33,10 +32,7 @@ def content(user_id, report_run_id):
     try:
         with Session() as sess:
             user = User.get_by_id(sess, user_id)
-            running_name, finished_name = chellow.dloads.make_names(
-                f"{FNAME}.csv", user
-            )
-            f = open(running_name, mode="w", newline="")
+            f = open_file(f"{FNAME}.csv", user, mode="w", newline="")
             report_run = ReportRun.get_by_id(sess, report_run_id)
 
             _process(sess, f, report_run)
@@ -56,7 +52,6 @@ def content(user_id, report_run_id):
     finally:
         if f is not None:
             f.close()
-            os.rename(running_name, finished_name)
 
 
 def _process(sess, f, report_run):
@@ -129,13 +124,7 @@ def _process(sess, f, report_run):
 
 
 def do_get(sess):
-    report_run = ReportRun.insert(
-        sess,
-        FNAME,
-        g.user,
-        FNAME,
-        {},
-    )
+    report_run = ReportRun.insert(sess, FNAME, g.user, FNAME, {})
     sess.commit()
     threading.Thread(target=content, args=(g.user.id, report_run.id)).start()
     return chellow_redirect(f"/report_runs/{report_run.id}", 303)

{chellow-1710934022.0.0.dist-info → chellow-1712589951.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1710934022.0.0
+Version: 1712589951.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-1710934022.0.0.dist-info → chellow-1712589951.0.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
-chellow/__init__.py,sha256=_9hq4MlC2YB7kUh4iH9hwmx7BqMV6JeyvGVB8uWk8Cs,10127
+chellow/__init__.py,sha256=A6gh-jVJBhuCFmfquLEa8uf-kQhsRSFficE1SlnHnAg,10200
 chellow/api.py,sha256=mk17TfweR76DPFC8lX2SArTjai6y6YshASxqO1w-_-s,11036
 chellow/bank_holidays.py,sha256=T_utYMwe_g1dz5X-aOTdIPryg49SvB7QsWM1yphlqG8,4423
 chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
-chellow/dloads.py,sha256=vtebrKchBt_oANDO_c-aL2jO-w1KKwBcYaG_VgzUlJI,5209
+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=j26jxohyZ09tWVOAnWRFl0k0QUVRX0nDthIIDJpo7cE,237327
 chellow/national_grid.py,sha256=uxcv0qisHPyzw9AVIYPzsRqwt2XPAcZL-SBR12qcrS0,4364
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 chellow/rate_server.py,sha256=vNuKzlr0lkAzZ4zG7zboStoo92_6iLKAxbw1yZ-ucII,5626
@@ -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
@@ -69,15 +69,13 @@ 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_169.py,sha256=tnTiHmhigcgZ7E8rUSfgzsVYUCW947xBZZq04-KqfK8,9287
-chellow/reports/report_177.py,sha256=JPfmdJMxRqzV_jpXjH-ziuRMwdK5UIjBUhRETJ2PnvA,10505
-chellow/reports/report_181.py,sha256=Fm2kgqjZvTVU31H6KVBVg3bqcGPHomJG82KXa7I7k4E,4989
+chellow/reports/report_181.py,sha256=mCL6vXfrj8r0kL-LilDS0SnSu5tJOzCq7eMJVx9zpEw,4999
 chellow/reports/report_183.py,sha256=DZX-hHJPl_Tbgkt31C_cuLZg_5L2b6iCPQ5foOZizR0,8817
 chellow/reports/report_187.py,sha256=UvpaYHjyJFNV5puYq8_KxfzoBtVrwFgIGUOmC5oGA9A,9956
-chellow/reports/report_215.py,sha256=_HZO_MhL51ttzmG6IrT8YVG6WmJMkRNWsXOW7AL7GWs,6766
 chellow/reports/report_219.py,sha256=o2eEg3mX9_raP2b4gjc2Gu4vqnMqcvvJBYQ1oQjxvpE,6637
 chellow/reports/report_231.py,sha256=gOb1AkXZQvwVpRg5cIenO7iR7Se1_zsWnJp9l2BlgpA,5008
 chellow/reports/report_233.py,sha256=DLAmkoHFKH-N8OEIoX4jeCxAaCfJK0e7ssjFJJpPqzw,4334
-chellow/reports/report_241.py,sha256=se2V1tb5scvH9-RRuGG3U-IbqUYd-BZcNFwvTRjkbsw,5625
+chellow/reports/report_241.py,sha256=AlFmSHnfG2HWv_ICmWX7fNpPwLHjq7mo1QtOTjSKO3k,5384
 chellow/reports/report_247.py,sha256=ozgCcee8XeqYbOpZCyU2STJKaz6h2x7TYQogagTaYLw,46626
 chellow/reports/report_29.py,sha256=KDFjgrLBv4WbG9efCdu_geMR7gT_QV9N97Wfdt7aDc4,2736
 chellow/reports/report_291.py,sha256=rqBXy6s7hMeYWw-yNX6w_L5t2yz6rNEeos_4xO7wf90,7519
@@ -88,20 +86,20 @@ chellow/reports/report_429.py,sha256=0GCc0rQnOSG0fusw69yMMOCxnWApBd3P2sGWIg1py9M
 chellow/reports/report_59.py,sha256=21uNlcuYQCOAvrRir241HR-6SsuL9bWEPVCcU_jOxfE,44731
 chellow/reports/report_81.py,sha256=UYr0Dm4TmCCYUbIWw3hWNI0GdQRhH27vwVk3Ytdsrcg,5288
 chellow/reports/report_87.py,sha256=ZadBo40rUORN0Fi926-dDHeTFn6L-fBzp3b4k7v5MdY,6802
-chellow/reports/report_asset_comparison.py,sha256=6kHiPOL5fiZXtPyKXQ0fHvi1zYX51Frb4NMMDwLdWvc,6140
+chellow/reports/report_asset_comparison.py,sha256=UN298MHuzyUDUiiZr7F_Ua6SrdVOlFLjgKjnIbrA-14,6118
 chellow/reports/report_batches.py,sha256=7O5TcB9W1sPKS0LQMsC6sUDzx73X5iyoZE0O3zK91zs,4798
 chellow/reports/report_bills.py,sha256=AHW6tiZAOE0gXDfencPvemE4zqK6eTqfN8_bWQ4RT5o,3323
-chellow/reports/report_csv_llfcs.py,sha256=XbVGcTbjLSrJL7zdgqIPX_FvN4Pa_lUSMDtkuFpPMBw,1934
+chellow/reports/report_csv_llfcs.py,sha256=OHSbP64lQ6dlAMcQYgvdANlA4lQyF0iBlwk7V9c9nuo,1944
 chellow/reports/report_csv_site_hh_data.py,sha256=T-clGDmYdn0ej7zZfL3kDp4Vyd82WzptxEzxx9KqAZg,4270
-chellow/reports/report_csv_site_snags.py,sha256=XrJmIW0G4SyhpMJFZw1rqLom84wzLVqid44EBS0UT9s,2747
+chellow/reports/report_csv_site_snags.py,sha256=gG2sYQrLoIBwCoMUC8rhmAL7Kffh_rvNb9UOX7cYDko,2668
 chellow/reports/report_ecoes_comparison.py,sha256=bTkbcvNB__UcNQtHncC41_Ql222vvPTJTnyVJbgjylM,21313
 chellow/reports/report_g_monthly_duration.py,sha256=vI5FKAU8_oThjR5oflPZont7Z7sVAunr0qlMfJsaPJI,12004
 chellow/reports/report_g_supplies_snapshot.py,sha256=0M0x_0o0985Hu45gUJJJwzfx0DDOAuXBJ1UVUDbQ36g,4718
 chellow/reports/report_g_supply_virtual_bill.py,sha256=x_KtQ02dwgmXvAEUXJ1poK0BRwqxa-GcbJ5pddEina0,3694
-chellow/reports/report_g_virtual_bills.py,sha256=17jKVjSrvQ91qE924InSzdxSebLo_QkvR2M1ugnRglo,4604
+chellow/reports/report_g_virtual_bills.py,sha256=t3hmTiURk1E_mPucIboCdPBlSLapDIUdHYRpVTFtJgw,4569
 chellow/reports/report_g_virtual_bills_hh.py,sha256=5crgu7oUrOSR9GAA1uhb8lJNn4gCUSBAaXci1gOuohE,3457
-chellow/reports/report_sscs.py,sha256=0LQAe_Madtomvij8MgP8y6isVjFhu8zBDZQSN4j10Xs,3437
-chellow/reports/report_supply_contacts.py,sha256=v3gwCBfc_9k10T4ytasFOtRIPZVjKEDgrUwXW75ZPKs,3840
+chellow/reports/report_sscs.py,sha256=beCzKpaQaeeiyMGpX6o-gbl1tCS6ArdF1o4GeIQE67s,3255
+chellow/reports/report_supply_contacts.py,sha256=vyA3mLWqYISwOuRhzRIYQIWmvWXS1Vv_rJClq2IFBiw,3640
 chellow/static/css/chellow.css,sha256=mcLjqKMo0qtdQWY7AnXEL8Bvx2B-Pu8kcGO58bUXOpY,5372
 chellow/static/images/favicon.svg,sha256=ySFHoVJYmr-xU93QrE-jLYn-ZNythh2vsemnR8dkvg0,2339
 chellow/static/images/favicon_test.svg,sha256=HnLS_BjNt8M0Ikko5Z-f_E2aed7y6RRU6j3K6XADciE,2346
@@ -363,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-1710934022.0.0.dist-info/METADATA,sha256=sFNcimdKN1-J3ReZZu4ppgCiIflLbWFfK3GbXyojil4,12203
-chellow-1710934022.0.0.dist-info/WHEEL,sha256=bq9SyP5NxIRA9EpQgMCd-9RmPHWvbH-4lTDGwxgIR64,87
-chellow-1710934022.0.0.dist-info/RECORD,,
+chellow-1712589951.0.0.dist-info/METADATA,sha256=7i4xrwuQ86GNArcYRVjMgd8c2k9pbTy5yW8XWSKvrTY,12203
+chellow-1712589951.0.0.dist-info/WHEEL,sha256=as-1oFTWSeWBgyzh0O_qF439xqBe6AbBgt4MfYe5zwY,87
+chellow-1712589951.0.0.dist-info/RECORD,,

{chellow-1710934022.0.0.dist-info → chellow-1712589951.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

chellow/reports/report_177.py

@@ -1,285 +0,0 @@
-import os
-import threading
-import time
-import traceback
-from datetime import datetime as Datetime
-
-from dateutil.relativedelta import relativedelta
-
-from flask import g, request
-
-import pytz
-
-from sqlalchemy import Float, cast, func, or_
-from sqlalchemy.orm import joinedload
-from sqlalchemy.sql.expression import null, true
-
-import chellow.computer
-import chellow.dloads
-from chellow.models import Bill, Channel, Era, HhDatum, Session, Site, SiteEra, Supply
-from chellow.utils import HH, hh_format, hh_max, hh_min, req_int
-from chellow.views import chellow_redirect
-
-
-def _content(sess, tmp_file, year, month, months, supply_id, user):
-    supplies = (
-        sess.query(Supply)
-        .join(Era)
-        .distinct()
-        .options(joinedload(Supply.generator_type))
-    )
-
-    if supply_id is not None:
-        supply = Supply.get_by_id(sess, supply_id)
-        supplies = supplies.filter(Supply.id == supply.id)
-
-    caches = {}
-
-    start_date = Datetime(year, month, 1, tzinfo=pytz.utc) - relativedelta(
-        months=months - 1
-    )
-
-    field_names = (
-        "supply-name",
-        "source-code",
-        "generator-type",
-        "month",
-        "pc-code",
-        "msn",
-        "site-code",
-        "site-name",
-        "metering-type",
-        "import-mpan-core",
-        "metered-import-kwh",
-        "metered-import-net-gbp",
-        "metered-import-estimated-kwh",
-        "billed-import-kwh",
-        "billed-import-net-gbp",
-        "export-mpan-core",
-        "metered-export-kwh",
-        "metered-export-estimated-kwh",
-        "billed-export-kwh",
-        "billed-export-net-gbp",
-        "problem",
-        "timestamp",
-    )
-
-    tmp_file.write("supply-id," + ",".join(field_names) + "\n")
-
-    forecast_date = chellow.computer.forecast_date()
-
-    for i in range(months):
-        month_start = start_date + relativedelta(months=i)
-        month_finish = month_start + relativedelta(months=1) - HH
-
-        for supply in supplies.filter(
-            Era.start_date <= month_finish,
-            or_(Era.finish_date == null(), Era.finish_date >= month_start),
-        ):
-            generator_type = supply.generator_type
-            if generator_type is None:
-                generator_type = ""
-            else:
-                generator_type = generator_type.code
-
-            source_code = supply.source.code
-            eras = supply.find_eras(sess, month_start, month_finish)
-            era = eras[-1]
-            metering_type = era.meter_category
-
-            site = (
-                sess.query(Site)
-                .join(SiteEra)
-                .filter(SiteEra.era == era, SiteEra.is_physical == true())
-                .one()
-            )
-
-            values = {
-                "supply-name": supply.name,
-                "source-code": source_code,
-                "generator-type": generator_type,
-                "month": hh_format(month_finish),
-                "pc-code": era.pc.code,
-                "msn": era.msn,
-                "site-code": site.code,
-                "site-name": site.name,
-                "metering-type": metering_type,
-                "problem": "",
-            }
-
-            tmp_file.write(str(supply.id) + ",")
-
-            for is_import, pol_name in [(True, "import"), (False, "export")]:
-                if is_import:
-                    mpan_core = era.imp_mpan_core
-                else:
-                    mpan_core = era.exp_mpan_core
-
-                values[pol_name + "-mpan-core"] = mpan_core
-                kwh = 0
-                est_kwh = 0
-
-                if metering_type in ["hh", "amr"]:
-                    est_kwh = (
-                        sess.query(HhDatum.value)
-                        .join(Channel)
-                        .join(Era)
-                        .filter(
-                            HhDatum.status == "E",
-                            Era.supply_id == supply.id,
-                            Channel.channel_type == "ACTIVE",
-                            Channel.imp_related == is_import,
-                            HhDatum.start_date >= month_start,
-                            HhDatum.start_date <= month_finish,
-                        )
-                        .first()
-                    )
-                    if est_kwh is None:
-                        est_kwh = 0
-                    else:
-                        est_kwh = est_kwh[0]
-
-                if not (is_import and source_code in ("net", "gen-net")):
-                    kwh_sum = (
-                        sess.query(cast(func.sum(HhDatum.value), Float))
-                        .join(Channel)
-                        .join(Era)
-                        .filter(
-                            Era.supply_id == supply.id,
-                            Channel.channel_type == "ACTIVE",
-                            Channel.imp_related == is_import,
-                            HhDatum.start_date >= month_start,
-                            HhDatum.start_date <= month_finish,
-                        )
-                        .one()[0]
-                    )
-                    if kwh_sum is not None:
-                        kwh += kwh_sum
-
-                values["metered-" + pol_name + "-estimated-kwh"] = est_kwh
-                values["metered-" + pol_name + "-kwh"] = kwh
-                values["metered-" + pol_name + "-net-gbp"] = 0
-                values["billed-" + pol_name + "-kwh"] = 0
-                values["billed-" + pol_name + "-net-gbp"] = 0
-                values["billed-" + pol_name + "-apportioned-kwh"] = 0
-                values["billed-" + pol_name + "-apportioned-net-gbp"] = 0
-                values["billed-" + pol_name + "-raw-kwh"] = 0
-                values["billed-" + pol_name + "-raw-net-gbp"] = 0
-
-            for bill in sess.query(Bill).filter(
-                Bill.supply == supply,
-                Bill.start_date <= month_finish,
-                Bill.finish_date >= month_start,
-            ):
-                bill_start = bill.start_date
-                bill_finish = bill.finish_date
-                bill_duration = (bill_finish - bill_start).total_seconds() + 30 * 60
-                overlap_duration = (
-                    min(bill_finish, month_finish) - max(bill_start, month_start)
-                ).total_seconds() + 30 * 60
-                overlap_proportion = float(overlap_duration) / float(bill_duration)
-                values["billed-import-net-gbp"] += overlap_proportion * float(bill.net)
-                values["billed-import-kwh"] += overlap_proportion * float(bill.kwh)
-
-            for era in eras:
-                chunk_start = hh_max(era.start_date, month_start)
-                chunk_finish = hh_min(era.finish_date, month_finish)
-
-                import_mpan_core = era.imp_mpan_core
-                if import_mpan_core is None:
-                    continue
-
-                supplier_contract = era.imp_supplier_contract
-
-                if source_code in ["net", "gen-net", "3rd-party"]:
-                    supply_source = chellow.computer.SupplySource(
-                        sess,
-                        chunk_start,
-                        chunk_finish,
-                        forecast_date,
-                        era,
-                        True,
-                        caches,
-                    )
-
-                    values["metered-import-kwh"] += sum(
-                        datum["msp-kwh"] for datum in supply_source.hh_data
-                    )
-
-                    import_vb_function = supply_source.contract_func(
-                        supplier_contract, "virtual_bill"
-                    )
-                    if import_vb_function is None:
-                        values["problem"] += (
-                            "Can't find the "
-                            "virtual_bill  function in the supplier "
-                            "contract. "
-                        )
-                    else:
-                        import_vb_function(supply_source)
-                        values["metered-import-net-gbp"] += supply_source.supplier_bill[
-                            "net-gbp"
-                        ]
-
-                    supply_source.contract_func(era.dc_contract, "virtual_bill")(
-                        supply_source
-                    )
-                    values["metered-import-net-gbp"] += supply_source.dc_bill["net-gbp"]
-
-                    mop_func = supply_source.contract_func(
-                        era.mop_contract, "virtual_bill"
-                    )
-                    if mop_func is None:
-                        values["problem"] += (
-                            " MOP virtual_bill " "function can't be found."
-                        )
-                    else:
-                        mop_func(supply_source)
-                        mop_bill = supply_source.mop_bill
-                        values["metered-import-net-gbp"] += mop_bill["net-gbp"]
-                        if len(mop_bill["problem"]) > 0:
-                            values["problem"] += (
-                                " MOP virtual bill problem: " + mop_bill["problem"]
-                            )
-
-            values["timestamp"] = int(time.time() * 1000)
-            tmp_file.write(
-                ",".join('"' + str(values[name]) + '"' for name in field_names) + "\n"
-            )
-
-
-def content(year, month, months, supply_id, user):
-    tmp_file = None
-    try:
-        with Session() as sess:
-            if supply_id is None:
-                base_name = (
-                    f"supplies_monthly_duration_for_all_supplies_for_{months}_to_"
-                    f"{year}_{month}.csv"
-                )
-            else:
-                base_name = (
-                    f"supplies_monthly_duration_for_{supply_id}_{months}_to_{year}_"
-                    f"{month}.csv"
-                )
-            running_name, finished_name = chellow.dloads.make_names(base_name, user)
-
-            tmp_file = open(running_name, "w")
-            _content(sess, tmp_file, year, month, months, supply_id, user)
-    except BaseException:
-        tmp_file.write(traceback.format_exc())
-    finally:
-        tmp_file.close()
-        os.rename(running_name, finished_name)
-
-
-def do_get(sess):
-    year = req_int("end_year")
-    month = req_int("end_month")
-    months = req_int("months")
-    supply_id = req_int("supply_id") if "supply_id" in request.values else None
-    user = g.user
-    threading.Thread(
-        target=content, args=(year, month, months, supply_id, user)
-    ).start()
-    return chellow_redirect("/downloads", 303)

chellow/reports/report_215.py

@@ -1,176 +0,0 @@
-import csv
-import os
-import sys
-import threading
-import traceback
-from datetime import datetime
-
-from flask import g, request
-
-import pytz
-
-from sqlalchemy import or_
-from sqlalchemy.sql.expression import null, true
-
-import chellow.dloads
-from chellow.models import Era, Session, Site, SiteEra, Source, Supply
-from chellow.utils import hh_after, hh_before, prev_hh, req_int
-from chellow.views import chellow_redirect
-
-
-def content(year, supply_id, user):
-    f = writer = None
-    try:
-        with Session() as sess:
-            running_name, finished_name = chellow.dloads.make_names(
-                "crc_special_events.csv", user
-            )
-            f = open(running_name, mode="w", newline="")
-            writer = csv.writer(f, lineterminator="\n")
-            writer.writerow(("MPAN Core", "Site Id", "Site Name", "Date", "Event"))
-
-            year_start = datetime(year, 4, 1, tzinfo=pytz.utc)
-            year_finish = prev_hh(datetime(year + 1, 4, 1, tzinfo=pytz.utc))
-
-            def add_event(events, date, code, era=None, mpan_core=None):
-                if era is None:
-                    mpan_cores = [mpan_core]
-                else:
-                    mpan_cores = []
-                    if era.imp_mpan_core is not None:
-                        mpan_cores.append(era.imp_mpan_core)
-                    if era.exp_mpan_core is not None:
-                        mpan_cores.append(era.exp_mpan_core)
-
-                for mpan_core in mpan_cores:
-                    events.append({"date": date, "code": code, "mpan-core": mpan_core})
-
-            if supply_id is None:
-                supplies = (
-                    sess.query(Supply)
-                    .join(Source)
-                    .join(Era)
-                    .filter(
-                        Source.code.in_(("net", "gen-net", "gen")),
-                        Era.start_date <= year_finish,
-                        or_(Era.finish_date == null(), Era.finish_date >= year_start),
-                    )
-                    .distinct()
-                )
-            else:
-                supply = Supply.get_by_id(supply_id)
-                supplies = sess.query(Supply).filter(Supply.id == supply.id)
-
-            for supply in supplies:
-                eras = (
-                    sess.query(Era)
-                    .filter(
-                        Era.supply == supply,
-                        Era.start_date <= year_finish,
-                        or_(Era.finish_date == null(), Era.finish_date >= year_start),
-                    )
-                    .order_by(Era.start_date)
-                    .all()
-                )
-                events = []
-                first_era = eras[0]
-                first_era_start = first_era.start_date
-                if hh_after(first_era_start, year_start):
-                    add_event(events, first_era_start, "New Supply", first_era)
-
-                last_era = eras[-1]
-                last_era_finish = last_era.finish_date
-                if hh_before(last_era_finish, year_finish):
-                    add_event(events, last_era_finish, "Disconnection", last_era)
-
-                prev_era = first_era
-                for era in eras[1:]:
-                    if era.msn != prev_era.msn:
-                        add_event(events, era.start_date, "Meter Change", era)
-                    if era.pc.code != prev_era.pc.code:
-                        add_event(
-                            events, era.start_date, "Change Of Profile Class", era
-                        )
-
-                    if era.mop_contract_id != prev_era.mop_contract_id:
-                        add_event(events, era.start_date, "Change Of MOP", era)
-
-                    if era.dc_contract_id != prev_era.dc_contract_id:
-                        add_event(events, era.start_date, "Change Of DC", era)
-
-                    for is_import in [True, False]:
-                        if era.imp_mpan_core is None:
-                            mpan_core = era.exp_mpan_core
-                        else:
-                            mpan_core = era.imp_mpan_core
-
-                        if is_import:
-                            cur_sup = era.imp_supplier_contract
-                            prev_sup = prev_era.imp_supplier_contract
-                        else:
-                            cur_sup = era.exp_supplier_contract
-                            prev_sup = prev_era.exp_supplier_contract
-
-                        if cur_sup is None and prev_sup is not None:
-                            add_event(
-                                events, era.start_date, "End of supply", mpan_core
-                            )
-                        elif cur_sup is not None and prev_sup is None:
-                            add_event(
-                                events,
-                                era.start_date,
-                                "Start of supply",
-                                None,
-                                mpan_core,
-                            )
-                        elif (
-                            cur_sup is not None
-                            and prev_sup is not None
-                            and cur_sup != prev_sup
-                        ):
-                            add_event(
-                                events,
-                                era.start_date,
-                                "Change Of Supplier",
-                                None,
-                                mpan_core,
-                            )
-
-                    prev_era = era
-
-                if len(events) > 0:
-                    site = (
-                        sess.query(Site)
-                        .join(SiteEra)
-                        .filter(SiteEra.is_physical == true(), SiteEra.era == last_era)
-                        .one()
-                    )
-
-                    for event in events:
-                        vals = [
-                            event["mpan-core"],
-                            site.code,
-                            site.name,
-                            event["date"].strftime("%Y-%m-%d %H:%M"),
-                            event["code"],
-                        ]
-                        writer.writerow(vals)
-
-                # Avoid a long-running transaction
-                sess.rollback()
-    except BaseException:
-        msg = traceback.format_exc()
-        sys.stderr.write(msg)
-        writer.writerow([msg])
-    finally:
-        if f is not None:
-            f.close()
-            os.rename(running_name, finished_name)
-
-
-def do_get(sess):
-    year = req_int("year")
-    supply_id = req_int("supply_id") if "supply_id" in request.values else None
-
-    threading.Thread(target=content, args=(year, supply_id, g.user)).start()
-    return chellow_redirect("/downloads", 303)