chellow 1722367388.0.0__py3-none-any.whl → 1723449410.0.0__py3-none-any.whl

chellow/views.py

@@ -1110,16 +1110,16 @@ def site_hh_data_get(site_id):
                 sup_hh[f"{prefix}kwh"] = datum.value
                 sup_hh[f"{prefix}status"] = datum.status
 
-                if not imp_related and source_code in ("net", "gen-net"):
+                if not imp_related and source_code in ("grid", "gen-grid"):
                     hh_dict["export_kwh"] += datum.value
-                if imp_related and source_code in ("net", "gen-net"):
+                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-net"
+                    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-net"
+                    imp_related and source_code == "gen-grid"
                 ):
                     hh_dict["parasitic_kwh"] += datum.value
                 if (imp_related and source_code == "3rd-party") or (
@@ -1609,7 +1609,7 @@ def site_used_graph_get(site_id):
         .join(Era)
         .join(Source)
         .join(SiteEra)
-        .filter(SiteEra.site == site, not_(Source.code.in_(("sub", "gen-net"))))
+        .filter(SiteEra.site == site, not_(Source.code.in_(("sub", "gen-grid"))))
         .distinct()
         .all()
     )
@@ -1774,9 +1774,9 @@ def site_months_get(site_id):
     site = Site.get_by_id(g.sess, site_id)
 
     typs = (
-        "imp_net",
+        "imp_grid",
         "imp_3p",
-        "exp_net",
+        "exp_grid",
         "exp_3p",
         "used",
         "displaced",
@@ -2263,16 +2263,16 @@ def site_gen_graph_get(site_id):
                 is_complete = False
 
             to_adds = []
-            if imp_related and source_code in ("net", "gen-net"):
+            if imp_related and source_code in ("grid", "gen-grid"):
                 to_adds.append(("imp", "pos"))
-            if not imp_related and source_code in ("net", "gen-net"):
+            if not imp_related and source_code in ("grid", "gen-grid"):
                 to_adds.append(("exp", "pos"))
             if (imp_related and source_code == "gen") or (
-                not imp_related and source_code == "gen-net"
+                not imp_related and source_code == "gen-grid"
             ):
                 to_adds.append(("gen", "pos"))
             if (not imp_related and source_code == "gen") or (
-                imp_related and source_code == "gen-net"
+                imp_related and source_code == "gen-grid"
             ):
                 to_adds.append(("gen", "neg"))
             if (imp_related and source_code == "3rd-party") or (

{chellow-1722367388.0.0.dist-info → chellow-1723449410.0.0.dist-info}/METADATA

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

@@ -5,13 +5,13 @@ chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=5SmP-0QPK6xCkd_wjIWh_8FAzN5OxNHCzyEQ1Xb-Y-M,5256
 chellow/edi_lib.py,sha256=alu20x9ZX06iPfnNI9dEJzuP6RIf4We3Y_M_bl7RrcY,51789
 chellow/general_import.py,sha256=l3EHq9zG9Vfl5Ee6XTVrC1nusXo4YGGB4VBmZ_JaJR8,65798
-chellow/models.py,sha256=7fCVyf9aCDb9natETLHzC2XIQkYxJhyLQhOQsTMWjFI,243147
+chellow/models.py,sha256=rQLMIpGqFQk0fm7SQsAJbb51j3OM55e-4-MVfh0mBAc,243511
 chellow/national_grid.py,sha256=czwIZqzJndSGhEMQ5YzI6hRBhvjkM6VRVYXybf4_KXg,4377
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 chellow/rate_server.py,sha256=fg-Pf_9Hk3bXmC9riPQNGQxBvLvBa_WtNYdwDCjnCSg,5678
 chellow/testing.py,sha256=Od4HHH6pZrhJ_De118_F55RJEKmAvhUH2S24QE9qFQk,3635
 chellow/utils.py,sha256=32qPWEGzCPKPhSM7ztpzcR6ZG74sVZanScDIdK50Rq4,19308
-chellow/views.py,sha256=s_pKNpBkiegxevAWEjowJKAtUPXpowOTbXI5473em4Y,79597
+chellow/views.py,sha256=nlX0JjJGTU8ydVFUK1d_oeexszOL3HIjZGouMRVg4Yc,79612
 chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/aahedc.py,sha256=d2usudp7KYWpU6Pk3fal5EQ47EbvkvKeaFGylnb3NWw,606
 chellow/e/bill_importer.py,sha256=7UcnqNlKbJc2GhW9gy8sDp9GuqambJVpZLvbafOZztA,7411
@@ -19,7 +19,7 @@ chellow/e/bmarketidx.py,sha256=C0BaHn2RxIuWH2QzA-OmSP0fbUGvW9tqEUhLnzOEdmA,7968
 chellow/e/bsuos.py,sha256=hdP9vnOJSuZl46OAkJeUg1XJYvYIBj4J6Sqce1Hy9Vs,15542
 chellow/e/ccl.py,sha256=30dh_SvlgzsTQPPAJNZWILaMvbeDsv9-P-S1JxS5_SQ,3184
 chellow/e/cfd.py,sha256=RvJRLDLY-KvT299a8xF-HRmslPZczqTgJ9C1zBo55U8,14456
-chellow/e/computer.py,sha256=KjHE57I3I7-1zPkyqX0mSjORlyUNfSEhQb2df4sCNkU,67244
+chellow/e/computer.py,sha256=CoYf9SA8zrh1NP_S1jKsfXsaBm5kFcjBbtPUJnx8M9A,67274
 chellow/e/dno_rate_parser.py,sha256=9A3SEBUQnnjx2Tw3CpA2q0KsJ-Pjgmt_mbADkEtsIzc,21497
 chellow/e/duos.py,sha256=nwviRjz-qIt3GxIMHk0hItIT4dtKsxOWq9TUC1z-hO8,30864
 chellow/e/elexon.py,sha256=ALhXS9Es7PV0z9ukPbIramn3cf3iLyFi-PMWPSm5iOs,5487
@@ -33,17 +33,18 @@ chellow/e/lcc.py,sha256=OkpynN8_iAdHRlu-yyU6BhRUqYYOZsUnl0HbHULYo_4,4670
 chellow/e/mdd_importer.py,sha256=n9YMR1XD8Wm_5vHo-pydpoLJKRhUds_TcqELGxujcvg,32184
 chellow/e/rcrc.py,sha256=92CA1uIotIHd1epQ_jEPdJKzXqDFV-AoJOJeRO6MEyA,4274
 chellow/e/ro.py,sha256=dZKZv_9wXSWuwcb3jiKavoD_9ot-PZseNVeEEe0siLo,596
-chellow/e/scenario.py,sha256=1tUxnvwTzr6cKqiw2wphdv5XDzV6JO6UVYkyQa67vHs,23263
+chellow/e/scenario.py,sha256=fBDZVOdrI1I3XQG-RdpB0-lDF9VYENBu_9bBXJxmvWk,23362
 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/triad.py,sha256=lIQj7EdUrcFwEqleuHZXYU_bfzIwNOqUVVxB3NPQt4A,13710
-chellow/e/views.py,sha256=l2G7IZiCi3krcTokE18DAJGQvAXiZQHKwAdpdCiNxso,215060
+chellow/e/views.py,sha256=y8k961thtfmmTsWkt1CJXq-BhojQFXWPKsB_WruNrb0,215070
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=UgWXDPzQkQghyj_lfgBqoSJpHB-t-qOdSaB8qY6GLog,4071
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=-HMoIfa_utXYKA44RuC0Xqv3vd2HLeQU_4P0iBUd3WA,4219
 chellow/e/bill_parsers/bgb_edi.py,sha256=GuwHeYbAGk7BVg5n19FcTANFDyKI-y0z3f9niQaPSSw,4828
 chellow/e/bill_parsers/csv.py,sha256=U5zcIaZ6B5QTTpFDAcBnk4G2r8B3j5kJhDPL4AJNkEk,5640
+chellow/e/bill_parsers/edf_export_xlsx.py,sha256=t-M9-dGNWXu3VDI1DbS5Ez1oHW33oopJryNgMTvTjys,6307
 chellow/e/bill_parsers/engie_edi.py,sha256=CTobTskDjzdcqqf_qk2ukDSaTLrVpGZMM0sYlwehog4,14985
 chellow/e/bill_parsers/engie_xls.py,sha256=jrut2heH_ZWmSjcn7celOydZS9Y49GfpYjDk_EKwamI,14453
 chellow/e/bill_parsers/engie_xlsx.py,sha256=4Hu3ls1uNMH7vjDHgcP6QARlGlvb616CqG3xZVjAKWo,16888
@@ -67,7 +68,7 @@ chellow/gas/engine.py,sha256=jT7m6vddi5GnWd51wCYEVhBS-LZEn1T9ggZX7Y9HGK0,25263
 chellow/gas/transportation.py,sha256=Bkg8TWOs-v0ES-4qqwbleiOhqbE_t2KauUx9JYMZELM,5300
 chellow/gas/views.py,sha256=N_vj5A3ia0FmLm2M18bcZQTGpVQXd7oHrIiFXa44aLo,57511
 chellow/reports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-chellow/reports/report_109.py,sha256=S8fsOwh-jVWGL0RsgyYLdqn00BAvlkBbi4VfTSGI-Mc,11181
+chellow/reports/report_109.py,sha256=FmRWG8wQC97cj0nqQH7mrfbYesRIKWXQLh6ERHvtHrU,11212
 chellow/reports/report_111.py,sha256=AlYjvCDpGNe1qBuzW52EONWDsFaIVElug0Vpe9qm1PY,28169
 chellow/reports/report_169.py,sha256=tnTiHmhigcgZ7E8rUSfgzsVYUCW947xBZZq04-KqfK8,9287
 chellow/reports/report_181.py,sha256=mCL6vXfrj8r0kL-LilDS0SnSu5tJOzCq7eMJVx9zpEw,4999
@@ -77,14 +78,14 @@ chellow/reports/report_219.py,sha256=cA0lfJKnJg41Zc4_gZB1KUXZ9JeJo0TiTlu5jm1bdDM
 chellow/reports/report_231.py,sha256=uhO1algP7sibpZVaniqGs56HOCPCQeDO-Y-UfvFQwnI,5311
 chellow/reports/report_233.py,sha256=cIatj-HHYW_GNIRsji-DlsmYjt8rUdm_5xujPLOYL8U,4537
 chellow/reports/report_241.py,sha256=AlFmSHnfG2HWv_ICmWX7fNpPwLHjq7mo1QtOTjSKO3k,5384
-chellow/reports/report_247.py,sha256=ozgCcee8XeqYbOpZCyU2STJKaz6h2x7TYQogagTaYLw,46626
+chellow/reports/report_247.py,sha256=KmigazTTyh6kGTnDylJZxfVVfZpJGPUVlCLPd46mVsw,46125
 chellow/reports/report_29.py,sha256=KDFjgrLBv4WbG9efCdu_geMR7gT_QV9N97Wfdt7aDc4,2736
 chellow/reports/report_291.py,sha256=rqBXy6s7hMeYWw-yNX6w_L5t2yz6rNEeos_4xO7wf90,7519
 chellow/reports/report_33.py,sha256=laVz-itDbJTdvC6LxLEeuY0eKpYx43Un4adiExPTEEE,16730
 chellow/reports/report_387.py,sha256=kmBZopb0AOivcowO2nPjRj6LnV0_QjCDXLwqPL7IGVE,5672
 chellow/reports/report_41.py,sha256=QQeTshA1Og7N3wPaoZ8ynJzwsvZ1mgSFc7DDkVqIZoM,7447
 chellow/reports/report_429.py,sha256=8WlLqyfMyvIF5Kc6CE0MKwcT5xwmR_Ao99Ef72yAOVc,12668
-chellow/reports/report_59.py,sha256=CCFPUspUFgoMt6sMFsdtLYW-inA9rN6D-6Kted6vskA,45458
+chellow/reports/report_59.py,sha256=Mv8726VwAPO720dd0AGeL-8pH-1iTJE-Ip-JFZcliLk,48391
 chellow/reports/report_81.py,sha256=NkT6dZeMo7Z0AkJemD_Xv8Ut5PIZ9vn8Ia1Q_DS9v54,5611
 chellow/reports/report_87.py,sha256=j2gdBOapaVY1ZnlNlw14RPx58_k8eUkc3oRSnKuCsNA,7057
 chellow/reports/report_asset_comparison.py,sha256=UN298MHuzyUDUiiZr7F_Ua6SrdVOlFLjgKjnIbrA-14,6118
@@ -139,12 +140,12 @@ chellow/templates/report_run_row.html,sha256=bmtcdqJaS1CXpL0i8PuqvmeF98jKNYX5-mn
 chellow/templates/report_run_row_bill_check.html,sha256=aC2LMu_6NvmTN3ZdxHJPPPczyxPN6hg0F-PPcqIWUws,4683
 chellow/templates/report_run_supply_contacts.html,sha256=JNzwz9M6qbLRDMkCzFCxxANapUer5klxo7t5a48nAzg,2117
 chellow/templates/report_runs.html,sha256=Xef2nilmHHSnyRNKUQJrU2qWsQfslFL_wWD5rR92SOo,667
-chellow/templates/site.html,sha256=H0hHgwLSkTZKRh1_aW9X9EKd6HUWJhGIu3AXBBskOmw,10104
+chellow/templates/site.html,sha256=rqu1bEN8zKxgx5j2Yeg2Jb-pYF4UtxmsjrcBxzCbBsg,10106
 chellow/templates/site_add.html,sha256=NxYmOIZQH6X8EBOuJUbhUJ8IYB3t0BukjR1yVRhnJhM,422
 chellow/templates/site_edit.html,sha256=TJ_ZDDkodj-uDB3GPP9Cel3FGZY2oP42KCzHOydPWVc,2909
 chellow/templates/site_gen_graph.html,sha256=LXkD4n_aC_sFm9JJTCmBRrczpyTn2UUEgBToFiM5RPo,3468
 chellow/templates/site_hh_data.html,sha256=xmSJ5h_DvI1-bnV7FdBodDUvDCU0-q-UHYj2MuyLOTg,1907
-chellow/templates/site_months.html,sha256=oXtCN7YD4_QhDkXfRsrmhLAEhIMHaGdK1EmTmECfN6o,6562
+chellow/templates/site_months.html,sha256=ToqH42dym82Q4ihFIT3St-EwPlhDAfwskNMh4cZ2EsM,6572
 chellow/templates/site_used_graph.html,sha256=NXuQYcPXnk2mHb2O4mxVPZ1R-X-MWPwneUV-J6z285w,3094
 chellow/templates/sites.html,sha256=4ouJ5xYqYHjXCv3cDucTjgbOd_whReFPPHopLBdW6Go,621
 chellow/templates/supplies.html,sha256=Ie_4K4-KwXqrCBwaUcjWxmV27rYjeESI_DCS9gLUipk,3488
@@ -166,7 +167,7 @@ chellow/templates/e/cop.html,sha256=ULv7ALFJHMUgPX96hQNm2irc3edtKYHS6fYAxvmzj8M,
 chellow/templates/e/cops.html,sha256=2uFpVZOZtEe8fBE9NU-hElVvT_gTLk9peHNfPKW0PAY,425
 chellow/templates/e/csv_bills.html,sha256=SFTtyVPj9inYOyc3QcS8lqo6X8GOwMhsyBirPvzv6Oc,437
 chellow/templates/e/csv_register_reads.html,sha256=B-9ZDwEgdTzmKXZ0HVNnYwOSRpen3A3e_HeG7Mg3NnU,763
-chellow/templates/e/csv_sites_hh_data.html,sha256=CtE0CMFTtFuabakMcPfyDkUnUIR8bWcoozn17d6ZwXg,966
+chellow/templates/e/csv_sites_hh_data.html,sha256=swUAahWGMQTPlIg16c2AljXVQ3kjoURgsEprHCaYWhA,968
 chellow/templates/e/csv_sites_triad.html,sha256=Btlx3P3L-ACYo6FjOky5s3a_pAlMyUe_5xNHLojGXEE,433
 chellow/templates/e/csv_supplies_hh_data.html,sha256=IQxLdEDKROsobIOvyp4lBm1c_GlnagjLuNHOSzgPGII,1701
 chellow/templates/e/csv_supplies_snapshot.html,sha256=6F1UL7TUH-yE3qYJulsLX7qca-gUhTye56n6xXWgpF8,748
@@ -205,7 +206,7 @@ chellow/templates/e/dtc_meter_types.html,sha256=dTAIoaCh8DMUAHil0WQ40auLsjsni8z0
 chellow/templates/e/duration_report.html,sha256=MrDgLDzbXdGLfpUbZ9U3xSP2H1VF0eK225LM_1U9azA,1493
 chellow/templates/e/elexon.html,sha256=QW2EKdTMBTIzUkiXpYIHVZidZHNca3GmyiwWKaWkvIY,997
 chellow/templates/e/em_hh_data.html,sha256=2Ndvpo2ngO2dOpEZa05-6xRCy3IKNkWHJwW6sVjhhWY,2032
-chellow/templates/e/em_months.html,sha256=0zPR10YSvjRne9xFkKkXaU2B-HlVWTFtSZeT9Mt76xA,6647
+chellow/templates/e/em_months.html,sha256=_WdOxiQ8dMEke1_nmD2yglY2zYzMx0AsaQgOw_6kDk8,6657
 chellow/templates/e/em_site.html,sha256=LQJ1RJe7IJCZ-dsmd-Ku3hhNEeKUq3BimEBKJPNZ-do,2890
 chellow/templates/e/em_totals.html,sha256=D_H12qF6b8heVeSGzcl4u7xRvtPLUtM1zWYrwEFRFTM,678
 chellow/templates/e/energisation_status.html,sha256=hvD1qMpLYjmWWGIrv-5Ko3KbRL3a6MdQXcO3Fr4_cHA,478
@@ -273,7 +274,7 @@ chellow/templates/e/read_type.html,sha256=volKteZB79famXrzN_Bgqy9JT9C4a50vXLkuZ0
 chellow/templates/e/read_types.html,sha256=CknHXNEkBnsAprqI66ftvnnMFBdR_kqI7o26rxjlrJA,473
 chellow/templates/e/scenario.html,sha256=apBfJY3RcieKsVmNIgyRJEJ89bEYlN-dmX9yXgOkJ7w,1153
 chellow/templates/e/scenario_add.html,sha256=qQpxvhlrQqrNYiIQTHu_NvSoeSKuRNEJQYwLqRlQ8_U,516
-chellow/templates/e/scenario_docs.html,sha256=1nTudJvQSbSAqlMoTojQue7krVO9BAc_YFnz4bDGDi0,4814
+chellow/templates/e/scenario_docs.html,sha256=K-T_f-u4h5-eEaroypNsryneezEk5rdlawUxjUtkOKE,4820
 chellow/templates/e/scenario_edit.html,sha256=Uf64v_qsBP0BxaFEIz214CC_dZXlvro4zvQXH_towhA,1070
 chellow/templates/e/scenarios.html,sha256=zlNhZvQEcuwLgHObVHS-4THur5Lz9Jf1G6xD98-jamI,847
 chellow/templates/e/site_add_e_supply.html,sha256=_gi1ejI4TMTMX9vCW7z2kToR2XKR6qoVh67qp_VrDsM,2731
@@ -364,6 +365,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-1722367388.0.0.dist-info/METADATA,sha256=lvfgDxukH_ByMr2M0Kmppz8rNbPWLKkEjvfc19LDnho,12241
-chellow-1722367388.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1722367388.0.0.dist-info/RECORD,,
+chellow-1723449410.0.0.dist-info/METADATA,sha256=jJ3jHguNMB1z6JGZw5ZOaOz7wuAQhHfYQiDHF1bTKrQ,12241
+chellow-1723449410.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1723449410.0.0.dist-info/RECORD,,