diff --git a/backend/src/main/java/run/webup/platform/ModelController.java b/backend/src/main/java/run/webup/platform/ModelController.java index 5bc8ca6..056c6a4 100644 --- a/backend/src/main/java/run/webup/platform/ModelController.java +++ b/backend/src/main/java/run/webup/platform/ModelController.java @@ -179,9 +179,9 @@ public class ModelController { private List> models(boolean all) { return db.queryForList( "SELECT m.*,p.name AS provider_name,p.api_type,v.id AS" - + " price_version_id,v.input_price,v.output_price,v.cache_read_price,v.cache_write_price" - + " FROM ai_models m JOIN ai_providers p ON p.id=m.provider_id JOIN" - + " ai_model_price_versions v ON v.id=m.current_price_version " + + " price_version_id,v.input_price,v.output_price,v.cache_read_price,v.cache_write_price," + + " v.created_at AS price_effective_at FROM ai_models m JOIN ai_providers p ON" + + " p.id=m.provider_id JOIN ai_model_price_versions v ON v.id=m.current_price_version " + (all ? "" : "WHERE m.enabled=TRUE AND p.enabled=TRUE ") + " ORDER BY m.created_at DESC"); } diff --git a/backend/src/test/java/run/webup/platform/ModelApiIntegrationTest.java b/backend/src/test/java/run/webup/platform/ModelApiIntegrationTest.java index 1a554c8..f8a9eae 100644 --- a/backend/src/test/java/run/webup/platform/ModelApiIntegrationTest.java +++ b/backend/src/test/java/run/webup/platform/ModelApiIntegrationTest.java @@ -78,6 +78,76 @@ class ModelApiIntegrationTest { assertTrue(encrypted.startsWith("v1:")); } + @Test + void memberCatalogShowsOnlyEnabledModelsAndTheCurrentPriceVersion() throws Exception { + UUID enabledProvider = UUID.randomUUID(), disabledProvider = UUID.randomUUID(); + for (UUID provider : List.of(enabledProvider, disabledProvider)) { + users + .db() + .update( + "INSERT INTO" + + " ai_providers(id,name,base_url,api_type,encrypted_key,enabled,timeout_seconds)" + + " VALUES (?,?, 'https://api.openai.com/v1','OPENAI','private-fixture',?,30)", + provider, + provider.equals(enabledProvider) ? "Visible provider" : "Disabled provider", + provider.equals(enabledProvider)); + } + var settings = + json.createObjectNode() + .put("providerId", enabledProvider.toString()) + .put("name", "Catalog model") + .put("modelId", "visible-model") + .put("contextLength", 8192) + .put("maxOutput", 1024) + .put("enabled", true) + .put("toolsEnabled", true) + .put("visionEnabled", true) + .put("inputPrice", 2) + .put("outputPrice", 8) + .put("cacheReadPrice", 1) + .put("cacheWritePrice", 3); + var visibleId = + json.readTree( + mvc.perform( + post("/api/admin/models") + .header("Authorization", "Bearer " + a) + .contentType(MediaType.APPLICATION_JSON) + .content(settings.toString())) + .andExpect(status().isOk()) + .andReturn() + .getResponse() + .getContentAsString()) + .path("id") + .asText(); + for (var hidden : + List.of( + settings.deepCopy().put("modelId", "disabled-model").put("enabled", false), + settings.deepCopy().put("providerId", disabledProvider.toString()))) { + mvc.perform( + post("/api/admin/models") + .header("Authorization", "Bearer " + a) + .contentType(MediaType.APPLICATION_JSON) + .content(hidden.toString())) + .andExpect(status().isOk()); + } + mvc.perform( + put("/api/admin/models/" + visibleId) + .header("Authorization", "Bearer " + a) + .contentType(MediaType.APPLICATION_JSON) + .content(settings.put("inputPrice", 5).toString())) + .andExpect(status().isOk()); + + mvc.perform(get("/api/models").header("Authorization", "Bearer " + u)) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.length()").value(1)) + .andExpect(jsonPath("$[0].provider_name").value("Visible provider")) + .andExpect(jsonPath("$[0].input_price").value(5)) + .andExpect(jsonPath("$[0].cache_read_price").value(1)) + .andExpect(jsonPath("$[0].price_effective_at").isNotEmpty()) + .andExpect(jsonPath("$[0].encrypted_key").doesNotExist()) + .andExpect(jsonPath("$[0].base_url").doesNotExist()); + } + @Test void ordinaryUsersCannotAdjustWallets() throws Exception { mvc.perform( diff --git a/docs/API.md b/docs/API.md index a812e3b..5c2582b 100644 --- a/docs/API.md +++ b/docs/API.md @@ -68,7 +68,7 @@ | POST | `/api/admin/providers/{id}/test` | 实际调用上游模型列表,记录连接结果 | | GET / POST | `/api/admin/models` | 管理列表 / 创建模型及初始价格版本 | | PUT | `/api/admin/models/{id}` | 更新能力与开放状态,新增价格版本 | -| GET | `/api/models` | 当前用户可选模型及价格 | +| GET | `/api/models` | 当前已启用的模型、供应商名称、能力、价格及版本生效时间(`price_effective_at`) | 供应商字段:name、baseUrl(HTTPS 443;连接时校验 DNS、拒绝私网 / 元数据地址)、apiType(OPENAI / ANTHROPIC / GEMINI)、authMode(BEARER / API_KEY / X_API_KEY)、apiKey、enabled、timeoutSeconds(5–180)。供应商预设接口 `/api/admin/providers/presets` 提供 MiMo、DeepSeek、Kimi 等官方模板及自定义兼容中转配置,不预造模型或价格。已有模型引用的供应商不能原地更换地址或协议,需新建供应商。 diff --git a/frontend/src/App.vue b/frontend/src/App.vue index e01e409..171da38 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -20,6 +20,7 @@ import { Server, Wallet, Code2, + Cpu, HardDrive, Globe, LifeBuoy, @@ -55,6 +56,7 @@ const nav = [ { to: "/console", label: "数据概览", icon: LayoutDashboard }, { to: "/projects", label: "我的项目", icon: FolderKanban }, { to: "/develop", label: "AI 开发", icon: Code2 }, + { to: "/models", label: "AI 模型", icon: Cpu }, { to: "/wallet", label: "钱包与账本", icon: Wallet }, { to: "/hosting", label: "云托管", icon: Server }, { to: "/storage", label: "对象存储", icon: HardDrive }, diff --git a/frontend/src/main.ts b/frontend/src/main.ts index 3b12e3c..20c11de 100644 --- a/frontend/src/main.ts +++ b/frontend/src/main.ts @@ -9,6 +9,7 @@ import Projects from "./views/Projects.vue"; import Account from "./views/Account.vue"; import Admin from "./views/Admin.vue"; import Models from "./views/Models.vue"; +import ModelCatalog from "./views/ModelCatalog.vue"; import Wallet from "./views/Wallet.vue"; import Develop from "./views/Develop.vue"; import AdminTasks from "./views/AdminTasks.vue"; @@ -69,6 +70,7 @@ const router = createRouter({ { path: "/admin/domains", component: AdminDomains, meta: { admin: true } }, { path: "/admin/plans", component: Plans, meta: { admin: true } }, { path: "/develop", component: Develop }, + { path: "/models", component: ModelCatalog }, { path: "/admin/models", component: Models, meta: { admin: true } }, { path: "/admin/tasks", component: AdminTasks, meta: { admin: true } }, { diff --git a/frontend/src/views/ModelCatalog.vue b/frontend/src/views/ModelCatalog.vue new file mode 100644 index 0000000..783d595 --- /dev/null +++ b/frontend/src/views/ModelCatalog.vue @@ -0,0 +1,155 @@ + + + + +