mirror of
https://github.com/memohai/Memoh.git
synced 2026-04-25 07:00:48 +09:00
fix(channel,attachment): channel quality refactor & attachment pipeline fixes (#349)
* feat(channel): add DingTalk channel adapter - Add DingTalk channel adapter (`internal/channel/adapters/dingtalk/`) using dingtalk-stream-sdk-go, supporting inbound message receiving and outbound text/markdown reply - Register DingTalk adapter in cmd/agent and cmd/memoh - Add go.mod dependency: github.com/memohai/dingtalk-stream-sdk-go - Add Dingtalk and Wecom SVG icons and Vue components to @memohai/icon - Refactor existing icon components to remove redundant inline wrappers - Add `channelTypeDisplayName` util for consistent channel label resolution - Add DingTalk/WeCom i18n entries (en/zh) for types and typesShort - Extend channel-icon, bot-channels, channel-settings-panel to support dingtalk/wecom - Use channelTypeDisplayName in profile page to replace ad-hoc i18n lookup * fix(channel,attachment): channel quality refactor & attachment pipeline fixes Channel module: - Fix RemoveAdapter not cleaning connectionMeta (stale status leak) - Fix preparedAttachmentTypeFromMime misclassifying image/gif - Fix sleepWithContext time.After goroutine/timer leak - Export IsDataURL/IsHTTPURL/IsDataPath, dedup across packages - Cache OutboundPolicy in managerOutboundStream to avoid repeated lookups - Split OutboundAttachmentStore: extract ContainerAttachmentIngester interface - Add ManagerOption funcs (WithInboundQueueSize, WithInboundWorkers, WithRefreshInterval) - Add thread-safety docs on OutboundStream / managerOutboundStream - Add debug logs on successful send/edit paths - Expand outbound_prepare_test.go with 21 new cases - Convert no-receiver adapter helpers to package-level funcs; drop unused params DingTalk adapter: - Implement AttachmentResolver: download inbound media via /v1.0/robot/messageFiles/download - Fix pure-image inbound messages failing due to missing resolver Attachment pipeline: - Fix images invisible to LLM in pipeline (DCP) path: inject InlineImages into last user message when cfg.Query is empty - Fix public_url fallback: skip direct URL-to-LLM when ContentHash is set, always prefer inlined persisted asset - Inject path: carry ImageParts through agent.InjectMessage; inline persisted attachments in resolver inject goroutine so mid-stream images reach the model - Fix ResolveMime for images: prefer content-sniffed MIME over platform-declared MIME (fixes Feishu sending image/png header for actual JPEG content → API 400)
This commit is contained in:
@@ -14,16 +14,16 @@ import (
|
||||
type qqOutboundStream struct {
|
||||
target string
|
||||
reply *channel.ReplyRef
|
||||
send func(context.Context, channel.OutboundMessage) error
|
||||
send func(context.Context, channel.PreparedOutboundMessage) error
|
||||
|
||||
closed atomic.Bool
|
||||
mu sync.Mutex
|
||||
buffer strings.Builder
|
||||
attachments []channel.Attachment
|
||||
attachments []channel.PreparedAttachment
|
||||
sentText bool
|
||||
}
|
||||
|
||||
func (a *QQAdapter) OpenStream(_ context.Context, cfg channel.ChannelConfig, target string, opts channel.StreamOptions) (channel.OutboundStream, error) {
|
||||
func (a *QQAdapter) OpenStream(_ context.Context, cfg channel.ChannelConfig, target string, opts channel.StreamOptions) (channel.PreparedOutboundStream, error) {
|
||||
parsed, err := parseConfig(cfg.Credentials)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("qq open stream: %w", err)
|
||||
@@ -32,19 +32,19 @@ func (a *QQAdapter) OpenStream(_ context.Context, cfg channel.ChannelConfig, tar
|
||||
return &qqOutboundStream{
|
||||
target: target,
|
||||
reply: opts.Reply,
|
||||
send: func(ctx context.Context, msg channel.OutboundMessage) error {
|
||||
send: func(ctx context.Context, msg channel.PreparedOutboundMessage) error {
|
||||
if msg.Target == "" {
|
||||
msg.Target = target
|
||||
}
|
||||
if msg.Message.Reply == nil && opts.Reply != nil {
|
||||
msg.Message.Reply = opts.Reply
|
||||
if msg.Message.Message.Reply == nil && opts.Reply != nil {
|
||||
msg.Message.Message.Reply = opts.Reply
|
||||
}
|
||||
return a.Send(ctx, cfg, msg)
|
||||
},
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (s *qqOutboundStream) Push(ctx context.Context, event channel.StreamEvent) error {
|
||||
func (s *qqOutboundStream) Push(ctx context.Context, event channel.PreparedStreamEvent) error {
|
||||
if s == nil || s.send == nil {
|
||||
return errors.New("qq stream not configured")
|
||||
}
|
||||
@@ -90,8 +90,10 @@ func (s *qqOutboundStream) Push(ctx context.Context, event channel.StreamEvent)
|
||||
if errText == "" {
|
||||
return nil
|
||||
}
|
||||
return s.flush(ctx, channel.Message{
|
||||
Text: "Error: " + errText,
|
||||
return s.flush(ctx, channel.PreparedMessage{
|
||||
Message: channel.Message{
|
||||
Text: "Error: " + errText,
|
||||
},
|
||||
})
|
||||
case channel.StreamEventFinal:
|
||||
if event.Final == nil {
|
||||
@@ -116,43 +118,62 @@ func (s *qqOutboundStream) Close(ctx context.Context) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *qqOutboundStream) flush(ctx context.Context, msg channel.Message) error {
|
||||
func (s *qqOutboundStream) flush(ctx context.Context, msg channel.PreparedMessage) error {
|
||||
s.mu.Lock()
|
||||
bufferedText := strings.TrimSpace(s.buffer.String())
|
||||
bufferedAttachments := append([]channel.Attachment(nil), s.attachments...)
|
||||
bufferedAttachments := append([]channel.PreparedAttachment(nil), s.attachments...)
|
||||
alreadySentText := s.sentText
|
||||
s.buffer.Reset()
|
||||
s.attachments = nil
|
||||
s.mu.Unlock()
|
||||
|
||||
logicalMsg := msg.LogicalMessage()
|
||||
if bufferedText != "" {
|
||||
msg.Text = bufferedText
|
||||
msg.Parts = nil
|
||||
if msg.Format == "" {
|
||||
msg.Format = channel.MessageFormatPlain
|
||||
logicalMsg.Text = bufferedText
|
||||
logicalMsg.Parts = nil
|
||||
if logicalMsg.Format == "" {
|
||||
logicalMsg.Format = channel.MessageFormatPlain
|
||||
}
|
||||
} else if alreadySentText && len(bufferedAttachments) == 0 && len(msg.Attachments) == 0 && strings.TrimSpace(msg.PlainText()) != "" {
|
||||
} else if alreadySentText && len(bufferedAttachments) == 0 && len(msg.Attachments) == 0 && strings.TrimSpace(logicalMsg.PlainText()) != "" {
|
||||
return nil
|
||||
}
|
||||
preparedAttachments := append([]channel.PreparedAttachment(nil), bufferedAttachments...)
|
||||
if len(bufferedAttachments) > 0 {
|
||||
msg.Attachments = append(bufferedAttachments, msg.Attachments...)
|
||||
logicalMsg.Attachments = append(preparedAttachmentLogicals(bufferedAttachments), logicalMsg.Attachments...)
|
||||
preparedAttachments = append(preparedAttachments, msg.Attachments...)
|
||||
} else {
|
||||
preparedAttachments = append(preparedAttachments, msg.Attachments...)
|
||||
}
|
||||
if msg.Reply == nil && s.reply != nil {
|
||||
msg.Reply = s.reply
|
||||
if logicalMsg.Reply == nil && s.reply != nil {
|
||||
logicalMsg.Reply = s.reply
|
||||
}
|
||||
if msg.IsEmpty() {
|
||||
if logicalMsg.IsEmpty() && len(preparedAttachments) == 0 {
|
||||
return nil
|
||||
}
|
||||
if err := s.send(ctx, channel.OutboundMessage{
|
||||
Target: s.target,
|
||||
Message: msg,
|
||||
if err := s.send(ctx, channel.PreparedOutboundMessage{
|
||||
Target: s.target,
|
||||
Message: channel.PreparedMessage{
|
||||
Message: logicalMsg,
|
||||
Attachments: preparedAttachments,
|
||||
},
|
||||
}); err != nil {
|
||||
return err
|
||||
}
|
||||
if strings.TrimSpace(msg.PlainText()) != "" {
|
||||
if strings.TrimSpace(logicalMsg.PlainText()) != "" {
|
||||
s.mu.Lock()
|
||||
s.sentText = true
|
||||
s.mu.Unlock()
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func preparedAttachmentLogicals(attachments []channel.PreparedAttachment) []channel.Attachment {
|
||||
if len(attachments) == 0 {
|
||||
return nil
|
||||
}
|
||||
logical := make([]channel.Attachment, 0, len(attachments))
|
||||
for _, att := range attachments {
|
||||
logical = append(logical, att.Logical)
|
||||
}
|
||||
return logical
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user