OpenAI関連のメソッド名を統一し、認証後のモデル更新処理を追加

- メソッド名を OpenAi -> OpenAI に統一（get/set/del/get_model_list/get_model/set_model）
- OpenAI 認証キー設定時にモデル一覧を取得して SELECTABLE_OPENAI_MODEL_LIST を更新、選択モデルが存在しなければ第一候補へフォールバックして OpenAI クライアントを再初期化する処理を追加
- model のメソッド名を setTranslatorOpenAiModel -> setTranslatorOpenAIModel に変更
- mainloop のエンドポイントマッピングを新しいメソッド名に合わせて更新

src-python/controller.py

@@ -1794,10 +1794,10 @@ class Controller:
         return response
 
     @staticmethod
-    def getOpenAiAuthKey(*args, **kwargs) -> dict:
+    def getOpenAIAuthKey(*args, **kwargs) -> dict:
         return {"status":200, "result":config.AUTH_KEYS["OpenAI_API"]}
 
-    def setOpenAiAuthKey(self, data, *args, **kwargs) -> dict:
+    def setOpenAIAuthKey(self, data, *args, **kwargs) -> dict:
         printLog("Set OpenAI Auth Key", data)
         translator_name = "OpenAI_API"
         try:
@@ -1808,6 +1808,12 @@ class Controller:
                 auth_keys[translator_name] = key
                 config.AUTH_KEYS = auth_keys
                 config.SELECTABLE_TRANSLATION_ENGINE_STATUS[translator_name] = True
+                config.SELECTABLE_OPENAI_MODEL_LIST = model.getTranslatorOpenAIModelList()
+                # ここにrunが必要
+                if config.OPENAI_MODEL not in config.SELECTABLE_OPENAI_MODEL_LIST:
+                    config.OPENAI_MODEL = config.SELECTABLE_OPENAI_MODEL_LIST[0]
+                    # ここにrunが必要
+                model.updateTranslatorOpenAIClient()
                 self.updateTranslationEngineAndEngineList()
                 response = {"status":200, "result":config.AUTH_KEYS[translator_name]}
             else:
@@ -1829,7 +1835,7 @@ class Controller:
             }
         return response
 
-    def delOpenAiAuthKey(self, *args, **kwargs) -> dict:
+    def delOpenAIAuthKey(self, *args, **kwargs) -> dict:
         translator_name = "OpenAI_API"
         auth_keys = config.AUTH_KEYS
         auth_keys[translator_name] = None
@@ -1838,17 +1844,17 @@ class Controller:
         self.updateTranslationEngineAndEngineList()
         return {"status":200, "result":config.AUTH_KEYS[translator_name]}
 
-    def getOpenAiModelList(self, *args, **kwargs) -> dict:
+    def getOpenAIModelList(self, *args, **kwargs) -> dict:
         return {"status":200, "result": config.SELECTABLE_OPENAI_MODEL_LIST}
 
-    def getOpenAiModel(self, *args, **kwargs) -> dict:
+    def getOpenAIModel(self, *args, **kwargs) -> dict:
         return {"status":200, "result":config.OPENAI_MODEL}
 
-    def setOpenAiModel(self, data, *args, **kwargs) -> dict:
+    def setOpenAIModel(self, data, *args, **kwargs) -> dict:
         printLog("Set OpenAI Model", data)
         try:
             data = str(data)
-            result = model.setTranslatorOpenAiModel(model=data)
+            result = model.setTranslatorOpenAIModel(model=data)
             if result is True:
                 config.OPENAI_MODEL = data
                 response = {"status":200, "result":config.OPENAI_MODEL}
@@ -2791,7 +2797,7 @@ class Controller:
                             config.SELECTABLE_OPENAI_MODEL_LIST = model.getTranslatorOpenAIModelList()
                             if config.OPENAI_MODEL not in config.SELECTABLE_OPENAI_MODEL_LIST:
                                 config.OPENAI_MODEL = config.SELECTABLE_OPENAI_MODEL_LIST[0]
-                            model.setTranslatorOpenAiModel(config.OPENAI_MODEL)
+                            model.setTranslatorOpenAIModel(config.OPENAI_MODEL)
                             model.updateTranslatorOpenAIClient()
                         else:
                             # error update Auth key

src-python/mainloop.py

@@ -188,12 +188,12 @@ mapping = {
     "/set/data/gemini_auth_key": {"status": True, "variable":controller.setGeminiAuthKey},
     "/delete/data/gemini_auth_key": {"status": True, "variable":controller.delGeminiAuthKey},
 
-    "/get/data/openai_model_list": {"status": True, "variable":controller.getOpenAiModelList},
+    "/get/data/openai_model_list": {"status": True, "variable":controller.getOpenAIModelList},
-    "/get/data/openai_model": {"status": True, "variable":controller.getOpenAiModel},
+    "/get/data/openai_model": {"status": True, "variable":controller.getOpenAIModel},
-    "/set/data/openai_model": {"status": True, "variable":controller.setOpenAiModel},
+    "/set/data/openai_model": {"status": True, "variable":controller.setOpenAIModel},
-    "/get/data/openai_auth_key": {"status": True, "variable":controller.getOpenAiAuthKey},
+    "/get/data/openai_auth_key": {"status": True, "variable":controller.getOpenAIAuthKey},
-    "/set/data/openai_auth_key": {"status": True, "variable":controller.setOpenAiAuthKey},
+    "/set/data/openai_auth_key": {"status": True, "variable":controller.setOpenAIAuthKey},
-    "/delete/data/openai_auth_key": {"status": True, "variable":controller.delOpenAiAuthKey},
+    "/delete/data/openai_auth_key": {"status": True, "variable":controller.delOpenAIAuthKey},
 
     "/get/data/convert_message_to_romaji": {"status": True, "variable":controller.getConvertMessageToRomaji},
     "/set/enable/convert_message_to_romaji": {"status": True, "variable":controller.setEnableConvertMessageToRomaji},

src-python/model.py

@@ -240,7 +240,7 @@ class Model:
         self.ensure_initialized()
         return self.translator.getOpenAIModelList()
 
-    def setTranslatorOpenAiModel(self, model: str) -> bool:
+    def setTranslatorOpenAIModel(self, model: str) -> bool:
         self.ensure_initialized()
         result = self.translator.setOpenAIModel(model=model)
         return result