modelのpyファイルを分ける

src/func.py

@@ -1,9 +1,9 @@
-from src.model.odds import Choices
+from src.model.choice import Choices, ChoicesWithBet, ChoiceWithBetTable
 
 
-def calculate(budget: int, raw_text: str) -> tuple[str, list[list]]:
+def calculate(budget: int, raw_text: str) -> tuple[str, ChoiceWithBetTable]:
     choices = Choices.from_text(raw_text)
-    choices_with_bet = choices.to_choices_with_bet(budget)
+    choices_with_bet = ChoicesWithBet.from_choices(choices, budget)
 
     summary_markdown = choices_with_bet.to_summary_markdwown()
     table = choices_with_bet.to_table()

src/model/choice/__init__.py

@@ -0,0 +1,6 @@
+from .choice import Choice
+from .choice_with_bet import ChoiceWithBet
+from .choices import Choices
+from .choices_with_bet import ChoicesWithBet, ChoiceWithBetTable
+
+__all__ = ["Choice", "ChoiceWithBet", "Choices", "ChoicesWithBet", "ChoiceWithBetTable"]

src/model/choice/choice.py

@@ -0,0 +1,6 @@
+from pydantic import BaseModel, StrictFloat, StrictStr
+
+
+class Choice(BaseModel):
+    name: StrictStr
+    odds: StrictFloat

src/model/choice/choice_with_bet.py

@@ -0,0 +1,17 @@
+from pydantic import StrictInt, computed_field
+
+from .choice import Choice
+
+
+class ChoiceWithBet(Choice):
+    bet_amount: StrictInt
+
+    @computed_field  # type: ignore
+    @property
+    def pay_back(self) -> int:
+        return int(self.bet_amount * self.odds)
+
+    @computed_field  # type: ignore
+    @property
+    def profit(self) -> int:
+        return self.pay_back - self.bet_amount

src/model/{choices.py → choice/choices.py}

@@ -1,29 +1,11 @@
 import re
 from typing import Final
 
-from pydantic import (BaseModel, RootModel, StrictFloat, StrictInt, StrictStr,
-                      computed_field, field_validator)
+from pydantic import RootModel, field_validator
 
-NUMBER_JOINER: Final[str] = "-"
-
-
-class Choice(BaseModel):
-    name: StrictStr
-    odds: StrictFloat
-
-
-class ChoiceWithBet(Choice):
-    bet_amount: StrictInt
+from .choice import Choice
 
-    @computed_field  # type: ignore
-    @property
-    def pay_back(self) -> int:
-        return int(self.bet_amount * self.odds)
-
-    @computed_field  # type: ignore
-    @property
-    def profit(self) -> int:
-        return self.pay_back - self.bet_amount
+NUMBER_JOINER: Final[str] = "-"
 
 
 class Choices(RootModel[list[Choice]]):
@@ -36,22 +18,6 @@ class Choices(RootModel[list[Choice]]):
             raise ValueError("買い目が1つもありません")
         return choices
 
-    def to_choices_with_bet(self, budget: int) -> "ChoicesWithBet":
-        inverse_ratios_sum = sum(1 / choice.odds for choice in self.root)
-
-        choice_with_bet_list: list[ChoiceWithBet] = []
-        for chice in self.root:
-            weight = (1 / chice.odds) / inverse_ratios_sum
-            choice_with_bet_list.append(
-                ChoiceWithBet(
-                    name=chice.name,
-                    odds=chice.odds,
-                    bet_amount=max(int(weight * budget / 100) * 100, 100),
-                )
-            )
-
-        return ChoicesWithBet(root=choice_with_bet_list)
-
     @classmethod
     def from_text(cls, text: str) -> "Choices":
         FIRST_KEYS: Final[list[str]] = [
@@ -118,40 +84,3 @@ class Choices(RootModel[list[Choice]]):
                 )
             )
         return cls(root=choice_list)
-
-
-class ChoicesWithBet(RootModel[list[ChoiceWithBet]]):
-    root: list[ChoiceWithBet]
-
-    def to_summary_markdwown(self) -> str:
-        return (
-            f"**点数**: {len(self.root)} 点<br>"
-            f"**購入額**: ¥ {self.total_bet_amount:,}<br>"
-            f"**回収率**: {self.average_pay_back / self.total_bet_amount:.0%}"
-        )
-
-    def to_table(self) -> list[list]:
-        return [
-            [
-                choice.name,
-                choice.odds,
-                choice.bet_amount,
-                choice.pay_back,
-            ]
-            for choice in self.root
-        ]
-
-    @computed_field  # type: ignore
-    @property
-    def total_bet_amount(self) -> int:
-        return sum(choice.bet_amount for choice in self.root)
-
-    @computed_field  # type: ignore
-    @property
-    def average_pay_back(self) -> float:
-        return sum(choice.pay_back for choice in self.root) / len(self.root)
-
-    @computed_field  # type: ignore  # type: ignore
-    @property
-    def average_profit(self) -> float:
-        return sum(choice.profit for choice in self.root) / len(self.root)

src/model/choice/choices_with_bet.py

@@ -0,0 +1,62 @@
+from pydantic import RootModel, computed_field
+
+from .choice_with_bet import ChoiceWithBet
+from .choices import Choices
+
+ChoiceWithBetTable = list[tuple[str, float, int, int]]
+
+
+class ChoicesWithBet(RootModel[list[ChoiceWithBet]]):
+    root: list[ChoiceWithBet]
+
+    @classmethod
+    def from_choices(cls, choices: Choices, budget: int) -> "ChoicesWithBet":
+        inverse_ratios_sum = sum(1 / choice.odds for choice in choices.root)  # 標準化用
+
+        choice_with_bet_list: list[ChoiceWithBet] = []
+        for chice in choices.root:
+            weight = (1 / chice.odds) / inverse_ratios_sum
+            choice_with_bet_list.append(
+                ChoiceWithBet(
+                    name=chice.name,
+                    odds=chice.odds,
+                    bet_amount=max(int(weight * budget / 100) * 100, 100),
+                )
+            )
+        return cls(root=choice_with_bet_list)
+
+    def to_summary_markdwown(self) -> str:
+        return (
+            f"**点数**: {len(self.root)}点<br>"
+            f"**購入/払戻**: ¥{self.total_bet_amount:,} → ¥{int(self.average_pay_back):,} ({int(self.average_profit):+,})<br>"
+            f"**回収率**: {self.average_pay_back / self.total_bet_amount:.0%}"
+        )
+
+    def to_table(self) -> ChoiceWithBetTable:
+        return [
+            (
+                choice.name,
+                choice.odds,
+                choice.bet_amount,
+                choice.pay_back,
+            )
+            for choice in self.root
+        ]
+
+    @computed_field  # type: ignore
+    @property
+    def total_bet_amount(self) -> int:
+        return sum(choice.bet_amount for choice in self.root)
+
+    @computed_field  # type: ignore
+    @property
+    def average_pay_back(self) -> float:
+        _average_pay_back: float = sum(choice.pay_back for choice in self.root) / len(
+            self.root
+        )
+        return _average_pay_back
+
+    @computed_field  # type: ignore
+    @property
+    def average_profit(self) -> float:
+        return self.average_pay_back - self.total_bet_amount