chore: commit workspace updates
This commit is contained in:
1 parent
01a2d171f5
commit
9727656b2b
491 files changed
+12826
-72249
No files matched your search
@@ -78,22 +78,6 @@ func (s *Service) requestProviderCancellation(ctx context.Context, task *model.T
|
||||
if err != nil {
|
||||
return s.markProviderCancellationUncertain(task, "读取上游取消配置失败,费用待核对:"+err.Error())
|
||||
}
|
||||
if isComfyBridgeInterface(input.Config.InterfaceType) {
|
||||
// 尚未领取的请求可以确定取消并退款;已经在本机执行的工作流只能丢弃迟到结果并转人工核对。
|
||||
request, requestErr := s.repo.ComfyBridgeRequest(task.ProviderRequestID)
|
||||
s.CancelComfyBridgeRequest(task.ProviderRequestID)
|
||||
if requestErr == nil && request.Status == "queued" {
|
||||
if err := s.taskBilling().RefundBilling(task.BillingOrderID, "本地 ComfyUI Bridge 请求在领取前取消"); err != nil {
|
||||
return s.markProviderCancellationUncertain(task, "Bridge 请求已取消,但积分退回失败:"+err.Error())
|
||||
}
|
||||
now := time.Now()
|
||||
if err := s.repo.UpdateTaskProviderCancellation(task.ID, model.ProviderCancelStatusRequested, model.ProviderCancelStatusConfirmed, "", nil, &now); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
return s.markProviderCancellationUncertain(task, "本地 ComfyUI Bridge 不支持取消已领取工作流,执行状态待核对")
|
||||
}
|
||||
if !supportsProviderCancellation(input.Config.InterfaceType) {
|
||||
return s.markProviderCancellationUncertain(task, "当前上游协议不支持取消,费用待核对")
|
||||
}
|
||||
@@ -103,7 +87,6 @@ func (s *Service) requestProviderCancellation(ctx context.Context, task *model.T
|
||||
requestTask := *task
|
||||
requestTask.InputJSON = mustJSON(input)
|
||||
requestCtx = withProviderRequestKind(withProviderAnalytics(requestCtx, s, requestTask), "cancel")
|
||||
requestCtx = withProviderOutboundPolicy(requestCtx, input.Config)
|
||||
if err := cancelProviderTask(requestCtx, input.Config, task.ProviderRequestID); err != nil {
|
||||
return s.markProviderCancellationUncertain(task, "上游取消请求结果不明确,费用待核对:"+safeProviderLogError(err))
|
||||
}
|
||||
@@ -123,7 +106,6 @@ func (s *Service) reconcileProviderCancellation(ctx context.Context, task *model
|
||||
queryTask := *task
|
||||
queryTask.InputJSON = mustJSON(input)
|
||||
queryCtx := withProviderRequestKind(withProviderAnalytics(ctx, s, queryTask), "cancel-query")
|
||||
queryCtx = withProviderOutboundPolicy(queryCtx, input.Config)
|
||||
outcome, providerStatus, err := queryProviderCancellation(queryCtx, input.Config, task.ProviderRequestID)
|
||||
if err != nil {
|
||||
if task.ProviderCancelAttempts >= providerCancellationMaxAttempts-1 {
|
||||
|
||||
Reference in new issue
Block a user