diff --git a/models/Image.go b/models/Image.go index e4030af..3b4745d 100644 --- a/models/Image.go +++ b/models/Image.go @@ -29,7 +29,7 @@ type Image struct { NegativePrompt string `json:"negative_prompt"` // 负向提示 NumInferenceSteps int `json:"num_inference_steps"` // 推理步数(minimum: 1; maximum: 500) CfgScale int `json:"cfg_scale"` // 引导比例(minimum: 1; maximum: 20) - Scheduler string `json:"scheduler"` // 调度器(DDIM|K_EULER|DPMSolverMultistep|K_EULER_ANCESTRAL|PNDM|KLMS) + SamplerName string `json:"sampler_name"` // 采样器名称 Seed int `json:"seed"` // 随机种子(minimum: 0; maximum: 2147483647) FromImage int `json:"from_image"` // 来源图片(如果是从图片生成的, 则记录来源图片的ID) Task string `json:"task"` // 任务编号(uuid) diff --git a/models/Model.go b/models/Model.go index 01c678a..a6da634 100644 --- a/models/Model.go +++ b/models/Model.go @@ -106,7 +106,7 @@ func (model *Model) Inference(image_list []Image, callback func(Image)) { //SubseedStrength int `json:"subseed_strength"` //SeedResizeFromH int `json:"seed_resize_from_h"` //SeedResizeFromW int `json:"seed_resize_from_w"` - //SamplerName string `json:"sampler_name"` + SamplerName string `json:"sampler_name"` //BatchSize int `json:"batch_size"` NIter int `json:"n_iter"` Steps int `json:"steps"` @@ -152,7 +152,7 @@ func (model *Model) Inference(image_list []Image, callback func(Image)) { //SubseedStrength: 0, //SeedResizeFromH: -1, //SeedResizeFromW: -1, - //SamplerName: "beamsearch", + SamplerName: image_list[0].SamplerName, // 采样器名称 //BatchSize: 1, NIter: len(image_list), // 1~100 Steps: 50, // 1~150 diff --git a/routers/images.go b/routers/images.go index 64539c7..6164416 100644 --- a/routers/images.go +++ b/routers/images.go @@ -106,9 +106,9 @@ func ImagesPost(w http.ResponseWriter, r *http.Request) { FromImage int `json:"from_image"` // 来源图片(图生图时使用) Prompt string `json:"prompt"` // 提示词 NegativePrompt string `json:"negative_prompt"` // 负面提示词 - Steps int `json:"steps"` // 推理步数 - CfgScale int `json:"cfg_scale"` // 引导比例 - Scheduler string `json:"scheduler"` // 调度器 + Steps int `json:"steps"` // 迭代步数 + CfgScale int `json:"cfg_scale"` // 提示词引导系数 (CFG Scale) + SamplerName string `json:"sampler_name"` // 采样器名称(Sampler Name) Seed int `json:"seed"` // 随机种子(单张图生成时使用) NIter int `json:"n_iter"` // 生成数量 ModelID int `json:"model_id"` // 模型ID @@ -137,8 +137,8 @@ func ImagesPost(w http.ResponseWriter, r *http.Request) { if template.CfgScale > 20 { template.CfgScale = 20 } - if template.Scheduler == "" { - template.Scheduler = "DDIM" + if template.SamplerName == "" { + template.SamplerName = "DDIM" } if template.ModelID <= 0 { w.WriteHeader(http.StatusBadRequest) @@ -167,7 +167,7 @@ func ImagesPost(w http.ResponseWriter, r *http.Request) { image.NegativePrompt = template.NegativePrompt image.NumInferenceSteps = template.Steps image.CfgScale = template.CfgScale - image.Scheduler = template.Scheduler + image.SamplerName = template.SamplerName image.Seed = template.Seed image_list = append(image_list, image) }