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

{python_mytnb-0.1.0 → python_mytnb-0.2.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.2.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.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-mytnb
-Version: 0.1.0
+Version: 0.2.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
@@ -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.2.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.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "python-mytnb"
-version = "0.1.0"
+version = "0.2.0"
 description = "Python library to interface with the myTNB API (Tenaga Nasional Berhad)"
 readme = "README.md"
 license = "MIT"

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

@@ -6,6 +6,7 @@ from mytnb.models import (
     AccountUsage,
     BillingMonth,
     CostMetric,
+    CustomerAccount,
     DailyUsage,
     Metric,
     TariffBlock,
@@ -19,6 +20,7 @@ __all__ = [
     "AccountUsage",
     "BillingMonth",
     "CostMetric",
+    "CustomerAccount",
     "DailyUsage",
     "Metric",
     "TariffBlock",

{python_mytnb-0.1.0 → python_mytnb-0.2.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.2.0}/src/mytnb/client/client.py

@@ -9,10 +9,12 @@ import tls_client
 
 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:
@@ -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.2.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.2.0}/src/mytnb/client/legacy.py

@@ -74,6 +74,13 @@ 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.
 

{python_mytnb-0.1.0 → python_mytnb-0.2.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):
@@ -234,3 +234,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"

{python_mytnb-0.1.0 → python_mytnb-0.2.0}/tests/test_cli.py

@@ -1,11 +1,15 @@
 """Tests for mytnb.cli module."""
 
+# pylint: disable=duplicate-code
+
 import json
-from unittest.mock import patch
+from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
+from click.testing import CliRunner
 
-from mytnb.cli import _build_credentials, _load_config, main
+from mytnb.cli import _build_credentials, _load_config, cli, main
+from mytnb.models import CustomerAccount
 
 
 class TestLoadConfig:
@@ -87,3 +91,57 @@ class TestInitConfig:
             with pytest.raises(SystemExit) as exc_info:
                 main()
             assert exc_info.value.code != 0
+
+
+class TestAccountsCommand:
+    """Tests for the `mytnb accounts` auto-discovery command."""
+
+    def test_json_output(self, tmp_path):
+        """Test accounts --json produces valid JSON."""
+        cfg_file = tmp_path / "config.json"
+        cfg_file.write_text(json.dumps({
+            "api_key": "k",
+            "authorization_token": "t",
+            "secure_key": "sk",
+            "user": {"user_name": "u@t.com", "user_id": "uid"},
+            "device": {"device_id": "did"},
+        }))
+
+        sample_acc = CustomerAccount.model_validate({"accNum": "220123456789"})
+        mock_client = MagicMock()
+        mock_client.get_customer_accounts = AsyncMock(return_value=[sample_acc])
+        mock_client.__aenter__ = AsyncMock(return_value=mock_client)
+        mock_client.__aexit__ = AsyncMock(return_value=None)
+
+        with patch("mytnb.cli._get_client", AsyncMock(return_value=mock_client)):
+            runner = CliRunner()
+            result = runner.invoke(
+                cli,
+                ["-c", str(cfg_file), "accounts", "--json"],
+            )
+            assert result.exit_code == 0
+
+    def test_no_accounts(self, tmp_path):
+        """Test accounts shows empty message when no linked accounts."""
+        cfg_file = tmp_path / "config.json"
+        cfg_file.write_text(json.dumps({
+            "api_key": "k",
+            "authorization_token": "t",
+            "secure_key": "sk",
+            "user": {"user_name": "u@t.com", "user_id": "uid"},
+            "device": {"device_id": "did"},
+        }))
+
+        mock_client = MagicMock()
+        mock_client.get_customer_accounts = AsyncMock(return_value=[])
+        mock_client.__aenter__ = AsyncMock(return_value=mock_client)
+        mock_client.__aexit__ = AsyncMock(return_value=None)
+
+        with patch("mytnb.cli._get_client", AsyncMock(return_value=mock_client)):
+            runner = CliRunner()
+            result = runner.invoke(
+                cli,
+                ["-c", str(cfg_file), "accounts"],
+            )
+            assert result.exit_code == 0
+            assert "No linked accounts" in result.output

{python_mytnb-0.1.0 → python_mytnb-0.2.0}/tests/test_client.py

@@ -1,6 +1,6 @@
 """Tests for mytnb.client API client."""
 
-# pylint: disable=protected-access
+# pylint: disable=duplicate-code, protected-access
 
 import base64
 import json
@@ -318,6 +318,69 @@ class TestEndpoints:
             assert len(accounts) == 1
             assert accounts[0].is_smart_meter is True
 
+    @pytest.mark.asyncio
+    async def test_get_customer_accounts(self):
+        response_data = {
+            "data": [
+                {
+                    "accNum": "220123456789",
+                    "userAccountID": "ua-001",
+                    "accDesc": "JALAN EXAMPLE 123",
+                    "icNum": "900101-01-1234",
+                    "amCurrentChg": 45.50,
+                    "isRegistered": "True",
+                    "isPaid": "False",
+                    "isOwned": "True",
+                    "isError": "false",
+                    "message": None,
+                    "accountTypeId": "1",
+                    "accountStAddress": "NO 123, JALAN EXAMPLE, KL",
+                    "ownerName": "AHMAD BIN ALI",
+                    "accountCategoryId": "2",
+                    "SmartMeterCode": "SMC001",
+                    "isTaggedSMR": "true",
+                    "IsHaveAccess": True,
+                    "IsApplyEBilling": True,
+                    "BudgetAmount": 150.00,
+                    "InstallationType": "Residential",
+                    "CreatedDate": "2024-01-15",
+                    "BusinessArea": "KL",
+                    "RateCategory": "Tariff A",
+                },
+                {
+                    "accNum": "220987654321",
+                    "userAccountID": "ua-002",
+                    "isOwned": "False",
+                    "isTaggedSMR": "false",
+                },
+            ],
+        }
+        async with MyTNBClient(_creds()) as client:
+            with patch.object(
+                client._client, "post", new_callable=AsyncMock,
+                return_value=_mock_response(response_data),
+            ):
+                result = await client.get_customer_accounts()
+                assert len(result) == 2
+                assert result[0].account_number == "220123456789"
+                assert result[0].owner_name == "AHMAD BIN ALI"
+                assert result[0].is_smart_meter is True
+                assert result[0].is_owned_bool is True
+                assert result[1].account_number == "220987654321"
+                assert result[1].is_smart_meter is False
+                assert result[1].is_owned_bool is False
+
+    @pytest.mark.asyncio
+    async def test_get_customer_accounts_empty(self):
+        response_data = {"data": []}
+        async with MyTNBClient(_creds()) as client:
+            with patch.object(
+                client._client, "post", new_callable=AsyncMock,
+                return_value=_mock_response(response_data),
+            ):
+                result = await client.get_customer_accounts()
+                assert result == []
+
     @pytest.mark.asyncio
     async def test_get_current_usage(self):
         response_data = {

{python_mytnb-0.1.0 → python_mytnb-0.2.0}/tests/test_models.py

@@ -1,9 +1,12 @@
 """Tests for mytnb.models data models."""
 
+# pylint: disable=duplicate-code
+
 from mytnb.models import (
     AccountUsage,
     BillingMonth,
     BREligibility,
+    CustomerAccount,
     DailyUsage,
     Metric,
     MonthlyTariffBlock,
@@ -282,3 +285,139 @@ class TestBREligibility:
         e = BREligibility.model_validate({"caNo": "123"})
         assert e.is_owner_over_rule is False
         assert e.is_owner_already_opt_in is False
+
+
+class TestCustomerAccount:
+    """Tests for the GetAccountsV4 / GetAccount response model."""
+
+    SAMPLE = {
+        "accNum": "220123456789",
+        "userAccountID": "user-abc-123",
+        "accDesc": "JALAN EXAMPLE 123",
+        "icNum": "900101-01-1234",
+        "amCurrentChg": 45.50,
+        "isRegistered": "True",
+        "isPaid": "False",
+        "isOwned": "True",
+        "isError": "false",
+        "message": None,
+        "accountTypeId": "1",
+        "accountStAddress": "NO 123, JALAN EXAMPLE, 50000 KL",
+        "ownerName": "AHMAD BIN ALI",
+        "accountCategoryId": "2",
+        "SmartMeterCode": "SMC001",
+        "isTaggedSMR": "true",
+        "IsHaveAccess": True,
+        "IsApplyEBilling": True,
+        "BudgetAmount": 150.00,
+        "InstallationType": "Residential",
+        "CreatedDate": "2024-01-15",
+        "BusinessArea": "KL",
+        "RateCategory": "Tariff A",
+    }
+
+    def test_parse_full(self):
+        acc = CustomerAccount.model_validate(self.SAMPLE)
+        assert acc.account_number == "220123456789"
+        assert acc.user_account_id == "user-abc-123"
+        assert acc.account_desc == "JALAN EXAMPLE 123"
+        assert acc.ic_num == "900101-01-1234"
+        assert acc.current_charges == "45.5"
+        assert acc.is_registered == "True"
+        assert acc.is_paid == "False"
+        assert acc.is_owned == "True"
+        assert acc.is_error == "false"
+        assert acc.message == ""
+        assert acc.account_type_id == "1"
+        assert acc.account_st_address == "NO 123, JALAN EXAMPLE, 50000 KL"
+        assert acc.owner_name == "AHMAD BIN ALI"
+        assert acc.account_category_id == "2"
+        assert acc.smart_meter_code == "SMC001"
+        assert acc.is_tagged_smr == "true"
+        assert acc.is_have_access is True
+        assert acc.is_apply_ebilling is True
+        assert acc.budget_amount == "150.0"
+        assert acc.installation_type == "Residential"
+        assert acc.created_date == "2024-01-15"
+        assert acc.business_area == "KL"
+        assert acc.rate_category == "Tariff A"
+
+    def test_is_smart_meter_true(self):
+        acc = CustomerAccount.model_validate(self.SAMPLE)
+        assert acc.is_smart_meter is True
+
+    def test_is_smart_meter_false(self):
+        data = {**self.SAMPLE, "isTaggedSMR": "false"}
+        acc = CustomerAccount.model_validate(data)
+        assert acc.is_smart_meter is False
+
+    def test_is_smart_meter_case_insensitive(self):
+        data = {**self.SAMPLE, "isTaggedSMR": "True"}
+        acc = CustomerAccount.model_validate(data)
+        assert acc.is_smart_meter is True
+
+    def test_boolean_helpers(self):
+        acc = CustomerAccount.model_validate(self.SAMPLE)
+        assert acc.is_registered_bool is True
+        assert acc.is_owned_bool is True
+        assert acc.is_paid_bool is False
+
+    def test_coerces_numeric_fields(self):
+        """Fields like amCurrentChg and BudgetAmount arrive as numbers."""
+        data = {**self.SAMPLE, "amCurrentChg": 0.0, "BudgetAmount": 0}
+        acc = CustomerAccount.model_validate(data)
+        assert acc.current_charges == "0.0"
+        assert acc.budget_amount == "0"
+
+    def test_coerces_bool_fields(self):
+        """isRegistered etc arrive as string 'True'/'False'."""
+        data = {**self.SAMPLE, "isRegistered": "False", "isOwned": "False"}
+        acc = CustomerAccount.model_validate(data)
+        assert acc.is_registered == "False"
+        assert acc.is_owned == "False"
+
+    def test_accepts_useraccount_id_camelcase(self):
+        """Should accept userAccountId (lowercase 'd') as well."""
+        data = {**self.SAMPLE}
+        del data["userAccountID"]
+        data["userAccountId"] = "ua-camel"
+        acc = CustomerAccount.model_validate(data)
+        assert acc.user_account_id == "ua-camel"
+
+    def test_accepts_smartmeter_code_camelcase(self):
+        """Should accept smartMeterCode (lowercase 's') as well."""
+        data = {**self.SAMPLE}
+        del data["SmartMeterCode"]
+        data["smartMeterCode"] = "SM002"
+        acc = CustomerAccount.model_validate(data)
+        assert acc.smart_meter_code == "SM002"
+
+    def test_minimal_fields(self):
+        acc = CustomerAccount.model_validate({"accNum": "220000000000"})
+        assert acc.account_number == "220000000000"
+        assert acc.user_account_id == ""
+        assert acc.owner_name == ""
+        assert acc.is_smart_meter is False
+
+    def test_ignores_extra_fields(self):
+        """Extra fields from the API (unitNo, building, etc.) are ignored."""
+        data = {**self.SAMPLE, "unitNo": "21-7", "building": "RESIDENSI"}
+        acc = CustomerAccount.model_validate(data)
+        assert acc.account_number == "220123456789"  # still parses fine
+
+    def test_null_fields_become_empty_strings(self):
+        """API sends null for optional fields like icNum, message, etc."""
+        data = {
+            "accNum": "220123456789",
+            "icNum": None,
+            "message": None,
+            "accDesc": None,
+            "ownerName": None,
+            "accountStAddress": None,
+        }
+        acc = CustomerAccount.model_validate(data)
+        assert acc.ic_num == ""
+        assert acc.message == ""
+        assert acc.account_desc == ""
+        assert acc.owner_name == ""
+        assert acc.account_st_address == ""

{python_mytnb-0.1.0 → python_mytnb-0.2.0}/uv.lock

@@ -567,7 +567,7 @@ wheels = [
 
 [[package]]
 name = "python-mytnb"
-version = "0.1.0"
+version = "0.2.0"
 source = { editable = "." }
 dependencies = [
     { name = "click" },