tariffkit 0.11.0__tar.gz → 0.11.2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {tariffkit-0.11.0 → tariffkit-0.11.2}/CHANGELOG.md +90 -1
- {tariffkit-0.11.0 → tariffkit-0.11.2}/PKG-INFO +1 -1
- {tariffkit-0.11.0 → tariffkit-0.11.2}/pyproject.toml +11 -1
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/billing/engine.py +35 -5
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/billing/ledger.py +24 -6
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/billing/models.py +10 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/billing/netting.py +3 -2
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/cca.py +68 -13
- tariffkit-0.11.2/src/tariffkit/data/cca/mce/2026-04-01.toml +122 -0
- tariffkit-0.11.2/src/tariffkit/data/export/pge/nbt00.json.gz +0 -0
- tariffkit-0.11.2/src/tariffkit/data/export/pge/nbt23.json.gz +0 -0
- tariffkit-0.11.2/src/tariffkit/data/export/pge/nbt24.json.gz +0 -0
- tariffkit-0.11.2/src/tariffkit/data/export/pge/nbt25.json.gz +0 -0
- tariffkit-0.11.2/src/tariffkit/data/export/pge/nbt26.json.gz +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/sources/influx.py +195 -40
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/sources/pge.py +55 -6
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_billing.py +70 -9
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_ledger.py +45 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_mce.py +41 -5
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_sources_influx.py +189 -2
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_sources_pge.py +64 -0
- tariffkit-0.11.0/src/tariffkit/data/cca/mce/2026-04-01.toml +0 -165
- tariffkit-0.11.0/src/tariffkit/data/export/pge/nbt00.json.gz +0 -0
- tariffkit-0.11.0/src/tariffkit/data/export/pge/nbt23.json.gz +0 -0
- tariffkit-0.11.0/src/tariffkit/data/export/pge/nbt24.json.gz +0 -0
- tariffkit-0.11.0/src/tariffkit/data/export/pge/nbt25.json.gz +0 -0
- tariffkit-0.11.0/src/tariffkit/data/export/pge/nbt26.json.gz +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/.gitignore +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/LICENSE +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/README.md +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/__init__.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/account/__init__.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/account/errors.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/account/model.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/account/rates.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/billing/__init__.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/billing/bank.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/billing/cycles.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/billing/trueup.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/cli/__init__.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/cli/__main__.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/cli/account_commands.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/cli/account_store.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/cli/availability.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/cli/commands.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/cli/meters.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/cli/setup.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/components.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/config.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/__init__.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/cca/mce/2023-01-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/cca/mce/2023-12-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/cca/mce/2025-10-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/export/pge/acc_plus/2023-04-15.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/holidays.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/nsc/pge.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/sources.json +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/e1/2026-03-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/eelec/2025-01-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/eelec/2025-03-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/eelec/2025-09-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/eelec/2026-01-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/eelec/2026-03-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/etouc/2025-01-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/etouc/2025-03-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/etouc/2025-09-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/etouc/2026-01-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/etouc/2026-03-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/etoud/2026-03-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/ev2a/2025-01-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/ev2a/2025-03-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/ev2a/2025-09-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/ev2a/2026-01-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/ev2a/2026-03-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/program/dcare/2025-01-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/program/dmedical/2026-03-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/program/efera/2026-03-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/program/ersmart/2022-05-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tariff/pge/program/medicalbaseline/2023-03-23.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tax/ca_energy_resources/2025-01-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/tax/ca_energy_resources/2026-01-01.toml +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/data/versioned.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/engine.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/errors.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/export/__init__.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/export/nbt.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/interop/__init__.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/interop/emhass.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/interop/predbat.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/interop/slots.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/metering.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/models.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/mqtt/__init__.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/mqtt/discovery.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/mqtt/publisher.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/providers/__init__.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/providers/pge/__init__.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/providers/pge/reconcile.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/providers/pge/statements/__init__.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/providers/pge/statements/errors.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/providers/pge/statements/model.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/providers/pge/statements/ocr.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/providers/pge/statements/parse.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/py.typed +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/secrets.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/sources/__init__.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/sources/greenbutton.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/sources/homeassistant.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/sources/meters.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/tariff/__init__.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/tariff/retail.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/timeutil.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/web/__init__.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/src/tariffkit/web/app.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/conftest.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/fixtures/nbt_golden_rows.jsonl +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/fixtures/statements/synthetic_cca_ratechange.txt +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_account.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_account_cli.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_cli_availability.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_components.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_cycles.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_eelec.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_engine.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_ev2a.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_export_golden.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_ha_backfill.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_ha_bank.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_ha_energy.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_ha_external_statistics.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_ha_repairs.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_integrations.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_interop.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_mqtt_publisher.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_pge_reconcile.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_pge_statements.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_private_config.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_schedules.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_setup.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_sources_greenbutton.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_sources_ha.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_sources_meters.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_trueup.py +0 -0
- {tariffkit-0.11.0 → tariffkit-0.11.2}/tests/test_versioned.py +0 -0
|
@@ -5,6 +5,93 @@ All notable changes to this project are documented here. This project follows
|
|
|
5
5
|
|
|
6
6
|
## [Unreleased]
|
|
7
7
|
|
|
8
|
+
## [0.11.2] - 2026-11-10
|
|
9
|
+
|
|
10
|
+
### Changed
|
|
11
|
+
- **`audit run` keeps the statements it downloads.** They stay under
|
|
12
|
+
`.cache/pge/statements/`, so a later run reads them from disk instead of
|
|
13
|
+
downloading them again. `--keep-statements` is gone; `--discard-statements`
|
|
14
|
+
deletes them after the run, matching `tariffkit account sync`. The
|
|
15
|
+
directory is owner-only, each file is `0600`, and each login has a
|
|
16
|
+
subdirectory of its own, so two accounts billed the same day never share a
|
|
17
|
+
file. A file is named by the statement's issue date and listed amount, so a
|
|
18
|
+
corrected statement that replaces the original is downloaded rather than
|
|
19
|
+
read from the old copy. Two statements listed with the same date and amount
|
|
20
|
+
each get their own file and are downloaded fresh.
|
|
21
|
+
|
|
22
|
+
### Fixed
|
|
23
|
+
- **MCE's cost relief credit follows its November reissue.** MCE reissued its
|
|
24
|
+
April 2026 residential card with the same rates and a new credit: -$0.03725
|
|
25
|
+
per kWh from 2026-11-01 through 2027-03-31, replacing -$0.0062. MCE
|
|
26
|
+
generation from November on was priced with the old credit, about 3.1 cents
|
|
27
|
+
per kWh too high. The card now carries both credits as dated windows, and
|
|
28
|
+
regeneration reads the credit off the card rather than carrying the last
|
|
29
|
+
one forward.
|
|
30
|
+
- **InfluxDB readings put a gap's energy where it arrived.** An advance across
|
|
31
|
+
a sample gap was spread evenly over the gap. Home Assistant writes a counter
|
|
32
|
+
when it changes, so a gap is usually the counter standing still, and its
|
|
33
|
+
energy came at the end. On the cycle ending 2026-09-28 a battery exporting
|
|
34
|
+
from 19:00 had about 0.2 kWh an evening put in the 18:00 hour, where PG&E's
|
|
35
|
+
15-minute data has none, and MCE's export credit came out $0.53 low. An
|
|
36
|
+
advance across a gap of more than ten minutes is now placed from the rates
|
|
37
|
+
sampled either side of it, and spread evenly only when neither explains it.
|
|
38
|
+
Against PG&E's own interval data the hourly split moved closer on eleven of
|
|
39
|
+
twelve cycles. That cycle now computes $62.40 against a billed $62.39, where
|
|
40
|
+
it was $62.50. Energy from a gap over an hour is still reported as
|
|
41
|
+
reconstructed.
|
|
42
|
+
- **InfluxDB readings no longer depend on how far past them the window runs.**
|
|
43
|
+
Samples were read only up to the window's end, so a gap just before it was
|
|
44
|
+
placed without the rate after it, and the share of a gap straddling the end
|
|
45
|
+
that fell inside the window was dropped. `read_counters` now reads up to
|
|
46
|
+
three days past `end` to place energy, and still counts nothing after
|
|
47
|
+
`end`. The four cycles from 2025-09-29 to 2026-01-29 moved from $0.04–$0.13
|
|
48
|
+
under their bills to $0.01–$0.02 under.
|
|
49
|
+
- **InfluxDB's last reading of a window covers only the window.** A window
|
|
50
|
+
that ended partway through an interval returned a last reading claiming
|
|
51
|
+
the whole interval, which overstated coverage and overlapped the next
|
|
52
|
+
window. Its duration now ends at `end`.
|
|
53
|
+
- **An unreachable InfluxDB is reported, not raised as a traceback.** A
|
|
54
|
+
timeout or refused connection escaped as the HTTP client's own exception,
|
|
55
|
+
and `audit run` exited 1, the code for a billing discrepancy. It is now a
|
|
56
|
+
`DataError` naming the host, and the audit exits 2.
|
|
57
|
+
- **Export credit pays the Energy Commission Tax.** The tax had no credit
|
|
58
|
+
bucket, so it was charged in cash even with credit in the bank. The
|
|
59
|
+
2026-10-05 statement applies $18.70 of MCE credit against $18.68 of Net
|
|
60
|
+
Charges and the $0.02 tax, closing at $0.00. The tax is now offset with
|
|
61
|
+
the generation charges on a cycle supplied wholly by a CCA. Any other
|
|
62
|
+
cycle, including one that changes supplier partway, still pays it in cash,
|
|
63
|
+
since no bundled statement has yet shown PG&E offsetting it. The engine
|
|
64
|
+
records that in the new `Bill.uncreditable_charges`. The
|
|
65
|
+
share charged before Permission To Operate stays beyond credit's reach, as
|
|
66
|
+
the rest of that agreement's charges do.
|
|
67
|
+
- `audit run` no longer reports "the rates reproduce this line" on an Energy
|
|
68
|
+
Export Credits Applied line. That line is made only of figures the
|
|
69
|
+
statement printed, so the check only ever read it back.
|
|
70
|
+
- **A refused bill history request says why.** When the portal rejected the
|
|
71
|
+
request -- a bad `history_filter`, most often -- `PgeSession.bill_history`
|
|
72
|
+
reported that the portal had changed, hiding the portal's own message. It now
|
|
73
|
+
raises `BillHistoryError` with that message. The filter values are documented
|
|
74
|
+
correctly: `BILL`, `PAYMENT` (singular) and `ALL`.
|
|
75
|
+
|
|
76
|
+
### Security
|
|
77
|
+
- **Locked dependencies move past new advisories.** certifi 2026.10.23 and
|
|
78
|
+
pypdf 6.21.3 in the production extras; filelock 4.2.4, uv 0.13.5 and Home
|
|
79
|
+
Assistant 2026.10.4 in the development graph.
|
|
80
|
+
- **Pillow 13.0.0 in the development graph**, clearing 41 advisories in
|
|
81
|
+
12.3.0. Home Assistant 2026.10.4 pins 12.3.0 exactly, so the pin is
|
|
82
|
+
overridden rather than waited out, and the audit exception that accepted it
|
|
83
|
+
is gone: both audits now come back clean. Pillow reaches only the Home
|
|
84
|
+
Assistant test stack; nothing in TariffKit imports it.
|
|
85
|
+
|
|
86
|
+
## [0.11.1] - 2026-10-19
|
|
87
|
+
|
|
88
|
+
### Fixed
|
|
89
|
+
- **`get_rates` and `get_emhass_forecast` no longer block Home Assistant's
|
|
90
|
+
event loop.** A window under an account epoch nothing had priced yet built
|
|
91
|
+
that epoch's rate engine on the loop, reading the vendored tariff files and
|
|
92
|
+
decompressing the export price matrix there. Both actions now price in the
|
|
93
|
+
executor, as the sensors already did.
|
|
94
|
+
|
|
8
95
|
## [0.11.0] - 2026-10-09
|
|
9
96
|
|
|
10
97
|
### Added
|
|
@@ -2129,7 +2216,9 @@ Initial release.
|
|
|
2129
2216
|
- Holiday calendars are extracted per vintage from the source data rather than
|
|
2130
2217
|
recomputed, because the vintage files disagree in far-future years.
|
|
2131
2218
|
|
|
2132
|
-
[Unreleased]: https://github.com/eman/tariffkit/compare/v0.11.
|
|
2219
|
+
[Unreleased]: https://github.com/eman/tariffkit/compare/v0.11.2...HEAD
|
|
2220
|
+
[0.11.2]: https://github.com/eman/tariffkit/releases/tag/v0.11.2
|
|
2221
|
+
[0.11.1]: https://github.com/eman/tariffkit/releases/tag/v0.11.1
|
|
2133
2222
|
[0.11.0]: https://github.com/eman/tariffkit/releases/tag/v0.11.0
|
|
2134
2223
|
[0.10.0]: https://github.com/eman/tariffkit/releases/tag/v0.10.0
|
|
2135
2224
|
[0.9.0]: https://github.com/eman/tariffkit/releases/tag/v0.9.0
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.5
|
|
2
2
|
Name: tariffkit
|
|
3
|
-
Version: 0.11.
|
|
3
|
+
Version: 0.11.2
|
|
4
4
|
Summary: Offline electricity tariff pricing, billing, and integration tools
|
|
5
5
|
Project-URL: Homepage, https://github.com/eman/tariffkit
|
|
6
6
|
Project-URL: Documentation, https://github.com/eman/tariffkit#documentation
|
|
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "tariffkit"
|
|
7
|
-
version = "0.11.
|
|
7
|
+
version = "0.11.2"
|
|
8
8
|
description = "Offline electricity tariff pricing, billing, and integration tools"
|
|
9
9
|
readme = "README.md"
|
|
10
10
|
license = "MIT"
|
|
@@ -100,6 +100,16 @@ exclude = [
|
|
|
100
100
|
"/tests/test_release.py",
|
|
101
101
|
]
|
|
102
102
|
|
|
103
|
+
[tool.uv]
|
|
104
|
+
# Pillow reaches the lock only through the Home Assistant test stack:
|
|
105
|
+
# pytest-homeassistant-custom-component 0.13.375 pins homeassistant==2026.10.4,
|
|
106
|
+
# which pins Pillow==12.3.0 -- 41 advisories, all fixed in 13.0.0. TariffKit
|
|
107
|
+
# never imports PIL, and the production extras do not include it, so this only
|
|
108
|
+
# lifts the dev graph past an exact pin that HA itself dropped in 2026.11.
|
|
109
|
+
# Remove once a pytest-homeassistant-custom-component release pins
|
|
110
|
+
# homeassistant>=2026.11, which requires Pillow 13 on its own.
|
|
111
|
+
override-dependencies = ["pillow>=13.0.0"]
|
|
112
|
+
|
|
103
113
|
[tool.ruff]
|
|
104
114
|
line-length = 100
|
|
105
115
|
target-version = "py314"
|
|
@@ -20,7 +20,7 @@ from ..cca import load_rate_card
|
|
|
20
20
|
from ..config import Config
|
|
21
21
|
from ..engine import RateEngine
|
|
22
22
|
from ..errors import DataError
|
|
23
|
-
from ..models import ImportPrice, Season, TouPeriod
|
|
23
|
+
from ..models import ImportPrice, Season, Supplier, TouPeriod
|
|
24
24
|
from ..tariff.retail import load_program
|
|
25
25
|
from ..timeutil import PACIFIC, hour_floor, to_pacific
|
|
26
26
|
from .models import Bill, BillingPeriod, IntervalReading, UsageBucket
|
|
@@ -89,6 +89,7 @@ class BillEngine:
|
|
|
89
89
|
uncompensated = 0.0
|
|
90
90
|
pre_pto_imported = 0.0
|
|
91
91
|
pre_pto_charges: dict[str, float] = {}
|
|
92
|
+
uncreditable: dict[str, float] = {}
|
|
92
93
|
import_components: dict[str, float] = {}
|
|
93
94
|
export_components: dict[str, float] = {}
|
|
94
95
|
complete = True
|
|
@@ -146,12 +147,25 @@ class BillEngine:
|
|
|
146
147
|
before = BillingPeriod(period.start, min(period.end, pto - timedelta(days=1)))
|
|
147
148
|
for name, value in self._fixed_charges(before).items():
|
|
148
149
|
pre_pto_charges[name] = pre_pto_charges.get(name, 0.0) + value
|
|
149
|
-
tax, untaxed_days = self._energy_surcharge(in_period
|
|
150
|
+
tax, untaxed_days = self._energy_surcharge(in_period)
|
|
150
151
|
# Recorded at zero too. A statement prints the line at 0.00 on a cycle
|
|
151
152
|
# that exported more than it used -- 2026-08-04 and 2026-09-03 both do
|
|
152
153
|
# -- and a bill without the component reads as one that never priced it.
|
|
153
154
|
if in_period:
|
|
154
155
|
import_components["energy_commission_tax"] = tax
|
|
156
|
+
# The closed agreement's share, which no later credit may reach any
|
|
157
|
+
# more than its energy. Export credit pays this tax from PTO on a
|
|
158
|
+
# CCA bill (see `ledger.CHARGE_BUCKETS`), and without this line it
|
|
159
|
+
# would reach the pre-PTO days' tax too. Rated alone because those
|
|
160
|
+
# days are charged as consumed and never netted, so their share of
|
|
161
|
+
# the cycle's tax is exactly this.
|
|
162
|
+
pre_pto_tax, _ = rate_surcharge(self._tax_base(in_period)[0], {})
|
|
163
|
+
if pre_pto_tax:
|
|
164
|
+
pre_pto_charges["energy_commission_tax"] = (
|
|
165
|
+
pre_pto_charges.get("energy_commission_tax", 0.0) + pre_pto_tax
|
|
166
|
+
)
|
|
167
|
+
if self.rates.config.supplier is not Supplier.CCA:
|
|
168
|
+
uncreditable["energy_commission_tax"] = _tax_beyond_pto(tax, pre_pto_charges)
|
|
155
169
|
if untaxed_days:
|
|
156
170
|
complete = False
|
|
157
171
|
warnings.append(
|
|
@@ -182,6 +196,7 @@ class BillEngine:
|
|
|
182
196
|
uncompensated_kwh=uncompensated,
|
|
183
197
|
pre_pto_imported_kwh=pre_pto_imported,
|
|
184
198
|
pre_pto_charges=pre_pto_charges,
|
|
199
|
+
uncreditable_charges=uncreditable,
|
|
185
200
|
warnings=tuple(warnings),
|
|
186
201
|
# Pricing confidence only. Coverage problems travel separately in
|
|
187
202
|
# `warnings`: they say the meter data is patchy, not that the rates
|
|
@@ -191,9 +206,7 @@ class BillEngine:
|
|
|
191
206
|
complete=complete,
|
|
192
207
|
)
|
|
193
208
|
|
|
194
|
-
def _energy_surcharge(
|
|
195
|
-
self, readings: Sequence[IntervalReading], period: BillingPeriod
|
|
196
|
-
) -> tuple[float, list[date]]:
|
|
209
|
+
def _energy_surcharge(self, readings: Sequence[IntervalReading]) -> tuple[float, list[date]]:
|
|
197
210
|
r"""California's Energy Resources Surcharge on energy consumed.
|
|
198
211
|
|
|
199
212
|
A state tax rather than a utility tariff, so it is charged whoever
|
|
@@ -606,6 +619,17 @@ def compute_segments(
|
|
|
606
619
|
days[day] = days.get(day, 0.0) + net
|
|
607
620
|
imports["energy_commission_tax"], _ = rate_surcharge(before, after)
|
|
608
621
|
|
|
622
|
+
# The cycle's tax is rated once, so it cannot be split by supplier, and
|
|
623
|
+
# only a statement wholly from a CCA has shown export credit paying it. A
|
|
624
|
+
# cycle with any other supplier's days pays all of it in cash.
|
|
625
|
+
uncreditable: dict[str, float] = {}
|
|
626
|
+
if "energy_commission_tax" in imports and any(
|
|
627
|
+
segment.config.supplier is not Supplier.CCA for segment in ordered
|
|
628
|
+
):
|
|
629
|
+
uncreditable["energy_commission_tax"] = _tax_beyond_pto(
|
|
630
|
+
imports["energy_commission_tax"], pre_pto_charges
|
|
631
|
+
)
|
|
632
|
+
|
|
609
633
|
return Bill(
|
|
610
634
|
period=whole,
|
|
611
635
|
buckets=tuple(buckets.values()),
|
|
@@ -615,6 +639,12 @@ def compute_segments(
|
|
|
615
639
|
uncompensated_kwh=uncompensated,
|
|
616
640
|
pre_pto_imported_kwh=pre_pto_imported,
|
|
617
641
|
pre_pto_charges=pre_pto_charges,
|
|
642
|
+
uncreditable_charges=uncreditable,
|
|
618
643
|
warnings=tuple(warnings),
|
|
619
644
|
complete=complete,
|
|
620
645
|
)
|
|
646
|
+
|
|
647
|
+
|
|
648
|
+
def _tax_beyond_pto(tax: float, pre_pto_charges: dict[str, float]) -> float:
|
|
649
|
+
"""The part of a cycle's tax not already held out of reach as pre-PTO."""
|
|
650
|
+
return max(tax - pre_pto_charges.get("energy_commission_tax", 0.0), 0.0)
|
|
@@ -131,6 +131,16 @@ CHARGE_BUCKETS: dict[str, CreditBucket] = {
|
|
|
131
131
|
"generation": CreditBucket.GENERATION,
|
|
132
132
|
"cca_generation": CreditBucket.GENERATION,
|
|
133
133
|
"cca_cost_relief_credit": CreditBucket.GENERATION,
|
|
134
|
+
# Levied on the generation supplier's sales and printed on its page, and
|
|
135
|
+
# offset by its export credit like the energy charges above it. The
|
|
136
|
+
# 2026-10-05 statement is the first since PTO to owe any: MCE's "Net
|
|
137
|
+
# Charges" are 18.68, it applies 18.70 of export credit, and the 0.02 tax
|
|
138
|
+
# printed beneath is what closes the section at $0.00. With no bucket it
|
|
139
|
+
# fell to the non-offsettable default and was charged in cash beside a bank
|
|
140
|
+
# of $92.62. Confirmed on a CCA statement only, so on any cycle not wholly
|
|
141
|
+
# supplied by a CCA the engine holds the tax out of reach in
|
|
142
|
+
# `Bill.uncreditable_charges`, and it is paid in cash.
|
|
143
|
+
"energy_commission_tax": CreditBucket.GENERATION,
|
|
134
144
|
# Delivery. The statement bills these as its "Energy Delivered" block.
|
|
135
145
|
"distribution": CreditBucket.DELIVERY,
|
|
136
146
|
"transmission": CreditBucket.DELIVERY,
|
|
@@ -196,6 +206,12 @@ CHARGE_BUCKETS: dict[str, CreditBucket] = {
|
|
|
196
206
|
#: the safety property this set used to provide.
|
|
197
207
|
NON_OFFSETTABLE = frozenset({"baseline_credit"})
|
|
198
208
|
|
|
209
|
+
|
|
210
|
+
def _reach(name: str) -> CreditBucket | None:
|
|
211
|
+
"""The bucket that may offset ``name``, or ``None`` for cash."""
|
|
212
|
+
return None if name in NON_OFFSETTABLE else CHARGE_BUCKETS.get(name)
|
|
213
|
+
|
|
214
|
+
|
|
199
215
|
#: False while the classification above is only partly reconciled.
|
|
200
216
|
#:
|
|
201
217
|
#: What a statement has confirmed: which components bank into which bucket, and
|
|
@@ -387,15 +403,16 @@ def charges_by_bucket(bill: Bill) -> tuple[dict[CreditBucket, float], float]:
|
|
|
387
403
|
stay out of reach.
|
|
388
404
|
|
|
389
405
|
So is anything charged before Permission To Operate
|
|
390
|
-
(``Bill.pre_pto_charges``),
|
|
406
|
+
(``Bill.pre_pto_charges``), and anything the engine held out of reach for
|
|
407
|
+
another reason (``Bill.uncreditable_charges``), whatever its bucket.
|
|
391
408
|
"""
|
|
392
409
|
offsettable: dict[CreditBucket, float] = dict.fromkeys(CreditBucket, 0.0)
|
|
393
410
|
non_offsettable = 0.0
|
|
394
411
|
offsettable[CreditBucket.BONUS] += sum(bill.fixed_components.values())
|
|
395
412
|
|
|
396
413
|
for name, value in bill.import_components.items():
|
|
397
|
-
bucket =
|
|
398
|
-
if bucket is None
|
|
414
|
+
bucket = _reach(name)
|
|
415
|
+
if bucket is None:
|
|
399
416
|
non_offsettable += value
|
|
400
417
|
else:
|
|
401
418
|
offsettable[bucket] += value
|
|
@@ -403,9 +420,10 @@ def charges_by_bucket(bill: Bill) -> tuple[dict[CreditBucket, float], float]:
|
|
|
403
420
|
# Charged before PTO, and so beyond any credit's reach: moved out of the
|
|
404
421
|
# bucket that would otherwise have let a later credit offset it. A charge
|
|
405
422
|
# with no bucket is already out of reach and stays where it is.
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
423
|
+
# So is anything the engine marked uncreditable, for the same effect.
|
|
424
|
+
for name, value in (*bill.pre_pto_charges.items(), *bill.uncreditable_charges.items()):
|
|
425
|
+
reach = CreditBucket.BONUS if name in bill.fixed_components else _reach(name)
|
|
426
|
+
if reach is None:
|
|
409
427
|
continue
|
|
410
428
|
offsettable[reach] -= value
|
|
411
429
|
non_offsettable += value
|
|
@@ -273,6 +273,15 @@ class Bill:
|
|
|
273
273
|
#: credit reach the two pre-PTO EV2-A days as well and applied $3.13, and
|
|
274
274
|
#: the $0.95 difference stayed missing from the bank from then on.
|
|
275
275
|
pre_pto_charges: dict[str, float] = field(default_factory=dict)
|
|
276
|
+
#: The part of ``import_components`` no export credit may reach for a
|
|
277
|
+
#: reason other than PTO, by component, and not already in
|
|
278
|
+
#: ``pre_pto_charges``. Billed, and in ``total``. Decided where the
|
|
279
|
+
#: supplier is known: the engine prices each configuration separately, and
|
|
280
|
+
#: a merged bill no longer says which supplier charged what.
|
|
281
|
+
#:
|
|
282
|
+
#: Holds the Energy Commission Tax on any cycle not wholly supplied by a
|
|
283
|
+
#: CCA. Only a CCA statement has shown export credit paying the tax.
|
|
284
|
+
uncreditable_charges: dict[str, float] = field(default_factory=dict)
|
|
276
285
|
|
|
277
286
|
@property
|
|
278
287
|
def imported_kwh(self) -> float:
|
|
@@ -414,5 +423,6 @@ class Bill:
|
|
|
414
423
|
"uncompensated_kwh": round(self.uncompensated_kwh, 3),
|
|
415
424
|
"pre_pto_imported_kwh": round(self.pre_pto_imported_kwh, 3),
|
|
416
425
|
"pre_pto_charges": {k: round(v, 4) for k, v in self.pre_pto_charges.items()},
|
|
426
|
+
"uncreditable_charges": {k: round(v, 4) for k, v in self.uncreditable_charges.items()},
|
|
417
427
|
"warnings": list(self.warnings),
|
|
418
428
|
}
|
|
@@ -185,8 +185,9 @@ def check_coverage(
|
|
|
185
185
|
yield (
|
|
186
186
|
f"{len(guessed)} interval(s) covering {hours:.1f}h were reconstructed across gaps "
|
|
187
187
|
f"in the source, carrying {shifted:.1f} kWh whose time-of-use split is a guess even "
|
|
188
|
-
f"though the cycle total is not.
|
|
189
|
-
f"
|
|
188
|
+
f"though the cycle total is not. Where a long gap's energy fell is inferred from the "
|
|
189
|
+
f"samples either side of it rather than measured, and peak hours are where a "
|
|
190
|
+
f"misplaced kilowatt-hour costs most"
|
|
190
191
|
)
|
|
191
192
|
elif shifted >= MATERIAL_SMEAR:
|
|
192
193
|
# No gaps, and still enough energy moved between measured intervals to
|
|
@@ -11,6 +11,7 @@ from __future__ import annotations
|
|
|
11
11
|
from dataclasses import dataclass
|
|
12
12
|
from datetime import date
|
|
13
13
|
from functools import lru_cache
|
|
14
|
+
from itertools import pairwise
|
|
14
15
|
from typing import Any
|
|
15
16
|
|
|
16
17
|
from .data import versioned
|
|
@@ -70,18 +71,18 @@ class CcaRateCard:
|
|
|
70
71
|
return base + float(premium)
|
|
71
72
|
|
|
72
73
|
def cost_relief_credit(self, on: date) -> float:
|
|
73
|
-
"""
|
|
74
|
+
"""The per-kWh credit in force on ``on``, or zero outside every window.
|
|
74
75
|
|
|
75
76
|
Dated rather than folded into the rates so it stops applying on its own
|
|
76
|
-
instead of quietly understating prices in later years.
|
|
77
|
+
instead of quietly understating prices in later years. A card can carry
|
|
78
|
+
more than one window because MCE reissues the credit without repricing:
|
|
79
|
+
the April 2026 card's -0.0062 gave way on 2026-11-01 to -0.03725, and
|
|
80
|
+
the generation rates either side of that date are identical.
|
|
77
81
|
"""
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
if through and on > date.fromisoformat(through):
|
|
83
|
-
return 0.0
|
|
84
|
-
return float(credit["rate"])
|
|
82
|
+
for start, end, rate in credit_windows(self.provider, self.raw):
|
|
83
|
+
if (start is None or on >= start) and (end is None or on <= end):
|
|
84
|
+
return rate
|
|
85
|
+
return 0.0
|
|
85
86
|
|
|
86
87
|
@property
|
|
87
88
|
def solar_bonus_fraction(self) -> float:
|
|
@@ -127,6 +128,48 @@ class CcaRateCard:
|
|
|
127
128
|
return rate
|
|
128
129
|
|
|
129
130
|
|
|
131
|
+
#: One cost relief credit window: first day, last day, $/kWh. An open start
|
|
132
|
+
#: means from the card's own effective date.
|
|
133
|
+
CreditWindow = tuple[date | None, date | None, float]
|
|
134
|
+
|
|
135
|
+
|
|
136
|
+
def credit_windows(provider: str, raw: dict[str, Any]) -> tuple[CreditWindow, ...]:
|
|
137
|
+
"""The card's ``[[cost_relief_credit]]`` windows, in order, checked disjoint.
|
|
138
|
+
|
|
139
|
+
Overlapping windows are refused rather than resolved: two credits claiming
|
|
140
|
+
the same day means the card was misread or a replacement was not ended,
|
|
141
|
+
and picking either one would hide which.
|
|
142
|
+
"""
|
|
143
|
+
entries = raw.get("cost_relief_credit") or []
|
|
144
|
+
if not isinstance(entries, list):
|
|
145
|
+
raise DataError(
|
|
146
|
+
f"{provider}: cost_relief_credit must be an array of tables "
|
|
147
|
+
f"([[cost_relief_credit]]), one per dated window"
|
|
148
|
+
)
|
|
149
|
+
|
|
150
|
+
def day(entry: dict[str, Any], key: str) -> date | None:
|
|
151
|
+
value = entry.get(key)
|
|
152
|
+
return None if value is None else date.fromisoformat(str(value))
|
|
153
|
+
|
|
154
|
+
try:
|
|
155
|
+
windows = sorted(
|
|
156
|
+
((day(e, "from"), day(e, "through"), float(e["rate"])) for e in entries),
|
|
157
|
+
key=lambda w: w[0] or date.min,
|
|
158
|
+
)
|
|
159
|
+
except (KeyError, TypeError, ValueError) as exc:
|
|
160
|
+
raise DataError(f"{provider}: malformed cost_relief_credit window: {exc}") from exc
|
|
161
|
+
for start, end, _ in windows:
|
|
162
|
+
if start is not None and end is not None and start > end:
|
|
163
|
+
raise DataError(f"{provider}: cost_relief_credit window ends {end} before {start}")
|
|
164
|
+
for (_, end, _), (start, _, _) in pairwise(windows):
|
|
165
|
+
if end is None or start is None or start <= end:
|
|
166
|
+
raise DataError(
|
|
167
|
+
f"{provider}: cost_relief_credit windows overlap "
|
|
168
|
+
f"(one ends {end or 'never'}, the next starts {start or 'at the card'})"
|
|
169
|
+
)
|
|
170
|
+
return tuple(windows)
|
|
171
|
+
|
|
172
|
+
|
|
130
173
|
@lru_cache(maxsize=8)
|
|
131
174
|
def load_rate_card(provider: str, on: date) -> CcaRateCard:
|
|
132
175
|
"""The provider's rate card in force on ``on``.
|
|
@@ -152,14 +195,26 @@ def load_rate_card(provider: str, on: date) -> CcaRateCard:
|
|
|
152
195
|
f"no vendored rate card for CCA {provider!r}; supply rates via "
|
|
153
196
|
f"CcaConfig(generation_rates=..., franchise_fee_surcharge=...)"
|
|
154
197
|
) from exc
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
198
|
+
return parse_rate_card(provider, version.raw)
|
|
199
|
+
|
|
200
|
+
|
|
201
|
+
def parse_rate_card(provider: str, raw: dict[str, Any]) -> CcaRateCard:
|
|
202
|
+
"""Validate a rate card's contents, as :func:`load_rate_card` does on load.
|
|
203
|
+
|
|
204
|
+
Separate so regeneration can put a rendered card through exactly the
|
|
205
|
+
checks it will face at runtime before writing it.
|
|
206
|
+
"""
|
|
207
|
+
if raw.get("schema") != 1:
|
|
208
|
+
raise DataError(f"{provider}: unsupported rate card schema {raw.get('schema')}")
|
|
209
|
+
raw = dict(raw)
|
|
158
210
|
try:
|
|
159
211
|
raw["utility"] = Utility(raw["utility"]).value
|
|
160
212
|
except (KeyError, ValueError) as exc:
|
|
161
213
|
raise DataError(f"{provider}: invalid utility identifier") from exc
|
|
162
|
-
|
|
214
|
+
# Checked on load so a malformed window fails when the card is chosen,
|
|
215
|
+
# not partway through pricing a cycle.
|
|
216
|
+
credit_windows(provider, raw)
|
|
217
|
+
return CcaRateCard(provider=str(raw.get("provider", provider)), raw=raw)
|
|
163
218
|
|
|
164
219
|
|
|
165
220
|
def available_rate_cards() -> tuple[str, ...]:
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
# NOTES -- hand-written, and kept verbatim above the generated header when
|
|
2
|
+
# `python -m tools.regen cca` rewrites this file. Everything below the header is
|
|
3
|
+
# generated; comments placed inside its tables are not kept.
|
|
4
|
+
#
|
|
5
|
+
# THE NOVEMBER 2026 REISSUE. On 2026-11-03 MCE replaced this card with
|
|
6
|
+
# "..._as-of-4.1.26_updated-Nov-1-credit.pdf" and withdrew the original (its URL
|
|
7
|
+
# now 404s). Every generation rate and the Deep Green premium are unchanged; the
|
|
8
|
+
# cost relief credit is not. The original card printed -0.0062/kWh "through
|
|
9
|
+
# December 31, 2026"; the reissue prints -0.03725/kWh "from November 1, 2026
|
|
10
|
+
# through March 31, 2027" and lists no other credit. The earlier credit is
|
|
11
|
+
# therefore recorded as ending 2026-10-31, replaced rather than stacked -- an
|
|
12
|
+
# inference from the card listing only one, which the first statement with a
|
|
13
|
+
# November day on it should confirm.
|
|
14
|
+
#
|
|
15
|
+
# HOW THESE WERE READ. The original card had no text layer, so its values were
|
|
16
|
+
# read from the rendered page on 2026-08-12. The reissue has text again, and
|
|
17
|
+
# extracts to exactly the same 16 generation rates.
|
|
18
|
+
#
|
|
19
|
+
# VERIFICATION. Three rates are confirmed against the July 2026 statement as
|
|
20
|
+
# well as the card -- summer E-ELEC peak 0.26299, part-peak 0.16388, off-peak
|
|
21
|
+
# 0.11878 -- as is the -0.0062 credit (tests/test_mce.py). The remaining
|
|
22
|
+
# thirteen rest on the card alone until a bill exercises them. There is no
|
|
23
|
+
# arithmetic check, unlike a PG&E snapshot: nothing published for these to sum
|
|
24
|
+
# to.
|
|
25
|
+
#
|
|
26
|
+
# PARITY. Every generation rate equals PG&E's bundled generation component for
|
|
27
|
+
# the same schedule, season and period. That is an observation, not an alias;
|
|
28
|
+
# tests/test_mce.py asserts it so a divergence fails loudly. The rates are keyed
|
|
29
|
+
# by schedule because they differ substantially between schedules -- winter
|
|
30
|
+
# off-peak is 0.06754 on E-ELEC and 0.11042 on E-TOU-C -- so an uncovered
|
|
31
|
+
# schedule raises rather than borrowing another's. MCE's "ELEC" pairs with
|
|
32
|
+
# PG&E's E-ELEC and bills as "SBP EELEC" on the Solar Billing Plan.
|
|
33
|
+
#
|
|
34
|
+
# EXPORT. Carried forward, not read from the card. The solar bonus (10% of the
|
|
35
|
+
# base export credit) and the CARE/FERA bonus ($0.05/kWh through 2028) are from
|
|
36
|
+
# MCE's Solar Billing Plan tariff, section 1. `export_credit_basis` was
|
|
37
|
+
# measured: 2,784 quarter-hourly intervals for the 2026-06-30..07-28 cycle,
|
|
38
|
+
# priced and compared with that statement, land within 0.3% on every export
|
|
39
|
+
# component (MCE generation EEC -0.1%, PG&E delivery EEC -0.2%, ACC Plus -0.3%,
|
|
40
|
+
# solar bonus +0.2%). `credits_acc_plus`: the 2026-08-04 statement prints PG&E
|
|
41
|
+
# applying -$1.71 of Energy Export Bonus Credits on its page while MCE's page
|
|
42
|
+
# separately reports $1.70 of EEBC earned and a $3.29 balance -- a second adder
|
|
43
|
+
# of MCE's own, settled on MCE's Solar Billing Plan year, not PG&E's shown twice.
|
|
44
|
+
#
|
|
45
|
+
# Marin Clean Energy (MCE) residential generation rates.
|
|
46
|
+
#
|
|
47
|
+
# Source: https://mcecleanenergy.org/wp-content/uploads/2026/09/MCE-website-rate-table_RES_as-of-4.1.26_updated-Nov-1-credit.pdf
|
|
48
|
+
# Solar Billing Plan tariff: https://mcecleanenergy.org/wp-content/uploads/2024/12/MCE-Solar-Billing-Plan-Tariff_120424.pdf
|
|
49
|
+
#
|
|
50
|
+
# GENERATED by `python -m tools.regen cca` -- do not hand-edit the rate tables.
|
|
51
|
+
#
|
|
52
|
+
# A CCA supplies generation only; delivery stays with the utility, so these
|
|
53
|
+
# are generation rates alone and pair with that utility's tariff sheet.
|
|
54
|
+
#
|
|
55
|
+
# These may currently equal the utility's own generation component exactly.
|
|
56
|
+
# That is parity today, not an alias: they are vendored separately so a
|
|
57
|
+
# divergence shows up rather than being silently inherited. Regeneration
|
|
58
|
+
# reports the parity status of every rate it writes.
|
|
59
|
+
|
|
60
|
+
schema = 1
|
|
61
|
+
provider = "MCE"
|
|
62
|
+
name = "Marin Clean Energy"
|
|
63
|
+
utility = "pacific_gas_and_electric"
|
|
64
|
+
schedules = ["E-ELEC", "E-TOU-C", "EV2-A"]
|
|
65
|
+
effective = "2026-04-01"
|
|
66
|
+
currency = "USD/kWh"
|
|
67
|
+
source_url = "https://mcecleanenergy.org/wp-content/uploads/2026/09/MCE-website-rate-table_RES_as-of-4.1.26_updated-Nov-1-credit.pdf"
|
|
68
|
+
|
|
69
|
+
# Checksum of the document these values were read from. A scheduled check
|
|
70
|
+
# compares it so a republished card is noticed even when it cannot be
|
|
71
|
+
# parsed -- detection does not need a text layer, only bytes.
|
|
72
|
+
source_sha256 = "c936fbe13c2d67cdebecdbbbe8736792c9dd254294f65164805b6d170b40ec3e"
|
|
73
|
+
source_read_on = "2026-11-09"
|
|
74
|
+
|
|
75
|
+
[options]
|
|
76
|
+
light_green = 0.0
|
|
77
|
+
deep_green = 0.0125
|
|
78
|
+
|
|
79
|
+
[[cost_relief_credit]]
|
|
80
|
+
rate = -0.0062
|
|
81
|
+
through = "2026-10-31"
|
|
82
|
+
|
|
83
|
+
[[cost_relief_credit]]
|
|
84
|
+
rate = -0.03725
|
|
85
|
+
from = "2026-11-01"
|
|
86
|
+
through = "2027-03-31"
|
|
87
|
+
|
|
88
|
+
[export]
|
|
89
|
+
solar_bonus_fraction = 0.1
|
|
90
|
+
care_fera_bonus_rate = 0.05
|
|
91
|
+
care_fera_bonus_through = "2028-12-31"
|
|
92
|
+
export_credit_basis = "acc_generation"
|
|
93
|
+
export_credit_verified = true
|
|
94
|
+
credits_acc_plus = true
|
|
95
|
+
|
|
96
|
+
[generation.eelec.summer]
|
|
97
|
+
peak = 0.26299
|
|
98
|
+
part_peak = 0.16388
|
|
99
|
+
off_peak = 0.11878
|
|
100
|
+
|
|
101
|
+
[generation.eelec.winter]
|
|
102
|
+
peak = 0.10086
|
|
103
|
+
part_peak = 0.08089
|
|
104
|
+
off_peak = 0.06754
|
|
105
|
+
|
|
106
|
+
[generation.etouc.summer]
|
|
107
|
+
peak = 0.20782
|
|
108
|
+
off_peak = 0.10482
|
|
109
|
+
|
|
110
|
+
[generation.etouc.winter]
|
|
111
|
+
peak = 0.1371
|
|
112
|
+
off_peak = 0.11042
|
|
113
|
+
|
|
114
|
+
[generation.ev2a.summer]
|
|
115
|
+
peak = 0.1883
|
|
116
|
+
part_peak = 0.14359
|
|
117
|
+
off_peak = 0.10245
|
|
118
|
+
|
|
119
|
+
[generation.ev2a.winter]
|
|
120
|
+
peak = 0.13143
|
|
121
|
+
part_peak = 0.11894
|
|
122
|
+
off_peak = 0.09546
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|