Merge pull request #99 from basenana/chat/waiting

update: message waiting

cmd/apps/apis/fsapi/v1/service.go

@@ -173,24 +173,25 @@ func (s *services) ChatInRoom(request *ChatRequest, server Room_ChatInRoomServer
 		errCh         = make(chan error, 1)
 	)
 	defer timeoutF()
+
 	go func() {
 		defer close(errCh)
 		errCh <- s.ctrl.ChatInRoom(ctx, request.RoomID, request.NewRequest, chatCh)
 	}()
 	for {
 		select {
 		case <-ctx.Done():
-			err := errors.New("chat in room timeout")
+			err = errors.New("chat in room timeout")
 			return status.Error(common.FsApiError(err), "context timeout")
-		case err := <-errCh:
+		case err = <-errCh:
 			if err != nil {
 				return status.Error(common.FsApiError(err), "chat in room failed")
 			}
 		case reply, ok := <-chatCh:
 			if !ok {
 				return nil
 			}
-			if err := server.Send(&ChatResponse{
+			if err = server.Send(&ChatResponse{
 				ResponseID:      reply.ResponseId,
 				ResponseMessage: reply.Line,
 				Sender:          reply.Sender,

cmd/apps/apis/fsapi/v1/service_test.go

@@ -109,7 +109,7 @@ var _ = Describe("testRoomService", func() {
 				content += resp.ResponseMessage
 			}
 
-			Expect(content).Should(Equal("hello, I am response\nabc"))
+			Expect(content).Should(Equal("🤔hello, I am response\nabc"))
 
 			// message should be saved
 			res, err := serviceClient.OpenRoom(ctx, &OpenRoomRequest{

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/credentials v1.13.26
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.36.0
 	github.com/aws/smithy-go v1.13.5
-	github.com/basenana/friday v0.0.0-20240422083937-ff7ccfab99af
+	github.com/basenana/friday v0.0.0-20240427115004-0dd2292b54db
 	github.com/blevesearch/bleve/v2 v2.3.10
 	github.com/bluele/gcache v0.0.2
 	github.com/getsentry/sentry-go v0.22.0

go.sum

@@ -54,6 +54,8 @@ github.com/basenana/friday v0.0.0-20240422082254-9359a3415e9c h1:Wmh19nZdLL+RnSc
 github.com/basenana/friday v0.0.0-20240422082254-9359a3415e9c/go.mod h1:izPqWGUN5Kxz6mb7Xwhz3Zoe5GdOa/O+Ht6VhIHmjaA=
 github.com/basenana/friday v0.0.0-20240422083937-ff7ccfab99af h1:hkKKv0W4F08N7+vJK4qXKY3yJyilZO+4gV+8UumllRM=
 github.com/basenana/friday v0.0.0-20240422083937-ff7ccfab99af/go.mod h1:izPqWGUN5Kxz6mb7Xwhz3Zoe5GdOa/O+Ht6VhIHmjaA=
+github.com/basenana/friday v0.0.0-20240427115004-0dd2292b54db h1:njCwQm13kdU+x3DtvhDDy0Thnst92RUZENWKoesnrv4=
+github.com/basenana/friday v0.0.0-20240427115004-0dd2292b54db/go.mod h1:izPqWGUN5Kxz6mb7Xwhz3Zoe5GdOa/O+Ht6VhIHmjaA=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=

pkg/controller/dialogue.go

@@ -22,6 +22,7 @@ import (
 
 	friday2 "github.com/basenana/nanafs/pkg/friday"
 	"github.com/basenana/nanafs/pkg/types"
+	"github.com/basenana/nanafs/utils"
 )
 
 func (c *controller) ListRooms(ctx context.Context, entryId int64) ([]*types.Room, error) {
@@ -104,7 +105,7 @@ func (c *controller) ChatInRoom(ctx context.Context, roomId int64, newMsg string
 		respMsg       string
 		realHistory   = room.History
 		errCh         = make(chan error, 1)
-		responseMsgId int64
+		responseMsgId = utils.GenerateNewID()
 	)
 	if entry.Kind == types.GroupKind {
 		isDir = true
@@ -124,6 +125,14 @@ func (c *controller) ChatInRoom(ctx context.Context, roomId int64, newMsg string
 		return err
 	}
 
+	reply <- types.ReplyChannel{
+		Line:       "🤔",
+		ResponseId: responseMsgId,
+		Sender:     "thinking",
+		SendAt:     time.Now(),
+		CreatedAt:  time.Now(),
+	}
+
 	go func() {
 		defer close(errCh)
 		realHistory, err = friday2.ChatWithEntry(ctx, room.EntryId, isDir, realHistory, responseCh)
@@ -166,9 +175,6 @@ func (c *controller) ChatInRoom(ctx context.Context, roomId int64, newMsg string
 				c.logger.Errorw("save message failed", "err", err)
 				return err
 			}
-			if responseMsgId == 0 {
-				responseMsgId = response.ID
-			}
 			reply <- types.ReplyChannel{
 				Line:       line["content"],
 				ResponseId: responseMsgId,

pkg/dialogue/dialogue.go

@@ -18,6 +18,7 @@ package dialogue
 
 import (
 	"context"
+	"errors"
 	"time"
 
 	"go.uber.org/zap"
@@ -117,14 +118,17 @@ func (m *manager) DeleteRoom(ctx context.Context, id int64) error {
 func (m *manager) SaveMessage(ctx context.Context, roomMessage *types.RoomMessage) (*types.RoomMessage, error) {
 	if roomMessage.ID == 0 {
 		roomMessage.ID = utils.GenerateNewID()
-		roomMessage.CreatedAt = time.Now()
-		return roomMessage, m.recorder.SaveRoomMessage(ctx, roomMessage)
 	}
 	crtMsg, err := m.recorder.GetRoomMessage(ctx, roomMessage.ID)
-	if err != nil {
+	if err != nil && !errors.Is(err, types.ErrNotFound) {
 		return nil, err
 	}
 
+	if crtMsg == nil {
+		roomMessage.CreatedAt = time.Now()
+		return roomMessage, m.recorder.SaveRoomMessage(ctx, roomMessage)
+	}
+
 	if roomMessage.Message != "" {
 		crtMsg.Message = roomMessage.Message
 	}