Skip to content

feat(settings): enhance LLM settings with JSON highlighting and respo… #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phodal merged 1 commit into from
May 28, 2025
Merged

feat(settings): enhance LLM settings with JSON highlighting and respo… #402

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 92 additions & 27 deletions core/src/main/kotlin/cc/unitmesh/devti/settings/SimplifiedLLMSettingComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,21 @@ import cc.unitmesh.devti.llm2.model.CustomRequest
import cc.unitmesh.devti.llm2.model.LlmConfig
import cc.unitmesh.devti.llm2.model.ModelType
import cc.unitmesh.devti.llms.custom.Message
import cc.unitmesh.devti.provider.local.JsonLanguageField
import cc.unitmesh.devti.provider.local.JsonTextProvider
import cc.unitmesh.devti.settings.locale.HUMAN_LANGUAGES
import cc.unitmesh.devti.settings.locale.LanguageChangedCallback
import cc.unitmesh.devti.settings.locale.LanguageChangedCallback.jBLabel
import cc.unitmesh.devti.util.AutoDevAppScope
import com.intellij.lang.Language
import com.intellij.openapi.fileTypes.PlainTextLanguage
import com.intellij.openapi.components.service
import com.intellij.openapi.project.ProjectManager
import com.intellij.openapi.ui.ComboBox
import com.intellij.openapi.ui.DialogWrapper
import com.intellij.openapi.ui.Messages
import com.intellij.ui.JBColor
import com.intellij.ui.LanguageTextField
import com.intellij.ui.components.JBCheckBox
import com.intellij.ui.components.JBLabel
import com.intellij.ui.components.JBTextField
Expand Down Expand Up @@ -193,16 +197,22 @@ class SimplifiedLLMSettingComponent(private val settings: AutoDevSettingsState)
private val urlField = JBTextField()
private val tokenField = JBTextField()
private val maxTokensField = JBTextField()
private val modelTypeComboBox = JComboBox(ModelType.values())

// Explicit model parameters
private val modelField = JBTextField()
private val streamCheckbox = JBCheckBox("Use streaming response", true)
private val temperatureField = JBTextField()

// Custom headers and body fields
private val headersArea = JTextArea(3, 40)
private val bodyArea = JTextArea(5, 40)
// Response resolver field with JSONPath highlighting
private val responseResolverField = LanguageTextField(
Language.findLanguageByID("JSONPath") ?: PlainTextLanguage.INSTANCE,
project,
""
)

// Custom headers and body fields with JSON highlighting
private val headersField = JsonLanguageField(project, "{}", "Custom headers JSON", null, false)
private val bodyField = JsonLanguageField(project, "{}", "Additional request body JSON", null, false)
private val testResultLabel = JBLabel("")

init {
Expand All @@ -215,7 +225,6 @@ class SimplifiedLLMSettingComponent(private val settings: AutoDevSettingsState)
urlField.text = existingLlm.url
tokenField.text = existingLlm.auth.token
maxTokensField.text = existingLlm.maxTokens.toString()
modelTypeComboBox.selectedItem = existingLlm.modelType
streamCheckbox.isSelected = existingLlm.customRequest.stream

// Extract model and temperature from body
Expand All @@ -235,8 +244,21 @@ class SimplifiedLLMSettingComponent(private val settings: AutoDevSettingsState)
} ?: "0.0"
temperatureField.text = temperatureValue

// Initialize response resolver - use legacy responseFormat if available, otherwise determine by stream
val responseResolver = if (existingLlm.responseFormat.isNotEmpty()) {
existingLlm.responseFormat
} else {
// Default based on streaming mode
if (existingLlm.customRequest.stream) {
"\$.choices[0].delta.content"
} else {
"\$.choices[0].message.content"
}
}
responseResolverField.text = responseResolver

// Initialize custom headers and body (excluding model and temperature)
headersArea.text = if (existingLlm.customRequest.headers.isNotEmpty()) {
val headersJson = if (existingLlm.customRequest.headers.isNotEmpty()) {
buildJsonObject {
existingLlm.customRequest.headers.forEach { (key, value) ->
put(key, value)
Expand All @@ -245,12 +267,13 @@ class SimplifiedLLMSettingComponent(private val settings: AutoDevSettingsState)
} else {
"{}"
}
headersField.text = headersJson

// Body without model and temperature (they are now explicit fields)
val bodyWithoutModelTemp = existingLlm.customRequest.body.filterKeys {
it != "model" && it != "temperature" && it != "stream"
}
bodyArea.text = if (bodyWithoutModelTemp.isNotEmpty()) {
val bodyJson = if (bodyWithoutModelTemp.isNotEmpty()) {
buildJsonObject {
bodyWithoutModelTemp.forEach { (key, value) ->
put(key, value)
Expand All @@ -259,29 +282,46 @@ class SimplifiedLLMSettingComponent(private val settings: AutoDevSettingsState)
} else {
"{}"
}
bodyField.text = bodyJson
} else {
// Default values for new LLM
maxTokensField.text = "4096"
modelField.text = "gpt-3.5-turbo"
temperatureField.text = "0.0"
headersArea.text = "{}"
bodyArea.text = "{}"
// Default response resolver based on streaming (will be set by listener)
responseResolverField.text = "\$.choices[0].delta.content"
headersField.text = "{}"
bodyField.text = "{}"
}

// Add listener to update response resolver default when streaming changes
streamCheckbox.addActionListener {
// Only update if field is empty or contains default values
val currentText = responseResolverField.text.trim()
if (currentText.isEmpty() ||
currentText == "\$.choices[0].delta.content" ||
currentText == "\$.choices[0].message.content") {
responseResolverField.text = if (streamCheckbox.isSelected) {
"\$.choices[0].delta.content"
} else {
"\$.choices[0].message.content"
}
}
}

init()
}

override fun createCenterPanel(): JPanel {
val panel = JPanel(BorderLayout())
panel.preferredSize = Dimension(600, 700)
panel.preferredSize = Dimension(600, 750)

val formBuilder = FormBuilder.createFormBuilder()
.addLabeledComponent(JBLabel("Name:"), nameField)
.addLabeledComponent(JBLabel("Description:"), descriptionField)
.addLabeledComponent(JBLabel("URL:"), urlField)
.addLabeledComponent(JBLabel("Token (optional):"), tokenField)
.addLabeledComponent(JBLabel("Max Tokens:"), maxTokensField)
.addLabeledComponent(JBLabel("Model Type:"), modelTypeComboBox)
.addSeparator()

// Model parameters section
Expand All @@ -291,11 +331,15 @@ class SimplifiedLLMSettingComponent(private val settings: AutoDevSettingsState)
formBuilder.addLabeledComponent(JBLabel("Temperature:"), temperatureField)
formBuilder.addSeparator()

// Custom headers section
formBuilder.addLabeledComponent(JBLabel("Custom Headers (JSON):"), JScrollPane(headersArea))
// Response resolver section
formBuilder.addLabeledComponent(JBLabel("Response Resolver (JSONPath):"), responseResolverField)
formBuilder.addSeparator()

// Custom headers section with JSON highlighting
formBuilder.addLabeledComponent(JBLabel("Custom Headers (JSON):"), headersField)

// Custom body section (additional fields)
formBuilder.addLabeledComponent(JBLabel("Additional Request Body (JSON):"), JScrollPane(bodyArea))
// Custom body section (additional fields) with JSON highlighting
formBuilder.addLabeledComponent(JBLabel("Additional Request Body (JSON):"), bodyField)

formBuilder.addSeparator()

Expand Down Expand Up @@ -342,8 +386,8 @@ class SimplifiedLLMSettingComponent(private val settings: AutoDevSettingsState)
try {
// Parse custom headers
val headers = try {
if (headersArea.text.trim().isNotEmpty() && headersArea.text.trim() != "{}") {
Json.decodeFromString<Map<String, String>>(headersArea.text)
if (headersField.text.trim().isNotEmpty() && headersField.text.trim() != "{}") {
Json.decodeFromString<Map<String, String>>(headersField.text)
} else {
emptyMap()
}
Expand All @@ -357,8 +401,8 @@ class SimplifiedLLMSettingComponent(private val settings: AutoDevSettingsState)

// Parse additional body fields and combine with explicit parameters
val additionalBody = try {
if (bodyArea.text.trim().isNotEmpty() && bodyArea.text.trim() != "{}") {
val jsonElement = Json.parseToJsonElement(bodyArea.text)
if (bodyField.text.trim().isNotEmpty() && bodyField.text.trim() != "{}") {
val jsonElement = Json.parseToJsonElement(bodyField.text)
if (jsonElement is JsonObject) {
jsonElement.toMap()
} else {
Expand Down Expand Up @@ -390,26 +434,37 @@ class SimplifiedLLMSettingComponent(private val settings: AutoDevSettingsState)
stream = streamCheckbox.isSelected
)

// Get response resolver, use default if empty
val responseResolver = responseResolverField.text.trim().ifEmpty {
if (streamCheckbox.isSelected) {
"\$.choices[0].delta.content"
} else {
"\$.choices[0].message.content"
}
}

val testConfig = LlmConfig(
name = nameField.text,
description = descriptionField.text,
url = urlField.text,
auth = Auth(type = "Bearer", token = tokenField.text),
maxTokens = maxTokens,
customRequest = customRequest,
modelType = modelTypeComboBox.selectedItem as ModelType
modelType = ModelType.Default, // Always use Default for new LLMs
responseFormat = responseResolver // Store response resolver in legacy field for compatibility
)

// Create a provider with the test config
val provider = LLMProvider2.invoke(
requestUrl = testConfig.url,
authorizationKey = testConfig.auth.token,
responseResolver = testConfig.getResponseFormatByStream(),
responseResolver = responseResolver,
requestCustomize = testConfig.toLegacyRequestFormat()
)

// Send a test message
val response = provider.request(Message("user", "Hello, this is a test message."))
val response = provider.request(Message("user", "Hello, this is a test message."),
stream = testConfig.customRequest.stream)
var responseText = ""
response.collectLatest {
responseText += it.chatMessage.content
Expand Down Expand Up @@ -454,8 +509,8 @@ class SimplifiedLLMSettingComponent(private val settings: AutoDevSettingsState)
try {
// Parse custom headers
val headers = try {
if (headersArea.text.trim().isNotEmpty() && headersArea.text.trim() != "{}") {
Json.decodeFromString<Map<String, String>>(headersArea.text)
if (headersField.text.trim().isNotEmpty() && headersField.text.trim() != "{}") {
Json.decodeFromString<Map<String, String>>(headersField.text)
} else {
emptyMap()
}
Expand All @@ -466,8 +521,8 @@ class SimplifiedLLMSettingComponent(private val settings: AutoDevSettingsState)

// Parse additional body fields and combine with explicit parameters
val additionalBody = try {
if (bodyArea.text.trim().isNotEmpty() && bodyArea.text.trim() != "{}") {
val jsonElement = Json.parseToJsonElement(bodyArea.text)
if (bodyField.text.trim().isNotEmpty() && bodyField.text.trim() != "{}") {
val jsonElement = Json.parseToJsonElement(bodyField.text)
if (jsonElement is JsonObject) {
jsonElement.toMap()
} else {
Expand Down Expand Up @@ -508,6 +563,15 @@ class SimplifiedLLMSettingComponent(private val settings: AutoDevSettingsState)
stream = streamCheckbox.isSelected
)

// Get response resolver, use default if empty
val responseResolver = responseResolverField.text.trim().ifEmpty {
if (streamCheckbox.isSelected) {
"\$.choices[0].delta.content"
} else {
"\$.choices[0].message.content"
}
}

// Create new LLM config
val newLlm = LlmConfig(
name = nameField.text,
Expand All @@ -516,7 +580,8 @@ class SimplifiedLLMSettingComponent(private val settings: AutoDevSettingsState)
auth = Auth(type = "Bearer", token = tokenField.text),
maxTokens = maxTokens,
customRequest = customRequest,
modelType = modelTypeComboBox.selectedItem as ModelType
modelType = ModelType.Default, // Always use Default for new LLMs
responseFormat = responseResolver // Store response resolver in legacy field for compatibility
)

// Add to list and update settings
Expand Down
Loading