chellow 1715270858.0.0__py3-none-any.whl → 1715329858.0.0__py3-none-any.whl

chellow/models.py

@@ -3808,6 +3808,9 @@ METER_CATEGORY = {
     "2CF": "amr",
     "2CDF": "amr",
     "2CEF": "amr",
+    "S2ADE": "amr",
+    "S2BDE": "amr",
+    "S2CD": "amr",
 }
 
 
@@ -6651,6 +6654,20 @@ def insert_dtc_meter_types(sess):
         ("2CF", "Polyphase with APC that is compliant with SMETS2"),
         ("2CDF", "Polyphase with ALCS and APC that is compliant with SMETS2"),
         ("2CEF", "Polyphase with Boost Function and APC that is compliant with SMETS2"),
+        (
+            "S2ADE",
+            "Single element meter with one or more ALCS and Boost Function that is "
+            "compliant with SMETS2",
+        ),
+        (
+            "S2BDE",
+            "A twin element meter with one or more ALCS and Boost Function that is "
+            "compliant with SMETS2",
+        ),
+        (
+            "S2CD",
+            "A polyphase meter with one or more ALCS that is compliant with SMETS2",
+        ),
     ):
         DtcMeterType.insert(sess, code, desc)
 
@@ -7434,6 +7451,26 @@ def db_upgrade_46_to_47(sess, root_path):
     sess.execute(text("alter table era drop column properties;"))
 
 
+def db_upgrade_47_to_48(sess, root_path):
+    for code, desc in (
+        (
+            "S2ADE",
+            "Single element meter with one or more ALCS and Boost Function that is "
+            "compliant with SMETS2",
+        ),
+        (
+            "S2BDE",
+            "A twin element meter with one or more ALCS and Boost Function that is "
+            "compliant with SMETS2",
+        ),
+        (
+            "S2CD",
+            "A polyphase meter with one or more ALCS that is compliant with SMETS2",
+        ),
+    ):
+        DtcMeterType.insert(sess, code, desc)
+
+
 upgrade_funcs = [None] * 18
 upgrade_funcs.extend(
     [
@@ -7466,6 +7503,7 @@ upgrade_funcs.extend(
         db_upgrade_44_to_45,
         db_upgrade_45_to_46,
         db_upgrade_46_to_47,
+        db_upgrade_47_to_48,
     ]
 )
 

chellow/reports/report_ecoes_comparison.py

@@ -540,7 +540,6 @@ def _process(
             values["chellow_era_id"] = chellow_era_id
             report_run.insert_row(sess, "", titles, values, {})
             sess.commit()
-        sess.expunge_all()
 
     for mpan_core in mpans:
         supply = Supply.get_by_mpan_core(sess, mpan_core)

{chellow-1715270858.0.0.dist-info → chellow-1715329858.0.0.dist-info}/METADATA

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

@@ -5,7 +5,7 @@ chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=5SmP-0QPK6xCkd_wjIWh_8FAzN5OxNHCzyEQ1Xb-Y-M,5256
 chellow/edi_lib.py,sha256=het3R0DBGtXEo-Sy1zvXQuX9EWQ1X6Y33G4l1hYYuds,51859
 chellow/general_import.py,sha256=l3EHq9zG9Vfl5Ee6XTVrC1nusXo4YGGB4VBmZ_JaJR8,65798
-chellow/models.py,sha256=Rq_ARe-MI73kalTW3Kpas-mTBdjFjBtaqSRAAn3SMzU,241085
+chellow/models.py,sha256=2YSRKOt89mgawuz1CV02FsjLi5ue9Np38PGOIS-yoc4,242202
 chellow/national_grid.py,sha256=uxcv0qisHPyzw9AVIYPzsRqwt2XPAcZL-SBR12qcrS0,4364
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 chellow/rate_server.py,sha256=fg-Pf_9Hk3bXmC9riPQNGQxBvLvBa_WtNYdwDCjnCSg,5678
@@ -92,7 +92,7 @@ chellow/reports/report_bills.py,sha256=AHW6tiZAOE0gXDfencPvemE4zqK6eTqfN8_bWQ4RT
 chellow/reports/report_csv_llfcs.py,sha256=OHSbP64lQ6dlAMcQYgvdANlA4lQyF0iBlwk7V9c9nuo,1944
 chellow/reports/report_csv_site_hh_data.py,sha256=T-clGDmYdn0ej7zZfL3kDp4Vyd82WzptxEzxx9KqAZg,4270
 chellow/reports/report_csv_site_snags.py,sha256=gG2sYQrLoIBwCoMUC8rhmAL7Kffh_rvNb9UOX7cYDko,2668
-chellow/reports/report_ecoes_comparison.py,sha256=s6d69cORezon-h3RmgewT8_cMpLrpMElmP2TnT-y7yY,21743
+chellow/reports/report_ecoes_comparison.py,sha256=mInFX4UmrPnjO-nLarqrCmyLx6O0wlCd94AUN2JlqZQ,21716
 chellow/reports/report_g_monthly_duration.py,sha256=vI5FKAU8_oThjR5oflPZont7Z7sVAunr0qlMfJsaPJI,12004
 chellow/reports/report_g_supplies_snapshot.py,sha256=0M0x_0o0985Hu45gUJJJwzfx0DDOAuXBJ1UVUDbQ36g,4718
 chellow/reports/report_g_supply_virtual_bill.py,sha256=x_KtQ02dwgmXvAEUXJ1poK0BRwqxa-GcbJ5pddEina0,3694
@@ -363,6 +363,6 @@ chellow/templates/g/supply_note_edit.html,sha256=6UQf_qbhFDys3cVsTp-c7ABWZpggW9R
 chellow/templates/g/supply_notes.html,sha256=WR3YwGh_qqTklSJ7JqWX6BKBc9rk_jMff4RiWZiF2CM,936
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1715270858.0.0.dist-info/METADATA,sha256=7pXnjJTkxqCx_uY6SmT4duXmX6nnZVNVIhhx9Bm8vyE,12205
-chellow-1715270858.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-chellow-1715270858.0.0.dist-info/RECORD,,
+chellow-1715329858.0.0.dist-info/METADATA,sha256=BQZ9tHpLeOFjIHah8sWynsNdPnzLkwfnXQPYiBVjBN4,12205
+chellow-1715329858.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+chellow-1715329858.0.0.dist-info/RECORD,,