pgw-api 1.1.0__tar.gz → 1.2.0__tar.gz

pgw_api-1.2.0/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 zackwag
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{pgw_api-1.1.0 → pgw_api-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pgw-api
-Version: 1.1.0
+Version: 1.2.0
 Summary: Python API client for Philadelphia Gas Works (PGW)
 Author: zackwag
 License: MIT
@@ -8,11 +8,13 @@ Project-URL: Homepage, https://github.com/zackwag/pgw-api
 Project-URL: Issues, https://github.com/zackwag/pgw-api/issues
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: aiohttp>=3.9.0
+Dynamic: license-file
 
 # pgw-api
 
-Python API client for [Philadelphia Gas Works (PGW)](https://www.pgworks.com/). Fetches monthly natural gas usage data from the PGW customer portal.
+Python API client for [Philadelphia Gas Works (PGW)](https://www.pgworks.com/). Fetches natural gas usage data (monthly, daily, and hourly) from the PGW customer portal.
 
 ## Installation
 
@@ -51,6 +53,30 @@ Creates a client instance with PGW portal credentials.
 
 Authenticates and returns a list of `GasUsage` objects sorted by month (newest first).
 
+### `await client.async_get_daily_usage(session, start, end)`
+
+Authenticates and returns a list of `DailyGasUsage` objects for the given date range (newest first). Requires a smart meter — most residential accounts only have monthly data and will return an empty list.
+
+```python
+from datetime import date
+
+daily = await client.async_get_daily_usage(session, date(2024, 1, 1), date(2024, 1, 31))
+for entry in daily:
+    print(f"{entry.date}: {entry.ccf} CCF")
+```
+
+### `await client.async_get_hourly_usage(session, usage_date)`
+
+Authenticates and returns a list of `HourlyGasUsage` objects for a single day (newest first). Requires a smart meter that reports interval data. Most residential accounts only have monthly data and will return an empty list.
+
+```python
+from datetime import date
+
+hourly = await client.async_get_hourly_usage(session, date(2024, 1, 15))
+for entry in hourly:
+    print(f"{entry.timestamp}: {entry.ccf} CCF")
+```
+
 ### `await client.async_validate_credentials(session)`
 
 Validates credentials without fetching usage data. Returns `True` or raises `PGWAuthError`.
@@ -65,6 +91,22 @@ Validates credentials without fetching usage data. Returns `True` or raises `PGW
 | `period_start` | `date \| None` | Meter read start date |
 | `period_end` | `date \| None` | Meter read end date |
 
+### `DailyGasUsage`
+
+| Property | Type | Description |
+|----------|------|-------------|
+| `date` | `date` | Usage date |
+| `ccf` | `float` | Usage in hundreds of cubic feet |
+| `cf` | `float` | Usage in cubic feet (CCF × 100) |
+
+### `HourlyGasUsage`
+
+| Property | Type | Description |
+|----------|------|-------------|
+| `timestamp` | `datetime` | Usage timestamp |
+| `ccf` | `float` | Usage in hundreds of cubic feet |
+| `cf` | `float` | Usage in cubic feet (CCF × 100) |
+
 ### Exceptions
 
 - `PGWAuthError` — invalid credentials or expired session

{pgw_api-1.1.0 → pgw_api-1.2.0}/README.md

@@ -1,6 +1,6 @@
 # pgw-api
 
-Python API client for [Philadelphia Gas Works (PGW)](https://www.pgworks.com/). Fetches monthly natural gas usage data from the PGW customer portal.
+Python API client for [Philadelphia Gas Works (PGW)](https://www.pgworks.com/). Fetches natural gas usage data (monthly, daily, and hourly) from the PGW customer portal.
 
 ## Installation
 
@@ -39,6 +39,30 @@ Creates a client instance with PGW portal credentials.
 
 Authenticates and returns a list of `GasUsage` objects sorted by month (newest first).
 
+### `await client.async_get_daily_usage(session, start, end)`
+
+Authenticates and returns a list of `DailyGasUsage` objects for the given date range (newest first). Requires a smart meter — most residential accounts only have monthly data and will return an empty list.
+
+```python
+from datetime import date
+
+daily = await client.async_get_daily_usage(session, date(2024, 1, 1), date(2024, 1, 31))
+for entry in daily:
+    print(f"{entry.date}: {entry.ccf} CCF")
+```
+
+### `await client.async_get_hourly_usage(session, usage_date)`
+
+Authenticates and returns a list of `HourlyGasUsage` objects for a single day (newest first). Requires a smart meter that reports interval data. Most residential accounts only have monthly data and will return an empty list.
+
+```python
+from datetime import date
+
+hourly = await client.async_get_hourly_usage(session, date(2024, 1, 15))
+for entry in hourly:
+    print(f"{entry.timestamp}: {entry.ccf} CCF")
+```
+
 ### `await client.async_validate_credentials(session)`
 
 Validates credentials without fetching usage data. Returns `True` or raises `PGWAuthError`.
@@ -53,6 +77,22 @@ Validates credentials without fetching usage data. Returns `True` or raises `PGW
 | `period_start` | `date \| None` | Meter read start date |
 | `period_end` | `date \| None` | Meter read end date |
 
+### `DailyGasUsage`
+
+| Property | Type | Description |
+|----------|------|-------------|
+| `date` | `date` | Usage date |
+| `ccf` | `float` | Usage in hundreds of cubic feet |
+| `cf` | `float` | Usage in cubic feet (CCF × 100) |
+
+### `HourlyGasUsage`
+
+| Property | Type | Description |
+|----------|------|-------------|
+| `timestamp` | `datetime` | Usage timestamp |
+| `ccf` | `float` | Usage in hundreds of cubic feet |
+| `cf` | `float` | Usage in cubic feet (CCF × 100) |
+
 ### Exceptions
 
 - `PGWAuthError` — invalid credentials or expired session

{pgw_api-1.1.0 → pgw_api-1.2.0}/pgw_api/__init__.py

@@ -2,11 +2,13 @@
 
 from .client import PGWApiClient
 from .exceptions import PGWAuthError, PGWConnectionError, PGWError
-from .models import BillingSummary, GasUsage
+from .models import BillingSummary, DailyGasUsage, GasUsage, HourlyGasUsage
 
 __all__ = [
     "BillingSummary",
+    "DailyGasUsage",
     "GasUsage",
+    "HourlyGasUsage",
     "PGWApiClient",
     "PGWAuthError",
     "PGWConnectionError",

{pgw_api-1.1.0 → pgw_api-1.2.0}/pgw_api/client.py

@@ -9,7 +9,7 @@ from datetime import date
 import aiohttp
 
 from .exceptions import PGWAuthError, PGWConnectionError
-from .models import BillingSummary, GasUsage
+from .models import BillingSummary, DailyGasUsage, GasUsage, HourlyGasUsage
 
 BASE_URL = "https://myaccount.pgworks.com/portal"
 LOGIN_URL = f"{BASE_URL}/"
@@ -50,6 +50,29 @@ class PGWApiClient:
         await self._authenticate(session)
         return await self._load_billing(session)
 
+    async def async_get_daily_usage(
+        self,
+        session: aiohttp.ClientSession,
+        start: date,
+        end: date,
+    ) -> list[DailyGasUsage]:
+        """Authenticate and fetch daily gas usage for a date range."""
+        await self._establish_session(session)
+        await self._authenticate(session)
+        csrf_token = await self._get_csrf_token(session)
+        return await self._load_daily_gas_usage(session, csrf_token, start, end)
+
+    async def async_get_hourly_usage(
+        self,
+        session: aiohttp.ClientSession,
+        usage_date: date,
+    ) -> list[HourlyGasUsage]:
+        """Authenticate and fetch hourly gas usage for a single day."""
+        await self._establish_session(session)
+        await self._authenticate(session)
+        csrf_token = await self._get_csrf_token(session)
+        return await self._load_hourly_gas_usage(session, csrf_token, usage_date)
+
     async def async_get_all(
         self, session: aiohttp.ClientSession
     ) -> tuple[list[GasUsage], BillingSummary]:
@@ -304,6 +327,169 @@ class PGWApiClient:
 
         return sorted(results, key=lambda u: u.month, reverse=True)
 
+    async def _load_daily_gas_usage(
+        self,
+        session: aiohttp.ClientSession,
+        csrf_token: str,
+        start: date,
+        end: date,
+    ) -> list[DailyGasUsage]:
+        """Call LoadGasUsage in daily mode for a date range."""
+        payload = {
+            "Type": "C",
+            "Mode": "D",
+            "strDate": "",
+            "hourlyType": "",
+            "seasonId": "",
+            "weatherOverlay": "0",
+            "usageyear": "",
+            "MeterNumber": "",
+            "DateFromDaily": start.strftime("%m/%d/%y"),
+            "DateToDaily": end.strftime("%m/%d/%y"),
+            "HistID": "0",
+            "requiredDataType": 0,
+        }
+        headers = {
+            **_HEADERS,
+            "Referer": f"{USAGE_URL}?type=GU",
+            "CSRFToken": csrf_token,
+        }
+
+        try:
+            async with session.post(
+                LOAD_GAS_URL, json=payload, headers=headers
+            ) as resp:
+                if resp.status != 200:
+                    raise PGWConnectionError(
+                        f"LoadGasUsage (daily) returned status {resp.status}"
+                    )
+                body = await resp.text()
+        except aiohttp.ClientError as err:
+            raise PGWConnectionError(
+                f"Failed to fetch daily gas usage: {err}"
+            ) from err
+
+        try:
+            data = json.loads(body)
+            inner = json.loads(data["d"])
+        except (json.JSONDecodeError, KeyError) as err:
+            raise PGWConnectionError(
+                "Unexpected response from LoadGasUsage (daily)"
+            ) from err
+
+        if isinstance(inner, dict) and "dtException" in inner:
+            msg = inner["dtException"][0].get("MessageInformation", "Unknown error")
+            if "CSRF" in msg:
+                raise PGWAuthError("CSRF token invalid - session may have expired")
+            raise PGWConnectionError(msg)
+
+        usage_entries = inner.get("objUsageGenerationResultSetTwo", [])
+        if not usage_entries:
+            return []
+
+        results: list[DailyGasUsage] = []
+        for entry in usage_entries:
+            entry_date = _parse_date(entry.get("FromDate"))
+            ccf = entry.get("UsageValue")
+
+            if entry_date is None or ccf is None:
+                continue
+
+            results.append(DailyGasUsage(date=entry_date, ccf=float(ccf)))
+
+        return sorted(results, key=lambda u: u.date, reverse=True)
+
+    async def _load_hourly_gas_usage(
+        self,
+        session: aiohttp.ClientSession,
+        csrf_token: str,
+        usage_date: date,
+    ) -> list[HourlyGasUsage]:
+        """Call LoadGasUsage in daily mode with hourlyType to get hourly data."""
+        from datetime import datetime
+
+        payload = {
+            "Type": "C",
+            "Mode": "D",
+            "strDate": usage_date.strftime("%m/%d/%y"),
+            "hourlyType": "H",
+            "seasonId": "",
+            "weatherOverlay": "0",
+            "usageyear": "",
+            "MeterNumber": "",
+            "DateFromDaily": "",
+            "DateToDaily": "",
+            "HistID": "0",
+            "requiredDataType": 0,
+        }
+        headers = {
+            **_HEADERS,
+            "Referer": f"{USAGE_URL}?type=GU",
+            "CSRFToken": csrf_token,
+        }
+
+        try:
+            async with session.post(
+                LOAD_GAS_URL, json=payload, headers=headers
+            ) as resp:
+                if resp.status != 200:
+                    raise PGWConnectionError(
+                        f"LoadGasUsage (hourly) returned status {resp.status}"
+                    )
+                body = await resp.text()
+        except aiohttp.ClientError as err:
+            raise PGWConnectionError(
+                f"Failed to fetch hourly gas usage: {err}"
+            ) from err
+
+        try:
+            data = json.loads(body)
+            inner = json.loads(data["d"])
+        except (json.JSONDecodeError, KeyError) as err:
+            raise PGWConnectionError(
+                "Unexpected response from LoadGasUsage (hourly)"
+            ) from err
+
+        if isinstance(inner, dict) and "dtException" in inner:
+            msg = inner["dtException"][0].get("MessageInformation", "Unknown error")
+            if "CSRF" in msg:
+                raise PGWAuthError("CSRF token invalid - session may have expired")
+            raise PGWConnectionError(msg)
+
+        usage_entries = inner.get("objUsageGenerationResultSetTwo", [])
+        if not usage_entries:
+            return []
+
+        results: list[HourlyGasUsage] = []
+        for entry in usage_entries:
+            ts = _parse_datetime(entry.get("FromDate"))
+            ccf = entry.get("UsageValue")
+
+            if ts is None or ccf is None:
+                continue
+
+            results.append(HourlyGasUsage(timestamp=ts, ccf=float(ccf)))
+
+        return sorted(results, key=lambda u: u.timestamp, reverse=True)
+
+
+def _parse_datetime(dt_str: str | None) -> datetime | None:
+    """Parse a datetime string from the portal (various formats)."""
+    if not dt_str:
+        return None
+    from datetime import datetime
+
+    for fmt in ("%m/%d/%Y %I:%M:%S %p", "%m/%d/%Y %H:%M:%S", "%m/%d/%y %I:%M:%S %p", "%m/%d/%y"):
+        try:
+            return datetime.strptime(dt_str, fmt)
+        except ValueError:
+            continue
+
+    parsed_date = _parse_date(dt_str)
+    if parsed_date:
+        return datetime(parsed_date.year, parsed_date.month, parsed_date.day)
+    return None
+
 
 def _parse_date(date_str: str | None) -> date | None:
     """Parse a date string in MM/DD/YY format."""

{pgw_api-1.1.0 → pgw_api-1.2.0}/pgw_api/models.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from datetime import date
+from datetime import date, datetime
 
 
 CCF_TO_CF = 100.0
@@ -24,6 +24,32 @@ class GasUsage:
         return self.ccf * CCF_TO_CF
 
 
+@dataclass
+class DailyGasUsage:
+    """A single day of gas usage data."""
+
+    date: date
+    ccf: float
+
+    @property
+    def cf(self) -> float:
+        """Usage in cubic feet."""
+        return self.ccf * CCF_TO_CF
+
+
+@dataclass
+class HourlyGasUsage:
+    """A single hour (or 15-min interval) of gas usage data."""
+
+    timestamp: datetime
+    ccf: float
+
+    @property
+    def cf(self) -> float:
+        """Usage in cubic feet."""
+        return self.ccf * CCF_TO_CF
+
+
 @dataclass
 class BillingSummary:
     """Current billing summary from the BillDashboard."""

{pgw_api-1.1.0 → pgw_api-1.2.0}/pgw_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pgw-api
-Version: 1.1.0
+Version: 1.2.0
 Summary: Python API client for Philadelphia Gas Works (PGW)
 Author: zackwag
 License: MIT
@@ -8,11 +8,13 @@ Project-URL: Homepage, https://github.com/zackwag/pgw-api
 Project-URL: Issues, https://github.com/zackwag/pgw-api/issues
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: aiohttp>=3.9.0
+Dynamic: license-file
 
 # pgw-api
 
-Python API client for [Philadelphia Gas Works (PGW)](https://www.pgworks.com/). Fetches monthly natural gas usage data from the PGW customer portal.
+Python API client for [Philadelphia Gas Works (PGW)](https://www.pgworks.com/). Fetches natural gas usage data (monthly, daily, and hourly) from the PGW customer portal.
 
 ## Installation
 
@@ -51,6 +53,30 @@ Creates a client instance with PGW portal credentials.
 
 Authenticates and returns a list of `GasUsage` objects sorted by month (newest first).
 
+### `await client.async_get_daily_usage(session, start, end)`
+
+Authenticates and returns a list of `DailyGasUsage` objects for the given date range (newest first). Requires a smart meter — most residential accounts only have monthly data and will return an empty list.
+
+```python
+from datetime import date
+
+daily = await client.async_get_daily_usage(session, date(2024, 1, 1), date(2024, 1, 31))
+for entry in daily:
+    print(f"{entry.date}: {entry.ccf} CCF")
+```
+
+### `await client.async_get_hourly_usage(session, usage_date)`
+
+Authenticates and returns a list of `HourlyGasUsage` objects for a single day (newest first). Requires a smart meter that reports interval data. Most residential accounts only have monthly data and will return an empty list.
+
+```python
+from datetime import date
+
+hourly = await client.async_get_hourly_usage(session, date(2024, 1, 15))
+for entry in hourly:
+    print(f"{entry.timestamp}: {entry.ccf} CCF")
+```
+
 ### `await client.async_validate_credentials(session)`
 
 Validates credentials without fetching usage data. Returns `True` or raises `PGWAuthError`.
@@ -65,6 +91,22 @@ Validates credentials without fetching usage data. Returns `True` or raises `PGW
 | `period_start` | `date \| None` | Meter read start date |
 | `period_end` | `date \| None` | Meter read end date |
 
+### `DailyGasUsage`
+
+| Property | Type | Description |
+|----------|------|-------------|
+| `date` | `date` | Usage date |
+| `ccf` | `float` | Usage in hundreds of cubic feet |
+| `cf` | `float` | Usage in cubic feet (CCF × 100) |
+
+### `HourlyGasUsage`
+
+| Property | Type | Description |
+|----------|------|-------------|
+| `timestamp` | `datetime` | Usage timestamp |
+| `ccf` | `float` | Usage in hundreds of cubic feet |
+| `cf` | `float` | Usage in cubic feet (CCF × 100) |
+
 ### Exceptions
 
 - `PGWAuthError` — invalid credentials or expired session

{pgw_api-1.1.0 → pgw_api-1.2.0}/pgw_api.egg-info/SOURCES.txt

@@ -1,3 +1,4 @@
+LICENSE
 README.md
 pyproject.toml
 pgw_api/__init__.py
@@ -8,4 +9,7 @@ pgw_api.egg-info/PKG-INFO
 pgw_api.egg-info/SOURCES.txt
 pgw_api.egg-info/dependency_links.txt
 pgw_api.egg-info/requires.txt
-pgw_api.egg-info/top_level.txt
+pgw_api.egg-info/top_level.txt
+tests/test_client.py
+tests/test_models.py
+tests/test_parsing.py

{pgw_api-1.1.0 → pgw_api-1.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pgw-api"
-version = "1.1.0"
+version = "1.2.0"
 description = "Python API client for Philadelphia Gas Works (PGW)"
 readme = "README.md"
 license = {text = "MIT"}
@@ -20,5 +20,8 @@ dependencies = [
 Homepage = "https://github.com/zackwag/pgw-api"
 Issues = "https://github.com/zackwag/pgw-api/issues"
 
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+
 [tool.setuptools.packages.find]
 include = ["pgw_api*"]

pgw_api-1.2.0/tests/test_client.py

@@ -0,0 +1,199 @@
+"""Tests for PGWApiClient using mocked HTTP responses."""
+
+import json
+from datetime import date, datetime
+from unittest.mock import AsyncMock, MagicMock
+
+import pytest
+
+from pgw_api.client import PGWApiClient
+from pgw_api.exceptions import PGWAuthError, PGWConnectionError
+from tests.conftest import CSRF_HTML, make_login_success, make_response, make_webmethod_response
+
+
+def _setup_session(responses):
+    """Wire up a mock session with a sequence of responses."""
+    session = MagicMock()
+    idx = {"i": 0}
+
+    def _ctx(resp):
+        cm = MagicMock()
+        cm.__aenter__ = AsyncMock(return_value=resp)
+        cm.__aexit__ = AsyncMock(return_value=False)
+        return cm
+
+    def _next(*args, **kwargs):
+        r = responses[idx["i"]]
+        idx["i"] += 1
+        return _ctx(r)
+
+    session.get = MagicMock(side_effect=_next)
+    session.post = MagicMock(side_effect=_next)
+    return session
+
+
+class TestMonthlyUsage:
+    @pytest.mark.asyncio
+    async def test_parses_monthly_entries(self):
+        usage_payload = make_webmethod_response({
+            "objUsageGenerationResultSetTwo": [
+                {"Month": 1, "Year": 2024, "UsageValue": 85.0, "FromDate": "12/15/23", "ToDate": "01/16/24"},
+                {"Month": 12, "Year": 2023, "UsageValue": 72.0, "FromDate": "11/14/23", "ToDate": "12/15/23"},
+            ]
+        })
+        session = _setup_session([
+            make_response(),                      # GET login page
+            make_response(text=make_login_success()),  # POST validateLogin
+            make_response(),                      # GET Dashboard
+            make_response(text=CSRF_HTML),         # GET usage page
+            make_response(text=usage_payload),     # POST LoadGasUsage
+        ])
+
+        client = PGWApiClient("user", "pass")
+        result = await client.async_get_usage(session)
+
+        assert len(result) == 2
+        assert result[0].month == date(2024, 1, 1)
+        assert result[0].ccf == 85.0
+        assert result[1].month == date(2023, 12, 1)
+
+    @pytest.mark.asyncio
+    async def test_empty_usage(self):
+        usage_payload = make_webmethod_response({"objUsageGenerationResultSetTwo": []})
+        session = _setup_session([
+            make_response(),
+            make_response(text=make_login_success()),
+            make_response(),
+            make_response(text=CSRF_HTML),
+            make_response(text=usage_payload),
+        ])
+
+        client = PGWApiClient("user", "pass")
+        result = await client.async_get_usage(session)
+        assert result == []
+
+
+class TestDailyUsage:
+    @pytest.mark.asyncio
+    async def test_parses_daily_entries(self):
+        usage_payload = make_webmethod_response({
+            "objUsageGenerationResultSetTwo": [
+                {"FromDate": "01/15/24", "UsageValue": 3.2},
+                {"FromDate": "01/14/24", "UsageValue": 4.1},
+                {"FromDate": "01/16/24", "UsageValue": 2.8},
+            ]
+        })
+        session = _setup_session([
+            make_response(),
+            make_response(text=make_login_success()),
+            make_response(),
+            make_response(text=CSRF_HTML),
+            make_response(text=usage_payload),
+        ])
+
+        client = PGWApiClient("user", "pass")
+        result = await client.async_get_daily_usage(
+            session, date(2024, 1, 14), date(2024, 1, 16)
+        )
+
+        assert len(result) == 3
+        assert result[0].date == date(2024, 1, 16)
+        assert result[0].ccf == 2.8
+        assert result[-1].date == date(2024, 1, 14)
+
+    @pytest.mark.asyncio
+    async def test_skips_entries_missing_date(self):
+        usage_payload = make_webmethod_response({
+            "objUsageGenerationResultSetTwo": [
+                {"FromDate": "01/15/24", "UsageValue": 3.2},
+                {"FromDate": None, "UsageValue": 4.1},
+            ]
+        })
+        session = _setup_session([
+            make_response(),
+            make_response(text=make_login_success()),
+            make_response(),
+            make_response(text=CSRF_HTML),
+            make_response(text=usage_payload),
+        ])
+
+        client = PGWApiClient("user", "pass")
+        result = await client.async_get_daily_usage(
+            session, date(2024, 1, 1), date(2024, 1, 31)
+        )
+        assert len(result) == 1
+
+
+class TestHourlyUsage:
+    @pytest.mark.asyncio
+    async def test_parses_hourly_entries(self):
+        usage_payload = make_webmethod_response({
+            "objUsageGenerationResultSetTwo": [
+                {"FromDate": "01/15/2024 01:00:00 AM", "UsageValue": 0.3},
+                {"FromDate": "01/15/2024 02:00:00 AM", "UsageValue": 0.4},
+                {"FromDate": "01/15/2024 12:00:00 PM", "UsageValue": 0.1},
+            ]
+        })
+        session = _setup_session([
+            make_response(),
+            make_response(text=make_login_success()),
+            make_response(),
+            make_response(text=CSRF_HTML),
+            make_response(text=usage_payload),
+        ])
+
+        client = PGWApiClient("user", "pass")
+        result = await client.async_get_hourly_usage(session, date(2024, 1, 15))
+
+        assert len(result) == 3
+        assert result[0].timestamp == datetime(2024, 1, 15, 12, 0, 0)
+        assert result[0].ccf == 0.1
+        assert result[-1].timestamp == datetime(2024, 1, 15, 1, 0, 0)
+
+    @pytest.mark.asyncio
+    async def test_empty_hourly(self):
+        usage_payload = make_webmethod_response({"objUsageGenerationResultSetTwo": []})
+        session = _setup_session([
+            make_response(),
+            make_response(text=make_login_success()),
+            make_response(),
+            make_response(text=CSRF_HTML),
+            make_response(text=usage_payload),
+        ])
+
+        client = PGWApiClient("user", "pass")
+        result = await client.async_get_hourly_usage(session, date(2024, 1, 15))
+        assert result == []
+
+
+class TestErrorHandling:
+    @pytest.mark.asyncio
+    async def test_csrf_error_raises_auth_error(self):
+        error_payload = make_webmethod_response({
+            "dtException": [{"MessageInformation": "Invalid CSRF Token"}]
+        })
+        session = _setup_session([
+            make_response(),
+            make_response(text=make_login_success()),
+            make_response(),
+            make_response(text=CSRF_HTML),
+            make_response(text=error_payload),
+        ])
+
+        client = PGWApiClient("user", "pass")
+        with pytest.raises(PGWAuthError, match="CSRF"):
+            await client.async_get_usage(session)
+
+    @pytest.mark.asyncio
+    async def test_bad_credentials(self):
+        login_fail = make_webmethod_response(
+            [{"STATUS": 0, "Message": "Invalid username or password"}]
+        )
+        session = _setup_session([
+            make_response(),
+            make_response(text=login_fail),
+        ])
+
+        client = PGWApiClient("user", "wrong")
+        with pytest.raises(PGWAuthError, match="Invalid username"):
+            await client.async_get_usage(session)

pgw_api-1.2.0/tests/test_models.py

@@ -0,0 +1,36 @@
+"""Tests for data models."""
+
+from datetime import date, datetime
+
+from pgw_api.models import DailyGasUsage, GasUsage, HourlyGasUsage
+
+
+class TestGasUsage:
+    def test_cf_conversion(self):
+        entry = GasUsage(month=date(2024, 1, 1), ccf=85.0)
+        assert entry.cf == 8500.0
+
+    def test_optional_fields_default_none(self):
+        entry = GasUsage(month=date(2024, 1, 1), ccf=10.0)
+        assert entry.period_start is None
+        assert entry.period_end is None
+
+
+class TestDailyGasUsage:
+    def test_cf_conversion(self):
+        entry = DailyGasUsage(date=date(2024, 1, 15), ccf=5.0)
+        assert entry.cf == 500.0
+
+    def test_zero_usage(self):
+        entry = DailyGasUsage(date=date(2024, 7, 1), ccf=0.0)
+        assert entry.cf == 0.0
+
+
+class TestHourlyGasUsage:
+    def test_cf_conversion(self):
+        entry = HourlyGasUsage(timestamp=datetime(2024, 1, 15, 14, 0), ccf=0.5)
+        assert entry.cf == 50.0
+
+    def test_zero_usage(self):
+        entry = HourlyGasUsage(timestamp=datetime(2024, 7, 1, 12, 0), ccf=0.0)
+        assert entry.cf == 0.0

pgw_api-1.2.0/tests/test_parsing.py

@@ -0,0 +1,69 @@
+"""Tests for parsing helpers and model construction."""
+
+from datetime import date, datetime
+
+from pgw_api.client import _parse_date, _parse_datetime, _parse_dollar, _parse_float, _parse_int
+
+
+class TestParseDate:
+    def test_mm_dd_yy(self):
+        assert _parse_date("01/15/24") == date(2024, 1, 15)
+
+    def test_mm_dd_yyyy(self):
+        assert _parse_date("12/31/2023") == date(2023, 12, 31)
+
+    def test_none(self):
+        assert _parse_date(None) is None
+
+    def test_empty(self):
+        assert _parse_date("") is None
+
+    def test_invalid(self):
+        assert _parse_date("not-a-date") is None
+
+
+class TestParseDatetime:
+    def test_12hr_format(self):
+        assert _parse_datetime("01/15/2024 02:30:00 PM") == datetime(2024, 1, 15, 14, 30, 0)
+
+    def test_24hr_format(self):
+        assert _parse_datetime("01/15/2024 14:30:00") == datetime(2024, 1, 15, 14, 30, 0)
+
+    def test_short_year(self):
+        assert _parse_datetime("01/15/24") == datetime(2024, 1, 15, 0, 0, 0)
+
+    def test_none(self):
+        assert _parse_datetime(None) is None
+
+    def test_empty(self):
+        assert _parse_datetime("") is None
+
+
+class TestParseDollar:
+    def test_with_symbol(self):
+        assert _parse_dollar("$37.52") == 37.52
+
+    def test_without_symbol(self):
+        assert _parse_dollar("37.52") == 37.52
+
+    def test_with_comma(self):
+        assert _parse_dollar("$1,234.56") == 1234.56
+
+    def test_invalid(self):
+        assert _parse_dollar("N/A") == 0.0
+
+
+class TestParseFloat:
+    def test_valid(self):
+        assert _parse_float("85.5") == 85.5
+
+    def test_invalid(self):
+        assert _parse_float("bad") == 0.0
+
+
+class TestParseInt:
+    def test_valid(self):
+        assert _parse_int("30") == 30
+
+    def test_invalid(self):
+        assert _parse_int("bad") == 0