Fix/content reasoning

* fix: concat * fix: concat * fix: concat sep * fix: concat content & url * fix: opimized * fix: test * fix: test * fix: multi content parse with uri * fix: multi content combine * fix: remove unused func * fix: multi content with content & reasoning content * fix: multi content with content & reasoning content See merge request: !886
2025-07-21 11:23:48 +00:00
parent 82e55ffdb8
commit 249c23c64b
16 changed files with 263 additions and 92 deletions
--- a/backend/domain/conversation/message/internal/dal/message.go
+++ b/backend/domain/conversation/message/internal/dal/message.go
@@ -48,6 +48,14 @@ func NewMessageDAO(db *gorm.DB, idgen idgen.IDGenerator) *MessageDAO {
 	}
 }

+func (dao *MessageDAO) PreCreate(ctx context.Context, msg *entity.Message) (*entity.Message, error) {
+	poData, err := dao.messageDO2PO(ctx, msg)
+	if err != nil {
+		return nil, err
+	}
+	return dao.messagePO2DO(poData), nil
+}
+
 func (dao *MessageDAO) Create(ctx context.Context, msg *entity.Message) (*entity.Message, error) {
 	poData, err := dao.messageDO2PO(ctx, msg)
 	if err != nil {
@@ -205,33 +213,44 @@ func (dao *MessageDAO) Delete(ctx context.Context, msgIDs []int64, runIDs []int6
 }

 func (dao *MessageDAO) messageDO2PO(ctx context.Context, msgDo *entity.Message) (*model.Message, error) {
-	id, gErr := dao.idgen.GenID(ctx)
-	if gErr != nil {
-		return nil, gErr
+	var id int64
+	if msgDo.ID > 0 {
+		id = msgDo.ID
+	} else {
+		genID, gErr := dao.idgen.GenID(ctx)
+		if gErr != nil {
+			return nil, gErr
+		}
+		id = genID
 	}
 	msgPO := &model.Message{
-		ID:             id,
-		ConversationID: msgDo.ConversationID,
-		RunID:          msgDo.RunID,
-		AgentID:        msgDo.AgentID,
-		SectionID:      msgDo.SectionID,
-		UserID:         msgDo.UserID,
-		Role:           string(msgDo.Role),
-		ContentType:    string(msgDo.ContentType),
-		MessageType:    string(msgDo.MessageType),
-		DisplayContent: msgDo.DisplayContent,
-		Content:        msgDo.Content,
-		BrokenPosition: msgDo.Position,
-		Status:         int32(entity.MessageStatusAvailable),
-		CreatedAt:      time.Now().UnixMilli(),
-		UpdatedAt:      time.Now().UnixMilli(),
+		ID:               id,
+		ConversationID:   msgDo.ConversationID,
+		RunID:            msgDo.RunID,
+		AgentID:          msgDo.AgentID,
+		SectionID:        msgDo.SectionID,
+		UserID:           msgDo.UserID,
+		Role:             string(msgDo.Role),
+		ContentType:      string(msgDo.ContentType),
+		MessageType:      string(msgDo.MessageType),
+		DisplayContent:   msgDo.DisplayContent,
+		Content:          msgDo.Content,
+		BrokenPosition:   msgDo.Position,
+		Status:           int32(entity.MessageStatusAvailable),
+		CreatedAt:        time.Now().UnixMilli(),
+		UpdatedAt:        time.Now().UnixMilli(),
+		ReasoningContent: msgDo.ReasoningContent,
 	}

-	mc, err := dao.buildModelContent(msgDo)
-	if err != nil {
-		return nil, err
+	if msgDo.ModelContent != "" {
+		msgPO.ModelContent = msgDo.ModelContent
+	} else {
+		mc, err := dao.buildModelContent(msgDo)
+		if err != nil {
+			return nil, err
+		}
+		msgPO.ModelContent = mc
 	}
-	msgPO.ModelContent = mc

 	ext, err := json.Marshal(msgDo.Ext)
 	if err != nil {
@@ -267,11 +286,13 @@ func (dao *MessageDAO) buildModelContent(msgDO *entity.Message) (string, error)
 			one.Type = schema.ChatMessagePartTypeImageURL
 			one.ImageURL = &schema.ChatMessageImageURL{
 				URL: contentData.FileData[0].Url,
+				URI: contentData.FileData[0].URI,
 			}
 		case message.InputTypeFile:
 			one.Type = schema.ChatMessagePartTypeFileURL
 			one.FileURL = &schema.ChatMessageFileURL{
 				URL: contentData.FileData[0].Url,
+				URI: contentData.FileData[0].URI,
 			}
 		case message.InputTypeVideo:
 			one.Type = schema.ChatMessagePartTypeVideoURL
@@ -282,6 +303,7 @@ func (dao *MessageDAO) buildModelContent(msgDO *entity.Message) (string, error)
 			one.Type = schema.ChatMessagePartTypeFileURL
 			one.AudioURL = &schema.ChatMessageAudioURL{
 				URL: contentData.FileData[0].Url,
+				URI: contentData.FileData[0].URI,
 			}
 		}
 		multiContent = append(multiContent, one)
--- a/backend/domain/conversation/message/repository/repository.go
+++ b/backend/domain/conversation/message/repository/repository.go
@@ -32,6 +32,7 @@ func NewMessageRepo(db *gorm.DB, idGen idgen.IDGenerator) MessageRepo {
 }

 type MessageRepo interface {
+	PreCreate(ctx context.Context, msg *entity.Message) (*entity.Message, error)
 	Create(ctx context.Context, msg *entity.Message) (*entity.Message, error)
 	List(ctx context.Context, conversationID int64, limit int, cursor int64,
 		direction entity.ScrollPageDirection, messageType *message.MessageType) ([]*entity.Message, bool, error)
--- a/backend/domain/conversation/message/service/message.go
+++ b/backend/domain/conversation/message/service/message.go
@@ -24,6 +24,7 @@ import (

 type Message interface {
 	List(ctx context.Context, req *entity.ListMeta) (*entity.ListResult, error)
+	PreCreate(ctx context.Context, req *entity.Message) (*entity.Message, error)
 	Create(ctx context.Context, req *entity.Message) (*entity.Message, error)
 	GetByRunIDs(ctx context.Context, conversationID int64, runIDs []int64) ([]*entity.Message, error)
 	GetByID(ctx context.Context, id int64) (*entity.Message, error)
--- a/backend/domain/conversation/message/service/message_impl.go
+++ b/backend/domain/conversation/message/service/message_impl.go
@@ -39,13 +39,14 @@ func NewService(c *Components) Message {
 	}
 }

+func (m *messageImpl) PreCreate(ctx context.Context, msg *entity.Message) (*entity.Message, error) {
+	// create message
+	return m.MessageRepo.PreCreate(ctx, msg)
+}
+
 func (m *messageImpl) Create(ctx context.Context, msg *entity.Message) (*entity.Message, error) {
 	// create message
-	msg, err := m.MessageRepo.Create(ctx, msg)
-	if err != nil {
-		return nil, err
-	}
-	return msg, nil
+	return m.MessageRepo.Create(ctx, msg)
 }

 func (m *messageImpl) List(ctx context.Context, req *entity.ListMeta) (*entity.ListResult, error) {
@@ -82,12 +83,7 @@ func (m *messageImpl) List(ctx context.Context, req *entity.ListMeta) (*entity.L
 }

 func (m *messageImpl) GetByRunIDs(ctx context.Context, conversationID int64, runIDs []int64) ([]*entity.Message, error) {
-	messageList, err := m.MessageRepo.GetByRunIDs(ctx, runIDs, "ASC")
-	if err != nil {
-		return nil, err
-	}
-
-	return messageList, nil
+	return m.MessageRepo.GetByRunIDs(ctx, runIDs, "ASC")
 }

 func (m *messageImpl) Edit(ctx context.Context, req *entity.Message) (*entity.Message, error) {
@@ -100,21 +96,11 @@ func (m *messageImpl) Edit(ctx context.Context, req *entity.Message) (*entity.Me
 }

 func (m *messageImpl) Delete(ctx context.Context, req *entity.DeleteMeta) error {
-	err := m.MessageRepo.Delete(ctx, req.MessageIDs, req.RunIDs)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return m.MessageRepo.Delete(ctx, req.MessageIDs, req.RunIDs)
 }

 func (m *messageImpl) GetByID(ctx context.Context, id int64) (*entity.Message, error) {
-	msg, err := m.MessageRepo.GetByID(ctx, id)
-	if err != nil {
-		return nil, err
-	}
-
-	return msg, nil
+	return m.MessageRepo.GetByID(ctx, id)
 }

 func (m *messageImpl) Broken(ctx context.Context, req *entity.BrokenMeta) error {
--- a/backend/domain/conversation/message/service/message_test.go
+++ b/backend/domain/conversation/message/service/message_test.go
@@ -19,6 +19,7 @@ package message
 import (
 	"context"
 	"testing"
+	"time"

 	"github.com/cloudwego/eino/schema"
 	"github.com/stretchr/testify/assert"
@@ -74,8 +75,10 @@ func TestCreateMessage(t *testing.T) {

 	ctrl := gomock.NewController(t)
 	idGen := mock.NewMockIDGenerator(ctrl)
-	idGen.EXPECT().GenID(gomock.Any()).Return(int64(10), nil).Times(1)
-
+	idGen.EXPECT().GenID(gomock.Any()).DoAndReturn(func(_ context.Context) (int64, error) {
+		newID := time.Now().UnixNano()
+		return newID, nil
+	}).AnyTimes()
 	mockDBGen := orm.NewMockDB()
 	mockDBGen.AddTable(&model.Message{})
 	mockDB, err := mockDBGen.DB()
@@ -92,10 +95,12 @@ func TestCreateMessage(t *testing.T) {
 	imageInput := &message.FileData{
 		Url:  "https://xxxxx.xxxx/image",
 		Name: "test_img",
+		URI:  "",
 	}
 	fileInput := &message.FileData{
 		Url:  "https://xxxxx.xxxx/file",
 		Name: "test_file",
+		URI:  "",
 	}
 	content := []*message.InputMetaData{
 		{