Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ providers:

adapters:
- name: my-tool
type: anthropic
models:
- sourceModelId: claude-sonnet-4
provider: anthropic
Expand Down
1 change: 0 additions & 1 deletion README.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ providers:

adapters:
- name: my-tool
type: anthropic
models:
- sourceModelId: claude-sonnet-4
provider: anthropic
Expand Down
2 changes: 1 addition & 1 deletion admin-ui/src/components/TestPanelDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 列表(默认展开详情)→ 可清空。
*/
Expand Down
98 changes: 33 additions & 65 deletions admin-ui/src/pages/AdaptersPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -71,7 +70,6 @@ interface AdapterMapping {

interface AdapterRow {
name: string
type: ProviderType
max_tokens?: number
stream?: boolean
baseUrl?: string
Expand All @@ -89,7 +87,6 @@ interface MappingRow {

interface FormState {
name: string
type: ProviderType
maxTokens: string
stream: string // '' | 'true' | 'false'
models: MappingRow[]
Expand All @@ -101,6 +98,12 @@ interface TestTarget {
modelIds: string[]
}

const ADAPTER_PROTOCOLS = [
{ type: 'openai' },
{ type: 'openai-responses' },
{ type: 'anthropic' },
]

/* ────────────────────────── 常量 / 工具 ────────────────────────── */

const emptyMappingRow = (): MappingRow => ({
Expand All @@ -113,7 +116,6 @@ const emptyMappingRow = (): MappingRow => ({

const emptyForm = (): FormState => ({
name: '',
type: 'openai',
maxTokens: '',
stream: '',
models: [emptyMappingRow()],
Expand All @@ -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() {
Expand Down Expand Up @@ -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) => ({
Expand Down Expand Up @@ -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) => {
Expand All @@ -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 }
Expand All @@ -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,
Expand Down Expand Up @@ -382,8 +378,6 @@ export default function AdaptersPage() {

/* ──── 渲染 ──── */

const isAnthropic = form.type === 'anthropic'

return (
<div className="flex flex-col gap-4 p-6">
{/* 工具条:搜索 + 添加 */}
Expand All @@ -407,7 +401,6 @@ export default function AdaptersPage() {
<TableHeader>
<TableRow>
<TableHead>{t('admin.adapters.adapter')}</TableHead>
<TableHead>{t('admin.adapters.type')}</TableHead>
<TableHead>{t('admin.adapters.baseUrl')}</TableHead>
<TableHead>{t('admin.adapters.modelMapping')}</TableHead>
<TableHead>{t('admin.adapters.status')}</TableHead>
Expand All @@ -421,9 +414,6 @@ export default function AdaptersPage() {
return (
<TableRow key={a.name}>
<TableCell className="font-semibold text-foreground">{a.name}</TableCell>
<TableCell className="font-mono text-[11.5px] text-muted-foreground">
{a.type === 'openai-responses' ? 'openai (responses)' : a.type}
</TableCell>
<TableCell className="font-mono text-[10.5px] text-muted-foreground">
{a.baseUrl || '—'}
</TableCell>
Expand Down Expand Up @@ -499,21 +489,21 @@ export default function AdaptersPage() {

{loading && adapters.length === 0 && (
<TableRow>
<TableCell colSpan={6} className="py-12 text-center">
<TableCell colSpan={5} className="py-12 text-center">
<Spinner className="text-xl" />
</TableCell>
</TableRow>
)}
{!loading && filtered.length === 0 && adapters.length === 0 && (
<TableRow>
<TableCell colSpan={6} className="py-12 text-center text-[13px] text-muted-foreground">
<TableCell colSpan={5} className="py-12 text-center text-[13px] text-muted-foreground">
{t('admin.adapters.empty')}
</TableCell>
</TableRow>
)}
{!loading && filtered.length === 0 && adapters.length > 0 && (
<TableRow>
<TableCell colSpan={6} className="py-12 text-center text-[13px] text-muted-foreground">
<TableCell colSpan={5} className="py-12 text-center text-[13px] text-muted-foreground">
{t('admin.adapters.noMatch')}
</TableCell>
</TableRow>
Expand Down Expand Up @@ -545,27 +535,6 @@ export default function AdaptersPage() {
/>
</div>

{/* 类型 */}
<div className="flex flex-col gap-1.5">
<label className={LABEL_CLS}>{t('admin.adapters.formType')}</label>
<Select
size="sm"
value={form.type}
onValueChange={(v) => setForm((f) => ({ ...f, type: String(v ?? 'openai') as ProviderType }))}
>
<SelectTrigger aria-label={t('admin.adapters.formType')}>
<SelectValue>
{(v) => TYPE_LABELS[String(v ?? 'openai') as ProviderType] ?? String(v)}
</SelectValue>
</SelectTrigger>
<SelectContent>
<SelectItem value="openai">OpenAI (Chat)</SelectItem>
<SelectItem value="openai-responses">OpenAI (Responses)</SelectItem>
<SelectItem value="anthropic">Anthropic</SelectItem>
</SelectContent>
</Select>
</div>

{/* 请求默认(max_tokens + stream) */}
<div className="flex flex-col gap-1.5">
<label className={LABEL_CLS}>{t('admin.adapters.formRequestDefaults')}</label>
Expand Down Expand Up @@ -697,23 +666,21 @@ export default function AdaptersPage() {

{/* thinking / effort 配置 */}
<div className="mt-2.5 flex flex-wrap items-center gap-x-4 gap-y-2">
{isAnthropic && (
<label className="flex items-center gap-1.5">
<span className="text-[10.5px] font-medium whitespace-nowrap text-primary-strong">
{t('admin.providers.thinkingBudget')}
</span>
<Input
type="number"
min={0}
step={1024}
value={m.thinking.budget_tokens ?? ''}
onChange={(e) => updateMappingThinking(i, { budget_tokens: e.target.value })}
inputSize="sm"
aria-label={t('admin.providers.thinkingBudget')}
className="w-24 font-mono text-[11px]"
/>
</label>
)}
<label className="flex items-center gap-1.5">
<span className="text-[10.5px] font-medium whitespace-nowrap text-primary-strong">
{t('admin.providers.thinkingBudget')}
</span>
<Input
type="number"
min={0}
step={1024}
value={m.thinking.budget_tokens ?? ''}
onChange={(e) => updateMappingThinking(i, { budget_tokens: e.target.value })}
inputSize="sm"
aria-label={t('admin.providers.thinkingBudget')}
className="w-24 font-mono text-[11px]"
/>
</label>

<label className="flex items-center gap-1.5">
<span className="text-[10.5px] font-medium whitespace-nowrap text-primary-strong">
Expand Down Expand Up @@ -809,9 +776,10 @@ export default function AdaptersPage() {
open={test.open}
onClose={() => setTest((prev) => ({ ...prev, open: false }))}
name={test.name}
protocols={ADAPTER_PROTOCOLS}
modelIds={test.modelIds}
endpoint="/admin/test-adapter"
buildBody={(modelId) => ({ adapterName: test.name, modelId })}
buildBody={(modelId, protocolType) => ({ adapterName: test.name, modelId, protocol: protocolType })}
/>
</div>
)
Expand Down
10 changes: 5 additions & 5 deletions app/Sources/APIClient.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions app/Sources/MenuBarController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
11 changes: 1 addition & 10 deletions app/Sources/MenuCardViews.swift
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,6 @@ struct CardButton: View {

struct AdapterCardModel {
let name: String
let type: String
let mappings: [Mapping]

struct Mapping: Identifiable {
Expand All @@ -706,11 +705,10 @@ struct AdapterCardModel {
}
}

// MARK: - 适配器头(名称 + 协议类型,不可点击)
// MARK: - 适配器头(名称,不可点击)

struct AdapterHeaderCardView: View {
let name: String
let type: String

var body: some View {
HStack(spacing: 6) {
Expand All @@ -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)
Expand Down Expand Up @@ -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,
Expand Down
16 changes: 10 additions & 6 deletions app/Sources/Models.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 {
Expand Down
Loading
Loading