update

app.py

@@ -18,7 +18,10 @@ def calculate(budget: int, text: str) -> tuple[str, list[list]]:
         raise gr.Error(e)
 
 
-with gr.Blocks() as demo:
+with gr.Blocks(
+    theme=gr.themes.Default(primary_hue="green", secondary_hue="lime")
+) as demo:
+    # flontend ------------------------------
     with gr.Row():
         with gr.Column():
             budget_input = gr.Number(value=DEFAULT_AMOUNT, label="予算")
@@ -37,7 +40,7 @@ with gr.Blocks() as demo:
                 col_count=(5, "fixed"),
             )
 
-    # click
+    # click ------------------------------
     calculate_button.click(
         calculate,
         inputs=[budget_input, text_input],

src/func.py

@@ -1,9 +1,5 @@
-from typing import Final
-
 from src.model.odds import Choices
 
-DEFAULT_AMOUNT: Final[int] = 10_000
-
 
 def calculate(budget: int, raw_text: str) -> tuple[str, list[list]]:
     choices = Choices.from_text(raw_text)

src/model/odds.py

@@ -1,4 +1,5 @@
 import re
+from typing import Final
 
 from pydantic import (
     BaseModel,
@@ -10,10 +11,12 @@ from pydantic import (
     field_validator,
 )
 
+NUMBER_JOINER: Final[str] = "-"
+
 
 class Choice(BaseModel):
     number: StrictStr
-    name: StrictStr
+    name: StrictStr = ""
     odds: StrictFloat
 
 
@@ -44,11 +47,9 @@ class Choices(RootModel[list[Choice]]):
     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(
                     number=chice.number,
@@ -62,62 +63,68 @@ class Choices(RootModel[list[Choice]]):
 
     @classmethod
     def from_text(cls, text: str) -> "Choices":
+        FIRST_KEYS: Final[list[str]] = [
+            "選択",
+            "オッズ",
+            "組み合わせ",
+            "オッズを見て個別選択",
+        ]
+        LAST_KEYS: Final[list[str]] = ["すべてを選択"]
+
         lines = text.split("\n")
-        for strat_key in ("選択", "オッズ", "組み合わせ", "オッズを見て個別選択"):
-            if strat_key in lines:
-                lines = lines[lines.index(strat_key) + 1 :]
-        text = "\n".join(lines)
+        lines = [line.strip() for line in lines]
+
+        # 余計な行を削除 ----------------------------------------
+        for first_key in FIRST_KEYS:
+            if first_key in lines:
+                lines = lines[lines.index(first_key) + 1 :]
+        for last_key in LAST_KEYS:
+            if last_key in lines:
+                lines = lines[: lines.index(last_key)]
+
         # pcの時
-        is_pc = re.match(r"[\d\n]+", text)
+        is_pc = re.match(r"[\d\s]+", "".join(lines))
         if is_pc:
-            return cls._from_text_from_pc(text)
+            return cls._from_lines_from_pc(lines)
         # moduleの時
-        return cls._from_text_from_mobile(text)
+        return cls._from_lines_from_mobile(lines)
 
     @classmethod
-    def _from_text_from_pc(cls, text: str) -> "Choices":
+    def _from_lines_from_pc(cls, lines: list[str]) -> "Choices":
         choices_list: list[Choice] = []
-        tmp_list: list[str] = []
-        lines: list[str] = text.split("\n")
+        tmp_numbers: list[str] = []
         for line in lines:
             is_odds = "." in line
             if is_odds:
                 choices_list.append(
                     Choice(
-                        number="-".join(tmp_list),
-                        name="",
+                        number=NUMBER_JOINER.join(tmp_numbers),
                         odds=float(line),
                     )
                 )
-                tmp_list = []
+                tmp_numbers = []
             else:
-                if line.strip():
-                    tmp_list.append(line.strip())
+                if line:
+                    tmp_numbers.append(line)
         return cls(root=choices_list)
 
     @classmethod
-    def _from_text_from_mobile(cls, text: str) -> "Choices":
+    def _from_lines_from_mobile(cls, lines: list[str]) -> "Choices":
         choice_list: list[Choice] = []
-        lines: list[str] = text.split("\n")
-        for strat_key in ("選択", "オッズ", "組み合わせ", "オッズを見て個別選択"):
-            if strat_key in lines:
-                lines = lines[lines.index(strat_key) + 1 :]
-        if "すべてを選択" in lines:
-            lines = lines[: lines.index("すべてを選択")]
         for i in range(len(lines) // 3):
-            # oddsが1つ目にある
-            if "." in lines[3 * i + 1]:
-                idx_odds = 1
-                idx_name = 2
-            else:
-                idx_odds = 2
-                idx_name = 1
+            idx_number = 3 * i
+            if "." in lines[3 * i + 1]:  # oddsが2つ目にある
+                idx_odds = 3 * i + 1
+                idx_name = 3 * i + 2
+            else:  # oddsが3つ目にある
+                idx_odds = 3 * i + 2
+                idx_name = 3 * i + 1
 
             choice_list.append(
                 Choice(
-                    number="-".join(lines[3 * i].split()),
-                    name="-".join(lines[3 * i + idx_name].split()),
-                    odds=float(lines[3 * i + idx_odds]),
+                    number=NUMBER_JOINER.join(lines[idx_number].split()),
+                    name=NUMBER_JOINER.join(lines[idx_name].split()),
+                    odds=float(lines[idx_odds]),
                 )
             )
         return cls(root=choice_list)