switch2 0.2.0__tar.gz → 0.2.1__tar.gz

{switch2-0.2.0 → switch2-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: switch2
-Version: 0.2.0
+Version: 0.2.1
 Summary: Async client library for the Switch2 energy portal
 Author-email: Jelmer Vernooij <jelmer@jelmer.uk>
 License-Expression: Apache-2.0
@@ -37,6 +37,7 @@ pip install switch2
 import asyncio
 from switch2 import Switch2ApiClient
 
+
 async def main():
     async with Switch2ApiClient("you@example.com", "your-password") as client:
         data = await client.fetch_data()
@@ -50,12 +51,15 @@ async def main():
             detail = await client.fetch_bill_detail(bill)
             print(f"    invoice {detail.invoice_number}, total £{detail.total}")
 
+
 asyncio.run(main())
 ```
 
 All exceptions derive from `Switch2Error`. `Switch2AuthError` means the
 portal rejected the credentials; `Switch2ParseError` means a page did not
-look the way the parser expects, which usually means the portal changed.
+look the way the parser expects, which usually means the portal changed;
+`Switch2UnavailableError` means the portal failed to load data it normally
+has, which tends to pass if you try again later.
 
 `data.readings` holds the readings of the register the portal selects by
 default; `data.register_readings` maps each register in `data.registers`

{switch2-0.2.0 → switch2-0.2.1}/README.md

@@ -14,6 +14,7 @@ pip install switch2
 import asyncio
 from switch2 import Switch2ApiClient
 
+
 async def main():
     async with Switch2ApiClient("you@example.com", "your-password") as client:
         data = await client.fetch_data()
@@ -27,12 +28,15 @@ async def main():
             detail = await client.fetch_bill_detail(bill)
             print(f"    invoice {detail.invoice_number}, total £{detail.total}")
 
+
 asyncio.run(main())
 ```
 
 All exceptions derive from `Switch2Error`. `Switch2AuthError` means the
 portal rejected the credentials; `Switch2ParseError` means a page did not
-look the way the parser expects, which usually means the portal changed.
+look the way the parser expects, which usually means the portal changed;
+`Switch2UnavailableError` means the portal failed to load data it normally
+has, which tends to pass if you try again later.
 
 `data.readings` holds the readings of the register the portal selects by
 default; `data.register_readings` maps each register in `data.registers`

{switch2-0.2.0 → switch2-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "switch2"
-version = "0.2.0"
+version = "0.2.1"
 description = "Async client library for the Switch2 energy portal"
 readme = "README.md"
 license = "Apache-2.0"

{switch2-0.2.0 → switch2-0.2.1}/switch2/__init__.py

@@ -13,6 +13,7 @@ from .api import (
     Switch2Data,
     Switch2Error,
     Switch2ParseError,
+    Switch2UnavailableError,
 )
 
 __all__ = [
@@ -28,4 +29,5 @@ __all__ = [
     "Switch2Data",
     "Switch2Error",
     "Switch2ParseError",
+    "Switch2UnavailableError",
 ]

{switch2-0.2.0 → switch2-0.2.1}/switch2/api.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import logging
+import re
 from collections.abc import Callable
 from dataclasses import dataclass, field
 from datetime import datetime
@@ -37,6 +38,14 @@ class Switch2ParseError(Switch2Error):
     """Raised when a portal page does not have the expected structure."""
 
 
+class Switch2UnavailableError(Switch2Error):
+    """Raised when the portal fails to load data it normally has.
+
+    This happens from time to time, e.g. it lists no meters for an account
+    that has them; trying again later usually works.
+    """
+
+
 @dataclass
 class CustomerInfo:
     """Customer information from the Switch2 portal."""
@@ -245,6 +254,10 @@ class Switch2ApiClient:
                 reg_id = _get_attr(option, "value")
                 if reg_id:
                     registers[reg_id] = option.text.strip()
+        if "-1" in registers:
+            raise Switch2UnavailableError(
+                f"Portal could not load any meters: {registers['-1']!r}"
+            )
 
         selected = soup.select_one("#RegisterId option[selected]")
         selected_id = _get_attr(selected, "value") if selected else ""
@@ -294,9 +307,7 @@ def _form_token(soup: BeautifulSoup) -> dict[str, str]:
 
 def _parse_date(text: str) -> datetime:
     """Parse a date string like '27th February 2026'."""
-    # Strip ordinal suffixes (1st, 2nd, 3rd, 4th, etc.)
-    for suffix in ("st ", "nd ", "rd ", "th "):
-        text = text.replace(suffix, " ")
+    text = re.sub(r"^(\d+)(?:st|nd|rd|th)\b", r"\1", text.strip())
     for fmt in ("%d %B %Y", "%d %b %Y"):
         try:
             return datetime.strptime(text, fmt)

{switch2-0.2.0 → switch2-0.2.1}/switch2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: switch2
-Version: 0.2.0
+Version: 0.2.1
 Summary: Async client library for the Switch2 energy portal
 Author-email: Jelmer Vernooij <jelmer@jelmer.uk>
 License-Expression: Apache-2.0
@@ -37,6 +37,7 @@ pip install switch2
 import asyncio
 from switch2 import Switch2ApiClient
 
+
 async def main():
     async with Switch2ApiClient("you@example.com", "your-password") as client:
         data = await client.fetch_data()
@@ -50,12 +51,15 @@ async def main():
             detail = await client.fetch_bill_detail(bill)
             print(f"    invoice {detail.invoice_number}, total £{detail.total}")
 
+
 asyncio.run(main())
 ```
 
 All exceptions derive from `Switch2Error`. `Switch2AuthError` means the
 portal rejected the credentials; `Switch2ParseError` means a page did not
-look the way the parser expects, which usually means the portal changed.
+look the way the parser expects, which usually means the portal changed;
+`Switch2UnavailableError` means the portal failed to load data it normally
+has, which tends to pass if you try again later.
 
 `data.readings` holds the readings of the register the portal selects by
 default; `data.register_readings` maps each register in `data.registers`

{switch2-0.2.0 → switch2-0.2.1}/tests/test_api.py

@@ -12,6 +12,7 @@ from switch2.api import (
     Switch2ApiClient,
     Switch2AuthError,
     Switch2ParseError,
+    Switch2UnavailableError,
     _parse_account_balance,
     _parse_bill_detail,
     _parse_bills,
@@ -35,6 +36,10 @@ class ParseDateTests(unittest.TestCase):
     def test_ordinal_rd(self) -> None:
         self.assertEqual(_parse_date("3rd April 2025"), datetime(2025, 4, 3))
 
+    def test_month_containing_suffix(self) -> None:
+        self.assertEqual(_parse_date("27th August 2026"), datetime(2026, 8, 27))
+        self.assertEqual(_parse_date("1st August 2026"), datetime(2026, 8, 1))
+
     def test_abbreviated_month(self) -> None:
         self.assertEqual(_parse_date("15th Jan 2025"), datetime(2025, 1, 15))
 
@@ -465,8 +470,9 @@ def _reading_row(date: str, amount: str) -> str:
 class FakePortal:
     """Serves canned pages in place of Switch2ApiClient._fetch."""
 
-    def __init__(self, login_response: str) -> None:
+    def __init__(self, login_response: str, meter_history: str = METER_HISTORY) -> None:
         self.login_response = login_response
+        self.meter_history = meter_history
         self.posts: list[tuple[str, dict[str, str]]] = []
 
     async def __call__(
@@ -478,7 +484,7 @@ class FakePortal:
             html = LOGIN_FORM if data is None else self.login_response
         elif url.endswith("/MeterReadings/History"):
             if data is None:
-                html = METER_HISTORY
+                html = self.meter_history
             elif data["RegisterId"] == "R1":
                 html = _reading_row("26th October 2026", "9166 kWh")
             else:
@@ -548,3 +554,19 @@ class FetchDataTests(unittest.TestCase):
             {"R1": [9166.0], "R2": [512.0]},
         )
         self.assertEqual([x.amount for x in data.readings], [9166.0])
+
+    def test_no_meters_available(self) -> None:
+        portal = FakePortal(
+            DASHBOARD,
+            meter_history="""
+            <form>
+              <input name="__RequestVerificationToken" value="tok2">
+              <select id="RegisterId">
+                <option value="-1" selected>No meters available</option>
+              </select>
+            </form>
+            """,
+        )
+        with self.assertRaises(Switch2UnavailableError):
+            asyncio.run(_client(portal).fetch_data())
+        self.assertEqual(portal.posts[1:], [])