From 024c0032ebc09b3322edbe2cf284e4f69178862f Mon Sep 17 00:00:00 2001 From: RockYang Date: Sun, 10 Dec 2023 14:45:22 +0800 Subject: [PATCH] chore: change default params for stable diffusion --- api/res/text2img.json | 20 ++++++++++---------- api/service/sd/service.go | 9 ++++++--- web/src/views/ImageSd.vue | 16 ++++++++-------- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/api/res/text2img.json b/api/res/text2img.json index df8a1299..050daf75 100644 --- a/api/res/text2img.json +++ b/api/res/text2img.json @@ -1,20 +1,20 @@ { "data": [ - "task(m1wpaa4v60zedj8)", - "a cute cat", + "task(s95jqt5jr8yppcp)", + "A beautiful Chinese girl in a garden", "", [], - 20, - "DPM++ 2M Karras", + 30, + "Euler a", 1, 1, 7, 512, - 384, + 512, true, 0.7, 2, - "ESRGAN_4x", + "Latent", 10, 0, 0, @@ -55,13 +55,13 @@ false, false, 0, - false, - [], + [ + ], "", "", "" ], "event_data": null, - "fn_index": 96, - "session_hash": "kmb0ojjfhdj" + "fn_index": 95, + "session_hash": "eqwumnt3rov" } \ No newline at end of file diff --git a/api/service/sd/service.go b/api/service/sd/service.go index a6133a55..3d32cf7a 100644 --- a/api/service/sd/service.go +++ b/api/service/sd/service.go @@ -135,7 +135,6 @@ func (s *Service) runTask(taskInfo TaskInfo, client *req.Client) { "fn_index": taskInfo.FnIndex, "session_hash": taskInfo.SessionHash, } - logger.Debug(utils.JsonEncode(body)) var result = make(chan CBReq) go func() { var res struct { @@ -231,7 +230,6 @@ func (s *Service) runTask(taskInfo TaskInfo, client *req.Client) { cbReq.ImageData = progressRes.LivePreview cbReq.Progress = int(progressRes.Progress * 100) - logger.Debug(cbReq) s.callback(cbReq) time.Sleep(time.Second) } @@ -287,8 +285,13 @@ func (s *Service) callback(data CBReq) { if data.Progress < 100 && data.ImageData != "" { jobVo.ImgURL = data.ImageData } + + logger.Infof("绘图进度:%d", data.Progress) + // 扣减绘图次数 - s.db.Model(&model.User{}).Where("id = ?", jobVo.UserId).UpdateColumn("img_calls", gorm.Expr("img_calls - ?", 1)) + if data.Progress == 100 { + s.db.Model(&model.User{}).Where("id = ? AND img_calls > 0", jobVo.UserId).UpdateColumn("img_calls", gorm.Expr("img_calls - ?", 1)) + } // 推送任务到前端 if client != nil { utils.ReplyChunkMessage(client, jobVo) diff --git a/web/src/views/ImageSd.vue b/web/src/views/ImageSd.vue index e33f0a4a..ebd1f35f 100644 --- a/web/src/views/ImageSd.vue +++ b/web/src/views/ImageSd.vue @@ -500,21 +500,21 @@ window.onresize = () => { } const samplers = ["Euler a", "Euler", "DPM2 a Karras", "DPM++ 2S a Karras", "DPM++ 2M Karras", "DPM++ SDE Karras", "DPM2", "DPM2 a", "DPM++ 2S a", "DPM++ 2M", "DPM++ SDE", "DPM fast", "DPM adaptive", "LMS Karras", "DPM2 Karras", "DDIM", "PLMS", "UniPC", "LMS", "Heun",] -const scaleAlg = ["ESRGAN_4x", "R-ESRGAN 4x+", "SwinIR_4x", "LDSR"] +const scaleAlg = ["Latent", "ESRGAN_4x", "R-ESRGAN 4x+", "SwinIR_4x", "LDSR"] const params = ref({ - width: 1024, - height: 1024, + width: 512, + height: 512, sampler: samplers[0], seed: -1, - steps: 20, + steps: 30, cfg_scale: 7, face_fix: false, - hd_fix: false, - hd_redraw_rate: 0.3, + hd_fix: true, + hd_redraw_rate: 0.7, hd_scale: 2, hd_scale_alg: scaleAlg[0], - hd_steps: 0, - prompt: "A beautiful Chinese girl riding on a tiger", + hd_steps: 10, + prompt: "A beautiful Chinese girl in a garden", negative_prompt: "nsfw, paintings, cartoon, anime, sketches, low quality,easynegative,ng_deepnegative _v1 75t,(worst quality:2),(low quality:2),(normalquality:2),lowres,bad anatomy,bad hands,normal quality,((monochrome)),((grayscale)),((watermark))", })