fix task article link drawer
Frontend CI / Frontend (push) Successful in 5m6s
Backend CI / Backend (push) Successful in 16m45s

This commit is contained in:
2026-05-14 21:14:27 +08:00
parent 34dda524d7
commit 765dae4bf1
15 changed files with 735 additions and 104 deletions
@@ -9,6 +9,7 @@ import (
"strings"
"time"
"github.com/google/uuid"
"github.com/jackc/pgx/v5/pgxpool"
"go.uber.org/zap"
@@ -108,6 +109,7 @@ type enqueuePromptRuleGenerationInput struct {
BrandID *int64
ExtraParams map[string]interface{}
FallbackName string
TaskBatchID *string
}
func NewPromptRuleGenerationService(
@@ -181,6 +183,7 @@ func (s *PromptRuleGenerationService) GenerateFromRule(ctx context.Context, req
}
results := make([]GenerateFromRuleItem, 0, generateCount)
taskBatchID := "instant-" + uuid.NewString()
var lastErr error
for idx := 0; idx < generateCount; idx++ {
result, enqueueErr := s.enqueuePromptRuleGeneration(ctx, enqueuePromptRuleGenerationInput{
@@ -190,6 +193,7 @@ func (s *PromptRuleGenerationService) GenerateFromRule(ctx context.Context, req
BrandID: req.BrandID,
ExtraParams: clonePromptRuleExtraParams(extra),
FallbackName: "即时任务",
TaskBatchID: &taskBatchID,
})
if enqueueErr != nil {
lastErr = enqueueErr
@@ -293,6 +297,9 @@ func (s *PromptRuleGenerationService) enqueuePromptRuleGeneration(ctx context.Co
"enable_web_search": extractBool(extra, "enable_web_search"),
"generate_count": generateCount,
}
if input.TaskBatchID != nil && strings.TrimSpace(*input.TaskBatchID) != "" {
inputParams["task_batch_id"] = strings.TrimSpace(*input.TaskBatchID)
}
if workspaceID := extractInt(extra, "workspace_id"); workspaceID > 0 {
inputParams["workspace_id"] = workspaceID
}
@@ -417,6 +424,7 @@ func (s *PromptRuleGenerationService) enqueuePromptRuleGeneration(ctx context.Co
OperatorID: operatorID,
TenantID: input.TenantID,
ArticleID: &articleID,
TaskBatchID: input.TaskBatchID,
QuotaReservationID: &reservationID,
TaskType: "custom_generation",
InputParamsJSON: inputJSON,
@@ -429,6 +437,7 @@ func (s *PromptRuleGenerationService) enqueuePromptRuleGeneration(ctx context.Co
return nil, response.ErrInternal(50012, "create_failed", "failed to commit generation task")
}
invalidateArticleCaches(ctx, s.cache, input.TenantID, &articleID)
s.invalidateScheduleTaskCacheForGeneration(ctx, input.TenantID, inputParams)
job := promptRuleGenerationJob{
OperatorID: operatorID,
@@ -612,6 +621,7 @@ func (s *PromptRuleGenerationService) executeGeneration(ctx context.Context, job
cleanupCtx, cancel := newGenerationCleanupContext()
defer cancel()
invalidateArticleCaches(cleanupCtx, s.cache, job.TenantID, &job.ArticleID)
s.invalidateScheduleTaskCacheForGeneration(cleanupCtx, job.TenantID, job.InputParams)
if runtimeCfg.StreamEnabled && s.streams != nil {
s.streams.Complete(job.ArticleID, job.TaskID, title, content)
@@ -764,6 +774,7 @@ func (s *PromptRuleGenerationService) failGeneration(ctx context.Context, job pr
}
}
invalidateArticleCaches(cleanupCtx, s.cache, job.TenantID, &job.ArticleID)
s.invalidateScheduleTaskCacheForGeneration(cleanupCtx, job.TenantID, job.InputParams)
if cleanupErr != nil {
RecordGenerationTaskEvent(GenerationTaskEventCleanupFailure, logCtx)
LogGenerationTaskError(s.logger, "prompt rule generation failure cleanup failed", logCtx, zap.Error(cleanupErr))
@@ -775,6 +786,18 @@ func (s *PromptRuleGenerationService) failGeneration(ctx context.Context, job pr
}
}
func (s *PromptRuleGenerationService) invalidateScheduleTaskCacheForGeneration(ctx context.Context, tenantID int64, inputParams map[string]interface{}) {
if s == nil || s.cache == nil || strings.TrimSpace(extractString(inputParams, "generation_mode")) != "schedule" {
return
}
scheduleTaskID := int64(extractInt(inputParams, "schedule_task_id"))
if scheduleTaskID <= 0 {
invalidateScheduleTaskCaches(ctx, s.cache, tenantID, nil)
return
}
invalidateScheduleTaskCaches(ctx, s.cache, tenantID, &scheduleTaskID)
}
func promptRuleGenerationJobLogContext(job promptRuleGenerationJob, stage, statusBefore, statusAfter, result string) GenerationTaskLogContext {
return GenerationTaskLogContext{
TaskID: job.TaskID,