mirror of
https://github.com/CherryHQ/cherry-studio.git
synced 2025-12-27 21:01:32 +08:00
chore: remove deprecated patches for @ai-sdk/google-vertex and @ai-sdk/openai-compatible
- Deleted outdated patch files for @ai-sdk/google-vertex and @ai-sdk/openai-compatible from the project. - Updated package.json to reflect the removal of these patches, streamlining dependency management.
This commit is contained in:
parent
e3c5c87e1b
commit
ef8cf65ece
@ -1,26 +0,0 @@
|
||||
diff --git a/edge/dist/index.js b/edge/dist/index.js
|
||||
index 87cb4e77c6e02c9cc16082f47d9a80878bea1006..8061d52940bfef4f4815051fd09bb700cf0034c7 100644
|
||||
--- a/edge/dist/index.js
|
||||
+++ b/edge/dist/index.js
|
||||
@@ -248,7 +248,7 @@ function createVertex(options = {}) {
|
||||
var _a;
|
||||
const region = loadVertexLocation();
|
||||
const project = loadVertexProject();
|
||||
- return (_a = (0, import_provider_utils4.withoutTrailingSlash)(options.baseURL)) != null ? _a : `https://${region}-aiplatform.googleapis.com/v1/projects/${project}/locations/${region}/publishers/google`;
|
||||
+ return (_a = (0, import_provider_utils4.withoutTrailingSlash)(options.baseURL)) != null ? _a : region === "global" ? `https://aiplatform.googleapis.com/v1/projects/${project}/locations/global/publishers/google` : `https://${region}-aiplatform.googleapis.com/v1/projects/${project}/locations/${region}/publishers/google`;
|
||||
};
|
||||
const createConfig = (name) => {
|
||||
var _a;
|
||||
diff --git a/edge/dist/index.mjs b/edge/dist/index.mjs
|
||||
index bd4ed39abe78fae60673607ab46241cc29dfa0a2..2e6f36d3668635d93b17660eda18f89972b4ccfd 100644
|
||||
--- a/edge/dist/index.mjs
|
||||
+++ b/edge/dist/index.mjs
|
||||
@@ -238,7 +238,7 @@ function createVertex(options = {}) {
|
||||
var _a;
|
||||
const region = loadVertexLocation();
|
||||
const project = loadVertexProject();
|
||||
- return (_a = withoutTrailingSlash(options.baseURL)) != null ? _a : `https://${region}-aiplatform.googleapis.com/v1/projects/${project}/locations/${region}/publishers/google`;
|
||||
+ return (_a = withoutTrailingSlash(options.baseURL)) != null ? _a : region === "global" ? `https://aiplatform.googleapis.com/v1/projects/${project}/locations/global/publishers/google` : `https://${region}-aiplatform.googleapis.com/v1/projects/${project}/locations/${region}/publishers/google`;
|
||||
};
|
||||
const createConfig = (name) => {
|
||||
var _a;
|
||||
@ -1,94 +0,0 @@
|
||||
diff --git a/dist/index.js b/dist/index.js
|
||||
index 287fe679c32d30a9745270a00589eb90de8da786..5892d4526529e89fca868251ee0c1b081748c358 100644
|
||||
--- a/dist/index.js
|
||||
+++ b/dist/index.js
|
||||
@@ -321,8 +321,8 @@ var OpenAICompatibleChatLanguageModel = class {
|
||||
} : { type: "json_object" } : void 0,
|
||||
stop: stopSequences,
|
||||
seed,
|
||||
- ...providerMetadata == null ? void 0 : providerMetadata[this.providerOptionsName],
|
||||
reasoning_effort: (_d = (_b = providerMetadata == null ? void 0 : providerMetadata[this.providerOptionsName]) == null ? void 0 : _b.reasoningEffort) != null ? _d : (_c = providerMetadata == null ? void 0 : providerMetadata["openai-compatible"]) == null ? void 0 : _c.reasoningEffort,
|
||||
+ ...providerMetadata == null ? void 0 : providerMetadata[this.providerOptionsName],
|
||||
// messages:
|
||||
messages: convertToOpenAICompatibleChatMessages(prompt)
|
||||
};
|
||||
@@ -510,7 +510,7 @@ var OpenAICompatibleChatLanguageModel = class {
|
||||
...args,
|
||||
stream: true,
|
||||
// only include stream_options when in strict compatibility mode:
|
||||
- stream_options: this.config.includeUsage ? { include_usage: true } : void 0
|
||||
+ ...(this.config.includeUsage ? { stream_options: { include_usage: true } } : {})
|
||||
};
|
||||
const metadataExtractor = (_a = this.config.metadataExtractor) == null ? void 0 : _a.createStreamExtractor();
|
||||
const { responseHeaders, value: response } = await (0, import_provider_utils2.postJsonToApi)({
|
||||
@@ -1324,10 +1324,11 @@ function createOpenAICompatible(options) {
|
||||
headers: getHeaders,
|
||||
fetch: options.fetch
|
||||
});
|
||||
- const createLanguageModel = (modelId, settings = {}) => createChatModel(modelId, settings);
|
||||
- const createChatModel = (modelId, settings = {}) => new OpenAICompatibleChatLanguageModel(modelId, settings, {
|
||||
+ const createLanguageModel = (modelId, settings = {}, config = {}) => createChatModel(modelId, settings, config);
|
||||
+ const createChatModel = (modelId, settings = {}, config = {}) => new OpenAICompatibleChatLanguageModel(modelId, settings, {
|
||||
...getCommonModelConfig("chat"),
|
||||
- defaultObjectGenerationMode: "tool"
|
||||
+ defaultObjectGenerationMode: "tool",
|
||||
+ ...config
|
||||
});
|
||||
const createCompletionModel = (modelId, settings = {}) => new OpenAICompatibleCompletionLanguageModel(
|
||||
modelId,
|
||||
@@ -1344,7 +1345,7 @@ function createOpenAICompatible(options) {
|
||||
settings,
|
||||
getCommonModelConfig("image")
|
||||
);
|
||||
- const provider = (modelId, settings) => createLanguageModel(modelId, settings);
|
||||
+ const provider = (modelId, settings, config) => createLanguageModel(modelId, settings, config);
|
||||
provider.languageModel = createLanguageModel;
|
||||
provider.chatModel = createChatModel;
|
||||
provider.completionModel = createCompletionModel;
|
||||
diff --git a/dist/index.mjs b/dist/index.mjs
|
||||
index 6446ad8d3a96c798bea3a17c1802810139d24143..7bb81eb126992cc64453134cc2581c2314c022c1 100644
|
||||
--- a/dist/index.mjs
|
||||
+++ b/dist/index.mjs
|
||||
@@ -305,8 +305,8 @@ var OpenAICompatibleChatLanguageModel = class {
|
||||
} : { type: "json_object" } : void 0,
|
||||
stop: stopSequences,
|
||||
seed,
|
||||
- ...providerMetadata == null ? void 0 : providerMetadata[this.providerOptionsName],
|
||||
reasoning_effort: (_d = (_b = providerMetadata == null ? void 0 : providerMetadata[this.providerOptionsName]) == null ? void 0 : _b.reasoningEffort) != null ? _d : (_c = providerMetadata == null ? void 0 : providerMetadata["openai-compatible"]) == null ? void 0 : _c.reasoningEffort,
|
||||
+ ...providerMetadata == null ? void 0 : providerMetadata[this.providerOptionsName],
|
||||
// messages:
|
||||
messages: convertToOpenAICompatibleChatMessages(prompt)
|
||||
};
|
||||
@@ -494,7 +494,7 @@ var OpenAICompatibleChatLanguageModel = class {
|
||||
...args,
|
||||
stream: true,
|
||||
// only include stream_options when in strict compatibility mode:
|
||||
- stream_options: this.config.includeUsage ? { include_usage: true } : void 0
|
||||
+ ...(this.config.includeUsage ? { stream_options: { include_usage: true } } : {})
|
||||
};
|
||||
const metadataExtractor = (_a = this.config.metadataExtractor) == null ? void 0 : _a.createStreamExtractor();
|
||||
const { responseHeaders, value: response } = await postJsonToApi({
|
||||
@@ -1331,10 +1331,11 @@ function createOpenAICompatible(options) {
|
||||
headers: getHeaders,
|
||||
fetch: options.fetch
|
||||
});
|
||||
- const createLanguageModel = (modelId, settings = {}) => createChatModel(modelId, settings);
|
||||
- const createChatModel = (modelId, settings = {}) => new OpenAICompatibleChatLanguageModel(modelId, settings, {
|
||||
+ const createLanguageModel = (modelId, settings = {}, config = {}) => createChatModel(modelId, settings, config);
|
||||
+ const createChatModel = (modelId, settings = {}, config = {}) => new OpenAICompatibleChatLanguageModel(modelId, settings, {
|
||||
...getCommonModelConfig("chat"),
|
||||
- defaultObjectGenerationMode: "tool"
|
||||
+ defaultObjectGenerationMode: "tool",
|
||||
+ ...config
|
||||
});
|
||||
const createCompletionModel = (modelId, settings = {}) => new OpenAICompatibleCompletionLanguageModel(
|
||||
modelId,
|
||||
@@ -1351,7 +1352,7 @@ function createOpenAICompatible(options) {
|
||||
settings,
|
||||
getCommonModelConfig("image")
|
||||
);
|
||||
- const provider = (modelId, settings) => createLanguageModel(modelId, settings);
|
||||
+ const provider = (modelId, settings, config) => createLanguageModel(modelId, settings, config);
|
||||
provider.languageModel = createLanguageModel;
|
||||
provider.chatModel = createChatModel;
|
||||
provider.completionModel = createCompletionModel;
|
||||
@ -254,8 +254,6 @@
|
||||
"openai@npm:^4.87.3": "patch:openai@npm%3A5.1.0#~/.yarn/patches/openai-npm-5.1.0-0e7b3ccb07.patch",
|
||||
"app-builder-lib@npm:26.0.15": "patch:app-builder-lib@npm%3A26.0.15#~/.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch",
|
||||
"@langchain/core@npm:^0.3.26": "patch:@langchain/core@npm%3A0.3.44#~/.yarn/patches/@langchain-core-npm-0.3.44-41d5c3cb0a.patch",
|
||||
"@ai-sdk/openai-compatible@npm:0.2.14": "patch:@ai-sdk/openai-compatible@npm%3A0.2.14#~/.yarn/patches/@ai-sdk-openai-compatible-npm-0.2.14-bb0a64a4be.patch",
|
||||
"@ai-sdk/google-vertex@npm:2.2.24": "patch:@ai-sdk/google-vertex@npm%3A2.2.24#~/.yarn/patches/@ai-sdk-google-vertex-npm-2.2.24-b89772c4de.patch",
|
||||
"undici": "6.21.2"
|
||||
},
|
||||
"packageManager": "yarn@4.9.1",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user