Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 14 additions & 17 deletions backend/modules/prompt/application/openapi.go
Original file line number Diff line number Diff line change
Expand Up @@ -424,8 +424,11 @@ func (p *PromptOpenAPIApplicationImpl) doExecuteStreaming(ctx context.Context, r

// 执行prompt流式调用
resultStream := make(chan *entity.Reply)
errChan := make(chan error)
replyResultChan := make(chan *entity.Reply, 1) // 用于接收aggregatedReply,避免数据竞争
type replyResult struct {
Reply *entity.Reply
Err error
}
replyResultChan := make(chan replyResult) // 用于接收aggregatedReply, error,避免数据竞争
goroutine.GoSafe(ctx, func() {
var executeErr error
var localAggregatedReply *entity.Reply
Expand All @@ -436,12 +439,10 @@ func (p *PromptOpenAPIApplicationImpl) doExecuteStreaming(ctx context.Context, r
}
// 确保errChan和resultStream被关闭
close(resultStream)
if executeErr != nil {
errChan <- executeErr
} else {
replyResultChan <- localAggregatedReply
replyResultChan <- replyResult{
Reply: localAggregatedReply,
Err: executeErr,
}
close(errChan)
close(replyResultChan)
}()

Expand Down Expand Up @@ -482,23 +483,19 @@ func (p *PromptOpenAPIApplicationImpl) doExecuteStreaming(ctx context.Context, r
return promptDO, nil, err
}
}
var ok bool
select { //nolint:staticcheck
case err, ok = <-errChan:
if !ok {
case result := <-replyResultChan:
if result.Err == nil {
logs.CtxInfo(ctx, "execute streaming finished")
return promptDO, result.Reply, nil
} else {
if st, ok := status.FromError(err); ok && st.Code() == codes.Canceled {
err = nil
if st, ok := status.FromError(result.Err); ok && st.Code() == codes.Canceled {
logs.CtxWarn(ctx, "execute streaming canceled")
} else {
logs.CtxError(ctx, "execute streaming failed, err=%v", err)
logs.CtxError(ctx, "execute streaming failed, err=%v", result.Err)
}
return promptDO, nil, result.Err
}
return promptDO, aggregatedReply, err
case aggregatedReply = <-replyResultChan:
logs.CtxInfo(ctx, "execute streaming finished")
return promptDO, aggregatedReply, nil
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,12 @@ func MessageToSpanMessage(message *entity.Message) *tracespec.ModelMessage {
return nil
}
return &tracespec.ModelMessage{
Role: RoleToSpanRole(message.Role),
Content: ptr.From(message.Content),
Parts: ContentPartsToSpanParts(message.Parts),
ToolCalls: ToolCallsToSpanToolCalls(message.ToolCalls),
ToolCallID: ptr.From(message.ToolCallID),
Role: RoleToSpanRole(message.Role),
Content: ptr.From(message.Content),
ReasoningContent: ptr.From(message.ReasoningContent),
Parts: ContentPartsToSpanParts(message.Parts),
ToolCalls: ToolCallsToSpanToolCalls(message.ToolCalls),
ToolCallID: ptr.From(message.ToolCallID),
}
}

Expand Down Expand Up @@ -125,7 +126,7 @@ func ContentTypeToSpanPartType(partType entity.ContentType) tracespec.ModelMessa
switch partType {
case entity.ContentTypeText:
return tracespec.ModelMessagePartTypeText
case entity.ContentTypeImageURL:
case entity.ContentTypeImageURL, entity.ContentTypeBase64Data:
return tracespec.ModelMessagePartTypeImage
case entity.ContentTypeMultiPartVariable:
return "multi_part_variable"
Expand Down
Loading