From 8dd74b3d8423ebe931660fd8a9d2a0db2499dca6 Mon Sep 17 00:00:00 2001 From: Carl-Robert Linnupuu Date: Thu, 14 Nov 2024 00:16:17 +0000 Subject: [PATCH] feat: add Qwen 2.5 Coder (32B) model (CodeGPT) --- .../service/codegpt/CodeGPTAvailableModels.kt | 41 +++++++++---------- .../CustomServiceChatCompletionTemplate.kt | 2 +- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/main/kotlin/ee/carlrobert/codegpt/settings/service/codegpt/CodeGPTAvailableModels.kt b/src/main/kotlin/ee/carlrobert/codegpt/settings/service/codegpt/CodeGPTAvailableModels.kt index 831cdd4f..a2461764 100644 --- a/src/main/kotlin/ee/carlrobert/codegpt/settings/service/codegpt/CodeGPTAvailableModels.kt +++ b/src/main/kotlin/ee/carlrobert/codegpt/settings/service/codegpt/CodeGPTAvailableModels.kt @@ -7,17 +7,18 @@ import javax.swing.Icon object CodeGPTAvailableModels { - val DEFAULT_CHAT_MODEL = CodeGPTModel("GPT-4o", "gpt-4o", Icons.OpenAI, FREE) - val DEFAULT_CODE_MODEL = CodeGPTModel("GPT-3.5 Turbo Instruct", "gpt-3.5-turbo-instruct", Icons.OpenAI, INDIVIDUAL) + val DEFAULT_CHAT_MODEL = CodeGPTModel("GPT-4o", "gpt-4o", Icons.OpenAI, INDIVIDUAL) + val DEFAULT_CODE_MODEL = CodeGPTModel("GPT-3.5 Turbo Instruct", "gpt-3.5-turbo-instruct", Icons.OpenAI, FREE) @JvmStatic fun getToolWindowModels(pricingPlan: PricingPlan?): List { return when (pricingPlan) { null, ANONYMOUS -> listOf( CodeGPTModel("o1-mini", "o1-mini", Icons.OpenAI, INDIVIDUAL), - CodeGPTModel("GPT-4o", "gpt-4o", Icons.OpenAI, FREE), - CodeGPTModel("Claude 3.5 Sonnet", "claude-3.5-sonnet", Icons.Anthropic, FREE), - CodeGPTModel("Gemini 1.5 Pro", "gemini-pro-1.5", Icons.Google, FREE), + CodeGPTModel("GPT-4o", "gpt-4o", Icons.OpenAI, INDIVIDUAL), + CodeGPTModel("Claude 3.5 Sonnet", "claude-3.5-sonnet", Icons.Anthropic, INDIVIDUAL), + CodeGPTModel("Gemini 1.5 Pro", "gemini-pro-1.5", Icons.Google, INDIVIDUAL), + CodeGPTModel("Qwen 2.5 Coder (32B)", "qwen-2.5-32b-chat", Icons.Qwen, FREE), CodeGPTModel("Llama 3.1 (405B)", "llama-3.1-405b", Icons.Meta, FREE), CodeGPTModel("DeepSeek Coder V2 - FREE", "deepseek-coder-v2", Icons.DeepSeek, ANONYMOUS), CodeGPTModel("GPT-4o mini - FREE", "gpt-4o-mini", Icons.OpenAI, ANONYMOUS), @@ -25,22 +26,21 @@ object CodeGPTAvailableModels { FREE -> listOf( CodeGPTModel("o1-mini", "o1-mini", Icons.OpenAI, INDIVIDUAL), - CodeGPTModel("GPT-4o", "gpt-4o", Icons.OpenAI, FREE), - CodeGPTModel("Claude 3.5 Sonnet", "claude-3.5-sonnet", Icons.Anthropic, FREE), - CodeGPTModel("Gemini 1.5 Pro", "gemini-pro-1.5", Icons.Google, FREE), + CodeGPTModel("GPT-4o", "gpt-4o", Icons.OpenAI, INDIVIDUAL), + CodeGPTModel("Claude 3.5 Sonnet", "claude-3.5-sonnet", Icons.Anthropic, INDIVIDUAL), + CodeGPTModel("Gemini 1.5 Pro", "gemini-pro-1.5", Icons.Google, INDIVIDUAL), + CodeGPTModel("Qwen 2.5 Coder (32B)", "qwen-2.5-32b-chat", Icons.Qwen, FREE), CodeGPTModel("Llama 3.1 (405B)", "llama-3.1-405b", Icons.Meta, FREE), CodeGPTModel("DeepSeek Coder V2", "deepseek-coder-v2", Icons.DeepSeek, ANONYMOUS), - CodeGPTModel("Qwen 2.5 (72B)", "qwen-2.5-72b", Icons.Qwen, FREE), - CodeGPTModel("Mixtral (8x22B)", "mixtral-8x22b", Icons.Mistral, FREE), ) INDIVIDUAL -> listOf( CodeGPTModel("o1-mini", "o1-mini", Icons.OpenAI, INDIVIDUAL), - CodeGPTModel("GPT-4o", "gpt-4o", Icons.OpenAI, FREE), - CodeGPTModel("Claude 3.5 Sonnet", "claude-3.5-sonnet", Icons.Anthropic, FREE), - CodeGPTModel("Gemini 1.5 Pro", "gemini-pro-1.5", Icons.Google, FREE), + CodeGPTModel("GPT-4o", "gpt-4o", Icons.OpenAI, INDIVIDUAL), + CodeGPTModel("Claude 3.5 Sonnet", "claude-3.5-sonnet", Icons.Anthropic, INDIVIDUAL), + CodeGPTModel("Gemini 1.5 Pro", "gemini-pro-1.5", Icons.Google, INDIVIDUAL), + CodeGPTModel("Qwen 2.5 Coder (32B)", "qwen-2.5-32b-chat", Icons.Qwen, FREE), CodeGPTModel("Llama 3.1 (405B)", "llama-3.1-405b", Icons.Meta, FREE), - CodeGPTModel("DeepSeek Coder V2", "deepseek-coder-v2", Icons.DeepSeek, FREE), ) } } @@ -48,21 +48,20 @@ object CodeGPTAvailableModels { @JvmStatic val ALL_CHAT_MODELS: List = listOf( CodeGPTModel("o1-mini", "o1-mini", Icons.OpenAI, INDIVIDUAL), - CodeGPTModel("GPT-4o", "gpt-4o", Icons.OpenAI, FREE), + CodeGPTModel("GPT-4o", "gpt-4o", Icons.OpenAI, INDIVIDUAL), CodeGPTModel("GPT-4o mini", "gpt-4o-mini", Icons.OpenAI, ANONYMOUS), - CodeGPTModel("Claude 3.5 Sonnet", "claude-3.5-sonnet", Icons.Anthropic, FREE), - CodeGPTModel("Gemini 1.5 Pro", "gemini-pro-1.5", Icons.Google, FREE), + CodeGPTModel("Claude 3.5 Sonnet", "claude-3.5-sonnet", Icons.Anthropic, INDIVIDUAL), + CodeGPTModel("Gemini 1.5 Pro", "gemini-pro-1.5", Icons.Google, INDIVIDUAL), + CodeGPTModel("Qwen 2.5 Coder (32B)", "qwen-2.5-32b-chat", Icons.Qwen, FREE), CodeGPTModel("Llama 3.1 (405B)", "llama-3.1-405b", Icons.Meta, FREE), CodeGPTModel("DeepSeek Coder V2", "deepseek-coder-v2", Icons.DeepSeek, FREE), - CodeGPTModel("Mixtral (8x22B)", "mixtral-8x22b", Icons.Mistral, FREE), - CodeGPTModel("Qwen 2.5 (72B)", "qwen-2.5-72b", Icons.Qwen, FREE), ) @JvmStatic val ALL_CODE_MODELS: List = listOf( + CodeGPTModel("Qwen 2.5 Coder (32B)", "qwen-2.5-32b-code", Icons.Qwen, FREE), DEFAULT_CODE_MODEL, - CodeGPTModel("StarCoder (7B) - FREE", "starcoder-7b", Icons.CodeGPTModel, FREE), - CodeGPTModel("WizardCoder Python (34B)", "wizardcoder-python", Icons.CodeGPTModel, FREE), + CodeGPTModel("StarCoder (7B) - FREE", "starcoder-7b", Icons.CodeGPTModel, ANONYMOUS), ) @JvmStatic diff --git a/src/main/kotlin/ee/carlrobert/codegpt/settings/service/custom/template/CustomServiceChatCompletionTemplate.kt b/src/main/kotlin/ee/carlrobert/codegpt/settings/service/custom/template/CustomServiceChatCompletionTemplate.kt index ff133926..8f9684b1 100644 --- a/src/main/kotlin/ee/carlrobert/codegpt/settings/service/custom/template/CustomServiceChatCompletionTemplate.kt +++ b/src/main/kotlin/ee/carlrobert/codegpt/settings/service/custom/template/CustomServiceChatCompletionTemplate.kt @@ -35,7 +35,7 @@ enum class CustomServiceChatCompletionTemplate( getDefaultHeadersWithAuthentication(), getDefaultBodyParams( mapOf( - "model" to "accounts/fireworks/models/llama-v2-7b-chat", + "model" to "accounts/fireworks/models/qwen2p5-coder-32b-instruct", "max_tokens" to 1024 ) )