Compare commits

..

1 Commits

Author SHA1 Message Date
dependabot[bot]
94a28f1055 ci(deps): bump actions/github-script from 7 to 8
Bumps [actions/github-script](https://github.com/actions/github-script) from 7 to 8.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v7...v8)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-version: '8'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-12-01 00:33:53 +00:00
21 changed files with 82 additions and 248 deletions

View File

@@ -42,7 +42,7 @@ jobs:
- name: Add pending label if in quiet hours - name: Add pending label if in quiet hours
if: steps.check_time.outputs.should_delay == 'true' if: steps.check_time.outputs.should_delay == 'true'
uses: actions/github-script@v7 uses: actions/github-script@v8
with: with:
script: | script: |
github.rest.issues.addLabels({ github.rest.issues.addLabels({

View File

@@ -162,7 +162,7 @@
"@langchain/core": "patch:@langchain/core@npm%3A1.0.2#~/.yarn/patches/@langchain-core-npm-1.0.2-183ef83fe4.patch", "@langchain/core": "patch:@langchain/core@npm%3A1.0.2#~/.yarn/patches/@langchain-core-npm-1.0.2-183ef83fe4.patch",
"@langchain/openai": "patch:@langchain/openai@npm%3A1.0.0#~/.yarn/patches/@langchain-openai-npm-1.0.0-474d0ad9d4.patch", "@langchain/openai": "patch:@langchain/openai@npm%3A1.0.0#~/.yarn/patches/@langchain-openai-npm-1.0.0-474d0ad9d4.patch",
"@mistralai/mistralai": "^1.7.5", "@mistralai/mistralai": "^1.7.5",
"@modelcontextprotocol/sdk": "^1.23.0", "@modelcontextprotocol/sdk": "^1.17.5",
"@mozilla/readability": "^0.6.0", "@mozilla/readability": "^0.6.0",
"@notionhq/client": "^2.2.15", "@notionhq/client": "^2.2.15",
"@openrouter/ai-sdk-provider": "^1.2.8", "@openrouter/ai-sdk-provider": "^1.2.8",

View File

@@ -42,14 +42,11 @@ import {
type MCPPrompt, type MCPPrompt,
type MCPResource, type MCPResource,
type MCPServer, type MCPServer,
type MCPTool, type MCPTool
MCPToolInputSchema,
MCPToolOutputSchema
} from '@types' } from '@types'
import { app, net } from 'electron' import { app, net } from 'electron'
import { EventEmitter } from 'events' import { EventEmitter } from 'events'
import { v4 as uuidv4 } from 'uuid' import { v4 as uuidv4 } from 'uuid'
import * as z from 'zod'
import { CacheService } from './CacheService' import { CacheService } from './CacheService'
import DxtService from './DxtService' import DxtService from './DxtService'
@@ -623,8 +620,6 @@ class McpService {
tools.map((tool: SDKTool) => { tools.map((tool: SDKTool) => {
const serverTool: MCPTool = { const serverTool: MCPTool = {
...tool, ...tool,
inputSchema: z.parse(MCPToolInputSchema, tool.inputSchema),
outputSchema: tool.outputSchema ? z.parse(MCPToolOutputSchema, tool.outputSchema) : undefined,
id: buildFunctionCallToolName(server.name, tool.name, server.id), id: buildFunctionCallToolName(server.name, tool.name, server.id),
serverId: server.id, serverId: server.id,
serverName: server.name, serverName: server.name,

View File

@@ -27,7 +27,6 @@ import { buildAiSdkMiddlewares } from './middleware/AiSdkMiddlewareBuilder'
import { buildPlugins } from './plugins/PluginBuilder' import { buildPlugins } from './plugins/PluginBuilder'
import { createAiSdkProvider } from './provider/factory' import { createAiSdkProvider } from './provider/factory'
import { import {
adaptProvider,
getActualProvider, getActualProvider,
isModernSdkSupported, isModernSdkSupported,
prepareSpecialProviderConfig, prepareSpecialProviderConfig,
@@ -65,11 +64,12 @@ export default class ModernAiProvider {
* - URL will be automatically formatted via `formatProviderApiHost`, adding version suffixes like `/v1` * - URL will be automatically formatted via `formatProviderApiHost`, adding version suffixes like `/v1`
* *
* 2. When called with `(model, provider)`: * 2. When called with `(model, provider)`:
* - The provided provider will be adapted via `adaptProvider` * - **Directly uses the provided provider WITHOUT going through `getActualProvider`**
* - URL formatting behavior depends on the adapted result * - **URL will NOT be automatically formatted, `/v1` suffix will NOT be added**
* - This is legacy behavior kept for backward compatibility
* *
* 3. When called with `(provider)`: * 3. When called with `(provider)`:
* - The provider will be adapted via `adaptProvider` * - Directly uses the provider without requiring a model
* - Used for operations that don't need a model (e.g., fetchModels) * - Used for operations that don't need a model (e.g., fetchModels)
* *
* @example * @example
@@ -77,7 +77,7 @@ export default class ModernAiProvider {
* // Recommended: Auto-format URL * // Recommended: Auto-format URL
* const ai = new ModernAiProvider(model) * const ai = new ModernAiProvider(model)
* *
* // Provider will be adapted * // Not recommended: Skip URL formatting (only for special cases)
* const ai = new ModernAiProvider(model, customProvider) * const ai = new ModernAiProvider(model, customProvider)
* *
* // For operations that don't need a model * // For operations that don't need a model
@@ -91,12 +91,12 @@ export default class ModernAiProvider {
if (this.isModel(modelOrProvider)) { if (this.isModel(modelOrProvider)) {
// 传入的是 Model // 传入的是 Model
this.model = modelOrProvider this.model = modelOrProvider
this.actualProvider = provider ? adaptProvider({ provider }) : getActualProvider(modelOrProvider) this.actualProvider = provider || getActualProvider(modelOrProvider)
// 只保存配置不预先创建executor // 只保存配置不预先创建executor
this.config = providerToAiSdkConfig(this.actualProvider, modelOrProvider) this.config = providerToAiSdkConfig(this.actualProvider, modelOrProvider)
} else { } else {
// 传入的是 Provider // 传入的是 Provider
this.actualProvider = adaptProvider({ provider: modelOrProvider }) this.actualProvider = modelOrProvider
// model为可选某些操作如fetchModels不需要model // model为可选某些操作如fetchModels不需要model
} }

View File

@@ -78,13 +78,11 @@ function handleSpecialProviders(model: Model, provider: Provider): Provider {
} }
/** /**
* Format and normalize the API host URL for a provider. * 主要用来对齐AISdk的BaseURL格式
* Handles provider-specific URL formatting rules (e.g., appending version paths, Azure formatting). * @param provider
* * @returns
* @param provider - The provider whose API host is to be formatted.
* @returns A new provider instance with the formatted API host.
*/ */
export function formatProviderApiHost(provider: Provider): Provider { function formatProviderApiHost(provider: Provider): Provider {
const formatted = { ...provider } const formatted = { ...provider }
if (formatted.anthropicApiHost) { if (formatted.anthropicApiHost) {
formatted.anthropicApiHost = formatApiHost(formatted.anthropicApiHost) formatted.anthropicApiHost = formatApiHost(formatted.anthropicApiHost)
@@ -116,38 +114,18 @@ export function formatProviderApiHost(provider: Provider): Provider {
} }
/** /**
* Retrieve the effective Provider configuration for the given model. * 获取实际的Provider配置
* Applies all necessary transformations (special-provider handling, URL formatting, etc.). * 简化版:将逻辑分解为小函数
*
* @param model - The model whose provider is to be resolved.
* @returns A new Provider instance with all adaptations applied.
*/ */
export function getActualProvider(model: Model): Provider { export function getActualProvider(model: Model): Provider {
const baseProvider = getProviderByModel(model) const baseProvider = getProviderByModel(model)
return adaptProvider({ provider: baseProvider, model }) // 按顺序处理各种转换
} let actualProvider = cloneDeep(baseProvider)
actualProvider = handleSpecialProviders(model, actualProvider)
actualProvider = formatProviderApiHost(actualProvider)
/** return actualProvider
* Transforms a provider configuration by applying model-specific adaptations and normalizing its API host.
* The transformations are applied in the following order:
* 1. Model-specific provider handling (e.g., New-API, system providers, Azure OpenAI)
* 2. API host formatting (provider-specific URL normalization)
*
* @param provider - The base provider configuration to transform.
* @param model - The model associated with the provider; optional but required for special-provider handling.
* @returns A new Provider instance with all transformations applied.
*/
export function adaptProvider({ provider, model }: { provider: Provider; model?: Model }): Provider {
let adaptedProvider = cloneDeep(provider)
// Apply transformations in order
if (model) {
adaptedProvider = handleSpecialProviders(model, adaptedProvider)
}
adaptedProvider = formatProviderApiHost(adaptedProvider)
return adaptedProvider
} }
/** /**

View File

@@ -4372,7 +4372,7 @@
"url": { "url": {
"preview": "Preview: {{url}}", "preview": "Preview: {{url}}",
"reset": "Reset", "reset": "Reset",
"tip": "Add # at the end to disable the automatically appended API version." "tip": "ending with # forces use of input address"
} }
}, },
"api_host": "API Host", "api_host": "API Host",

View File

@@ -4372,7 +4372,7 @@
"url": { "url": {
"preview": "预览: {{url}}", "preview": "预览: {{url}}",
"reset": "重置", "reset": "重置",
"tip": "在末尾添加 # 以禁用自动附加的API版本。" "tip": "# 结尾强制使用输入地址"
} }
}, },
"api_host": "API 地址", "api_host": "API 地址",

View File

@@ -4372,7 +4372,7 @@
"url": { "url": {
"preview": "預覽:{{url}}", "preview": "預覽:{{url}}",
"reset": "重設", "reset": "重設",
"tip": "在末尾添加 # 以停用自動附加的 API 版本。" "tip": "# 結尾強制使用輸入位址"
} }
}, },
"api_host": "API 主機地址", "api_host": "API 主機地址",

View File

@@ -4372,7 +4372,7 @@
"url": { "url": {
"preview": "Vorschau: {{url}}", "preview": "Vorschau: {{url}}",
"reset": "Zurücksetzen", "reset": "Zurücksetzen",
"tip": "Fügen Sie am Ende ein # hinzu, um die automatisch angehängte API-Version zu deaktivieren." "tip": "# am Ende erzwingt die Verwendung der Eingabe-Adresse"
} }
}, },
"api_host": "API-Adresse", "api_host": "API-Adresse",

View File

@@ -4372,7 +4372,7 @@
"url": { "url": {
"preview": "Προεπισκόπηση: {{url}}", "preview": "Προεπισκόπηση: {{url}}",
"reset": "Επαναφορά", "reset": "Επαναφορά",
"tip": "Προσθέστε το σύμβολο # στο τέλος για να απενεργοποιήσετε την αυτόματα προστιθέμενη έκδοση API." "tip": "#τέλος ενδεχόμενη χρήση της εισαγωγής διευθύνσεως"
} }
}, },
"api_host": "Διεύθυνση API", "api_host": "Διεύθυνση API",

View File

@@ -4372,7 +4372,7 @@
"url": { "url": {
"preview": "Vista previa: {{url}}", "preview": "Vista previa: {{url}}",
"reset": "Restablecer", "reset": "Restablecer",
"tip": "Añada # al final para deshabilitar la versión de la API que se añade automáticamente." "tip": "forzar uso de dirección de entrada con # al final"
} }
}, },
"api_host": "Dirección API", "api_host": "Dirección API",

View File

@@ -4372,7 +4372,7 @@
"url": { "url": {
"preview": "Aperçu : {{url}}", "preview": "Aperçu : {{url}}",
"reset": "Réinitialiser", "reset": "Réinitialiser",
"tip": "Ajoutez # à la fin pour désactiver la version d'API ajoutée automatiquement." "tip": "forcer l'utilisation de l'adresse d'entrée si terminé par #"
} }
}, },
"api_host": "Adresse API", "api_host": "Adresse API",

View File

@@ -4372,7 +4372,7 @@
"url": { "url": {
"preview": "プレビュー: {{url}}", "preview": "プレビュー: {{url}}",
"reset": "リセット", "reset": "リセット",
"tip": "自動的に付加されるAPIバージョンを無効にするには、末尾に#を追加します" "tip": "#で終わる場合、入力されたアドレスを強制的に使用します"
} }
}, },
"api_host": "APIホスト", "api_host": "APIホスト",

View File

@@ -4372,7 +4372,7 @@
"url": { "url": {
"preview": "Pré-visualização: {{url}}", "preview": "Pré-visualização: {{url}}",
"reset": "Redefinir", "reset": "Redefinir",
"tip": "Adicione # no final para desativar a versão da API adicionada automaticamente." "tip": "e forçar o uso do endereço original quando terminar com '#'"
} }
}, },
"api_host": "Endereço API", "api_host": "Endereço API",

View File

@@ -4372,7 +4372,7 @@
"url": { "url": {
"preview": "Предпросмотр: {{url}}", "preview": "Предпросмотр: {{url}}",
"reset": "Сброс", "reset": "Сброс",
"tip": "Добавьте # в конце, чтобы отключить автоматически добавляемую версию API." "tip": "заканчивая на # принудительно использует введенный адрес"
} }
}, },
"api_host": "Хост API", "api_host": "Хост API",

View File

@@ -1,10 +1,8 @@
import { adaptProvider } from '@renderer/aiCore/provider/providerConfig'
import OpenAIAlert from '@renderer/components/Alert/OpenAIAlert' import OpenAIAlert from '@renderer/components/Alert/OpenAIAlert'
import { LoadingIcon } from '@renderer/components/Icons' import { LoadingIcon } from '@renderer/components/Icons'
import { HStack } from '@renderer/components/Layout' import { HStack } from '@renderer/components/Layout'
import { ApiKeyListPopup } from '@renderer/components/Popups/ApiKeyListPopup' import { ApiKeyListPopup } from '@renderer/components/Popups/ApiKeyListPopup'
import Selector from '@renderer/components/Selector' import Selector from '@renderer/components/Selector'
import { HelpTooltip } from '@renderer/components/TooltipIcons'
import { isEmbeddingModel, isRerankModel } from '@renderer/config/models' import { isEmbeddingModel, isRerankModel } from '@renderer/config/models'
import { PROVIDER_URLS } from '@renderer/config/providers' import { PROVIDER_URLS } from '@renderer/config/providers'
import { useTheme } from '@renderer/context/ThemeProvider' import { useTheme } from '@renderer/context/ThemeProvider'
@@ -21,7 +19,14 @@ import type { SystemProviderId } from '@renderer/types'
import { isSystemProvider, isSystemProviderId, SystemProviderIds } from '@renderer/types' import { isSystemProvider, isSystemProviderId, SystemProviderIds } from '@renderer/types'
import type { ApiKeyConnectivity } from '@renderer/types/healthCheck' import type { ApiKeyConnectivity } from '@renderer/types/healthCheck'
import { HealthStatus } from '@renderer/types/healthCheck' import { HealthStatus } from '@renderer/types/healthCheck'
import { formatApiHost, formatApiKeys, getFancyProviderName, validateApiHost } from '@renderer/utils' import {
formatApiHost,
formatApiKeys,
formatAzureOpenAIApiHost,
formatVertexApiHost,
getFancyProviderName,
validateApiHost
} from '@renderer/utils'
import { formatErrorMessage } from '@renderer/utils/error' import { formatErrorMessage } from '@renderer/utils/error'
import { import {
isAIGatewayProvider, isAIGatewayProvider,
@@ -31,6 +36,7 @@ import {
isNewApiProvider, isNewApiProvider,
isOpenAICompatibleProvider, isOpenAICompatibleProvider,
isOpenAIProvider, isOpenAIProvider,
isSupportAPIVersionProvider,
isVertexProvider isVertexProvider
} from '@renderer/utils/provider' } from '@renderer/utils/provider'
import { Button, Divider, Flex, Input, Select, Space, Switch, Tooltip } from 'antd' import { Button, Divider, Flex, Input, Select, Space, Switch, Tooltip } from 'antd'
@@ -275,10 +281,12 @@ const ProviderSetting: FC<Props> = ({ providerId }) => {
}, [configuredApiHost, apiHost]) }, [configuredApiHost, apiHost])
const hostPreview = () => { const hostPreview = () => {
const formattedApiHost = adaptProvider({ provider: { ...provider, apiHost } }).apiHost if (apiHost.endsWith('#')) {
return apiHost.replace('#', '')
}
if (isOpenAICompatibleProvider(provider)) { if (isOpenAICompatibleProvider(provider)) {
return formattedApiHost + '/chat/completions' return formatApiHost(apiHost, isSupportAPIVersionProvider(provider)) + '/chat/completions'
} }
if (isAzureOpenAIProvider(provider)) { if (isAzureOpenAIProvider(provider)) {
@@ -286,26 +294,29 @@ const ProviderSetting: FC<Props> = ({ providerId }) => {
const path = !['preview', 'v1'].includes(apiVersion) const path = !['preview', 'v1'].includes(apiVersion)
? `/v1/chat/completion?apiVersion=v1` ? `/v1/chat/completion?apiVersion=v1`
: `/v1/responses?apiVersion=v1` : `/v1/responses?apiVersion=v1`
return formattedApiHost + path return formatAzureOpenAIApiHost(apiHost) + path
} }
if (isAnthropicProvider(provider)) { if (isAnthropicProvider(provider)) {
return formattedApiHost + '/messages' // AI SDK uses the baseURL with /v1, then appends /messages
// formatApiHost adds /v1 automatically if not present
const normalizedHost = formatApiHost(apiHost)
return normalizedHost + '/messages'
} }
if (isGeminiProvider(provider)) { if (isGeminiProvider(provider)) {
return formattedApiHost + '/models' return formatApiHost(apiHost, true, 'v1beta') + '/models'
} }
if (isOpenAIProvider(provider)) { if (isOpenAIProvider(provider)) {
return formattedApiHost + '/responses' return formatApiHost(apiHost) + '/responses'
} }
if (isVertexProvider(provider)) { if (isVertexProvider(provider)) {
return formattedApiHost + '/publishers/google' return formatVertexApiHost(provider) + '/publishers/google'
} }
if (isAIGatewayProvider(provider)) { if (isAIGatewayProvider(provider)) {
return formattedApiHost + '/language-model' return formatApiHost(apiHost) + '/language-model'
} }
return formattedApiHost return formatApiHost(apiHost)
} }
// API key 连通性检查状态指示器,目前仅在失败时显示 // API key 连通性检查状态指示器,目前仅在失败时显示
@@ -483,9 +494,7 @@ const ProviderSetting: FC<Props> = ({ providerId }) => {
{!isDmxapi && ( {!isDmxapi && (
<> <>
<SettingSubtitle style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}> <SettingSubtitle style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
<div className="flex items-center gap-1">
<Tooltip title={hostSelectorTooltip} mouseEnterDelay={0.3}> <Tooltip title={hostSelectorTooltip} mouseEnterDelay={0.3}>
<div>
<Selector <Selector
size={14} size={14}
value={activeHostField} value={activeHostField}
@@ -494,10 +503,7 @@ const ProviderSetting: FC<Props> = ({ providerId }) => {
style={{ paddingLeft: 1, fontWeight: 'bold' }} style={{ paddingLeft: 1, fontWeight: 'bold' }}
placement="bottomLeft" placement="bottomLeft"
/> />
</div>
</Tooltip> </Tooltip>
<HelpTooltip title={t('settings.provider.api.url.tip')}></HelpTooltip>
</div>
<div style={{ display: 'flex', alignItems: 'center', gap: 4 }}> <div style={{ display: 'flex', alignItems: 'center', gap: 4 }}>
<Button <Button
type="text" type="text"

View File

@@ -34,15 +34,6 @@ export const MCPToolInputSchema = z
required: z.array(z.string()).optional() required: z.array(z.string()).optional()
}) })
.loose() .loose()
.transform((schema) => {
if (!schema.properties) {
schema.properties = {}
}
if (!schema.required) {
schema.required = []
}
return schema
})
export interface BuiltinTool extends BaseTool { export interface BuiltinTool extends BaseTool {
inputSchema: z.infer<typeof MCPToolInputSchema> inputSchema: z.infer<typeof MCPToolInputSchema>

View File

@@ -13,8 +13,7 @@ import {
routeToEndpoint, routeToEndpoint,
splitApiKeyString, splitApiKeyString,
validateApiHost, validateApiHost,
withoutTrailingApiVersion, withoutTrailingApiVersion
withoutTrailingSharp
} from '../api' } from '../api'
vi.mock('@renderer/store', () => { vi.mock('@renderer/store', () => {
@@ -82,27 +81,6 @@ describe('api', () => {
it('keeps host untouched when api version unsupported', () => { it('keeps host untouched when api version unsupported', () => {
expect(formatApiHost('https://api.example.com', false)).toBe('https://api.example.com') expect(formatApiHost('https://api.example.com', false)).toBe('https://api.example.com')
}) })
it('removes trailing # and does not append api version when host ends with #', () => {
expect(formatApiHost('https://api.example.com#')).toBe('https://api.example.com')
expect(formatApiHost('http://localhost:5173/#')).toBe('http://localhost:5173/')
expect(formatApiHost(' https://api.openai.com/# ')).toBe('https://api.openai.com/')
})
it('handles trailing # with custom api version settings', () => {
expect(formatApiHost('https://api.example.com#', true, 'v2')).toBe('https://api.example.com')
expect(formatApiHost('https://api.example.com#', false, 'v2')).toBe('https://api.example.com')
})
it('handles host with both trailing # and existing api version', () => {
expect(formatApiHost('https://api.example.com/v2#')).toBe('https://api.example.com/v2')
expect(formatApiHost('https://api.example.com/v3beta#')).toBe('https://api.example.com/v3beta')
})
it('trims whitespace before processing trailing #', () => {
expect(formatApiHost(' https://api.example.com# ')).toBe('https://api.example.com')
expect(formatApiHost('\thttps://api.example.com#\n')).toBe('https://api.example.com')
})
}) })
describe('hasAPIVersion', () => { describe('hasAPIVersion', () => {
@@ -426,56 +404,4 @@ describe('api', () => {
expect(withoutTrailingApiVersion('')).toBe('') expect(withoutTrailingApiVersion('')).toBe('')
}) })
}) })
describe('withoutTrailingSharp', () => {
it('removes trailing # from URL', () => {
expect(withoutTrailingSharp('https://api.example.com#')).toBe('https://api.example.com')
expect(withoutTrailingSharp('http://localhost:3000#')).toBe('http://localhost:3000')
})
it('returns URL unchanged when no trailing #', () => {
expect(withoutTrailingSharp('https://api.example.com')).toBe('https://api.example.com')
expect(withoutTrailingSharp('http://localhost:3000')).toBe('http://localhost:3000')
})
it('handles URLs with multiple # characters but only removes trailing one', () => {
expect(withoutTrailingSharp('https://api.example.com#path#')).toBe('https://api.example.com#path')
})
it('handles URLs with # in the middle (not trailing)', () => {
expect(withoutTrailingSharp('https://api.example.com#section/path')).toBe('https://api.example.com#section/path')
expect(withoutTrailingSharp('https://api.example.com/v1/chat/completions#')).toBe(
'https://api.example.com/v1/chat/completions'
)
})
it('handles empty string', () => {
expect(withoutTrailingSharp('')).toBe('')
})
it('handles single character #', () => {
expect(withoutTrailingSharp('#')).toBe('')
})
it('preserves whitespace around the URL (pure function)', () => {
expect(withoutTrailingSharp(' https://api.example.com# ')).toBe(' https://api.example.com# ')
expect(withoutTrailingSharp('\thttps://api.example.com#\n')).toBe('\thttps://api.example.com#\n')
})
it('only removes exact trailing # character', () => {
expect(withoutTrailingSharp('https://api.example.com# ')).toBe('https://api.example.com# ')
expect(withoutTrailingSharp(' https://api.example.com#')).toBe(' https://api.example.com')
expect(withoutTrailingSharp('https://api.example.com#\t')).toBe('https://api.example.com#\t')
})
it('handles URLs ending with multiple # characters', () => {
expect(withoutTrailingSharp('https://api.example.com##')).toBe('https://api.example.com#')
expect(withoutTrailingSharp('https://api.example.com###')).toBe('https://api.example.com##')
})
it('preserves URL with trailing # and other content', () => {
expect(withoutTrailingSharp('https://api.example.com/v1#')).toBe('https://api.example.com/v1')
expect(withoutTrailingSharp('https://api.example.com/v2beta#')).toBe('https://api.example.com/v2beta')
})
})
}) })

View File

@@ -62,23 +62,6 @@ export function withoutTrailingSlash<T extends string>(url: T): T {
return url.replace(/\/$/, '') as T return url.replace(/\/$/, '') as T
} }
/**
* Removes the trailing '#' from a URL string if it exists.
*
* @template T - The string type to preserve type safety
* @param {T} url - The URL string to process
* @returns {T} The URL string without a trailing '#'
*
* @example
* ```ts
* withoutTrailingSharp('https://example.com#') // 'https://example.com'
* withoutTrailingSharp('https://example.com') // 'https://example.com'
* ```
*/
export function withoutTrailingSharp<T extends string>(url: T): T {
return url.replace(/#$/, '') as T
}
/** /**
* Formats an API host URL by normalizing it and optionally appending an API version. * Formats an API host URL by normalizing it and optionally appending an API version.
* *
@@ -87,12 +70,12 @@ export function withoutTrailingSharp<T extends string>(url: T): T {
* @param apiVersion - The API version to append if needed. Defaults to `'v1'`. * @param apiVersion - The API version to append if needed. Defaults to `'v1'`.
* *
* @returns The formatted API host URL. If the host is empty after normalization, returns an empty string. * @returns The formatted API host URL. If the host is empty after normalization, returns an empty string.
* If the host ends with '#', API version is not supported, or the host already contains a version, returns the normalized host with trailing '#' removed. * If the host ends with '#', API version is not supported, or the host already contains a version, returns the normalized host as-is.
* Otherwise, returns the host with the API version appended. * Otherwise, returns the host with the API version appended.
* *
* @example * @example
* formatApiHost('https://api.example.com/') // Returns 'https://api.example.com/v1' * formatApiHost('https://api.example.com/') // Returns 'https://api.example.com/v1'
* formatApiHost('https://api.example.com#') // Returns 'https://api.example.com' * formatApiHost('https://api.example.com#') // Returns 'https://api.example.com#'
* formatApiHost('https://api.example.com/v2', true, 'v1') // Returns 'https://api.example.com/v2' * formatApiHost('https://api.example.com/v2', true, 'v1') // Returns 'https://api.example.com/v2'
*/ */
export function formatApiHost(host?: string, supportApiVersion: boolean = true, apiVersion: string = 'v1'): string { export function formatApiHost(host?: string, supportApiVersion: boolean = true, apiVersion: string = 'v1'): string {
@@ -101,13 +84,10 @@ export function formatApiHost(host?: string, supportApiVersion: boolean = true,
return '' return ''
} }
const shouldAppendApiVersion = !(normalizedHost.endsWith('#') || !supportApiVersion || hasAPIVersion(normalizedHost)) if (normalizedHost.endsWith('#') || !supportApiVersion || hasAPIVersion(normalizedHost)) {
return normalizedHost
if (shouldAppendApiVersion) {
return `${normalizedHost}/${apiVersion}`
} else {
return withoutTrailingSharp(normalizedHost)
} }
return `${normalizedHost}/${apiVersion}`
} }
/** /**

View File

@@ -136,10 +136,7 @@ export async function callMCPTool(
topicId?: string, topicId?: string,
modelName?: string modelName?: string
): Promise<MCPCallToolResponse> { ): Promise<MCPCallToolResponse> {
logger.info( logger.info(`Calling Tool: ${toolResponse.tool.serverName} ${toolResponse.tool.name}`, toolResponse.tool)
`Calling Tool: ${toolResponse.id} ${toolResponse.tool.serverName} ${toolResponse.tool.name}`,
toolResponse.tool
)
try { try {
const server = getMcpServerByTool(toolResponse.tool) const server = getMcpServerByTool(toolResponse.tool)

View File

@@ -4747,12 +4747,11 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@modelcontextprotocol/sdk@npm:^1.23.0": "@modelcontextprotocol/sdk@npm:^1.17.5":
version: 1.23.0 version: 1.17.5
resolution: "@modelcontextprotocol/sdk@npm:1.23.0" resolution: "@modelcontextprotocol/sdk@npm:1.17.5"
dependencies: dependencies:
ajv: "npm:^8.17.1" ajv: "npm:^6.12.6"
ajv-formats: "npm:^3.0.1"
content-type: "npm:^1.0.5" content-type: "npm:^1.0.5"
cors: "npm:^2.8.5" cors: "npm:^2.8.5"
cross-spawn: "npm:^7.0.5" cross-spawn: "npm:^7.0.5"
@@ -4762,17 +4761,9 @@ __metadata:
express-rate-limit: "npm:^7.5.0" express-rate-limit: "npm:^7.5.0"
pkce-challenge: "npm:^5.0.0" pkce-challenge: "npm:^5.0.0"
raw-body: "npm:^3.0.0" raw-body: "npm:^3.0.0"
zod: "npm:^3.25 || ^4.0" zod: "npm:^3.23.8"
zod-to-json-schema: "npm:^3.25.0" zod-to-json-schema: "npm:^3.24.1"
peerDependencies: checksum: 10c0/182b92b5e7c07da428fd23c6de22021c4f9a91f799c02a8ef15def07e4f9361d0fc22303548658fec2a700623535fd44a9dc4d010fb5d803a8f80e3c6c64a45e
"@cfworker/json-schema": ^4.1.1
zod: ^3.25 || ^4.0
peerDependenciesMeta:
"@cfworker/json-schema":
optional: true
zod:
optional: false
checksum: 10c0/b0291f921ad9bda06bbf1a61b1bb61ceca1173da5d74d39a411c40428d6ca50a95f0de3a1631f25a44b439220b15c30c1306600bf48bef665ab7ad118d528260
languageName: node languageName: node
linkType: hard linkType: hard
@@ -10055,7 +10046,7 @@ __metadata:
"@libsql/client": "npm:0.14.0" "@libsql/client": "npm:0.14.0"
"@libsql/win32-x64-msvc": "npm:^0.4.7" "@libsql/win32-x64-msvc": "npm:^0.4.7"
"@mistralai/mistralai": "npm:^1.7.5" "@mistralai/mistralai": "npm:^1.7.5"
"@modelcontextprotocol/sdk": "npm:^1.23.0" "@modelcontextprotocol/sdk": "npm:^1.17.5"
"@mozilla/readability": "npm:^0.6.0" "@mozilla/readability": "npm:^0.6.0"
"@napi-rs/system-ocr": "patch:@napi-rs/system-ocr@npm%3A1.0.2#~/.yarn/patches/@napi-rs-system-ocr-npm-1.0.2-59e7a78e8b.patch" "@napi-rs/system-ocr": "patch:@napi-rs/system-ocr@npm%3A1.0.2#~/.yarn/patches/@napi-rs-system-ocr-npm-1.0.2-59e7a78e8b.patch"
"@notionhq/client": "npm:^2.2.15" "@notionhq/client": "npm:^2.2.15"
@@ -10412,20 +10403,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"ajv-formats@npm:^3.0.1":
version: 3.0.1
resolution: "ajv-formats@npm:3.0.1"
dependencies:
ajv: "npm:^8.0.0"
peerDependencies:
ajv: ^8.0.0
peerDependenciesMeta:
ajv:
optional: true
checksum: 10c0/168d6bca1ea9f163b41c8147bae537e67bd963357a5488a1eaf3abe8baa8eec806d4e45f15b10767e6020679315c7e1e5e6803088dfb84efa2b4e9353b83dd0a
languageName: node
linkType: hard
"ajv-keywords@npm:^3.4.1": "ajv-keywords@npm:^3.4.1":
version: 3.5.2 version: 3.5.2
resolution: "ajv-keywords@npm:3.5.2" resolution: "ajv-keywords@npm:3.5.2"
@@ -10435,7 +10412,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"ajv@npm:^6.10.0, ajv@npm:^6.12.0, ajv@npm:^6.12.4": "ajv@npm:^6.10.0, ajv@npm:^6.12.0, ajv@npm:^6.12.4, ajv@npm:^6.12.6":
version: 6.12.6 version: 6.12.6
resolution: "ajv@npm:6.12.6" resolution: "ajv@npm:6.12.6"
dependencies: dependencies:
@@ -10447,7 +10424,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"ajv@npm:^8.0.0, ajv@npm:^8.17.1, ajv@npm:^8.6.3": "ajv@npm:^8.0.0, ajv@npm:^8.6.3":
version: 8.17.1 version: 8.17.1
resolution: "ajv@npm:8.17.1" resolution: "ajv@npm:8.17.1"
dependencies: dependencies:
@@ -26376,15 +26353,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"zod-to-json-schema@npm:^3.25.0":
version: 3.25.0
resolution: "zod-to-json-schema@npm:3.25.0"
peerDependencies:
zod: ^3.25 || ^4
checksum: 10c0/2d2cf6ca49752bf3dc5fb37bc8f275eddbbc4020e7958d9c198ea88cd197a5f527459118188a0081b889da6a6474d64c4134cd60951fa70178c125138761c680
languageName: node
linkType: hard
"zod-validation-error@npm:^3.4.0": "zod-validation-error@npm:^3.4.0":
version: 3.4.0 version: 3.4.0
resolution: "zod-validation-error@npm:3.4.0" resolution: "zod-validation-error@npm:3.4.0"
@@ -26394,20 +26362,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"zod@npm:^3.22.4, zod@npm:^3.24.1": "zod@npm:^3.22.4, zod@npm:^3.23.8, zod@npm:^3.24.1":
version: 3.25.56 version: 3.25.56
resolution: "zod@npm:3.25.56" resolution: "zod@npm:3.25.56"
checksum: 10c0/3800f01d4b1df932b91354eb1e648f69cc7e5561549e6d2bf83827d930a5f33bbf92926099445f6fc1ebb64ca9c6513ef9ae5e5409cfef6325f354bcf6fc9a24 checksum: 10c0/3800f01d4b1df932b91354eb1e648f69cc7e5561549e6d2bf83827d930a5f33bbf92926099445f6fc1ebb64ca9c6513ef9ae5e5409cfef6325f354bcf6fc9a24
languageName: node languageName: node
linkType: hard linkType: hard
"zod@npm:^3.25 || ^4.0":
version: 4.1.13
resolution: "zod@npm:4.1.13"
checksum: 10c0/d7e74e82dba81a91ffc3239cd85bc034abe193a28f7087a94ab258a3e48e9a7ca4141920cac979a0d781495b48fc547777394149f26be04c3dc642f58bbc3941
languageName: node
linkType: hard
"zod@npm:^3.25.0 || ^4.0.0, zod@npm:^3.25.76 || ^4": "zod@npm:^3.25.0 || ^4.0.0, zod@npm:^3.25.76 || ^4":
version: 4.1.12 version: 4.1.12
resolution: "zod@npm:4.1.12" resolution: "zod@npm:4.1.12"