chellow 1730296955.0.0__py3-none-any.whl → 1731435800.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/bill_parsers/mm.py

@@ -94,7 +94,7 @@ ELEMENT_LOOKUP = {
     "30RS0123": "night",
     "90ANNUAL": "duos-fixed",
     "9QANNUAL": "duos-availability",
-    "9UANNUAL": "duos-excess-availability",
+    "9UANNUAL": "tnuos",
     "40ANNUAL": "maximum-demand",
     "20ANNUAL": "triad",
     "70ANNUAL": "elexon",

chellow/general_import.py

@@ -83,7 +83,8 @@ ALLOWED_ACTIONS = ("insert", "update", "delete")
 
 def general_import_era(sess, action, vals, args):
     if action == "update":
-        mpan_core = add_arg(args, "mpan_core", vals, 0)
+        mpan_core_str = add_arg(args, "mpan_core", vals, 0)
+        mpan_core = parse_mpan_core(mpan_core_str)
         supply = Supply.get_by_mpan_core(sess, mpan_core)
         date_str = add_arg(args, "date", vals, 1)
         dt = parse_hh_start(date_str)
@@ -150,11 +151,9 @@ def general_import_era(sess, action, vals, args):
 
         ssc_code = add_arg(args, "SSC", vals, 13)
         if ssc_code == NO_CHANGE:
-            ssc = era.ssc
+            ssc_code = era.ssc.code
         elif len(ssc_code) == 0:
-            ssc = None
-        else:
-            ssc = Ssc.get_by_code(sess, ssc_code)
+            ssc_code = None
 
         es_code = add_arg(args, "Energisation Status", vals, 14)
         if es_code == NO_CHANGE:
@@ -162,11 +161,11 @@ def general_import_era(sess, action, vals, args):
         else:
             es = EnergisationStatus.get_by_code(sess, es_code)
 
-        properties = add_arg(args, "Properties", vals, 15)
-        if properties == NO_CHANGE:
-            properties = loads(era.properties)
+        dtc_meter_type_code = add_arg(args, "DTC Meter Type", vals, 15)
+        if dtc_meter_type_code == NO_CHANGE:
+            dtc_meter_type = era.dtc_meter_type
         else:
-            properties = loads(properties)
+            dtc_meter_type = DtcMeterType.get_by_code(sess, dtc_meter_type_code)
 
         imp_mpan_core = add_arg(args, "Import MPAN Core", vals, 16)
         imp_llfc_code = None
@@ -266,9 +265,9 @@ def general_import_era(sess, action, vals, args):
             mtc_code,
             cop,
             comm,
-            ssc,
+            ssc_code,
             es,
-            properties,
+            dtc_meter_type,
             imp_mpan_core,
             imp_llfc_code,
             imp_supplier_contract,

{chellow-1730296955.0.0.dist-info → chellow-1731435800.0.0.dist-info}/METADATA

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

@@ -1,10 +1,10 @@
-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
 chellow/dloads.py,sha256=dixp-O0MF2_mlwrnKx3D9DH09Qu05BjTo0rZfigTjR4,5534
 chellow/edi_lib.py,sha256=alu20x9ZX06iPfnNI9dEJzuP6RIf4We3Y_M_bl7RrcY,51789
-chellow/general_import.py,sha256=l3EHq9zG9Vfl5Ee6XTVrC1nusXo4YGGB4VBmZ_JaJR8,65798
+chellow/general_import.py,sha256=Ia2Y40NEwqOYBHUwafJRcI34EO0WMX6FSBQJtGHeY0M,65874
 chellow/models.py,sha256=9LLROzS6gXZGICk0ITXhCyTtKaIY7HW4bMqWg4Mc-xw,244221
 chellow/national_grid.py,sha256=czwIZqzJndSGhEMQ5YzI6hRBhvjkM6VRVYXybf4_KXg,4377
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
@@ -58,7 +58,7 @@ chellow/e/bill_parsers/gdf_csv.py,sha256=ZfK3Oc6oP28p_P9DIevLNB_zW2WLcEJ3Lvb1gL3
 chellow/e/bill_parsers/haven_csv.py,sha256=0uENq8IgVNqdxfBQMBxLTSZWCOuDHXZC0xzk52SbfyE,13652
 chellow/e/bill_parsers/haven_edi.py,sha256=YGPHRxPOhje9s32jqPHHELni2tooOYj3cMC_qaZVPq4,16107
 chellow/e/bill_parsers/haven_edi_tprs.py,sha256=ZVX9CCqUybsot_Z0BEOJPvl9x5kSr7fEWyuJXvZDcz4,11841
-chellow/e/bill_parsers/mm.py,sha256=56_nfXNrt_ZZRwoHnj5xTi6Emh9I2wY4JJSaNxmwcCc,10038
+chellow/e/bill_parsers/mm.py,sha256=zeNF5F8uduQeEFjYOm5lfMS-DO3JjTB7oarA3H_Si5s,10019
 chellow/e/bill_parsers/nonsettlement_dc_stark_xlsx.py,sha256=yogXTuQHGRL7IiqvRWr2C9V24ez1j9Yx0128UygPE_k,4723
 chellow/e/bill_parsers/settlement_dc_stark_xlsx.py,sha256=PlEqCZuJ9DfQXeeYQ64jtf3ML7sUt_tt61QOOTnkE5c,6380
 chellow/e/bill_parsers/sse_edi.py,sha256=L85DOfNkqexeEIEr8pCBn_2sHJI-zEaw6cogpE3YyYM,15204
@@ -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-1730296955.0.0.dist-info/METADATA,sha256=EWZqlbrVtZnK0QYT9y6umoxEQNWbIAPMBYFWvnPr9WU,12204
-chellow-1730296955.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1730296955.0.0.dist-info/RECORD,,
+chellow-1731435800.0.0.dist-info/METADATA,sha256=ilPn6kcxryT74lMCin7HXAJqf48jbjfuyV1Y3qmf9dA,12204
+chellow-1731435800.0.0.dist-info/WHEEL,sha256=WJ9WQ4-pUYxfD_tEj5GvKSG9KSULNumqkTQdolV8mME,87
+chellow-1731435800.0.0.dist-info/RECORD,,

{chellow-1730296955.0.0.dist-info → chellow-1731435800.0.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.25.0
+Generator: hatchling 1.26.2
 Root-Is-Purelib: true
 Tag: py3-none-any