chellow 1730296955.0.0__tar.gz → 1731435800.0.0__tar.gz

{chellow-1730296955.0.0 → chellow-1731435800.0.0}/.github/workflows/chellow.yml

@@ -54,7 +54,7 @@ jobs:
           echo "__version__ = \"$(date +%s).0.0\"" > VERSION
           python -m build 
       - name: Publish distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: pypa/gh-action-pypi-publish@release/v1.11
 
   deploy_test:
     runs-on: ubuntu-latest
@@ -74,6 +74,6 @@ jobs:
           echo "__version__ = \"$(date +%s).0.0\"" > VERSION
           python -m build 
       - name: Publish distribution to Test PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: pypa/gh-action-pypi-publish@release/v1.11
         with:
           repository-url: https://test.pypi.org/legacy/

{chellow-1730296955.0.0 → chellow-1731435800.0.0}/PKG-INFO

@@ -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-1731435800.0.0/VERSION

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

{chellow-1730296955.0.0 → chellow-1731435800.0.0}/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-1730296955.0.0 → chellow-1731435800.0.0}/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-1730296955.0.0 → chellow-1731435800.0.0}/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 → chellow-1731435800.0.0}/test/gas/test_gas_views.py

@@ -1013,7 +1013,7 @@ def test_supply_edit_post(client, sess):
     }
 
     response = client.post(f"/g/supplies/{g_supply.id}/edit", data=data)
-    assert response.headers["Location"] == f"http://localhost/g/supplies/{g_supply.id}"
+    assert response.headers["Location"] == f"/g/supplies/{g_supply.id}"
 
     match(response, 303)
 

{chellow-1730296955.0.0 → chellow-1731435800.0.0}/test/test_general_import.py

@@ -768,26 +768,113 @@ def test_general_import_era_insert_nhh(sess):
     general_import_era(sess, action, vals, args)
 
 
-def test_general_import_era_update(mocker):
-    MockSupply = mocker.patch("chellow.general_import.Supply", autospec=True)
-
-    mock_supply = mocker.Mock()
-
-    MockSupply.get_by_mpan_core.return_value = mock_supply
-
-    mock_era = mocker.Mock()
-    mock_era.properties = "{}"
-
-    mock_supply.find_era_at.return_value = mock_era
+def test_general_import_era_update(sess):
+    vf = to_utc(ct_datetime(1996, 1, 1))
+    site = Site.insert(sess, "CI017", "Water Works")
+    market_role_Z = MarketRole.insert(sess, "Z", "Non-core")
+    participant = Participant.insert(sess, "CALB", "AK Industries")
+    participant.insert_party(sess, market_role_Z, "None core", vf, None, None)
+    market_role_X = MarketRole.insert(sess, "X", "Supplier")
+    market_role_M = MarketRole.insert(sess, "M", "Mop")
+    market_role_C = MarketRole.insert(sess, "C", "HH Dc")
+    market_role_R = MarketRole.insert(sess, "R", "Distributor")
+    participant.insert_party(sess, market_role_M, "Fusion Mop Ltd", vf, None, None)
+    participant.insert_party(sess, market_role_X, "Fusion Ltc", vf, None, None)
+    participant.insert_party(sess, market_role_C, "Fusion DC", vf, None, None)
+    mop_contract = Contract.insert_mop(
+        sess, "Fusion", participant, "", {}, vf, None, {}
+    )
+    dc_contract = Contract.insert_dc(
+        sess, "Fusion DC 2000", participant, "", {}, vf, None, {}
+    )
+    pc = Pc.insert(sess, "01", "nhh", vf, None)
+    insert_cops(sess)
+    cop = Cop.get_by_code(sess, "5")
+    insert_comms(sess)
+    comm = Comm.get_by_code(sess, "GSM")
+    exp_supplier_contract = Contract.insert_supplier(
+        sess, "Fusion Supplier 2000", participant, "", {}, vf, None, {}
+    )
+    dno = participant.insert_party(sess, market_role_R, "WPD", vf, None, "22")
+    meter_type = MeterType.insert(sess, "C5", "COP 1-5", vf, None)
+    meter_payment_type = MeterPaymentType.insert(sess, "CR", "Credit", vf, None)
+    mtc = Mtc.insert(sess, "845", False, True, vf, None)
+    mtc_participant = MtcParticipant.insert(
+        sess,
+        mtc,
+        participant,
+        "HH COP5 And Above With Comms",
+        False,
+        True,
+        meter_type,
+        meter_payment_type,
+        0,
+        vf,
+        None,
+    )
+    insert_voltage_levels(sess)
+    voltage_level = VoltageLevel.get_by_code(sess, "HV")
+    llfc = dno.insert_llfc(
+        sess, "521", "Export (HV)", voltage_level, False, False, vf, None
+    )
+    MtcLlfc.insert(sess, mtc_participant, llfc, vf, None)
+    ssc_code = "0393"
+    ssc = Ssc.insert(sess, ssc_code, "All", True, vf, None)
 
-    sess = mocker.Mock()
+    mtc_ssc = MtcSsc.insert(sess, mtc_participant, ssc, vf, None)
+    mtc_llfc_ssc = MtcLlfcSsc.insert(sess, mtc_ssc, llfc, vf, None)
+    MtcLlfcSscPc.insert(sess, mtc_llfc_ssc, pc, vf, None)
+    insert_sources(sess)
+    source = Source.get_by_code(sess, "grid")
+    insert_energisation_statuses(sess)
+    energisation_status = EnergisationStatus.get_by_code(sess, "E")
+    gsp_group = GspGroup.insert(sess, "_L", "South Western")
+    insert_dtc_meter_types(sess)
+    dtc_meter_type = DtcMeterType.get_by_code(sess, "H")
+    site.insert_e_supply(
+        sess,
+        source,
+        None,
+        "Bob",
+        utc_datetime(2000, 1, 1),
+        None,
+        gsp_group,
+        mop_contract,
+        "773",
+        dc_contract,
+        "ghyy3",
+        "hgjeyhuw",
+        dno,
+        pc,
+        "845",
+        cop,
+        comm,
+        ssc_code,
+        energisation_status,
+        dtc_meter_type,
+        None,
+        None,
+        None,
+        None,
+        None,
+        "22 7867 6232 781",
+        "521",
+        exp_supplier_contract,
+        "7748",
+        361,
+    )
     action = "update"
     vals = [
-        "CH4U",
+        "2278676232781",
         "2019-09-08 00:00",
         "{no change}",
         "{no change}",
-        "A Mop Contract",
+        "Fusion",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
         "{no change}",
         "{no change}",
         "{no change}",

chellow-1730296955.0.0/VERSION

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