Merge pull request #51 from BalanceBalls/bug-fixes

More refactoring

Author: BalanceBalls

clients/gemini.go

@@ -115,6 +115,7 @@ func (c GeminiClient) RequestCompletion(
 					processResultID++
 				}
 				sendCompensationChunk(resultChan, processResultID)
+				break
 			}
 		}
 
@@ -204,7 +205,7 @@ func sendCompensationChunk(resultChan chan util.ProcessApiCompletionResponse, id
 	resultChan <- util.ProcessApiCompletionResponse{
 		ID:     id,
 		Result: chunk,
-		Final:  false,
+		Final:  true,
 	}
 	util.Slog.Debug("Gemini: compensation chunk sent")
 }
@@ -327,15 +328,25 @@ func buildChatHistory(msgs []util.MessageToSend) []*genai.Content {
 			role = "model"
 		}
 
+		messageContent := ""
+		if singleMessage.Resoning != "" {
+			messageContent += singleMessage.Resoning
+		}
 		if singleMessage.Content != "" {
+			messageContent += singleMessage.Content
+		}
+
+		if messageContent != "" {
 			message := genai.Content{
 				Parts: []genai.Part{
-					genai.Text(singleMessage.Content),
+					genai.Text(messageContent),
 				},
 				Role: role,
 			}
 			chat = append(chat, &message)
 		}
+
+		util.Slog.Debug("constructed turn", "data", messageContent)
 	}
 
 	return chat

clients/openai.go

@@ -80,15 +80,15 @@ func (c OpenAiClient) RequestModelsList(ctx context.Context) util.ProcessModelsR
 	return processModelsListResponse(resp)
 }
 
-func ConstructUserMessage(content string) util.MessageToSend {
-	return util.MessageToSend{
+func ConstructUserMessage(content string) util.OpenAIConversationTurn {
+	return util.OpenAIConversationTurn{
 		Role:    "user",
 		Content: content,
 	}
 }
 
-func constructSystemMessage(content string) util.MessageToSend {
-	return util.MessageToSend{
+func constructSystemMessage(content string) util.OpenAIConversationTurn {
+	return util.OpenAIConversationTurn{
 		Role:    "system",
 		Content: content,
 	}
@@ -99,7 +99,7 @@ func (c OpenAiClient) constructCompletionRequestPayload(
 	cfg config.Config,
 	settings util.Settings,
 ) ([]byte, error) {
-	messages := []util.MessageToSend{}
+	messages := []util.OpenAIConversationTurn{}
 
 	if util.IsSystemMessageSupported(c.provider, settings.Model) {
 		if cfg.SystemMessage != "" || settings.SystemPrompt != nil {
@@ -113,8 +113,24 @@ func (c OpenAiClient) constructCompletionRequestPayload(
 	}
 
 	for _, singleMessage := range chatMsgs {
+		messageContent := ""
+		if singleMessage.Resoning != "" {
+			messageContent += singleMessage.Resoning
+		}
+
 		if singleMessage.Content != "" {
-			messages = append(messages, singleMessage)
+			messageContent += singleMessage.Content
+		}
+
+		if messageContent != "" {
+			conversationTurn := util.OpenAIConversationTurn{
+				Model:   singleMessage.Model,
+				Role:    singleMessage.Role,
+				Content: messageContent,
+			}
+
+			util.Slog.Debug("constructed turn", "data", conversationTurn)
+			messages = append(messages, conversationTurn)
 		}
 	}
 

panes/chat-pane.go

@@ -157,7 +157,7 @@ func (p ChatPane) Update(msg tea.Msg) (ChatPane, tea.Cmd) {
 		return p, nil
 
 	case sessions.LoadDataFromDB:
-		util.Slog.Debug("case LoadDataFromDB: ", "message", msg)
+		// util.Slog.Debug("case LoadDataFromDB: ", "message", msg)
 		return p.initializePane(msg.Session)
 
 	case sessions.UpdateCurrentSession:

panes/prompt-pane.go

@@ -16,7 +16,7 @@ import (
 
 const ResponseWaitingMsg = "> Please wait ..."
 const InitializingMsg = "Components initializing ..."
-const PlaceholderMsg = "Press i to type. Use ctrl+e to expand/collapse editor"
+const PlaceholderMsg = "Press i to type • ctrl+e expand/collapse editor • ctrl+r clear"
 
 type keyMap struct {
 	insert    key.Binding
@@ -277,6 +277,10 @@ func (p PromptPane) Update(msg tea.Msg) (PromptPane, tea.Cmd) {
 
 				switch p.viewMode {
 				case util.TextEditMode:
+					if strings.TrimSpace(p.textEditor.Value()) == "" {
+						break
+					}
+
 					if !p.textEditor.Focused() {
 						promptText := p.textEditor.Value()
 						p.textEditor.SetValue("")
@@ -299,6 +303,10 @@ func (p PromptPane) Update(msg tea.Msg) (PromptPane, tea.Cmd) {
 							util.SendViewModeChangedMsg(util.NormalMode))
 					}
 				default:
+					if strings.TrimSpace(p.input.Value()) == "" {
+						break
+					}
+
 					promptText := p.input.Value()
 					p.input.SetValue("")
 					p.input.Blur()

panes/sessions-pane.go

@@ -129,7 +129,7 @@ func (p SessionsPane) Update(msg tea.Msg) (SessionsPane, tea.Cmd) {
 		p.updateSessionsList()
 
 	case sessions.LoadDataFromDB:
-		util.Slog.Debug("case LoadDataFromDB: ", "message", msg)
+		// util.Slog.Debug("case LoadDataFromDB: ", "message", msg)
 		p.currentSession = msg.Session
 		p.sessionsListData = msg.AllSessions
 		p.currentSessionId = msg.CurrentActiveSessionID