Add provider model catalogs to news risk settings
Development CI / check-and-build (push) Successful in 1m30s
GitHub Git mirror / mirror (push) Successful in 6s
Development CI / deploy-development (push) Successful in 2m28s

This commit is contained in:
eezd committed 2026-10-30 19:11:44 +08:00
1 parent b54863f40a
commit 376d07250e
7 files changed
+235 -4

No files matched your search

+25
View File
@@ -75,6 +75,31 @@ def api_root(base_url: str) -> str:
return root.removesuffix("/v1") return root.removesuffix("/v1")
async def list_models(provider: AiProvider) -> list[str]:
"""Read the provider's model catalog without generating a completion."""
options = {'api_key': decrypt(provider.api_key_encrypted), 'timeout': 10, 'max_retries': 0}
root = api_root(provider.base_url)
client = (openai.AsyncOpenAI(base_url=f'{root}/v1', **options) if provider.protocol == 'openai'
else anthropic.AsyncAnthropic(base_url=root, **options))
try:
async with asyncio.timeout(30), client:
models = await client.models.list()
identifiers = set()
async for model in models:
identifier = getattr(model, 'id', None)
if not isinstance(identifier, str) or not identifier.strip():
raise LlmError('模型列表响应缺少有效的模型 ID;请手动填写模型名称')
identifiers.add(identifier)
return sorted(identifiers)
except (openai.APIStatusError, anthropic.APIStatusError) as error:
raise LlmError(f'模型列表接口返回 HTTP {error.status_code};请检查接入权限,或手动填写模型名称') from error
except (TimeoutError, openai.APITimeoutError, anthropic.APITimeoutError,
httpx.TimeoutException, httpx2.TimeoutException) as error:
raise LlmError('读取模型列表超时;可重试或手动填写模型名称') from error
except (openai.APIError, anthropic.APIError, httpx.TransportError, httpx2.TransportError) as error:
raise LlmError('无法读取模型列表;请检查接入配置,或手动填写模型名称') from error
async def stream( async def stream(
provider: AiProvider, system: str, messages: list[dict], tools: list[ToolSpec], effort: Effort | None = None, provider: AiProvider, system: str, messages: list[dict], tools: list[ToolSpec], effort: Effort | None = None,
) -> AsyncIterator[TextDelta | ThinkingStarted | Completion]: ) -> AsyncIterator[TextDelta | ThinkingStarted | Completion]:
+9
View File
@@ -119,6 +119,15 @@ async def create_provider(body: ProviderIn, session: Annotated[AsyncSession, Dep
return success(ProviderOut.model_validate(provider, from_attributes=True)) return success(ProviderOut.model_validate(provider, from_attributes=True))
@router.get('/providers/{provider_id}/models')
async def list_provider_models(provider_id: int, session: Annotated[AsyncSession, Depends(get_session)]) -> ApiResponse[list[str]]:
provider = await get_provider(session, provider_id)
try:
return success(await llm.list_models(provider))
except llm.LlmError as error:
raise HTTPException(status.HTTP_502_BAD_GATEWAY, str(error)) from error
@router.patch("/providers/{provider_id}") @router.patch("/providers/{provider_id}")
async def patch_provider(provider_id: int, body: ProviderPatch, session: Annotated[AsyncSession, Depends(get_session)]) -> ApiResponse[ProviderOut]: async def patch_provider(provider_id: int, body: ProviderPatch, session: Annotated[AsyncSession, Depends(get_session)]) -> ApiResponse[ProviderOut]:
provider = await get_provider(session, provider_id) provider = await get_provider(session, provider_id)
+81
View File
@@ -73,3 +73,84 @@ def test_delete_provider_handles_news_risk_reference(trading, monkeypatch, enabl
assert reference.provider_id is None assert reference.provider_id is None
session.delete.assert_awaited_once_with(provider) session.delete.assert_awaited_once_with(provider)
session.commit.assert_awaited_once() session.commit.assert_awaited_once()
@pytest.mark.parametrize('protocol,base_url', [('openai', 'https://example.invalid/v1/'), ('anthropic', 'https://example.invalid/')])
def test_model_catalog_uses_selected_protocol_and_reads_all_pages(trading, monkeypatch, protocol, base_url):
from alphapulse.ai import llm
options = []
class Page:
async def __aiter__(self):
for identifier in ['model-b', 'model-a', 'model-b']:
yield SimpleNamespace(id=identifier)
class Client:
def __init__(self, **kwargs):
options.append(kwargs)
self.models = SimpleNamespace(list=AsyncMock(return_value=Page()))
async def __aenter__(self): return self
async def __aexit__(self, *args): pass
monkeypatch.setattr(llm, 'decrypt', lambda value: 'test-only-key')
monkeypatch.setattr(llm.openai if protocol == 'openai' else llm.anthropic,
'AsyncOpenAI' if protocol == 'openai' else 'AsyncAnthropic', Client)
provider = SimpleNamespace(protocol=protocol, base_url=base_url, api_key_encrypted=b'test')
assert asyncio.run(llm.list_models(provider)) == ['model-a', 'model-b']
assert options == [{'base_url': 'https://example.invalid/v1' if protocol == 'openai' else 'https://example.invalid',
'api_key': 'test-only-key', 'timeout': 10, 'max_retries': 0}]
@pytest.mark.parametrize('failure', ['http', 'timeout', 'invalid_id'])
def test_model_catalog_failures_remain_explicit_without_exposing_upstream_details(trading, monkeypatch, failure):
from alphapulse.ai import llm
class Page:
async def __aiter__(self):
yield SimpleNamespace(id=None)
class Client:
def __init__(self, **kwargs):
self.models = SimpleNamespace(list=AsyncMock(return_value=Page()))
if failure == 'timeout': self.models.list.side_effect = TimeoutError()
if failure == 'http':
response = httpx.Response(401, request=httpx.Request('GET', 'https://example.invalid/v1/models'))
self.models.list.side_effect = llm.openai.APIStatusError('private-upstream-details', response=response, body=None)
async def __aenter__(self): return self
async def __aexit__(self, *args): pass
monkeypatch.setattr(llm, 'decrypt', lambda value: 'test-only-key')
monkeypatch.setattr(llm.openai, 'AsyncOpenAI', Client)
provider = SimpleNamespace(protocol='openai', base_url='https://example.invalid', api_key_encrypted=b'test')
with pytest.raises(llm.LlmError) as error:
asyncio.run(llm.list_models(provider))
assert 'private-upstream-details' not in str(error.value)
assert '手动填写' in str(error.value)
@pytest.mark.parametrize('failure', [None, 'unavailable', 'missing'])
def test_provider_model_catalog_http_contract(trading, monkeypatch, failure):
from fastapi import FastAPI, HTTPException
from alphapulse.api import settings
provider = SimpleNamespace(id=1)
async def get_provider(session, identifier):
assert identifier == 1
if failure == 'missing': raise HTTPException(404, '模型配置不存在')
return provider
catalog = AsyncMock(return_value=['model-a', 'model-b'])
if failure == 'unavailable': catalog.side_effect = settings.llm.LlmError('读取模型列表失败')
monkeypatch.setattr(settings, 'get_provider', get_provider)
monkeypatch.setattr(settings.llm, 'list_models', catalog)
app = FastAPI()
app.include_router(settings.router)
app.dependency_overrides[settings.require_admin] = lambda: None
app.dependency_overrides[settings.get_session] = lambda: None
async def check():
async with httpx.AsyncClient(transport=httpx.ASGITransport(app), base_url='http://test') as client:
response = await client.get('/api/settings/providers/1/models')
assert response.status_code == ({None: 200, 'unavailable': 502, 'missing': 404}[failure])
if failure is None: assert response.json()['data'] == ['model-a', 'model-b']
asyncio.run(check())
+10
View File
@@ -9,6 +9,16 @@ export function listProvidersApi() {
}) })
} }
/** Read the selected provider's catalog; the page owns failure presentation. */
export function listProviderModelsApi(id: number) {
return request<Settings.ListProviderModelsResponseData>({
url: `/settings/providers/${id}/models`,
method: "get",
timeout: 35000,
notify: false
})
}
/** 新增模型配置 */ /** 新增模型配置 */
export function createProviderApi(body: Settings.ProviderForm) { export function createProviderApi(body: Settings.ProviderForm) {
return request<Settings.CreateProviderResponseData>({ return request<Settings.CreateProviderResponseData>({
+1
View File
@@ -18,6 +18,7 @@ export interface Provider {
} }
export type ListProvidersResponseData = Provider[] export type ListProvidersResponseData = Provider[]
export type ListProviderModelsResponseData = string[]
export interface ProviderForm { export interface ProviderForm {
name: string name: string
+54 -4
View File
@@ -3,7 +3,7 @@ import type * as Risk from "@/common/apis/risk/type"
import type { Provider } from "@/common/apis/settings/type" import type { Provider } from "@/common/apis/settings/type"
import { formatTime } from "@@/utils/text" import { formatTime } from "@@/utils/text"
import * as api from "@/common/apis/risk" import * as api from "@/common/apis/risk"
import { listProvidersApi } from "@/common/apis/settings" import { listProviderModelsApi, listProvidersApi } from "@/common/apis/settings"
import { useUserStore } from "@/pinia/stores/user" import { useUserStore } from "@/pinia/stores/user"
const user = useUserStore() const user = useUserStore()
@@ -19,6 +19,10 @@ const events = ref<Risk.RiskEvent[]>([])
const settings = ref<Risk.Settings | null>(null) const settings = ref<Risk.Settings | null>(null)
const providers = ref<Provider[]>([]) const providers = ref<Provider[]>([])
const showSettings = ref(false) const showSettings = ref(false)
const models = ref<string[]>([])
const modelsLoading = ref(false)
const modelsLoaded = ref(false)
const modelsError = ref("")
const detail = ref<Awaited<ReturnType<typeof api.getRiskEventApi>> | null>(null) const detail = ref<Awaited<ReturnType<typeof api.getRiskEventApi>> | null>(null)
const showDetail = ref(false) const showDetail = ref(false)
const failures = ref<Risk.Analysis[]>([]) const failures = ref<Risk.Analysis[]>([])
@@ -28,6 +32,7 @@ const failed = ref(false)
const saving = ref(false) const saving = ref(false)
let sequence = 0 let sequence = 0
let detailSequence = 0 let detailSequence = 0
let modelsSequence = 0
let timer: ReturnType<typeof setInterval> | undefined let timer: ReturnType<typeof setInterval> | undefined
const labels: Record<string, string> = { bullish: "偏多", bearish: "偏空", mixed: "震荡/分歧", neutral: "中性", unknown: "无法判断", official: "官方公告", reported: "媒体报道", unverified: "待核实", refuted: "更正/辟谣", insufficient: "信息不足", low: "低", medium: "中", high: "高" } const labels: Record<string, string> = { bullish: "偏多", bearish: "偏空", mixed: "震荡/分歧", neutral: "中性", unknown: "无法判断", official: "官方公告", reported: "媒体报道", unverified: "待核实", refuted: "更正/辟谣", insufficient: "信息不足", low: "低", medium: "中", high: "高" }
const starText = (value: number) => value ? "★".repeat(value) : "无明显风险" const starText = (value: number) => value ? "★".repeat(value) : "无明显风险"
@@ -57,13 +62,36 @@ async function openSettings() {
providers.value = choices providers.value = choices
showSettings.value = true showSettings.value = true
} }
async function loadModels() {
const seq = ++modelsSequence
const version = user.sessionVersion
const id = settings.value?.provider_id
models.value = []
modelsError.value = ""
modelsLoaded.value = false
modelsLoading.value = false
if (!showSettings.value || !id) return
modelsLoading.value = true
try {
const choices = await listProviderModelsApi(id)
if (seq !== modelsSequence || version !== user.sessionVersion) return
models.value = choices
modelsLoaded.value = true
} catch (error) {
if (seq === modelsSequence && version === user.sessionVersion)
modelsError.value = error instanceof Error ? error.message : "读取模型列表失败"
} finally {
if (seq === modelsSequence && version === user.sessionVersion) modelsLoading.value = false
}
}
async function save(enable: boolean) { async function save(enable: boolean) {
if (!settings.value) return if (!settings.value) return
const version = user.sessionVersion const version = user.sessionVersion
saving.value = true saving.value = true
try { try {
if (enable) await api.enableRiskApi(settings.value) const data = { ...settings.value, model: settings.value.model.trim() }
else await api.saveRiskSettingsApi({ ...settings.value, enabled: false }) if (enable) await api.enableRiskApi(data)
else await api.saveRiskSettingsApi({ ...data, enabled: false })
if (version !== user.sessionVersion) return if (version !== user.sessionVersion) return
showSettings.value = false showSettings.value = false
await load() await load()
@@ -97,6 +125,14 @@ function search() {
} }
watch([hours, stars, archive, range], search) watch([hours, stars, archive, range], search)
watch(page, () => void load()) watch(page, () => void load())
watch([showSettings, () => settings.value?.provider_id], () => void loadModels())
watch(() => user.sessionVersion, () => {
modelsSequence++
showSettings.value = false
settings.value = null
models.value = []
modelsLoading.value = false
})
watch(showDetail, (visible) => { watch(showDetail, (visible) => {
if (!visible) { if (!visible) {
detailSequence++ detailSequence++
@@ -112,6 +148,7 @@ onMounted(() => {
onBeforeUnmount(() => { onBeforeUnmount(() => {
sequence++ sequence++
detailSequence++ detailSequence++
modelsSequence++
clearInterval(timer) clearInterval(timer)
}) })
</script> </script>
@@ -224,7 +261,20 @@ onBeforeUnmount(() => {
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="新闻模型名称"> <el-form-item label="新闻模型名称">
<el-input v-model="settings.model" placeholder="填写接口实际支持的模型 ID,例如 LUNA 对应名称" /> <div class="w-full flex gap-2">
<el-select v-model="settings.model" class="min-w-0 flex-1" filterable allow-create default-first-option :loading="modelsLoading" :disabled="!settings.provider_id" placeholder="选择模型,或输入模型 ID 后回车">
<el-option v-for="model in models" :key="model" :value="model" :label="model" />
</el-select>
<el-button :loading="modelsLoading" :disabled="!settings.provider_id" @click="loadModels">
刷新列表
</el-button>
</div>
<p v-if="modelsError" class="mb-0 w-full text-sm text-amber-600">
{{ modelsError }}
</p>
<p v-else-if="modelsLoaded && !models.length" class="mb-0 text-sm text-slate-500">
接口未返回可选模型,可手动填写模型 ID。
</p>
</el-form-item> </el-form-item>
<el-alert type="info" :closable="false" title="测试并启用会调用模型,随后分析起点之后的全部新闻;不会修改 Chat 或交易模型。" /> <el-alert type="info" :closable="false" title="测试并启用会调用模型,随后分析起点之后的全部新闻;不会修改 Chat 或交易模型。" />
<p>当前状态:{{ settings.enabled ? '已启用' : '已关闭' }}</p> <p>当前状态:{{ settings.enabled ? '已启用' : '已关闭' }}</p>
+55
View File
@@ -379,6 +379,61 @@ test("风险首页丢弃旧窗口与旧会话结果,详情关闭后不写回",
assert.equal(page.detail.value, null) assert.equal(page.detail.value, null)
}) })
test("新闻模型列表随接入配置更新,保留手填值并丢弃旧配置、关闭及旧会话结果", async () => {
const requests: { id: number, response: ReturnType<typeof Promise.withResolvers> }[] = []
let unmount = () => {}
const user = vue.reactive({ sessionVersion: 1 })
const load = moduleLoader({
"@/common/apis/risk": { getRiskSettingsApi: async () => ({ provider_id: 1, model: "manual-model", enabled: false }) },
"@/common/apis/settings": {
listProvidersApi: async () => [],
listProviderModelsApi: (id: number) => {
const response = Promise.withResolvers()
requests.push({ id, response })
return response.promise
}
},
"@/pinia/stores/user": { useUserStore: () => user }
}, { ...globals, clearInterval, onBeforeUnmount: (callback: () => void) => unmount = callback })
const page = load("@/pages/home/index.vue").default.setup({}, { expose() {} })
await page.openSettings()
await vue.nextTick()
assert.equal(requests[0].id, 1)
page.settings.value.provider_id = 2
await vue.nextTick()
requests[1].response.resolve(["model-two"])
await setImmediate()
requests[0].response.resolve(["model-one"])
await setImmediate()
assert.deepEqual(Array.from(page.models.value), ["model-two"])
assert.equal(page.settings.value.model, "manual-model")
const failed = page.loadModels()
requests[2].response.reject(new Error("目录不可用"))
await failed
assert.equal(page.modelsError.value, "目录不可用")
assert.equal(page.settings.value.model, "manual-model")
const closed = page.loadModels()
page.showSettings.value = false
await vue.nextTick()
requests[3].response.resolve(["closed"])
await closed
assert.equal(page.models.value.length, 0)
await page.openSettings()
await vue.nextTick()
user.sessionVersion++
await vue.nextTick()
requests[4].response.resolve(["previous-session"])
await setImmediate()
assert.equal(page.showSettings.value, false)
assert.equal(page.models.value.length, 0)
await page.openSettings()
await vue.nextTick()
unmount()
requests[5].response.resolve(["unmounted"])
await setImmediate()
assert.equal(page.models.value.length, 0)
})
test("新闻 AI 详情绑定新闻修订版本,旧分析响应不能覆盖当前版本", async () => { test("新闻 AI 详情绑定新闻修订版本,旧分析响应不能覆盖当前版本", async () => {
const requests: { params: unknown, response: ReturnType<typeof Promise.withResolvers> }[] = [] const requests: { params: unknown, response: ReturnType<typeof Promise.withResolvers> }[] = []
const props = vue.reactive({ newsId: 1, revision: 1 }) const props = vue.reactive({ newsId: 1, revision: 1 })