增加2.5模型调用
This commit is contained in:
1 parent
3f29ba716a
commit
be655b6569
32 files changed
+1075
-56
No files matched your search
@@ -20,6 +20,7 @@ var (
|
||||
|
||||
type Settings struct {
|
||||
Engine string `json:"engine,omitempty"`
|
||||
Model string `json:"model,omitempty"`
|
||||
Width int `json:"width,omitempty"`
|
||||
Height int `json:"height,omitempty"`
|
||||
ForceSingle *bool `json:"forceSingle,omitempty"`
|
||||
@@ -231,6 +232,10 @@ func normalizeSettings(value Settings) Settings {
|
||||
if value.Engine != "jimeng" && value.Engine != "evolink" && value.Engine != "bailian" && value.Engine != "seedream" {
|
||||
value.Engine = ""
|
||||
}
|
||||
value.Model = strings.TrimSpace(value.Model)
|
||||
if value.Engine != "evolink" || len(value.Model) > 120 {
|
||||
value.Model = ""
|
||||
}
|
||||
if value.Width < 1 || value.Height < 1 {
|
||||
value.Width, value.Height = 0, 0
|
||||
} else {
|
||||
|
||||
@@ -86,6 +86,25 @@ func TestServiceNormalizesAndScopesTemplates(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestTemplateSettingsPreserveEvoLinkModelAndLegacyEmptyModel(t *testing.T) {
|
||||
service := NewService(&memoryCatalog{}, nil, func() string { return "tmpl_model" })
|
||||
created, err := service.Create(context.Background(), "owner", CreateCommand{
|
||||
Name: "Flare", Prompt: "draw", Settings: Settings{Engine: "evolink", Model: " gpt-image-2.5-flare ", Quality: "medium"},
|
||||
})
|
||||
if err != nil || created.Settings.Model != "gpt-image-2.5-flare" {
|
||||
t.Fatalf("created=%#v err=%v", created, err)
|
||||
}
|
||||
legacy, err := service.Create(context.Background(), "owner", CreateCommand{
|
||||
Name: "Legacy", Prompt: "draw", Settings: Settings{Engine: "evolink"},
|
||||
})
|
||||
if err != nil || legacy.Settings.Model != "" {
|
||||
t.Fatalf("legacy=%#v err=%v", legacy, err)
|
||||
}
|
||||
if got := normalizeSettings(Settings{Engine: "jimeng", Model: "gpt-image-2.5-flare"}); got.Model != "" {
|
||||
t.Fatalf("cross-engine model=%#v", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestServiceUpdateDeleteAndNotFound(t *testing.T) {
|
||||
now := time.Now().UTC()
|
||||
catalog := &memoryCatalog{items: []Template{{ID: "t1", OwnerID: "owner", Name: "old", Prompt: "p", Settings: Settings{}, CreatedAt: now, UpdatedAt: now}}}
|
||||
|
||||
Reference in new issue
Block a user