From e221b1eed4ad189b003a191e6db44342eb53f16f Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Wed, 8 Nov 2023 14:54:10 +0800
Subject: [PATCH] feat: update stable diffusion api version

---
 api/res/text2img.json     | 65 ++++++++++-----------------------------
 api/service/sd/service.go |  7 +++--
 api/service/sd/types.go   | 20 ++++++------
 api/utils/common.go       |  4 +--
 4 files changed, 34 insertions(+), 62 deletions(-)

diff --git a/api/res/text2img.json b/api/res/text2img.json
index 4adecfa9..df8a1299 100644
--- a/api/res/text2img.json
+++ b/api/res/text2img.json
@@ -1,37 +1,38 @@
 {
   "data": [
-    "task(38194gitxp745ha)",
-    "A beautiful Chinese girl riding on a tiger",
+    "task(m1wpaa4v60zedj8)",
+    "a cute cat",
     "",
     [],
     20,
-    "Euler a",
-    false,
-    false,
+    "DPM++ 2M Karras",
     1,
     1,
     7,
-    -1,
-    -1,
-    0,
-    0,
-    0,
-    false,
-    512,
     512,
+    384,
     true,
     0.7,
     2,
     "ESRGAN_4x",
+    10,
     0,
     0,
-    0,
+    "Use same checkpoint",
     "Use same sampler",
     "",
     "",
     [],
     "None",
-    null,
+    false,
+    "",
+    0.8,
+    -1,
+    false,
+    -1,
+    0,
+    0,
+    0,
     false,
     false,
     "positive",
@@ -54,45 +55,13 @@
     false,
     false,
     0,
-    "Not set",
-    true,
-    true,
-    "",
-    "",
-    "",
-    "",
-    "",
-    1.3,
-    "Not set",
-    "Not set",
-    1.3,
-    "Not set",
-    1.3,
-    "Not set",
-    1.3,
-    1.3,
-    "Not set",
-    1.3,
-    "Not set",
-    1.3,
-    "Not set",
-    1.3,
-    "Not set",
-    1.3,
-    "Not set",
-    1.3,
-    "Not set",
     false,
-    "None",
-    null,
-    false,
-    50,
     [],
     "",
     "",
     ""
   ],
   "event_data": null,
-  "fn_index": 232,
-  "session_hash": "3xedmn4nuzq"
+  "fn_index": 96,
+  "session_hash": "kmb0ojjfhdj"
 }
\ No newline at end of file
diff --git a/api/service/sd/service.go b/api/service/sd/service.go
index def9940a..e1f88920 100644
--- a/api/service/sd/service.go
+++ b/api/service/sd/service.go
@@ -105,7 +105,8 @@ func (s *Service) Txt2Img(task types.SdTask) error {
 	data[ParamKeys["negative_prompt"]] = params.NegativePrompt
 	data[ParamKeys["steps"]] = params.Steps
 	data[ParamKeys["sampler"]] = params.Sampler
-	data[ParamKeys["face_fix"]] = params.FaceFix
+	// @fix bug: 有些 stable diffusion 没有面部修复功能
+	//data[ParamKeys["face_fix"]] = params.FaceFix
 	data[ParamKeys["cfg_scale"]] = params.CfgScale
 	data[ParamKeys["seed"]] = params.Seed
 	data[ParamKeys["height"]] = params.Height
@@ -176,7 +177,8 @@ func (s *Service) runTask(taskInfo TaskInfo, client *req.Client) {
 		var info map[string]any
 		err = utils.JsonDecode(utils.InterfaceToString(res.Data[1]), &info)
 		if err != nil {
-			cbReq.Message = err.Error()
+			logger.Error(res.Data)
+			cbReq.Message = "error with decode image url:" + err.Error()
 			cbReq.Success = false
 			result <- cbReq
 			return
@@ -229,6 +231,7 @@ 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)
 		}
diff --git a/api/service/sd/types.go b/api/service/sd/types.go
index 04901a5a..5dfb02ae 100644
--- a/api/service/sd/types.go
+++ b/api/service/sd/types.go
@@ -32,14 +32,14 @@ var ParamKeys = map[string]int{
 	"negative_prompt": 2,
 	"steps":           4,
 	"sampler":         5,
-	"face_fix":        6,
-	"cfg_scale":       10,
-	"seed":            11,
-	"height":          17,
-	"width":           18,
-	"hd_fix":          19,
-	"hd_redraw_rate":  20, //高清修复重绘幅度
-	"hd_scale":        21, // 高清修复放大倍数
-	"hd_scale_alg":    22, // 高清修复放大算法
-	"hd_sample_num":   23, // 高清修复采样次数
+	"face_fix":        6, // 面部修复
+	"cfg_scale":       8,
+	"seed":            27,
+	"height":          9,
+	"width":           10,
+	"hd_fix":          11,
+	"hd_redraw_rate":  12, //高清修复重绘幅度
+	"hd_scale":        13, // 高清修复放大倍数
+	"hd_scale_alg":    14, // 高清修复放大算法
+	"hd_sample_num":   15, // 高清修复采样次数
 }
diff --git a/api/utils/common.go b/api/utils/common.go
index 748dbc8c..a319f0bb 100644
--- a/api/utils/common.go
+++ b/api/utils/common.go
@@ -148,11 +148,11 @@ func IntValue(str string, defaultValue int) int {
 }
 
 func ForceCovert(src any, dst interface{}) error {
-	bytes, err := json.Marshal(src)
+	b, err := json.Marshal(src)
 	if err != nil {
 		return err
 	}
-	err = json.Unmarshal(bytes, dst)
+	err = json.Unmarshal(b, dst)
 	if err != nil {
 		return err
 	}