utility-tariffs-lib 0.3.0__tar.gz → 0.3.1__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.
Files changed (97) hide show
  1. {utility_tariffs_lib-0.3.0/utility_tariffs_lib.egg-info → utility_tariffs_lib-0.3.1}/PKG-INFO +1 -1
  2. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/price_curve.py +20 -3
  3. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/price_timeline.py +11 -4
  4. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/pyproject.toml +1 -1
  5. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1/utility_tariffs_lib.egg-info}/PKG-INFO +1 -1
  6. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/LICENSE +0 -0
  7. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/README.md +0 -0
  8. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/README.md +0 -0
  9. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/__init__.py +0 -0
  10. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/py.typed +0 -0
  11. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/__init__.py +0 -0
  12. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/accumulator.py +0 -0
  13. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/bands.py +0 -0
  14. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/bill_days.py +0 -0
  15. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/billing.py +0 -0
  16. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/compile.py +0 -0
  17. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/config.py +0 -0
  18. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/defaults.py +0 -0
  19. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/definition.py +0 -0
  20. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/definition_parse.py +0 -0
  21. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/definition_savings.py +0 -0
  22. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/demand.py +0 -0
  23. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/engine.py +0 -0
  24. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/index.py +0 -0
  25. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/period_bill.py +0 -0
  26. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/periods.py +0 -0
  27. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/price_series.py +0 -0
  28. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/price_stats.py +0 -0
  29. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/reprice.py +0 -0
  30. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/savings.py +0 -0
  31. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/slot_history.py +0 -0
  32. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/slots.py +0 -0
  33. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/stored_energy.py +0 -0
  34. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariff/windows.py +0 -0
  35. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariffranking/__init__.py +0 -0
  36. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariffranking/search.py +0 -0
  37. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariffstore/__init__.py +0 -0
  38. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariffstore/aclient.py +0 -0
  39. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariffstore/client.py +0 -0
  40. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariffstore/compile.py +0 -0
  41. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariffstore/core.py +0 -0
  42. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariffstore/index.py +0 -0
  43. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariffstore/layout.py +0 -0
  44. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariffstore/price_client.py +0 -0
  45. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariffstore/price_rules.py +0 -0
  46. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariffstore/prices.py +0 -0
  47. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/tariffstore/schema.py +0 -0
  48. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/timeutil/__init__.py +0 -0
  49. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/lib/timeutil/real_time.py +0 -0
  50. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/setup.cfg +0 -0
  51. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_async_client.py +0 -0
  52. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_build.py +0 -0
  53. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_client.py +0 -0
  54. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_compile.py +0 -0
  55. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_eia861_map.py +0 -0
  56. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_end_to_end.py +0 -0
  57. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_index.py +0 -0
  58. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_lib_release_notes.py +0 -0
  59. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_packaging.py +0 -0
  60. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_price_client.py +0 -0
  61. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_price_format.py +0 -0
  62. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_prices.py +0 -0
  63. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_prices_bord_gais.py +0 -0
  64. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_prices_comed.py +0 -0
  65. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_prices_energinet.py +0 -0
  66. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_prices_energy_charts.py +0 -0
  67. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_prices_energyzero.py +0 -0
  68. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_prices_runner.py +0 -0
  69. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_repo_rules.py +0 -0
  70. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_schema.py +0 -0
  71. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_sources_at.py +0 -0
  72. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_sources_bord_gais.py +0 -0
  73. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_sources_br.py +0 -0
  74. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_sources_ca_manitoba.py +0 -0
  75. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_sources_ca_nb.py +0 -0
  76. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_sources_ch.py +0 -0
  77. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_sources_dk.py +0 -0
  78. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_sources_electric_ireland.py +0 -0
  79. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_sources_gb.py +0 -0
  80. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_sources_hq.py +0 -0
  81. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_sources_ie.py +0 -0
  82. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_sources_in.py +0 -0
  83. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_sources_other.py +0 -0
  84. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_sources_pt.py +0 -0
  85. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_sources_sg.py +0 -0
  86. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_sources_us.py +0 -0
  87. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_sources_zm.py +0 -0
  88. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_status.py +0 -0
  89. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_status_docs.py +0 -0
  90. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_stored_tariffs.py +0 -0
  91. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_sync_core.py +0 -0
  92. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_sync_run.py +0 -0
  93. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_tariffs_through_lib.py +0 -0
  94. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/tests/test_urdb_convert.py +0 -0
  95. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/utility_tariffs_lib.egg-info/SOURCES.txt +0 -0
  96. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/utility_tariffs_lib.egg-info/dependency_links.txt +0 -0
  97. {utility_tariffs_lib-0.3.0 → utility_tariffs_lib-0.3.1}/utility_tariffs_lib.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: utility-tariffs-lib
3
- Version: 0.3.0
3
+ Version: 0.3.1
4
4
  Summary: Tariff model, bill engine, price series, store client and plan ranking
5
5
  Author: macuistin
6
6
  License-Expression: MIT
@@ -22,6 +22,7 @@ from decimal import Decimal
22
22
  from .bands import band_at, export_band_at, no_holidays
23
23
  from .defaults import SLOT_SECONDS
24
24
  from .definition import ExportPrices, ImportPrices, TariffDefinition
25
+ from .definition_parse import connected_loads, demand_windows
25
26
  from .engine import BillInputs, price_bill
26
27
  from .price_series import series_names
27
28
 
@@ -99,14 +100,30 @@ def price_curve(
99
100
  return tuple(slots)
100
101
 
101
102
 
103
+ def unit_inputs(
104
+ definition: TariffDefinition,
105
+ imported: Mapping[str, Decimal],
106
+ exported: Decimal | Mapping[str, Decimal],
107
+ cost_by_series: Mapping[str, Decimal] | None = None,
108
+ ) -> BillInputs:
109
+ """Inputs for a bill used only to take a difference, so a charge that does not follow the
110
+ energy cancels. A demand window and a connected load are given zero kW: they are the same in
111
+ both bills and so are not part of any price."""
112
+ zero = {name: Decimal(0) for name in series_names(definition)}
113
+ return BillInputs(
114
+ _DAYS, _DAYS, imported, exported,
115
+ import_cost_by_series=zero if cost_by_series is None else cost_by_series,
116
+ peak_kw=dict.fromkeys(demand_windows(definition.total), Decimal(0)),
117
+ load_kw=dict.fromkeys(connected_loads(definition.total), Decimal(0)),
118
+ )
119
+
120
+
102
121
  def _bill(
103
122
  definition: TariffDefinition,
104
123
  imported: Mapping[str, Decimal],
105
124
  exported: Decimal | Mapping[str, Decimal],
106
125
  ) -> Decimal:
107
- zero = {name: Decimal(0) for name in series_names(definition)}
108
- inputs = BillInputs(_DAYS, _DAYS, imported, exported, import_cost_by_series=zero)
109
- return price_bill(definition, inputs).total
126
+ return price_bill(definition, unit_inputs(definition, imported, exported)).total
110
127
 
111
128
 
112
129
  def _export(definition: TariffDefinition, name: str) -> Decimal | Mapping[str, Decimal]:
@@ -20,8 +20,15 @@ from decimal import Decimal
20
20
 
21
21
  from .bands import band_at, export_band_at, no_holidays
22
22
  from .definition import TariffDefinition
23
- from .engine import BillInputs, price_bill
24
- from .price_curve import _STEP, MarginalPrices, PriceSlot, marginal_prices, price_curve
23
+ from .engine import price_bill
24
+ from .price_curve import (
25
+ _STEP,
26
+ MarginalPrices,
27
+ PriceSlot,
28
+ marginal_prices,
29
+ price_curve,
30
+ unit_inputs,
31
+ )
25
32
  from .price_series import PriceSeries, series_names
26
33
 
27
34
 
@@ -41,9 +48,9 @@ def series_factor(definition: TariffDefinition, name: str) -> Decimal:
41
48
  """What one unit of a series price becomes in the bill: 1 when nothing follows the energy
42
49
  line, and for example 1.05 when VAT is added after it."""
43
50
  names = {other: Decimal(0) for other in series_names(definition)}
44
- base = price_bill(definition, BillInputs(30, 30, {}, Decimal(0), import_cost_by_series=names))
51
+ base = price_bill(definition, unit_inputs(definition, {}, Decimal(0), names))
45
52
  names[name] = _STEP
46
- more = price_bill(definition, BillInputs(30, 30, {}, Decimal(0), import_cost_by_series=names))
53
+ more = price_bill(definition, unit_inputs(definition, {}, Decimal(0), names))
47
54
  return (more.total - base.total) / _STEP
48
55
 
49
56
 
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "utility-tariffs-lib"
7
- version = "0.3.0"
7
+ version = "0.3.1"
8
8
  description = "Tariff model, bill engine, price series, store client and plan ranking"
9
9
  readme = "lib/README.md"
10
10
  license = "MIT"
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: utility-tariffs-lib
3
- Version: 0.3.0
3
+ Version: 0.3.1
4
4
  Summary: Tariff model, bill engine, price series, store client and plan ranking
5
5
  Author: macuistin
6
6
  License-Expression: MIT