- 新增操作日志表(asynch_op_log)及对应DAO,记录任务创建等操作的审计信息 - 新增任务分页查询接口(ListTask)及对应DTO、Service和DAO方法 - 优化模型调用失败重试逻辑:支持配置重试排队策略(插队到队首或队尾) - 新增临时文件存储机制,当模型调用成功但OSS上传失败时,下次仅重试OSS上传 - 模型配置新增retry_queue_max_seconds字段,控制失败重试排队策略 - 更新数据库表结构(asynch_models、asynch_task、新增asynch_op_log)及同步更新SQL - 配置文件调整:超时单位改为秒,更新服务地址和轮询间隔 - 修复模型列表查询支持按名称模糊搜索
180 lines
4.1 KiB
Go
180 lines
4.1 KiB
Go
package service
|
||
|
||
import (
|
||
"bytes"
|
||
"context"
|
||
"encoding/json"
|
||
"fmt"
|
||
"io"
|
||
"net/http"
|
||
"net/url"
|
||
"strings"
|
||
"time"
|
||
|
||
"model-asynch/model/entity"
|
||
)
|
||
|
||
// parseAPIKeyHeaders 支持多个 header 绑定,逗号分隔:
|
||
// 示例:
|
||
// - X-API-Key:qwen3-tts-key,operation:true,count:123
|
||
// - X-API-Key:"qwen3-tts-key",operation:"true"
|
||
//
|
||
// 说明:
|
||
// - HTTP Header 最终都是字符串,这里做的是“值的字符串化表达”。
|
||
// - 若 value 用双引号包裹,会去掉外层引号再注入,便于在配置中区分字符串/布尔/数字等表达(以及避免值中包含特殊字符时歧义)。
|
||
func parseAPIKeyHeaders(apiKey string) map[string]string {
|
||
apiKey = strings.TrimSpace(apiKey)
|
||
if apiKey == "" {
|
||
return nil
|
||
}
|
||
out := map[string]string{}
|
||
parts := strings.Split(apiKey, ",")
|
||
for _, p := range parts {
|
||
p = strings.TrimSpace(p)
|
||
if p == "" {
|
||
continue
|
||
}
|
||
// HeaderName:HeaderValue(推荐) / HeaderName=HeaderValue(兼容)
|
||
if strings.Contains(p, ":") {
|
||
kv := strings.SplitN(p, ":", 2)
|
||
k := strings.TrimSpace(kv[0])
|
||
v := strings.TrimSpace(kv[1])
|
||
v = strings.Trim(v, "\"")
|
||
if k != "" && v != "" {
|
||
out[k] = v
|
||
}
|
||
continue
|
||
}
|
||
if strings.Contains(p, "=") {
|
||
kv := strings.SplitN(p, "=", 2)
|
||
k := strings.TrimSpace(kv[0])
|
||
v := strings.TrimSpace(kv[1])
|
||
v = strings.Trim(v, "\"")
|
||
if k != "" && v != "" {
|
||
out[k] = v
|
||
}
|
||
continue
|
||
}
|
||
}
|
||
if len(out) == 0 {
|
||
return nil
|
||
}
|
||
return out
|
||
}
|
||
|
||
func payloadToQuery(payload any) (url.Values, error) {
|
||
if payload == nil {
|
||
return url.Values{}, nil
|
||
}
|
||
// 统一转成 map[string]any
|
||
b, err := json.Marshal(payload)
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
m := map[string]any{}
|
||
if err := json.Unmarshal(b, &m); err != nil {
|
||
return nil, err
|
||
}
|
||
q := url.Values{}
|
||
for k, v := range m {
|
||
if v == nil {
|
||
continue
|
||
}
|
||
// 复杂类型直接 json 字符串化
|
||
switch vv := v.(type) {
|
||
case string:
|
||
q.Set(k, vv)
|
||
case float64, bool, int, int64, uint64:
|
||
q.Set(k, fmt.Sprintf("%v", vv))
|
||
default:
|
||
bs, _ := json.Marshal(v)
|
||
q.Set(k, string(bs))
|
||
}
|
||
}
|
||
return q, nil
|
||
}
|
||
|
||
// InvokeModel 调用模型服务,返回二进制结果
|
||
func InvokeModel(ctx context.Context, m *entity.AsynchModel, payload any) ([]byte, error) {
|
||
if m == nil || m.BaseURL == "" {
|
||
return nil, fmt.Errorf("模型配置不完整")
|
||
}
|
||
url := strings.TrimRight(m.BaseURL, "/") + "/" + strings.TrimLeft(m.Route, "/")
|
||
if strings.TrimSpace(m.Route) == "" {
|
||
url = strings.TrimRight(m.BaseURL, "/")
|
||
}
|
||
|
||
timeout := time.Duration(m.TimeoutSeconds) * time.Second
|
||
if timeout <= 0 {
|
||
timeout = 60 * time.Second
|
||
}
|
||
client := &http.Client{Timeout: timeout}
|
||
|
||
method := strings.ToUpper(strings.TrimSpace(m.HttpMethod))
|
||
if method == "" {
|
||
method = http.MethodPost
|
||
}
|
||
|
||
var (
|
||
req *http.Request
|
||
err error
|
||
)
|
||
switch method {
|
||
case http.MethodGet:
|
||
q, err := payloadToQuery(payload)
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
if len(q) > 0 {
|
||
if strings.Contains(url, "?") {
|
||
url = url + "&" + q.Encode()
|
||
} else {
|
||
url = url + "?" + q.Encode()
|
||
}
|
||
}
|
||
req, err = http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
|
||
default:
|
||
bodyBytes, err := json.Marshal(payload)
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
req, err = http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewReader(bodyBytes))
|
||
}
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
|
||
// 透传必要头部(如 Authorization / X-User-Info),以及注入模型配置里的 api_key
|
||
for k, v := range forwardHeaders(ctx) {
|
||
if v != "" {
|
||
req.Header.Set(k, v)
|
||
}
|
||
}
|
||
for hk, hv := range parseAPIKeyHeaders(m.APIKey) {
|
||
req.Header.Set(hk, hv)
|
||
}
|
||
if method != http.MethodGet {
|
||
req.Header.Set("Content-Type", "application/json")
|
||
}
|
||
|
||
resp, err := client.Do(req)
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
defer resp.Body.Close()
|
||
|
||
b, err := io.ReadAll(resp.Body)
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
|
||
// 尽量把错误体带回去,方便排查
|
||
msg := string(b)
|
||
if len(msg) > 2000 {
|
||
msg = msg[:2000]
|
||
}
|
||
return nil, fmt.Errorf("模型服务返回非2xx: %d, body=%s", resp.StatusCode, msg)
|
||
}
|
||
return b, nil
|
||
}
|