1.增加适配o1-mini、o1-preview模型。2.修复配置Api Server。

Author: flyun

TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java

@@ -5942,33 +5942,32 @@ protected void performSendMessageRequest(final TLObject req, final MessageObject
                 // todo 旧协议兼容
                 // 发送请求格式切换，多模态请求，以及旧模态请求（只能发送文本）
 //                if (isMultiCompletionRequest(aiModelReal, isOpenAIVision)) {
-                if (UserConfig.isSupportImageModel(currentAccount, user.id)) {
+                if (UserConfig.isMultiCompletionRequest(currentAccount, user.id)) {
                     List<ChatMultiMessage> chatMessageList = getChatMultiCompletionRequest(prompt, msgObj);
-//                    if (true) return;
 
                     chatCompletionRequest = ChatCompletionRequest.builder()
                             .model(aiModelReal)
-                            .temperature(temperature != -100 ? temperature : null)
-                            // gpt-4-vision-preview如果不配置maxTokens，则会按照最短的maxTokens配置。
-                            //  导致输出文字过短，而图片模型无法进行多轮会话导致无法发送继续，输出更多内容。
-                            .maxTokens(tokenLimit != -100 ? tokenLimit : 4096)
                             .build().setMessages(chatMessageList);
 
                 } else {
                     List<ChatMessage> chatMessageList = getChatCompletionRequest(prompt, msgObj);
 
                     chatCompletionRequest = ChatCompletionRequest.builder()
                             .model(aiModelReal)
-                            .temperature(temperature != -100 ? temperature : null)
-                            .maxTokens(tokenLimit != -100 ? tokenLimit : null)
                             .build().setMessages(chatMessageList);
                 }
 
+                // o1不支持temperature以及tokenLimit，直接忽略配置
+                if (!UserConfig.isJudgeByModelO(aiModel)) {
+                    chatCompletionRequest.setTemperature(temperature != -100 ? temperature : null);
+                    chatCompletionRequest.setMaxTokens(tokenLimit != -100 ? tokenLimit : null);
+                }
+
                 BaseMessage baseMessage = new BaseMessage();
                 baseMessage.setDialog_id(newMsgObj.dialog_id);
                 KeepAliveJob.finishJob();
 
-                if (getUserConfig().streamResponses) {
+                if (getUserConfig().streamResponses && !UserConfig.isJudgeByModelO(aiModel)) {
 
                     streamMessages.clear();
 

TMessagesProj/src/main/java/org/telegram/messenger/UserConfig.java

@@ -524,6 +524,10 @@ private void initAiModelList() {
         aiModelList.put(13, new AiModelBean("GPT-4o", "gpt-4o", true));
         aiModelList.put(17, new AiModelBean("GPT-4o-0806", "gpt-4o-2024-08-06", true));
         aiModelList.put(18, new AiModelBean("GPT-4o-0513", "gpt-4o-2024-05-13", true));
+        aiModelList.put(19, new AiModelBean("o1 mini", "o1-mini", true));
+        aiModelList.put(20, new AiModelBean("o1 preview", "o1-preview", true));
+        aiModelList.put(21, new AiModelBean("o1 mini-2024-09-12", "o1-mini-2024-09-12", true));
+        aiModelList.put(22, new AiModelBean("o1 preview-2024-09-12", "o1-preview-2024-09-12", true));
         aiModelList.put(1, new AiModelBean("GPT-3.5", "gpt-3.5-turbo", true));
         aiModelList.put(2, new AiModelBean("GPT-3.5-0613", "gpt-3.5-turbo-0613", false));
         aiModelList.put(3, new AiModelBean("GPT-3.5-16k", "gpt-3.5-turbo-16k", true));
@@ -810,6 +814,15 @@ public static boolean isUserGeminiProVision(int currentAccount, long userId) {
 
     }
 
+    public static boolean isJudgeByModelO(int aiModel) {
+        if (aiModel == 19) return true;
+        if (aiModel == 20) return true;
+        if (aiModel == 21) return true;
+        if (aiModel == 22) return true;
+
+        return false;
+    }
+
     public boolean isJudgeByModelGeminiProVision(int aiModel) {
 
         if (aiModel == 802) return true;
@@ -829,6 +842,11 @@ public boolean isJudgeByModelOpenAIVision(int aiModel) {
 
     public static boolean isSupportImageModel(int currentAccount, long userId) {
 
+        int aiModel = getUserAiModel(currentAccount, userId);
+        return isMultiCompletionRequest(currentAccount, userId) && !isJudgeByModelO(aiModel);
+    }
+
+    public static boolean isMultiCompletionRequest(int currentAccount, long userId) {
 
         int aiModel = getUserAiModel(currentAccount, userId);
 

TMessagesProj/src/main/java/org/telegram/ui/ChangeApiServerActivity.java

@@ -236,7 +236,7 @@ private void saveApiServer() {
         String newFirst = firstNameField.getText().toString().replace("\n", "");
         if (TextUtils.isEmpty(newFirst)) {
             newFirst = UserConfig.defaultApiServer;
-        };
+        }
 
         String formatUrl = formatUrl(newFirst);
         if (TextUtils.isEmpty(formatUrl)) {

openai_service/src/main/java/com/theokanning/openai/service/OpenAiService.java

@@ -1494,11 +1494,11 @@ private HashMap<String, String> processOpenAIPrefixUrl(String url) {
                 // 匹配到特定格式，拆分后缀
                 tempPrefixUrl = path.substring(0, path.length() - pathEnd.length());
 
-                tempUrl = new URI(uri.getScheme(), uri.getAuthority(), tempPrefixUrl,
-                        null).toString();
+                tempUrl = new URI(uri.getScheme(),null, uri.getHost(), uri.getPort(), tempPrefixUrl,
+                        null,null).toString();
             } else {
-                tempUrl = new URI(uri.getScheme(), uri.getAuthority(), "/v1/",
-                        null).toString();
+                tempUrl = new URI(uri.getScheme(), null, uri.getHost(), uri.getPort(), path + "v1/",
+                        null,null).toString();
                 tempPrefixUrl = fixPrefixUrl;
             }
         } catch (URISyntaxException e) {