numberとnameを合体

app.py

@@ -35,9 +35,9 @@ with gr.Blocks(
             df_output = gr.Dataframe(
                 value=[],
                 label=None,
-                headers=["", "", "オッズ", "賭け額", "払戻"],
-                datatype=["str", "str", "number", "number", "number"],
-                col_count=(5, "fixed"),
+                headers=["買い目", "オッズ", "賭け額", "払戻"],
+                datatype=["str", "number", "number", "number"],
+                col_count=(4, "fixed"),
             )
 
     # click ------------------------------

src/model/odds.py

@@ -1,22 +1,14 @@
 import re
 from typing import Final
 
-from pydantic import (
-    BaseModel,
-    RootModel,
-    StrictFloat,
-    StrictInt,
-    StrictStr,
-    computed_field,
-    field_validator,
-)
+from pydantic import (BaseModel, RootModel, StrictFloat, StrictInt, StrictStr,
+                      computed_field, field_validator)
 
 NUMBER_JOINER: Final[str] = "-"
 
 
 class Choice(BaseModel):
-    number: StrictStr
-    name: StrictStr = ""
+    name: StrictStr
     odds: StrictFloat
 
 
@@ -52,7 +44,6 @@ class Choices(RootModel[list[Choice]]):
             weight = (1 / chice.odds) / inverse_ratios_sum
             choice_with_bet_list.append(
                 ChoiceWithBet(
-                    number=chice.number,
                     name=chice.name,
                     odds=chice.odds,
                     bet_amount=max(int(weight * budget / 100) * 100, 100),
@@ -98,7 +89,7 @@ class Choices(RootModel[list[Choice]]):
             if is_odds:
                 choices_list.append(
                     Choice(
-                        number=NUMBER_JOINER.join(tmp_numbers),
+                        name=NUMBER_JOINER.join(tmp_numbers),
                         odds=float(line),
                     )
                 )
@@ -122,8 +113,7 @@ class Choices(RootModel[list[Choice]]):
 
             choice_list.append(
                 Choice(
-                    number=NUMBER_JOINER.join(lines[idx_number].split()),
-                    name=NUMBER_JOINER.join(lines[idx_name].split()),
+                    name=f"{NUMBER_JOINER.join(lines[idx_number].split())} {NUMBER_JOINER.join(lines[idx_name].split())}",
                     odds=float(lines[idx_odds]),
                 )
             )
@@ -143,7 +133,6 @@ class ChoicesWithBet(RootModel[list[ChoiceWithBet]]):
     def to_table(self) -> list[list]:
         return [
             [
-                choice.number,
                 choice.name,
                 choice.odds,
                 choice.bet_amount,

tests/test_func.py

@@ -0,0 +1,22 @@
+from src.func import calculate
+
+
+def test_calculate():
+    assert (
+        calculate(
+            10000,
+            (
+                "オッズを見て個別に選択全選択全解除\n"
+                "選択\n"
+                "1\n"
+                " \n"
+                "1\n"
+                "675.5\n"
+                "1\n"
+                "\n"
+                "2\n"
+                "93.7"
+            ),
+        )
+        == []
+    )