feat(tariffzones): add range syntax support for zone hours

_parse_hours now accepts inclusive range tokens (e.g. '0-5') in
addition to single values, enabling compact config like:

  zone_1_hours: 7-22
  zone_2_hours: 0-6,23
  zone_3_hours: 17-20

Ranges are expanded inclusively (7-22 → [7,8,...,22]).
Single integers and range strings may be freely mixed.
List/tuple elements that are Python ints are handled directly
(no string conversion) to avoid treating negative integers as ranges.

Validation unchanged: inverted ranges (5-3) and out-of-bounds
values raise ValueError.

Updated config dummy example to use range notation.
Added 7 new parse_hours tests covering ranges.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: MaStr

config/batcontrol_config_dummy.yaml

@@ -69,11 +69,11 @@ utility:
   fees: 0.015 # only required for awattar and energyforecast
   markup: 0.03 # only required for awattar and energyforecast
   # tariff_zone_1: 0.2733 # only required for tariff_zones, Euro/kWh incl. vat/fees (peak hours)
-  # zone_1_hours: 7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22 # hours assigned to zone 1 (0-23, comma-separated)
+  # zone_1_hours: 7-22 # hours assigned to zone 1; supports ranges (7-22), singles (7), or mixed (0-5,6,7)
   # tariff_zone_2: 0.1734 # only required for tariff_zones, Euro/kWh incl. vat/fees (off-peak hours)
-  # zone_2_hours: 0,1,2,3,4,5,6,23 # hours assigned to zone 2 (must cover remaining hours)
+  # zone_2_hours: 0-6,23 # hours assigned to zone 2 (must cover remaining hours)
   # tariff_zone_3: 0.2100 # optional third zone price
-  # zone_3_hours: 17,18,19,20 # optional hours for zone 3 (must not overlap with zone 1 or 2)
+  # zone_3_hours: 17-20 # optional hours for zone 3 (must not overlap with zone 1 or 2)
   # apikey: YOUR_API_KEY # MANDATORY for energyforecast and tibber. Uncomment and set if using those providers.
 
 #--------------------------

src/batcontrol/dynamictariff/tariffzones.py

@@ -161,34 +161,73 @@ def _get_prices_native(self) -> dict[int, float]:
 
     @staticmethod
     def _parse_hours(value, name: str) -> list:
-        """Parse a comma-separated string, list, or single int into a validated list of hours.
-
-        Raises ValueError if any value is out of range [0, 23] or appears more than once
-        within the same zone.
+        """Parse hour specifications into a validated list of hours.
+
+        Accepted formats (may be mixed):
+        - Single integer:           5
+        - Comma-separated values:   "0,1,2,3"
+        - Inclusive ranges:         "0-5"  →  [0, 1, 2, 3, 4, 5]
+        - Mixed:                    "0-5,6,7"  →  [0, 1, 2, 3, 4, 5, 6, 7]
+        - Python list/tuple of ints or range-strings: [0, '1-3', 4]
+
+        Raises ValueError if any hour is out of range [0, 23], if a range is
+        invalid (start > end), or if an hour appears more than once within the
+        same zone.
         """
+        def expand_token(token: str) -> list:
+            """Expand a single string token (range or integer) to a list of ints."""
+            if '-' in token:
+                parts = token.split('-', 1)
+                try:
+                    start, end = int(parts[0].strip()), int(parts[1].strip())
+                except (ValueError, TypeError) as exc:
+                    raise ValueError(
+                        f'[{name}] invalid range: {token!r}'
+                    ) from exc
+                if start > end:
+                    raise ValueError(
+                        f'[{name}] range start must be <= end, got {token!r}'
+                    )
+                return list(range(start, end + 1))
+            try:
+                return [int(token)]
+            except (ValueError, TypeError) as exc:
+                raise ValueError(
+                    f'[{name}] invalid hour value: {token!r}'
+                ) from exc
+
         if isinstance(value, int):
-            parts = [value]
+            raw_ints = [value]
+            tokens = []
         elif isinstance(value, str):
-            parts = [p.strip() for p in value.split(',') if p.strip()]
+            raw_ints = []
+            tokens = [p.strip() for p in value.split(',') if p.strip()]
         elif isinstance(value, (list, tuple)):
-            parts = list(value)
+            # split into direct integers (no range parsing) and string tokens
+            raw_ints = [p for p in value if isinstance(p, int)]
+            tokens = [str(p).strip() for p in value
+                      if not isinstance(p, int) and str(p).strip()]
         else:
             raise ValueError(
                 f'[{name}] must be a comma-separated string, list, or integer'
             )
 
         hours = []
-        for part in parts:
-            try:
-                h = int(part)
-            except (ValueError, TypeError) as exc:
-                raise ValueError(f'[{name}] invalid hour value: {part!r}') from exc
+        for h in raw_ints:
             if h < 0 or h > 23:
                 raise ValueError(f'[{name}] hour {h} is out of range [0, 23]')
             if h in hours:
                 raise ValueError(f'[{name}] hour {h} appears more than once')
             hours.append(h)
 
+        for token in tokens:
+            for h in expand_token(token):
+                if h < 0 or h > 23:
+                    raise ValueError(f'[{name}] hour {h} is out of range [0, 23]')
+                if h in hours:
+                    raise ValueError(f'[{name}] hour {h} appears more than once')
+                hours.append(h)
+
         return hours
 
     @staticmethod

tests/batcontrol/dynamictariff/test_tariffzones.py

@@ -45,13 +45,49 @@ def test_parse_hours_single_int():
     assert result == [5]
 
 
+def test_parse_hours_range_string():
+    result = TariffZones._parse_hours('0-5', 'zone_1_hours')
+    assert result == [0, 1, 2, 3, 4, 5]
+
+
+def test_parse_hours_range_full_day():
+    result = TariffZones._parse_hours('7-22', 'zone_1_hours')
+    assert result == list(range(7, 23))
+
+
+def test_parse_hours_mixed_range_and_singles():
+    result = TariffZones._parse_hours('0-5,6,7', 'zone_1_hours')
+    assert result == [0, 1, 2, 3, 4, 5, 6, 7]
+
+
+def test_parse_hours_range_single_element():
+    # "5-5" is a valid range that yields just [5]
+    result = TariffZones._parse_hours('5-5', 'zone_1_hours')
+    assert result == [5]
+
+
+def test_parse_hours_list_with_range_strings():
+    result = TariffZones._parse_hours(['0-3', '4', '5-6'], 'zone_1_hours')
+    assert result == [0, 1, 2, 3, 4, 5, 6]
+
+
+def test_parse_hours_rejects_inverted_range():
+    with pytest.raises(ValueError, match='start must be <= end'):
+        TariffZones._parse_hours('5-3', 'zone_1_hours')
+
+
 def test_parse_hours_rejects_out_of_range():
     with pytest.raises(ValueError, match='out of range'):
         TariffZones._parse_hours('0,24', 'zone_1_hours')
     with pytest.raises(ValueError, match='out of range'):
         TariffZones._parse_hours([-1], 'zone_1_hours')
 
 
+def test_parse_hours_rejects_range_out_of_bounds():
+    with pytest.raises(ValueError, match='out of range'):
+        TariffZones._parse_hours('20-25', 'zone_1_hours')
+
+
 def test_parse_hours_rejects_duplicate_within_zone():
     with pytest.raises(ValueError, match='more than once'):
         TariffZones._parse_hours('7,8,7', 'zone_1_hours')
@@ -211,9 +247,9 @@ def test_csv_string_hours_accepted():
     t = TariffZones(
         make_tz(),
         tariff_zone_1=0.27,
-        zone_1_hours='7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22',
+        zone_1_hours='7-22',
         tariff_zone_2=0.17,
-        zone_2_hours='0,1,2,3,4,5,6,23',
+        zone_2_hours='0-6,23',
     )
     prices = t._get_prices_native()
     assert len(prices) == 48
@@ -227,14 +263,16 @@ def test_factory_creates_tariff_zones():
     config = {
         'type': 'tariff_zones',
         'tariff_zone_1': 0.27,
-        'zone_1_hours': '7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22',
+        'zone_1_hours': '7-22',
         'tariff_zone_2': 0.17,
-        'zone_2_hours': '0,1,2,3,4,5,6,23',
+        'zone_2_hours': '0-6,23',
     }
     provider = DynamicTariff.create_tarif_provider(config, make_tz(), 0, 0)
     assert isinstance(provider, TariffZones)
     assert provider.tariff_zone_1 == pytest.approx(0.27)
     assert provider.tariff_zone_2 == pytest.approx(0.17)
+    assert provider.zone_1_hours == list(range(7, 23))
+    assert provider.zone_2_hours == list(range(0, 7)) + [23]
 
 
 def test_factory_three_zones():