chellow 1751619264.0.0__py3-none-any.whl → 1751980348.0.0__py3-none-any.whl

chellow/e/computer.py

@@ -22,6 +22,7 @@ from chellow.models import (
     Channel,
     ClockInterval,
     Contract,
+    DtcMeterType,
     Era,
     HhDatum,
     Llfc,
@@ -694,7 +695,14 @@ class SiteSource(DataSource):
                 self.dtc_meter_type_code = self.era_map_dtc_meter_types[
                     era_dtc_meter_type_code
                 ]
+                if self.dtc_meter_type_code is None:
+                    self.dtc_meter_type = None
+                else:
+                    self.dtc_meter_type = DtcMeterType.get_by_code(
+                        sess, era_dtc_meter_type_code
+                    )
             else:
+                self.dtc_meter_type = era.dtc_meter_type
                 self.dtc_meter_type_code = era_dtc_meter_type_code
 
             self.is_import = True
@@ -1086,7 +1094,14 @@ class SupplySource(DataSource):
             self.dtc_meter_type_code = self.era_map_dtc_meter_types[
                 era_dtc_meter_type_code
             ]
+            if self.dtc_meter_type_code is None:
+                self.dtc_meter_type_code = None
+            else:
+                self.dtc_meter_type = DtcMeterType.get_by_code(
+                    sess, self.dtc_meter_type_code
+                )
         else:
+            self.dtc_meter_type = era.dtc_meter_type
             self.dtc_meter_type_code = era_dtc_meter_type_code
 
         self.id = self.mpan_core
@@ -1196,11 +1211,15 @@ class SupplySource(DataSource):
                         - Datetime(chunk_start.year, 1, 1)
                     ).total_seconds()
                 )
+                if hist_era.pc.code == "00":
+                    ssc = Ssc.get_by_code(sess, "0393", chunk_start)
+                else:
+                    ssc = hist_era.ssc
 
-                for tpr in (
-                    sess.query(Tpr)
+                for tpr in sess.scalars(
+                    select(Tpr)
                     .join(MeasurementRequirement)
-                    .filter(MeasurementRequirement.ssc == hist_era.ssc)
+                    .where(MeasurementRequirement.ssc == ssc)
                 ):
                     for hist_date in hh_range(self.caches, chunk_start, chunk_finish):
                         if is_tpr(sess, self.caches, tpr.code, hist_date):

chellow/e/triad.py

@@ -27,7 +27,7 @@ from chellow.utils import (
 
 def hh(ds, rate_period="monthly", est_kw=None):
     for hh in ds.hh_data:
-        if hh["ct-is-month-end"]:
+        if hh["ct-is-month-end"] and ds.dtc_meter_type is not None:
             _process_triad_hh(ds, rate_period, est_kw, hh)
 
 

chellow/reports/report_247.py

@@ -471,14 +471,13 @@ def _process_site(
     if supply_ids is not None:
         q = q.where(Supply.id.in_(supply_ids))
     for supply in sess.execute(q).scalars():
-        last_era = (
-            sess.execute(
-                select(Era).where(Era.supply == supply).order_by(Era.start_date.desc())
-            )
-            .scalars()
-            .first()
-        )
-        if last_era.finish_date is not None and last_era.start_date <= finish_date:
+        last_era = sess.scalars(
+            select(Era)
+            .join(SiteEra)
+            .where(Era.supply == supply)
+            .order_by(Era.start_date.desc())
+        ).first()
+        if last_era.finish_date is not None and last_era.finish_date < finish_date:
             site_era = sess.execute(
                 select(SiteEra).where(
                     SiteEra.era == last_era,

{chellow-1751619264.0.0.dist-info → chellow-1751980348.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1751619264.0.0
+Version: 1751980348.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)
@@ -86,6 +86,19 @@ in Windows an environment variable can be set by doing:
   `admin@example.com` and the password `admin`, and then the home page should appear.
   Change the admin password from the `users` page.
 
+### Azure
+
+SSH into the machine and you'll be in ``/home/site/wwwroot``.
+
+* Create a virtual environment: ``python -m venv antenv``
+* Activate the virtual environment with: ``source antenv/bin/activate``
+*
+In ``/home/site/wwwroot`` create a file called ``app.py`` containing the following:
+
+    import chellow
+    
+    app = chellow.create_app()
+
 
 ### Manually Upgrading Chellow
 

{chellow-1751619264.0.0.dist-info → chellow-1751980348.0.0.dist-info}/RECORD

@@ -21,7 +21,7 @@ chellow/e/bmarketidx.py,sha256=9PDY-JKQwcQhGpgJEj8EktQXrUITBvQ35YryzTxwle8,7936
 chellow/e/bsuos.py,sha256=2L7pgiGbV4k1Udfzjj4B2Qye02sV_FhNjwh7_sIxXFg,15525
 chellow/e/ccl.py,sha256=30dh_SvlgzsTQPPAJNZWILaMvbeDsv9-P-S1JxS5_SQ,3184
 chellow/e/cfd.py,sha256=CWLdYeNjgqT6Ro8YRf4vhwXIAJ2aV4Wi6HLNClVSeaQ,14260
-chellow/e/computer.py,sha256=aGti5aXRTdC85M-WRiAoZkC_76sqfAiP-79ggWZF09Q,68020
+chellow/e/computer.py,sha256=lt4Zlr8EOClL1acuuvKA-tNPCI5RRHnAZbsaGQnB9j4,68835
 chellow/e/dno_rate_parser.py,sha256=NOVfS9HRDsc0rO282hU-IdrcuvMlC7VE8RySqd_5eT0,21762
 chellow/e/duos.py,sha256=RHrn93I1ASO2uYkuF18qlhG4p-jpuJhd_g3o69wtP4U,31004
 chellow/e/elexon.py,sha256=ALhXS9Es7PV0z9ukPbIramn3cf3iLyFi-PMWPSm5iOs,5487
@@ -43,7 +43,7 @@ chellow/e/scenario.py,sha256=FLgh03r_SgXx0hMWFbAvwsz2ScDL8LUwYWSWVv2rQlg,24973
 chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,6232
 chellow/e/tlms.py,sha256=K2n-dF6qNW7VQp4m_sVK1HWnXarmAIzpotWXYqWQacY,9363
 chellow/e/tnuos.py,sha256=NBmc-f3oezrl4gviAKobljHfICTpBKxxxEGBGJi_lRk,4927
-chellow/e/triad.py,sha256=NSIIDsj6mPLr_jIFxce-cXzh7bxLTv5cFsNBJhY4CH0,13686
+chellow/e/triad.py,sha256=uQIngSrz8irBXQ0Rp_s8nAUzu-y2Ms7aj4B38_Ff8y8,13720
 chellow/e/views.py,sha256=e5rMZFT2fNO3P14_0nCyOEwNWnMiayx2wqo4PJmBwRM,220111
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=opjXRrqrgBTbSKzL0JfTLP0fnz3DL3oRZZ4P0DifQ3I,4119
@@ -88,7 +88,7 @@ chellow/reports/report_219.py,sha256=3Zs16ka6dWWY_lCDoA-ZFrlPb4vHk1LQoa2yrlTMntA
 chellow/reports/report_231.py,sha256=WARLztV2HzBFSi5_xvY_DTXVyuBBbBYiU0RazfjKw-Y,5270
 chellow/reports/report_233.py,sha256=qJdPFuBgQAWD24BsljgGJ44L_RGdHOA1RqsxGjTWhFc,4975
 chellow/reports/report_241.py,sha256=lfivElRkV_CZAhck0rxAuhqzgponj3aWwmwGMNQvUxg,5343
-chellow/reports/report_247.py,sha256=SnbGqvCkakeYrPvFA13NRSiuwJWaO_CVO2hU4_pw4w0,46044
+chellow/reports/report_247.py,sha256=00a-shl3TRRWyana42OZHvPnjE803rQc_2HzlSA5xKE,46029
 chellow/reports/report_29.py,sha256=ZXnq6Kg5on-IPquUsH4bn46mBVESY_WhwqDWZPXOJwo,2695
 chellow/reports/report_291.py,sha256=BnWtxe0eWN2QKKWpwjs5-RI5LbReBKL119QbkrkNhV8,7478
 chellow/reports/report_33.py,sha256=lt1EN_LNx6u-AgdaS3YRkPMZA33JgMcELolHF4oJUMw,16689
@@ -385,6 +385,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-1751619264.0.0.dist-info/METADATA,sha256=xlK5YqUwEKANf3zGXV4UcDjBQRjqy22tD54jbvo4XS4,12238
-chellow-1751619264.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1751619264.0.0.dist-info/RECORD,,
+chellow-1751980348.0.0.dist-info/METADATA,sha256=cQNBuWTEa9-hyJkd1XVznNi0ItxpmbWKgYp3PB6V2qY,12585
+chellow-1751980348.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1751980348.0.0.dist-info/RECORD,,