chellow 1730108364.0.0__py3-none-any.whl → 1730306906.0.0__py3-none-any.whl

chellow/__init__.py

@@ -74,7 +74,6 @@ def create_app(testing=False, instance_path=None):
     app.register_blueprint(chellow.views.home)
     app.register_blueprint(chellow.e.views.e)
     app.register_blueprint(chellow.gas.views.gas)
-    chellow.utils.root_path = app.root_path
 
     api = chellow.api.api
     api.init_app(app, endpoint="/api/v1")
@@ -90,6 +89,7 @@ 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))
 
@@ -116,20 +116,6 @@ def create_app(testing=False, instance_path=None):
         )
         print(msg)
 
-        try:
-            scheme = request.headers["X-Forwarded-Proto"]
-        except KeyError:
-            config_contract = Contract.get_non_core_by_name(g.sess, "configuration")
-            props = config_contract.make_properties()
-            scheme = props.get("redirect_scheme", "http")
-
-        try:
-            host = request.headers["X-Forwarded-Host"]
-        except KeyError:
-            host = request.host
-
-        chellow.utils.url_root = scheme + "://" + host
-
     @app.before_request
     def check_permissions(*args, **kwargs):
         g.user = None

chellow/e/tnuos.py

@@ -21,6 +21,7 @@ def hh(ds):
 BAND_LOOKUP = {
     "Domestic Aggregated (Related MPAN)": "Domestic",
     "Domestic Aggregated with Residual": "Domestic",
+    "Domestic Aggregated or CT with Residual": "Domestic",
     "HV Generation Site Specific": "HV1",
     "HV Generation Site Specific no RP charge": "HV1",
     "HV Site Specific Band 1": "HV1",
@@ -46,11 +47,21 @@ BAND_LOOKUP = {
     "LV Sub Site Specific No Residual": "LV1",
     "Non-Domestic Aggregated (related MPAN)": "LV_NoMIC_1",
     "Non-Domestic Aggregated Band 1": "LV_NoMIC_1",
+    "Non-Domestic Aggregated or CT Band 1": "LV_NoMIC_1",
     "Non-Domestic Aggregated Band 2": "LV_NoMIC_2",
+    "Non-Domestic Aggregated or CT Band 2": "LV_NoMIC_2",
     "Non-Domestic Aggregated Band 3": "LV_NoMIC_3",
+    "Non-Domestic Aggregated or CT Band 3": "LV_NoMIC_3",
     "Non-Domestic Aggregated Band 4": "LV_NoMIC_4",
+    "Non-Domestic Aggregated or CT Band 4": "LV_NoMIC_4",
     "Non-Domestic Aggregated No Residual": "LV_NoMIC_1",
+    "Non-Domestic Aggregated or CT No Residual": "LV_NoMIC_1",
     "Unmetered Supplies": "Unmetered",
+    "Designated EHV Site Specific No Residual": "EHV1",
+    "Designated EHV Site Specific Band 1": "EHV1",
+    "Designated EHV Site Specific Band 2": "EHV2",
+    "Designated EHV Site Specific Band 3": "EHV3",
+    "Designated EHV Site Specific Band 4": "EHV4",
     "Designated EHV0": "EHV1",
     "Designated EHV1": "EHV1",
     "Designated EHV2": "EHV2",

{chellow-1730108364.0.0.dist-info → chellow-1730306906.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1730108364.0.0
+Version: 1730306906.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)
@@ -22,7 +22,7 @@ Requires-Dist: python-dateutil==2.8.2
 Requires-Dist: pytz==2022.6
 Requires-Dist: requests==2.32.2
 Requires-Dist: sqlalchemy==2.0.30
-Requires-Dist: waitress==2.1.2
+Requires-Dist: waitress==3.0.1
 Requires-Dist: xlrd==2.0.1
 Requires-Dist: zish==0.1.11
 Description-Content-Type: text/markdown

{chellow-1730108364.0.0.dist-info → chellow-1730306906.0.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-chellow/__init__.py,sha256=hejB7bPYedSLGaDsHR0_g3UTF7gKfQkdE4zuzoB3A5A,10242
+chellow/__init__.py,sha256=ML9TeTCsCbEEjXLwe9BjeSe9WDj9VVgfdfW-D74oxVU,9785
 chellow/api.py,sha256=mk17TfweR76DPFC8lX2SArTjai6y6YshASxqO1w-_-s,11036
 chellow/bank_holidays.py,sha256=T_utYMwe_g1dz5X-aOTdIPryg49SvB7QsWM1yphlqG8,4423
 chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
@@ -41,7 +41,7 @@ chellow/e/ro.py,sha256=dZKZv_9wXSWuwcb3jiKavoD_9ot-PZseNVeEEe0siLo,596
 chellow/e/scenario.py,sha256=FLgh03r_SgXx0hMWFbAvwsz2ScDL8LUwYWSWVv2rQlg,24973
 chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,6232
 chellow/e/tlms.py,sha256=M33D6YpMixu2KkwSCzDRM3kThLgShg8exp63Obo75l8,8905
-chellow/e/tnuos.py,sha256=XseYztPUsQXNKuBmystO2kzzwAG9ehCZgpGBTdgSk-A,4313
+chellow/e/tnuos.py,sha256=NBmc-f3oezrl4gviAKobljHfICTpBKxxxEGBGJi_lRk,4927
 chellow/e/triad.py,sha256=lIQj7EdUrcFwEqleuHZXYU_bfzIwNOqUVVxB3NPQt4A,13710
 chellow/e/views.py,sha256=ZISAhDQZHM8j0VKdMOqfNBtwSLTE9c0OtnsGVCaT0kE,216706
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -377,6 +377,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-1730108364.0.0.dist-info/METADATA,sha256=6ueLHfA97aZWoR9h-N2AWXKzNQX_ENNk-7ola2Jke30,12204
-chellow-1730108364.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1730108364.0.0.dist-info/RECORD,,
+chellow-1730306906.0.0.dist-info/METADATA,sha256=bhdp0UZlh1JYunlv3N7oBw4ggmLxl4bplW2oO7ftQlM,12204
+chellow-1730306906.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1730306906.0.0.dist-info/RECORD,,