chellow 1724313988.0.0__tar.gz → 1724334398.0.0__tar.gz

{chellow-1724313988.0.0 → chellow-1724334398.0.0}/PKG-INFO

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

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

{chellow-1724313988.0.0 → chellow-1724334398.0.0}/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-1724313988.0.0 → chellow-1724334398.0.0}/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-1724334398.0.0/test/reports/test_report_csv_site_hh_data.py

@@ -0,0 +1,94 @@
+import csv
+from io import StringIO
+
+from utils import match, match_tables
+
+from chellow.models import Site, User, UserRole
+from chellow.reports.report_csv_site_hh_data import content
+from chellow.utils import ct_datetime, to_utc
+
+
+def test_do_get(client, mocker, sess):
+    MockThread = mocker.patch(
+        "chellow.reports.report_csv_site_hh_data.threading.Thread"
+    )
+    user = User.get_by_email_address(sess, "admin@example.com")
+    start_date = to_utc(ct_datetime(2020, 1, 1))
+    finish_date = to_utc(ct_datetime(2020, 1, 31, 23, 30))
+    site_id = None
+    expected_args = start_date, finish_date, site_id, user.id
+    query_string = {
+        "start_year": "2020",
+        "start_month": "01",
+        "start_day": "01",
+        "start_hour": "00",
+        "start_minute": "00",
+        "finish_year": "2020",
+        "finish_month": "01",
+        "finish_day": "31",
+        "finish_hour": "23",
+        "finish_minute": "30",
+    }
+    response = client.get("/reports/csv_site_hh_data", query_string=query_string)
+    match(response, 303)
+    MockThread.assert_called_with(target=content, args=expected_args)
+
+
+def test_content(mocker, sess):
+    mock_file = StringIO()
+    mock_file.close = mocker.Mock()
+    mocker.patch(
+        "chellow.reports.report_csv_site_hh_data.open_file", return_value=mock_file
+    )
+
+    site = Site.insert(sess, "CI017", "Water Works")
+    site_id = site.id
+    editor = UserRole.insert(sess, "editor")
+    user = User.insert(sess, "admin@example.com", "xxx", editor, None)
+    user_id = user.id
+
+    sess.commit()
+
+    start_date = to_utc(ct_datetime(2024, 6, 1))
+    finish_date = to_utc(ct_datetime(2024, 6, 1))
+    content(start_date, finish_date, site_id, user_id)
+    mock_file.seek(0)
+    actual = list(csv.reader(mock_file))
+    expected = [
+        [
+            "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",
+        ],
+        [
+            "CI017",
+            "Water Works",
+            "",
+            "",
+            "",
+            "2024-06-01 00:00",
+            "0",
+            "0",
+            "0",
+            "0",
+            "0",
+            "0",
+            "0",
+            "0",
+            "",
+        ],
+    ]
+
+    match_tables(expected, actual)

chellow-1724334398.0.0/test/test_dloads.py

@@ -0,0 +1,27 @@
+from pathlib import Path
+from tempfile import TemporaryDirectory
+
+from chellow.dloads import SERIAL_DIGITS, open_file, startup
+
+
+def test_startup():
+    with TemporaryDirectory() as tmpdir:
+        startup(Path(tmpdir), run_deleter=False)
+
+
+def test_startup_interrupted():
+    with TemporaryDirectory() as tempdir:
+        tmpdir = Path(tempdir)
+        downloads = tmpdir / "downloads"
+        downloads.mkdir()
+        fname = "0" * SERIAL_DIGITS + "_RUNNING_inewton.ods"
+        (downloads / fname).touch()
+        startup(tmpdir, run_deleter=False)
+
+
+def test_truncate():
+    with TemporaryDirectory() as tmpdir:
+        startup(Path(tmpdir), run_deleter=False)
+        user = None
+        with open_file("test.txt", user, mode="w") as fl:
+            fl.truncate()

chellow-1724313988.0.0/VERSION

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

chellow-1724313988.0.0/test/reports/test_report_csv_site_hh_data.py

@@ -1,38 +0,0 @@
-from io import StringIO
-
-from utils import match
-
-from chellow.models import User
-from chellow.reports.report_csv_site_hh_data import content
-from chellow.utils import ct_datetime, to_utc
-
-
-def test_do_get(client, mocker, sess):
-    mock_file = StringIO()
-    mock_file.close = mocker.Mock()
-    mocker.patch(
-        "chellow.reports.report_csv_site_hh_data.open_file", return_value=mock_file
-    )
-    MockThread = mocker.patch(
-        "chellow.reports.report_csv_site_hh_data.threading.Thread"
-    )
-    user = User.get_by_email_address(sess, "admin@example.com")
-    start_date = to_utc(ct_datetime(2020, 1, 1))
-    finish_date = to_utc(ct_datetime(2020, 1, 31, 23, 30))
-    site_id = None
-    expected_args = start_date, finish_date, site_id, user.id
-    query_string = {
-        "start_year": "2020",
-        "start_month": "01",
-        "start_day": "01",
-        "start_hour": "00",
-        "start_minute": "00",
-        "finish_year": "2020",
-        "finish_month": "01",
-        "finish_day": "31",
-        "finish_hour": "23",
-        "finish_minute": "30",
-    }
-    response = client.get("/reports/csv_site_hh_data", query_string=query_string)
-    match(response, 303)
-    MockThread.assert_called_with(target=content, args=expected_args)

chellow-1724313988.0.0/test/test_dloads.py

@@ -1,19 +0,0 @@
-from pathlib import Path
-from tempfile import TemporaryDirectory
-
-from chellow.dloads import open_file, startup
-
-
-def test_startup(mocker):
-    mocker.patch("chellow.dloads.FileDeleter")
-    with TemporaryDirectory() as tmpdir:
-        startup(Path(tmpdir))
-
-
-def test_truncate(mocker):
-    mocker.patch("chellow.dloads.FileDeleter")
-    with TemporaryDirectory() as tmpdir:
-        startup(Path(tmpdir))
-        user = None
-        with open_file("test.txt", user, mode="w") as fl:
-            fl.truncate()