Codex/dreambrand model aliases

Dockerfile

@@ -1,28 +1,34 @@
 FROM oven/bun:1@sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7 AS builder
 
+ARG BUN_REGISTRY=https://registry.npmjs.org
+
 WORKDIR /build/web
 COPY web/package.json web/bun.lock ./
 COPY web/default/package.json ./default/package.json
 COPY web/classic/package.json ./classic/package.json
-RUN bun install --frozen-lockfile
+RUN bun install --frozen-lockfile --registry=${BUN_REGISTRY}
 COPY ./web/default ./default
 COPY ./VERSION /build/VERSION
 RUN cd default && DISABLE_ESLINT_PLUGIN='true' VITE_REACT_APP_VERSION=$(cat /build/VERSION) bun run build
 
 FROM oven/bun:1@sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7 AS builder-classic
 
+ARG BUN_REGISTRY=https://registry.npmjs.org
+
 WORKDIR /build/web
 COPY web/package.json web/bun.lock ./
 COPY web/default/package.json ./default/package.json
 COPY web/classic/package.json ./classic/package.json
-RUN bun install --frozen-lockfile
+RUN bun install --frozen-lockfile --registry=${BUN_REGISTRY}
 COPY ./web/classic ./classic
 COPY ./VERSION /build/VERSION
 RUN cd classic && VITE_REACT_APP_VERSION=$(cat /build/VERSION) bun run build
 
 FROM golang:1.26.1-alpine@sha256:2389ebfa5b7f43eeafbd6be0c3700cc46690ef842ad962f6c5bd6be49ed82039 AS builder2
 ENV GO111MODULE=on CGO_ENABLED=0
 
+ARG GOPROXY=https://goproxy.cn,direct
+ENV GOPROXY=${GOPROXY}
 ARG TARGETOS
 ARG TARGETARCH
 ENV GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH:-amd64}
@@ -40,8 +46,11 @@ RUN go build -ldflags "-s -w -X 'github.com/QuantumNous/new-api/common.Version=$
 
 FROM debian:bookworm-slim@sha256:f06537653ac770703bc45b4b113475bd402f451e85223f0f2837acbf89ab020a
 
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends ca-certificates tzdata libasan8 wget \
+ARG DEBIAN_MIRROR=mirrors.aliyun.com
+
+RUN sed -i "s|http://deb.debian.org|http://${DEBIAN_MIRROR}|g" /etc/apt/sources.list.d/debian.sources \
+    && apt-get -o Acquire::Retries=5 -o Acquire::http::Timeout=30 update \
+    && apt-get -o Acquire::Retries=5 -o Acquire::http::Timeout=30 install -y --no-install-recommends ca-certificates tzdata libasan8 wget \
     && rm -rf /var/lib/apt/lists/* \
     && update-ca-certificates
 

Dockerfile.dev

@@ -4,6 +4,8 @@
 FROM golang:1.26.1-alpine AS builder
 
 ENV GO111MODULE=on CGO_ENABLED=0
+ARG GOPROXY=https://goproxy.cn,direct
+ENV GOPROXY=${GOPROXY}
 ARG TARGETOS
 ARG TARGETARCH
 ENV GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH:-amd64}
@@ -24,8 +26,11 @@ RUN go build -ldflags "-s -w -X 'github.com/QuantumNous/new-api/common.Version=$
 
 FROM debian:bookworm-slim
 
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends ca-certificates tzdata wget \
+ARG DEBIAN_MIRROR=mirrors.aliyun.com
+
+RUN sed -i "s|http://deb.debian.org|http://${DEBIAN_MIRROR}|g" /etc/apt/sources.list.d/debian.sources \
+    && apt-get -o Acquire::Retries=5 -o Acquire::http::Timeout=30 update \
+    && apt-get -o Acquire::Retries=5 -o Acquire::http::Timeout=30 install -y --no-install-recommends ca-certificates tzdata wget \
     && rm -rf /var/lib/apt/lists/* \
     && update-ca-certificates
 

common/api_type.go

@@ -75,6 +75,8 @@ func ChannelType2APIType(channelType int) (int, bool) {
 		apiType = constant.APITypeReplicate
 	case constant.ChannelTypeCodex:
 		apiType = constant.APITypeCodex
+	case constant.ChannelTypeDreamBrand:
+		apiType = constant.APITypeDreamBrand
 	}
 	if apiType == -1 {
 		return constant.APITypeOpenAI, false

constant/api_type.go

@@ -36,5 +36,6 @@ const (
 	APITypeMiniMax
 	APITypeReplicate
 	APITypeCodex
+	APITypeDreamBrand
 	APITypeDummy // this one is only for count, do not add any channel after this
 )

constant/asset_audit.go

@@ -0,0 +1,3 @@
+package constant
+
+const AssetAuditModelName = "zlhub-asset-audit"

constant/channel.go

@@ -55,6 +55,9 @@ const (
 	ChannelTypeSora           = 55
 	ChannelTypeReplicate      = 56
 	ChannelTypeCodex          = 57
+	ChannelTypeZLHubVideo     = 58
+	ChannelTypeZLHubAsset     = 59
+	ChannelTypeDreamBrand     = 60
 	ChannelTypeDummy          // this one is only for count, do not add any channel after this
 
 )
@@ -118,6 +121,9 @@ var ChannelBaseURLs = []string{
 	"https://api.openai.com",                    //55
 	"https://api.replicate.com",                 //56
 	"https://chatgpt.com",                       //57
+	"https://api.zlhub.cn",                      //58
+	"https://asset.zlhub.cn",                    //59
+	"https://ai.dreambrand.studio",              //60
 }
 
 var ChannelTypeNames = map[int]string{
@@ -175,6 +181,9 @@ var ChannelTypeNames = map[int]string{
 	ChannelTypeSora:           "Sora",
 	ChannelTypeReplicate:      "Replicate",
 	ChannelTypeCodex:          "Codex",
+	ChannelTypeZLHubVideo:     "ZLHubVideo",
+	ChannelTypeZLHubAsset:     "ZLHubAsset",
+	ChannelTypeDreamBrand:     "DreamBrand",
 }
 
 func GetChannelTypeName(channelType int) string {

controller/asset_audit.go

@@ -0,0 +1,212 @@
+package controller
+
+import (
+	"bytes"
+	"crypto/rand"
+	"encoding/hex"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strings"
+	"time"
+
+	"github.com/QuantumNous/new-api/common"
+	"github.com/QuantumNous/new-api/constant"
+	"github.com/QuantumNous/new-api/dto"
+	"github.com/QuantumNous/new-api/logger"
+	"github.com/QuantumNous/new-api/model"
+	relaycommon "github.com/QuantumNous/new-api/relay/common"
+	"github.com/QuantumNous/new-api/relay/helper"
+	"github.com/QuantumNous/new-api/service"
+	"github.com/QuantumNous/new-api/types"
+
+	"github.com/gin-gonic/gin"
+)
+
+const assetAuditTrackIDBytes = 16
+
+func RelayAssetAuditUploadSync(c *gin.Context) {
+	relayAssetAudit(c, http.MethodPost, "/api/asset/upload/sync")
+}
+
+func RelayAssetAuditUploadAsync(c *gin.Context) {
+	relayAssetAudit(c, http.MethodPost, "/api/asset/upload/async")
+}
+
+func RelayAssetAuditTask(c *gin.Context) {
+	taskID := strings.TrimSpace(c.Param("task_id"))
+	if taskID == "" {
+		c.JSON(http.StatusBadRequest, gin.H{
+			"code":    "invalid_request",
+			"message": "task_id is required",
+		})
+		return
+	}
+	relayAssetAudit(c, http.MethodGet, "/api/task/"+url.PathEscape(taskID))
+}
+
+func relayAssetAudit(c *gin.Context, method string, upstreamPath string) {
+	if common.GetContextKeyInt(c, constant.ContextKeyChannelType) != constant.ChannelTypeZLHubAsset {
+		c.JSON(http.StatusBadRequest, gin.H{
+			"code":    "invalid_channel_type",
+			"message": "asset audit requests require a ZLHubAsset channel",
+		})
+		return
+	}
+
+	info := newAssetAuditRelayInfo(c)
+	priceData, err := helper.ModelPriceHelperPerCall(c, info)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{
+			"code":    "model_price_error",
+			"message": err.Error(),
+		})
+		return
+	}
+	info.PriceData = priceData
+
+	if !priceData.FreeModel {
+		if apiErr := service.PreConsumeBilling(c, priceData.Quota, info); apiErr != nil {
+			c.JSON(apiErr.StatusCode, gin.H{"error": apiErr.ToOpenAIError()})
+			return
+		}
+	}
+
+	resp, respBody, err := doAssetAuditRequest(c, method, upstreamPath)
+	if err != nil {
+		if info.Billing != nil {
+			info.Billing.Refund(c)
+		}
+		c.JSON(http.StatusInternalServerError, gin.H{
+			"code":    "do_request_failed",
+			"message": err.Error(),
+		})
+		return
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode >= http.StatusBadRequest {
+		if info.Billing != nil {
+			info.Billing.Refund(c)
+		}
+		service.IOCopyBytesGracefully(c, resp, respBody)
+		return
+	}
+
+	if err := service.SettleBilling(c, info, priceData.Quota); err != nil {
+		logger.LogError(c, fmt.Sprintf("asset audit settle billing failed: %v", err))
+	}
+	recordAssetAuditConsumeLog(c, info, priceData.Quota, upstreamPath)
+
+	service.IOCopyBytesGracefully(c, resp, respBody)
+}
+
+func newAssetAuditRelayInfo(c *gin.Context) *relaycommon.RelayInfo {
+	startTime := common.GetContextKeyTime(c, constant.ContextKeyRequestStartTime)
+	if startTime.IsZero() {
+		startTime = time.Now()
+	}
+	tokenGroup := common.GetContextKeyString(c, constant.ContextKeyTokenGroup)
+	if tokenGroup == "" {
+		tokenGroup = common.GetContextKeyString(c, constant.ContextKeyUserGroup)
+	}
+	info := &relaycommon.RelayInfo{
+		RequestId:       c.GetString(common.RequestIdKey),
+		UserId:          common.GetContextKeyInt(c, constant.ContextKeyUserId),
+		UsingGroup:      common.GetContextKeyString(c, constant.ContextKeyUsingGroup),
+		UserGroup:       common.GetContextKeyString(c, constant.ContextKeyUserGroup),
+		UserQuota:       common.GetContextKeyInt(c, constant.ContextKeyUserQuota),
+		UserEmail:       common.GetContextKeyString(c, constant.ContextKeyUserEmail),
+		TokenId:         common.GetContextKeyInt(c, constant.ContextKeyTokenId),
+		TokenKey:        common.GetContextKeyString(c, constant.ContextKeyTokenKey),
+		TokenUnlimited:  common.GetContextKeyBool(c, constant.ContextKeyTokenUnlimited),
+		TokenGroup:      tokenGroup,
+		OriginModelName: constant.AssetAuditModelName,
+		StartTime:       startTime,
+		RelayFormat:     types.RelayFormatOpenAI,
+	}
+	info.InitChannelMeta(c)
+	return info
+}
+
+func doAssetAuditRequest(c *gin.Context, method string, upstreamPath string) (*http.Response, []byte, error) {
+	var body io.Reader
+	if method != http.MethodGet {
+		storage, err := common.GetBodyStorage(c)
+		if err != nil {
+			return nil, nil, err
+		}
+		bodyBytes, err := storage.Bytes()
+		if err != nil {
+			return nil, nil, err
+		}
+		body = bytes.NewReader(bodyBytes)
+	}
+
+	baseURL := strings.TrimRight(common.GetContextKeyString(c, constant.ContextKeyChannelBaseUrl), "/")
+	if baseURL == "" {
+		baseURL = strings.TrimRight(constant.ChannelBaseURLs[constant.ChannelTypeZLHubAsset], "/")
+	}
+	req, err := http.NewRequestWithContext(c.Request.Context(), method, baseURL+upstreamPath, body)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	trackID, err := newAssetAuditTrackID()
+	if err != nil {
+		return nil, nil, err
+	}
+	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("Accept", "application/json")
+	req.Header.Set("X-Access-Token", common.GetContextKeyString(c, constant.ContextKeyChannelKey))
+	req.Header.Set("X-Track-Id", trackID)
+
+	proxy := ""
+	if setting, ok := common.GetContextKeyType[dto.ChannelSettings](c, constant.ContextKeyChannelSetting); ok {
+		proxy = setting.Proxy
+	}
+	client, err := service.GetHttpClientWithProxy(proxy)
+	if err != nil {
+		return nil, nil, err
+	}
+	resp, err := client.Do(req)
+	if err != nil {
+		if resp != nil && resp.Body != nil {
+			_ = resp.Body.Close()
+		}
+		return nil, nil, err
+	}
+	respBody, err := io.ReadAll(resp.Body)
+	if err != nil {
+		_ = resp.Body.Close()
+		return nil, nil, err
+	}
+	resp.Body = io.NopCloser(bytes.NewReader(respBody))
+	return resp, respBody, nil
+}
+
+func newAssetAuditTrackID() (string, error) {
+	buf := make([]byte, assetAuditTrackIDBytes)
+	if _, err := rand.Read(buf); err != nil {
+		return "", err
+	}
+	return hex.EncodeToString(buf), nil
+}
+
+func recordAssetAuditConsumeLog(c *gin.Context, info *relaycommon.RelayInfo, quota int, upstreamPath string) {
+	model.RecordConsumeLog(c, info.UserId, model.RecordConsumeLogParams{
+		ChannelId:      info.ChannelId,
+		ModelName:      constant.AssetAuditModelName,
+		TokenName:      c.GetString("token_name"),
+		Quota:          quota,
+		Content:        fmt.Sprintf("asset audit request: %s", upstreamPath),
+		TokenId:        info.TokenId,
+		UseTimeSeconds: int(time.Since(info.StartTime).Seconds()),
+		Group:          info.UsingGroup,
+		Other: map[string]interface{}{
+			"asset_audit": true,
+			"path":        upstreamPath,
+		},
+	})
+}

controller/channel-test.go

@@ -83,6 +83,9 @@ func testChannel(channel *model.Channel, testUserID int, testModel string, endpo
 		constant.ChannelTypeKling,
 		constant.ChannelTypeJimeng,
 		constant.ChannelTypeDoubaoVideo,
+		constant.ChannelTypeZLHubVideo,
+		constant.ChannelTypeZLHubAsset,
+		constant.ChannelTypeDreamBrand,
 		constant.ChannelTypeVidu,
 	}
 	if lo.Contains(unsupportedTestChannelTypes, channel.Type) {

controller/misc.go

@@ -70,7 +70,7 @@ func GetStatus(c *gin.Context) {
 		"server_address":              system_setting.ServerAddress,
 		"turnstile_check":             common.TurnstileCheckEnabled,
 		"turnstile_site_key":          common.TurnstileSiteKey,
-		"docs_link":                   operation_setting.GetGeneralSetting().DocsLink,
+		"docs_link":                   operation_setting.NormalizeDocsLink(operation_setting.GetGeneralSetting().DocsLink),
 		"quota_per_unit":              common.QuotaPerUnit,
 		// 兼容旧前端：保留 display_in_currency，同时提供新的 quota_display_type
 		"display_in_currency":           operation_setting.IsCurrencyDisplay(),

controller/model.go

@@ -80,6 +80,12 @@ func init() {
 			OwnedBy: minimax.ChannelName,
 		})
 	}
+	openAIModels = append(openAIModels, dto.OpenAIModels{
+		Id:      constant.AssetAuditModelName,
+		Object:  "model",
+		Created: 1626777600,
+		OwnedBy: "zlhub-asset",
+	})
 	for modelName, _ := range constant.MidjourneyModel2Action {
 		openAIModels = append(openAIModels, dto.OpenAIModels{
 			Id:      modelName,
@@ -105,6 +111,7 @@ func init() {
 		adaptor.Init(meta)
 		channelId2Models[i] = adaptor.GetModelList()
 	}
+	channelId2Models[constant.ChannelTypeZLHubAsset] = []string{constant.AssetAuditModelName}
 	openAIModels = lo.UniqBy(openAIModels, func(m dto.OpenAIModels) string {
 		return m.Id
 	})

controller/payment_webhook_availability.go

@@ -108,3 +108,17 @@ func isEpayWebhookConfigured() bool {
 func isEpayWebhookEnabled() bool {
 	return isEpayTopUpEnabled()
 }
+
+func isAlipayTopUpEnabled() bool {
+	if !isPaymentComplianceConfirmed() {
+		return false
+	}
+	return strings.TrimSpace(setting.AlipayAppId) != "" &&
+		strings.TrimSpace(setting.AlipayGateway) != "" &&
+		strings.TrimSpace(setting.AlipayPrivateKey) != "" &&
+		strings.TrimSpace(setting.AlipayPublicKey) != ""
+}
+
+func isAlipayWebhookEnabled() bool {
+	return isAlipayTopUpEnabled()
+}