mirror of
https://github.com/fawney19/Aether.git
synced 2026-09-02 17:30:23 +08:00
feat(models): allow manual global model creation
This commit is contained in:
@@ -16,6 +16,27 @@
|
|||||||
v-if="!isEditMode"
|
v-if="!isEditMode"
|
||||||
class="w-[260px] shrink-0 flex flex-col h-full"
|
class="w-[260px] shrink-0 flex flex-col h-full"
|
||||||
>
|
>
|
||||||
|
<!-- 手动添加入口 -->
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="mb-3 w-full rounded-lg border px-3 py-2 text-left transition-colors"
|
||||||
|
:class="manualModelMode
|
||||||
|
? 'border-primary bg-primary/10 text-primary'
|
||||||
|
: 'border-border/60 bg-muted/20 hover:bg-muted/40'"
|
||||||
|
@click="enableManualModelMode"
|
||||||
|
>
|
||||||
|
<div class="flex items-center justify-between gap-2">
|
||||||
|
<span class="text-sm font-medium">手动添加模型</span>
|
||||||
|
<Plus class="h-4 w-4 shrink-0" />
|
||||||
|
</div>
|
||||||
|
<p
|
||||||
|
class="mt-1 text-xs"
|
||||||
|
:class="manualModelMode ? 'text-primary/80' : 'text-muted-foreground'"
|
||||||
|
>
|
||||||
|
无法联网获取目录时,直接填写模型 ID 继续创建。
|
||||||
|
</p>
|
||||||
|
</button>
|
||||||
|
|
||||||
<!-- 搜索框 -->
|
<!-- 搜索框 -->
|
||||||
<div class="relative mb-3">
|
<div class="relative mb-3">
|
||||||
<Search class="absolute left-2.5 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
|
<Search class="absolute left-2.5 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
|
||||||
@@ -88,7 +109,7 @@
|
|||||||
v-if="groupedModels.length === 0"
|
v-if="groupedModels.length === 0"
|
||||||
class="text-center py-8 text-sm text-muted-foreground"
|
class="text-center py-8 text-sm text-muted-foreground"
|
||||||
>
|
>
|
||||||
{{ searchQuery ? '未找到模型' : '加载中...' }}
|
{{ emptyModelListText }}
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
@@ -108,6 +129,12 @@
|
|||||||
<h4 class="font-medium text-sm">
|
<h4 class="font-medium text-sm">
|
||||||
基本信息
|
基本信息
|
||||||
</h4>
|
</h4>
|
||||||
|
<div
|
||||||
|
v-if="manualModelMode && !isEditMode"
|
||||||
|
class="rounded-lg border border-primary/30 bg-primary/5 px-3 py-2 text-xs text-muted-foreground"
|
||||||
|
>
|
||||||
|
当前为手动添加模式。填写模型 ID、名称和价格后即可离线创建统一模型;稍后可在模型详情中关联 Provider。
|
||||||
|
</div>
|
||||||
<div class="grid grid-cols-2 gap-3">
|
<div class="grid grid-cols-2 gap-3">
|
||||||
<div class="space-y-1.5">
|
<div class="space-y-1.5">
|
||||||
<Label
|
<Label
|
||||||
@@ -343,7 +370,7 @@
|
|||||||
{{ isEditMode ? '保存' : '添加' }}
|
{{ isEditMode ? '保存' : '添加' }}
|
||||||
</Button>
|
</Button>
|
||||||
<Button
|
<Button
|
||||||
v-if="selectedModel && !isEditMode"
|
v-if="(selectedModel || manualModelMode) && !isEditMode"
|
||||||
type="button"
|
type="button"
|
||||||
variant="ghost"
|
variant="ghost"
|
||||||
@click="clearSelection"
|
@click="clearSelection"
|
||||||
@@ -382,6 +409,7 @@ import {
|
|||||||
EMBEDDING_API_FORMATS,
|
EMBEDDING_API_FORMATS,
|
||||||
buildGlobalModelCreatePayload,
|
buildGlobalModelCreatePayload,
|
||||||
buildGlobalModelUpdatePayload,
|
buildGlobalModelUpdatePayload,
|
||||||
|
getModelDirectoryEmptyText,
|
||||||
} from './global-model-form-helpers'
|
} from './global-model-form-helpers'
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
@@ -404,6 +432,8 @@ const searchQuery = ref('')
|
|||||||
const allModelsCache = ref<ModelsDevModelItem[]>([]) // 全部模型(缓存)
|
const allModelsCache = ref<ModelsDevModelItem[]>([]) // 全部模型(缓存)
|
||||||
const selectedModel = ref<ModelsDevModelItem | null>(null)
|
const selectedModel = ref<ModelsDevModelItem | null>(null)
|
||||||
const expandedProvider = ref<string | null>(null)
|
const expandedProvider = ref<string | null>(null)
|
||||||
|
const manualModelMode = ref(false)
|
||||||
|
const modelListLoadFailed = ref(false)
|
||||||
|
|
||||||
// 当前显示的模型列表:有搜索词时用全部,否则只用官方
|
// 当前显示的模型列表:有搜索词时用全部,否则只用官方
|
||||||
const allModels = computed(() => {
|
const allModels = computed(() => {
|
||||||
@@ -466,6 +496,14 @@ const groupedModels = computed(() => {
|
|||||||
return result
|
return result
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const emptyModelListText = computed(() => {
|
||||||
|
return getModelDirectoryEmptyText({
|
||||||
|
searchQuery: searchQuery.value,
|
||||||
|
manualModelMode: manualModelMode.value,
|
||||||
|
modelListLoadFailed: modelListLoadFailed.value,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
// 搜索时如果只有一个提供商,自动展开
|
// 搜索时如果只有一个提供商,自动展开
|
||||||
watch(groupedModels, (groups) => {
|
watch(groupedModels, (groups) => {
|
||||||
if (searchQuery.value && groups.length === 1) {
|
if (searchQuery.value && groups.length === 1) {
|
||||||
@@ -478,6 +516,16 @@ function toggleProvider(providerId: string) {
|
|||||||
expandedProvider.value = expandedProvider.value === providerId ? null : providerId
|
expandedProvider.value = expandedProvider.value === providerId ? null : providerId
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function enableManualModelMode() {
|
||||||
|
manualModelMode.value = true
|
||||||
|
selectedModel.value = null
|
||||||
|
expandedProvider.value = null
|
||||||
|
searchQuery.value = ''
|
||||||
|
if (!form.value.name && !form.value.display_name) {
|
||||||
|
form.value = defaultForm()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 阶梯计费配置
|
// 阶梯计费配置
|
||||||
const tieredPricing = ref<TieredPricingConfig | null>(null)
|
const tieredPricing = ref<TieredPricingConfig | null>(null)
|
||||||
|
|
||||||
@@ -710,11 +758,15 @@ function fillVideoResolutionPricePreset(preset: 'common' | 'sora' | 'veo') {
|
|||||||
async function loadModels() {
|
async function loadModels() {
|
||||||
if (allModelsCache.value.length > 0) return
|
if (allModelsCache.value.length > 0) return
|
||||||
loading.value = true
|
loading.value = true
|
||||||
|
modelListLoadFailed.value = false
|
||||||
try {
|
try {
|
||||||
// 只加载一次全部模型,过滤在 computed 中完成
|
// 只加载一次全部模型,过滤在 computed 中完成
|
||||||
allModelsCache.value = await getModelsDevList(false)
|
allModelsCache.value = await getModelsDevList(false)
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
log.error('Failed to load models:', err)
|
log.error('Failed to load models:', err)
|
||||||
|
modelListLoadFailed.value = true
|
||||||
|
enableManualModelMode()
|
||||||
|
showError('模型目录加载失败,已切换到手动添加模式,可离线继续创建')
|
||||||
} finally {
|
} finally {
|
||||||
loading.value = false
|
loading.value = false
|
||||||
}
|
}
|
||||||
@@ -729,6 +781,7 @@ watch(() => props.open, (isOpen) => {
|
|||||||
|
|
||||||
// 选择模型并填充表单
|
// 选择模型并填充表单
|
||||||
function selectModel(model: ModelsDevModelItem) {
|
function selectModel(model: ModelsDevModelItem) {
|
||||||
|
manualModelMode.value = false
|
||||||
selectedModel.value = model
|
selectedModel.value = model
|
||||||
expandedProvider.value = model.providerId
|
expandedProvider.value = model.providerId
|
||||||
form.value.name = model.modelId
|
form.value.name = model.modelId
|
||||||
@@ -774,6 +827,7 @@ function selectModel(model: ModelsDevModelItem) {
|
|||||||
|
|
||||||
// 清除选择(手动填写)
|
// 清除选择(手动填写)
|
||||||
function clearSelection() {
|
function clearSelection() {
|
||||||
|
manualModelMode.value = false
|
||||||
selectedModel.value = null
|
selectedModel.value = null
|
||||||
form.value = defaultForm()
|
form.value = defaultForm()
|
||||||
tieredPricing.value = null
|
tieredPricing.value = null
|
||||||
@@ -793,6 +847,8 @@ function resetForm() {
|
|||||||
searchQuery.value = ''
|
searchQuery.value = ''
|
||||||
selectedModel.value = null
|
selectedModel.value = null
|
||||||
expandedProvider.value = null
|
expandedProvider.value = null
|
||||||
|
manualModelMode.value = false
|
||||||
|
modelListLoadFailed.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
// 加载模型数据(编辑模式)
|
// 加载模型数据(编辑模式)
|
||||||
@@ -828,6 +884,14 @@ const { isEditMode, handleDialogUpdate, handleCancel } = useFormDialog({
|
|||||||
resetForm,
|
resetForm,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
watch(() => form.value.name, (name) => {
|
||||||
|
if (!manualModelMode.value || isEditMode.value) return
|
||||||
|
const modelName = name.trim()
|
||||||
|
if (modelName && !form.value.display_name.trim()) {
|
||||||
|
form.value.display_name = modelName
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
async function handleSubmit() {
|
async function handleSubmit() {
|
||||||
if (!form.value.name || !form.value.display_name) {
|
if (!form.value.name || !form.value.display_name) {
|
||||||
showError('请填写模型ID和名称')
|
showError('请填写模型ID和名称')
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import {
|
|||||||
EMBEDDING_API_FORMATS,
|
EMBEDDING_API_FORMATS,
|
||||||
buildGlobalModelCreatePayload,
|
buildGlobalModelCreatePayload,
|
||||||
buildGlobalModelUpdatePayload,
|
buildGlobalModelUpdatePayload,
|
||||||
|
getModelDirectoryEmptyText,
|
||||||
} from '../global-model-form-helpers'
|
} from '../global-model-form-helpers'
|
||||||
|
|
||||||
const embeddingPricing = {
|
const embeddingPricing = {
|
||||||
@@ -59,4 +60,26 @@ describe('global model form embedding payload helpers', () => {
|
|||||||
api_formats: ['jina:embedding'],
|
api_formats: ['jina:embedding'],
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('surfaces manual-add guidance when the online model directory is unavailable', () => {
|
||||||
|
expect(getModelDirectoryEmptyText({
|
||||||
|
searchQuery: '',
|
||||||
|
manualModelMode: false,
|
||||||
|
modelListLoadFailed: true,
|
||||||
|
})).toBe('模型目录加载失败,请使用手动添加继续创建')
|
||||||
|
|
||||||
|
expect(getModelDirectoryEmptyText({
|
||||||
|
searchQuery: '',
|
||||||
|
manualModelMode: true,
|
||||||
|
modelListLoadFailed: false,
|
||||||
|
})).toBe('已切换到手动添加,可在右侧填写模型信息')
|
||||||
|
})
|
||||||
|
|
||||||
|
it('keeps search empty state ahead of manual/offline guidance', () => {
|
||||||
|
expect(getModelDirectoryEmptyText({
|
||||||
|
searchQuery: 'local-model',
|
||||||
|
manualModelMode: true,
|
||||||
|
modelListLoadFailed: true,
|
||||||
|
})).toBe('未找到模型')
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -22,6 +22,19 @@ export interface GlobalModelFormPayloadState {
|
|||||||
is_active?: boolean
|
is_active?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ModelDirectoryEmptyTextState {
|
||||||
|
searchQuery: string
|
||||||
|
manualModelMode: boolean
|
||||||
|
modelListLoadFailed: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getModelDirectoryEmptyText(state: ModelDirectoryEmptyTextState): string {
|
||||||
|
if (state.searchQuery) return '未找到模型'
|
||||||
|
if (state.modelListLoadFailed) return '模型目录加载失败,请使用手动添加继续创建'
|
||||||
|
if (state.manualModelMode) return '已切换到手动添加,可在右侧填写模型信息'
|
||||||
|
return '加载中...'
|
||||||
|
}
|
||||||
|
|
||||||
function cleanGlobalModelConfig(form: GlobalModelFormPayloadState): Record<string, unknown> | undefined {
|
function cleanGlobalModelConfig(form: GlobalModelFormPayloadState): Record<string, unknown> | undefined {
|
||||||
return form.config && Object.keys(form.config).length > 0 ? form.config : undefined
|
return form.config && Object.keys(form.config).length > 0 ? form.config : undefined
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user