Upload 5 files

app_gradio.py

@@ -3,7 +3,8 @@ from utils import get_calculated_df, get_info, text2oddslist
 
 
 def calculate(amount, text):
-    df = get_calculated_df(amount, text2oddslist(text))
+    odds_list = text2oddslist(text)
+    df = get_calculated_df(amount, odds_list)
     info = get_info(df)
 
     # dfの整形

utils.py

@@ -48,8 +48,9 @@ def _text2oddslist_pc(text: str) -> OdddsList:
 def _text2oddslist_mobile(text: str) -> OdddsList:
     odds_list: OdddsList = []
     lines: list[str] = text.split("\n")
-    if "選択" in lines:
-        lines = lines[lines.index("選択") + 1 :]
+    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):
@@ -90,7 +91,6 @@ def get_calculated_df(amount: int, odds_list: OdddsList) -> pd.DataFrame:
     )
     df["refound"] = (df["buy"] * df["odds"]).astype(int)
     df["profit"] = df["refound"] - amount
-    df = df
     return df