feat: sync deployed v1.0.0-rc.38-custom.42

Sync production source including routing, billing, Astra detection and public uptime. Update custom build instructions and license packaging.

relay/channel/ali/adaptor_test.go

@@ -1,10 +1,12 @@
 package ali
 
 import (
+	"bytes"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io"
+	"mime/multipart"
 	"net/http"
 	"net/http/httptest"
 	"strings"
@@ -19,6 +21,7 @@ import (
 	relayhelper "github.com/QuantumNous/new-api/relay/helper"
 	"github.com/QuantumNous/new-api/relaykit/dto"
 	"github.com/QuantumNous/new-api/service"
+	"github.com/QuantumNous/new-api/setting/ratio_setting"
 	"github.com/QuantumNous/new-api/setting/system_setting"
 	"github.com/gin-gonic/gin"
 	"github.com/stretchr/testify/assert"
@@ -26,6 +29,43 @@ import (
 	"github.com/tidwall/gjson"
 )
 
+func TestAliMultipartEditsUseValidatedProviderQuantity(t *testing.T) {
+	for _, tc := range []struct {
+		name    string
+		convert func(*gin.Context, *relaycommon.RelayInfo, dto.ImageRequest) (*AliImageRequest, error)
+	}{
+		{"multimodal edit", oaiFormEdit2AliImageEdit},
+		{"legacy Wan edit", oaiFormEdit2WanxImageEdit},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			var body bytes.Buffer
+			writer := multipart.NewWriter(&body)
+			require.NoError(t, writer.WriteField("model", "fixture-image"))
+			require.NoError(t, writer.WriteField("n", "2"))
+			require.NoError(t, writer.WriteField("parameters", `{"n":3,"prompt_extend":false}`))
+			part, err := writer.CreateFormFile("image", "input.png")
+			require.NoError(t, err)
+			_, err = part.Write([]byte("fixture image"))
+			require.NoError(t, err)
+			require.NoError(t, writer.Close())
+			c, _ := gin.CreateTestContext(httptest.NewRecorder())
+			c.Request = httptest.NewRequest(http.MethodPost, "/v1/images/edits", &body)
+			c.Request.Header.Set("Content-Type", writer.FormDataContentType())
+			common.SetContextKey(c, rootconstant.ContextKeyChannelType, rootconstant.ChannelTypeAli)
+			request, err := relayhelper.GetAndValidOpenAIImageRequest(c, constant.RelayModeImagesEdits)
+			require.NoError(t, err)
+			info := &relaycommon.RelayInfo{Request: request}
+			converted, err := tc.convert(c, info, *request)
+			require.NoError(t, err)
+			require.NotNil(t, converted.Parameters.N)
+			assert.Equal(t, uint(3), *converted.Parameters.N)
+			require.NotNil(t, converted.Parameters.PromptExtend)
+			assert.False(t, *converted.Parameters.PromptExtend)
+			assert.Equal(t, uint(2), *request.N, "conversion must preserve the incoming request")
+		})
+	}
+}
+
 func TestConvertOpenAIRequestFiltersThinkingBudgetByUpstreamModel(t *testing.T) {
 	tests := []struct {
 		name          string
@@ -169,6 +209,42 @@ func TestMappedAliImageModelUsesUpstreamProtocol(t *testing.T) {
 	assert.IsType(t, &AliImageRequest{}, converted)
 }
 
+func TestAliImageCountMatchesLegacyReservation(t *testing.T) {
+	saved := ratio_setting.ModelPrice2JSONString()
+	require.NoError(t, ratio_setting.UpdateModelPriceByJSONString(`{"z-image":0.04}`))
+	t.Cleanup(func() { require.NoError(t, ratio_setting.UpdateModelPriceByJSONString(saved)) })
+	for _, tc := range []struct {
+		name, body string
+		count      int
+		multiplier float64
+	}{
+		{"provider override", `{"model":"z-image","n":2,"parameters":{"n":4}}`, 4, 1},
+		{"empty parameters inherit top-level", `{"model":"z-image","n":2,"parameters":{}}`, 2, 1},
+		{"null count inherits top-level", `{"model":"z-image","n":2,"parameters":{"n":null}}`, 2, 1},
+		{"default count", `{"model":"z-image"}`, 1, 1},
+		{"prompt extension", `{"model":"z-image","parameters":{"n":3,"prompt_extend":true}}`, 3, 2},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			c, _ := gin.CreateTestContext(httptest.NewRecorder())
+			c.Request = httptest.NewRequest(http.MethodPost, "/v1/images/generations", strings.NewReader(tc.body))
+			c.Request.Header.Set("Content-Type", "application/json")
+			common.SetContextKey(c, rootconstant.ContextKeyChannelType, rootconstant.ChannelTypeAli)
+			request, err := relayhelper.GetAndValidOpenAIImageRequest(c, constant.RelayModeImagesGenerations)
+			require.NoError(t, err)
+			info := &relaycommon.RelayInfo{Request: request, OriginModelName: request.Model, UserGroup: "default", UsingGroup: "default"}
+			price, err := relayhelper.ModelPriceHelper(c, info, 0, request.GetTokenCountMeta())
+			require.NoError(t, err)
+			assert.Equal(t, common.QuotaFromFloat(0.04*float64(tc.count)*tc.multiplier*common.QuotaPerUnit), price.QuotaToPreConsume)
+			info.ChannelMeta = &relaycommon.ChannelMeta{ChannelType: rootconstant.ChannelTypeAli, UpstreamModelName: request.Model}
+			converted, err := oaiImage2AliImageRequest(info, *request, true)
+			require.NoError(t, err)
+			encoded, err := common.Marshal(converted)
+			require.NoError(t, err)
+			assert.Equal(t, int64(tc.count), gjson.GetBytes(encoded, "parameters.n").Int())
+		})
+	}
+}
+
 func TestAliImageHandlerHonorsRequestResponseFormat(t *testing.T) {
 	imageBytes := []byte("ali-image")
 	var downloads atomic.Int32