对即梦2.0完美支持

.gitignore

@@ -35,3 +35,9 @@ data/
 .test
 token_estimator_test.go
 skills-lock.json
+...
+ - 副本.env
+
+.superpowers/
+finance-reconciliation.html
+cmd/test_seedance_official_auth/main.go

0cmd/test_seedance_official_auth/main.go

@@ -0,0 +1,179 @@
+// 本地直连测试 BytePlus/火山官方素材 CreateAssetGroup 鉴权。
+//
+// 用法（PowerShell）:
+//   $env:SEEDANCE_AK="你的AccessKeyID"
+//   $env:SEEDANCE_SK="你的SecretAccessKey"
+//   $env:SEEDANCE_PLATFORM="overseas"   # 或 cn
+//   $env:SEEDANCE_PROXY="http://user:pass@host:port"  # 可选
+//   go run ./cmd/test_seedance_official_auth
+//
+// 请勿把 AK/SK 写进代码或发到聊天里。
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"os"
+	"strings"
+	"time"
+
+	"github.com/QuantumNous/new-api/common"
+	"github.com/QuantumNous/new-api/pkg/volc/sign"
+	"golang.org/x/net/proxy"
+)
+
+func main() {
+	ak := strings.TrimSpace(os.Getenv("SEEDANCE_AK"))
+	sk := strings.TrimSpace(os.Getenv("SEEDANCE_SK"))
+	platform := strings.ToLower(strings.TrimSpace(os.Getenv("SEEDANCE_PLATFORM")))
+	proxyURL := strings.TrimSpace(os.Getenv("SEEDANCE_PROXY"))
+	if ak == "" || sk == "" {
+		fmt.Println("请设置环境变量 SEEDANCE_AK / SEEDANCE_SK 后重试（不要把密钥写进代码）")
+		os.Exit(2)
+	}
+
+	host := "ark.cn-beijing.volcengineapi.com"
+	region := "cn-beijing"
+	if platform == "overseas" || platform == "byteplus" {
+		host = "ark.ap-southeast-1.byteplusapi.com"
+		region = "ap-southeast-1"
+	}
+	if r := strings.TrimSpace(os.Getenv("SEEDANCE_REGION")); r != "" {
+		region = r
+	}
+
+	project := strings.TrimSpace(os.Getenv("SEEDANCE_PROJECT"))
+	if project == "" {
+		project = "default"
+	}
+	action := strings.TrimSpace(os.Getenv("SEEDANCE_ACTION"))
+	if action == "" {
+		action = "CreateAssetGroup"
+	}
+	var bodyObj map[string]any
+	switch action {
+	case "GetAsset":
+		assetID := strings.TrimSpace(os.Getenv("SEEDANCE_ASSET_ID"))
+		if assetID == "" {
+			fmt.Println("GetAsset 需要环境变量 SEEDANCE_ASSET_ID")
+			os.Exit(2)
+		}
+		bodyObj = map[string]any{
+			"Id":          assetID,
+			"ProjectName": project,
+		}
+	default:
+		bodyObj = map[string]any{
+			"Name":        "debug-aigc",
+			"GroupType":   "AIGC",
+			"ProjectName": project,
+		}
+		action = "CreateAssetGroup"
+	}
+	body, err := common.Marshal(bodyObj)
+	if err != nil {
+		fatal(err)
+	}
+	q := url.Values{}
+	q.Set("Action", action)
+	q.Set("Version", "2024-01-01")
+	fullURL := fmt.Sprintf("https://%s/?%s", host, q.Encode())
+
+	req, err := http.NewRequest(http.MethodPost, fullURL, bytes.NewReader(body))
+	if err != nil {
+		fatal(err)
+	}
+	req.Header.Set("Content-Type", "application/json")
+	req.Host = host
+
+	if err = sign.SignRequest(req, sign.Credentials{
+		AccessKeyID:     ak,
+		SecretAccessKey: sk,
+		Region:          region,
+		Service:         "ark",
+	}, body, time.Now().UTC()); err != nil {
+		fatal(err)
+	}
+
+	client, err := buildClient(proxyURL)
+	if err != nil {
+		fatal(err)
+	}
+
+	fmt.Printf("POST %s\n", fullURL)
+	fmt.Printf("platform=%s region=%s host=%s proxy=%v ak_prefix=%s...\n",
+		platform, region, host, proxyURL != "", trimPrefix(ak, 8))
+
+	resp, err := client.Do(req)
+	if err != nil {
+		fatal(err)
+	}
+	defer resp.Body.Close()
+	raw, _ := io.ReadAll(resp.Body)
+	fmt.Printf("HTTP %d\n%s\n", resp.StatusCode, string(raw))
+
+	var parsed map[string]any
+	_ = common.Unmarshal(raw, &parsed)
+	if meta, ok := parsed["ResponseMetadata"].(map[string]any); ok {
+		if errObj, ok := meta["Error"].(map[string]any); ok {
+			fmt.Printf("\n解析错误: Code=%v Message=%v\n", errObj["Code"], errObj["Message"])
+			os.Exit(1)
+		}
+	}
+	if resp.StatusCode >= 400 {
+		os.Exit(1)
+	}
+	fmt.Println("\n鉴权看起来通过了（未返回 Error）")
+}
+
+func buildClient(proxyURL string) (*http.Client, error) {
+	if proxyURL == "" {
+		return &http.Client{Timeout: 30 * time.Second}, nil
+	}
+	u, err := url.Parse(proxyURL)
+	if err != nil {
+		return nil, err
+	}
+	switch strings.ToLower(u.Scheme) {
+	case "http", "https":
+		return &http.Client{
+			Timeout: 30 * time.Second,
+			Transport: &http.Transport{
+				Proxy: http.ProxyURL(u),
+			},
+		}, nil
+	case "socks5", "socks5h":
+		var auth *proxy.Auth
+		if u.User != nil {
+			pass, _ := u.User.Password()
+			auth = &proxy.Auth{User: u.User.Username(), Password: pass}
+		}
+		dialer, err := proxy.SOCKS5("tcp", u.Host, auth, proxy.Direct)
+		if err != nil {
+			return nil, err
+		}
+		return &http.Client{
+			Timeout: 30 * time.Second,
+			Transport: &http.Transport{
+				Dial: dialer.Dial,
+			},
+		}, nil
+	default:
+		return nil, fmt.Errorf("unsupported proxy scheme: %s", u.Scheme)
+	}
+}
+
+func trimPrefix(s string, n int) string {
+	if len(s) <= n {
+		return s
+	}
+	return s[:n]
+}
+
+func fatal(err error) {
+	fmt.Println("ERROR:", err)
+	os.Exit(1)
+}

common/endpoint_type.go

@@ -28,7 +28,7 @@ func GetEndpointTypesByChannelType(channelType int, modelName string) []constant
 		endpointTypes = []constant.EndpointType{constant.EndpointTypeOpenAI}
 	case constant.ChannelTypeXai:
 		endpointTypes = []constant.EndpointType{constant.EndpointTypeOpenAI, constant.EndpointTypeOpenAIResponse}
-	case constant.ChannelTypeSora:
+	case constant.ChannelTypeSora, constant.ChannelTypeMegabyai, constant.ChannelTypeSora2U, constant.ChannelTypeZiZiDongHua:
 		endpointTypes = []constant.EndpointType{constant.EndpointTypeOpenAIVideo}
 	default:
 		if IsOpenAIResponseOnlyModel(modelName) {

common/gin.go

@@ -334,6 +334,32 @@ func parseMultipartFormData(c *gin.Context, data []byte, v any) error {
 		}
 	}
 
+	// Support sending text fields (especially long "prompt") as file parts using curl -F "prompt=@file.txt"
+	// This is very common for video generation with large prompts.
+	// We read the file content as the string value for these fields.
+	textFieldsAsFiles := map[string]bool{
+		"prompt": true, "model": true, "mode": true, "size": true,
+		"seconds": true, "duration": true, "aspect_ratio": true,
+		"resolution": true, "image": true,
+	}
+	for key, fhs := range form.File {
+		if !textFieldsAsFiles[key] || len(fhs) == 0 {
+			continue
+		}
+		if existing, ok := formMap[key]; ok {
+			if s, _ := existing.(string); strings.TrimSpace(s) != "" {
+				continue // already have a text value
+			}
+		}
+		fh := fhs[0]
+		if f, err := fh.Open(); err == nil {
+			if content, err := io.ReadAll(f); err == nil && len(content) > 0 {
+				formMap[key] = string(content)
+			}
+			f.Close()
+		}
+	}
+
 	return processFormMap(formMap, v)
 }
 

common/init.go

@@ -147,7 +147,7 @@ func initConstantEnv() {
 	// GenerateDefaultToken 是否生成初始令牌，默认关闭。
 	constant.GenerateDefaultToken = GetEnvOrDefaultBool("GENERATE_DEFAULT_TOKEN", false)
 	// 是否启用错误日志
-	constant.ErrorLogEnabled = GetEnvOrDefaultBool("ERROR_LOG_ENABLED", false)
+	constant.ErrorLogEnabled = GetEnvOrDefaultBool("ERROR_LOG_ENABLED", true)
 	// 任务轮询时查询的最大数量
 	constant.TaskQueryLimit = GetEnvOrDefault("TASK_QUERY_LIMIT", 1000)
 	// 异步任务超时时间（分钟），超过此时间未完成的任务将被标记为失败并退款。0 表示禁用。

common/model.go

@@ -16,6 +16,7 @@ var (
 		"prefix:imagen-",
 		"flux-",
 		"flux.1-",
+		"agnes-image",
 	}
 	OpenAITextModels = []string{
 		"gpt-",

constant/channel.go

@@ -55,6 +55,19 @@ const (
 	ChannelTypeSora           = 55
 	ChannelTypeReplicate      = 56
 	ChannelTypeCodex          = 57
+	ChannelTypeApiWenhao      = 58
+	ChannelTypeApimart        = 59
+	ChannelTypeAgnes          = 60
+	ChannelTypeVyroSeedance   = 61
+	ChannelType83zi           = 62
+	ChannelType7tai           = 63
+	ChannelTypeTh12345ai      = 64
+	ChannelTypeMegabyai       = 65
+	ChannelTypeSora2U         = 66
+	ChannelTypeZiZiDongHua    = 67
+	ChannelTypeMao            = 68
+	ChannelTypeYkVideo        = 69
+	ChannelTypeYkSd           = 70
 	ChannelTypeDummy          // this one is only for count, do not add any channel after this
 
 )
@@ -118,6 +131,19 @@ var ChannelBaseURLs = []string{
 	"https://api.openai.com",                    //55
 	"https://api.replicate.com",                 //56
 	"https://chatgpt.com",                       //57
+	"https://saast.fuwenhao.com",                //58 ApiWenhao
+	"https://api.apimart.ai",                    //59 ApiMart (CN: https://api.apib.ai)
+	"https://apihub.agnes-ai.com",               //60 Agnes
+	"https://996k.cn/v1",                        //61 VyroSeedance (996k vyro-seedance-2)
+	"https://sd2.83zi.com",                      //62 83zi SD2 video
+	"https://api.7tai.cc/v1",                    //63 7tai (炳火) video
+	"https://sd.12345ai.net",                    //64 th12345ai (TH API) video
+	"https://newapi.megabyai.cc",                //65 megabyai video
+	"https://sora2u.com",                        //66 sora2u Seedance video
+	"https://www.zizidonghua.com",               //67 zz (ZiZiDongHua) MiniMax-H3 video
+	"https://api.catertx.com",                   //68 mao (catertx Seedance)
+	"https://zcbservice.aizfw.cn/kyyReactApiServer", //69 yk-video (KYY model-center)
+	"https://zcbservice.aizfw.cn/kyyReactApiServer", //70 yk-sd (KYY Seedance special/discount)
 }
 
 var ChannelTypeNames = map[int]string{
@@ -175,6 +201,19 @@ var ChannelTypeNames = map[int]string{
 	ChannelTypeSora:           "Sora",
 	ChannelTypeReplicate:      "Replicate",
 	ChannelTypeCodex:          "Codex",
+	ChannelTypeApiWenhao:      "ApiWenhao",
+	ChannelTypeApimart:        "ApiMart",
+	ChannelTypeAgnes:          "Agnes",
+	ChannelTypeVyroSeedance:  "VyroSeedance",
+	ChannelType83zi:          "83zi",
+	ChannelType7tai:          "7tai",
+	ChannelTypeTh12345ai:     "th12345ai",
+	ChannelTypeMegabyai:      "megabyai",
+	ChannelTypeSora2U:        "sora2u",
+	ChannelTypeZiZiDongHua:   "zz",
+	ChannelTypeMao:           "mao",
+	ChannelTypeYkVideo:       "yk-video",
+	ChannelTypeYkSd:          "yk-sd",
 }
 
 func GetChannelTypeName(channelType int) string {
@@ -184,11 +223,24 @@ func GetChannelTypeName(channelType int) string {
 	return "Unknown"
 }
 
+// GetChannelDefaultBaseURL returns the built-in default base URL for a channel type.
+// It is safe when channelType is out of range (returns "").
+func GetChannelDefaultBaseURL(channelType int) string {
+	if channelType < 0 || channelType >= len(ChannelBaseURLs) {
+		return ""
+	}
+	return ChannelBaseURLs[channelType]
+}
+
 type ChannelSpecialBase struct {
 	ClaudeBaseURL string
 	OpenAIBaseURL string
 }
 
+// VolcEngineOpenSpeechTTSV3BaseURL 为火山豆包 OpenSpeech「语音合成 HTTP V3（单向 NDJSON）」渠道占位 Base URL。
+// 在「字节火山」类渠道中将 API 地址填为此值（或填完整 unidirectional URL）时，/v1/audio/speech 将走 V3 协议（X-Api-App-Id / Access-Key / Resource-Id），密钥格式仍为 appid|access_token。
+const VolcEngineOpenSpeechTTSV3BaseURL = "openspeech-tts-v3"
+
 var ChannelSpecialBases = map[string]ChannelSpecialBase{
 	"glm-coding-plan": {
 		ClaudeBaseURL: "https://open.bigmodel.cn/api/anthropic",

constant/channel_base_url_test.go

@@ -0,0 +1,36 @@
+package constant
+
+import "testing"
+
+func TestGetChannelDefaultBaseURL(t *testing.T) {
+	if got := GetChannelDefaultBaseURL(ChannelTypeAgnes); got != "https://apihub.agnes-ai.com" {
+		t.Fatalf("Agnes default base URL = %q", got)
+	}
+	if got := GetChannelDefaultBaseURL(ChannelTypeTh12345ai); got != "https://sd.12345ai.net" {
+		t.Fatalf("th12345ai default base URL = %q", got)
+	}
+	if got := GetChannelDefaultBaseURL(ChannelTypeMegabyai); got != "https://newapi.megabyai.cc" {
+		t.Fatalf("megabyai default base URL = %q", got)
+	}
+	if got := GetChannelDefaultBaseURL(ChannelTypeSora2U); got != "https://sora2u.com" {
+		t.Fatalf("sora2u default base URL = %q", got)
+	}
+	if got := GetChannelDefaultBaseURL(ChannelTypeZiZiDongHua); got != "https://www.zizidonghua.com" {
+		t.Fatalf("zz default base URL = %q", got)
+	}
+	if got := GetChannelDefaultBaseURL(ChannelTypeMao); got != "https://api.catertx.com" {
+		t.Fatalf("mao base url = %q", got)
+	}
+	if got := GetChannelDefaultBaseURL(ChannelTypeYkVideo); got != "https://zcbservice.aizfw.cn/kyyReactApiServer" {
+		t.Fatalf("yk-video base url = %q", got)
+	}
+	if got := GetChannelDefaultBaseURL(ChannelTypeYkSd); got != "https://zcbservice.aizfw.cn/kyyReactApiServer" {
+		t.Fatalf("yk-sd base url = %q", got)
+	}
+	if got := GetChannelDefaultBaseURL(len(ChannelBaseURLs)); got != "" {
+		t.Fatalf("out of range should return empty, got %q", got)
+	}
+	if got := GetChannelDefaultBaseURL(-1); got != "" {
+		t.Fatalf("negative type should return empty, got %q", got)
+	}
+}

constant/error_log.go

@@ -0,0 +1,11 @@
+package constant
+
+const (
+	ErrorCategoryAuth       = "auth"
+	ErrorCategoryRateLimit  = "rate_limit"
+	ErrorCategoryChannel    = "channel"
+	ErrorCategoryValidation = "validation"
+	ErrorCategoryQuota      = "quota"
+	ErrorCategoryUpstream   = "upstream"
+	ErrorCategoryOther      = "other"
+)

controller/channel-billing.go

@@ -357,7 +357,7 @@ func updateChannelMoonshotBalance(channel *model.Channel) (float64, error) {
 }
 
 func updateChannelBalance(channel *model.Channel) (float64, error) {
-	baseURL := constant.ChannelBaseURLs[channel.Type]
+	baseURL := constant.GetChannelDefaultBaseURL(channel.Type)
 	if channel.GetBaseURL() == "" {
 		channel.BaseURL = &baseURL
 	}