refactor(model): 重构模型网关结构和流式响应解析

2026-07-06 13:20:19 +08:00
parent 1ce1913437
commit d3a8043337
6 changed files with 199 additions and 107 deletions
@@ -11,6 +11,7 @@ import (
 type CreateModelReq struct {
 	g.Meta          `path:"/createModel" method:"post" tags:"模型管理" summary:"创建模型配置" dc:"添加新的模型配置"`
 	ModelName       string         `p:"modelName" json:"modelName" v:"required#模型名称不能为空" dc:"模型名称（唯一标识）"`
+	OperatorName    string         `p:"operatorName" json:"operatorName" dc:"运营商名称"`
 	ModelType       int            `p:"modelType" json:"modelType" v:"required#模型类型不能为空" dc:"模型类型"`
 	BaseURL         string         `p:"baseUrl" json:"baseUrl" v:"required#模型地址不能为空" dc:"模型服务地址"`
 	HttpMethod      string         `p:"httpMethod" json:"httpMethod" dc:"请求方式：GET/POST（默认POST）"`
@@ -19,17 +20,15 @@ type CreateModelReq struct {
 	Enabled         *int           `p:"enabled" json:"enabled" dc:"是否启用：0-停用 1-启用"`
 	IsChatModel     *int           `p:"isChatModel" json:"isChatModel" dc:"是否为对话模型：0-否 1-是"`
 	CallMode        *int           `p:"callMode" json:"callMode" dc:"调用模式：0-同步 1-异步 2-流式"`
-	RequiredFields  []string       `p:"requiredFields" json:"requiredFields" dc:"必填字段"`
 	ApiKey          string         `p:"apiKey" json:"apiKey" dc:"调用凭证/密钥"`
 	Form            []entity.Form  `p:"form" json:"form" dc:"动态表单配置"`
 	RequestMapping  map[string]any `p:"requestMapping" json:"requestMapping" dc:"请求映射"`
 	ResponseMapping map[string]any `p:"responseMapping" json:"responseMapping" dc:"返回映射"`
-	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:"附加映射"`
 	QueryConfig     map[string]any `p:"queryConfig" json:"queryConfig" dc:"查询/回调配置"`
 	StreamConfig    map[string]any `p:"streamConfig" json:"streamConfig" dc:"流式输出配置"`
 	SpecialParams   map[string]any `p:"specialParams" json:"specialParams" dc:"请求特殊参数（首尾帧等）"`
+	RequiredFields  []string       `p:"requiredFields" json:"requiredFields" dc:"必填字段"`
 	MaxConcurrency  int            `p:"maxConcurrency" json:"maxConcurrency" dc:"最大并发数（默认10）"`
 	TimeoutSeconds  int            `p:"timeoutSeconds" json:"timeoutSeconds" dc:"请求超时时间（秒，默认600）"`
 	RetryTimes      int            `p:"retryTimes" json:"retryTimes" dc:"失败重试次数（默认3）"`
@@ -43,6 +42,7 @@ type UpdateModelReq struct {
 	g.Meta          `path:"/updateModel" method:"put" tags:"模型管理" summary:"更新模型配置" dc:"更新指定ID的模型配置"`
 	ID              int64          `p:"id" json:"id" v:"required#id不能为空" dc:"配置ID"`
 	ModelName       string         `p:"modelName" json:"modelName" v:"required#模型名称不能为空" dc:"模型名称（唯一标识）"`
+	OperatorName    string         `p:"operatorName" json:"operatorName" dc:"运营商名称"`
 	ModelType       int            `p:"modelType" json:"modelType" v:"required#模型类型不能为空" dc:"模型类型"`
 	BaseURL         string         `p:"baseUrl" json:"baseUrl" v:"required#模型地址不能为空" dc:"模型服务地址"`
 	HttpMethod      string         `p:"httpMethod" json:"httpMethod" dc:"请求方式：GET/POST（默认POST）"`
@@ -51,17 +51,15 @@ type UpdateModelReq struct {
 	Enabled         *int           `p:"enabled" json:"enabled" dc:"是否启用：0-停用 1-启用"`
 	IsChatModel     *int           `p:"isChatModel" json:"isChatModel" dc:"是否为对话模型：0-否 1-是"`
 	CallMode        *int           `p:"callMode" json:"callMode" dc:"调用模式：0-同步 1-异步 2-流式"`
-	RequiredFields  []string       `p:"requiredFields" json:"requiredFields" dc:"必填字段"`
 	ApiKey          string         `p:"apiKey" json:"apiKey" dc:"调用凭证/密钥"`
 	Form            []entity.Form  `p:"form" json:"form" dc:"动态表单配置"`
 	RequestMapping  map[string]any `p:"requestMapping" json:"requestMapping" dc:"请求映射"`
 	ResponseMapping map[string]any `p:"responseMapping" json:"responseMapping" dc:"返回映射"`
-	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:"附加映射"`
 	QueryConfig     map[string]any `p:"queryConfig" json:"queryConfig" dc:"查询/回调配置"`
 	StreamConfig    map[string]any `p:"streamConfig" json:"streamConfig" dc:"流式输出配置"`
 	SpecialParams   map[string]any `p:"specialParams" json:"specialParams" dc:"请求特殊参数（首尾帧等）"`
+	RequiredFields  []string       `p:"requiredFields" json:"requiredFields" dc:"必填字段"`
 	MaxConcurrency  int            `p:"maxConcurrency" json:"maxConcurrency" dc:"最大并发数（默认10）"`
 	TimeoutSeconds  int            `p:"timeoutSeconds" json:"timeoutSeconds" dc:"请求超时时间（秒，默认600）"`
 	RetryTimes      int            `p:"retryTimes" json:"retryTimes" dc:"失败重试次数（默认3）"`
@@ -83,11 +81,8 @@ type DeleteModelRes struct {

 // GetModelReq 获取模型配置详情
 type GetModelReq struct {
-	g.Meta      `path:"/getModel" method:"get" tags:"模型管理" summary:"获取模型配置" dc:"根据模型ID获取配置详情"`
-	ID          int64  `p:"id" json:"id,string" dc:"配置ID"`
-	Creator     string `p:"creator" json:"creator" dc:"创建人"`
-	IsChatModel *int   `p:"isChatModel" json:"isChatModel" dc:"是否为聊天模型"`
-	ModelName   string `p:"modelName" json:"modelName" dc:"模型名称（唯一标识）"`
+	g.Meta `path:"/getModel" method:"get" tags:"模型管理" summary:"获取模型配置" dc:"根据模型ID获取配置详情"`
+	ID     int64 `p:"id" json:"id,string" dc:"配置ID"`
 }

 type GetModelRes struct {
@@ -22,7 +22,6 @@ type modelGatewayModelCol struct {
 	TimeoutSeconds  string
 	RetryTimes      string
 	OperatorName    string
-	TokenConfig     string
 	ExtendMapping   string
 	QueryConfig     string
 	StreamConfig    string
@@ -50,7 +49,6 @@ var ModelGatewayModelCol = modelGatewayModelCol{
 	TimeoutSeconds:  "timeout_seconds",
 	RetryTimes:      "retry_times",
 	OperatorName:    "operator_name",
-	TokenConfig:     "token_config",
 	ExtendMapping:   "extend_mapping",
 	QueryConfig:     "query_config",
 	StreamConfig:    "stream_config",
@@ -61,29 +59,28 @@ var ModelGatewayModelCol = modelGatewayModelCol{
 type ModelGatewayModel struct {
 	beans.SQLBaseDO `orm:",inline"`
 	ModelName       string         `orm:"model_name" json:"modelName"`
+	OperatorName    string         `orm:"operator_name" json:"operatorName"`
 	ModelType       int            `orm:"model_type" json:"modelType"`
 	BaseURL         string         `orm:"base_url" json:"baseUrl"`
 	HttpMethod      string         `orm:"http_method" json:"httpMethod"`
 	HeadMsg         map[string]any `orm:"head_msg" json:"headMsg"`
-	Form            []Form         `orm:"form_json" json:"form"`
-	RequestMapping  map[string]any `orm:"request_mapping" json:"requestMapping"`
-	ResponseMapping map[string]any `orm:"response_mapping" json:"responseMapping"`
-	RequiredFields  []string       `orm:"required_fields" json:"requiredFields"`
 	IsPrivate       *int           `orm:"is_private" json:"isPrivate"`
 	IsChatModel     *int           `orm:"is_chat_model" json:"isChatModel"`
 	CallMode        *int           `orm:"call_mode" json:"callMode"`
 	ApiKey          string         `orm:"api_key" json:"apiKey"`
 	Enabled         *int           `orm:"enabled" json:"enabled"`
-	MaxConcurrency  int            `orm:"max_concurrency" json:"maxConcurrency"`
-	TimeoutSeconds  int            `orm:"timeout_seconds" json:"timeoutSeconds"`
-	RetryTimes      int            `orm:"retry_times" json:"retryTimes"`
-	OperatorName    string         `orm:"operator_name" json:"operatorName"`
-	TokenConfig     map[string]any `orm:"token_config" json:"tokenConfig"`
+	Form            []Form         `orm:"form_json" json:"form"`
+	RequestMapping  map[string]any `orm:"request_mapping" json:"requestMapping"`
+	ResponseMapping map[string]any `orm:"response_mapping" json:"responseMapping"`
 	ExtendMapping   map[string]any `orm:"extend_mapping" json:"extendMapping"`
 	QueryConfig     map[string]any `orm:"query_config" json:"queryConfig"`
 	StreamConfig    map[string]any `orm:"stream_config" json:"streamConfig"`
 	SpecialParams   map[string]any `orm:"special_params" json:"specialParams"`
 	BillingConfig   map[string]any `orm:"billing_config" json:"billingConfig"`
+	RequiredFields  []string       `orm:"required_fields" json:"requiredFields"`
+	MaxConcurrency  int            `orm:"max_concurrency" json:"maxConcurrency"`
+	TimeoutSeconds  int            `orm:"timeout_seconds" json:"timeoutSeconds"`
+	RetryTimes      int            `orm:"retry_times" json:"retryTimes"`
 }

 type Form struct {