refactor:Unify the naming of configuration fields in thinking, change to using underscore style. (#11106)

* refactor:Unify the naming of configuration fields in thinking, change to using underscore style. * fix(i18n): Auto update translations for PR #11106 * chore: lint * fix: typecheck --------- Co-authored-by: GitHub Action <action@github.com>
2025-12-31 00:10:22 +08:00 · 2025-11-02 19:24:23 +08:00 · 2025-11-02 19:24:23 +08:00 · bd94d23343
commit bd94d23343
parent 5f1c14e2c0
10 changed files with 55 additions and 18 deletions
--- a/src/renderer/src/aiCore/legacy/clients/openai/OpenAIApiClient.ts
+++ b/src/renderer/src/aiCore/legacy/clients/openai/OpenAIApiClient.ts
@ -192,7 +192,7 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
            extra_body: {
              google: {
                thinking_config: {
-                  thinkingBudget: 0
+                  thinking_budget: 0
                }
              }
            }
@ -327,8 +327,8 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
          extra_body: {
            google: {
              thinking_config: {
-                thinkingBudget: -1,
-                includeThoughts: true
+                thinking_budget: -1,
+                include_thoughts: true
              }
            }
          }
@ -338,8 +338,8 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
        extra_body: {
          google: {
            thinking_config: {
-              thinkingBudget: budgetTokens,
-              includeThoughts: true
+              thinking_budget: budgetTokens,
+              include_thoughts: true
            }
          }
        }
@ -670,7 +670,7 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
            } else if (isClaudeReasoningModel(model) && reasoningEffort.thinking?.budget_tokens) {
              suffix = ` --thinking_budget ${reasoningEffort.thinking.budget_tokens}`
            } else if (isGeminiReasoningModel(model) && reasoningEffort.extra_body?.google?.thinking_config) {
-              suffix = ` --thinking_budget ${reasoningEffort.extra_body.google.thinking_config.thinkingBudget}`
+              suffix = ` --thinking_budget ${reasoningEffort.extra_body.google.thinking_config.thinking_budget}`
            }
            // FIXME: poe 不支持多个text part，上传文本文件的时候用的不是file part而是text part，因此会出问题
            // 临时解决方案是强制poe用string content，但是其实poe部分支持array
--- a/src/renderer/src/aiCore/utils/reasoning.ts
+++ b/src/renderer/src/aiCore/utils/reasoning.ts
@ -98,7 +98,7 @@ export function getReasoningEffort(assistant: Assistant, model: Model): Reasonin
          extra_body: {
            google: {
              thinking_config: {
-                thinkingBudget: 0
+                thinking_budget: 0
              }
            }
          }
@ -259,8 +259,8 @@ export function getReasoningEffort(assistant: Assistant, model: Model): Reasonin
        extra_body: {
          google: {
            thinking_config: {
-              thinkingBudget: -1,
-              includeThoughts: true
+              thinking_budget: -1,
+              include_thoughts: true
            }
          }
        }
@ -270,8 +270,8 @@ export function getReasoningEffort(assistant: Assistant, model: Model): Reasonin
      extra_body: {
        google: {
          thinking_config: {
-            thinkingBudget: budgetTokens,
-            includeThoughts: true
+            thinking_budget: budgetTokens ?? -1,
+            include_thoughts: true
          }
        }
      }
@ -431,8 +431,8 @@ export function getGeminiReasoningParams(assistant: Assistant, model: Model): Re
    if (reasoningEffort === undefined) {
      return {
        thinkingConfig: {
-          includeThoughts: false,
-          ...(GEMINI_FLASH_MODEL_REGEX.test(model.id) ? { thinkingBudget: 0 } : {})
+          include_thoughts: false,
+          ...(GEMINI_FLASH_MODEL_REGEX.test(model.id) ? { thinking_budget: 0 } : {})
        }
      }
    }
@ -442,7 +442,7 @@ export function getGeminiReasoningParams(assistant: Assistant, model: Model): Re
    if (effortRatio > 1) {
      return {
        thinkingConfig: {
-          includeThoughts: true
+          include_thoughts: true
        }
      }
    }
@ -452,8 +452,8 @@ export function getGeminiReasoningParams(assistant: Assistant, model: Model): Re

    return {
      thinkingConfig: {
-        ...(budget > 0 ? { thinkingBudget: budget } : {}),
-        includeThoughts: true
+        ...(budget > 0 ? { thinking_budget: budget } : {}),
+        include_thoughts: true
      }
    }
  }
--- a/src/renderer/src/i18n/translate/de-de.json
+++ b/src/renderer/src/i18n/translate/de-de.json
@ -1,6 +1,7 @@
 {
  "agent": {
    "add": {
+      "description": "Bewältigen Sie komplexe Aufgaben mit verschiedenen Werkzeugen",
      "error": {
        "failed": "Agent hinzufügen fehlgeschlagen",
        "invalid_agent": "Ungültiger Agent"
@ -547,8 +548,12 @@
  "chat": {
    "add": {
      "assistant": {
+        "description": "Tägliche Gespräche und schnelle Fragen & Antworten",
        "title": "Assistent hinzufügen"
      },
+      "option": {
+        "title": "Typ auswählen"
+      },
      "topic": {
        "title": "Neues Thema erstellen"
      }
--- a/src/renderer/src/i18n/translate/el-gr.json
+++ b/src/renderer/src/i18n/translate/el-gr.json
@ -1,6 +1,7 @@
 {
  "agent": {
    "add": {
+      "description": "Χειριστείτε πολύπλοκες εργασίες με διάφορα εργαλεία",
      "error": {
        "failed": "Αποτυχία προσθήκης πράκτορα",
        "invalid_agent": "Μη έγκυρος Agent"
@ -547,8 +548,12 @@
  "chat": {
    "add": {
      "assistant": {
+        "description": "Καθημερινές συνομιλίες και γρήγορες ερωταπαντήσεις",
        "title": "Προσθήκη βοηθού"
      },
+      "option": {
+        "title": "Επιλέξτε Τύπο"
+      },
      "topic": {
        "title": "Δημιουργία νέου θέματος"
      }
--- a/src/renderer/src/i18n/translate/es-es.json
+++ b/src/renderer/src/i18n/translate/es-es.json
@ -1,6 +1,7 @@
 {
  "agent": {
    "add": {
+      "description": "Maneja tareas complejas con varias herramientas",
      "error": {
        "failed": "Error al añadir agente",
        "invalid_agent": "Agent inválido"
@ -547,8 +548,12 @@
  "chat": {
    "add": {
      "assistant": {
+        "description": "Conversaciones diarias y preguntas y respuestas rápidas",
        "title": "Agregar asistente"
      },
+      "option": {
+        "title": "Seleccionar Tipo"
+      },
      "topic": {
        "title": "Crear nuevo tema"
      }
--- a/src/renderer/src/i18n/translate/fr-fr.json
+++ b/src/renderer/src/i18n/translate/fr-fr.json
@ -1,6 +1,7 @@
 {
  "agent": {
    "add": {
+      "description": "Gérez des tâches complexes avec divers outils",
      "error": {
        "failed": "Échec de l'ajout de l'agent",
        "invalid_agent": "Agent invalide"
@ -547,8 +548,12 @@
  "chat": {
    "add": {
      "assistant": {
+        "description": "Conversations quotidiennes et Q&R rapides",
        "title": "Ajouter un assistant"
      },
+      "option": {
+        "title": "Sélectionner le type"
+      },
      "topic": {
        "title": "Nouveau sujet"
      }
--- a/src/renderer/src/i18n/translate/ja-jp.json
+++ b/src/renderer/src/i18n/translate/ja-jp.json
@ -1,6 +1,7 @@
 {
  "agent": {
    "add": {
+      "description": "さまざまなツールを使って複雑なタスクを処理する",
      "error": {
        "failed": "エージェントの追加に失敗しました",
        "invalid_agent": "無効なエージェント"
@ -547,8 +548,12 @@
  "chat": {
    "add": {
      "assistant": {
+        "description": "日常会話と簡単なQ&A",
        "title": "アシスタントを追加"
      },
+      "option": {
+        "title": "種類を選択"
+      },
      "topic": {
        "title": "新しいトピック"
      }
--- a/src/renderer/src/i18n/translate/pt-pt.json
+++ b/src/renderer/src/i18n/translate/pt-pt.json
@ -1,6 +1,7 @@
 {
  "agent": {
    "add": {
+      "description": "Lide com tarefas complexas usando várias ferramentas",
      "error": {
        "failed": "Falha ao adicionar agente",
        "invalid_agent": "Agent inválido"
@ -547,8 +548,12 @@
  "chat": {
    "add": {
      "assistant": {
+        "description": "Conversas diárias e perguntas e respostas rápidas",
        "title": "Adicionar assistente"
      },
+      "option": {
+        "title": "Selecionar Tipo"
+      },
      "topic": {
        "title": "Novo Tópico"
      }
--- a/src/renderer/src/i18n/translate/ru-ru.json
+++ b/src/renderer/src/i18n/translate/ru-ru.json
@ -1,6 +1,7 @@
 {
  "agent": {
    "add": {
+      "description": "Справляйтесь со сложными задачами с помощью различных инструментов",
      "error": {
        "failed": "Не удалось добавить агента",
        "invalid_agent": "Недействительный агент"
@ -547,8 +548,12 @@
  "chat": {
    "add": {
      "assistant": {
+        "description": "Ежедневные разговоры и быстрые вопросы и ответы",
        "title": "Добавить ассистента"
      },
+      "option": {
+        "title": "Выберите тип"
+      },
      "topic": {
        "title": "Новый топик"
      }
--- a/src/renderer/src/types/sdk.ts
+++ b/src/renderer/src/types/sdk.ts
@ -23,7 +23,6 @@ import type {
  GoogleGenAI,
  Model as GeminiModel,
  SendMessageParameters,
-  ThinkingConfig,
  Tool
 } from '@google/genai'

@ -92,7 +91,10 @@ export type ReasoningEffortOptionalParams = {
  }
  extra_body?: {
    google?: {
-      thinking_config: ThinkingConfig
+      thinking_config: {
+        thinking_budget: number
+        include_thoughts?: boolean
+      }
    }
  }
  // Add any other potential reasoning-related keys here if they exist