Skip to content

feat(settings): 优化GitHub模型加载和占位符替换机制 #418

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
Jun 17, 2025
Merged

feat(settings): 优化GitHub模型加载和占位符替换机制 #418

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
60 changes: 49 additions & 11 deletions core/src/main/kotlin/cc/unitmesh/devti/settings/model/LLMModelManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,20 +247,46 @@ class LLMModelManager(
}
}
} else {
// Initialize GitHub Copilot in background and update UI when ready
// Initialize GitHub Copilot in background and incrementally add models
AutoDevAppScope.workerScope().launch {
try {
GithubCopilotManager.getInstance().initialize()
// After initialization, update the UI on the EDT
// Get fresh GitHub models after initialization
val freshGithubModels = manager.getSupportedModels(forceRefresh = false)

// Add GitHub models incrementally without clearing existing items
SwingUtilities.invokeLater {
updateAllDropdowns(
defaultModelDropdown,
planLLMDropdown,
actLLMDropdown,
completionLLMDropdown,
embeddingLLMDropdown,
fastApplyLLMDropdown
)
freshGithubModels?.forEach { model ->
val modelItem = ModelItem("Github: ${model.id}", model.id, false)

// Check if we need to replace placeholder items
fun ComboBox<ModelItem>.replaceOrAddModel(newItem: ModelItem) {
// Look for placeholder with same modelId
for (i in 0 until this.itemCount) {
val existingItem = this.getItemAt(i)
if (existingItem.modelId == newItem.modelId &&
existingItem.displayName.contains("(loading...)")) {
// Replace placeholder with real model
this.removeItemAt(i)
this.insertItemAt(newItem, i)
this.selectedItem = newItem
return
}
}
// No placeholder found, just add the model
this.addItem(newItem)
}

if (model.isEmbedding) {
embeddingLLMDropdown.replaceOrAddModel(modelItem)
} else {
defaultModelDropdown.replaceOrAddModel(modelItem)
planLLMDropdown.replaceOrAddModel(modelItem)
actLLMDropdown.replaceOrAddModel(modelItem)
completionLLMDropdown.replaceOrAddModel(modelItem)
fastApplyLLMDropdown.replaceOrAddModel(modelItem)
}
}
}
} catch (e: Exception) {
// Silently handle initialization failures
Expand Down Expand Up @@ -301,13 +327,25 @@ class LLMModelManager(
fun ComboBox<ModelItem>.selectModelById(modelId: String) {
if (modelId.isEmpty()) return

// First try to find existing item
for (i in 0 until this.itemCount) {
val item = this.getItemAt(i)
if (item.modelId == modelId) {
this.selectedItem = item
break
return
}
}

// If not found, check if it's likely a GitHub Copilot model
val userModels = LlmConfig.load()
val isUserCustomModel = userModels.any { it.name == modelId }

if (!isUserCustomModel && modelId.isNotEmpty()) {
// This is likely a GitHub Copilot model that's not loaded yet
val placeholderItem = ModelItem("Github: $modelId (loading...)", modelId, false)
this.addItem(placeholderItem)
this.selectedItem = placeholderItem
}
}

// Set default model
Expand Down
Loading