mirror of
https://github.com/NoFxAiOS/nofx.git
synced 2026-07-14 16:26:57 +08:00
merge: resolve conflicts from origin/dev into PR #1495
- Use PR branch (dev-nofxi) as authority for agent/ module code - Merge dev's newer model names (MiniMax-M2.7, deepseek-v4-flash) with PR's blockrun provider entries - Fix duplicate agent init in main.go, keep defer-based Stop() - Fix var type bug in store/ai_model.go (model → models) - Remove dev-only test files incompatible with PR's evolved agent code (to be re-synced after merge) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -22,18 +22,20 @@ func (AICharge) TableName() string { return "ai_charges" }
|
||||
var modelPrices = map[string]float64{
|
||||
"deepseek": 0.003,
|
||||
"deepseek-reasoner": 0.005,
|
||||
"deepseek-v4-flash": 0.003,
|
||||
"deepseek-v4-pro": 0.01,
|
||||
"gpt-5.4": 0.05,
|
||||
"gpt-5.4-pro": 0.50,
|
||||
"gpt-5.3": 0.01,
|
||||
"gpt-5-mini": 0.005,
|
||||
"claude-opus": 0.12,
|
||||
"qwen-max": 0.01,
|
||||
"qwen-plus": 0.005,
|
||||
"qwen-turbo": 0.002,
|
||||
"qwen-flash": 0.002,
|
||||
"grok-4.1": 0.06,
|
||||
"gemini-3.1-pro": 0.03,
|
||||
"kimi-k2.5": 0.008,
|
||||
"claude-opus": 0.12,
|
||||
"qwen-max": 0.01,
|
||||
"qwen-plus": 0.005,
|
||||
"qwen-turbo": 0.002,
|
||||
"qwen-flash": 0.002,
|
||||
"grok-4.1": 0.06,
|
||||
"gemini-3.1-pro": 0.03,
|
||||
"kimi-k2.5": 0.008,
|
||||
}
|
||||
|
||||
// GetModelPrice returns the price per call for a given model
|
||||
|
||||
@@ -147,7 +147,7 @@ func (s *AIModelStore) GetDefault(userID string) (*AIModel, error) {
|
||||
|
||||
func (s *AIModelStore) firstEnabledUsable(userID string) (*AIModel, error) {
|
||||
var models []AIModel
|
||||
err := s.db.Where("user_id = ? AND enabled = ?", userID, true).
|
||||
err := s.db.Where("user_id = ? AND enabled = ? AND api_key != ''", userID, true).
|
||||
Order("updated_at DESC, id ASC").
|
||||
Find(&models).Error
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user