feat(audit): correlate outbound card callbacks
This commit is contained in:
@@ -641,6 +641,10 @@ func (a *Adapter) StartStream(ctx context.Context, incoming *im.IncomingMessage)
|
||||
logger.Warnf(ctx, "[DingTalk] Failed to create AI card, falling back to sessionWebhook: %v", err)
|
||||
} else {
|
||||
state.outTrackID = outTrackID
|
||||
if incoming.Extra == nil {
|
||||
incoming.Extra = make(map[string]string)
|
||||
}
|
||||
incoming.Extra["dingtalk_out_track_id"] = outTrackID
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -586,6 +586,7 @@ type imMessageAuditContext struct {
|
||||
platform string
|
||||
channelID string
|
||||
messageID string
|
||||
deliveryID string
|
||||
userID string
|
||||
chatID string
|
||||
threadID string
|
||||
@@ -604,6 +605,9 @@ func newIMMessageAuditContext(msg *IncomingMessage, channelID string, kbIDs []st
|
||||
}
|
||||
audit.platform = string(msg.Platform)
|
||||
audit.messageID = msg.MessageID
|
||||
if msg.Extra != nil {
|
||||
audit.deliveryID = msg.Extra["dingtalk_out_track_id"]
|
||||
}
|
||||
audit.userID = msg.UserID
|
||||
audit.chatID = msg.ChatID
|
||||
audit.threadID = msg.ThreadID
|
||||
@@ -619,6 +623,7 @@ func applyIMMessageAudit(message *types.Message, audit *imMessageAuditContext) {
|
||||
message.SourcePlatform = audit.platform
|
||||
message.SourceChannelID = audit.channelID
|
||||
message.SourceMessageID = audit.messageID
|
||||
message.SourceDeliveryID = audit.deliveryID
|
||||
message.SourceUserID = audit.userID
|
||||
message.SourceChatID = audit.chatID
|
||||
message.SourceThreadID = audit.threadID
|
||||
|
||||
@@ -208,6 +208,7 @@ func TestCreateIMMessagePayloadsShareRequestShape(t *testing.T) {
|
||||
ChatID: "platform-chat-1",
|
||||
ThreadID: "platform-thread-1",
|
||||
MessageID: "platform-message-1",
|
||||
Extra: map[string]string{"dingtalk_out_track_id": "card-track-1"},
|
||||
}
|
||||
audit := newIMMessageAuditContext(incoming, "channel-1", []string{"kb-1", "kb-2"})
|
||||
userMsg := createIMUserMessagePayload("session-1", "hello", "request-1", audit)
|
||||
@@ -241,7 +242,7 @@ func TestCreateIMMessagePayloadsShareRequestShape(t *testing.T) {
|
||||
if message.SourcePlatform != "dingtalk" || message.SourceChannelID != "channel-1" {
|
||||
t.Fatalf("source channel metadata = platform %q channel %q", message.SourcePlatform, message.SourceChannelID)
|
||||
}
|
||||
if message.SourceMessageID != "platform-message-1" || message.SourceUserID != "platform-user-1" {
|
||||
if message.SourceMessageID != "platform-message-1" || message.SourceUserID != "platform-user-1" || message.SourceDeliveryID != "card-track-1" {
|
||||
t.Fatalf("source actor metadata = message %q user %q", message.SourceMessageID, message.SourceUserID)
|
||||
}
|
||||
if message.SourceChatID != "platform-chat-1" || message.SourceThreadID != "platform-thread-1" {
|
||||
|
||||
@@ -226,6 +226,8 @@ type Message struct {
|
||||
SourceChannelID string `json:"source_channel_id,omitempty" gorm:"type:varchar(36);default:''"`
|
||||
// SourceMessageID is the platform message identifier used for end-to-end correlation.
|
||||
SourceMessageID string `json:"source_message_id,omitempty" gorm:"type:varchar(128);default:''"`
|
||||
// SourceDeliveryID correlates outbound cards/messages with later platform callbacks.
|
||||
SourceDeliveryID string `json:"source_delivery_id,omitempty" gorm:"type:varchar(128);default:''"`
|
||||
// SourceUserID records the platform user for this individual message.
|
||||
SourceUserID string `json:"source_user_id,omitempty" gorm:"type:varchar(128);default:''"`
|
||||
// SourceChatID records the platform conversation or group identifier.
|
||||
|
||||
@@ -23,6 +23,7 @@ func TestMessageAuditMigrationCoversModelFields(t *testing.T) {
|
||||
"source_platform",
|
||||
"source_channel_id",
|
||||
"source_message_id",
|
||||
"source_delivery_id",
|
||||
"source_user_id",
|
||||
"source_chat_id",
|
||||
"source_thread_id",
|
||||
|
||||
@@ -11,7 +11,8 @@ func TestMessageCarriesAuditMetadata(t *testing.T) {
|
||||
ID: "message-1",
|
||||
SourcePlatform: "dingtalk",
|
||||
SourceChannelID: "channel-1",
|
||||
SourceMessageID: "external-message-1",
|
||||
SourceMessageID: "platform-message-1",
|
||||
SourceDeliveryID: "card-track-1",
|
||||
SourceUserID: "user-1",
|
||||
SourceChatID: "chat-1",
|
||||
SourceThreadID: "thread-1",
|
||||
@@ -37,6 +38,7 @@ func TestMessageCarriesAuditMetadata(t *testing.T) {
|
||||
if decoded.SourcePlatform != original.SourcePlatform ||
|
||||
decoded.SourceChannelID != original.SourceChannelID ||
|
||||
decoded.SourceMessageID != original.SourceMessageID ||
|
||||
decoded.SourceDeliveryID != original.SourceDeliveryID ||
|
||||
decoded.SourceUserID != original.SourceUserID ||
|
||||
decoded.SourceChatID != original.SourceChatID ||
|
||||
decoded.SourceThreadID != original.SourceThreadID {
|
||||
|
||||
@@ -171,6 +171,7 @@ CREATE TABLE IF NOT EXISTS messages (
|
||||
source_platform VARCHAR(20) NOT NULL DEFAULT '',
|
||||
source_channel_id VARCHAR(36) NOT NULL DEFAULT '',
|
||||
source_message_id VARCHAR(128) NOT NULL DEFAULT '',
|
||||
source_delivery_id VARCHAR(128) NOT NULL DEFAULT '',
|
||||
source_user_id VARCHAR(128) NOT NULL DEFAULT '',
|
||||
source_chat_id VARCHAR(128) NOT NULL DEFAULT '',
|
||||
source_thread_id VARCHAR(128) NOT NULL DEFAULT '',
|
||||
@@ -188,6 +189,7 @@ CREATE INDEX IF NOT EXISTS idx_messages_knowledge_id ON messages(knowledge_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_messages_request_role ON messages(request_id, role);
|
||||
CREATE INDEX IF NOT EXISTS idx_messages_source_channel ON messages(source_platform, source_channel_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_messages_source_message ON messages(source_platform, source_message_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_messages_source_delivery ON messages(source_platform, source_delivery_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_messages_source_user ON messages(source_platform, source_user_id);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS chunks (
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
DO $$ BEGIN RAISE NOTICE '[Migration 000064 rollback] Removing message audit metadata'; END $$;
|
||||
|
||||
DROP INDEX IF EXISTS idx_messages_source_user;
|
||||
DROP INDEX IF EXISTS idx_messages_source_delivery;
|
||||
DROP INDEX IF EXISTS idx_messages_source_message;
|
||||
DROP INDEX IF EXISTS idx_messages_source_channel;
|
||||
DROP INDEX IF EXISTS idx_messages_request_role;
|
||||
@@ -11,6 +12,7 @@ ALTER TABLE messages DROP COLUMN IF EXISTS searched_knowledge_base_ids;
|
||||
ALTER TABLE messages DROP COLUMN IF EXISTS source_thread_id;
|
||||
ALTER TABLE messages DROP COLUMN IF EXISTS source_chat_id;
|
||||
ALTER TABLE messages DROP COLUMN IF EXISTS source_user_id;
|
||||
ALTER TABLE messages DROP COLUMN IF EXISTS source_delivery_id;
|
||||
ALTER TABLE messages DROP COLUMN IF EXISTS source_message_id;
|
||||
ALTER TABLE messages DROP COLUMN IF EXISTS source_channel_id;
|
||||
ALTER TABLE messages DROP COLUMN IF EXISTS source_platform;
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
-- Migration: 000064_message_audit
|
||||
-- Description: Persist per-message source metadata, retrieval scope, and model token usage.
|
||||
-- Description: Persist per-message source metadata, delivery correlation, retrieval scope, and model token usage.
|
||||
DO $$ BEGIN RAISE NOTICE '[Migration 000064] Adding message audit metadata'; END $$;
|
||||
|
||||
ALTER TABLE messages ADD COLUMN IF NOT EXISTS source_platform VARCHAR(20) NOT NULL DEFAULT '';
|
||||
ALTER TABLE messages ADD COLUMN IF NOT EXISTS source_channel_id VARCHAR(36) NOT NULL DEFAULT '';
|
||||
ALTER TABLE messages ADD COLUMN IF NOT EXISTS source_message_id VARCHAR(128) NOT NULL DEFAULT '';
|
||||
ALTER TABLE messages ADD COLUMN IF NOT EXISTS source_delivery_id VARCHAR(128) NOT NULL DEFAULT '';
|
||||
ALTER TABLE messages ADD COLUMN IF NOT EXISTS source_user_id VARCHAR(128) NOT NULL DEFAULT '';
|
||||
ALTER TABLE messages ADD COLUMN IF NOT EXISTS source_chat_id VARCHAR(128) NOT NULL DEFAULT '';
|
||||
ALTER TABLE messages ADD COLUMN IF NOT EXISTS source_thread_id VARCHAR(128) NOT NULL DEFAULT '';
|
||||
@@ -19,6 +20,9 @@ CREATE INDEX IF NOT EXISTS idx_messages_source_channel
|
||||
CREATE INDEX IF NOT EXISTS idx_messages_source_message
|
||||
ON messages (source_platform, source_message_id)
|
||||
WHERE source_message_id != '';
|
||||
CREATE INDEX IF NOT EXISTS idx_messages_source_delivery
|
||||
ON messages (source_platform, source_delivery_id)
|
||||
WHERE source_delivery_id != '';
|
||||
CREATE INDEX IF NOT EXISTS idx_messages_source_user
|
||||
ON messages (source_platform, source_user_id)
|
||||
WHERE source_user_id != '';
|
||||
@@ -26,6 +30,7 @@ CREATE INDEX IF NOT EXISTS idx_messages_source_user
|
||||
COMMENT ON COLUMN messages.source_platform IS 'Concrete source platform such as dingtalk; channel remains im for compatibility';
|
||||
COMMENT ON COLUMN messages.source_channel_id IS 'WeKnora im_channels.id that received the message';
|
||||
COMMENT ON COLUMN messages.source_message_id IS 'External platform message identifier';
|
||||
COMMENT ON COLUMN messages.source_delivery_id IS 'External delivery or card identifier used to correlate callbacks';
|
||||
COMMENT ON COLUMN messages.source_user_id IS 'External platform user identifier for this individual message';
|
||||
COMMENT ON COLUMN messages.source_chat_id IS 'External platform conversation or group identifier';
|
||||
COMMENT ON COLUMN messages.source_thread_id IS 'External platform thread identifier when available';
|
||||
|
||||
Reference in New Issue
Block a user