From 88185f05e209c3576b7338c067ad957d3ca0042d Mon Sep 17 00:00:00 2001 From: maplezzk <34745236+maplezzk@users.noreply.github.com> Date: Sat, 1 Aug 2026 16:53:15 +0800 Subject: [PATCH] feat: make adapters protocol agnostic --- README.md | 1 - README.zh.md | 1 - admin-ui/src/components/TestPanelDialog.tsx | 2 +- admin-ui/src/pages/AdaptersPage.tsx | 98 +++++++------------ app/Sources/APIClient.swift | 10 +- app/Sources/MenuBarController.swift | 4 +- app/Sources/MenuCardViews.swift | 11 +-- app/Sources/Models.swift | 16 +-- .../ViewModels/AdaptersViewModel.swift | 12 +-- app/Sources/Views/AdapterFormView.swift | 18 ---- app/Sources/Views/AdaptersView.swift | 45 +-------- app/Sources/Views/TestPanelView.swift | 73 +++++++++++--- app/Sources/en.lproj/Localizable.strings | 3 +- app/Sources/zh.lproj/Localizable.strings | 3 +- .../AdaptersViewModelTests.swift | 14 +-- .../DashboardViewModelTests.swift | 4 +- .../LLMProxyTests/MenuBarPreviewTests.swift | 3 +- .../LLMProxyTests/MenuCardSnapshotTests.swift | 2 +- docs/api-spec.md | 7 +- docs/architecture.md | 3 +- docs/macos-menubar-design.md | 2 +- locales/en/translation.json | 2 - locales/zh/translation.json | 2 - src/adapter/router.ts | 8 +- src/api/handlers/adapter-crud.ts | 23 ++--- src/api/handlers/base.ts | 1 - src/api/handlers/model-handlers.ts | 17 +++- src/config/parser.ts | 2 - src/config/types.ts | 2 - src/config/validator.ts | 4 - src/types/i18n.generated.ts | 2 - test/adapter/handlers.test.ts | 7 +- test/adapter/router.test.ts | 11 +-- test/api/handlers.test.ts | 27 ++++- test/api/integration.test.ts | 20 +++- test/config/parser.test.ts | 1 + 36 files changed, 216 insertions(+), 245 deletions(-) diff --git a/README.md b/README.md index 57697d2..63e1281 100644 --- a/README.md +++ b/README.md @@ -137,7 +137,6 @@ providers: adapters: - name: my-tool - type: anthropic models: - sourceModelId: claude-sonnet-4 provider: anthropic diff --git a/README.zh.md b/README.zh.md index 11f4ac7..800f5a3 100644 --- a/README.zh.md +++ b/README.zh.md @@ -123,7 +123,6 @@ providers: adapters: - name: my-tool - type: anthropic models: - sourceModelId: claude-sonnet-4 provider: anthropic diff --git a/admin-ui/src/components/TestPanelDialog.tsx b/admin-ui/src/components/TestPanelDialog.tsx index 61b41a7..093ca32 100644 --- a/admin-ui/src/components/TestPanelDialog.tsx +++ b/admin-ui/src/components/TestPanelDialog.tsx @@ -43,7 +43,7 @@ interface TestResult { * 受控组件:open/onClose 由调用方持有;测试目标(名称 / 可选类型标签 / 模型列表) * 与请求体构造、端点均由调用方通过 props 注入: * - providers:endpoint 缺省 `/admin/test-model`,buildBody → {providerName, model, type} - * - adapters:endpoint 传 `/admin/test-adapter`,buildBody → {adapterName, modelId} + * - adapters:endpoint 传 `/admin/test-adapter`,buildBody → {adapterName, modelId, protocol} * * 行为对齐旧版:选模型 → 运行 → 结果 unshift 列表(默认展开详情)→ 可清空。 */ diff --git a/admin-ui/src/pages/AdaptersPage.tsx b/admin-ui/src/pages/AdaptersPage.tsx index d026831..53421a4 100644 --- a/admin-ui/src/pages/AdaptersPage.tsx +++ b/admin-ui/src/pages/AdaptersPage.tsx @@ -39,13 +39,12 @@ import { } from '@appica/icons-react' import { useApp } from '../lib/app-state' import { fetchJson } from '../lib/api' -import type { ApiRes, ProviderType } from '../lib/api-types' +import type { ApiRes } from '../lib/api-types' import { EffortSelect, LABEL_CLS, REASONING_EFFORTS, THINKING_TYPES, - TYPE_LABELS, extractError, } from '../lib/form-helpers' import { useToast } from '../lib/toast' @@ -71,7 +70,6 @@ interface AdapterMapping { interface AdapterRow { name: string - type: ProviderType max_tokens?: number stream?: boolean baseUrl?: string @@ -89,7 +87,6 @@ interface MappingRow { interface FormState { name: string - type: ProviderType maxTokens: string stream: string // '' | 'true' | 'false' models: MappingRow[] @@ -101,6 +98,12 @@ interface TestTarget { modelIds: string[] } +const ADAPTER_PROTOCOLS = [ + { type: 'openai' }, + { type: 'openai-responses' }, + { type: 'anthropic' }, +] + /* ────────────────────────── 常量 / 工具 ────────────────────────── */ const emptyMappingRow = (): MappingRow => ({ @@ -113,7 +116,6 @@ const emptyMappingRow = (): MappingRow => ({ const emptyForm = (): FormState => ({ name: '', - type: 'openai', maxTokens: '', stream: '', models: [emptyMappingRow()], @@ -124,7 +126,7 @@ const emptyForm = (): FormState => ({ /** * Adapters 页 — 移植自旧版 adapters.ts: * - 列表(baseUrl / 模型映射 / 状态)、搜索过滤、空态/无匹配 - * - 新增/编辑弹窗(name/type/请求默认 max_tokens+stream / 模型映射表) + * - 新增/编辑弹窗(name/请求默认 max_tokens+stream / 模型映射表) * - 批量从供应商导入、删除确认、连通性测试(复用 TestPanelDialog → /admin/test-adapter) */ export default function AdaptersPage() { @@ -194,7 +196,6 @@ export default function AdaptersPage() { if (a) { next = { name: a.name, - type: (a.type as ProviderType) || 'openai', maxTokens: a.max_tokens != null ? String(a.max_tokens) : '', stream: a.stream === true ? 'true' : a.stream === false ? 'false' : '', models: (a.models || []).map((m) => ({ @@ -284,7 +285,7 @@ export default function AdaptersPage() { /** 保存:校验 → 组装 validModels → PUT/POST → toast + 刷新(对齐旧版 save)。 */ const save = async () => { - const { name, type, models } = form + const { name, models } = form const validModels = models .filter((m) => m.sourceModelId.trim() && m.provider && m.targetModelId) .map((m) => { @@ -293,14 +294,10 @@ export default function AdaptersPage() { provider: m.provider, targetModelId: m.targetModelId, } - if (type === 'anthropic') { - const bt = parseInt(m.thinking.budget_tokens ?? '', 10) - if (bt > 0) base.thinking = { budget_tokens: bt } - if (m.reasoning_effort && (REASONING_EFFORTS as readonly string[]).includes(m.reasoning_effort)) { - base.thinking = { ...(base.thinking as object), reasoning_effort: m.reasoning_effort } - } - } else if (m.reasoning_effort && (REASONING_EFFORTS as readonly string[]).includes(m.reasoning_effort)) { - base.thinking = { reasoning_effort: m.reasoning_effort } + const bt = parseInt(m.thinking.budget_tokens ?? '', 10) + if (bt > 0) base.thinking = { budget_tokens: bt } + if (m.reasoning_effort && (REASONING_EFFORTS as readonly string[]).includes(m.reasoning_effort)) { + base.thinking = { ...(base.thinking as object), reasoning_effort: m.reasoning_effort } } if (m.thinking.type && (THINKING_TYPES as readonly string[]).includes(m.thinking.type)) { base.thinking = { ...(base.thinking as object), type: m.thinking.type } @@ -316,7 +313,6 @@ export default function AdaptersPage() { const streamDefault = form.stream === 'true' ? true : form.stream === 'false' ? false : undefined const body = { name, - type, max_tokens: parseInt(form.maxTokens, 10) || undefined, stream: streamDefault, models: validModels, @@ -382,8 +378,6 @@ export default function AdaptersPage() { /* ──── 渲染 ──── */ - const isAnthropic = form.type === 'anthropic' - return (
{/* 工具条:搜索 + 添加 */} @@ -407,7 +401,6 @@ export default function AdaptersPage() { {t('admin.adapters.adapter')} - {t('admin.adapters.type')} {t('admin.adapters.baseUrl')} {t('admin.adapters.modelMapping')} {t('admin.adapters.status')} @@ -421,9 +414,6 @@ export default function AdaptersPage() { return ( {a.name} - - {a.type === 'openai-responses' ? 'openai (responses)' : a.type} - {a.baseUrl || '—'} @@ -499,21 +489,21 @@ export default function AdaptersPage() { {loading && adapters.length === 0 && ( - + )} {!loading && filtered.length === 0 && adapters.length === 0 && ( - + {t('admin.adapters.empty')} )} {!loading && filtered.length === 0 && adapters.length > 0 && ( - + {t('admin.adapters.noMatch')} @@ -545,27 +535,6 @@ export default function AdaptersPage() { />
- {/* 类型 */} -
- - -
- {/* 请求默认(max_tokens + stream) */}
@@ -697,23 +666,21 @@ export default function AdaptersPage() { {/* thinking / effort 配置 */}
- {isAnthropic && ( - - )} +
) diff --git a/app/Sources/APIClient.swift b/app/Sources/APIClient.swift index fb36f20..e798cc4 100644 --- a/app/Sources/APIClient.swift +++ b/app/Sources/APIClient.swift @@ -251,7 +251,7 @@ class APIClient { var req = URLRequest(url: url) req.httpMethod = "PUT" req.setValue("application/json", forHTTPHeaderField: "Content-Type") - let body = UpdateAdapterBody(name: adapter.name, type: adapter.type, maxTokens: adapter.maxTokens, stream: adapter.stream, models: mappings) + let body = UpdateAdapterBody(name: adapter.name, maxTokens: adapter.maxTokens, stream: adapter.stream, models: mappings) req.httpBody = try JSONEncoder().encode(body) let (data, resp) = try await data(for: req) try Self.validate(data: data, response: resp, context: "updateAdapter") @@ -523,12 +523,12 @@ class APIClient { // MARK: - Adapters CRUD - func createAdapter(name: String, type: String, maxTokens: Int? = nil, stream: Bool? = nil, models: [UpdateModelMapping]) async throws { + func createAdapter(name: String, maxTokens: Int? = nil, stream: Bool? = nil, models: [UpdateModelMapping]) async throws { let url = URL(string: "\(baseURL)/admin/adapters")! var req = URLRequest(url: url) req.httpMethod = "POST" req.setValue("application/json", forHTTPHeaderField: "Content-Type") - let body = UpdateAdapterBody(name: name, type: type, maxTokens: maxTokens, stream: stream, models: models) + let body = UpdateAdapterBody(name: name, maxTokens: maxTokens, stream: stream, models: models) req.httpBody = try JSONEncoder().encode(body) let (data, resp) = try await data(for: req) try Self.validate(data: data, response: resp, context: "createAdapter") @@ -542,12 +542,12 @@ class APIClient { try Self.validate(data: data, response: resp, context: "deleteAdapter") } - func testAdapter(name: String, modelId: String) async throws -> TestModelResult { + func testAdapter(name: String, modelId: String, protocolType: String) async throws -> TestModelResult { let url = URL(string: "\(baseURL)/admin/test-adapter")! var req = URLRequest(url: url) req.httpMethod = "POST" req.setValue("application/json", forHTTPHeaderField: "Content-Type") - req.httpBody = try JSONSerialization.data(withJSONObject: ["adapterName": name, "modelId": modelId]) + req.httpBody = try JSONSerialization.data(withJSONObject: ["adapterName": name, "modelId": modelId, "protocol": protocolType]) let (data, resp) = try await data(for: req) try Self.validate(data: data, response: resp, context: "testAdapter") let result = try JSONDecoder().decode(TestModelResponse.self, from: data) diff --git a/app/Sources/MenuBarController.swift b/app/Sources/MenuBarController.swift index 07d7afd..02e49ab 100644 --- a/app/Sources/MenuBarController.swift +++ b/app/Sources/MenuBarController.swift @@ -458,8 +458,8 @@ class MenuBarController: NSObject, NSMenuDelegate { menu.addItem(makeCardItem(MenuHintCardView(text: hint, isLoading: isLoading), interactive: false)) } else { for card in makeAdapterCardModels(adapters: adapters) { - // 适配器头:名称 + 协议类型(不可点击) - menu.addItem(makeCardItem(AdapterHeaderCardView(name: card.name, type: card.type), interactive: false)) + // 适配器头:名称(不可点击) + menu.addItem(makeCardItem(AdapterHeaderCardView(name: card.name), interactive: false)) // 每个映射一行:悬停自动展开模型子菜单 for mapping in card.mappings { let row = MappingRowView(sourceModelId: mapping.sourceModelId, currentLabel: mapping.currentLabel) diff --git a/app/Sources/MenuCardViews.swift b/app/Sources/MenuCardViews.swift index 39f8c1c..4b4575a 100644 --- a/app/Sources/MenuCardViews.swift +++ b/app/Sources/MenuCardViews.swift @@ -693,7 +693,6 @@ struct CardButton: View { struct AdapterCardModel { let name: String - let type: String let mappings: [Mapping] struct Mapping: Identifiable { @@ -706,11 +705,10 @@ struct AdapterCardModel { } } -// MARK: - 适配器头(名称 + 协议类型,不可点击) +// MARK: - 适配器头(名称,不可点击) struct AdapterHeaderCardView: View { let name: String - let type: String var body: some View { HStack(spacing: 6) { @@ -719,12 +717,6 @@ struct AdapterHeaderCardView: View { .foregroundStyle(.orange) Text(name) .font(.system(size: 12.5, weight: .semibold)) - Text(type) - .font(.system(size: 9.5, weight: .medium)) - .foregroundStyle(.secondary) - .padding(.horizontal, 5) - .padding(.vertical, 1.5) - .background(Capsule().fill(Color.secondary.opacity(0.12))) Spacer() } .padding(.horizontal, 14) @@ -807,7 +799,6 @@ func makeAdapterCardModels(adapters: [Adapter]) -> [AdapterCardModel] { adapters.map { adapter in AdapterCardModel( name: adapter.name, - type: adapter.type, mappings: adapter.models.map { mapping in AdapterCardModel.Mapping( sourceModelId: mapping.sourceModelId, diff --git a/app/Sources/Models.swift b/app/Sources/Models.swift index 70d0f38..a44f957 100644 --- a/app/Sources/Models.swift +++ b/app/Sources/Models.swift @@ -441,20 +441,18 @@ struct AdapterModel: Codable { struct Adapter: Codable { let name: String - let type: String let maxTokens: Int? let stream: Bool? let baseUrl: String? var models: [AdapterModel] enum CodingKeys: String, CodingKey { - case name, type, stream, baseUrl, models + case name, stream, baseUrl, models case maxTokens = "max_tokens" } - init(name: String, type: String, maxTokens: Int? = nil, stream: Bool? = nil, baseUrl: String?, models: [AdapterModel]) { + init(name: String, maxTokens: Int? = nil, stream: Bool? = nil, baseUrl: String?, models: [AdapterModel]) { self.name = name - self.type = type self.maxTokens = maxTokens self.stream = stream self.baseUrl = baseUrl @@ -473,15 +471,21 @@ struct AdaptersData: Codable { struct UpdateAdapterBody: Codable { let name: String - let type: String let maxTokens: Int? let stream: Bool? let models: [UpdateModelMapping] enum CodingKeys: String, CodingKey { - case name, type, stream, models + case name, stream, models case maxTokens = "max_tokens" } + + init(name: String, maxTokens: Int?, stream: Bool?, models: [UpdateModelMapping]) { + self.name = name + self.maxTokens = maxTokens + self.stream = stream + self.models = models + } } struct UpdateModelMapping: Codable { diff --git a/app/Sources/ViewModels/AdaptersViewModel.swift b/app/Sources/ViewModels/AdaptersViewModel.swift index 4c4481c..63d0709 100644 --- a/app/Sources/ViewModels/AdaptersViewModel.swift +++ b/app/Sources/ViewModels/AdaptersViewModel.swift @@ -14,7 +14,6 @@ final class AdaptersViewModel { var showForm: Bool = false var editingAdapter: Adapter? = nil var formName: String = "" - var formType: String = "openai" var formMaxTokens: String = "" /// stream 默认值三态:""=默认(跟随), "true"=流式, "false"=非流式 var formStream: String = "" @@ -61,7 +60,6 @@ final class AdaptersViewModel { editingAdapter = adapter if let adapter = adapter { formName = adapter.name - formType = adapter.type formMaxTokens = adapter.maxTokens.map(String.init) ?? "" formStream = adapter.stream == true ? "true" : adapter.stream == false ? "false" : "" formMappings = adapter.models.map { m in @@ -69,7 +67,6 @@ final class AdaptersViewModel { } } else { formName = "" - formType = "openai" formMaxTokens = "" formStream = "" formMappings = [] @@ -84,7 +81,6 @@ final class AdaptersViewModel { showForm = false editingAdapter = nil formName = "" - formType = "openai" formMaxTokens = "" formStream = "" formMappings = [] @@ -164,9 +160,9 @@ final class AdaptersViewModel { do { if editingAdapter != nil { - try await client.updateAdapter(Adapter(name: name, type: formType, maxTokens: maxTokens, stream: streamDefault, baseUrl: nil, models: []), mappings: mappings) + try await client.updateAdapter(Adapter(name: name, maxTokens: maxTokens, stream: streamDefault, baseUrl: nil, models: []), mappings: mappings) } else { - try await client.createAdapter(name: name, type: formType, maxTokens: maxTokens, stream: streamDefault, models: mappings) + try await client.createAdapter(name: name, maxTokens: maxTokens, stream: streamDefault, models: mappings) } closeForm() await load() @@ -192,7 +188,7 @@ final class AdaptersViewModel { // MARK: - Test - func testAdapter(_ adapter: Adapter) async { + func testAdapter(_ adapter: Adapter, protocolType: String = "openai") async { guard let firstMapping = adapter.models.first else { testResults[adapter.name] = TestModelResult( reachable: false, latency: nil, model: nil, @@ -207,7 +203,7 @@ final class AdaptersViewModel { testResults.removeValue(forKey: name) error = nil do { - testResults[name] = try await client.testAdapter(name: name, modelId: firstMapping.sourceModelId) + testResults[name] = try await client.testAdapter(name: name, modelId: firstMapping.sourceModelId, protocolType: protocolType) } catch { testResults[name] = TestModelResult( reachable: false, diff --git a/app/Sources/Views/AdapterFormView.swift b/app/Sources/Views/AdapterFormView.swift index 8109b57..f22a533 100644 --- a/app/Sources/Views/AdapterFormView.swift +++ b/app/Sources/Views/AdapterFormView.swift @@ -3,12 +3,6 @@ import SwiftUI struct AdapterFormView: View { @Environment(AdaptersViewModel.self) private var viewModel - private let adapterTypes = [ - ("anthropic", "Anthropic"), - ("openai", "OpenAI"), - ("openai-responses", "OpenAI Responses"), - ] - var body: some View { @Bindable var vm = viewModel @@ -32,18 +26,6 @@ struct AdapterFormView: View { .textFieldStyle(.roundedBorder) } - // 类型 - VStack(alignment: .leading, spacing: 4) { - Text(loc("adapter.type")).font(.caption).foregroundColor(.secondary) - Picker("", selection: $vm.formType) { - ForEach(adapterTypes, id: \.0) { type in - Text(type.1).tag(type.0) - } - } - .labelsHidden() - .pickerStyle(.segmented) - } - // 默认请求参数(下游未传时生效) VStack(alignment: .leading, spacing: 6) { Text(loc("adapter.requestDefaults")).font(.caption).foregroundColor(.secondary) diff --git a/app/Sources/Views/AdaptersView.swift b/app/Sources/Views/AdaptersView.swift index bf7e058..dd23a86 100644 --- a/app/Sources/Views/AdaptersView.swift +++ b/app/Sources/Views/AdaptersView.swift @@ -113,12 +113,12 @@ struct AdaptersView: View { private func adapterCard(_ adapter: Adapter) -> some View { HStack(spacing: 14) { - // 类型图标 - Image(systemName: typeIcon(for: adapter.type)) + // 适配器不绑定协议,使用通用分支图标 + Image(systemName: "arrow.triangle.branch") .font(.title3) - .foregroundColor(.white) + .foregroundColor(.accentColor) .frame(width: 32, height: 32) - .background(typeIconColor(for: adapter.type), in: RoundedRectangle(cornerRadius: 7)) + .background(Color.accentColor.opacity(0.12), in: RoundedRectangle(cornerRadius: 7)) // 信息 VStack(alignment: .leading, spacing: 4) { @@ -126,7 +126,6 @@ struct AdaptersView: View { Text(adapter.name) .font(.body) .fontWeight(.medium) - typeBadge(adapter.type) Text(loc("adapter.mappingCount", adapter.models.count)) .font(.caption) .foregroundColor(.secondary) @@ -212,40 +211,4 @@ struct AdaptersView: View { APIClient.adapterAPIBaseURL(adapter.name) } - private func typeIcon(for type: String) -> String { - switch type { - case "anthropic": return "a.circle" - case "openai": return "o.circle" - case "openai-responses": return "r.circle" - default: return "questionmark.circle" - } - } - - private func typeIconColor(for type: String) -> Color { - switch type { - case "anthropic": return .orange - case "openai": return .blue - case "openai-responses": return .purple - default: return .gray - } - } - - private func typeBadge(_ type: String) -> some View { - let label: String = { - switch type { - case "anthropic": return "Anthropic" - case "openai": return "OpenAI" - case "openai-responses": return "Responses" - default: return type - } - }() - return Text(label) - .font(.caption2) - .fontWeight(.medium) - .padding(.horizontal, 6) - .padding(.vertical, 2) - .background(typeIconColor(for: type).opacity(0.12)) - .foregroundColor(typeIconColor(for: type)) - .clipShape(Capsule()) - } } diff --git a/app/Sources/Views/TestPanelView.swift b/app/Sources/Views/TestPanelView.swift index 6714125..2467f6f 100644 --- a/app/Sources/Views/TestPanelView.swift +++ b/app/Sources/Views/TestPanelView.swift @@ -19,6 +19,7 @@ struct TestPanelView: View { @State private var adapters: [Adapter] = [] @State private var selectedAdapterName = "" @State private var adapterModelId = "" + @State private var selectedAdapterProtocol = "openai" // 通用 @State private var isTesting = false @@ -31,6 +32,7 @@ struct TestPanelView: View { private var selectedProvider: Provider? { providers.first { $0.name == selectedProviderName } } private var selectedAdapter: Adapter? { adapters.first { $0.name == selectedAdapterName } } + private var adapterModels: [AdapterModel] { selectedAdapter?.models ?? [] } var body: some View { VStack(spacing: 0) { @@ -130,17 +132,37 @@ struct TestPanelView: View { private var adapterForm: some View { Group { - Picker(loc("test.selectProvider"), selection: $selectedAdapterName) { - Text(loc("test.selectProvider")).tag("") + Picker(loc("test.selectAdapter"), selection: $selectedAdapterName) { + Text(loc("test.selectAdapter")).tag("") ForEach(adapters, id: \.name) { a in Text(a.name).tag(a.name) } } - .onChange(of: selectedAdapterName) { _, _ in - if let a = selectedAdapter, let first = a.models.first { + .onChange(of: selectedAdapterName) { _, name in + selectedAdapterProtocol = "openai" + if let a = adapters.first(where: { $0.name == name }), let first = a.models.first { adapterModelId = first.sourceModelId + } else { + adapterModelId = "" } } - TextField(loc("test.model"), text: $adapterModelId).textFieldStyle(.roundedBorder) + if adapterModels.isEmpty { + TextField(loc("test.model"), text: $adapterModelId).textFieldStyle(.roundedBorder) + } else { + Picker(loc("test.model"), selection: $adapterModelId) { + Text(loc("test.model")).tag("") + ForEach(adapterModels, id: \.sourceModelId) { model in + Text(model.sourceModelId).tag(model.sourceModelId) + } + } + .pickerStyle(.menu) + } + + Picker(loc("test.protocol"), selection: $selectedAdapterProtocol) { + ForEach(types, id: \.self) { type in + Text(type).tag(type) + } + } + .pickerStyle(.segmented) } } @@ -169,7 +191,11 @@ struct TestPanelView: View { let base = apiBase testResult = try await api.testProvider(modelId: selectedModelId, provider: selectedProviderName, apiKey: key, apiBase: base, type: type) } else { - testResult = try await api.testAdapter(name: selectedAdapterName, modelId: adapterModelId) + testResult = try await api.testAdapter( + name: selectedAdapterName, + modelId: adapterModelId, + protocolType: selectedAdapterProtocol + ) } } catch { errorMessage = error.localizedDescription @@ -240,7 +266,8 @@ struct TestPanelView: View { } else { curl = generateAdapterCurl( model: adapterModelId, - baseURL: APIClient.adapterAPIBaseURL(selectedAdapterName) + baseURL: APIClient.adapterAPIBaseURL(selectedAdapterName), + protocolType: selectedAdapterProtocol ) } NSPasteboard.general.clearContents() @@ -274,12 +301,27 @@ struct TestPanelView: View { } } - private func generateAdapterCurl(model: String, baseURL: String) -> String { - return """ - curl -X POST \(baseURL)chat/completions \\ - -H "Content-Type: application/json" \\ - -d '{"model": "\(model)", "messages": [{"role": "user", "content": "hi"}]}' - """ + private func generateAdapterCurl(model: String, baseURL: String, protocolType: String) -> String { + switch protocolType { + case "anthropic": + return """ + curl -X POST \(baseURL)messages \\ + -H "Content-Type: application/json" \\ + -d '{"model": "\(model)", "max_tokens": 100, "messages": [{"role": "user", "content": "hi"}]}' + """ + case "openai-responses": + return """ + curl -X POST \(baseURL)responses \\ + -H "Content-Type: application/json" \\ + -d '{"model": "\(model)", "input": "hi"}' + """ + default: + return """ + curl -X POST \(baseURL)chat/completions \\ + -H "Content-Type: application/json" \\ + -d '{"model": "\(model)", "messages": [{"role": "user", "content": "hi"}]}' + """ + } } // MARK: - Data Loading @@ -291,6 +333,10 @@ struct TestPanelView: View { providers = config.data?.providers ?? [] let adaptersResp = try await api.fetchAdapters() adapters = adaptersResp.data?.adapters ?? [] + if let selected = adapters.first(where: { $0.name == selectedAdapterName }), + !selected.models.contains(where: { $0.sourceModelId == adapterModelId }) { + adapterModelId = selected.models.first?.sourceModelId ?? "" + } } catch { /* ignore */ } isLoadingData = false } @@ -307,6 +353,7 @@ struct TestPanelView: View { mode = .adapter selectedAdapterName = a.name adapterModelId = a.modelId + selectedAdapterProtocol = "openai" } } } diff --git a/app/Sources/en.lproj/Localizable.strings b/app/Sources/en.lproj/Localizable.strings index 4743837..3e8210d 100644 --- a/app/Sources/en.lproj/Localizable.strings +++ b/app/Sources/en.lproj/Localizable.strings @@ -67,12 +67,14 @@ "test.apiKey" = "API Key"; "test.apiBase" = "API Base"; "test.type" = "Type"; +"test.protocol" = "Protocol"; "test.send" = "Send"; "test.result" = "Result"; "test.latency" = "Latency: %@ms"; "test.reachable" = "Reachable"; "test.unreachable" = "Unreachable"; "test.selectProvider" = "Select provider…"; +"test.selectAdapter" = "Select adapter…"; "providers.loading" = "Loading providers..."; "providers.searchPlaceholder" = "Search providers..."; "providers.addProvider" = "Add Provider"; @@ -138,7 +140,6 @@ "adapter.editTitle" = "Edit Adapter"; "adapter.name" = "Name"; "adapter.namePlaceholder" = "Adapter name"; -"adapter.type" = "Type"; "adapter.requestDefaults" = "Request Defaults"; "adapter.streamDefault" = "stream default"; "adapter.streamFollow" = "Default (follow)"; diff --git a/app/Sources/zh.lproj/Localizable.strings b/app/Sources/zh.lproj/Localizable.strings index a0ee79a..a65c5da 100644 --- a/app/Sources/zh.lproj/Localizable.strings +++ b/app/Sources/zh.lproj/Localizable.strings @@ -74,12 +74,14 @@ "test.apiKey" = "API Key"; "test.apiBase" = "API Base"; "test.type" = "类型"; +"test.protocol" = "协议"; "test.send" = "发送"; "test.result" = "结果"; "test.latency" = "延迟: %@ms"; "test.reachable" = "可达"; "test.unreachable" = "不可达"; "test.selectProvider" = "选择供应商…"; +"test.selectAdapter" = "选择适配器…"; // Providers "providers.loading" = "正在加载供应商..."; @@ -153,7 +155,6 @@ "adapter.editTitle" = "编辑适配器"; "adapter.name" = "名称"; "adapter.namePlaceholder" = "适配器名称"; -"adapter.type" = "类型"; "adapter.requestDefaults" = "默认请求参数"; "adapter.streamDefault" = "stream 默认"; "adapter.streamFollow" = "默认(跟随)"; diff --git a/app/Tests/LLMProxyTests/AdaptersViewModelTests.swift b/app/Tests/LLMProxyTests/AdaptersViewModelTests.swift index 1e50596..693456e 100644 --- a/app/Tests/LLMProxyTests/AdaptersViewModelTests.swift +++ b/app/Tests/LLMProxyTests/AdaptersViewModelTests.swift @@ -15,7 +15,7 @@ final class AdaptersViewModelTests: XCTestCase { @MainActor func testFilteredAdaptersEmptySearch() { viewModel.adapters = [ - Adapter(name: "test-adapter", type: "openai", baseUrl: nil, models: []), + Adapter(name: "test-adapter", baseUrl: nil, models: []), ] viewModel.search = "" XCTAssertEqual(viewModel.filteredAdapters.count, 1) @@ -24,8 +24,8 @@ final class AdaptersViewModelTests: XCTestCase { @MainActor func testFilteredAdaptersWithSearch() { viewModel.adapters = [ - Adapter(name: "openai-adapter", type: "openai", baseUrl: nil, models: []), - Adapter(name: "anthropic-adapter", type: "anthropic", baseUrl: nil, models: []), + Adapter(name: "openai-adapter", baseUrl: nil, models: []), + Adapter(name: "anthropic-adapter", baseUrl: nil, models: []), ] viewModel.search = "openai" XCTAssertEqual(viewModel.filteredAdapters.count, 1) @@ -34,14 +34,14 @@ final class AdaptersViewModelTests: XCTestCase { @MainActor func testFilteredAdaptersNoMatch() { - viewModel.adapters = [Adapter(name: "test", type: "openai", baseUrl: nil, models: [])] + viewModel.adapters = [Adapter(name: "test", baseUrl: nil, models: [])] viewModel.search = "nonexistent" XCTAssertEqual(viewModel.filteredAdapters.count, 0) } @MainActor func testFilteredAdaptersCaseInsensitive() { - viewModel.adapters = [Adapter(name: "MyAdapter", type: "openai", baseUrl: nil, models: [])] + viewModel.adapters = [Adapter(name: "MyAdapter", baseUrl: nil, models: [])] viewModel.search = "myadapter" XCTAssertEqual(viewModel.filteredAdapters.count, 1) } @@ -54,7 +54,6 @@ final class AdaptersViewModelTests: XCTestCase { XCTAssertTrue(viewModel.showForm) XCTAssertNil(viewModel.editingAdapter) XCTAssertEqual(viewModel.formName, "") - XCTAssertEqual(viewModel.formType, "openai") XCTAssertEqual(viewModel.formMappings.count, 1) // auto-add one row } @@ -62,7 +61,6 @@ final class AdaptersViewModelTests: XCTestCase { func testOpenFormForEdit() { let adapter = Adapter( name: "my-adapter", - type: "anthropic", baseUrl: nil, models: [ AdapterModel(sourceModelId: "gpt-4", provider: "openai", targetModelId: "gpt-4-turbo", status: nil), @@ -72,7 +70,6 @@ final class AdaptersViewModelTests: XCTestCase { XCTAssertTrue(viewModel.showForm) XCTAssertNotNil(viewModel.editingAdapter) XCTAssertEqual(viewModel.formName, "my-adapter") - XCTAssertEqual(viewModel.formType, "anthropic") XCTAssertEqual(viewModel.formMappings.count, 1) XCTAssertEqual(viewModel.formMappings[0].sourceModelId, "gpt-4") XCTAssertEqual(viewModel.formMappings[0].provider, "openai") @@ -86,7 +83,6 @@ final class AdaptersViewModelTests: XCTestCase { XCTAssertFalse(viewModel.showForm) XCTAssertNil(viewModel.editingAdapter) XCTAssertEqual(viewModel.formName, "") - XCTAssertEqual(viewModel.formType, "openai") XCTAssertTrue(viewModel.formMappings.isEmpty) } diff --git a/app/Tests/LLMProxyTests/DashboardViewModelTests.swift b/app/Tests/LLMProxyTests/DashboardViewModelTests.swift index ce91662..4f29aba 100644 --- a/app/Tests/LLMProxyTests/DashboardViewModelTests.swift +++ b/app/Tests/LLMProxyTests/DashboardViewModelTests.swift @@ -126,8 +126,8 @@ final class DashboardViewModelTests: XCTestCase { let provider2 = Provider(name: "p2", type: "anthropic", api_key: nil, api_base: nil, models: [ ProviderModel(id: "m3") ]) - let adapter1 = Adapter(name: "a1", type: "anthropic", baseUrl: nil, models: []) - let adapter2 = Adapter(name: "a2", type: "openai", baseUrl: nil, models: []) + let adapter1 = Adapter(name: "a1", baseUrl: nil, models: []) + let adapter2 = Adapter(name: "a2", baseUrl: nil, models: []) vm.config = ConfigData( providers: [provider1, provider2], adapters: [adapter1, adapter2] diff --git a/app/Tests/LLMProxyTests/MenuBarPreviewTests.swift b/app/Tests/LLMProxyTests/MenuBarPreviewTests.swift index 9837582..f815838 100644 --- a/app/Tests/LLMProxyTests/MenuBarPreviewTests.swift +++ b/app/Tests/LLMProxyTests/MenuBarPreviewTests.swift @@ -33,7 +33,7 @@ final class MenuBarPreviewTests: XCTestCase { func testAdapterCardModelsBuildsMappings() { let adapters = [ - Adapter(name: "my-tool", type: "anthropic", maxTokens: nil, stream: nil, baseUrl: nil, models: [ + Adapter(name: "my-tool", maxTokens: nil, stream: nil, baseUrl: nil, models: [ AdapterModel(sourceModelId: "claude-sonnet-4", provider: "anthropic", targetModelId: "claude-sonnet-4-20250514", status: nil), AdapterModel(sourceModelId: "gpt-4o", provider: "deepseek", targetModelId: "deepseek-chat", status: nil), ]), @@ -42,7 +42,6 @@ final class MenuBarPreviewTests: XCTestCase { XCTAssertEqual(cards.count, 1) XCTAssertEqual(cards[0].name, "my-tool") - XCTAssertEqual(cards[0].type, "anthropic") XCTAssertEqual(cards[0].mappings.count, 2) let first = cards[0].mappings[0] diff --git a/app/Tests/LLMProxyTests/MenuCardSnapshotTests.swift b/app/Tests/LLMProxyTests/MenuCardSnapshotTests.swift index 0be8de5..42f84c4 100644 --- a/app/Tests/LLMProxyTests/MenuCardSnapshotTests.swift +++ b/app/Tests/LLMProxyTests/MenuCardSnapshotTests.swift @@ -61,7 +61,7 @@ final class MenuCardSnapshotTests: XCTestCase { let detailStatus = status - let header = AdapterHeaderCardView(name: "my-tool", type: "anthropic") + let header = AdapterHeaderCardView(name: "my-tool") let adapter = VStack(spacing: 0) { header MappingRowView(sourceModelId: "claude-sonnet-4", currentLabel: "anthropic/claude-sonnet-4-20250514") diff --git a/docs/api-spec.md b/docs/api-spec.md index 22695e6..5d26e6f 100644 --- a/docs/api-spec.md +++ b/docs/api-spec.md @@ -117,12 +117,13 @@ GET /v1/models ``` POST /{adapterName}/v1/messages # Anthropic 格式入站 POST /{adapterName}/v1/chat/completions # OpenAI 格式入站 +POST /{adapterName}/v1/responses # OpenAI Responses 格式入站 ``` - `adapterName` 只支持 `[a-zA-Z0-9_-]`,不支持中文 -- 入站格式由适配器 `type`(`anthropic` / `openai`)决定 -- 出站格式由目标 provider `type` 决定 -- 跨协议时自动转换(OpenAI ↔ Anthropic) +- 适配器不绑定协议;入站格式由请求路径决定,天然兼容 `anthropic`、`openai`、`openai-responses` +- 出站格式由目标 provider/model 可用协议决定 +- 入站与出站协议不一致时自动转换 **跨协议转换矩阵** diff --git a/docs/architecture.md b/docs/architecture.md index cb7de47..5ac1e8c 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -219,7 +219,8 @@ Provider { } AdapterConfig { - name, type(anthropic|openai), models: AdapterModelMapping[] + name, models: AdapterModelMapping[] + // 不绑定入口协议;根据请求路径兼容 openai、openai-responses、anthropic } AdapterModelMapping { diff --git a/docs/macos-menubar-design.md b/docs/macos-menubar-design.md index 66cd860..f6d1046 100644 --- a/docs/macos-menubar-design.md +++ b/docs/macos-menubar-design.md @@ -43,7 +43,7 @@ ───── ✕ 退出 LLMProxy ⌘Q ───── -⚡ 适配器头(名称 + 协议胶囊,不可点) +⚡ 适配器头(名称,不可点) 映射行 当前 provider/model › ← 悬停即展开模型子菜单,零点击 ``` diff --git a/locales/en/translation.json b/locales/en/translation.json index 5499d6a..1a8ec22 100644 --- a/locales/en/translation.json +++ b/locales/en/translation.json @@ -253,7 +253,6 @@ "searchPlaceholder": "Search adapters...", "add": "+ Add", "adapter": "Adapter", - "type": "Type", "baseUrl": "Base URL", "modelMapping": "Model Mapping", "status": "Status", @@ -264,7 +263,6 @@ "addTitle": "Add Adapter", "formName": "Name", "formNamePlaceholder": "my-tool", - "formType": "Type", "formDefaultMaxTokens": "Default Max Tokens", "defaultMaxTokensHint": "Leave empty to use the upstream API's default", "formRequestDefaults": "Request Defaults", diff --git a/locales/zh/translation.json b/locales/zh/translation.json index e5830b1..555d13d 100644 --- a/locales/zh/translation.json +++ b/locales/zh/translation.json @@ -253,7 +253,6 @@ "searchPlaceholder": "搜索适配器...", "add": "+ 添加", "adapter": "适配器", - "type": "类型", "baseUrl": "Base URL", "modelMapping": "模型映射", "status": "状态", @@ -264,7 +263,6 @@ "addTitle": "添加适配器", "formName": "名称", "formNamePlaceholder": "my-tool", - "formType": "类型", "formDefaultMaxTokens": "默认 Max Tokens", "defaultMaxTokensHint": "留空使用上游 API 的默认值", "formRequestDefaults": "默认请求参数", diff --git a/src/adapter/router.ts b/src/adapter/router.ts index dc70150..1403513 100644 --- a/src/adapter/router.ts +++ b/src/adapter/router.ts @@ -46,10 +46,10 @@ export function resolveAdapterRoute( ) } - // 适配器配置中的 type 是默认入口协议;实际请求路径可能使用另一种协议, - // 此时应优先按请求路径选择同协议上游,避免无意义的格式转换。 - const inboundType = preferredProtocol ?? adapter.type - const protocol = resolveProviderProtocol(provider, model, inboundType) + // 适配器不再绑定入口协议。实际请求路径(或测试面板选择)决定入站协议; + // 未指定时使用目标供应商/模型的首个可用协议,兼容旧客户端调用。 + const protocol = resolveProviderProtocol(provider, model, preferredProtocol) + const inboundType = preferredProtocol ?? protocol.type const apiBase = protocol.apiBase ?? getDefaultApiBase(protocol.type) // Thinking config: 优先使用适配器映射上的配置,否则使用目标模型的配置 diff --git a/src/api/handlers/adapter-crud.ts b/src/api/handlers/adapter-crud.ts index 30bce94..556348d 100644 --- a/src/api/handlers/adapter-crud.ts +++ b/src/api/handlers/adapter-crud.ts @@ -16,7 +16,6 @@ export function handleGetAdapters(ctx: ServerContext, req: IncomingMessage, res: const adapters = (config.adapters ?? []).map((a) => { return { name: a.name, - type: a.type, max_tokens: a.max_tokens, stream: a.stream, baseUrl: `http://${host}/${a.name}/v1`, @@ -40,15 +39,10 @@ export function handleGetAdapters(ctx: ServerContext, req: IncomingMessage, res: export async function handleCreateAdapter(ctx: ServerContext, req: IncomingMessage, res: ServerResponse): Promise { const body = JSON.parse(await readBody(req)) - const { name, type, max_tokens, stream, models } = body + const { name, max_tokens, stream, models } = body - if (!name || !type || !models || !Array.isArray(models)) { - json(res, 400, { success: false, error: '缺少必填字段: name, type, models(models 需为数组)' }) - return - } - - if (!['anthropic', 'openai'].includes(type)) { - json(res, 400, { success: false, error: 'type 必须为 anthropic 或 openai' }) + if (!name || !models || !Array.isArray(models)) { + json(res, 400, { success: false, error: '缺少必填字段: name, models(models 需为数组)' }) return } @@ -58,7 +52,7 @@ export async function handleCreateAdapter(ctx: ServerContext, req: IncomingMessa return } - const newAdapter: AdapterConfig = { name, type, max_tokens, stream, models } + const newAdapter: AdapterConfig = { name, max_tokens, stream, models } const errs = validateConfig({ providers: config.providers, adapters: [newAdapter] }) if (errs.length > 0) { json(res, 400, { success: false, error: '校验失败', errors: errs }) @@ -70,8 +64,8 @@ export async function handleCreateAdapter(ctx: ServerContext, req: IncomingMessa newConfig.adapters.push(newAdapter) const ok = await writeConfigOrRespondError(ctx, newConfig, res) if (!ok) return - ctx.logger.log('system', 'Create adapter request received', { name, type, modelCount: models.length }) - ctx.logger.log('system', 'Adapter created', { name, type }) + ctx.logger.log('system', 'Create adapter request received', { name, modelCount: models.length }) + ctx.logger.log('system', 'Adapter created', { name }) json(res, 200, { success: true, data: { name } }) } @@ -81,7 +75,7 @@ export async function handleUpdateAdapter(ctx: ServerContext, req: IncomingMessa const adapterName = match[1] const body = JSON.parse(await readBody(req)) - const { name: newName, type, max_tokens, stream, models } = body + const { name: newName, max_tokens, stream, models } = body const { config } = ctx.store.getConfig() const idx = (config.adapters ?? []).findIndex((a) => a.name === adapterName) @@ -100,7 +94,6 @@ export async function handleUpdateAdapter(ctx: ServerContext, req: IncomingMessa if (!newConfig.adapters) { json(res, 500, { success: false, error: '服务器状态异常' }); return } newConfig.adapters[idx] = { name: finalName, - type: type ?? newConfig.adapters[idx].type, max_tokens: max_tokens, stream: stream, models: models ?? newConfig.adapters[idx].models, @@ -115,7 +108,7 @@ export async function handleUpdateAdapter(ctx: ServerContext, req: IncomingMessa const ok = await writeConfigOrRespondError(ctx, newConfig, res) if (!ok) return - ctx.logger.log('system', 'Update adapter request received', { name: adapterName, newName: finalName, type: type ?? '', modelCount: models?.length }) + ctx.logger.log('system', 'Update adapter request received', { name: adapterName, newName: finalName, modelCount: models?.length }) ctx.logger.log('system', 'Adapter updated', { name: adapterName }) json(res, 200, { success: true, data: { name: adapterName } }) } diff --git a/src/api/handlers/base.ts b/src/api/handlers/base.ts index d0938b8..03aee22 100644 --- a/src/api/handlers/base.ts +++ b/src/api/handlers/base.ts @@ -41,7 +41,6 @@ export function handleGetConfig(ctx: ServerContext, _req: IncomingMessage, res: vision: config.vision ?? null, adapters: (config.adapters ?? []).map((a) => ({ name: a.name, - type: a.type, models: a.models, })), }, diff --git a/src/api/handlers/model-handlers.ts b/src/api/handlers/model-handlers.ts index a49b76c..3fc4563 100644 --- a/src/api/handlers/model-handlers.ts +++ b/src/api/handlers/model-handlers.ts @@ -128,17 +128,24 @@ export async function handleTestAdapter(ctx: ServerContext, req: IncomingMessage const adapterName = typeof body.adapterName === 'string' ? body.adapterName : '' const modelId = typeof body.modelId === 'string' ? body.modelId : '' + const rawProtocol = body.protocol ?? body.type + const requestedProtocol = typeof rawProtocol === 'string' ? rawProtocol : undefined if (!adapterName || !modelId) { json(res, 400, { success: false, error: '缺少必填字段: adapterName, modelId' }) return } - ctx.logger.log('system', 'Adapter test request received', { adapter: adapterName, model: modelId }) + if (requestedProtocol && !['anthropic', 'openai', 'openai-responses'].includes(requestedProtocol)) { + json(res, 400, { success: false, error: 'protocol 必须为 openai、anthropic 或 openai-responses' }) + return + } + + ctx.logger.log('system', 'Adapter test request received', { adapter: adapterName, model: modelId, protocol: requestedProtocol ?? '' }) let route try { - route = resolveAdapterRoute(ctx.store, adapterName, modelId) + route = resolveAdapterRoute(ctx.store, adapterName, modelId, requestedProtocol as 'anthropic' | 'openai' | 'openai-responses' | undefined) } catch (err) { const message = err instanceof Error ? err.message : String(err) const code = err instanceof AdapterError ? err.code : 'UNKNOWN' @@ -153,6 +160,8 @@ export async function handleTestAdapter(ctx: ServerContext, req: IncomingMessage const targetModel = route.route.modelId const url = providerType === 'anthropic' ? `${baseUrl}/v1/messages` + : providerType === 'openai-responses' + ? `${baseUrl}/v1/responses` : `${baseUrl}/v1/chat/completions` // 适配器入口 URL(客户端实际请求的地址) @@ -169,7 +178,9 @@ export async function handleTestAdapter(ctx: ServerContext, req: IncomingMessage const requestBody = providerType === 'anthropic' ? { model: targetModel, messages: [{ role: 'user' as const, content: 'hi' }], max_tokens: 10, stream: false } - : { model: targetModel, messages: [{ role: 'user' as const, content: 'hi' }], stream: false } + : providerType === 'openai-responses' + ? { model: targetModel, input: 'hi', stream: false } + : { model: targetModel, messages: [{ role: 'user' as const, content: 'hi' }], stream: false } const startTime = Date.now() try { diff --git a/src/config/parser.ts b/src/config/parser.ts index 89fd171..1e0d904 100644 --- a/src/config/parser.ts +++ b/src/config/parser.ts @@ -68,7 +68,6 @@ export function loadConfigFromYaml(filePath: string): Config { })), adapters: (interpolated.adapters ?? []).map((a) => ({ name: a.name, - type: a.type, max_tokens: a.max_tokens, stream: a.stream, models: (a.models ?? []).map((m) => ({ @@ -111,7 +110,6 @@ export function serializeConfigToYaml(config: Config): string { })), adapters: (config.adapters ?? []).map((a) => ({ name: a.name, - type: a.type, ...(a.max_tokens !== undefined ? { max_tokens: a.max_tokens } : {}), ...(a.stream !== undefined ? { stream: a.stream } : {}), models: a.models.map((m) => ({ diff --git a/src/config/types.ts b/src/config/types.ts index 3f2e6d2..2c9c7d4 100644 --- a/src/config/types.ts +++ b/src/config/types.ts @@ -78,7 +78,6 @@ export interface AdapterModelMapping { export interface AdapterConfig { name: string - type: ProviderType /** 默认 max_tokens,客户端没传时使用 */ max_tokens?: number /** 下游未传 stream 时的默认值。未配置(undefined)时沿用内置默认 true(流式) */ @@ -121,7 +120,6 @@ export interface ProviderConfigFile { export interface AdapterConfigFile { name: string - type: ProviderType max_tokens?: number stream?: boolean models: { source_model_id: string; provider: string; target_model_id: string; thinking?: ThinkingConfigFile; reasoning_effort?: string }[] diff --git a/src/config/validator.ts b/src/config/validator.ts index 1f05f28..5aae3ae 100644 --- a/src/config/validator.ts +++ b/src/config/validator.ts @@ -215,10 +215,6 @@ function validateAdapters(config: Config): ValidationError[] { errors.push({ field: `adapters.${adapter.name}.name`, message: `适配器名称 "${adapter.name}" 与模型供应商名称冲突` }) } - if (!VALID_PROVIDER_TYPES.includes(adapter.type)) { - errors.push({ field: `adapters.${adapter.name}.type`, message: `适配器类型 "${adapter.type}" 无效,仅支持 anthropic、openai、openai-responses` }) - } - if (!adapter.models || !Array.isArray(adapter.models) || adapter.models.length === 0) { errors.push({ field: `adapters.${adapter.name}.models`, message: '每个适配器至少需要一个模型映射' }) continue diff --git a/src/types/i18n.generated.ts b/src/types/i18n.generated.ts index c0b52f3..7c52724 100644 --- a/src/types/i18n.generated.ts +++ b/src/types/i18n.generated.ts @@ -26,7 +26,6 @@ export type TranslationKey = | 'admin.adapters.formNamePlaceholder' | 'admin.adapters.formRequestDefaults' | 'admin.adapters.formStreamDefault' - | 'admin.adapters.formType' | 'admin.adapters.importedModels' | 'admin.adapters.importedModelsSkip' | 'admin.adapters.modelMapping' @@ -51,7 +50,6 @@ export type TranslationKey = | 'admin.adapters.targetModelId' | 'admin.adapters.testTitle' | 'admin.adapters.title' - | 'admin.adapters.type' | 'admin.adapters.updated' | 'admin.capture.adapter' | 'admin.capture.copyRaw' diff --git a/test/adapter/handlers.test.ts b/test/adapter/handlers.test.ts index d1823eb..bb9924e 100644 --- a/test/adapter/handlers.test.ts +++ b/test/adapter/handlers.test.ts @@ -43,7 +43,7 @@ function createTestConfig(): Config { { name: 'test-openai', type: 'openai', apiKey: 'sk-test', apiBase: `http://127.0.0.1:${PORT}`, models: [{ id: 'gpt-4o-test' }] }, ], adapters: [ - { name: 'my-tool', type: 'openai', models: [{ sourceModelId: 'my-model', provider: 'test-openai', targetModelId: 'gpt-4o-test' }] }, + { name: 'my-tool', models: [{ sourceModelId: 'my-model', provider: 'test-openai', targetModelId: 'gpt-4o-test' }] }, ], } } @@ -118,7 +118,7 @@ describe('adapter/handlers', { timeout: 10000 }, () => { { name: 'test-openai', type: 'openai', apiKey: 'sk-test', apiBase: `http://127.0.0.1:${PORT}`, models: [{ id: 'gpt-4o-test' }] }, ], adapters: [ - { name: 'cli-tool', type: 'anthropic', models: [{ sourceModelId: 'sonnet', provider: 'test-openai', targetModelId: 'gpt-4o-test' }] }, + { name: 'cli-tool', models: [{ sourceModelId: 'sonnet', provider: 'test-openai', targetModelId: 'gpt-4o-test' }] }, ], } const store = new ConfigStore('/fake', config) @@ -160,7 +160,6 @@ describe('adapter/handlers', { timeout: 10000 }, () => { }], adapters: [{ name: 'pi', - type: 'openai-responses', models: [{ sourceModelId: 'HIGH', provider: 'multi-protocol', targetModelId: 'shared-model' }], }], } @@ -203,7 +202,7 @@ describe('adapter/handlers', { timeout: 10000 }, () => { const config: Config = { providers: [], adapters: [ - { name: 'broken', type: 'openai', models: [{ sourceModelId: 'm', provider: 'nonexistent-p', targetModelId: 'x' }] }, + { name: 'broken', models: [{ sourceModelId: 'm', provider: 'nonexistent-p', targetModelId: 'x' }] }, ], } const store = new ConfigStore('/fake', config) diff --git a/test/adapter/router.test.ts b/test/adapter/router.test.ts index 823a42b..a86d506 100644 --- a/test/adapter/router.test.ts +++ b/test/adapter/router.test.ts @@ -28,7 +28,6 @@ function createStore(): ConfigStore { adapters: [ { name: 'claude-code', - type: 'anthropic', models: [ { sourceModelId: 'sonnet', provider: 'anthropic-main', targetModelId: 'claude-sonnet-4-20250514' }, { sourceModelId: 'fast', provider: 'openai-main', targetModelId: 'gpt-4o' }, @@ -49,13 +48,13 @@ describe('adapter/router', () => { assert.strictEqual(result.inboundType, 'anthropic') }) - it('跨协议映射到 OpenAI Provider(Anthropic 格式 → OpenAI 上游)', () => { + it('无协议绑定时按目标 Provider 协议作为默认入站协议', () => { const store = createStore() const result = resolveAdapterRoute(store, 'claude-code', 'fast') assert.strictEqual(result.route.providerName, 'openai-main') assert.strictEqual(result.route.providerType, 'openai') assert.strictEqual(result.route.modelId, 'gpt-4o') - assert.strictEqual(result.inboundType, 'anthropic') // 适配器格式不变 + assert.strictEqual(result.inboundType, 'openai') }) it('实际请求协议优先于适配器默认协议', () => { @@ -71,7 +70,6 @@ describe('adapter/router', () => { }], adapters: [{ name: 'pi', - type: 'openai-responses', models: [{ sourceModelId: 'HIGH', provider: 'multi-protocol', targetModelId: 'shared-model' }], }], } @@ -104,7 +102,7 @@ describe('adapter/router', () => { const config: Config = { providers: [], adapters: [ - { name: 'test-adapter', type: 'openai', models: [{ sourceModelId: 'm', provider: 'nonexistent-provider', targetModelId: 'm' }] }, + { name: 'test-adapter', models: [{ sourceModelId: 'm', provider: 'nonexistent-provider', targetModelId: 'm' }] }, ], } const store = new ConfigStore('/fake', config) @@ -120,7 +118,7 @@ describe('adapter/router', () => { { name: 'p', type: 'openai', apiKey: 'k', models: [{ id: 'real' }] }, ], adapters: [ - { name: 'a', type: 'openai', models: [{ sourceModelId: 'm', provider: 'p', targetModelId: 'nonexistent-model' }] }, + { name: 'a', models: [{ sourceModelId: 'm', provider: 'p', targetModelId: 'nonexistent-model' }] }, ], } const store = new ConfigStore('/fake', config) @@ -148,7 +146,6 @@ describe('adapter/router', () => { adapters: [ { name: 'a', - type: 'openai', models: [ { sourceModelId: 'mm', provider: 'vision-provider', targetModelId: 'multimodal-model' }, { sourceModelId: 'txt', provider: 'vision-provider', targetModelId: 'text-only-model' }, diff --git a/test/api/handlers.test.ts b/test/api/handlers.test.ts index 2d04e56..3e8a577 100644 --- a/test/api/handlers.test.ts +++ b/test/api/handlers.test.ts @@ -4,7 +4,7 @@ import { ConfigStore } from '../../src/config/store.js' import { StatusTracker } from '../../src/status/tracker.js' import { Logger } from '../../src/log/logger.js' import type { Config } from '../../src/config/types.js' -import { handleGetConfig, handleReload, handleHealth, handleStatus, handleGetLocale, handleSetLocale, handleSetProxyKey, handleCreateProvider, handleUpdateProvider } from '../../src/api/handlers/index.js' +import { handleGetConfig, handleReload, handleHealth, handleStatus, handleGetLocale, handleSetLocale, handleSetProxyKey, handleCreateProvider, handleUpdateProvider, handleCreateAdapter } from '../../src/api/handlers/index.js' import type { OutgoingHttpHeaders } from 'node:http' function createConfig(): Config { @@ -114,6 +114,29 @@ describe('api/handlers', () => { assert.doesNotMatch(savedYaml, /\n\s+protocol: openai\n/) }) + it('POST /admin/adapters 不需要协议字段且保存时不写入协议', async () => { + const tmpDir = (await import('node:fs')).mkdtempSync((await import('node:os')).tmpdir() + '/llm-proxy-test-') + const configPath = `${tmpDir}/config.yaml` + const store = new ConfigStore(configPath, createConfig()) + const ctx = { store, tracker: new StatusTracker(), logger: new Logger() } + const req = new (await import('stream')).Readable() + req.push(JSON.stringify({ + name: 'tool', + models: [{ sourceModelId: 'source', provider: 'p1', targetModelId: 'mv1' }], + })) + req.push(null) + const res = mockRes() + + await handleCreateAdapter(ctx, req as never, res as never) + + assert.strictEqual(res.getStatus(), 200) + const adapter = store.getConfig().config.adapters?.[0] + assert.ok(adapter) + assert.strictEqual(Object.hasOwn(adapter, 'type'), false) + const savedYaml = (await import('node:fs')).readFileSync(configPath, 'utf-8') + assert.doesNotMatch(savedYaml, /adapters:\n\s+- name: tool\n\s+type:/) + }) + it('GET /admin/health 返回 ok', () => { const store = new ConfigStore('/fake', createConfig()) const tracker = new StatusTracker() @@ -195,7 +218,7 @@ describe('api/handlers', () => { const config: Config = { ...createConfig(), providers: [{ ...createConfig().providers[0], models: [{ id: 'mv1', input: ['image'] }] }], - adapters: [{ name: 'adapter', type: 'openai', models: [{ sourceModelId: 'source', provider: 'p1', targetModelId: 'mv1' }] }], + adapters: [{ name: 'adapter', models: [{ sourceModelId: 'source', provider: 'p1', targetModelId: 'mv1' }] }], vision: { provider: 'p1', model: 'mv1' }, locale: 'zh', port: 9100, diff --git a/test/api/integration.test.ts b/test/api/integration.test.ts index 635779e..0efa4e8 100644 --- a/test/api/integration.test.ts +++ b/test/api/integration.test.ts @@ -148,8 +148,8 @@ function createTestConfig(): Config { }, ], adapters: [ - { name: 'my-tool', type: 'openai', models: [{ sourceModelId: 'gpt-test', provider: 'test-openai', targetModelId: 'gpt-4o-test' }] }, - { name: 'resp-adapter', type: 'openai-responses', models: [{ sourceModelId: 'resp-test', provider: 'test-responses', targetModelId: 'gpt-4o-resp' }] }, + { name: 'my-tool', models: [{ sourceModelId: 'gpt-test', provider: 'test-openai', targetModelId: 'gpt-4o-test' }] }, + { name: 'resp-adapter', models: [{ sourceModelId: 'resp-test', provider: 'test-responses', targetModelId: 'gpt-4o-resp' }] }, ], } } @@ -304,12 +304,26 @@ describe('integration', { timeout: 15000 }, () => { assert.strictEqual(data.success, true) assert.ok(data.data.adapters.length > 0) assert.strictEqual(data.data.adapters[0].name, 'my-tool') - assert.strictEqual(data.data.adapters[0].type, 'openai') + assert.strictEqual(Object.hasOwn(data.data.adapters[0], 'type'), false) assert.strictEqual(data.data.adapters[0].models[0].sourceModelId, 'gpt-test') assert.strictEqual(data.data.adapters[0].models[0].targetModelId, 'gpt-4o-test') assert.strictEqual(data.data.adapters[0].models[0].status, 'ok') }) + it('管理 API: 适配器测试可选择入站协议', async () => { + const resp = await fetch(`http://127.0.0.1:${PROXY_PORT}/admin/test-adapter`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ adapterName: 'resp-adapter', modelId: 'resp-test', protocol: 'anthropic' }), + }) + const data = await resp.json() + assert.strictEqual(resp.status, 200) + assert.strictEqual(data.success, true) + assert.strictEqual(data.data.adapterUrl, '/resp-adapter/v1/messages') + assert.strictEqual(data.data.requestUrl, `http://127.0.0.1:${MOCK_PORT}/v1/responses`) + assert.strictEqual(data.data.requestBody.input, 'hi') + }) + // --- OpenAI Responses API --- it('POST /v1/responses → 非流式 → 同协议返回 Responses 格式', async () => { diff --git a/test/config/parser.test.ts b/test/config/parser.test.ts index e72eb4e..ddd727e 100644 --- a/test/config/parser.test.ts +++ b/test/config/parser.test.ts @@ -167,6 +167,7 @@ adapters: budget_tokens: 4096 `) const config = loadConfigFromYaml(path) + assert.strictEqual(Object.hasOwn(config.adapters![0], 'type'), false) assert.strictEqual(config.adapters![0].models[0].thinking?.budget_tokens, 4096) })