feat: add talent price bonus feature and update UI labels

app.py

@@ -10,12 +10,11 @@ from ui.display import (
     get_language,
     get_plants_selector,
     get_strategy,
+    get_talent_price_bonus,
     prerender_inventory_inputs,
     update_dishes_selector_on_language,
-    update_dishes_selector_on_currency,
     update_inventory_inputs,
     update_inventory_ui_by_language,
-    update_plants_selector_on_currency,
     update_plants_selector_on_language,
     update_selectors_on_currency,
 )
@@ -82,6 +81,7 @@ with gr.Blocks(js=js, css=css, theme=gr.themes.Monochrome()) as demo:
         strategy: gr.Radio = get_strategy()
         blooms_rate: gr.Dropdown = get_blooms_acquisition_rate()
         confiserie_rate: gr.Dropdown = get_confiserie_acquisition_rate()
+        talent_price_bonus: gr.Number = get_talent_price_bonus()
         solve_button = gr.Button("Solve")
         results_output = gr.Textbox(label="Results", show_copy_button=True)
 
@@ -127,6 +127,7 @@ with gr.Blocks(js=js, css=css, theme=gr.themes.Monochrome()) as demo:
             budget,
             blooms_rate,
             confiserie_rate,
+            talent_price_bonus,
             strategy,
         ]
         + inventory_inputs,

solver.py

@@ -3,18 +3,13 @@ from datetime import datetime
 import numpy as np
 from numpy.typing import NDArray
 from pyscipopt import Model, quicksum
-from ui.display import format_results
-from ui.i18n import setup_i18n
 
-_ = setup_i18n()
+from ui.display import format_results
 
 from data_loader import (
     DISHES_DF,
-    DISHES_LABELS,
     LABELS,
     PLANTS_DF,
-    PLANTS_LABELS,
-    TIERS_LABELS,
 )
 
 
@@ -94,13 +89,18 @@ def get_results(
     budget,
     plants_prices_extra_rate,
     dishes_prices_extra_rate,
+    talent_price_bonus,
     strategy,
     *inventory,
 ):
     prices: NDArray[np.int16] = np.concat(
         [
             PLANTS_DF[currency] * (1 + plants_prices_extra_rate),
-            DISHES_DF[currency] * (1 + dishes_prices_extra_rate),
+            np.floor(
+                DISHES_DF[currency]
+                * (1 + dishes_prices_extra_rate)
+                * (1 + talent_price_bonus / 100)
+            ).astype(np.int16),
         ],
         dtype=np.int16,
     )
@@ -122,15 +122,13 @@ def get_results(
         for i in range(len(PLANTS_DF))
         if plants_solution[i] > 0
     }
-    results["solution"].update(
-        {
-            f"{LABELS[language]['dishes'][DISHES_DF.iloc[i]['name']]} ({LABELS[language]['tiers'][DISHES_DF.iloc[i]['tier']]}, {int(prices[len(PLANTS_DF) + i])} {currency})": dishes_solution[
-                i
-            ]
-            for i in range(len(DISHES_DF))
-            if dishes_solution[i] > 0
-        }
-    )
+    results["solution"].update({
+        f"{LABELS[language]['dishes'][DISHES_DF.iloc[i]['name']]} ({LABELS[language]['tiers'][DISHES_DF.iloc[i]['tier']]}, {int(prices[len(PLANTS_DF) + i])} {currency})": dishes_solution[
+            i
+        ]
+        for i in range(len(DISHES_DF))
+        if dishes_solution[i] > 0
+    })
     results["total_price"] = outputs["total_price"]
     results["total_count"] = outputs["total_count"]
     results["remaining"] = outputs["remaining"]

ui/display.py

@@ -14,9 +14,6 @@ from data_loader import (
     PLANTS_LABELS,
     TIERS_LABELS,
 )
-from ui.i18n import setup_i18n
-
-_ = setup_i18n()
 
 
 def get_language():
@@ -26,17 +23,14 @@ def get_language():
     return gr.Dropdown(
         choices=[("English", "en"), ("简体中文", "cn"), ("日本語", "ja")],
         value="en",
-        label=_("Language"),
-        info=_(
-            "Select the language for the interface. Currently, only part of texts are translated."
-        ),
+        label="Language",
+        info="Select the language for the interface. Currently, only part of texts are translated.",
         elem_id="language-select",
         interactive=True,
     )
 
 
 def update_inventory_ui_by_language(language):
-    setup_i18n(language)
     inventory_inputs = [
         gr.update(
             label=LABELS[language]["plants"][row["name"]],
@@ -58,7 +52,7 @@ def get_currency():
     Returns a Gradio Radio component for selecting currency.
     """
     return gr.Radio(
-        choices=[(_("Gold"), "gold"), (_("Gems"), "gems")],
+        choices=[("Gold", "gold"), ("Gems", "gems")],
         value="gold",
         type="value",
         label="Currency",
@@ -75,8 +69,8 @@ def get_budget():
     """
     return gr.Number(
         value=0,
-        label=_(_("Budget💸")),
-        info=_(_("Enter your budget amount.")),
+        label="Budget💸",
+        info="Enter your budget amount.",
         elem_id="budget-number",
         interactive=True,
         precision=0,
@@ -92,12 +86,12 @@ def get_blooms_acquisition_rate():
     """
     return gr.Dropdown(
         choices=[
-            _("0(Gabby's Acquisition)"),
-            _("+100%(HVA for Shop Level 1 & 2)"),
-            _("+200%(HVA for Shop Level 3 & 4)"),
-            _("+300%(HVA for Shop Level 5 & 6)"),
+            "0(Gabby's Acquisition)",
+            "+100%(HVA for Shop Level 1 & 2)",
+            "+200%(HVA for Shop Level 3 & 4)",
+            "+300%(HVA for Shop Level 5 & 6)",
         ],
-        value=_("0(Gabby's Acquisition)"),
+        value="0(Gabby's Acquisition)",
         type="index",
         label="Blooms Extra Acquisition Rate🌿",
         info="Select your high-value acquisition rate for Bewildering Blooms.",
@@ -109,12 +103,12 @@ def get_confiserie_acquisition_rate():
     """Returns a Gradio Dropdown component for Confiserie Acquisition Rate."""
     return gr.Dropdown(
         choices=[
-            _("0(Andre's Acquisition)"),
-            _("+100%(HVA for Shop Level 1 & 2)"),
-            _("+200%(HVA for Shop Level 3 & 4)"),
-            _("+300%(HVA for Shop Level 5 & 6)"),
+            "0(Andre's Acquisition)",
+            "+100%(HVA for Shop Level 1 & 2)",
+            "+200%(HVA for Shop Level 3 & 4)",
+            "+300%(HVA for Shop Level 5 & 6)",
         ],
-        value=_("0(Andre's Acquisition)"),
+        value="0(Andre's Acquisition)",
         type="index",
         label="Confiserie Extra Acquisition Rate🍜",
         info="Select your high-value acquisition rate for The Confiserie.",
@@ -154,8 +148,8 @@ def get_plants_selector(language, currency):
         choices=filtered_plants_labels,
         value=default_value,
         type="value",
-        label=_("Plants"),
-        info=_("Select plants"),
+        label="Plants",
+        info="Select plants",
         interactive=True,
     )
     return checkbox_group
@@ -214,8 +208,8 @@ def get_dishes_selector(language, currency):
         choices=filtered_dishes_labels,
         value=default_value,
         type="value",
-        label=_("Dishes"),
-        info=_("Select dishes."),
+        label="Dishes",
+        info="Select dishes.",
         interactive=True,
     )
 
@@ -266,14 +260,10 @@ def prerender_inventory_inputs() -> list[gr.Number]:
         """
         Returns a Gradio Number component for inventory input based on the dataframe row data."""
         return gr.Number(
-            label=_(
-                PLANTS_LABELS[row["name"]]
-                if row["name"] in PLANTS_LABELS
-                else DISHES_LABELS[row["name"]]
-            ),
-            info=_(
-                f"{TIERS_LABELS[row['tier']]} ${row['gold'] if row['gold'] > 0 else row['gems']}"
-            ),
+            label=PLANTS_LABELS[row["name"]]
+            if row["name"] in PLANTS_LABELS
+            else DISHES_LABELS[row["name"]],
+            info=f"{TIERS_LABELS[row['tier']]} ${row['gold'] if row['gold'] > 0 else row['gems']}",
             value=0,
             precision=0,
             minimum=0,
@@ -316,19 +306,36 @@ def update_inventory_inputs(
     return _out
 
 
+def get_talent_price_bonus():
+    """
+    Returns a Gradio Number component for talent price bonus input.
+    """
+    return gr.Number(
+        value=0,
+        label="Talent Price Bonus(%)",
+        info="Enter the total percentage increase in dish selling price from your talents.",
+        elem_id="talent-price-bonus",
+        interactive=True,
+        precision=0,
+        minimum=0,
+        maximum=1000,
+        step=1,
+    )
+
+
 def get_strategy():
     """
     Returns a Gradio Radio component for selecting the selling strategy.
     """
     return gr.Radio(
         choices=[
-            (_("Prioritize high-priced items"), "MaximizeStock"),
-            (_("Prioritize low-priced items"), "MinimizeStock"),
+            ("Prioritize high-priced items", "MaximizeStock"),
+            ("Prioritize low-priced items", "MinimizeStock"),
         ],
         value="MinimizeStock",
         type="value",
-        label=_("Selling Strategy📈📉"),
-        info=_("Select the strategy for selling items."),
+        label="Selling Strategy📈📉",
+        info="Select the strategy for selling items.",
         interactive=True,
         elem_id="strategy-radio",
     )
@@ -345,12 +352,12 @@ def format_results(results):
         str: A formatted string representation of the results.
     """
     output = []
-    output.append(_("Solution:"))
+    output.append("Solution:")
     for item, count in results["solution"].items():
         output.append(f"{item}: {count}")
 
-    output.append(f"\n{_('Total Value:')} {results['total_price']}")
-    output.append(f"{_('Total Count:')} {results['total_count']}")
-    output.append(f"{_('Remaining Budget')}: {results['remaining']}")
+    output.append(f"\n{'Total Value:'} {results['total_price']}")
+    output.append(f"{'Total Count:'} {results['total_count']}")
+    output.append(f"{'Remaining Budget'}: {results['remaining']}")
 
     return "\n".join(output)

ui/i18n.py

@@ -1,11 +0,0 @@
-import gettext
-import os
-
-
-def setup_i18n(language="en"):
-    locales_dir = os.path.join(os.path.dirname(__file__), "locales")
-    translation = gettext.translation(
-        "messages", localedir=locales_dir, languages=[language], fallback=True
-    )
-    translation.install()
-    return translation.gettext

ui/labels.json

@@ -74,6 +74,10 @@
       "feast_of_loyalty_and_dedication": "Feast of Loyalty and Dedication",
       "feast_of_widsom_and_wit": "Feast of Wisdom and Wit",
       "the_founders_feast": "The Founders Feast"
+    },
+    "ui": {
+      "talent_price_bonus": "Talent Price Bonus(%)",
+      "talent_price_bonus_info": "Enter the total percentage increase in dish selling price from your talents."
     }
   },
   "cn": {
@@ -151,6 +155,10 @@
       "feast_of_loyalty_and_dedication": "忠诚与无私之宴",
       "feast_of_widsom_and_wit": "智慧与风雅之宴",
       "the_founders_feast": "霍格沃茨盛宴"
+    },
+    "ui": {
+      "talent_price_bonus": "天赋价格加成(%)",
+      "talent_price_bonus_info": "输入天赋导致的菜品售价增幅百分比。"
     }
   },
   "ja": {
@@ -228,6 +236,10 @@
       "feast_of_loyalty_and_dedication": "知恵と風雅の宴",
       "feast_of_widsom_and_wit": "忠誠と無私の宴",
       "the_founders_feast": "ホグワーツの饗宴"
+    },
+    "ui": {
+      "talent_price_bonus": "才能価格ボーナス(%)",
+      "talent_price_bonus_info": "才能による料理販売価格の上昇率を入力してください。"
     }
   }
 }