mirror of
https://github.com/CherryHQ/cherry-studio.git
synced 2026-07-03 20:59:22 +08:00
0665ce7270
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Co-authored-by: fullex <106392080+0xfullex@users.noreply.github.com> Signed-off-by: suyao <sy20010504@gmail.com>
99 lines
5.3 KiB
Diff
99 lines
5.3 KiB
Diff
diff --git a/dist/internal/index.js b/dist/internal/index.js
|
|
index af85cb1..df59cf5 100644
|
|
--- a/dist/internal/index.js
|
|
+++ b/dist/internal/index.js
|
|
@@ -1480,7 +1480,7 @@ async function prepareTools({
|
|
anthropicTools2.push({
|
|
name: tool.name,
|
|
description: tool.description,
|
|
- input_schema: tool.inputSchema,
|
|
+ input_schema: sanitizeJsonSchema(tool.inputSchema),
|
|
cache_control: cacheControl,
|
|
...eagerInputStreaming ? { eager_input_streaming: true } : {},
|
|
...supportsStrictTools === true && tool.strict != null ? { strict: tool.strict } : {},
|
|
@@ -3459,12 +3459,12 @@ var AnthropicMessagesLanguageModel = class {
|
|
const isThinking = thinkingType === "enabled" || thinkingType === "adaptive";
|
|
let thinkingBudget = thinkingType === "enabled" ? (_f = anthropicOptions == null ? void 0 : anthropicOptions.thinking) == null ? void 0 : _f.budgetTokens : void 0;
|
|
const thinkingDisplay = thinkingType === "adaptive" ? (_g = anthropicOptions == null ? void 0 : anthropicOptions.thinking) == null ? void 0 : _g.display : void 0;
|
|
- const maxTokens = maxOutputTokens != null ? maxOutputTokens : maxOutputTokensForModel;
|
|
+ const maxTokens = maxOutputTokens != null ? maxOutputTokens : (isKnownModel || this.modelId.startsWith("claude-") ? maxOutputTokensForModel : void 0);
|
|
const baseArgs = {
|
|
// model id:
|
|
model: this.modelId,
|
|
// standardized settings:
|
|
- max_tokens: maxTokens,
|
|
+ ...(maxTokens != null && { max_tokens: maxTokens }),
|
|
temperature,
|
|
top_k: topK,
|
|
top_p: topP,
|
|
@@ -3477,6 +3477,9 @@ var AnthropicMessagesLanguageModel = class {
|
|
...thinkingDisplay != null && { display: thinkingDisplay }
|
|
}
|
|
},
|
|
+ ...thinkingType === "disabled" && {
|
|
+ thinking: { type: "disabled" }
|
|
+ },
|
|
...((anthropicOptions == null ? void 0 : anthropicOptions.effort) || (anthropicOptions == null ? void 0 : anthropicOptions.taskBudget) || useStructuredOutput && (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null) && {
|
|
output_config: {
|
|
...(anthropicOptions == null ? void 0 : anthropicOptions.effort) && {
|
|
@@ -3635,7 +3638,9 @@ var AnthropicMessagesLanguageModel = class {
|
|
details: "topP is not supported when thinking is enabled"
|
|
});
|
|
}
|
|
- baseArgs.max_tokens = maxTokens + (thinkingBudget != null ? thinkingBudget : 0);
|
|
+ if (maxTokens != null) {
|
|
+ baseArgs.max_tokens = maxTokens + (thinkingBudget != null ? thinkingBudget : 0);
|
|
+ }
|
|
} else {
|
|
if (isAnthropicModel && topP != null && temperature != null) {
|
|
warnings.push({
|
|
diff --git a/dist/internal/index.mjs b/dist/internal/index.mjs
|
|
index 9c37d98..2f2652e 100644
|
|
--- a/dist/internal/index.mjs
|
|
+++ b/dist/internal/index.mjs
|
|
@@ -1496,7 +1496,7 @@ async function prepareTools({
|
|
anthropicTools2.push({
|
|
name: tool.name,
|
|
description: tool.description,
|
|
- input_schema: tool.inputSchema,
|
|
+ input_schema: sanitizeJsonSchema(tool.inputSchema),
|
|
cache_control: cacheControl,
|
|
...eagerInputStreaming ? { eager_input_streaming: true } : {},
|
|
...supportsStrictTools === true && tool.strict != null ? { strict: tool.strict } : {},
|
|
@@ -3500,12 +3500,12 @@ var AnthropicMessagesLanguageModel = class {
|
|
const isThinking = thinkingType === "enabled" || thinkingType === "adaptive";
|
|
let thinkingBudget = thinkingType === "enabled" ? (_f = anthropicOptions == null ? void 0 : anthropicOptions.thinking) == null ? void 0 : _f.budgetTokens : void 0;
|
|
const thinkingDisplay = thinkingType === "adaptive" ? (_g = anthropicOptions == null ? void 0 : anthropicOptions.thinking) == null ? void 0 : _g.display : void 0;
|
|
- const maxTokens = maxOutputTokens != null ? maxOutputTokens : maxOutputTokensForModel;
|
|
+ const maxTokens = maxOutputTokens != null ? maxOutputTokens : (isKnownModel || this.modelId.startsWith("claude-") ? maxOutputTokensForModel : void 0);
|
|
const baseArgs = {
|
|
// model id:
|
|
model: this.modelId,
|
|
// standardized settings:
|
|
- max_tokens: maxTokens,
|
|
+ ...(maxTokens != null && { max_tokens: maxTokens }),
|
|
temperature,
|
|
top_k: topK,
|
|
top_p: topP,
|
|
@@ -3518,6 +3518,9 @@ var AnthropicMessagesLanguageModel = class {
|
|
...thinkingDisplay != null && { display: thinkingDisplay }
|
|
}
|
|
},
|
|
+ ...thinkingType === "disabled" && {
|
|
+ thinking: { type: "disabled" }
|
|
+ },
|
|
...((anthropicOptions == null ? void 0 : anthropicOptions.effort) || (anthropicOptions == null ? void 0 : anthropicOptions.taskBudget) || useStructuredOutput && (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null) && {
|
|
output_config: {
|
|
...(anthropicOptions == null ? void 0 : anthropicOptions.effort) && {
|
|
@@ -3676,7 +3679,9 @@ var AnthropicMessagesLanguageModel = class {
|
|
details: "topP is not supported when thinking is enabled"
|
|
});
|
|
}
|
|
- baseArgs.max_tokens = maxTokens + (thinkingBudget != null ? thinkingBudget : 0);
|
|
+ if (maxTokens != null) {
|
|
+ baseArgs.max_tokens = maxTokens + (thinkingBudget != null ? thinkingBudget : 0);
|
|
+ }
|
|
} else {
|
|
if (isAnthropicModel && topP != null && temperature != null) {
|
|
warnings.push({
|