python-mytnb 0.1.0__tar.gz → 0.3.0__tar.gz

{python_mytnb-0.1.0 → python_mytnb-0.3.0}/.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [dev, main]
+    branches: [dev, master]
   pull_request:
-    branches: [dev, main]
+    branches: [dev, master]
 
 jobs:
   lint:

{python_mytnb-0.1.0 → python_mytnb-0.3.0}/.github/workflows/publish.yml

@@ -1,9 +1,8 @@
 name: Publish to PyPI
 
 on:
-  push:
-    tags:
-      - "v*"
+  release:
+    types: [published]
 
 jobs:
   publish:

{python_mytnb-0.1.0 → python_mytnb-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-mytnb
-Version: 0.1.0
+Version: 0.3.0
 Summary: Python library to interface with the myTNB API (Tenaga Nasional Berhad)
 Project-URL: Repository, https://github.com/danieyal/python-mytnb
 License-Expression: MIT
@@ -18,10 +18,10 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.10
 Requires-Dist: click>=8.3.3
 Requires-Dist: cryptography>=42.0
+Requires-Dist: curl-cffi>=0.7
 Requires-Dist: httpx>=0.27
 Requires-Dist: pydantic>=2.0
 Requires-Dist: rich>=15.0.0
-Requires-Dist: tls-client>=1.0
 Provides-Extra: dev
 Requires-Dist: pylint>=3.0; extra == 'dev'
 Requires-Dist: pytest-asyncio>=0.21; extra == 'dev'
@@ -29,6 +29,9 @@ Requires-Dist: pytest>=7.0; extra == 'dev'
 Requires-Dist: ruff>=0.6; extra == 'dev'
 Description-Content-Type: text/markdown
 
+[![PyPI version](https://badge.fury.io/py/python-mytnb.svg)](https://badge.fury.io/py/python-mytnb)
+[![CI](https://github.com/danieyal/python-mytnb/actions/workflows/ci.yml/badge.svg)](https://github.com/danieyal/python-mytnb/actions/workflows/ci.yml)
+
 # python-mytnb
 
 A Python library to interface with the myTNB (Tenaga Nasional Berhad) API for electricity account management and usage monitoring in Malaysia.
@@ -55,6 +58,11 @@ async def main():
     client = await MyTNBClient.login("user@example.com", "your-password")
 
     async with client:
+        # Auto-discover linked accounts
+        accounts = await client.get_customer_accounts()
+        for acc in accounts:
+            print(f"{acc.account_number} — {acc.owner_name} (SMR: {acc.is_smart_meter})")
+
         # Get smart meter usage & billing history
         usage = await client.get_account_usage_smart("220123456789")
 
@@ -89,6 +97,8 @@ All commands:
 
 ```
 mytnb login                                  # Test login, show user info
+mytnb accounts                               # List all linked accounts (auto-discovery)
+mytnb accounts --json                        # Account list as JSON
 mytnb usage <account>                        # Monthly usage & billing summary
 mytnb usage --daily <account>                # Daily usage breakdown
 mytnb usage --json <account>                 # Full usage data as JSON
@@ -109,25 +119,27 @@ mytnb init-config   # Generate a starter config file
 
 myTNB uses two API backends, both handled transparently by this library:
 
-| Backend     | Domain                | Auth                                        | Used for                            |
-| ----------- | --------------------- | ------------------------------------------- | ----------------------------------- |
-| REST        | `api.mytnb.com.my`    | JWT + API key                               | Account listing, eligibility checks |
-| Legacy ASMX | `mytnbapp.tnb.com.my` | Encrypted payloads (AES-256-CBC + RSA-OAEP) | Usage data, billing, services       |
+| Backend     | Domain                      | Auth                                        | Used for                            |
+| ----------- | --------------------------- | ------------------------------------------- | ----------------------------------- |
+| REST        | `api.mytnb.com.my`          | JWT + API key                               | Bill eligibility, eligibility icons |
+| AWS Gateway | `api.mytnb.com.my/core/api` | Encrypted payloads (AES-256-CBC + RSA-OAEP) | Account listing (auto-discovery)    |
+| Legacy ASMX | `mytnbapp.tnb.com.my`       | Encrypted payloads (AES-256-CBC + RSA-OAEP) | Usage data, billing, services       |
 
 Request encryption for the ASMX API is automatic — just pass plaintext parameters.
 
 ## Data Models
 
-| Model           | Description                                          |
-| --------------- | ---------------------------------------------------- |
-| `AccountUsage`  | Full usage response: metrics, monthly and daily data |
-| `UsageMetric`   | Current/average usage (kWh)                          |
-| `CostMetric`    | Current/projected cost (RM)                          |
-| `BillingMonth`  | Monthly billing record with tariff blocks            |
-| `DailyUsage`    | Daily consumption and cost                           |
-| `TariffBlock`   | Tariff pricing block details                         |
-| `SMRAccount`    | Smart Meter Reading eligibility status               |
-| `BREligibility` | Bill rendering opt-in status                         |
+| Model             | Description                                          |
+| ----------------- | ---------------------------------------------------- |
+| `CustomerAccount` | Linked account: number, owner, address, SMR status   |
+| `AccountUsage`    | Full usage response: metrics, monthly and daily data |
+| `UsageMetric`     | Current/average usage (kWh)                          |
+| `CostMetric`      | Current/projected cost (RM)                          |
+| `BillingMonth`    | Monthly billing record with tariff blocks            |
+| `DailyUsage`      | Daily consumption and cost                           |
+| `TariffBlock`     | Tariff pricing block details                         |
+| `SMRAccount`      | Smart Meter Reading eligibility status               |
+| `BREligibility`   | Bill rendering opt-in status                         |
 
 ## Geographic Restrictions
 

{python_mytnb-0.1.0 → python_mytnb-0.3.0}/README.md

@@ -1,3 +1,6 @@
+[![PyPI version](https://badge.fury.io/py/python-mytnb.svg)](https://badge.fury.io/py/python-mytnb)
+[![CI](https://github.com/danieyal/python-mytnb/actions/workflows/ci.yml/badge.svg)](https://github.com/danieyal/python-mytnb/actions/workflows/ci.yml)
+
 # python-mytnb
 
 A Python library to interface with the myTNB (Tenaga Nasional Berhad) API for electricity account management and usage monitoring in Malaysia.
@@ -24,6 +27,11 @@ async def main():
     client = await MyTNBClient.login("user@example.com", "your-password")
 
     async with client:
+        # Auto-discover linked accounts
+        accounts = await client.get_customer_accounts()
+        for acc in accounts:
+            print(f"{acc.account_number} — {acc.owner_name} (SMR: {acc.is_smart_meter})")
+
         # Get smart meter usage & billing history
         usage = await client.get_account_usage_smart("220123456789")
 
@@ -58,6 +66,8 @@ All commands:
 
 ```
 mytnb login                                  # Test login, show user info
+mytnb accounts                               # List all linked accounts (auto-discovery)
+mytnb accounts --json                        # Account list as JSON
 mytnb usage <account>                        # Monthly usage & billing summary
 mytnb usage --daily <account>                # Daily usage breakdown
 mytnb usage --json <account>                 # Full usage data as JSON
@@ -78,25 +88,27 @@ mytnb init-config   # Generate a starter config file
 
 myTNB uses two API backends, both handled transparently by this library:
 
-| Backend     | Domain                | Auth                                        | Used for                            |
-| ----------- | --------------------- | ------------------------------------------- | ----------------------------------- |
-| REST        | `api.mytnb.com.my`    | JWT + API key                               | Account listing, eligibility checks |
-| Legacy ASMX | `mytnbapp.tnb.com.my` | Encrypted payloads (AES-256-CBC + RSA-OAEP) | Usage data, billing, services       |
+| Backend     | Domain                      | Auth                                        | Used for                            |
+| ----------- | --------------------------- | ------------------------------------------- | ----------------------------------- |
+| REST        | `api.mytnb.com.my`          | JWT + API key                               | Bill eligibility, eligibility icons |
+| AWS Gateway | `api.mytnb.com.my/core/api` | Encrypted payloads (AES-256-CBC + RSA-OAEP) | Account listing (auto-discovery)    |
+| Legacy ASMX | `mytnbapp.tnb.com.my`       | Encrypted payloads (AES-256-CBC + RSA-OAEP) | Usage data, billing, services       |
 
 Request encryption for the ASMX API is automatic — just pass plaintext parameters.
 
 ## Data Models
 
-| Model           | Description                                          |
-| --------------- | ---------------------------------------------------- |
-| `AccountUsage`  | Full usage response: metrics, monthly and daily data |
-| `UsageMetric`   | Current/average usage (kWh)                          |
-| `CostMetric`    | Current/projected cost (RM)                          |
-| `BillingMonth`  | Monthly billing record with tariff blocks            |
-| `DailyUsage`    | Daily consumption and cost                           |
-| `TariffBlock`   | Tariff pricing block details                         |
-| `SMRAccount`    | Smart Meter Reading eligibility status               |
-| `BREligibility` | Bill rendering opt-in status                         |
+| Model             | Description                                          |
+| ----------------- | ---------------------------------------------------- |
+| `CustomerAccount` | Linked account: number, owner, address, SMR status   |
+| `AccountUsage`    | Full usage response: metrics, monthly and daily data |
+| `UsageMetric`     | Current/average usage (kWh)                          |
+| `CostMetric`      | Current/projected cost (RM)                          |
+| `BillingMonth`    | Monthly billing record with tariff blocks            |
+| `DailyUsage`      | Daily consumption and cost                           |
+| `TariffBlock`     | Tariff pricing block details                         |
+| `SMRAccount`      | Smart Meter Reading eligibility status               |
+| `BREligibility`   | Bill rendering opt-in status                         |
 
 ## Geographic Restrictions
 

{python_mytnb-0.1.0 → python_mytnb-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "python-mytnb"
-version = "0.1.0"
+version = "0.3.0"
 description = "Python library to interface with the myTNB API (Tenaga Nasional Berhad)"
 readme = "README.md"
 license = "MIT"
@@ -25,7 +25,7 @@ dependencies = [
     "httpx>=0.27",
     "pydantic>=2.0",
     "cryptography>=42.0",
-    "tls_client>=1.0",
+    "curl_cffi>=0.7",
     "click>=8.3.3",
     "rich>=15.0.0",
 ]

{python_mytnb-0.1.0 → python_mytnb-0.3.0}/src/mytnb/__init__.py

@@ -6,9 +6,12 @@ from mytnb.models import (
     AccountUsage,
     BillingMonth,
     CostMetric,
+    CustomerAccount,
     DailyUsage,
     Metric,
     TariffBlock,
+    TariffBlockLegendGroup,
+    TariffBlockLegendItem,
     UsageMetric,
 )
 
@@ -19,8 +22,11 @@ __all__ = [
     "AccountUsage",
     "BillingMonth",
     "CostMetric",
+    "CustomerAccount",
     "DailyUsage",
     "Metric",
     "TariffBlock",
+    "TariffBlockLegendGroup",
+    "TariffBlockLegendItem",
     "UsageMetric",
 ]

{python_mytnb-0.1.0 → python_mytnb-0.3.0}/src/mytnb/cli.py

@@ -371,6 +371,48 @@ def init_config(output):
     console.print(f"[green]Config written to[/] {target}")
 
 
+@cli.command()
+@click.option("--json", "as_json", is_flag=True, help="Output full JSON.")
+@click.pass_context
+def accounts(ctx, as_json):
+    """List all linked accounts (auto-discovery)."""
+
+    async def _accounts():
+        client = await _get_client(ctx)
+        async with client:
+            with console.status("[bold green]Fetching accounts..."):
+                result = await client.get_customer_accounts()
+
+            if as_json:
+                _print_json(result)
+                return
+
+            if not result:
+                console.print("[yellow]No linked accounts found.[/]")
+                return
+
+            table = Table(title="Linked Accounts")
+            table.add_column("Account No", style="cyan")
+            table.add_column("Owner", style="bold")
+            table.add_column("Address")
+            table.add_column("SMR", justify="center")
+            table.add_column("Owned", justify="center")
+
+            for acc in result:
+                table.add_row(
+                    acc.account_number,
+                    acc.owner_name or "—",
+                    acc.account_st_address or "—",
+                    "✓" if acc.is_smart_meter else "—",
+                    "✓" if acc.is_owned else "—",
+                )
+
+            console.print(table)
+            console.print(f"\n[dim]{len(result)} account(s) found.[/]")
+
+    _run_async(_accounts())
+
+
 def main() -> None:
     cli()  # pylint: disable=no-value-for-parameter
 

{python_mytnb-0.1.0 → python_mytnb-0.3.0}/src/mytnb/client/client.py

@@ -5,14 +5,16 @@ from __future__ import annotations
 from typing import Any, Optional
 
 import httpx
-import tls_client
+from curl_cffi import requests as curl_requests
 
 from mytnb.auth import Credentials
 from mytnb.client.auth import login
-from mytnb.client.config import USER_AGENT
+from mytnb.client.config import AWS_API_BASE_URL, USER_AGENT, _check_http_status
 from mytnb.client.legacy import _LegacyTransport
 from mytnb.client.rest import _RestTransport
-from mytnb.models import AccountUsage, BREligibility, SMRAccount
+from mytnb.crypto import encrypt_request
+from mytnb.exceptions import APIError
+from mytnb.models import AccountUsage, BREligibility, CustomerAccount, SMRAccount
 
 
 class MyTNBClient:
@@ -38,7 +40,7 @@ class MyTNBClient:
         self._timeout = timeout
         self._use_staging_key = use_staging_key
         self._http_client: Optional[httpx.AsyncClient] = None
-        self._tls_session: Optional[tls_client.Session] = None
+        self._tls_session: Optional[curl_requests.Session] = None
         self._rest: Optional[_RestTransport] = None
         self._legacy: Optional[_LegacyTransport] = None
 
@@ -57,14 +59,14 @@ class MyTNBClient:
         return self._http_client
 
     @property
-    def _legacy_client(self) -> tls_client.Session:
-        """Get or create a tls_client session for legacy ASMX requests.
+    def _legacy_client(self) -> curl_requests.Session:
+        """Get or create a curl_cffi session for legacy ASMX requests.
 
-        Uses an Android TLS fingerprint to bypass CloudFront WAF.
+        Uses a TLS fingerprint to bypass CloudFront WAF.
         """
         if self._tls_session is None:
-            self._tls_session = tls_client.Session(
-                client_identifier="okhttp4_android_13",
+            self._tls_session = curl_requests.Session(
+                impersonate="chrome131",
             )
         return self._tls_session
 
@@ -178,25 +180,49 @@ class MyTNBClient:
         accounts = result.get("data", [])
         return [SMRAccount.model_validate(acc) for acc in accounts]
 
-    async def get_services(self) -> dict:
-        """Get available services (V4)."""
-        data = {"usrInf": self._legacy_transport.base_user_info()}
-        return await self._legacy_transport.post("GetServicesV4", data)
+    async def get_customer_accounts(self) -> list[CustomerAccount]:
+        """Get all accounts linked to the current user.
 
-    async def get_energy_recommendations(
-        self,
-        account_number: str,
-        *,
-        is_owner: bool = True,
-    ) -> dict:
-        """Get energy budget recommendations."""
+        This is the auto-discovery endpoint — call this first to
+        discover which accounts are available, then pass individual
+        account numbers to get_account_usage_smart(), etc.
+
+        Uses POST /v3/account/GetAccount via the AWS API gateway.
+        The payload is encrypted (same encryption as legacy ASMX)
+        but the response is plain JSON (no ``{"d":{...}}`` wrapper).
+        """
+        usr_inf = self._legacy_transport.base_user_info()
+        usr_inf["IsWhiteList"] = False
         data = {
-            "contractAccount": account_number,
-            "isOwner": "true" if is_owner else "false",
-            "usrInf": self._legacy_transport.base_user_info(),
+            "usrInf": usr_inf,
+            "deviceInf": self._legacy_transport.base_device_info(),
+            "featureInfo": [],
         }
-        result = await self._legacy_transport.post("GetUserEBRecommendations", data)
-        return result.get("data") or result
+
+        payload = encrypt_request(data, use_staging_key=self._use_staging_key)
+        body = {"dt": payload.to_dict()}
+
+        response = await self._client.post(
+            f"{AWS_API_BASE_URL}/v3/account/GetAccount",
+            headers={
+                "Content-Type": "application/json",
+                "Accept": "application/json,text/json,text/x-json,text/javascript,application/xml,text/xml",
+                "User-Agent": USER_AGENT,
+            },
+            json=body,
+        )
+
+        _check_http_status(response.status_code, context="AWS account API")
+
+        if response.status_code != 200:
+            raise APIError(
+                message=f"AWS account API request failed with status {response.status_code}",
+                error_code=str(response.status_code),
+            )
+
+        data = response.json()
+        accounts = data.get("data", [])
+        return [CustomerAccount.model_validate(acc) for acc in accounts]
 
     async def get_account_due_amount(
         self,

{python_mytnb-0.1.0 → python_mytnb-0.3.0}/src/mytnb/client/config.py

@@ -9,6 +9,7 @@ from mytnb.exceptions import AuthenticationError, GeoBlockedError, RateLimitErro
 # Base URLs
 LEGACY_BASE_URL = "https://mytnbapp.tnb.com.my/v7/mytnbws.asmx"
 REST_BASE_URL = "https://api.mytnb.com.my"
+AWS_API_BASE_URL = "https://api.mytnb.com.my/core/api"
 SITECORE_LOGIN_URL = "https://www.mytnb.com.my/api/sitecore/Account/Login"
 SSO_HANDLER_URL = "https://myaccount.mytnb.com.my/SSO/SSOHandler"
 

{python_mytnb-0.1.0 → python_mytnb-0.3.0}/src/mytnb/client/legacy.py

@@ -7,7 +7,7 @@ import json
 import logging
 from typing import Any
 
-import tls_client
+from curl_cffi import requests as curl_requests
 
 from mytnb.auth import Credentials
 from mytnb.client.config import (
@@ -30,7 +30,7 @@ class _LegacyTransport:
 
     def __init__(
         self,
-        session: tls_client.Session,
+        session: curl_requests.Session,
         credentials: Credentials,
         timeout: float,
         use_staging_key: bool,
@@ -74,11 +74,18 @@ class _LegacyTransport:
             "ses_param2": "",
         }
 
+    def base_device_info(self) -> dict:
+        """Build the deviceInf object from credentials for legacy ASMX requests."""
+        di = self._credentials.device_info
+        if not di:
+            return {}
+        return di.to_dict()
+
     async def post(self, endpoint: str, data: Any) -> dict:
         """Make a POST request to the legacy ASMX API.
 
         Automatically encrypts the data using AES-256-CBC + RSA-OAEP.
-        Uses tls_client with an Android TLS fingerprint to bypass CloudFront WAF.
+        Uses curl_cffi with a TLS fingerprint to bypass CloudFront WAF.
         """
         url = f"{LEGACY_BASE_URL}/{endpoint}"
         req_headers = self.headers()
@@ -92,7 +99,7 @@ class _LegacyTransport:
             url,
             headers=req_headers,
             json=body,
-            timeout_seconds=int(self._timeout),
+            timeout=int(self._timeout),
         )
         logger.debug("Legacy POST %s → %s", endpoint, response.status_code)
 

{python_mytnb-0.1.0 → python_mytnb-0.3.0}/src/mytnb/models.py

@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from typing import Optional
+from typing import Any, Optional
 
-from pydantic import BaseModel, Field
+from pydantic import AliasChoices, BaseModel, Field, field_validator
 
 
 class TariffBlock(BaseModel):
@@ -150,6 +150,26 @@ class ByMonthData(BaseModel):
     model_config = {"populate_by_name": True}
 
 
+class TariffBlockLegendItem(BaseModel):
+    """A single tariff rate block in the legend (e.g. BLK1: RM 0.218/kWh)."""
+
+    block_id: str = Field(alias="BlockId")
+    block_range: str = Field(default="", alias="BlockRange")
+    block_price: str = Field(default="", alias="BlockPrice")
+
+    model_config = {"populate_by_name": True, "extra": "ignore"}
+
+
+class TariffBlockLegendGroup(BaseModel):
+    """A monthly group of RP4 tariff legend items."""
+
+    items: list[TariffBlockLegendItem] = Field(
+        default_factory=list, alias="TariffBlocksLegend"
+    )
+
+    model_config = {"populate_by_name": True, "extra": "ignore"}
+
+
 class AccountUsage(BaseModel):
     """Full account usage response from GetAccountUsageSmart."""
 
@@ -161,6 +181,8 @@ class AccountUsage(BaseModel):
     start_date: Optional[str] = None
     end_date: Optional[str] = None
     date_range: Optional[str] = None
+    tariff_blocks_legend: list[TariffBlockLegendItem] = Field(default_factory=list)
+    tariff_blocks_legend_rp4: list[TariffBlockLegendGroup] = Field(default_factory=list)
 
     @classmethod
     def from_api_response(cls, data: dict) -> "AccountUsage":
@@ -178,6 +200,18 @@ class AccountUsage(BaseModel):
         by_day_raw = data.get("ByDay", [])
         by_day = [DailyUsageWeek.model_validate(w) for w in by_day_raw]
 
+        # Tariff block legends (residential)
+        legend_raw = data.get("TariffBlocksLegend", [])
+        tariff_blocks_legend = [
+            TariffBlockLegendItem.model_validate(item) for item in legend_raw
+        ]
+
+        # Tariff block legends by month (RP4 commercial)
+        rp4_raw = data.get("TariffBlocksLegendByMonthListRP4", [])
+        tariff_blocks_legend_rp4 = [
+            TariffBlockLegendGroup.model_validate(group) for group in rp4_raw
+        ]
+
         return cls(
             usage_metrics=usage_metrics,
             cost_metrics=cost_metrics,
@@ -187,6 +221,8 @@ class AccountUsage(BaseModel):
             start_date=data.get("StartDate"),
             end_date=data.get("EndDate"),
             date_range=data.get("DateRange"),
+            tariff_blocks_legend=tariff_blocks_legend,
+            tariff_blocks_legend_rp4=tariff_blocks_legend_rp4,
         )
 
     @property
@@ -234,3 +270,105 @@ class BREligibility(BaseModel):
     is_tenant_already_opt_in: bool = Field(default=False, alias="isTenantAlreadyOptIn")
 
     model_config = {"populate_by_name": True}
+
+
+class CustomerAccount(BaseModel):
+    """A linked/customer account returned by the account auto-discovery endpoint.
+
+    Uses GET /v3/account/GetAccount via the AWS API gateway.
+    Returns all accounts linked to the current user without needing
+    to know account numbers ahead of time.
+    """
+
+    account_number: str = Field(alias="accNum")
+    user_account_id: str = Field(
+        default="",
+        validation_alias=AliasChoices("userAccountId", "userAccountID"),
+    )
+    account_desc: str = Field(default="", alias="accDesc")
+    ic_num: str = Field(default="", alias="icNum")
+    current_charges: str = Field(default="", alias="amCurrentChg")
+    is_registered: str = Field(default="", alias="isRegistered")
+    is_paid: str = Field(default="", alias="isPaid")
+    is_owned: str = Field(default="", alias="isOwned")
+    is_error: str = Field(default="", alias="isError")
+    message: Optional[str] = Field(default=None, alias="message")
+    account_type_id: str = Field(default="", alias="accountTypeId")
+    account_st_address: str = Field(default="", alias="accountStAddress")
+    owner_name: str = Field(default="", alias="ownerName")
+    account_category_id: str = Field(default="", alias="accountCategoryId")
+    smart_meter_code: str = Field(
+        default="",
+        validation_alias=AliasChoices("smartMeterCode", "SmartMeterCode"),
+    )
+    is_tagged_smr: str = Field(default="", alias="isTaggedSMR")
+    is_have_access: bool = Field(default=False, alias="IsHaveAccess")
+    is_apply_ebilling: bool = Field(default=False, alias="IsApplyEBilling")
+    budget_amount: str = Field(default="", alias="BudgetAmount")
+    installation_type: str = Field(default="", alias="InstallationType")
+    created_date: str = Field(default="", alias="CreatedDate")
+    business_area: str = Field(default="", alias="BusinessArea")
+    rate_category: str = Field(default="", alias="RateCategory")
+
+    model_config = {"populate_by_name": True, "extra": "ignore"}
+
+    # -- Coerce fields that can arrive as null, numbers, or string bools --
+
+    @field_validator(
+        "account_desc",
+        "ic_num",
+        "current_charges",
+        "budget_amount",
+        "account_type_id",
+        "account_st_address",
+        "owner_name",
+        "account_category_id",
+        "smart_meter_code",
+        "installation_type",
+        "created_date",
+        "business_area",
+        "rate_category",
+        "message",
+        "is_registered",
+        "is_paid",
+        "is_owned",
+        "is_error",
+        "is_tagged_smr",
+        mode="before",
+    )
+    @classmethod
+    def _coerce_to_str(cls, v: Any) -> str:
+        """Normalise values that may arrive as null, int, float, or bool."""
+        if v is None:
+            return ""
+        if isinstance(v, bool):
+            return str(v)
+        if isinstance(v, (int, float)):
+            return str(v)
+        return str(v)
+
+    # -- Helpers ----------------------------------------------------------
+
+    @property
+    def is_smart_meter(self) -> bool:
+        """Whether this account has a smart meter."""
+        # pylint: disable=no-member
+        return self.is_tagged_smr.lower() == "true"
+
+    @property
+    def is_registered_bool(self) -> bool:
+        """isRegistered as a boolean."""
+        # pylint: disable=no-member
+        return self.is_registered.lower() == "true"
+
+    @property
+    def is_owned_bool(self) -> bool:
+        """isOwned as a boolean."""
+        # pylint: disable=no-member
+        return self.is_owned.lower() == "true"
+
+    @property
+    def is_paid_bool(self) -> bool:
+        """isPaid as a boolean."""
+        # pylint: disable=no-member
+        return self.is_paid.lower() == "true"