tariffkit 0.2.1__tar.gz → 0.2.3__tar.gz

{tariffkit-0.2.1 → tariffkit-0.2.3}/CHANGELOG.md

@@ -5,6 +5,62 @@ All notable changes to this project are documented here. This project follows
 
 ## [Unreleased]
 
+## [0.2.3] - 2026-08-17
+
+### Changed
+- Pacific Gas and Electric now has the unambiguous machine identifier
+  `pacific_gas_and_electric`, while Home Assistant and MQTT present `PG&E` or
+  the full company name. The separate `pge` identifier correctly means Portland
+  General Electric and is recognized but explicitly unsupported for pricing,
+  preventing it from ever selecting California tariff data.
+- Home Assistant now labels the export-minus-import calculation explicitly,
+  translates time-of-use states for display, and presents the forecast horizon
+  as **Rates Available Through**. Forecast metadata and a new **Rate Data
+  Status** entity are grouped under diagnostics, where PTO date, export lock
+  end, NBT vintage, tariff provenance, source, and quality flags explain the
+  active rates without crowding the primary price controls.
+
+### Fixed
+- The PyPI project page now loads the TariffKit banner from an absolute URL
+  instead of an unresolved repository-relative path.
+
+## [0.2.2] - 2026-08-16
+
+### Added
+- Project documentation now uses a TariffKit banner built from the integration's
+  existing icon and a provider-neutral electricity rate curve.
+- Public contribution and support guidance now provides privacy-safe issue
+  forms, private security routing, review ownership, a pull request checklist,
+  community conduct expectations, and exact development checks. The guidance
+  also makes the generated-data and repository-only audit boundaries explicit
+  so public collaboration does not expose utility-account material or alter
+  distribution guarantees.
+- Pull requests now run GitHub's dependency review action with read-only
+  permissions so vulnerable or disallowed dependency changes fail before merge.
+
+### Changed
+- **Python 3.14.2 and Home Assistant 2026.3.0 are now the supported floors.**
+  The lockfile no longer carries the obsolete Home Assistant 2026.2 fallback,
+  and CI audits the complete locked dependency graph with a pinned `pip-audit`
+  release while retaining raw reports as failure artifacts. The Linux secrets
+  extra and Home Assistant tests both inherit the same exact cryptography pin;
+  an expiring policy requires each audit to report exactly its three known,
+  unreachable advisories and rejects any additional finding.
+- The README now explains that default HACS approval may take months and gives
+  complete custom-repository installation steps for use during the review.
+- Workflow actions are pinned to reviewed immutable commits, checkout credentials
+  are not persisted, superseded runs are bounded by concurrency controls, and
+  repository write access is isolated to the jobs that publish results.
+- MQTT now rejects credentials over plaintext unless the operator explicitly
+  allows insecure authentication for an isolated trusted network. Passwords
+  also require a username, while anonymous plaintext publishing remains valid.
+
+### Fixed
+- Rate-sheet regeneration now scans trailing table cells with a linear parser,
+  avoiding pathological regular-expression backtracking on malformed publisher
+  text while preserving accepted dollar, decimal, negative, and change-marker
+  forms.
+
 ## [0.2.1] - 2026-08-16
 
 ### Added
@@ -184,6 +240,8 @@ Initial release.
 - Holiday calendars are extracted per vintage from the source data rather than
   recomputed, because the vintage files disagree in far-future years.
 
-[Unreleased]: https://github.com/eman/tariffkit/compare/v0.2.1...HEAD
+[Unreleased]: https://github.com/eman/tariffkit/compare/v0.2.3...HEAD
+[0.2.3]: https://github.com/eman/tariffkit/releases/tag/v0.2.3
+[0.2.2]: https://github.com/eman/tariffkit/releases/tag/v0.2.2
 [0.2.1]: https://github.com/eman/tariffkit/releases/tag/v0.2.1
 [0.2.0]: https://github.com/eman/tariffkit/releases/tag/v0.2.0

{tariffkit-0.2.1 → tariffkit-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: tariffkit
-Version: 0.2.1
+Version: 0.2.3
 Summary: Offline electricity tariff pricing, billing, and integration tools
 Project-URL: Homepage, https://github.com/eman/tariffkit
 Project-URL: Documentation, https://github.com/eman/tariffkit#documentation
@@ -17,7 +17,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Home Automation
 Classifier: Typing :: Typed
-Requires-Python: >=3.14
+Requires-Python: >=3.14.2
 Provides-Extra: all
 Requires-Dist: fastapi>=0.110; extra == 'all'
 Requires-Dist: httpx>=0.27; extra == 'all'
@@ -43,8 +43,17 @@ Requires-Dist: fastapi>=0.110; extra == 'web'
 Requires-Dist: uvicorn[standard]>=0.29; extra == 'web'
 Description-Content-Type: text/markdown
 
+<p align="center">
+  <img src="https://raw.githubusercontent.com/eman/tariffkit/main/images/banner.svg" alt="TariffKit — electricity pricing, billing, and energy integrations" width="100%">
+</p>
+
 # TariffKit
 
+[![CI](https://github.com/eman/tariffkit/actions/workflows/ci.yml/badge.svg)](https://github.com/eman/tariffkit/actions/workflows/ci.yml)
+[![PyPI](https://img.shields.io/pypi/v/tariffkit)](https://pypi.org/project/tariffkit/)
+[![Python 3.14.2](https://img.shields.io/badge/python-3.14.2-blue.svg)](https://www.python.org/downloads/)
+[![License: MIT](https://img.shields.io/badge/license-MIT-green.svg)](LICENSE)
+
 An offline electricity tariff engine for pricing, billing, and energy-system
 integrations. The first data provider supports PG&E residential rate plans under
 **NEM 3.0 / the Net Billing Tariff (NBT)**; the package identity is deliberately
@@ -134,11 +143,23 @@ pip install 'tariffkit[statements]' # + reading local PG&E statement PDFs
 pip install 'tariffkit[all]'
 ```
 
-The Home Assistant custom component is also available through HACS as a custom
-repository while its default-store submission is reviewed:
+The Home Assistant integration has been
+[submitted to the default HACS store](https://github.com/hacs/default/pull/10019),
+but approval queues can take months. Until it is approved, install TariffKit as
+a custom repository:
 
 [![Open your Home Assistant instance and add the TariffKit repository to HACS](https://my.home-assistant.io/badges/hacs_repository.svg)](https://my.home-assistant.io/redirect/hacs_repository/?owner=eman&repository=tariffkit&category=integration)
 
+Or add it manually:
+
+1. Open **HACS** in Home Assistant.
+2. Select the **three-dot menu → Custom repositories**.
+3. Enter `https://github.com/eman/tariffkit`, choose **Integration**, and select
+   **Add**.
+4. Search HACS for **TariffKit**, open it, and select **Download**.
+5. Restart Home Assistant, then add TariffKit from
+   **Settings → Devices & services → Add integration**.
+
 ## CLI
 
 ```bash

{tariffkit-0.2.1 → tariffkit-0.2.3}/README.md

@@ -1,5 +1,14 @@
+<p align="center">
+  <img src="https://raw.githubusercontent.com/eman/tariffkit/main/images/banner.svg" alt="TariffKit — electricity pricing, billing, and energy integrations" width="100%">
+</p>
+
 # TariffKit
 
+[![CI](https://github.com/eman/tariffkit/actions/workflows/ci.yml/badge.svg)](https://github.com/eman/tariffkit/actions/workflows/ci.yml)
+[![PyPI](https://img.shields.io/pypi/v/tariffkit)](https://pypi.org/project/tariffkit/)
+[![Python 3.14.2](https://img.shields.io/badge/python-3.14.2-blue.svg)](https://www.python.org/downloads/)
+[![License: MIT](https://img.shields.io/badge/license-MIT-green.svg)](LICENSE)
+
 An offline electricity tariff engine for pricing, billing, and energy-system
 integrations. The first data provider supports PG&E residential rate plans under
 **NEM 3.0 / the Net Billing Tariff (NBT)**; the package identity is deliberately
@@ -89,11 +98,23 @@ pip install 'tariffkit[statements]' # + reading local PG&E statement PDFs
 pip install 'tariffkit[all]'
 ```
 
-The Home Assistant custom component is also available through HACS as a custom
-repository while its default-store submission is reviewed:
+The Home Assistant integration has been
+[submitted to the default HACS store](https://github.com/hacs/default/pull/10019),
+but approval queues can take months. Until it is approved, install TariffKit as
+a custom repository:
 
 [![Open your Home Assistant instance and add the TariffKit repository to HACS](https://my.home-assistant.io/badges/hacs_repository.svg)](https://my.home-assistant.io/redirect/hacs_repository/?owner=eman&repository=tariffkit&category=integration)
 
+Or add it manually:
+
+1. Open **HACS** in Home Assistant.
+2. Select the **three-dot menu → Custom repositories**.
+3. Enter `https://github.com/eman/tariffkit`, choose **Integration**, and select
+   **Add**.
+4. Search HACS for **TariffKit**, open it, and select **Download**.
+5. Restart Home Assistant, then add TariffKit from
+   **Settings → Devices & services → Add integration**.
+
 ## CLI
 
 ```bash

{tariffkit-0.2.1 → tariffkit-0.2.3}/pyproject.toml

@@ -4,12 +4,12 @@ build-backend = "hatchling.build"
 
 [project]
 name = "tariffkit"
-version = "0.2.1"
+version = "0.2.3"
 description = "Offline electricity tariff pricing, billing, and integration tools"
 readme = "README.md"
 license = "MIT"
 license-files = ["LICENSE"]
-requires-python = ">=3.14"
+requires-python = ">=3.14.2"
 keywords = ["pge", "nem3", "net-billing-tariff", "solar", "battery", "home-assistant", "energy", "tariff"]
 classifiers = [
     "Development Status :: 3 - Alpha",
@@ -61,11 +61,15 @@ release = [
     "packaging>=25",
     "twine>=6.2",
 ]
+security = [
+    "pip-audit==2.10.1",
+]
 dev = [
     { include-group = "test" },
     { include-group = "quality" },
     { include-group = "regen" },
     { include-group = "release" },
+    { include-group = "security" },
     "fastapi>=0.110",
     "paho-mqtt>=2.0",
     "pytest-homeassistant-custom-component>=0.13.316",

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/__init__.py

@@ -25,6 +25,7 @@ from .models import (
     Season,
     Supplier,
     TouPeriod,
+    Utility,
 )
 from .timeutil import PACIFIC, DayType, now_pacific
 
@@ -47,6 +48,7 @@ __all__ = [
     "Supplier",
     "TariffKitError",
     "TouPeriod",
+    "Utility",
     "__version__",
     "now_pacific",
 ]

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/cca.py

@@ -15,6 +15,7 @@ from typing import Any
 
 from .data import versioned
 from .errors import ConfigError, DataError
+from .models import Utility
 
 
 @dataclass(frozen=True, slots=True)
@@ -115,7 +116,12 @@ def load_rate_card(provider: str, on: date) -> CcaRateCard:
         ) from exc
     if version.raw.get("schema") != 1:
         raise DataError(f"{provider}: unsupported rate card schema {version.raw.get('schema')}")
-    return CcaRateCard(provider=str(version.raw["provider"]), raw=version.raw)
+    raw = dict(version.raw)
+    try:
+        raw["utility"] = Utility(raw["utility"]).value
+    except (KeyError, ValueError) as exc:
+        raise DataError(f"{provider}: invalid utility identifier") from exc
+    return CcaRateCard(provider=str(raw["provider"]), raw=raw)
 
 
 def available_rate_cards() -> tuple[str, ...]:

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/cli.py

@@ -215,6 +215,12 @@ def build_parser() -> argparse.ArgumentParser:
     mqtt.add_argument("--topic-prefix")
     mqtt.add_argument("--forecast-hours", type=int)
     mqtt.add_argument("--tls", action="store_true", default=None)
+    mqtt.add_argument(
+        "--allow-insecure-auth",
+        action="store_true",
+        default=None,
+        help="allow MQTT credentials without TLS on an isolated trusted network",
+    )
     mqtt.add_argument(
         "--no-discovery",
         dest="discovery",
@@ -601,6 +607,7 @@ def _mqtt_settings(args: Any, *, config: Config | None, profile_name: str | None
         discovery=args.discovery,
         forecast_hours=args.forecast_hours,
         tls=args.tls,
+        allow_insecure_auth=args.allow_insecure_auth,
         profile=profile_name,
     )
     if config is not None and settings.profile is not None:

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/config.py

@@ -11,7 +11,7 @@ from pathlib import Path
 from typing import Any, Literal
 
 from .errors import ConfigError
-from .models import Supplier
+from .models import Supplier, Utility
 
 AccPlusSegment = Literal["residential", "residential_low_income", "none"]
 Discount = Literal["none", "care", "fera"]
@@ -80,7 +80,7 @@ class CcaConfig:
 class Config:
     """Everything needed to price a kWh for one service agreement."""
 
-    utility: str = "PGE"
+    utility: Utility = Utility.PACIFIC_GAS_AND_ELECTRIC
     tariff: str = "E-ELEC"
     supplier: Supplier = Supplier.BUNDLED
 
@@ -117,6 +117,7 @@ class Config:
     nsc_rate: float | None = None
 
     def __post_init__(self) -> None:
+        object.__setattr__(self, "utility", Utility(self.utility))
         # Coerce the string forms of the enums. Supplier is a StrEnum, so a
         # plain "cca" compares equal to Supplier.CCA but is not it -- and every
         # branch that matters tests identity. Constructing Config directly with
@@ -195,7 +196,7 @@ class Config:
     def to_dict(self) -> dict[str, Any]:
         """A JSON-compatible representation suitable for API request bodies."""
         data: dict[str, Any] = {
-            "utility": self.utility,
+            "utility": self.utility.value,
             "tariff": self.tariff,
             "supplier": self.supplier.value,
             "interconnection_year": self.interconnection_year,

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/data/cca/mce/2023-01-01.toml

@@ -16,7 +16,7 @@
 schema = 1
 provider = "MCE"
 name = "Marin Clean Energy"
-utility = "PGE"
+utility = "pacific_gas_and_electric"
 schedules = ["E-ELEC", "E-TOU-C", "EV2-A"]
 effective = "2023-01-01"
 currency = "USD/kWh"

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/data/cca/mce/2026-04-01.toml

@@ -49,7 +49,7 @@
 schema = 1
 provider = "MCE"
 name = "Marin Clean Energy"
-utility = "PGE"
+utility = "pacific_gas_and_electric"
 #: MCE prices each PG&E schedule separately, so a rate card is keyed by schedule
 #: rather than tied to one. Slugs match the tariff data directories.
 schedules = ["E-ELEC", "E-TOU-C", "EV2-A"]

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/data/export/pge/acc_plus/2023-04-15.toml

@@ -1,4 +1,4 @@
-# ACC Plus adder, Pacific Gas and Electric Schedule NBT.
+# ACC Plus adder, Pacific Gas and Electric Company Schedule NBT.
 #
 # Source: https://www.pge.com/tariffs/assets/pdf/tariffbook/ELEC_SCHEDS_NBT.pdf
 #
@@ -18,13 +18,9 @@
 # closure.
 
 schema = 1
-# When this version of the adder table took force. The Net Billing Tariff opened
-# on 2023-04-15 and the five-year step-down has been published unchanged since,
-# so there is one vintage -- but it is dated, because a revision must be able to
-# sit beside it rather than overwrite it.
 effective = "2023-04-15"
 unit = "USD/kWh"
-source = "Pacific Gas and Electric Schedule NBT"
+source = "Pacific Gas and Electric Company Schedule NBT"
 
 [residential]
 2023 = 0.02200

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/data/nsc/pge.toml

@@ -1,4 +1,4 @@
-# Pacific Gas and Electric Net Surplus Compensation (NSC) rates, by true-up month.
+# Pacific Gas and Electric Company Net Surplus Compensation (NSC) rates, by true-up month.
 #
 # Source: https://www.pge.com/assets/pge/docs/clean-energy/solar/AB920-RateTable.pdf
 #
@@ -28,7 +28,7 @@
 # case rather than an edge one.
 
 schema = 1
-utility = "PGE"
+utility = "pacific_gas_and_electric"
 currency = "USD/kWh"
 source_url = "https://www.pge.com/assets/pge/docs/clean-energy/solar/AB920-RateTable.pdf"
 decision = "D.11-06-016"

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/data/tariff/pge/eelec/2025-01-01.toml

@@ -18,7 +18,7 @@
 # makes a silent mis-parse essentially impossible.
 
 schema = 1
-utility = "PGE"
+utility = "pacific_gas_and_electric"
 tariff = "E-ELEC"
 effective = "2025-01-01"
 advice_letter = "7469-E"

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/data/tariff/pge/eelec/2025-03-01.toml

@@ -17,7 +17,7 @@
 # makes a silent mis-parse essentially impossible.
 
 schema = 1
-utility = "PGE"
+utility = "pacific_gas_and_electric"
 tariff = "E-ELEC"
 effective = "2025-03-01"
 advice_letter = "7516-E"

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/data/tariff/pge/eelec/2025-09-01.toml

@@ -17,7 +17,7 @@
 # makes a silent mis-parse essentially impossible.
 
 schema = 1
-utility = "PGE"
+utility = "pacific_gas_and_electric"
 tariff = "E-ELEC"
 effective = "2025-09-01"
 advice_letter = "7684-E"

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/data/tariff/pge/eelec/2026-01-01.toml

@@ -18,7 +18,7 @@
 # makes a silent mis-parse essentially impossible.
 
 schema = 1
-utility = "PGE"
+utility = "pacific_gas_and_electric"
 tariff = "E-ELEC"
 effective = "2026-01-01"
 advice_letter = "7797-E"

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/data/tariff/pge/eelec/2026-03-01.toml

@@ -1,4 +1,4 @@
-# Pacific Gas and Electric Schedule E-ELEC -- retail time-of-use rates.
+# Pacific Gas and Electric Company Schedule E-ELEC -- retail time-of-use rates.
 #
 # Source: https://www.pge.com/tariffs/assets/pdf/tariffbook/ELEC_SCHEDS_E-ELEC.pdf
 #
@@ -22,7 +22,7 @@
 # makes a silent mis-parse essentially impossible.
 
 schema = 1
-utility = "PGE"
+utility = "pacific_gas_and_electric"
 tariff = "E-ELEC"
 effective = "2026-03-01"
 advice_letter = "7846-E"

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/data/tariff/pge/etouc/2025-01-01.toml

@@ -19,7 +19,7 @@
 # makes a silent mis-parse essentially impossible.
 
 schema = 1
-utility = "PGE"
+utility = "pacific_gas_and_electric"
 tariff = "E-TOU-C"
 effective = "2025-01-01"
 advice_letter = "7469-E"

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/data/tariff/pge/etouc/2025-03-01.toml

@@ -18,7 +18,7 @@
 # makes a silent mis-parse essentially impossible.
 
 schema = 1
-utility = "PGE"
+utility = "pacific_gas_and_electric"
 tariff = "E-TOU-C"
 effective = "2025-03-01"
 advice_letter = "7516-E"

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/data/tariff/pge/etouc/2025-09-01.toml

@@ -18,7 +18,7 @@
 # makes a silent mis-parse essentially impossible.
 
 schema = 1
-utility = "PGE"
+utility = "pacific_gas_and_electric"
 tariff = "E-TOU-C"
 effective = "2025-09-01"
 advice_letter = "7684-E"

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/data/tariff/pge/etouc/2026-01-01.toml

@@ -19,7 +19,7 @@
 # makes a silent mis-parse essentially impossible.
 
 schema = 1
-utility = "PGE"
+utility = "pacific_gas_and_electric"
 tariff = "E-TOU-C"
 effective = "2026-01-01"
 advice_letter = "7797-E"

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/data/tariff/pge/etouc/2026-03-01.toml

@@ -1,4 +1,4 @@
-# PG&E Schedule E-TOU-C -- retail time-of-use rates.
+# Pacific Gas and Electric Company Schedule E-TOU-C -- retail time-of-use rates.
 #
 # Source: https://www.pge.com/tariffs/assets/pdf/tariffbook/ELEC_SCHEDS_E-TOU-C.pdf
 #
@@ -26,7 +26,7 @@
 # makes a silent mis-parse essentially impossible.
 
 schema = 1
-utility = "PGE"
+utility = "pacific_gas_and_electric"
 tariff = "E-TOU-C"
 effective = "2026-03-01"
 advice_letter = "7846-E"
@@ -193,8 +193,10 @@ drop_components = ["generation", "bundled_pcia"]
 2025 = -0.01011
 2026 = -0.01011
 
-# Schedule E-FFS franchise fee surcharge. A different schedule, so it is
-# carried forward rather than read from this sheet.
+# Franchise fee surcharge, which a CCA/DA customer pays and a bundled one
+# does not. Published in a separate schedule (E-FFS) and read from it,
+# because carrying it forward would let that schedule be reissued without
+# anything noticing -- it is live rate data on every CCA price.
 [cca.franchise_fee_vintages]
 2009 = 0.00064
 2010 = 0.00061

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/data/tariff/pge/ev2a/2025-01-01.toml

@@ -18,7 +18,7 @@
 # makes a silent mis-parse essentially impossible.
 
 schema = 1
-utility = "PGE"
+utility = "pacific_gas_and_electric"
 tariff = "EV2-A"
 effective = "2025-01-01"
 advice_letter = "7469-E"

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/data/tariff/pge/ev2a/2025-03-01.toml

@@ -17,7 +17,7 @@
 # makes a silent mis-parse essentially impossible.
 
 schema = 1
-utility = "PGE"
+utility = "pacific_gas_and_electric"
 tariff = "EV2-A"
 effective = "2025-03-01"
 advice_letter = "7516-E"

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/data/tariff/pge/ev2a/2025-09-01.toml

@@ -17,7 +17,7 @@
 # makes a silent mis-parse essentially impossible.
 
 schema = 1
-utility = "PGE"
+utility = "pacific_gas_and_electric"
 tariff = "EV2-A"
 effective = "2025-09-01"
 advice_letter = "7684-E"

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/data/tariff/pge/ev2a/2026-01-01.toml

@@ -18,7 +18,7 @@
 # makes a silent mis-parse essentially impossible.
 
 schema = 1
-utility = "PGE"
+utility = "pacific_gas_and_electric"
 tariff = "EV2-A"
 effective = "2026-01-01"
 advice_letter = "7797-E"

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/data/tariff/pge/ev2a/2026-03-01.toml

@@ -1,4 +1,4 @@
-# Pacific Gas and Electric Schedule EV2-A -- retail time-of-use rates.
+# Pacific Gas and Electric Company Schedule EV2-A -- retail time-of-use rates.
 #
 # Source: https://www.pge.com/tariffs/assets/pdf/tariffbook/ELEC_SCHEDS_EV2%20(Sch).pdf
 #
@@ -23,7 +23,7 @@
 # makes a silent mis-parse essentially impossible.
 
 schema = 1
-utility = "PGE"
+utility = "pacific_gas_and_electric"
 tariff = "EV2-A"
 effective = "2026-03-01"
 advice_letter = "7846-E"

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/engine.py

@@ -5,8 +5,9 @@ from __future__ import annotations
 from datetime import UTC, datetime, timedelta
 
 from .config import Config
+from .errors import DataError
 from .export.nbt import NbtExportRates
-from .models import PriceCurve, PricePoint
+from .models import PriceCurve, PricePoint, Utility
 from .tariff.retail import RetailTariff
 from .timeutil import PACIFIC, hour_floor, now_pacific, to_pacific
 
@@ -21,6 +22,8 @@ class RateEngine:
 
     def __init__(self, config: Config | None = None) -> None:
         self.config = config or Config()
+        if self.config.utility is not Utility.PACIFIC_GAS_AND_ELECTRIC:
+            raise DataError(f"{self.config.utility.display_name} pricing is not supported")
         self.tariff = RetailTariff(self.config)
         self.export_rates = NbtExportRates(self.config)
 
@@ -69,7 +72,7 @@ class RateEngine:
         snapshot = self.tariff.snapshot_for(when)
         low, high = self.export_rates.covered_years
         return {
-            "utility": self.config.utility,
+            "utility": self.config.utility.value,
             "tariff": self.config.tariff,
             "supplier": str(self.config.supplier),
             "tariff_effective": snapshot.effective.isoformat(),
@@ -78,5 +81,6 @@ class RateEngine:
             "export_vintage": self.export_rates.vintage,
             "export_years": [low, high],
             "acc_plus": self.export_rates.acc_plus,
+            "pto_date": self.config.pto_date.isoformat() if self.config.pto_date else None,
             "lock_end": self.config.lock_end.isoformat() if self.config.lock_end else None,
         }

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/export/nbt.py

@@ -15,7 +15,7 @@ from typing import Any
 from ..config import FLOATING_VINTAGE, Config
 from ..data import read_data_json_gz, versioned
 from ..errors import ConfigError, DataError, OutOfRangeError
-from ..models import ExportPrice, Supplier
+from ..models import ExportPrice, Supplier, Utility
 from ..timeutil import MONTHS, DayType, day_type, export_hour
 
 #: Where a utility's ACC Plus adder table lives. Keyed by utility rather than
@@ -32,9 +32,10 @@ def _matrix(vintage: str) -> dict[str, Any]:
     return payload
 
 
-def _acc_plus_table(utility: str, on: date) -> dict[str, Any]:
-    relative = ACC_PLUS_DIR.format(utility=utility.lower())
-    return versioned.load(relative, on, label=f"{utility} ACC Plus").raw
+def _acc_plus_table(utility: Utility | str, on: date) -> dict[str, Any]:
+    utility_id = Utility(utility)
+    relative = ACC_PLUS_DIR.format(utility=utility_id.data_slug)
+    return versioned.load(relative, on, label=f"{utility_id.short_name} ACC Plus").raw
 
 
 class NbtExportRates:

{tariffkit-0.2.1 → tariffkit-0.2.3}/src/tariffkit/models.py

@@ -28,6 +28,40 @@ class Supplier(StrEnum):
     CCA = "cca"
 
 
+class Utility(StrEnum):
+    """Stable utility identities used by profiles and API payloads."""
+
+    PACIFIC_GAS_AND_ELECTRIC = "pacific_gas_and_electric"
+    PORTLAND_GENERAL_ELECTRIC = "pge"
+
+    @property
+    def data_slug(self) -> str:
+        """Private filesystem key for this utility's vendored data."""
+        match self:
+            case Utility.PACIFIC_GAS_AND_ELECTRIC:
+                return "pge"
+            case Utility.PORTLAND_GENERAL_ELECTRIC:
+                return "portland_general_electric"
+
+    @property
+    def short_name(self) -> str:
+        """Recognizable user-facing abbreviation."""
+        match self:
+            case Utility.PACIFIC_GAS_AND_ELECTRIC:
+                return "PG&E"
+            case Utility.PORTLAND_GENERAL_ELECTRIC:
+                return "PGE"
+
+    @property
+    def display_name(self) -> str:
+        """Full user-facing company name."""
+        match self:
+            case Utility.PACIFIC_GAS_AND_ELECTRIC:
+                return "Pacific Gas and Electric Company"
+            case Utility.PORTLAND_GENERAL_ELECTRIC:
+                return "Portland General Electric"
+
+
 @dataclass(frozen=True, slots=True)
 class ImportPrice:
     """What a kWh drawn from the grid costs, marginally."""