chellow 1733390302.0.0__py3-none-any.whl → 1734005435.0.0__py3-none-any.whl

chellow/__init__.py

@@ -89,7 +89,6 @@ def create_app(testing=False, instance_path=None):
             props = configuration.make_properties()
             api_props = props.get("api", {})
             api.description = api_props.get("description", "Access Chellow data")
-            chellow.utils.url_root = props.get("url_root", "")
 
     chellow.dloads.startup(Path(app.instance_path), run_deleter=(not testing))
 

chellow/e/bill_parsers/mm.py

@@ -36,7 +36,16 @@ def _handle_0000(headers, pre_record, record):
 
 
 def _handle_0050(headers, pre_record, record):
-    pass
+    parts = _chop_record(
+        record,
+        issue_date=DATE_LENGTH,
+        unknown_1=12,
+        unknown_2=12,
+        unknown_3=12,
+        unknown_4=12,
+        late_payment=12,
+    )
+    headers["late_payment"] = Decimal(parts["late_payment"]) / Decimal(100)
 
 
 def _handle_0051(headers, pre_record, record):
@@ -45,8 +54,11 @@ def _handle_0051(headers, pre_record, record):
 
 def _handle_0100(headers, pre_record, record):
     issue_date = headers["issue_date"]
+    late_payment = headers.get("late_payment")
     headers.clear()
     headers["issue_date"] = issue_date
+    if late_payment is not None:
+        headers["late_payment"] = late_payment
     headers["account"] = pre_record[33:41]
     headers["reference"] = pre_record[41:46]
     headers["kwh"] = Decimal("0")
@@ -263,6 +275,16 @@ def _handle_1500(headers, pre_record, record):
         net=12,
         vat=12,
     )
+    breakdown = headers["breakdown"]
+    net = Decimal("0.00") + Decimal(parts["net"]) / Decimal("100")
+    gross = Decimal("0.00") + Decimal(parts["gross"]) / Decimal("100")
+    if "late_payment" in headers:
+        late_payment_gbp = headers["late_payment"]
+        net += late_payment_gbp
+        gross += late_payment_gbp
+        breakdown["late-payment-gbp"] += late_payment_gbp
+        del headers["late_payment"]
+
     return {
         "bill_type_code": "N",
         "mpan_core": headers["mpan_core"],
@@ -272,10 +294,10 @@ def _handle_1500(headers, pre_record, record):
         "start_date": headers["start_date"],
         "finish_date": headers["finish_date"],
         "kwh": headers["kwh"],
-        "net": Decimal("0.00") + Decimal(parts["net"]) / Decimal("100"),
+        "net": net,
         "vat": Decimal("0.00") + Decimal(parts["vat"]) / Decimal("100"),
-        "gross": Decimal("0.00") + Decimal(parts["gross"]) / Decimal("100"),
-        "breakdown": headers["breakdown"],
+        "gross": gross,
+        "breakdown": breakdown,
         "reads": headers["reads"],
     }
 
@@ -291,7 +313,7 @@ def _handle_1600(headers, pre_record, record):
     )
     late_payment_gbp = Decimal(parts["late_payment_fee"]) / Decimal(100)
 
-    headers["breakdown"]["late_payment_gbp"] += late_payment_gbp
+    headers["breakdown"]["late-payment-gbp"] += late_payment_gbp
 
 
 def _handle_1700(headers, pre_record, record):

chellow/e/computer.py

@@ -16,8 +16,6 @@ from werkzeug.exceptions import BadRequest
 
 from zish import dumps
 
-import chellow.bank_holidays
-import chellow.utils
 from chellow.models import (
     Bill,
     BillType,
@@ -218,11 +216,7 @@ def hh_rate(sess, caches, contract_id_or_name, date, market_role_code=None):
                     f"The market role code {market_role_code} isn't recognized."
                 )
 
-            vals = PropDict(
-                f"the rate script {chellow.utils.url_root}{seg}{rs.id} ",
-                loads(rs.script),
-                [],
-            )
+            vals = PropDict(f"the rate script {seg}{rs.id} ", loads(rs.script), [])
             for dt in hh_range(caches, cstart, cfinish):
                 if dt not in cont_cache:
                     cont_cache[dt] = vals

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
@@ -16,6 +17,7 @@ from flask import (
     flash,
     g,
     make_response,
+    redirect,
     render_template as rtemplate,
     request,
 )
@@ -105,14 +107,13 @@ from chellow.utils import (
     utc_datetime_now,
 )
 from chellow.views import (
-    chellow_redirect as credirect,
     hx_redirect as chx_redirect,
     requires_editor,
 )
 
 
 def chellow_redirect(path, code=None):
-    return credirect(f"/e{path}", code)
+    return redirect(f"/e{path}", code)
 
 
 def hx_redirect(path, code=None):
@@ -1421,9 +1422,7 @@ def dno_rate_script_edit_delete(dno_rate_script_id):
         dno = Party.get_dno_by_code(g.sess, contract.name, rate_script.start_date)
         contract.delete_rate_script(g.sess, rate_script)
         g.sess.commit()
-        res = make_response()
-        res.headers["HX-Redirect"] = f"{chellow.utils.url_root}/e/dnos/{dno.id}"
-        return res
+        return hx_redirect(f"/dnos/{dno.id}")
     except BadRequest as e:
         flash(e.description)
         return render_template(
@@ -4731,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)
@@ -6020,11 +6140,7 @@ def supply_note_edit_delete(supply_id, index):
         del supply_note["notes"][index]
         supply.note = dumps(supply_note)
         g.sess.commit()
-        res = make_response()
-        res.headers["HX-Redirect"] = (
-            f"{chellow.utils.url_root}/e/supplies/{supply_id}/notes"
-        )
-        return res
+        return hx_redirect(f"/supplies/{supply_id}/notes")
     except BadRequest as e:
         flash(e.description)
         supply_note = loads(supply.note)

chellow/gas/engine.py

@@ -13,7 +13,6 @@ from werkzeug.exceptions import BadRequest
 
 from zish import dumps, loads
 
-import chellow.bank_holidays
 from chellow.e.computer import hh_rate
 from chellow.models import (
     BillType,
@@ -323,8 +322,7 @@ def g_rates(sess, caches, g_contract_id_or_name, date, is_industry):
             prefix = "industry" if g_contract.is_industry else "supplier"
 
             vals = PropDict(
-                f"the rate script {chellow.utils.url_root}/g/{prefix}_rate_scripts/"
-                f"{rs.id} ",
+                f"the rate script /g/{prefix}_rate_scripts/{rs.id} ",
                 loads(rs.script),
                 [],
             )

chellow/gas/views.py

@@ -13,6 +13,7 @@ from flask import (
     flash,
     g,
     make_response,
+    redirect,
     render_template as rtemplate,
     request,
 )
@@ -60,11 +61,11 @@ from chellow.utils import (
     utc_datetime,
     utc_datetime_now,
 )
-from chellow.views import chellow_redirect as credirect, hx_redirect as chx_redirect
+from chellow.views import hx_redirect as chx_redirect
 
 
 def chellow_redirect(path, code=None):
-    return credirect(f"/g{path}", code)
+    return redirect(f"/g{path}", code)
 
 
 def hx_redirect(path, code=None):

chellow/reports/report_109.py

@@ -4,7 +4,7 @@ import threading
 import traceback
 from datetime import datetime as Datetime
 
-from flask import g
+from flask import g, redirect
 
 from sqlalchemy import or_, text
 from sqlalchemy.sql.expression import null
@@ -13,7 +13,6 @@ from chellow.dloads import open_file
 from chellow.e.computer import SiteSource, contract_func, displaced_era, forecast_date
 from chellow.models import Contract, Era, Session, Site, SiteEra, Source, Supply
 from chellow.utils import c_months_u, hh_format, hh_range, req_int
-from chellow.views import chellow_redirect
 
 
 def to_val(v):
@@ -274,4 +273,4 @@ def do_get(sess):
     contract_id = req_int("supplier_contract_id")
     args = contract_id, end_year, end_month, months, g.user
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_111.py

@@ -9,7 +9,7 @@ from itertools import combinations
 
 from dateutil.relativedelta import relativedelta
 
-from flask import g, request
+from flask import g, redirect, request
 
 from sqlalchemy import or_, select
 from sqlalchemy.orm import joinedload, subqueryload
@@ -49,7 +49,6 @@ from chellow.utils import (
     req_str,
     to_utc,
 )
-from chellow.views import chellow_redirect
 
 
 def add_gap(caches, gaps, elem, start_date, finish_date, is_virtual, gbp):
@@ -298,7 +297,7 @@ def do_post(sess):
         report_run.id,
     )
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect(f"/report_runs/{report_run.id}", 303)
+    return redirect(f"/report_runs/{report_run.id}", 303)
 
 
 def _process_supply(

chellow/reports/report_169.py

@@ -3,7 +3,7 @@ import threading
 import traceback
 from io import StringIO
 
-from flask import g, request
+from flask import g, redirect, request
 
 from sqlalchemy import or_, select
 from sqlalchemy.sql.expression import null
@@ -23,7 +23,6 @@ from chellow.utils import (
     to_ct,
     to_utc,
 )
-from chellow.views import chellow_redirect
 
 
 def _write_row(writer, titles, vals, total):
@@ -266,4 +265,4 @@ def handle_request(mpan_cores=None):
         user.id,
     )
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_181.py

@@ -2,7 +2,7 @@ import csv
 import threading
 import traceback
 
-from flask import g, request
+from flask import g, redirect, request
 
 from sqlalchemy import or_
 from sqlalchemy.sql.expression import null
@@ -23,7 +23,6 @@ from chellow.utils import (
     req_int,
     to_utc,
 )
-from chellow.views import chellow_redirect
 
 
 def _make_sites(sess, year_start, year_finish, site_id, source_codes):
@@ -169,4 +168,4 @@ 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.id)).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_183.py

@@ -4,7 +4,7 @@ import threading
 import traceback
 from io import StringIO
 
-from flask import g, request
+from flask import g, redirect, request
 
 from sqlalchemy import or_, select
 from sqlalchemy.orm import joinedload
@@ -22,7 +22,6 @@ from chellow.utils import (
     to_ct,
     to_utc,
 )
-from chellow.views import chellow_redirect
 
 
 def _write_row(writer, titles, vals, total):
@@ -241,7 +240,7 @@ def do_post(sess):
         file_name = f"sites_hh_data_{site_id}_{finish_date_str}.csv"
         args = site_id, start_date, finish_date, g.user.id, file_name
         threading.Thread(target=site_content, args=args).start()
-        return chellow_redirect("/downloads", 303)
+        return redirect("/downloads", 303)
     else:
         typ = req_str("type")
         site_codes_str = req_str("site_codes")
@@ -252,4 +251,4 @@ def do_post(sess):
         file_name = f"sites_hh_data_{finish_date_str}_filter.zip"
         args = site_codes, typ, start_date, finish_date, g.user.id, file_name
         threading.Thread(target=none_content, args=args).start()
-        return chellow_redirect("/downloads", 303)
+        return redirect("/downloads", 303)

chellow/reports/report_187.py

@@ -2,7 +2,7 @@ import threading
 import traceback
 from datetime import datetime as Datetime
 
-from flask import g, request
+from flask import g, redirect, request
 
 from sqlalchemy import null, or_, select, text, true
 
@@ -20,7 +20,6 @@ from chellow.utils import (
     req_str,
     to_ct,
 )
-from chellow.views import chellow_redirect
 
 
 def csv_str(row):
@@ -267,4 +266,4 @@ def do_post(sess):
     args = start_date, finish_date, supply_id, mpan_cores, is_zipped, g.user.id
 
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_219.py

@@ -2,7 +2,7 @@ import csv
 import threading
 import traceback
 
-from flask import g, request
+from flask import g, redirect, request
 
 from sqlalchemy import and_, or_, select
 from sqlalchemy.orm import joinedload
@@ -21,7 +21,6 @@ from chellow.models import (
     User,
 )
 from chellow.utils import c_months_u, csv_make_val, req_int
-from chellow.views import chellow_redirect
 
 
 def content(year, month, months, supply_id, user_id):
@@ -189,4 +188,4 @@ def do_get(sess):
     supply_id = req_int("supply_id") if "supply_id" in request.values else None
     args = year, month, months, supply_id, g.user.id
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_231.py

@@ -3,7 +3,7 @@ import sys
 import threading
 import traceback
 
-from flask import g
+from flask import g, redirect
 
 from sqlalchemy import or_
 from sqlalchemy.sql.expression import null
@@ -14,7 +14,6 @@ from chellow.dloads import open_file
 from chellow.e.computer import SupplySource, contract_func, forecast_date
 from chellow.models import Contract, Era, Session, User
 from chellow.utils import csv_make_val, hh_format, hh_max, hh_min, req_date, req_int
-from chellow.views import chellow_redirect
 
 
 def content(user_id, start_date, finish_date, contract_id):
@@ -134,4 +133,4 @@ def do_get(sess):
 
     args = g.user.id, start_date, finish_date, contract_id
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_233.py

@@ -5,7 +5,7 @@ import traceback
 
 from dateutil.relativedelta import relativedelta
 
-from flask import g
+from flask import g, redirect
 
 from sqlalchemy.orm import joinedload
 from sqlalchemy.sql.expression import false, select, true
@@ -30,7 +30,6 @@ from chellow.utils import (
     req_int_none,
     utc_datetime_now,
 )
-from chellow.views import chellow_redirect
 
 
 def content(contract_id, days_hidden, is_ignored, user_id):
@@ -148,4 +147,4 @@ def do_get(sess):
 
     args = contract_id, days_hidden, is_ignored, g.user.id
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_241.py

@@ -5,7 +5,7 @@ from datetime import datetime as Datetime
 
 from dateutil.relativedelta import relativedelta
 
-from flask import g
+from flask import g, redirect
 
 import pytz
 
@@ -17,7 +17,6 @@ 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
 
 
 def content(
@@ -164,4 +163,4 @@ def do_get(sess):
         g.user.id,
     )
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_247.py

@@ -6,7 +6,7 @@ from datetime import datetime as Datetime
 
 from dateutil.relativedelta import relativedelta
 
-from flask import flash, g, make_response, render_template, request
+from flask import flash, g, make_response, redirect, render_template, request
 
 import odio
 
@@ -48,7 +48,6 @@ from chellow.utils import (
     to_utc,
     utc_datetime_now,
 )
-from chellow.views import chellow_redirect
 
 
 CATEGORY_ORDER = {None: 0, "unmetered": 1, "nhh": 2, "amr": 3, "hh": 4}
@@ -1129,7 +1128,7 @@ def do_post(sess):
 
         args = (scenario_props, base_name, user.id, compression, now)
         threading.Thread(target=content, args=args).start()
-        return chellow_redirect("/downloads", 303)
+        return redirect("/downloads", 303)
     except BadRequest as e:
         flash(e.description)
         if "scenario_id" in request.values:

chellow/reports/report_29.py

@@ -3,12 +3,11 @@ import sys
 import threading
 import traceback
 
-from flask import g
+from flask import g, redirect
 
 from chellow.dloads import open_file
 from chellow.models import Session, Site, User
 from chellow.utils import c_months_u, csv_make_val, req_int, req_str, to_ct
-from chellow.views import chellow_redirect
 
 
 def _write_row(writer, total, values, titles):
@@ -78,4 +77,4 @@ def do_get(sess):
     site_id = req_int("site_id")
     args = start_date, finish_date, site_id, typ, g.user.id
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_291.py

@@ -2,7 +2,7 @@ import csv
 import threading
 import traceback
 
-from flask import g
+from flask import g, redirect
 
 from sqlalchemy import or_
 from sqlalchemy.sql.expression import null, true
@@ -23,7 +23,6 @@ from chellow.models import (
     User,
 )
 from chellow.utils import csv_make_val, hh_format, hh_max, hh_min, req_date, req_int
-from chellow.views import chellow_redirect
 
 
 def content(supply_id, start_date, finish_date, user_id):
@@ -209,4 +208,4 @@ def do_get(sess):
     args = supply_id, start_date, finish_date, g.user.id
 
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_33.py

@@ -5,7 +5,7 @@ import traceback
 
 from dateutil.relativedelta import relativedelta
 
-from flask import g, request
+from flask import g, redirect, request
 
 from sqlalchemy import or_, text
 from sqlalchemy.orm import joinedload
@@ -42,7 +42,6 @@ from chellow.utils import (
     req_int,
     req_str,
 )
-from chellow.views import chellow_redirect
 
 
 def content(user_id, date, supply_id, mpan_cores):
@@ -528,4 +527,4 @@ def do_get(session):
 
     args = user.id, date, supply_id, mpan_cores
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_387.py

@@ -3,7 +3,7 @@ import sys
 import threading
 import traceback
 
-from flask import g
+from flask import g, redirect
 
 from sqlalchemy import or_, select
 from sqlalchemy.sql.expression import null, true
@@ -18,7 +18,6 @@ from chellow.utils import (
     req_date,
     req_int,
 )
-from chellow.views import chellow_redirect
 
 
 def content(supply_id, start_date, finish_date, user):
@@ -162,4 +161,4 @@ def do_get(sess):
 
     args = supply_id, start_date, finish_date, g.user
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)