mirror of
https://github.com/laoxong/nofx.git
synced 2026-06-04 01:48:22 +08:00
7ae5bf8247
* feat(store): prevent deletion of active strategies and update translations (#1461) Co-authored-by: Dean <afei.wuhao@gmail.com> * fix: allow model switching without re-entering wallet key Users with existing wallets could not switch AI models because the "Start Trading" button required a valid private key even when one was already configured. Now the button is enabled when hasExistingWallet is true, and handleSubmit passes an empty key so the backend preserves the existing key. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: replace window.location with useNavigate for routing in auth components (#1470) Co-authored-by: Dean <afei.wuhao@gmail.com> * feat(trader): implement margin mode handling for order and leverage settings * refactor(trader): update SetMarginMode to avoid legacy endpoint and improve logging * feat(api): enhance strategy handling by integrating claw402 wallet key validation Added validation for the claw402 model's wallet key during strategy test runs. If the selected AI model is claw402, the server now checks for a valid wallet key and returns appropriate error messages if it's missing or if the model fails to load. This ensures better error handling and user feedback when working with AI models. * refactor(api): streamline claw402 wallet key retrieval and error handling Refactored the strategy handling logic to encapsulate claw402 wallet key retrieval in a new method, `resolveStrategyDataWalletKey`. This improves code readability and maintains consistent error handling for missing or invalid wallet keys during strategy test runs. The changes enhance the overall robustness of the AI model integration. * feat(trader): add claw402 wallet key resolution for trader configuration Implemented a new method, `resolveTraderDataWalletKey`, to retrieve the claw402 wallet key based on the selected AI model and user ID. This enhancement allows for better integration of the claw402 model within the trader configuration, ensuring that the correct wallet key is used for trading operations. The `AutoTraderConfig` struct has been updated to include the new `Claw402WalletKey` field, improving the overall handling of wallet keys in the trading process. * feat(claw402): preflight USDC balance before AI calls (#1479) * chore: ignore nofx-server build artifact Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * feat(claw402): preflight USDC balance before AI calls Short-circuit claw402 Call/CallWithRequestFull when the wallet balance can't cover the estimated cost of the call, surfacing ErrInsufficientFunds instead of letting x402 fail mid-flight after the sign step. - wallet: cached balance lookup (30s TTL, per-address mutex) to avoid hammering the Base RPC; separate error-returning and display-only APIs so callers can distinguish zero balance from an unreachable RPC. - claw402: 1.5× safety multiplier on the flat per-call estimate, 4.0× for reasoner models whose chain-of-thought cost can blow past the flat rate. Fail-open on RPC errors — x402 still gates actually-empty wallets, and we prefer availability over extra strictness. - shortAddr redacts the wallet in error strings to avoid leaking the full address into telemetry bundles. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * fix(telemetry): report token usage for SSE streaming paths (#1475) * fix(telemetry): report token usage for SSE streaming paths ParseSSEStream already parsed the usage block from SSE chunks but only printed it, so claw402 streaming calls (and native streaming) never fired TokenUsageCallback. GA4 therefore undercounted AI usage on the streaming path. Return the parsed usage from ParseSSEStream and have both callers fire the callback with their own Provider/Model. * chore: drop leftover debug Printf in ParseSSEStream Telemetry is now wired via TokenUsageCallback, so the Printf is redundant noise in the stream path. * fix(gemini): update default model to gemini-3.1-pro Google discontinued gemini-3-pro-preview on 2026-03-26 and directs all callers to gemini-3.1-pro / gemini-3.1-pro-preview. Users on their own API key were getting errors from the native Gemini endpoint because the provider default pointed at the retired ID. Claw402 was unaffected because its route map already used gemini-3.1-pro. Align both the native provider default and the handler's preset list with gemini-3.1-pro so every code path sends a live model ID. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * refactor: extract ResolveClaw402WalletKey to store layer and expand OKX margin mode tests - Move duplicated claw402 wallet resolution logic into store.AIModelStore.ResolveClaw402WalletKey - api/strategy.go and manager/trader_manager.go now delegate to the shared method - Add detailed doc comment on OKX SetMarginMode explaining the local-state-only approach and why the legacy /api/v5/account/set-isolated-mode endpoint is not called - Add 3 new test cases: cross mode leverage, OpenShort tdMode, SetTakeProfit tdMode * fix(auth): prevent SetupPage remount from wiping freshly-set auth token (#1481) After #1470 moved routing into react-router, SetupPage is rendered at two different tree positions (top-level guard + /setup Route). When register success flushSync-sets `user`, the top-level guard stops matching and the Route-level SetupPage mounts as a new instance, re-running its cleanup useEffect and removing the auth_token that handlePostAuthSuccess just wrote. Subsequent requests 401 and bounce the user back to /login. Redirect /setup to /welcome when user is already set so SetupPage is never re-mounted during the auth transition. * fix(wallet): handle JSON-RPC null error field in balance query Some RPC implementations return explicit "error": null on success. json.RawMessage deserializes this as the 4-byte literal "null", so len() > 0 was true, causing every balance query to fail with "rpc error: null". Skip the null literal to avoid false positives. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: deanokk <wuhao@vergex.trade> Co-authored-by: Dean <afei.wuhao@gmail.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: root <root@localhost.localdomain>
306 lines
8.9 KiB
Go
306 lines
8.9 KiB
Go
package store
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"nofx/crypto"
|
|
"nofx/logger"
|
|
"strings"
|
|
"time"
|
|
|
|
"gorm.io/gorm"
|
|
)
|
|
|
|
// AIModelStore AI model storage
|
|
type AIModelStore struct {
|
|
db *gorm.DB
|
|
}
|
|
|
|
// AIModel AI model configuration
|
|
type AIModel struct {
|
|
ID string `gorm:"primaryKey" json:"id"`
|
|
UserID string `gorm:"column:user_id;not null;default:default;index" json:"user_id"`
|
|
Name string `gorm:"not null" json:"name"`
|
|
Provider string `gorm:"not null" json:"provider"`
|
|
Enabled bool `gorm:"default:false" json:"enabled"`
|
|
APIKey crypto.EncryptedString `gorm:"column:api_key;default:''" json:"apiKey"`
|
|
CustomAPIURL string `gorm:"column:custom_api_url;default:''" json:"customApiUrl"`
|
|
CustomModelName string `gorm:"column:custom_model_name;default:''" json:"customModelName"`
|
|
CreatedAt time.Time `json:"created_at"`
|
|
UpdatedAt time.Time `json:"updated_at"`
|
|
}
|
|
|
|
func (AIModel) TableName() string { return "ai_models" }
|
|
|
|
// NewAIModelStore creates a new AIModelStore
|
|
func NewAIModelStore(db *gorm.DB) *AIModelStore {
|
|
return &AIModelStore{db: db}
|
|
}
|
|
|
|
func (s *AIModelStore) initTables() error {
|
|
// For PostgreSQL with existing table, skip AutoMigrate
|
|
if s.db.Dialector.Name() == "postgres" {
|
|
var tableExists int64
|
|
s.db.Raw(`SELECT COUNT(*) FROM information_schema.tables WHERE table_name = 'ai_models'`).Scan(&tableExists)
|
|
if tableExists > 0 {
|
|
return nil
|
|
}
|
|
}
|
|
return s.db.AutoMigrate(&AIModel{})
|
|
}
|
|
|
|
func (s *AIModelStore) initDefaultData() error {
|
|
// No longer pre-populate AI models - create on demand when user configures
|
|
return nil
|
|
}
|
|
|
|
// FindOrphanClaw402 finds a claw402 model whose user_id no longer exists in the users table.
|
|
// Used to recover wallets after account reset.
|
|
func (s *AIModelStore) FindOrphanClaw402() (*AIModel, error) {
|
|
var model AIModel
|
|
err := s.db.Where("provider = ? AND api_key != '' AND user_id NOT IN (SELECT id FROM users)", "claw402").
|
|
First(&model).Error
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &model, nil
|
|
}
|
|
|
|
// AdoptModel re-assigns an existing model to a new user.
|
|
func (s *AIModelStore) AdoptModel(modelID, newUserID string) error {
|
|
return s.db.Model(&AIModel{}).Where("id = ?", modelID).
|
|
Update("user_id", newUserID).Error
|
|
}
|
|
|
|
// List retrieves user's AI model list
|
|
func (s *AIModelStore) List(userID string) ([]*AIModel, error) {
|
|
var models []*AIModel
|
|
err := s.db.Where("user_id = ?", userID).Order("id").Find(&models).Error
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return models, nil
|
|
}
|
|
|
|
// Get retrieves a single AI model
|
|
func (s *AIModelStore) Get(userID, modelID string) (*AIModel, error) {
|
|
if modelID == "" {
|
|
return nil, fmt.Errorf("model ID cannot be empty")
|
|
}
|
|
|
|
candidates := []string{}
|
|
if userID != "" {
|
|
candidates = append(candidates, userID)
|
|
}
|
|
if userID != "default" {
|
|
candidates = append(candidates, "default")
|
|
}
|
|
if len(candidates) == 0 {
|
|
candidates = append(candidates, "default")
|
|
}
|
|
|
|
for _, uid := range candidates {
|
|
var model AIModel
|
|
err := s.db.Where("user_id = ? AND id = ?", uid, modelID).First(&model).Error
|
|
if err == nil {
|
|
return &model, nil
|
|
}
|
|
if !errors.Is(err, gorm.ErrRecordNotFound) {
|
|
return nil, err
|
|
}
|
|
}
|
|
return nil, gorm.ErrRecordNotFound
|
|
}
|
|
|
|
// GetByID retrieves an AI model by ID only
|
|
func (s *AIModelStore) GetByID(modelID string) (*AIModel, error) {
|
|
if modelID == "" {
|
|
return nil, fmt.Errorf("model ID cannot be empty")
|
|
}
|
|
|
|
var model AIModel
|
|
err := s.db.Where("id = ?", modelID).First(&model).Error
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &model, nil
|
|
}
|
|
|
|
// GetDefault retrieves the default enabled AI model
|
|
func (s *AIModelStore) GetDefault(userID string) (*AIModel, error) {
|
|
if userID == "" {
|
|
userID = "default"
|
|
}
|
|
model, err := s.firstEnabled(userID)
|
|
if err == nil {
|
|
return model, nil
|
|
}
|
|
if !errors.Is(err, gorm.ErrRecordNotFound) {
|
|
return nil, err
|
|
}
|
|
if userID != "default" {
|
|
return s.firstEnabled("default")
|
|
}
|
|
return nil, fmt.Errorf("please configure an available AI model in the system first")
|
|
}
|
|
|
|
func (s *AIModelStore) firstEnabled(userID string) (*AIModel, error) {
|
|
var model AIModel
|
|
err := s.db.Where("user_id = ? AND enabled = ?", userID, true).
|
|
Order("updated_at DESC, id ASC").
|
|
First(&model).Error
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &model, nil
|
|
}
|
|
|
|
// GetAnyEnabled returns the first enabled AI model across all users.
|
|
// Used by single-user features (e.g. Telegram bot) that need any working LLM client.
|
|
func (s *AIModelStore) GetAnyEnabled() (*AIModel, error) {
|
|
var model AIModel
|
|
err := s.db.Where("enabled = ? AND api_key != ''", true).
|
|
Order("updated_at DESC, id ASC").
|
|
First(&model).Error
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &model, nil
|
|
}
|
|
|
|
// Update updates AI model, creates if not exists
|
|
// IMPORTANT: If apiKey is empty string, the existing API key will be preserved (not overwritten)
|
|
func (s *AIModelStore) Update(userID, id string, enabled bool, apiKey, customAPIURL, customModelName string) error {
|
|
// Try exact ID match first
|
|
var existingModel AIModel
|
|
err := s.db.Where("user_id = ? AND id = ?", userID, id).First(&existingModel).Error
|
|
if err == nil {
|
|
// Update existing model
|
|
updates := map[string]interface{}{
|
|
"enabled": enabled,
|
|
"custom_api_url": customAPIURL,
|
|
"custom_model_name": customModelName,
|
|
"updated_at": time.Now().UTC(),
|
|
}
|
|
// If apiKey is not empty, update it (encryption handled by crypto.EncryptedString)
|
|
if apiKey != "" {
|
|
updates["api_key"] = crypto.EncryptedString(apiKey)
|
|
}
|
|
return s.db.Model(&existingModel).Updates(updates).Error
|
|
}
|
|
|
|
// Try legacy logic compatibility: use id as provider to search
|
|
provider := id
|
|
err = s.db.Where("user_id = ? AND provider = ?", userID, provider).First(&existingModel).Error
|
|
if err == nil {
|
|
logger.Warnf("⚠️ Using legacy provider matching to update model: %s -> %s", provider, existingModel.ID)
|
|
updates := map[string]interface{}{
|
|
"enabled": enabled,
|
|
"custom_api_url": customAPIURL,
|
|
"custom_model_name": customModelName,
|
|
"updated_at": time.Now().UTC(),
|
|
}
|
|
if apiKey != "" {
|
|
updates["api_key"] = crypto.EncryptedString(apiKey)
|
|
}
|
|
return s.db.Model(&existingModel).Updates(updates).Error
|
|
}
|
|
|
|
// Create new record
|
|
if provider == id && (provider == "deepseek" || provider == "qwen") {
|
|
provider = id
|
|
} else {
|
|
parts := strings.Split(id, "_")
|
|
if len(parts) >= 2 {
|
|
provider = parts[len(parts)-1]
|
|
} else {
|
|
provider = id
|
|
}
|
|
}
|
|
|
|
// Try to get name from existing model with same provider
|
|
var refModel AIModel
|
|
var name string
|
|
if err := s.db.Where("provider = ?", provider).First(&refModel).Error; err == nil {
|
|
name = refModel.Name
|
|
} else {
|
|
if provider == "deepseek" {
|
|
name = "DeepSeek AI"
|
|
} else if provider == "qwen" {
|
|
name = "Qwen AI"
|
|
} else {
|
|
name = provider + " AI"
|
|
}
|
|
}
|
|
|
|
newModelID := id
|
|
if id == provider {
|
|
newModelID = fmt.Sprintf("%s_%s", userID, provider)
|
|
}
|
|
|
|
logger.Infof("✓ Creating new AI model configuration: ID=%s, Provider=%s, Name=%s", newModelID, provider, name)
|
|
newModel := &AIModel{
|
|
ID: newModelID,
|
|
UserID: userID,
|
|
Name: name,
|
|
Provider: provider,
|
|
Enabled: enabled,
|
|
APIKey: crypto.EncryptedString(apiKey),
|
|
CustomAPIURL: customAPIURL,
|
|
CustomModelName: customModelName,
|
|
}
|
|
return s.db.Create(newModel).Error
|
|
}
|
|
|
|
// Create creates an AI model
|
|
// ResolveClaw402WalletKey returns the claw402 wallet private key for a user.
|
|
// If preferredModelID is non-empty and points to a claw402 model, its key is returned first.
|
|
// Otherwise the first enabled claw402 model in the user's model list is used.
|
|
// Returns ("", nil) when no claw402 model is configured — callers should treat this as
|
|
// "no paid data routing" rather than an error.
|
|
func (s *AIModelStore) ResolveClaw402WalletKey(userID, preferredModelID string) (string, error) {
|
|
if preferredModelID != "" {
|
|
model, err := s.Get(userID, preferredModelID)
|
|
if err != nil {
|
|
return "", fmt.Errorf("failed to load selected AI model")
|
|
}
|
|
if model.Provider == "claw402" {
|
|
walletKey := string(model.APIKey)
|
|
if walletKey == "" {
|
|
return "", fmt.Errorf("selected claw402 model is missing wallet private key")
|
|
}
|
|
return walletKey, nil
|
|
}
|
|
}
|
|
|
|
models, err := s.List(userID)
|
|
if err != nil {
|
|
return "", fmt.Errorf("failed to load AI models")
|
|
}
|
|
|
|
for _, model := range models {
|
|
if model == nil || model.Provider != "claw402" {
|
|
continue
|
|
}
|
|
if walletKey := string(model.APIKey); walletKey != "" {
|
|
return walletKey, nil
|
|
}
|
|
}
|
|
|
|
return "", nil
|
|
}
|
|
|
|
func (s *AIModelStore) Create(userID, id, name, provider string, enabled bool, apiKey, customAPIURL string) error {
|
|
model := &AIModel{
|
|
ID: id,
|
|
UserID: userID,
|
|
Name: name,
|
|
Provider: provider,
|
|
Enabled: enabled,
|
|
APIKey: crypto.EncryptedString(apiKey),
|
|
CustomAPIURL: customAPIURL,
|
|
}
|
|
// Use FirstOrCreate to ignore if already exists
|
|
return s.db.Where("id = ?", id).FirstOrCreate(model).Error
|
|
}
|