chellow 1724227131.0.0__py3-none-any.whl → 1724318422.0.0__py3-none-any.whl

chellow/e/cfd.py

@@ -225,46 +225,35 @@ def import_operational_costs_levy(sess, log, set_progress, s):
 RUN_TYPES = ("II", "SF", "R1", "R2", "R3", "RF", "DF")
 
 
-def _reconciled_days(log, s, search_from):
-    runs = {}
-
-    records = [
-        r
-        for r in api_records(log, s, "e0e163cb-ba36-416d-83fe-976992d61516")
-        if r["Settlement_Date"] > search_from
-    ]
-    if len(records) > 0:
-        prev_settlement_date = _parse_date(records[0]["Settlement_Date"])
-        runs = {}
-        for record in records:
-            settlement_date = _parse_date(record["Settlement_Date"])
-            if settlement_date != prev_settlement_date:
-                yield prev_settlement_date, runs
-                runs = {}
-
-            settlement_run_type = record["Settlement_Run_Type"]
-            runs[settlement_run_type] = record
-            prev_settlement_date = settlement_date
-
-        yield settlement_date, runs
-
-
-def _reconciled_daily_quarters(log, s, search_from):
-    quarter = {}
-    for settlement_date, lcc_runs in _reconciled_days(log, s, search_from):
-        try:
-            runs = quarter[settlement_date]
-        except KeyError:
-            runs = quarter[settlement_date] = {}
+def _reconciled_quarters(log, s, search_from):
+    quarters = {}
+
+    for record in api_records(log, s, "e0e163cb-ba36-416d-83fe-976992d61516"):
+        settlement_date = _parse_date(record["Settlement_Date"])
+        if settlement_date > search_from:
+            settlement_date_ct = to_ct(settlement_date)
+            quarter_start_ct_month = int((settlement_date_ct.month - 1) / 3) * 3 + 1
+            quarter_start = to_utc(
+                ct_datetime(settlement_date_ct.year, quarter_start_ct_month, 1)
+            )
+            try:
+                quarter = quarters[quarter_start]
+            except KeyError:
+                quarter = quarters[quarter_start] = {}
 
-        for run_type, record in lcc_runs.items():
-            runs[run_type] = record
+            try:
+                day = quarter[settlement_date]
+            except KeyError:
+                day = quarter[settlement_date] = {}
 
-        settlement_next_ct = to_ct(settlement_date) + relativedelta(days=1)
+            settlement_run_type = record["Settlement_Run_Type"]
+            day[settlement_run_type] = record
 
-        if settlement_next_ct.month in (1, 4, 7, 10) and settlement_next_ct.day == 1:
-            yield quarter
-            quarter = {}
+    # Only return complate quarters
+    if len(quarters) > 0:
+        last_start = sorted(quarters.keys())[-1]
+        del quarters[last_start]
+    return quarters
 
 
 def import_reconciled_daily_levy_rates(sess, log, set_progress, s):
@@ -277,7 +266,7 @@ def import_reconciled_daily_levy_rates(sess, log, set_progress, s):
             sess, contract_name, "", {}, to_utc(ct_datetime(1996, 4, 1)), None, {}
         )
 
-    search_from = "1996-04-01"
+    search_from = to_utc(ct_datetime(1996, 4, 1))
     for rs in sess.scalars(
         select(RateScript)
         .where(RateScript.contract == contract)
@@ -305,12 +294,12 @@ def import_reconciled_daily_levy_rates(sess, log, set_progress, s):
             day_ct += relativedelta(days=1)
 
         if complete:
-            search_from = quarter_finish_ct.strftime("%Y-%m-%d")
+            search_from = to_utc(quarter_finish_ct)
         else:
             break
 
-    for quarter in _reconciled_daily_quarters(log, s, search_from):
-        quarter_start = sorted(quarter.keys())[0]
+    for quarter_start, quarter in _reconciled_quarters(log, s, search_from).items():
+
         rs = sess.execute(
             select(RateScript).where(
                 RateScript.contract == contract,

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-1724227131.0.0.dist-info → chellow-1724318422.0.0.dist-info}/METADATA

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

@@ -18,7 +18,7 @@ chellow/e/bill_importer.py,sha256=7UcnqNlKbJc2GhW9gy8sDp9GuqambJVpZLvbafOZztA,74
 chellow/e/bmarketidx.py,sha256=C0BaHn2RxIuWH2QzA-OmSP0fbUGvW9tqEUhLnzOEdmA,7968
 chellow/e/bsuos.py,sha256=hdP9vnOJSuZl46OAkJeUg1XJYvYIBj4J6Sqce1Hy9Vs,15542
 chellow/e/ccl.py,sha256=30dh_SvlgzsTQPPAJNZWILaMvbeDsv9-P-S1JxS5_SQ,3184
-chellow/e/cfd.py,sha256=RvJRLDLY-KvT299a8xF-HRmslPZczqTgJ9C1zBo55U8,14456
+chellow/e/cfd.py,sha256=Gm435c42LFwZx1n-1UY1Tdx6mL1is7E0vRLWQe8RPOo,14184
 chellow/e/computer.py,sha256=CoYf9SA8zrh1NP_S1jKsfXsaBm5kFcjBbtPUJnx8M9A,67274
 chellow/e/dno_rate_parser.py,sha256=A5TP6KjyfT5lVWh7dX4SiXRi6wnf2lGv-H_T4Sod8CI,21731
 chellow/e/duos.py,sha256=nwviRjz-qIt3GxIMHk0hItIT4dtKsxOWq9TUC1z-hO8,30864
@@ -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-1724227131.0.0.dist-info/METADATA,sha256=TIPwGvUhaCnJygHu9LSLR4zNNY0vJUJlaR2YX7C0gtk,12241
-chellow-1724227131.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1724227131.0.0.dist-info/RECORD,,
+chellow-1724318422.0.0.dist-info/METADATA,sha256=VR1bg4yGVprAuGnPp_bo8wwpmpcG_tOFHBcamuJ88jo,12241
+chellow-1724318422.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1724318422.0.0.dist-info/RECORD,,