chellow 1733501869.0.0__tar.gz → 1734005435.0.0__tar.gz

{chellow-1733501869.0.0 → chellow-1734005435.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1733501869.0.0
+Version: 1734005435.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-1734005435.0.0/VERSION

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

{chellow-1733501869.0.0 → chellow-1734005435.0.0}/chellow/e/views.py

@@ -3,6 +3,7 @@ import os
 import threading
 from collections import defaultdict
 from datetime import datetime as Datetime
+from decimal import Decimal
 from io import BytesIO, StringIO
 from itertools import chain, islice
 from random import random
@@ -4729,6 +4730,127 @@ def site_add_e_supply_post(site_id):
         )
 
 
+@e.route("/sites/<int:site_id>/hh_data")
+def site_hh_data_get(site_id):
+    caches = {}
+    site = Site.get_by_id(g.sess, site_id)
+
+    start_year = req_int("start_year")
+    start_month = req_int("start_month")
+    start_date, finish_date = next(
+        c_months_u(start_year=start_year, start_month=start_month, months=1)
+    )
+
+    supplies = (
+        g.sess.query(Supply)
+        .join(Era)
+        .join(SiteEra)
+        .join(Source)
+        .filter(
+            SiteEra.site == site,
+            SiteEra.is_physical == true(),
+            Era.start_date <= finish_date,
+            or_(Era.finish_date == null(), Era.finish_date >= start_date),
+            Source.code != "sub",
+        )
+        .order_by(Supply.id)
+        .distinct()
+        .options(joinedload(Supply.source), joinedload(Supply.generator_type))
+        .all()
+    )
+
+    data = iter(
+        g.sess.query(HhDatum)
+        .join(Channel)
+        .join(Era)
+        .filter(
+            Channel.channel_type == "ACTIVE",
+            Era.supply_id.in_([s.id for s in supplies]),
+            HhDatum.start_date >= start_date,
+            HhDatum.start_date <= finish_date,
+        )
+        .order_by(HhDatum.start_date, Era.supply_id)
+        .options(
+            joinedload(HhDatum.channel)
+            .joinedload(Channel.era)
+            .joinedload(Era.supply)
+            .joinedload(Supply.source)
+        )
+    )
+    datum = next(data, None)
+
+    hh_data = []
+    for hh_date in hh_range(caches, start_date, finish_date):
+        sups = []
+        hh_dict = {
+            "start_date": hh_date,
+            "supplies": sups,
+            "export_kwh": Decimal(0),
+            "import_kwh": Decimal(0),
+            "parasitic_kwh": Decimal(0),
+            "generated_kwh": Decimal(0),
+            "third_party_import_kwh": Decimal(0),
+            "third_party_export_kwh": Decimal(0),
+        }
+        hh_data.append(hh_dict)
+        for supply in supplies:
+            sup_hh = {}
+            sups.append(sup_hh)
+            while (
+                datum is not None
+                and datum.start_date == hh_date
+                and datum.channel.era.supply_id == supply.id
+            ):
+                channel = datum.channel
+                imp_related = channel.imp_related
+                source_code = channel.era.supply.source.code
+
+                prefix = "import_" if imp_related else "export_"
+                sup_hh[f"{prefix}kwh"] = datum.value
+                sup_hh[f"{prefix}status"] = datum.status
+
+                if not imp_related and source_code in ("grid", "gen-grid"):
+                    hh_dict["export_kwh"] += datum.value
+                if imp_related and source_code in ("grid", "gen-grid"):
+                    hh_dict["import_kwh"] += datum.value
+                if (imp_related and source_code == "gen") or (
+                    not imp_related and source_code == "gen-grid"
+                ):
+                    hh_dict["generated_kwh"] += datum.value
+                if (not imp_related and source_code == "gen") or (
+                    imp_related and source_code == "gen-grid"
+                ):
+                    hh_dict["parasitic_kwh"] += datum.value
+                if (imp_related and source_code == "3rd-party") or (
+                    not imp_related and source_code == "3rd-party-reverse"
+                ):
+                    hh_dict["third_party_import_kwh"] += datum.value
+                if (not imp_related and source_code == "3rd-party") or (
+                    imp_related and source_code == "3rd-party-reverse"
+                ):
+                    hh_dict["third_party_export_kwh"] += datum.value
+                datum = next(data, None)
+
+        hh_dict["displaced_kwh"] = (
+            hh_dict["generated_kwh"] - hh_dict["export_kwh"] - hh_dict["parasitic_kwh"]
+        )
+        hh_dict["used_kwh"] = sum(
+            (
+                hh_dict["import_kwh"],
+                hh_dict["displaced_kwh"],
+                hh_dict["third_party_import_kwh"] - hh_dict["third_party_export_kwh"],
+            )
+        )
+
+    return render_template(
+        "site_hh_data.html",
+        site=site,
+        supplies=supplies,
+        hh_data=hh_data,
+        start_date=start_date,
+    )
+
+
 @e.route("/sources")
 def sources_get():
     sources = g.sess.query(Source).order_by(Source.code)

{chellow-1733501869.0.0/chellow/templates → chellow-1734005435.0.0/chellow/templates/e}/site_hh_data.html

@@ -22,12 +22,13 @@
 {% endblock %}
 
 {% block content %}
-	<form>
+	<form action="/e/sites/{{site.id}}/hh_data">
 		<fieldset>						
-			<label>Month</label> {{input_date(resolution='month')}}
+			<label>Month</label> {{input_date(prefix='start', initial=start_date, resolution='month')}}
 			<input type="submit" value="Show">
 		</fieldset>
 	</form>
+
 	<table class="sticky">
 		<caption>HH Data</caption>
 		<thead>

{chellow-1733501869.0.0 → chellow-1734005435.0.0}/chellow/templates/site.html

@@ -161,7 +161,7 @@
 Table of site level monthly kWh, MD kWh etc.</a>
 		</li>
 		<li>
-			<a href="/sites/{{site.id}}/hh_data?year={{month_finish.year}}&amp;month={{month_finish.month}}">Table of hh data</a>
+			<a href="/e/sites/{{site.id}}/hh_data?start_year={{month_finish.year}}&amp;start_month={{month_finish.month}}">Table of hh data</a>
 		</li>
 		<li>
 			<a href="/e/sites/{{site.id}}/site_snags">Site Snags</a>

{chellow-1733501869.0.0 → chellow-1734005435.0.0}/chellow/views.py

@@ -10,7 +10,6 @@ import traceback
 import types
 from collections import OrderedDict
 from datetime import datetime as Datetime
-from decimal import Decimal
 from functools import wraps
 from importlib import import_module
 from io import DEFAULT_BUFFER_SIZE, StringIO
@@ -50,7 +49,6 @@ from sqlalchemy import (
     true,
 )
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import joinedload
 from sqlalchemy.orm.attributes import flag_modified
 
 from werkzeug.exceptions import BadRequest, Forbidden
@@ -1155,123 +1153,6 @@ def report_post(report_id):
     return report_module.do_post(g.sess)
 
 
-@home.route("/sites/<int:site_id>/hh_data")
-def site_hh_data_get(site_id):
-    caches = {}
-    site = Site.get_by_id(g.sess, site_id)
-
-    year = req_int("year")
-    month = req_int("month")
-    start_date, finish_date = next(
-        c_months_u(start_year=year, start_month=month, months=1)
-    )
-
-    supplies = (
-        g.sess.query(Supply)
-        .join(Era)
-        .join(SiteEra)
-        .join(Source)
-        .filter(
-            SiteEra.site == site,
-            SiteEra.is_physical == true(),
-            Era.start_date <= finish_date,
-            or_(Era.finish_date == null(), Era.finish_date >= start_date),
-            Source.code != "sub",
-        )
-        .order_by(Supply.id)
-        .distinct()
-        .options(joinedload(Supply.source), joinedload(Supply.generator_type))
-        .all()
-    )
-
-    data = iter(
-        g.sess.query(HhDatum)
-        .join(Channel)
-        .join(Era)
-        .filter(
-            Channel.channel_type == "ACTIVE",
-            Era.supply_id.in_([s.id for s in supplies]),
-            HhDatum.start_date >= start_date,
-            HhDatum.start_date <= finish_date,
-        )
-        .order_by(HhDatum.start_date, Era.supply_id)
-        .options(
-            joinedload(HhDatum.channel)
-            .joinedload(Channel.era)
-            .joinedload(Era.supply)
-            .joinedload(Supply.source)
-        )
-    )
-    datum = next(data, None)
-
-    hh_data = []
-    for hh_date in hh_range(caches, start_date, finish_date):
-        sups = []
-        hh_dict = {
-            "start_date": hh_date,
-            "supplies": sups,
-            "export_kwh": Decimal(0),
-            "import_kwh": Decimal(0),
-            "parasitic_kwh": Decimal(0),
-            "generated_kwh": Decimal(0),
-            "third_party_import_kwh": Decimal(0),
-            "third_party_export_kwh": Decimal(0),
-        }
-        hh_data.append(hh_dict)
-        for supply in supplies:
-            sup_hh = {}
-            sups.append(sup_hh)
-            while (
-                datum is not None
-                and datum.start_date == hh_date
-                and datum.channel.era.supply_id == supply.id
-            ):
-                channel = datum.channel
-                imp_related = channel.imp_related
-                source_code = channel.era.supply.source.code
-
-                prefix = "import_" if imp_related else "export_"
-                sup_hh[f"{prefix}kwh"] = datum.value
-                sup_hh[f"{prefix}status"] = datum.status
-
-                if not imp_related and source_code in ("grid", "gen-grid"):
-                    hh_dict["export_kwh"] += datum.value
-                if imp_related and source_code in ("grid", "gen-grid"):
-                    hh_dict["import_kwh"] += datum.value
-                if (imp_related and source_code == "gen") or (
-                    not imp_related and source_code == "gen-grid"
-                ):
-                    hh_dict["generated_kwh"] += datum.value
-                if (not imp_related and source_code == "gen") or (
-                    imp_related and source_code == "gen-grid"
-                ):
-                    hh_dict["parasitic_kwh"] += datum.value
-                if (imp_related and source_code == "3rd-party") or (
-                    not imp_related and source_code == "3rd-party-reverse"
-                ):
-                    hh_dict["third_party_import_kwh"] += datum.value
-                if (not imp_related and source_code == "3rd-party") or (
-                    imp_related and source_code == "3rd-party-reverse"
-                ):
-                    hh_dict["third_party_export_kwh"] += datum.value
-                datum = next(data, None)
-
-        hh_dict["displaced_kwh"] = (
-            hh_dict["generated_kwh"] - hh_dict["export_kwh"] - hh_dict["parasitic_kwh"]
-        )
-        hh_dict["used_kwh"] = sum(
-            (
-                hh_dict["import_kwh"],
-                hh_dict["displaced_kwh"],
-                hh_dict["third_party_import_kwh"] - hh_dict["third_party_export_kwh"],
-            )
-        )
-
-    return render_template(
-        "site_hh_data.html", site=site, supplies=supplies, hh_data=hh_data
-    )
-
-
 @home.route("/sites/<int:site_id>")
 def site_get(site_id):
     configuration_contract = Contract.get_non_core_by_name(g.sess, "configuration")

{chellow-1733501869.0.0 → chellow-1734005435.0.0}/test/e/test_e_views.py

@@ -3059,6 +3059,23 @@ def test_site_add_e_supply_post_fail(client, sess):
     match(response, 400)
 
 
+def test_site_hh_data(sess, client):
+    site = Site.insert(sess, "CI017", "Water Works")
+    sess.commit()
+
+    query_string = {
+        "start_year": "2022",
+        "start_month": "3",
+    }
+    response = client.get(f"/e/sites/{site.id}/hh_data", query_string=query_string)
+
+    patterns = [
+        r'<input type="hidden" name="start_year" value="2022">',
+        r'<input type="hidden" name="start_month" value="3">',
+    ]
+    match(response, 200, *patterns)
+
+
 def test_supplier_batches_get(sess, client):
     vf = to_utc(ct_datetime(1996, 1, 1))
     participant = Participant.insert(sess, "hhak", "AK Industries")

{chellow-1733501869.0.0 → chellow-1734005435.0.0}/test/test_views.py

@@ -462,19 +462,6 @@ def test_site_get_dumb(client, sess):
     match(response, 200, *patterns)
 
 
-def test_site_hh_data(sess, client):
-    site = Site.insert(sess, "CI017", "Water Works")
-    sess.commit()
-
-    query_string = {
-        "year": "2022",
-        "month": "3",
-    }
-    response = client.get(f"/sites/{site.id}/hh_data", query_string=query_string)
-
-    match(response, 200)
-
-
 def test_supplies_get_e(sess, client):
     valid_from = to_utc(ct_datetime(1996, 1, 1))
     site = Site.insert(sess, "CI017", "Water Works")

chellow-1733501869.0.0/VERSION

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

chellow-1733501869.0.0/chellow/templates/e/site_hh_data.html

@@ -1,52 +0,0 @@
-<form>
-	<fieldset>						
-		<label>Site Code </label>
-		{{input_text('site_code', site.code)}}
-		<label>Month</label>
-		{{input_date(None, None, 'month')}}
-		<input type="submit" value="Show">
-	</fieldset>
-</form>
-<table class="sticky">
-	<caption>HH Data</caption>
-	<thead>
-		<tr>
-			<th>HH Starting</th>
-			<th>Imported kWh</th>
-			<th>Used kWh</th>
-			<th>Displaced kWh</th>
-			<th>Generated kWh</th>
-			<th>Exported kWh</th>
-			<th>Parasitic kWh</th>
-			{% for supply in supplies %}
-				{% set pref = supply.name + ' '+ supply.source.code +
-				(' ' + supply.generator_type.code if
-				supply.generator_type != None else '') %}
-				<th style="border-left-width: medium;">{{pref}} Imp kWh</th>
-				<th>{{pref}} Imp Status</th>
-				<th>{{pref}} Exp kWh</th>
-				<th>{{pref}} Exp Status</th>
-			{% endfor %}
-		</tr>
-	</thead>
-	<tbody>
-		{% for hh in hh_data %}
-			<tr>
-				<td style="white-space: nowrap">{{hh.start_date|hh_format}}</td>
-				<td>{{hh.import_kwh}}</td>
-				<td>{{hh.used_kwh}}</td>
-				<td>{{hh.displaced_kwh}}</td>
-				<td>{{hh.generated_kwh}}</td>
-				<td>{{hh.export_kwh}}</td>
-				<td>{{hh.parasitic_kwh}}</td>
-				{% for datum in hh.supplies %}
-					<td style="border-left-width: medium;"
-						>{{datum.import_kwh}}</td>
-					<td>{{datum.import_status}}</td>
-					<td>{{datum.export_kwh}}</td>
-					<td>{{datum.export_status}}</td>
-				{% endfor %}
-			</tr>
-		{% endfor %}
-	</tbody>
-</table>