chellow 1724313988.0.0__py3-none-any.whl → 1724334398.0.0__py3-none-any.whl

chellow/dloads.py

@@ -25,17 +25,23 @@ def startup(instance_path, run_deleter=True):
     global download_id
     global download_path
 
-    if run_deleter:
-        file_deleter = FileDeleter()
-        file_deleter.start()
-
     download_path = instance_path / "downloads"
     download_path.mkdir(parents=True, exist_ok=True)
 
+    # Delete any files marked RUNNING that are hanging around
+    for fl in download_path.iterdir():
+        if fl.name[SERIAL_DIGITS:].startswith("_RUNNING_"):
+            new_name = fl.name.replace("_RUNNING_", "_INTERRUPTED_", 1)
+            fl.rename(fl.parent / new_name)
+
     dirs = sorted(download_path.iterdir(), reverse=True)
     if len(dirs) > 0:
         download_id = int(dirs[0].name[:SERIAL_DIGITS]) + 1
 
+    if run_deleter:
+        file_deleter = FileDeleter()
+        file_deleter.start()
+
 
 class DloadFile:
     def __init__(self, running_name, finished_name, mode, newline, is_zip):

chellow/reports/report_csv_site_hh_data.py

@@ -5,7 +5,7 @@ import traceback
 
 from flask import g, request
 
-from sqlalchemy import null, or_, true
+from sqlalchemy import null, or_, select, true
 from sqlalchemy.orm import joinedload
 
 from chellow.dloads import open_file
@@ -25,36 +25,38 @@ def content(start_date, finish_date, site_id, user_id):
             writer = csv.writer(f, lineterminator="\n")
             write_row(
                 writer,
-                "Site Id",
-                "Site Name",
-                "Associated Site Ids",
-                "Sources",
-                "Generator Types",
-                "HH Start Clock-Time",
-                "Imported kWh",
-                "Displaced kWh",
-                "Exported kWh",
-                "Used kWh",
-                "Parasitic kWh",
-                "Generated kWh",
-                "3rd Party Import",
-                "3rd Party Export",
-                "Meter Type",
+                "site_id",
+                "site_name",
+                "associated_site_ids",
+                "sources",
+                "generator_types",
+                "hh_start_clock_time",
+                "imported_kwh",
+                "displaced_kwh",
+                "exported_kwh",
+                "used_kwh",
+                "parasitic_kwh",
+                "generated_kwh",
+                "3rd_party_import",
+                "3rd_party_export",
+                "meter_type",
             )
 
-            sites = sess.query(Site).order_by(Site.code)
+            sites_q = select(Site).order_by(Site.code)
             if site_id is not None:
-                sites = sites.filter(Site.id == site_id)
+                sites_q = sites_q.where(Site.id == site_id)
 
-            for site in sites:
+            for site in sess.scalars(sites_q):
                 sources = set()
                 generator_types = set()
                 assoc = site.find_linked_sites(sess, start_date, finish_date)
                 metering_type = ""
-                for era in (
-                    sess.query(Era)
+                for era in sess.scalars(
+                    select(Era)
                     .join(SiteEra)
-                    .filter(
+                    .join(Supply)
+                    .join(Source)
+                    .where(
                         SiteEra.site == site,
                         SiteEra.is_physical == true(),
                         Era.start_date <= finish_date,
@@ -90,9 +92,9 @@ def content(start_date, finish_date, site_id, user_id):
                         sources_str,
                         generators_str,
                         hh["start_date"],
-                        hh["imp_net"],
+                        hh["imp_grid"],
                         hh["displaced"],
-                        hh["exp_net"],
+                        hh["exp_grid"],
                         hh["used"],
                         hh["exp_gen"],
                         hh["imp_gen"],

{chellow-1724313988.0.0.dist-info → chellow-1724334398.0.0.dist-info}/METADATA

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

@@ -2,7 +2,7 @@ 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=5SmP-0QPK6xCkd_wjIWh_8FAzN5OxNHCzyEQ1Xb-Y-M,5256
+chellow/dloads.py,sha256=dixp-O0MF2_mlwrnKx3D9DH09Qu05BjTo0rZfigTjR4,5534
 chellow/edi_lib.py,sha256=alu20x9ZX06iPfnNI9dEJzuP6RIf4We3Y_M_bl7RrcY,51789
 chellow/general_import.py,sha256=l3EHq9zG9Vfl5Ee6XTVrC1nusXo4YGGB4VBmZ_JaJR8,65798
 chellow/models.py,sha256=rQLMIpGqFQk0fm7SQsAJbb51j3OM55e-4-MVfh0mBAc,243511
@@ -92,7 +92,7 @@ chellow/reports/report_asset_comparison.py,sha256=UN298MHuzyUDUiiZr7F_Ua6SrdVOlF
 chellow/reports/report_batches.py,sha256=7O5TcB9W1sPKS0LQMsC6sUDzx73X5iyoZE0O3zK91zs,4798
 chellow/reports/report_bills.py,sha256=AHW6tiZAOE0gXDfencPvemE4zqK6eTqfN8_bWQ4RT5o,3323
 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_hh_data.py,sha256=yWhEoGGyg_ctM8T55raksTPRJ5ycVO6lVfUx5tRBzTQ,4372
 chellow/reports/report_csv_site_snags.py,sha256=gG2sYQrLoIBwCoMUC8rhmAL7Kffh_rvNb9UOX7cYDko,2668
 chellow/reports/report_ecoes_comparison.py,sha256=PGDJKI2f6DCVCH0xcp--BzXWAWFfTDGgcKVQnfqxBKg,21653
 chellow/reports/report_g_monthly_duration.py,sha256=FMMFIWFfGW2Bd9Excpf4LLXXqQ-fbnZZ_KfNa1VaPqA,13034
@@ -365,6 +365,6 @@ chellow/templates/g/supply_note_edit.html,sha256=b8mB6_ucBwoljp03iy6AgVaZUhGw3-1
 chellow/templates/g/supply_notes.html,sha256=6epNmZ3NKdXZz27fvmRUGeffg_oc1kmwuBeyRzQe3Rg,854
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1724313988.0.0.dist-info/METADATA,sha256=t9QpJIWe-EWi4KGZqjLBITe47y-OEcQpgZcSWnG5wg4,12241
-chellow-1724313988.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1724313988.0.0.dist-info/RECORD,,
+chellow-1724334398.0.0.dist-info/METADATA,sha256=pqYIzP5QRUm6h-OprcFHq3lYO4fl_hYTTKksG19zR1k,12241
+chellow-1724334398.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1724334398.0.0.dist-info/RECORD,,