refactor(model): 重构模型网关实体和映射逻辑

2026-06-12 17:50:22 +08:00
5 changed files with 152 additions and 162 deletions
--- a/common/util/mapping.go
+++ b/common/util/mapping.go
@@ -22,13 +22,13 @@ import (
 // ParseAndValidate 解析并校验结果
 func ParseAndValidate(raw map[string]any, model *entity.ModelGatewayModel) (map[string]any, error) {
 	// 1) 解析 content 字符串为 rounds 数组
-	contentVal, ok := raw[model.ResponseBody]
+	contentVal, ok := raw[entity.ResponseBody]
 	if !ok {
-		return raw, fmt.Errorf("字段 %s 不存在", model.ResponseBody)
+		return raw, fmt.Errorf("字段 %s 不存在", entity.ResponseBody)
 	}
 	contentStr, ok := contentVal.(string)
 	if !ok || strings.TrimSpace(contentStr) == "" {
-		return raw, fmt.Errorf("字段 %s 为空或不是字符串", model.ResponseBody)
+		return raw, fmt.Errorf("字段 %s 为空或不是字符串", entity.ResponseBody)
 	}
 	var arr []any
 	if err := json.Unmarshal([]byte(contentStr), &arr); err != nil {
--- a/model/dto/model_gateway_models_dto.go
+++ b/model/dto/model_gateway_models_dto.go
@@ -25,8 +25,6 @@ type CreateModelReq struct {
 	Form             []map[string]any `p:"form" json:"form" dc:"动态表单配置"`
 	RequestMapping   map[string]any   `p:"requestMapping" json:"requestMapping" dc:"请求映射"`
 	ResponseMapping  map[string]any   `p:"responseMapping" json:"responseMapping" dc:"返回映射"`
-	ResponseBody       string           `p:"responseBody" json:"responseBody" dc:"返回主体"`
-	ResponseTokenField string           `p:"responseTokenField" json:"responseTokenField" dc:"响应中消耗token的字段映射"`
 	OperatorName     string           `p:"operatorName" json:"operatorName" dc:"运营商名称"`
 	TokenConfig      map[string]any   `p:"tokenConfig" json:"tokenConfig" dc:"token计算配置"`
 	ExtendMapping    map[string]any   `p:"extendMapping" json:"extendMapping" dc:"附加映射"`
@@ -63,8 +61,6 @@ type UpdateModelReq struct {
 	Form             []map[string]any `p:"form" json:"form" dc:"动态表单配置"`
 	RequestMapping   map[string]any   `p:"requestMapping" json:"requestMapping" dc:"请求映射"`
 	ResponseMapping  map[string]any   `p:"responseMapping" json:"responseMapping" dc:"返回映射"`
-	ResponseBody       string           `p:"responseBody" json:"responseBody" dc:"返回主体"`
-	ResponseTokenField string           `p:"responseTokenField" json:"responseTokenField" dc:"响应中消耗token的字段映射"`
 	OperatorName     string           `p:"operatorName" json:"operatorName" dc:"运营商名称"`
 	TokenConfig      map[string]any   `p:"tokenConfig" json:"tokenConfig" dc:"token计算配置"`
 	ExtendMapping    map[string]any   `p:"extendMapping" json:"extendMapping" dc:"附加映射"`
--- a/model/entity/model_gateway_model.go
+++ b/model/entity/model_gateway_model.go
@@ -13,7 +13,6 @@ type modelGatewayModelCol struct {
 	RequestMapping   string
 	ResponseMapping  string
 	ResponseBody     string
-	ResponseTokenField string
 	RequiredFields   string
 	IsPrivate        string
 	IsChatModel      string
@@ -32,7 +31,6 @@ type modelGatewayModelCol struct {
 	StreamConfig     string
 	FirstFrame       string
 	LastFrame        string
-	MaxTokens          string
 }

 var ModelGatewayModelCol = modelGatewayModelCol{
@@ -45,8 +43,6 @@ var ModelGatewayModelCol = modelGatewayModelCol{
 	FormJSON:         "form_json",
 	RequestMapping:   "request_mapping",
 	ResponseMapping:  "response_mapping",
-	ResponseBody:       "response_body",
-	ResponseTokenField: "response_token_field",
 	RequiredFields:   "required_fields",
 	IsPrivate:        "is_private",
 	IsChatModel:      "is_chat_model",
@@ -65,7 +61,6 @@ var ModelGatewayModelCol = modelGatewayModelCol{
 	StreamConfig:     "stream_config",
 	FirstFrame:       "first_frame",
 	LastFrame:        "last_frame",
-	MaxTokens:          "max_tokens",
 }

 type ModelGatewayModel struct {
@@ -78,8 +73,6 @@ type ModelGatewayModel struct {
 	Form             []map[string]any `orm:"form_json" json:"form"`
 	RequestMapping   map[string]any   `orm:"request_mapping" json:"requestMapping"`
 	ResponseMapping  map[string]any   `orm:"response_mapping" json:"responseMapping"`
-	ResponseBody       string           `orm:"response_body" json:"responseBody"`
-	ResponseTokenField string           `orm:"response_token_field" json:"tokenField"`
 	RequiredFields   []string         `orm:"required_fields" json:"requiredFields"`
 	IsPrivate        *int             `orm:"is_private" json:"isPrivate"`
 	IsChatModel      *int             `orm:"is_chat_model" json:"isChatModel"`
@@ -98,5 +91,9 @@ type ModelGatewayModel struct {
 	StreamConfig     map[string]any   `orm:"stream_config" json:"streamConfig"`
 	FirstFrame       string           `orm:"first_frame" json:"firstFrame"`
 	LastFrame        string           `orm:"last_frame" json:"lastFrame"`
-	MaxTokens          int              `orm:"max_tokens" json:"maxTokens"`
 }
+
+const ( //ResponseMapping 下的字段
+	ResponseBody = "response_body" //返回主体
+	TotalTokens  = "total_tokens"  //总token数
+)
--- a/service/task/worker.go
+++ b/service/task/worker.go
@@ -205,7 +205,7 @@ func (w *asyncWorker) callModelAsync(ctx context.Context, task *entity.ModelGate
 		return nil, err
 	}
 	// 2. 拿到 task_id
-	taskID := gjson.New(body).Get(model.ResponseBody).String()
+	taskID := gjson.New(body).Get(entity.ResponseBody).String()

 	// 3. 创建等待通道
 	ch := make(chan asyncResult, 1)
@@ -310,8 +310,8 @@ func (w *asyncWorker) parseAndRetry(ctx context.Context, body map[string]any, ta
 		}

 		// 2) 先存 token 到数据库，防止后续失败丢失
-		if _, ok := mapped[model.ResponseTokenField]; ok {
-			task.ExpendTokens = gconv.Int64(mapped[model.ResponseTokenField])
+		if _, ok := mapped[entity.TotalTokens]; ok {
+			task.ExpendTokens = gconv.Int64(mapped[entity.TotalTokens])
 			_, err = dao.ModelGatewayTask.Update(ctx, &entity.ModelGatewayTask{
 				SQLBaseDO:    beans.SQLBaseDO{Id: task.Id},
 				ExpendTokens: task.ExpendTokens,
@@ -327,7 +327,7 @@ func (w *asyncWorker) parseAndRetry(ctx context.Context, body map[string]any, ta
 				return parsed, nil
 			}
 		case public.BuildTypeStruct:
-			parsed = util.ParseStructResult(mapped, model.ResponseBody)
+			parsed = util.ParseStructResult(mapped, entity.ResponseBody)
 			return parsed, nil
 		default:
 			return mapped, nil
--- a/update.sql
+++ b/update.sql
@@ -33,7 +33,6 @@ CREATE TABLE IF NOT EXISTS model_gateway_models (
    max_concurrency int4 NOT NULL DEFAULT 10,
    timeout_seconds int4 NOT NULL DEFAULT 600,
    retry_times     int2 NOT NULL DEFAULT 3,
-    auto_clean_seconds int4 NOT NULL DEFAULT 86400,
    response_token_field varchar(128) NOT NULL DEFAULT '',
    call_mode       int2 NOT NULL DEFAULT 0,
    required_fields jsonb NOT NULL DEFAULT '[]',
@@ -55,6 +54,7 @@ COMMENT ON COLUMN model_gateway_models.created_at IS '创建时间';
 COMMENT ON COLUMN model_gateway_models.updater IS '更新人';
 COMMENT ON COLUMN model_gateway_models.updated_at IS '更新时间';
 COMMENT ON COLUMN model_gateway_models.deleted_at IS '删除时间(软删)';
+
 COMMENT ON COLUMN model_gateway_models.model_name IS '模型名称';
 COMMENT ON COLUMN model_gateway_models.model_type IS '模型类型';
 COMMENT ON COLUMN model_gateway_models.operator_name IS '运营商名称';
@@ -62,12 +62,11 @@ COMMENT ON COLUMN model_gateway_models.base_url IS '模型地址';
 COMMENT ON COLUMN model_gateway_models.http_method IS '请求方式 GET/POST';
 COMMENT ON COLUMN model_gateway_models.head_msg IS '请求头信息';
 COMMENT ON COLUMN model_gateway_models.api_key IS '调用凭证/密钥';
-
 COMMENT ON COLUMN model_gateway_models.is_private IS '是否私有化：0-私有 1-公共';
 COMMENT ON COLUMN model_gateway_models.enabled IS '是否启用：0-停用 1-启用';
 COMMENT ON COLUMN model_gateway_models.is_chat_model IS '是否为对话模型：0-否 1-是';
 COMMENT ON COLUMN model_gateway_models.is_owner IS '1=当前用户创建 0=超级管理员';
-
+COMMENT ON COLUMN model_gateway_models.call_mode IS '调用模式：0-同步 1-异步 2-流式';
 COMMENT ON COLUMN model_gateway_models.form_json IS '动态表单结构';
 COMMENT ON COLUMN model_gateway_models.request_mapping IS '请求映射';
 COMMENT ON COLUMN model_gateway_models.response_mapping IS '返回映射';
@@ -81,9 +80,7 @@ COMMENT ON COLUMN model_gateway_models.last_frame IS '尾帧图片参数';
 COMMENT ON COLUMN model_gateway_models.max_concurrency IS '最大并发数';
 COMMENT ON COLUMN model_gateway_models.timeout_seconds IS '调用模型超时(秒)';
 COMMENT ON COLUMN model_gateway_models.retry_times IS '失败重试次数';
-COMMENT ON COLUMN model_gateway_models.auto_clean_seconds IS '任务完成后自动清理时间(秒)';
 COMMENT ON COLUMN model_gateway_models.response_token_field IS '响应中消耗token的字段映射';
-COMMENT ON COLUMN model_gateway_models.call_mode IS '调用模式：0-同步 1-异步 2-流式';
 COMMENT ON COLUMN model_gateway_models.required_fields IS '必选字段列表';
 COMMENT ON COLUMN model_gateway_models.max_tokens IS '最大 token 数，0 表示不传';