Skip to content

Commit ac8c670

Browse files
authored
Update LLM configuration and fix island task cold start issues (#390)
2 parents aef75de + 8261298 commit ac8c670

17 files changed

Lines changed: 149 additions & 79 deletions

config/template.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@
101101
"AdbOfflineRestart": false,
102102
"AdbOfflineThreshold": 3,
103103
"LlmAnalysis": true,
104-
"LlmApiKey": "sk-O6ZQRe5T4NJVV8gdVTFHTZAI3Q8ZKtJMWdrrKeGljw3zUX4b",
105-
"LlmApiBase": "https://api.nanoda.work/v1",
106-
"LlmModel": "Nvidia/qwen/qwen2.5-coder-32b-instruct"
104+
"LlmApiKey": null,
105+
"LlmApiBase": "https://api.xiaomimimo.com/v1",
106+
"LlmModel": "mimo-v2.5-pro"
107107
},
108108
"Optimization": {
109109
"OcrDevice": "auto",

module/config/argument/args.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -483,15 +483,15 @@
483483
},
484484
"LlmApiKey": {
485485
"type": "textarea",
486-
"value": "sk-O6ZQRe5T4NJVV8gdVTFHTZAI3Q8ZKtJMWdrrKeGljw3zUX4b"
486+
"value": ""
487487
},
488488
"LlmApiBase": {
489489
"type": "textarea",
490-
"value": "https://api.nanoda.work/v1"
490+
"value": "https://api.xiaomimimo.com/v1"
491491
},
492492
"LlmModel": {
493493
"type": "input",
494-
"value": "Nvidia/qwen/qwen2.5-coder-32b-instruct",
494+
"value": "mimo-v2.5-pro",
495495
"valuetype": "str"
496496
}
497497
},

module/config/argument/argument.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,12 @@ Error:
181181
LlmAnalysis: true
182182
LlmApiKey:
183183
type: textarea
184-
value: "sk-O6ZQRe5T4NJVV8gdVTFHTZAI3Q8ZKtJMWdrrKeGljw3zUX4b"
184+
value: ""
185185
LlmApiBase:
186186
type: textarea
187-
value: "https://api.nanoda.work/v1"
187+
value: "https://api.xiaomimimo.com/v1"
188188
LlmModel:
189-
value: "Nvidia/qwen/qwen2.5-coder-32b-instruct"
189+
value: "mimo-v2.5-pro"
190190
valuetype: str
191191
Optimization:
192192
OcrDevice:

module/config/config_generated.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ class GeneratedConfig:
117117
Error_AdbOfflineRestart = False
118118
Error_AdbOfflineThreshold = 3
119119
Error_LlmAnalysis = True
120-
Error_LlmApiKey = 'sk-O6ZQRe5T4NJVV8gdVTFHTZAI3Q8ZKtJMWdrrKeGljw3zUX4b'
121-
Error_LlmApiBase = 'https://api.nanoda.work/v1'
122-
Error_LlmModel = 'Nvidia/qwen/qwen2.5-coder-32b-instruct'
120+
Error_LlmApiKey = None
121+
Error_LlmApiBase = 'https://api.xiaomimimo.com/v1'
122+
Error_LlmModel = 'mimo-v2.5-pro'
123123

124124
# 配置组 `Optimization`
125125
Optimization_OcrDevice = 'auto' # auto, cpu, gpu, ane

module/config/i18n/en-US.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3675,8 +3675,8 @@
36753675
"help": "Connect with >, e.g. ChaoHo > NewJersey > Amagi_chan\nSaratoga > Akashi > Tashkent > YingSwei\nLeMalin > Unicorn > Shimakaze > Cheshire\nChenHai > WilliamDPorter\nHelena > Friedrich > Atago\nYixian > August > Eugen > Hood > Javelin > Laffey > Explorer > Navigator > OceanCrosser > FeiYun > Takao\nOnly recognizes the first two rows in default order. If the specified character is unavailable, falls back to WorkerJuu."
36763676
},
36773677
"DoubleBambooShoots": {
3678-
"name": "Cold Bamboo Shoots",
3679-
"help": "Produced with highest priority before base meals."
3678+
"name": "Prioritize Seasonal Dish",
3679+
"help": "When enabled, produce the current restaurant seasonal dish before base meals. Spring uses Cold Bamboo Shoots, summer uses Amaranth Rice Ball; autumn and winter have no extra restaurant seasonal dish."
36803680
},
36813681
"Meal1": {
36823682
"name": "Meal 1",
@@ -3886,8 +3886,8 @@
38863886
"help": "Connect with >, e.g. ChaoHo > NewJersey > Amagi_chan\nSaratoga > Akashi > Tashkent > YingSwei\nLeMalin > Unicorn > Shimakaze > Cheshire\nChenHai > WilliamDPorter\nHelena > Friedrich > Atago\nYixian > August > Eugen > Hood > Javelin > Laffey > Explorer > Navigator > OceanCrosser > FeiYun > Takao\nOnly recognizes the first two rows in default order. If the specified character is unavailable, falls back to WorkerJuu."
38873887
},
38883888
"Seasonal": {
3889-
"name": "Spring Flower Tea",
3890-
"help": "Checked and produced before permanent meals."
3889+
"name": "Prioritize Seasonal Drink",
3890+
"help": "When enabled, produce the current Teahouse seasonal drink before base drinks. Spring uses Spring Flower Tea, summer uses Watermelon Juice; autumn and winter have no extra teahouse seasonal drink."
38913891
},
38923892
"Meal1": {
38933893
"name": "Meal 1",

module/config/i18n/ja-JP.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3675,8 +3675,8 @@
36753675
"help": ">で接続。例:ChaoHo > NewJersey > Amagi_chan\nSaratoga > Akashi > Tashkent > YingSwei\nLeMalin > Unicorn > Shimakaze > Cheshire\nChenHai > WilliamDPorter\nHelena > Friedrich > Atago\nYixian > August > Eugen > Hood > Javelin > Laffey > Explorer > Navigator > OceanCrosser > FeiYun > Takao\nデフォルト順の先頭2行のみ認識します。指定キャラクターが使用できない場合は WorkerJuu にフォールバックします。"
36763676
},
36773677
"DoubleBambooShoots": {
3678-
"name": "涼拌双筍",
3679-
"help": "基本メニューの前に最優先で生産されます"
3678+
"name": "季節料理を優先生産",
3679+
"help": "有効にすると、現在の季節のレストラン季節料理を基本メニューより先に生産します。春は涼拌双筍、夏はアマランサスおにぎりです。秋冬は追加の季節料理を生産しません"
36803680
},
36813681
"Meal1": {
36823682
"name": "メニュー1",
@@ -3886,8 +3886,8 @@
38863886
"help": ">で接続。例:ChaoHo > NewJersey > Amagi_chan\nSaratoga > Akashi > Tashkent > YingSwei\nLeMalin > Unicorn > Shimakaze > Cheshire\nChenHai > WilliamDPorter\nHelena > Friedrich > Atago\nYixian > August > Eugen > Hood > Javelin > Laffey > Explorer > Navigator > OceanCrosser > FeiYun > Takao\nデフォルト順の先頭2行のみ認識します。指定キャラクターが使用できない場合は WorkerJuu にフォールバックします。"
38873887
},
38883888
"Seasonal": {
3889-
"name": "春花茶",
3890-
"help": "常設メニューの前にチェックして生産されます"
3889+
"name": "季節ドリンクを優先生産",
3890+
"help": "有効にすると、現在の季節の白熊ドリンク季節品を基本ドリンクより先に生産します。春は迎春花茶、夏はスイカジュースです。秋冬は追加の季節ドリンクを生産しません"
38913891
},
38923892
"Meal1": {
38933893
"name": "メニュー1",

module/config/i18n/zh-CN.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3675,8 +3675,8 @@
36753675
"help": "以>连接,例如肇和 新泽西 小天城:ChaoHo > NewJersey > Amagi_chan\n小加加:Saratoga > 明石:Akashi > 塔什干:Tashkent > 应瑞:YingSwei\n恶毒:LeMalin > 独角兽:Unicorn > 岛风:Shimakaze > 柴郡:Cheshire\n镇海:ChenHai > 威廉D波特:WilliamDPorter\n海伦娜:Helena > 大帝:Friedrich > 愛宕:Atago\n逸仙:Yixian > 奥古斯特:August > 欧根亲王:Eugen > 胡德:Hood > 标枪:Javelin > 拉菲:Laffey > 探索者:Explorer > 领航员:Navigator > 领洋者:OceanCrosser > 飞云:FeiYun > 高雄:Takao\n仅识别默认排序前两排;指定舰娘不可用时回退 WorkerJuu。"
36763676
},
36773677
"DoubleBambooShoots": {
3678-
"name": "凉拌双笋",
3679-
"help": "在基础餐品之前优先制作(最高优先级)"
3678+
"name": "季节餐优先制作",
3679+
"help": "开启后按当前季节选择餐馆季节餐,并在基础餐品之前优先制作。春季为凉拌双笋,夏季为苋菜饭团;秋冬无餐馆季节餐时不额外制作。"
36803680
},
36813681
"Meal1": {
36823682
"name": "餐品1",
@@ -3886,8 +3886,8 @@
38863886
"help": "以>连接,例如肇和 新泽西 小天城:ChaoHo > NewJersey > Amagi_chan\n小加加:Saratoga > 明石:Akashi > 塔什干:Tashkent > 应瑞:YingSwei\n恶毒:LeMalin > 独角兽:Unicorn > 岛风:Shimakaze > 柴郡:Cheshire\n镇海:ChenHai > 威廉D波特:WilliamDPorter\n海伦娜:Helena > 大帝:Friedrich > 愛宕:Atago\n逸仙:Yixian > 奥古斯特:August > 欧根亲王:Eugen > 胡德:Hood > 标枪:Javelin > 拉菲:Laffey > 探索者:Explorer > 领航员:Navigator > 领洋者:OceanCrosser > 飞云:FeiYun > 高雄:Takao\n仅识别默认排序前两排;指定舰娘不可用时回退 WorkerJuu。"
38873887
},
38883888
"Seasonal": {
3889-
"name": "迎春花茶",
3890-
"help": "在常驻餐品之前检查并制作"
3889+
"name": "季节饮品优先制作",
3890+
"help": "开启后按当前季节选择白熊饮品的季节饮品,并在基础饮品之前优先制作。春季为迎春花茶,夏季为西瓜汁;秋冬无白熊饮品季节饮品时不额外制作。"
38913891
},
38923892
"Meal1": {
38933893
"name": "餐品1",

module/config/i18n/zh-MIAO.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3675,8 +3675,8 @@
36753675
"help": "以>连接,例如肇和 新泽西 小天城:ChaoHo > NewJersey > Amagi_chan\n小加加:Saratoga > 明石:Akashi > 塔什干:Tashkent > 应瑞:YingSwei\n恶毒:LeMalin > 独角兽:Unicorn > 岛风:Shimakaze > 柴郡:Cheshire\n镇海:ChenHai > 威廉D波特:WilliamDPorter\n海伦娜:Helena > 大帝:Friedrich > 愛宕:Atago\n逸仙:Yixian > 奥古斯特:August > 欧根亲王:Eugen > 胡德:Hood > 标枪:Javelin > 拉菲:Laffey > 探索者:Explorer > 领航员:Navigator > 领洋者:OceanCrosser > 飞云:FeiYun > 高雄:Takao\n仅识别默认排序前两排;指定舰娘不可用时回退 WorkerJuu。"
36763676
},
36773677
"DoubleBambooShoots": {
3678-
"name": "凉拌双笋",
3679-
"help": "在基础餐品之前优先制作(最高优先级)"
3678+
"name": "季节餐优先制作",
3679+
"help": "开启后按当前季节选择餐馆季节餐,并在基础餐品之前优先制作喵。春季为凉拌双笋,夏季为苋菜饭团;秋冬无餐馆季节餐时不额外制作喵。"
36803680
},
36813681
"Meal1": {
36823682
"name": "餐品1",
@@ -3886,8 +3886,8 @@
38863886
"help": "以>连接,例如肇和 新泽西 小天城:ChaoHo > NewJersey > Amagi_chan\n小加加:Saratoga > 明石:Akashi > 塔什干:Tashkent > 应瑞:YingSwei\n恶毒:LeMalin > 独角兽:Unicorn > 岛风:Shimakaze > 柴郡:Cheshire\n镇海:ChenHai > 威廉D波特:WilliamDPorter\n海伦娜:Helena > 大帝:Friedrich > 愛宕:Atago\n逸仙:Yixian > 奥古斯特:August > 欧根亲王:Eugen > 胡德:Hood > 标枪:Javelin > 拉菲:Laffey > 探索者:Explorer > 领航员:Navigator > 领洋者:OceanCrosser > 飞云:FeiYun > 高雄:Takao\n仅识别默认排序前两排;指定舰娘不可用时回退 WorkerJuu。"
38873887
},
38883888
"Seasonal": {
3889-
"name": "迎春花茶",
3890-
"help": "在常驻餐品之前检查并制作"
3889+
"name": "季节饮品优先制作",
3890+
"help": "开启后按当前季节选择白熊饮品的季节饮品,并在基础饮品之前优先制作喵。春季为迎春花茶,夏季为西瓜汁;秋冬无白熊饮品季节饮品时不额外制作喵。"
38913891
},
38923892
"Meal1": {
38933893
"name": "餐品1",

module/config/i18n/zh-TW.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3675,8 +3675,8 @@
36753675
"help": "以>連接,例如肇和 新澤西 小天城:ChaoHo > NewJersey > Amagi_chan\n小加加:Saratoga > 明石:Akashi > 塔什干:Tashkent > 應瑞:YingSwei\n惡毒:LeMalin > 獨角獸:Unicorn > 島風:Shimakaze > 柴郡:Cheshire\n鎮海:ChenHai > 威廉D波特:WilliamDPorter\n海倫娜:Helena > 大帝:Friedrich > 愛宕:Atago\n逸仙:Yixian > 奧古斯特:August > 歐根親王:Eugen > 胡德:Hood > 標槍:Javelin > 拉菲:Laffey > 探索者:Explorer > 領航員:Navigator > 領洋者:OceanCrosser > 飛雲:FeiYun > 高雄:Takao\n僅識別預設排序前兩排;指定艦娘不可用時回退 WorkerJuu。"
36763676
},
36773677
"DoubleBambooShoots": {
3678-
"name": "涼拌雙筍",
3679-
"help": "在基礎餐品之前優先製作(最高優先級)"
3678+
"name": "季節餐優先製作",
3679+
"help": "開啟後按目前季節選擇餐館季節餐,並在基礎餐品之前優先製作。春季為涼拌雙筍,夏季為莧菜飯糰;秋冬無餐館季節餐時不額外製作。"
36803680
},
36813681
"Meal1": {
36823682
"name": "餐品1",
@@ -3886,8 +3886,8 @@
38863886
"help": "以>連接,例如肇和 新澤西 小天城:ChaoHo > NewJersey > Amagi_chan\n小加加:Saratoga > 明石:Akashi > 塔什干:Tashkent > 應瑞:YingSwei\n惡毒:LeMalin > 獨角獸:Unicorn > 島風:Shimakaze > 柴郡:Cheshire\n鎮海:ChenHai > 威廉D波特:WilliamDPorter\n海倫娜:Helena > 大帝:Friedrich > 愛宕:Atago\n逸仙:Yixian > 奧古斯特:August > 歐根親王:Eugen > 胡德:Hood > 標槍:Javelin > 拉菲:Laffey > 探索者:Explorer > 領航員:Navigator > 領洋者:OceanCrosser > 飛雲:FeiYun > 高雄:Takao\n僅識別預設排序前兩排;指定艦娘不可用時回退 WorkerJuu。"
38873887
},
38883888
"Seasonal": {
3889-
"name": "迎春花茶",
3890-
"help": "在常駐餐品之前檢查並製作"
3889+
"name": "季節飲品優先製作",
3890+
"help": "開啟後按目前季節選擇白熊飲品的季節飲品,並在基礎飲品之前優先製作。春季為迎春花茶,夏季為西瓜汁;秋冬無白熊飲品季節飲品時不額外製作。"
38913891
},
38923892
"Meal1": {
38933893
"name": "餐品1",

module/island/island_cargo_preparation.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
from module.logger import logger
3535
from module.map.map_grids import SelectedGrids
3636
from module.ocr.ocr import Duration
37-
from module.ui.page import page_island_phone
37+
from module.ui.page import page_island, page_island_phone
3838
from module.ui_white.assets import POPUP_CANCEL_WHITE
3939

4040

@@ -238,6 +238,7 @@ def blacklist(self):
238238
def run(self):
239239
logger.hr('Island Cargo Preparation Run', level=1)
240240

241+
self.ui_ensure(page_island)
241242
self.ui_goto(page_island_phone, get_ship=False)
242243
self.island_transport_enter()
243244

0 commit comments

Comments
 (0)