8fba0017c7
Backend (Go)
- Include custom endpoints in each model’s SupportedEndpointTypes by parsing Model.Endpoints (JSON) and appending keys alongside native endpoint types.
- Build a global supportedEndpointMap map[string]EndpointInfo{path, method} by:
- Seeding with native defaults.
- Overriding/adding from models.endpoints (accepts string path → default POST, or {path, method}).
- Expose supported_endpoint at the top level of /api/pricing (vendors-like), removing per-model duplication.
- Fix default path for EndpointTypeOpenAIResponse to /v1/responses.
- Keep concurrency/caching for pricing retrieval intact.
Frontend (React)
- Fetch supported_endpoint in useModelPricingData and propagate to PricingPage → ModelDetailSideSheet → ModelEndpoints.
- ModelEndpoints
- Resolve path+method via endpointMap; replace {model} with actual model name.
- Fix mobile visibility; always show path and HTTP method.
- JSONEditor
- Wrap with Form.Slot to inherit form layout; simplify visual styles.
- Use Tabs for “Visual” / “Manual” modes.
- Unify editors: key-value editor now supports nested JSON:
- “+” to convert a primitive into an object and add nested fields.
- Add “Convert to value” for two‑way toggle back from object.
- Stable key rename without reordering rows; new rows append at bottom.
- Use Row/Col grid for clean alignment; region editor uses Form.Slot + grid.
- Editing flows
- EditModelModal / EditPrefillGroupModal use JSONEditor (editorType='object') for endpoint mappings.
- PrefillGroupManagement renders endpoint group items by JSON keys.
Data expectations / compatibility
- models.endpoints should be a JSON object mapping endpoint type → string path or {path, method}. Strings default to POST.
- No schema changes; existing TEXT field continues to store JSON.
QA
- /api/pricing now returns custom endpoint types and global supported_endpoint.
- UI shows both native and custom endpoints; paths/methods render on mobile; nested editing works and preserves order.
33 lines
1.3 KiB
Go
33 lines
1.3 KiB
Go
package common
|
||
|
||
import "one-api/constant"
|
||
|
||
// EndpointInfo 描述单个端点的默认请求信息
|
||
// path: 上游路径
|
||
// method: HTTP 请求方式，例如 POST/GET
|
||
// 目前均为 POST，后续可扩展
|
||
//
|
||
// json 标签用于直接序列化到 API 输出
|
||
// 例如：{"path":"/v1/chat/completions","method":"POST"}
|
||
|
||
type EndpointInfo struct {
|
||
Path string `json:"path"`
|
||
Method string `json:"method"`
|
||
}
|
||
|
||
// defaultEndpointInfoMap 保存内置端点的默认 Path 与 Method
|
||
var defaultEndpointInfoMap = map[constant.EndpointType]EndpointInfo{
|
||
constant.EndpointTypeOpenAI: {Path: "/v1/chat/completions", Method: "POST"},
|
||
constant.EndpointTypeOpenAIResponse: {Path: "/v1/responses", Method: "POST"},
|
||
constant.EndpointTypeAnthropic: {Path: "/v1/messages", Method: "POST"},
|
||
constant.EndpointTypeGemini: {Path: "/v1beta/models/{model}:generateContent", Method: "POST"},
|
||
constant.EndpointTypeJinaRerank: {Path: "/rerank", Method: "POST"},
|
||
constant.EndpointTypeImageGeneration: {Path: "/v1/images/generations", Method: "POST"},
|
||
}
|
||
|
||
// GetDefaultEndpointInfo 返回指定端点类型的默认信息以及是否存在
|
||
func GetDefaultEndpointInfo(et constant.EndpointType) (EndpointInfo, bool) {
|
||
info, ok := defaultEndpointInfoMap[et]
|
||
return info, ok
|
||
}
|