vrr/ProxyAI
2
0
Fork 0
mirror of https://github.com/carlrobertoh/ProxyAI.git synced 2026-05-09 19:45:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: model value change for empty conversations

Browse source
This commit is contained in:
Carl-Robert Linnupuu 2024-12-17 11:06:28 +00:00
parent 1c2a5496e4
commit 54fa78e7e6
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ee/carlrobert/codegpt/conversations/ConversationService.java
View file

@ -187,7 +187,7 @@ public final class ConversationService {
return Optional.empty();
}
private static String getModelForSelectedService(ServiceType serviceType) {
public String getModelForSelectedService(ServiceType serviceType) {
var application = ApplicationManager.getApplication();
return switch (serviceType) {
case CODEGPT -> application.getService(CodeGPTServiceSettings.class)

1
src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ChatToolWindowTabPanel.java
View file

@ -78,6 +78,7 @@ public class ChatToolWindowTabPanel implements Disposable {
this);
userInputPanel = new UserInputPanel(
project,
conversation,
totalTokensPanel,
this::handleSubmit,
this::handleCancel);

10
src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/UserInputPanel.kt
View file

@ -20,8 +20,8 @@ import com.intellij.util.ui.UIUtil
import ee.carlrobert.codegpt.CodeGPTBundle
import ee.carlrobert.codegpt.Icons
import ee.carlrobert.codegpt.actions.AttachImageAction
import ee.carlrobert.codegpt.conversations.Conversation
import ee.carlrobert.codegpt.conversations.ConversationService
import ee.carlrobert.codegpt.conversations.ConversationsState
import ee.carlrobert.codegpt.settings.GeneralSettings
import ee.carlrobert.codegpt.settings.service.ServiceType
import ee.carlrobert.codegpt.settings.service.codegpt.CodeGPTServiceSettings
@ -41,6 +41,7 @@ import javax.swing.JPanel
class UserInputPanel(
private val project: Project,
private val conversation: Conversation,
private val totalTokensPanel: TotalTokensPanel,
private val onSubmit: (String, List<AppliedActionInlay>?) -> Unit,
private val onStop: () -> Unit
@ -158,9 +159,12 @@ class UserInputPanel(
{
imageActionSupported.set(isImageActionSupported())
// TODO: Implement a proper session management
if (service<ConversationsState>().state?.currentConversation?.messages?.isNotEmpty() == true) {
service<ConversationService>().startConversation()
val conversationService = service<ConversationService>()
if (conversation.messages.isNotEmpty()) {
conversationService.startConversation()
project.service<ChatToolWindowContentManager>().createNewTabPanel()
} else {
conversation.model = conversationService.getModelForSelectedService(it)
}
},
service<GeneralSettings>().state.selectedService