swap out the NamedTuple for a frozen dataclass.

move the responsibility of sorting the numbers from the caller to the class initialisation.
(now the string representation matches the internal state)

move logging of ValueError from tui.py to lottery.py

patch bump

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lottery-tui"
-version = "0.2.4"
+version = "0.2.7"
 description = "A terminal user interface for lottery games."
 authors = [{ name = "onyx-and-iris", email = "code@onyxandiris.online" }]
 dependencies = ["textual>=8.0.0", "loguru>=0.7.3"]
@@ -13,6 +13,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
 ]

src/lottery_tui/lottery.py

@@ -1,29 +1,41 @@
 import random
 from abc import ABC, abstractmethod
-from typing import NamedTuple
+from dataclasses import dataclass
+
+from loguru import logger
 
 
-class Result(NamedTuple):
+@dataclass(frozen=True)
-    """A named tuple to hold the results of a lottery draw."""
+class Result:
+    """A dataclass to hold the results of a lottery draw with auto-sorted numbers."""
 
     kind: str
     numbers: list[int]
     bonus: list[int] | None
 
+    def __post_init__(self):
+        """Sort the numbers after initialization.
+
+        We use super().__setattr__ to bypass the frozen nature of the dataclass for sorting.
+        """
+        super().__setattr__('numbers', sorted(self.numbers))
+        if self.bonus:
+            super().__setattr__('bonus', sorted(self.bonus))
+
     def __str__(self) -> str:
         """Return a string representation of the lottery result."""
-        out = f'Numbers: {", ".join(str(n) for n in sorted(self.numbers))}'
+        out = f'Numbers: {", ".join(str(n) for n in self.numbers)}'
         if self.bonus:
             match self.kind:
                 case 'EuroMillions':
                     bonus_name = 'Lucky Stars'
-                case 'Set For Life':
+                case 'SetForLife':
                     bonus_name = 'Life Ball'
                 case 'Thunderball':
                     bonus_name = 'Thunderball'
                 case _:
                     bonus_name = 'Bonus Numbers'
-            out += f'\n{bonus_name}: {", ".join(str(n) for n in sorted(self.bonus))}'
+            out += f'\n{bonus_name}: {", ".join(str(n) for n in self.bonus)}'
         return out
 
 
@@ -45,19 +57,19 @@ class Lottery(ABC):
 
 
 @register_lottery
-class UKlotto(Lottery):
+class Lotto(Lottery):
-    """A class representing the UK Lotto lottery.
+    """A class representing the Lotto lottery.
 
-    Uk Lotto draws 6 numbers from a pool of 1 to 59, without replacement.
+    Lotto draws 6 numbers from a pool of 1 to 59, without replacement.
-    There is no bonus number in UK Lotto.
+    There is no bonus number in Lotto.
     """
 
     POSSIBLE_NUMBERS = range(1, 60)
 
     def draw(self) -> Result:
-        """Perform a UK Lotto draw."""
+        """Perform a Lotto draw."""
-        result = random.sample(UKlotto.POSSIBLE_NUMBERS, 6)
+        result = random.sample(Lotto.POSSIBLE_NUMBERS, 6)
-        return Result(kind='UK Lotto', numbers=result, bonus=None)
+        return Result(kind=type(self).__name__, numbers=result, bonus=None)
 
 
 @register_lottery
@@ -75,7 +87,7 @@ class EuroMillions(Lottery):
         """Perform a EuroMillions draw."""
         numbers = random.sample(EuroMillions.POSSIBLE_NUMBERS, 5)
         bonus = random.sample(EuroMillions.POSSIBLE_BONUS_NUMBERS, 2)
-        return Result(kind='EuroMillions', numbers=numbers, bonus=bonus)
+        return Result(kind=type(self).__name__, numbers=numbers, bonus=bonus)
 
 
 @register_lottery
@@ -92,7 +104,7 @@ class SetForLife(Lottery):
         """Perform a Set For Life draw."""
         numbers = random.sample(SetForLife.POSSIBLE_NUMBERS, 5)
         life_ball = [random.randint(1, 10)]
-        return Result(kind='Set For Life', numbers=numbers, bonus=life_ball)
+        return Result(kind=type(self).__name__, numbers=numbers, bonus=life_ball)
 
 
 @register_lottery
@@ -109,12 +121,14 @@ class Thunderball(Lottery):
         """Perform a Thunderball draw."""
         numbers = random.sample(Thunderball.POSSIBLE_NUMBERS, 5)
         thunderball = [random.randint(1, 14)]
-        return Result(kind='Thunderball', numbers=numbers, bonus=thunderball)
+        return Result(kind=type(self).__name__, numbers=numbers, bonus=thunderball)
 
 
 def request_lottery_obj(lottery_name: str) -> Lottery:
     """Return a lottery object based on the provided lottery name."""
     lottery_cls = registry.get(lottery_name.lower())
     if lottery_cls is None:
-        raise ValueError(f"Lottery '{lottery_name}' not found.")
+        ERR_MSG = f"Lottery '{lottery_name}' not found. Available lotteries: {', '.join(registry.keys())}"
+        logger.error(ERR_MSG)
+        raise ValueError(ERR_MSG)
     return lottery_cls()

src/lottery_tui/tui.py

@@ -1,4 +1,3 @@
-from loguru import logger
 from rich.text import Text
 from textual.app import App, ComposeResult
 from textual.containers import Container
@@ -19,7 +18,7 @@ class LotteryTUI(App):
             Static('Pick a lottery to play:', id='instructions'),
             Select(
                 options=[
-                    ('UK Lotto', 'uklotto'),
+                    ('Lotto', 'lotto'),
                     ('EuroMillions', 'euromillions'),
                     ('Set For Life', 'setforlife'),
                     ('Thunderball', 'thunderball'),
@@ -49,15 +48,7 @@ class LotteryTUI(App):
             )
             return
 
-        selected_lottery = self.query_one('#lottery-select').value
+        lottery_obj = request_lottery_obj(self.query_one('#lottery-select').value)
-
-        try:
-            lottery_obj = request_lottery_obj(selected_lottery)
-        except ValueError:
-            ERR_MSG = f'Invalid lottery selection: {selected_lottery}'
-            logger.exception(ERR_MSG)
-            raise
-
         result = lottery_obj.draw()
         self._update_result_label(str(result))