chellow 1717422005.0.0__py3-none-any.whl → 1717768383.0.0__py3-none-any.whl

chellow/e/bill_parsers/settlement_dc_stark_xlsx.py

@@ -8,7 +8,7 @@ from openpyxl import load_workbook
 from werkzeug.exceptions import BadRequest
 
 from chellow.models import Session
-from chellow.utils import hh_format, parse_mpan_core, to_utc
+from chellow.utils import parse_mpan_core, to_utc
 
 
 class Parser:
@@ -99,10 +99,18 @@ class Parser:
                     ad_hoc_visits = self.get_dec("P", row)
                     ad_hoc_rate = self.get_dec("Q", row)
                     ad_hoc_gbp = self.get_dec("R", row)
+                    activity_names = set()
+                    activity_gbp = Decimal("0")
+                    if ad_hoc_gbp != 0:
+                        activity_names.add("ad_hoc_visit")
+                        activity_gbp += ad_hoc_gbp
 
                     annual_visits = self.get_int("S", row)
                     annual_rate = self.get_dec("T", row)
                     annual_gbp = self.get_dec("U", row)
+                    if annual_gbp != 0:
+                        activity_names.add("annual_visit")
+                        activity_gbp += annual_gbp
 
                     if cop_3_meters > 0:
                         cop = "3"
@@ -121,19 +129,16 @@ class Parser:
                         "mpan-gbp": mpan_gbp,
                         "ad-hoc-visits": ad_hoc_visits,
                         "ad-hoc-rate": [ad_hoc_rate],
-                        "ad-hoc-gbp": ad_hoc_gbp,
+                        "ad-hoc-gbp-info": ad_hoc_gbp,
                         "annual-visits-count": annual_visits,
                         "annual-visits-rate": [annual_rate],
-                        "annual-visits-gbp": annual_gbp,
+                        "annual-visits-gbp-info": annual_gbp,
                     }
-                    annual_date_cell = self.get_cell("V", row)
-                    annual_date_value = annual_date_cell.value
-                    if annual_date_value is not None:
-                        if isinstance(annual_date_value, Datetime):
-                            annual_date = hh_format(annual_date_value)
-                        else:
-                            annual_date = annual_date_value
-                        breakdown["annual-visits-date"] = [annual_date]
+                    if len(activity_names) > 0:
+                        breakdown["activity-name"] = sorted(activity_names)
+
+                    if activity_gbp != 0:
+                        breakdown["activity-gbp"] = activity_gbp
 
                     bills.append(
                         {

chellow/e/bmarketidx.py

@@ -1,9 +1,12 @@
 import atexit
-import collections
 import threading
 import traceback
+from collections import deque
+from datetime import datetime as Datetime
 from decimal import Decimal
 
+from dateutil.relativedelta import relativedelta
+
 import requests
 
 from werkzeug.exceptions import BadRequest
@@ -73,7 +76,7 @@ class BmarketidxImporter(threading.Thread):
     def __init__(self):
         super().__init__(name="Bmarketidx Importer")
         self.lock = threading.RLock()
-        self.messages = collections.deque(maxlen=100)
+        self.messages = deque(maxlen=1000)
         self.stopped = threading.Event()
         self.going = threading.Event()
 
@@ -145,7 +148,7 @@ class BmarketidxImporter(threading.Thread):
                             self.global_alert = (
                                 f"There's a problem with the <a "
                                 f"href='/non_core_contracts/{contract.id}/"
-                                f"automatic_importer'>bmarketidx automatic "
+                                f"auto_importer'>bmarketidx automatic "
                                 f"importer</a>."
                             )
                     finally:
@@ -164,24 +167,38 @@ def _process_month(log_f, sess, contract, latest_rs, month_start, month_finish):
     )
     rates = {}
     month_finish_ct = to_ct(month_finish)
+    base_url = "https://data.elexon.co.uk/bmrs/api/v1/balancing/pricing/market-index"
     for d in range(month_finish_ct.day):
-        day_ct = ct_datetime(month_finish_ct.year, month_finish_ct.month, d + 1)
+        day_from_ct = ct_datetime(month_finish_ct.year, month_finish_ct.month, d + 1)
+        day_to_ct = day_from_ct + relativedelta(days=1)
         params = {
-            "q": f"ajax/alldata/MID/Date,SP,Provider,Price,Volume/NULL/"
-            f'{day_ct.strftime("%Y-%m-%d")}/ALL'
+            "from": f'{day_from_ct.strftime("%Y-%m-%d")}T00:00Z',
+            "to": f'{day_to_ct.strftime("%Y-%m-%d")}T00:00Z',
+            "settlementPeriodFrom": "1",
+            "settlementPeriodTo": "1",
         }
         sess.rollback()
-        r = requests.get(
-            "https://www.bmreports.com/bmrs/", params=params, timeout=60, verify=False
-        )
+        q_str = "&".join(f"{k}={v}" for k, v in params.items())
+        log_f(f"Attempting to download {base_url}?{q_str}")
+        r = requests.get(base_url, params=params, timeout=60, verify=False)
         res = r.json()
-        for h in res["arr"]:
-            dt = to_utc(day_ct + (int(h["settlementPeriod"]) - 1) * HH)
-            try:
-                rate = rates[dt]
-            except KeyError:
-                rate = rates[dt] = {}
-            rate[h["DataProviderId"]] = Decimal(h["MarketIndexPrice"]) / Decimal(1000)
+        for h in res["data"]:
+            # {
+            #   "startTime":"2022-06-01T23:00:00Z",
+            #   "dataProvider":"N2EXMIDP",
+            #   "settlementDate":"2022-06-02",
+            #   "settlementPeriod":1,
+            #   "price":0.00,
+            #   "volume":0.000
+            # },
+            settlement_date = Datetime.strptime(h["settlementDate"], "%Y-%m-%d")
+            if settlement_date.month == month_finish_ct.month:
+                dt = to_utc(settlement_date + (int(h["settlementPeriod"]) - 1) * HH)
+                try:
+                    rate = rates[dt]
+                except KeyError:
+                    rate = rates[dt] = {}
+                rate[h["dataProvider"]] = Decimal(h["price"]) / Decimal(1000)
 
     if month_finish in rates:
         log_f("The whole month's data is there.")

{chellow-1717422005.0.0.dist-info → chellow-1717768383.0.0.dist-info}/METADATA

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

@@ -15,7 +15,7 @@ chellow/views.py,sha256=eDvTQM_PUqRvrCQvBdlF5q7MEs7w2yJmRjcC8WDbHtE,79584
 chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/aahedc.py,sha256=d2usudp7KYWpU6Pk3fal5EQ47EbvkvKeaFGylnb3NWw,606
 chellow/e/bill_importer.py,sha256=7UcnqNlKbJc2GhW9gy8sDp9GuqambJVpZLvbafOZztA,7411
-chellow/e/bmarketidx.py,sha256=lao_Azld-aaimEQLsTCpGTaZKI8iFpg2K6CDFOG0seM,7132
+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=V1DTT5XBQbt8hO1gae1u3315fZ4iuYk3XC7J2sUbhKQ,14352
@@ -53,7 +53,7 @@ chellow/e/bill_parsers/haven_edi.py,sha256=YGPHRxPOhje9s32jqPHHELni2tooOYj3cMC_q
 chellow/e/bill_parsers/haven_edi_tprs.py,sha256=ZVX9CCqUybsot_Z0BEOJPvl9x5kSr7fEWyuJXvZDcz4,11841
 chellow/e/bill_parsers/mm.py,sha256=ShhaVc0IpShpy4Q2pfj3EfjhpjbffQutKsAq6ivNiys,8522
 chellow/e/bill_parsers/nonsettlement_dc_stark_xlsx.py,sha256=yogXTuQHGRL7IiqvRWr2C9V24ez1j9Yx0128UygPE_k,4723
-chellow/e/bill_parsers/settlement_dc_stark_xlsx.py,sha256=gKeYMdUO4bVycV8n1lWs5AIfF3bHZLkM6tkasD4rhHs,6239
+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
 chellow/e/bill_parsers/sww_xls.py,sha256=QEjiuvwvr5FuWCfqqVw8LaA_vZyAKsvRAS5fw3xtFhM,7533
 chellow/gas/bill_import.py,sha256=w0lPgK_Drzh8rtnEBQe3qFuxrgzZ6qQSgpaGrrGznMU,6549
@@ -364,6 +364,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-1717422005.0.0.dist-info/METADATA,sha256=Htpjp-p18RGbhe8l7jpmEErcTO1aCFxezxhbSBeCG1c,12205
-chellow-1717422005.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-chellow-1717422005.0.0.dist-info/RECORD,,
+chellow-1717768383.0.0.dist-info/METADATA,sha256=FSbmmHYytVZN9CdVIekLk3eUbkbT4a-3mLVR3ow7PFM,12205
+chellow-1717768383.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+chellow-1717768383.0.0.dist-info/RECORD,,