feat: 新增模型扩展映射与查询配置字段

service/model_invoker.go

@@ -6,13 +6,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"model-gateway/model/entity"
 	"net/http"
 	"net/url"
 	"strings"
 	"time"
 
-	"model-gateway/model/entity"
-
 	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/tidwall/gjson"
@@ -196,6 +195,59 @@ func InvokeModel(ctx context.Context, m *entity.AsynchModel, payload any, modelK
 	return mappedResponse, nil
 }
 
+//// InvokeModel 调用模型服务，返回二进制结果
+//func InvokeModel(ctx context.Context, m *entity.AsynchModel, payload any, modelKey string) ([]byte, error) {
+//	if m == nil || m.BaseURL == "" {
+//		return nil, fmt.Errorf("模型配置不完整")
+//	}
+//	// 请求参数映射
+//	mappedPayload, err := mapRequestPayload(m.RequestMapping, payload)
+//	if err != nil {
+//		return nil, fmt.Errorf("请求参数映射失败: %w", err)
+//	}
+//	// 合并请求头
+//	headers := util.ForwardHeaders(ctx)
+//	for hk, hv := range parseHeadMsgHeaders(m.HeadMsg) {
+//		headers[hk] = hv
+//	}
+//	for hk, hv := range parseHeadMsgHeaders(modelKey) {
+//		headers[hk] = hv
+//	}
+//
+//	// 设置超时
+//	timeout := time.Duration(m.TimeoutSeconds) * time.Second
+//	if timeout <= 0 {
+//		timeout = 600 * time.Second
+//	}
+//	ctx, cancel := context.WithTimeout(ctx, timeout)
+//	defer cancel()
+//
+//	invokeUrl := strings.TrimRight(m.BaseURL, "/")
+//	method := strings.ToUpper(strings.TrimSpace(m.HttpMethod))
+//	if method == "" {
+//		method = http.MethodPost
+//	}
+//
+//	var respBytes []byte
+//
+//	switch method {
+//	case http.MethodGet:
+//		err = commonHttp.Get(ctx, invokeUrl, headers, &respBytes, mappedPayload)
+//	default:
+//		err = commonHttp.Post(ctx, invokeUrl, headers, &respBytes, mappedPayload)
+//	}
+//	if err != nil {
+//		return nil, err
+//	}
+//	// 响应参数映射
+//	mappedResponse, err := mapResponsePayload(m.ResponseMapping, respBytes)
+//	if err != nil {
+//		g.Log().Warningf(ctx, "响应参数映射失败: %v，返回原始数据", err)
+//		return respBytes, nil
+//	}
+//	return mappedResponse, nil
+//}
+
 // ============================================
 // 映射相关函数
 // ============================================