perf: optimize request metadata extraction and disabled field filtering (#5009)
* perf: optimize request metadata extraction and disabled field filtering * perf: optimize stream usage estimation path
This commit is contained in:
@@ -2054,6 +2054,17 @@ func TestRemoveDisabledFieldsDefaultFiltering(t *testing.T) {
|
||||
assertJSONEqual(t, `{"cache_control":{"type":"ephemeral"},"store":true}`, string(out))
|
||||
}
|
||||
|
||||
func TestRemoveDisabledFieldsNoControlledFieldsKeepsBody(t *testing.T) {
|
||||
input := `{"model":"gpt-4o","messages":[{"role":"user","content":"hi"}]}`
|
||||
settings := dto.ChannelOtherSettings{}
|
||||
|
||||
out, err := RemoveDisabledFields([]byte(input), settings, false)
|
||||
if err != nil {
|
||||
t.Fatalf("RemoveDisabledFields returned error: %v", err)
|
||||
}
|
||||
require.Equal(t, input, string(out))
|
||||
}
|
||||
|
||||
func TestRemoveDisabledFieldsAllowInferenceGeo(t *testing.T) {
|
||||
input := `{
|
||||
"inference_geo":"eu",
|
||||
|
||||
@@ -18,6 +18,7 @@ import (
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/gorilla/websocket"
|
||||
"github.com/tidwall/gjson"
|
||||
)
|
||||
|
||||
type ThinkingContentInfo struct {
|
||||
@@ -785,6 +786,9 @@ func RemoveDisabledFields(jsonData []byte, channelOtherSettings dto.ChannelOther
|
||||
if model_setting.GetGlobalSettings().PassThroughRequestEnabled || channelPassThroughEnabled {
|
||||
return jsonData, nil
|
||||
}
|
||||
if !hasRemovableDisabledField(jsonData, channelOtherSettings) {
|
||||
return jsonData, nil
|
||||
}
|
||||
|
||||
var data map[string]interface{}
|
||||
if err := common.Unmarshal(jsonData, &data); err != nil {
|
||||
@@ -851,6 +855,25 @@ func RemoveDisabledFields(jsonData []byte, channelOtherSettings dto.ChannelOther
|
||||
return jsonDataAfter, nil
|
||||
}
|
||||
|
||||
func hasRemovableDisabledField(jsonData []byte, channelOtherSettings dto.ChannelOtherSettings) bool {
|
||||
values := gjson.GetManyBytes(
|
||||
jsonData,
|
||||
"service_tier",
|
||||
"inference_geo",
|
||||
"speed",
|
||||
"store",
|
||||
"safety_identifier",
|
||||
"stream_options.include_obfuscation",
|
||||
)
|
||||
|
||||
return (!channelOtherSettings.AllowServiceTier && values[0].Exists()) ||
|
||||
(!channelOtherSettings.AllowInferenceGeo && values[1].Exists()) ||
|
||||
(!channelOtherSettings.AllowSpeed && values[2].Exists()) ||
|
||||
(channelOtherSettings.DisableStore && values[3].Exists()) ||
|
||||
(!channelOtherSettings.AllowSafetyIdentifier && values[4].Exists()) ||
|
||||
(!channelOtherSettings.AllowIncludeObfuscation && values[5].Exists())
|
||||
}
|
||||
|
||||
// RemoveGeminiDisabledFields removes disabled fields from Gemini request JSON data
|
||||
// Currently supports removing functionResponse.id field which Vertex AI does not support
|
||||
func RemoveGeminiDisabledFields(jsonData []byte) ([]byte, error) {
|
||||
|
||||
Reference in New Issue
Block a user