xinyin025/geekai
1
0
Fork 0
mirror of https://github.com/yangjian102621/geekai.git synced 2025-09-19 09:46:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: fixed for img_call repeated reductions

Browse Source
This commit is contained in:
RockYang 2024-01-01 18:54:48 +08:00
parent 25bba912f6
commit 5dc0fe05af
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/service/sd/service.go
View File

@ -136,6 +136,7 @@ func (s *Service) Txt2Img(task types.SdTask) error {
taskInfo.TaskId = params.TaskId taskInfo.TaskId = params.TaskId
taskInfo.Data = data taskInfo.Data = data
taskInfo.JobId = task.Id taskInfo.JobId = task.Id
taskInfo.UserId = uint(task.UserId)
go func() { go func() {
s.runTask(taskInfo, s.httpClient) s.runTask(taskInfo, s.httpClient)
}() }()
@ -158,7 +159,7 @@ func (s *Service) runTask(taskInfo TaskInfo, client *req.Client) {
Duration float64 `json:"duration"` Duration float64 `json:"duration"`
AverageDuration float64 `json:"average_duration"` AverageDuration float64 `json:"average_duration"`
} }
var cbReq = CBReq{TaskId: taskInfo.TaskId, JobId: taskInfo.JobId, SessionId: taskInfo.SessionId} var cbReq = CBReq{UserId: taskInfo.UserId, TaskId: taskInfo.TaskId, JobId: taskInfo.JobId, SessionId: taskInfo.SessionId}
response, err := client.R().SetBody(body).SetSuccessResult(&res).Post(s.config.ApiURL + "/run/predict") response, err := client.R().SetBody(body).SetSuccessResult(&res).Post(s.config.ApiURL + "/run/predict")
if err != nil { if err != nil {
cbReq.Message = "error with send request: " + err.Error() cbReq.Message = "error with send request: " + err.Error()
@ -231,7 +232,7 @@ func (s *Service) runTask(taskInfo TaskInfo, client *req.Client) {
TextInfo interface{} `json:"textinfo"` TextInfo interface{} `json:"textinfo"`
} }
response, err := client.R().SetBody(progressReq).SetSuccessResult(&progressRes).Post(s.config.ApiURL + "/internal/progress") response, err := client.R().SetBody(progressReq).SetSuccessResult(&progressRes).Post(s.config.ApiURL + "/internal/progress")
var cbReq = CBReq{TaskId: taskInfo.TaskId, Success: true, JobId: taskInfo.JobId, SessionId: taskInfo.SessionId} var cbReq = CBReq{UserId: taskInfo.UserId, TaskId: taskInfo.TaskId, Success: true, JobId: taskInfo.JobId, SessionId: taskInfo.SessionId}
if err != nil { // TODO: 这里可以考虑设置失败重试次数 if err != nil { // TODO: 这里可以考虑设置失败重试次数
logger.Error(err) logger.Error(err)
return return
@ -292,15 +293,11 @@ func (s *Service) callback(data CBReq) {
} }
logger.Debugf("绘图进度：%d", data.Progress) logger.Debugf("绘图进度：%d", data.Progress)
// 扣减绘图次数
if data.Progress == 100 {
s.db.Model(&model.User{}).Where("id = ? AND img_calls > 0", job.UserId).UpdateColumn("img_calls", gorm.Expr("img_calls - ?", 1))
}
} else { // 任务失败 } else { // 任务失败
logger.Error("任务执行失败：", data.Message) logger.Error("任务执行失败：", data.Message)
// update the task progress // update the task progress
s.db.Model(&model.SdJob{Id: uint(data.JobId)}).UpdateColumn("progress", -1) s.db.Model(&model.SdJob{Id: uint(data.JobId)}).UpdateColumn("progress", -1)
// restore img_calls
s.db.Model(&model.User{}).Where("id = ? AND img_calls > 0", data.UserId).UpdateColumn("img_calls", gorm.Expr("img_calls + ?", 1))
} }
} }

2
api/service/sd/types.go
View File

@ -5,6 +5,7 @@ import logger2 "chatplus/logger"
var logger = logger2.GetLogger() var logger = logger2.GetLogger()
type TaskInfo struct { type TaskInfo struct {
UserId uint `json:"user_id"`
SessionId string `json:"session_id"` SessionId string `json:"session_id"`
JobId int `json:"job_id"` JobId int `json:"job_id"`
TaskId string `json:"task_id"` TaskId string `json:"task_id"`
@ -15,6 +16,7 @@ type TaskInfo struct {
} }
type CBReq struct { type CBReq struct {
UserId uint
SessionId string SessionId string
JobId int JobId int
TaskId string TaskId string