From f46cad437957a94de134c0c9692550f4bb6a8028 Mon Sep 17 00:00:00 2001 From: shokollm <270575765+shokollm@users.noreply.github.com> Date: Wed, 15 Apr 2026 15:20:42 +0000 Subject: [PATCH] WIP: Multiple fixes and improvements Backend: - Fixed auth issue where get_optional_user wasn't properly extracting tokens - Added user_id to conversational agent for proper auth context - Fixed DCA buy logic to support multiple buys on dips - Fixed sell logic to use amount_percent - Added comprehensive backtest engine tests - Fixed kline data validation for bad price data - Fixed chained tool calls handling Frontend: - BotCard now links to chat page instead of bot page - Chat page handles direct bot loading from dashboard - Various UI improvements and fixes Tests: - Added test_agent.py with mock client tests - Added test_backtest_engine.py with 7 comprehensive tests --- src/backend/app/api/auth.py | 37 +- src/backend/app/api/backtest.py | 46 +- src/backend/app/api/bots.py | 82 +- src/backend/app/api/conversations.py | 201 ++- src/backend/app/db/models.py | 9 +- src/backend/app/db/schemas.py | 2 +- src/backend/app/main.py | 4 +- src/backend/app/services/ai_agent/agent.py | 1093 ++++++++++++++++- src/backend/app/services/ai_agent/client.py | 173 ++- .../app/services/ai_agent/mock_client.py | 164 +++ src/backend/app/services/backtest/engine.py | 107 +- src/backend/tests/test_agent.py | 609 +++++++++ src/backend/tests/test_backtest_engine.py | 926 +++++++------- src/frontend/src/lib/api/client.ts | 12 +- .../src/lib/components/AnonymousBanner.svelte | 83 +- .../src/lib/components/AppHeader.svelte | 115 ++ .../src/lib/components/BotCard.svelte | 30 +- .../src/lib/components/BotInfoPanel.svelte | 477 +++++-- .../src/lib/components/ChatArea.svelte | 244 ++-- .../src/lib/components/ChatInput.svelte | 141 +-- .../src/lib/components/ChatInterface.svelte | 133 +- .../src/lib/components/ChatLayout.svelte | 99 +- .../lib/components/ConversationList.svelte | 190 ++- src/frontend/src/lib/components/index.ts | 3 +- src/frontend/src/lib/stores/chatStore.ts | 2 +- src/frontend/src/lib/utils/markdown.ts | 2 +- src/frontend/src/routes/+layout.svelte | 7 + src/frontend/src/routes/+page.svelte | 3 +- src/frontend/src/routes/bot/[id]/+page.svelte | 2 +- src/frontend/src/routes/chat/+page.svelte | 103 +- .../routes/chat/[conversationId]/+page.svelte | 542 ++++++-- .../src/routes/dashboard/+page.svelte | 4 +- src/frontend/src/routes/home/+page.svelte | 164 ++- 33 files changed, 4642 insertions(+), 1167 deletions(-) create mode 100644 src/backend/app/services/ai_agent/mock_client.py create mode 100644 src/backend/tests/test_agent.py create mode 100644 src/frontend/src/lib/components/AppHeader.svelte diff --git a/src/backend/app/api/auth.py b/src/backend/app/api/auth.py index 9869fae..a03d0a5 100644 --- a/src/backend/app/api/auth.py +++ b/src/backend/app/api/auth.py @@ -1,7 +1,7 @@ from fastapi import APIRouter, Depends, HTTPException, status, Request -from fastapi.security import OAuth2PasswordBearer +from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm from sqlalchemy.orm import Session -from typing import Annotated +from typing import Optional, Annotated from ..core.database import get_db from ..core.security import ( @@ -26,6 +26,14 @@ router = APIRouter() settings = get_settings() oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/auth/login") +# Custom optional token extractor that doesn't raise on missing token +def get_optional_token(request: Request) -> Optional[str]: + """Extract bearer token from Authorization header, returning None if not present.""" + auth_header = request.headers.get("Authorization") + if auth_header and auth_header.startswith("Bearer "): + return auth_header[7:] # Remove "Bearer " prefix + return None + TOKEN_BLACKLIST = set() @@ -58,6 +66,31 @@ def get_current_user( return user +def get_optional_user( + request: Request, + db: Session = Depends(get_db), +) -> Optional[User]: + """Get current user, returning None if not authenticated.""" + token = get_optional_token(request) + + if not token: + return None + + if token in TOKEN_BLACKLIST: + return None + + payload = verify_token(token) + if payload is None: + return None + + user_id = payload.get("sub") + if user_id is None: + return None + + user = db.query(User).filter(User.id == user_id).first() + return user + + @router.post( "/register", response_model=Token, status_code=status.HTTP_201_CREATED ) diff --git a/src/backend/app/api/backtest.py b/src/backend/app/api/backtest.py index a0debd1..3e7fa74 100644 --- a/src/backend/app/api/backtest.py +++ b/src/backend/app/api/backtest.py @@ -1,16 +1,17 @@ import uuid import asyncio from datetime import datetime -from fastapi import APIRouter, Depends, HTTPException, status, BackgroundTasks +from fastapi import APIRouter, Depends, HTTPException, status, BackgroundTasks, Request from sqlalchemy.orm import Session -from typing import List, Dict, Any, Optional +from typing import List, Dict, Any, Optional, Union from concurrent.futures import ThreadPoolExecutor -from .auth import get_current_user +from .auth import get_optional_user, get_current_user from ..core.database import get_db from ..core.config import get_settings from ..db.schemas import BacktestCreate, BacktestResponse -from ..db.models import Bot, Backtest, Signal, User +from ..db.models import Bot, Backtest, Signal, User, AnonymousUser +from ..services.rate_limiter import RateLimiter router = APIRouter() @@ -88,18 +89,41 @@ async def start_backtest( bot_id: str, config: BacktestCreate, background_tasks: BackgroundTasks, - current_user: User = Depends(get_current_user), + current_user: Optional[User] = Depends(get_optional_user), db: Session = Depends(get_db), + request: Request = None, ): bot = db.query(Bot).filter(Bot.id == bot_id).first() if not bot: raise HTTPException( status_code=status.HTTP_404_NOT_FOUND, detail="Bot not found" ) - if bot.user_id != current_user.id: - raise HTTPException( - status_code=status.HTTP_403_FORBIDDEN, detail="Not authorized" - ) + + # Check authorization + if current_user: + # Authenticated user - must own the bot + if bot.user_id != current_user.id: + raise HTTPException( + status_code=status.HTTP_403_FORBIDDEN, detail="Not authorized" + ) + else: + # Anonymous user - can only run backtests on anonymous bots (user_id = None) + if bot.user_id is not None: + raise HTTPException( + status_code=status.HTTP_403_FORBIDDEN, + detail="You need to be logged in to run backtests on this bot" + ) + + # Rate limit anonymous backtests + anonymous_token = request.cookies.get("anonymous_token") if request else None + if anonymous_token: + try: + RateLimiter.check_anonymous_backtest_limit(db, anonymous_token) + except HTTPException as e: + raise HTTPException( + status_code=status.HTTP_403_FORBIDDEN, + detail="You've reached the maximum of 1 backtest as an anonymous user. Please login or create an account for unlimited backtests." + ) settings = get_settings() backtest_id = str(uuid.uuid4()) @@ -134,6 +158,10 @@ async def start_backtest( db.commit() db.refresh(backtest) + # Increment anonymous backtest count + if not current_user and anonymous_token: + RateLimiter.increment_backtest_count(db, anonymous_token) + db_url = str(settings.DATABASE_URL) background_tasks.add_task( run_backtest_sync, backtest_id, db_url, bot_id, backtest_config diff --git a/src/backend/app/api/bots.py b/src/backend/app/api/bots.py index a37740a..a2857a2 100644 --- a/src/backend/app/api/bots.py +++ b/src/backend/app/api/bots.py @@ -1,8 +1,8 @@ from fastapi import APIRouter, Depends, HTTPException, status from sqlalchemy.orm import Session -from typing import List, Annotated +from typing import List, Annotated, Optional -from .auth import get_current_user +from .auth import get_current_user, get_optional_user from ..core.database import get_db from ..core.config import get_settings from ..db.schemas import ( @@ -71,7 +71,7 @@ def create_bot( @router.get("/{bot_id}", response_model=BotResponse) def get_bot( bot_id: str, - current_user: Annotated[User, Depends(get_current_user)], + current_user: Optional[User] = Depends(get_optional_user), db: Session = Depends(get_db), ): bot = db.query(Bot).filter(Bot.id == bot_id).first() @@ -80,11 +80,22 @@ def get_bot( status_code=status.HTTP_404_NOT_FOUND, detail="Bot not found", ) - if bot.user_id != current_user.id: - raise HTTPException( - status_code=status.HTTP_403_FORBIDDEN, - detail="Not authorized to access this bot", - ) + + # Check authorization + if current_user: + # Authenticated user - must own the bot + if bot.user_id != current_user.id: + raise HTTPException( + status_code=status.HTTP_403_FORBIDDEN, + detail="Not authorized to access this bot", + ) + else: + # Anonymous user - can only access anonymous bots (user_id = None) + if bot.user_id is not None: + raise HTTPException( + status_code=status.HTTP_403_FORBIDDEN, + detail="Not authorized to access this bot", + ) return bot @@ -163,7 +174,7 @@ def delete_bot( def chat( bot_id: str, request: BotChatRequest, - current_user: Annotated[User, Depends(get_current_user)], + current_user: Optional[User] = Depends(get_optional_user), db: Session = Depends(get_db), ): bot = db.query(Bot).filter(Bot.id == bot_id).first() @@ -172,11 +183,21 @@ def chat( status_code=status.HTTP_404_NOT_FOUND, detail="Bot not found", ) - if bot.user_id != current_user.id: - raise HTTPException( - status_code=status.HTTP_403_FORBIDDEN, - detail="Not authorized to chat with this bot", - ) + # Check authorization + if current_user: + # Authenticated user - must own the bot + if bot.user_id != current_user.id: + raise HTTPException( + status_code=status.HTTP_403_FORBIDDEN, + detail="Not authorized to chat with this bot", + ) + else: + # Anonymous user - can only chat with anonymous bots (user_id = None) + if bot.user_id is not None: + raise HTTPException( + status_code=status.HTTP_403_FORBIDDEN, + detail="Not authorized to chat with this bot", + ) conversation_history = ( db.query(BotConversation) @@ -190,9 +211,18 @@ def chat( ] user_message = request.message + + import logging + logger = logging.getLogger(__name__) + logger.warning(f"chat endpoint: current_user={current_user}, user_id={current_user.id if current_user else None}") # Use ConversationalAgent for natural chat with tool-calling - agent = get_conversational_agent(bot_id=bot_id) + agent = get_conversational_agent( + bot_id=bot_id, + user_id=current_user.id if current_user else None + ) + logger.warning(f"chat endpoint: agent.user_id={agent.user_id}") + result = agent.chat(user_message, history_for_agent) assistant_content = result.get("response", "I couldn't process your request.") @@ -234,7 +264,7 @@ def chat( @router.get("/{bot_id}/history", response_model=List[BotConversationResponse]) def get_history( bot_id: str, - current_user: Annotated[User, Depends(get_current_user)], + current_user: Optional[User] = Depends(get_optional_user), db: Session = Depends(get_db), ): bot = db.query(Bot).filter(Bot.id == bot_id).first() @@ -243,11 +273,21 @@ def get_history( status_code=status.HTTP_404_NOT_FOUND, detail="Bot not found", ) - if bot.user_id != current_user.id: - raise HTTPException( - status_code=status.HTTP_403_FORBIDDEN, - detail="Not authorized to access this bot's history", - ) + # Check authorization + if current_user: + # Authenticated user - must own the bot + if bot.user_id != current_user.id: + raise HTTPException( + status_code=status.HTTP_403_FORBIDDEN, + detail="Not authorized to access this bot's history", + ) + else: + # Anonymous user - can only access anonymous bots (user_id = None) + if bot.user_id is not None: + raise HTTPException( + status_code=status.HTTP_403_FORBIDDEN, + detail="Not authorized to access this bot's history", + ) conversations = ( db.query(BotConversation) diff --git a/src/backend/app/api/conversations.py b/src/backend/app/api/conversations.py index 217c004..575f7ae 100644 --- a/src/backend/app/api/conversations.py +++ b/src/backend/app/api/conversations.py @@ -5,7 +5,8 @@ from typing import List, Optional, Annotated from ..core.database import get_db from ..db.models import Conversation, Message, User, AnonymousUser, Bot -from ..services.auth import get_current_user +from ..db.schemas import ChatRequest +from ..api.auth import get_optional_user from ..services.rate_limiter import RateLimiter from ..services.ai_agent import get_conversational_agent @@ -33,7 +34,7 @@ def get_or_create_anonymous_token( @router.get("") def list_conversations( db: Session = Depends(get_db), - current_user: Optional[User] = Depends(get_current_user), + current_user: Optional[User] = Depends(get_optional_user), ): if current_user: return ( @@ -48,7 +49,7 @@ def list_conversations( @router.post("") def create_conversation( db: Session = Depends(get_db), - current_user: Optional[User] = Depends(get_current_user), + current_user: Optional[User] = Depends(get_optional_user), request: Request = None, response: Response = None, ): @@ -70,7 +71,7 @@ def create_conversation( def get_conversation( conversation_id: str, db: Session = Depends(get_db), - current_user: Optional[User] = Depends(get_current_user), + current_user: Optional[User] = Depends(get_optional_user), ): conversation = ( db.query(Conversation).filter(Conversation.id == conversation_id).first() @@ -78,17 +79,43 @@ def get_conversation( if not conversation: raise HTTPException(status_code=404, detail="Conversation not found") - if conversation.user_id and conversation.user_id != current_user.id: + if conversation.user_id and current_user and conversation.user_id != current_user.id: raise HTTPException(status_code=403, detail="Access denied") - return conversation + # Get messages for this conversation + messages = ( + db.query(Message) + .filter(Message.conversation_id == conversation_id) + .order_by(Message.created_at) + .all() + ) + + # Build response with messages + return { + "id": conversation.id, + "user_id": conversation.user_id, + "bot_id": conversation.bot_id, + "title": conversation.title, + "created_at": conversation.created_at.isoformat() if conversation.created_at else None, + "updated_at": conversation.updated_at.isoformat() if conversation.updated_at else None, + "messages": [ + { + "id": msg.id, + "conversation_id": msg.conversation_id, + "role": msg.role, + "content": msg.content, + "created_at": msg.created_at.isoformat() if msg.created_at else None, + } + for msg in messages + ], + } @router.delete("/{conversation_id}", status_code=status.HTTP_204_NO_CONTENT) def delete_conversation( conversation_id: str, db: Session = Depends(get_db), - current_user: Optional[User] = Depends(get_current_user), + current_user: Optional[User] = Depends(get_optional_user), ): conversation = ( db.query(Conversation).filter(Conversation.id == conversation_id).first() @@ -96,7 +123,7 @@ def delete_conversation( if not conversation: raise HTTPException(status_code=404, detail="Conversation not found") - if conversation.user_id and conversation.user_id != current_user.id: + if conversation.user_id and current_user and conversation.user_id != current_user.id: raise HTTPException(status_code=403, detail="Access denied") db.delete(conversation) @@ -108,7 +135,7 @@ def set_bot_for_conversation( conversation_id: str, bot_id: str, db: Session = Depends(get_db), - current_user: Optional[User] = Depends(get_current_user), + current_user: Optional[User] = Depends(get_optional_user), request: Request = None, ): conversation = ( @@ -117,7 +144,7 @@ def set_bot_for_conversation( if not conversation: raise HTTPException(status_code=404, detail="Conversation not found") - if conversation.user_id and conversation.user_id != current_user.id: + if conversation.user_id and current_user and conversation.user_id != current_user.id: raise HTTPException(status_code=403, detail="Access denied") if not current_user: @@ -146,9 +173,9 @@ def set_bot_for_conversation( @router.post("/{conversation_id}/chat") def chat_in_conversation( conversation_id: str, - message: str, + body: ChatRequest, db: Session = Depends(get_db), - current_user: Optional[User] = Depends(get_current_user), + current_user: Optional[User] = Depends(get_optional_user), request: Request = None, response: Response = None, ): @@ -158,23 +185,53 @@ def chat_in_conversation( if not conversation: raise HTTPException(status_code=404, detail="Conversation not found") - if conversation.user_id and conversation.user_id != current_user.id: + if conversation.user_id and current_user and conversation.user_id != current_user.id: raise HTTPException(status_code=403, detail="Access denied") warning = None + user_is_authenticated = current_user is not None + # Get anonymous_token from cookies or from the conversation itself + anonymous_token = None if not current_user: RateLimiter.check_system_limit(db) + + # First try to get from conversation (more reliable) + anonymous_token = conversation.anonymous_token + + # If not on conversation, try cookies + if not anonymous_token and request: + anonymous_token = request.cookies.get("anonymous_token") + + # If still not found, create new one + if not anonymous_token: + anonymous_token = get_or_create_anonymous_token(request, response, db) + # Also set it on the conversation for future use + conversation.anonymous_token = anonymous_token + db.commit() - anon_token = get_or_create_anonymous_token(request, response, db) - - anon = RateLimiter.check_anonymous_limit(db, anon_token) - - RateLimiter.increment_chat_count(db, anon_token) + # Debug logging + import logging + logging.info(f"Anonymous chat: token={anonymous_token}, checking limit") + anon = RateLimiter.check_anonymous_limit(db, anonymous_token) + if anon: + logging.info(f"Anonymous user found: chat_count={anon.chat_count}") + else: + logging.info("Anonymous user NOT found in DB") + RateLimiter.increment_chat_count(db, anonymous_token) if anon and anon.chat_count > 40: warning = "Your progress is not saved." + # Always save the user's message first + user_msg = Message( + conversation_id=conversation_id, + role="user", + content=body.message, + ) + db.add(user_msg) + + # Get conversation history for context conversation_history = ( db.query(Message) .filter(Message.conversation_id == conversation_id) @@ -185,27 +242,77 @@ def chat_in_conversation( {"role": msg.role, "content": msg.content} for msg in conversation_history[-10:] ] + # Get user_id + user_id = current_user.id if current_user else None + + # Debug logging + print(f"DEBUG: conversation_id={conversation_id}") + print(f"DEBUG: conversation.bot_id={conversation.bot_id}") + print(f"DEBUG: conversation.anonymous_token={conversation.anonymous_token[:20] if conversation.anonymous_token else None}") + print(f"DEBUG: anonymous_token variable={anonymous_token[:20] if anonymous_token else None}") + + # If no bot is set, use a general-purpose agent (without bot-specific context) if not conversation.bot_id: + # Use the conversational agent with user context + agent = get_conversational_agent( + user_id=user_id, + conversation_id=conversation_id, + anonymous_token=anonymous_token, + ) + result = agent.chat(body.message, history_for_agent) + assistant_content = result.get("response", "I couldn't process your request.") + + # Refresh conversation to get updated bot_id (in case agent set it) + db.refresh(conversation) + + # Save the assistant's response + assistant_msg = Message( + conversation_id=conversation_id, + role="assistant", + content=assistant_content, + ) + db.add(assistant_msg) + db.commit() + + # Fetch updated conversation with messages + conversation_history = ( + db.query(Message) + .filter(Message.conversation_id == conversation_id) + .order_by(Message.created_at) + .all() + ) + return { - "response": "No bot selected for this conversation. Please set a bot first.", - "thinking": None, - "strategy_config": None, - "success": False, - "warning": warning, + "id": conversation.id, + "user_id": conversation.user_id, + "bot_id": conversation.bot_id, + "title": conversation.title, + "created_at": conversation.created_at.isoformat() if conversation.created_at else None, + "updated_at": conversation.updated_at.isoformat() if conversation.updated_at else None, + "messages": [ + { + "id": msg.id, + "conversation_id": msg.conversation_id, + "role": msg.role, + "content": msg.content, + "created_at": msg.created_at.isoformat() if msg.created_at else None, + } + for msg in conversation_history + ], } - agent = get_conversational_agent(bot_id=conversation.bot_id) - result = agent.chat(message, history_for_agent) + # Bot is set - process with the AI agent + agent = get_conversational_agent( + bot_id=conversation.bot_id, + user_id=user_id, + conversation_id=conversation_id, + anonymous_token=anonymous_token, + ) + result = agent.chat(body.message, history_for_agent) assistant_content = result.get("response", "I couldn't process your request.") - user_msg = Message( - conversation_id=conversation_id, - role="user", - content=message, - ) - db.add(user_msg) - + # Save the assistant's response assistant_msg = Message( conversation_id=conversation_id, role="assistant", @@ -213,13 +320,31 @@ def chat_in_conversation( ) db.add(assistant_msg) - conversation.updated_at = conversation.updated_at db.commit() + # Fetch updated conversation with messages + conversation_history = ( + db.query(Message) + .filter(Message.conversation_id == conversation_id) + .order_by(Message.created_at) + .all() + ) + return { - "response": assistant_content, - "thinking": result.get("thinking"), - "strategy_config": result.get("strategy_config"), - "success": result.get("success", False), - "warning": warning, + "id": conversation.id, + "user_id": conversation.user_id, + "bot_id": conversation.bot_id, + "title": conversation.title, + "created_at": conversation.created_at.isoformat() if conversation.created_at else None, + "updated_at": conversation.updated_at.isoformat() if conversation.updated_at else None, + "messages": [ + { + "id": msg.id, + "conversation_id": msg.conversation_id, + "role": msg.role, + "content": msg.content, + "created_at": msg.created_at.isoformat() if msg.created_at else None, + } + for msg in conversation_history + ], } diff --git a/src/backend/app/db/models.py b/src/backend/app/db/models.py index f3d8e7a..21e9e83 100644 --- a/src/backend/app/db/models.py +++ b/src/backend/app/db/models.py @@ -40,7 +40,7 @@ class Bot(Base): __tablename__ = "bots" id = Column(String, primary_key=True, default=generate_uuid) - user_id = Column(String, ForeignKey("users.id"), nullable=False) + user_id = Column(String, ForeignKey("users.id"), nullable=True) # nullable for anonymous bots name = Column(String, nullable=False) description = Column(Text) strategy_config = Column(JSON, nullable=False) @@ -53,6 +53,9 @@ class Bot(Base): conversations = relationship( "Conversation", back_populates="bot", cascade="all, delete-orphan" ) + bot_conversations = relationship( + "BotConversation", back_populates="bot", cascade="all, delete-orphan" + ) backtests = relationship( "Backtest", back_populates="bot", cascade="all, delete-orphan" ) @@ -112,7 +115,7 @@ class BotConversation(Base): content = Column(Text, nullable=False) created_at = Column(DateTime, default=datetime.utcnow) - bot = relationship("Bot", back_populates="conversations") + bot = relationship("Bot", back_populates="bot_conversations") class Backtest(Base): @@ -166,7 +169,7 @@ Index("idx_bots_user_id", Bot.user_id) Index("idx_conversations_user_id", Conversation.user_id) Index("idx_conversations_bot_id", Conversation.bot_id) Index("idx_messages_conversation_id", Message.conversation_id) -Index("idx_conversations_bot_id", BotConversation.bot_id) +Index("idx_bot_conversations_bot_id", BotConversation.bot_id) Index("idx_backtests_bot_id", Backtest.bot_id) Index("idx_simulations_bot_id", Simulation.bot_id) Index("idx_signals_bot_id", Signal.bot_id) diff --git a/src/backend/app/db/schemas.py b/src/backend/app/db/schemas.py index c21dd04..b58cdfd 100644 --- a/src/backend/app/db/schemas.py +++ b/src/backend/app/db/schemas.py @@ -54,7 +54,7 @@ class BotUpdate(BaseModel): class BotResponse(BaseModel): id: str - user_id: str + user_id: Optional[str] # None for anonymous bots name: str description: Optional[str] strategy_config: dict diff --git a/src/backend/app/main.py b/src/backend/app/main.py index fd6055b..b9dcd6a 100644 --- a/src/backend/app/main.py +++ b/src/backend/app/main.py @@ -54,9 +54,7 @@ app.add_middleware( app.include_router(auth.router, prefix="/api/auth", tags=["auth"]) app.include_router(bots.router, prefix="/api/bots", tags=["bots"]) -app.include_router( - conversations.router, prefix="/api/conversations", tags=["conversations"] -) +app.include_router(conversations.router, tags=["conversations"]) app.include_router(backtest.router, prefix="/api", tags=["backtest"]) app.include_router(simulate.router, prefix="/api", tags=["simulate"]) app.include_router(config.router, prefix="/api/config", tags=["config"]) diff --git a/src/backend/app/services/ai_agent/agent.py b/src/backend/app/services/ai_agent/agent.py index a01130d..9be1812 100644 --- a/src/backend/app/services/ai_agent/agent.py +++ b/src/backend/app/services/ai_agent/agent.py @@ -14,19 +14,421 @@ from .help import ( ) from .tools import get_tool_registry from ...core.config import get_settings -from ...db.models import Bot, Simulation +from ...db.models import Bot, Simulation, Conversation class ConversationalAgent: - def __init__(self, api_key: str, model: str = "MiniMax-M2.7", bot_id: str = None): - self.api_key = api_key - self.model = model + def __init__( + self, + api_key: str = None, + model: str = "MiniMax-M2.7", + bot_id: str = None, + user_id: str = None, + conversation_id: str = None, + anonymous_token: str = None, + client: "MiniMaxClient" = None, # Injectable for testing + ): + # Use injected client or create real one + if client is not None: + self.client = client + else: + if api_key is None: + settings = get_settings() + api_key = settings.MINIMAX_API_KEY + self.client = MiniMaxClient(api_key, model) + + # Store config for potential re-initialization + self._api_key = api_key + self._model = model self.bot_id = bot_id - - self.client = MiniMaxClient(api_key, model) + self.user_id = user_id + self.conversation_id = conversation_id + self.anonymous_token = anonymous_token self.pending_command = None self.recent_search_results = [] + + def _chat_with_retry(self, messages: List[Dict], system_prompt: str, tools: Any = None, max_retries: int = 3) -> Dict[str, Any]: + """Call the chat API with retry logic for transient errors.""" + last_error = None + + for attempt in range(max_retries): + try: + resp = self.client.chat( + messages=messages, + system_prompt=system_prompt, + tools=tools, + ) + + # Check if we got an error response + if isinstance(resp, dict): + # Check for explicit error key + if resp.get('error'): + last_error = resp.get('error') + print(f"DEBUG: API attempt {attempt + 1} failed with error: {last_error[:50]}...") + if attempt < max_retries - 1: + import time + time.sleep(1) # Wait 1 second before retry + continue + + # Check for base_resp error status + base_resp = resp.get('base_resp', {}) + if base_resp and base_resp.get('status_code') != 0: + status_msg = base_resp.get('status_msg', 'Unknown error') + last_error = f"API error {base_resp.get('status_code')}: {status_msg}" + print(f"DEBUG: API attempt {attempt + 1} failed with base_resp error: {last_error[:50]}...") + if attempt < max_retries - 1: + import time + time.sleep(1) + continue + + # Check for empty or None choices (also an error) + if resp.get('choices') is None: + last_error = f"Empty response from API: {resp.get('base_resp', {}).get('status_msg', 'no choices')}" + print(f"DEBUG: API attempt {attempt + 1} failed with empty choices: {last_error[:50]}...") + if attempt < max_retries - 1: + import time + time.sleep(1) + continue + + # Success - return the response + return resp + + except Exception as e: + last_error = str(e) + print(f"DEBUG: API attempt {attempt + 1} failed with exception: {last_error[:50]}...") + if attempt < max_retries - 1: + import time + time.sleep(1) + continue + + # All retries exhausted - return error response + print(f"DEBUG: All {max_retries} attempts failed. Last error: {last_error}") + return {"error": last_error or "All retries exhausted"} + + def _send_tool_result_to_model(self, func_name: str, tool_result: Any, messages: List[Dict]) -> str: + """Send tool result back to model and return model's final response. + + This method handles chained tool calls - if the model responds with more tool calls + after a tool result, it will execute those tools and continue until we get actual content. + """ + # Extract just the response text from the tool result + if isinstance(tool_result, dict): + result_text = tool_result.get("response", str(tool_result)) + else: + result_text = str(tool_result) + + print(f"DEBUG _send_tool_result_to_model: func={func_name}, result={result_text[:100]}") + print(f"DEBUG _send_tool_result_to_model: messages count = {len(messages)}") + + # Check if tool result is an error + tool_result_is_error = ( + "failed" in result_text.lower() or + "error" in result_text.lower() or + "not found" in result_text.lower() or + "couldn't" in result_text.lower() or + "cannot" in result_text.lower() or + "maximum" in result_text.lower() or + "reached" in result_text.lower() or + "❌" in result_text or + "denied" in result_text.lower() or + "unauthorized" in result_text.lower() + ) + + # If the tool result is an error, return it immediately + if tool_result_is_error: + print(f"DEBUG _send_tool_result_to_model: tool result is error, returning error") + return result_text + + # Build messages with tool result + tool_result_message = { + "role": "user", + "content": f"[TOOL RESULT] The tool '{func_name}' returned this result: {result_text}\n\nIMPORTANT: Tell the user this exact result. If it says 'failed' or 'error', tell them it failed and why. Do NOT say you're running something if it already ran and returned a result." + } + messages_with_result = messages + [tool_result_message] + + # Send tool result back to model for final response + print(f"DEBUG _send_tool_result_to_model: sending result to model, messages count = {len(messages_with_result)}") + + # Build system prompt with user authentication context + user_context = "" + if self.user_id: + user_context = "\n\n[USER CONTEXT]\n- User is LOGGED IN (authenticated)\n- User ID: " + self.user_id + "\n- All operations including listing bots, viewing strategies, running backtests are available." + else: + user_context = "\n\n[USER CONTEXT]\n- User is NOT LOGGED IN (anonymous)\n- Limited functionality: Can use search/risk/price tools, but cannot list bots, create bots, or run backtests without logging in.\n- If user wants to see their strategy or run backtests, tell them they need to log in first." + + system_prompt_with_context = SYSTEM_PROMPT_WITH_TOOLS + user_context + + resp = self._chat_with_retry( + messages=messages_with_result, + system_prompt=system_prompt_with_context, + tools=TOOLS, + ) + + print(f"DEBUG _send_tool_result_to_model: API resp keys = {resp.keys() if isinstance(resp, dict) else 'not dict'}") + + # Handle API error - return the result text instead + if isinstance(resp, dict) and resp.get('error'): + error_msg = resp.get('error', 'Unknown error') + print(f"DEBUG _send_tool_result_to_model: API error = {error_msg}, returning original result") + return result_text + + # Get response from model + if resp.get("choices") and len(resp.get("choices", [])) > 0: + final_choice = resp["choices"][0] + if "message" in final_choice: + final_message = final_choice["message"] + final_content = final_message.get("content", "") or "" + tool_calls = final_message.get("tool_calls", []) + + print(f"DEBUG _send_tool_result_to_model: final_content = '{final_content[:80] if final_content else 'EMPTY'}'") + print(f"DEBUG _send_tool_result_to_model: tool_calls = {len(tool_calls) if tool_calls else 0}") + + if final_content and final_content.strip(): + # Got actual content - return it + extracted = self._extract_response_from_content(final_content) + print(f"DEBUG _send_tool_result_to_model: returning content: '{extracted[:80] if extracted else 'EMPTY'}'") + return extracted + + if tool_calls: + # Model wants to call another tool - execute it and return that result directly + # Don't loop - just execute and return the result + for tool_call in tool_calls: + func = tool_call.get("function", {}) + next_func_name = func.get("name", "") + next_args = json.loads(func.get("arguments", "{}")) + print(f"DEBUG _send_tool_result_to_model: executing next tool: {next_func_name}") + + # Execute the tool + next_result = self._execute_tool(next_func_name, next_args) + + # Return the result directly + if isinstance(next_result, dict): + return next_result.get("response", str(next_result)) + return str(next_result) + + # Fallback - return the original result + print(f"DEBUG _send_tool_result_to_model: falling back to result_text") + return result_text + + def _execute_tool(self, func_name: str, args: Dict) -> Any: + """Execute a single tool by name and return its result.""" + print(f"DEBUG _execute_tool: {func_name} with args={args}") + + if func_name == "search_tokens": + keyword = args.get("keyword", "") + limit = args.get("limit", 10) + code, output = self._call_ave_script("search", ["--keyword", keyword, "--chain", "bsc", "--limit", str(limit)]) + if code == 0: + try: + data = json.loads(output) + tokens = data.get("data", []) + if tokens: + token_list = "" + for t in tokens[:limit]: + addr = t.get("token", "") + symbol = t.get("symbol", "") + name = t.get("name", "") + mc = t.get("market_cap", "N/A") + token_list += f"- **{symbol}** ({name}): `{addr}` - MC: ${mc}\n" + return {"response": f"Search results for '{keyword}':\n{token_list}"} + except json.JSONDecodeError: + return {"response": "Failed to parse search results."} + return {"response": f"Failed to search: {output}"} + + elif func_name == "get_token": + address = args.get("address", "") + code, output = self._call_ave_script("info", ["--address", address, "--chain", "bsc"]) + if code == 0: + return {"response": f"Token info:\n{output}"} + return {"response": f"Failed to get token info: {output}"} + + elif func_name == "get_price": + token_ids = args.get("token_ids", "") + tokens_list = token_ids.replace(",", " ").split() + if not tokens_list: + return {"response": "No token IDs provided."} + code, output = self._call_ave_script("price", ["--tokens"] + tokens_list) + if code == 0: + return {"response": f"Prices:\n{output}"} + return {"response": f"Failed to get prices: {output}"} + + elif func_name == "get_bot_info": + bot_id = args.get("bot_id", "") + return self._execute_get_bot_info(bot_id) + + elif func_name == "get_risk": + address = args.get("address", "") + chain = args.get("chain", "bsc") + code, output = self._call_ave_script("risk", ["--address", address, "--chain", chain]) + if code == 0: + return {"response": f"Risk analysis:\n{output}"} + return {"response": f"Failed to get risk data: {output}"} + + elif func_name == "get_trending": + chain = args.get("chain", "bsc") + limit = args.get("limit", 10) + code, output = self._call_ave_script("trending", ["--chain", chain, "--limit", str(limit)]) + if code == 0: + return {"response": f"Trending tokens:\n{output}"} + return {"response": f"Failed to get trending: {output}"} + + elif func_name == "run_backtest": + token_address = args.get("token_address") + timeframe = args.get("timeframe", "1d") + start_date = args.get("start_date") + end_date = args.get("end_date") + return self._execute_backtest(token_address, timeframe, start_date, end_date) + + elif func_name == "manage_simulation": + action = args.get("action") + token_address = args.get("token_address") + kline_interval = args.get("kline_interval", "1m") + return self._manage_simulation(action, token_address, kline_interval) + + elif func_name == "list_bots": + return self._execute_list_bots() + + elif func_name == "create_bot": + name = args.get("name", "") + strategy = args.get("strategy") + return self._execute_create_bot(name, strategy) + + elif func_name == "set_bot": + bot_id = args.get("bot_id", "") + return self._execute_set_bot(bot_id) + + elif func_name == "update_strategy": + bot_id = args.get("bot_id") + conditions = args.get("conditions", []) + actions = args.get("actions", []) + risk_management = args.get("risk_management") + return self._execute_update_strategy(bot_id, conditions, actions, risk_management) + + elif func_name == "list_conversations": + return self._execute_list_conversations() + + elif func_name == "create_conversation": + name = args.get("name", "") + bot_id = args.get("bot_id") + return self._execute_create_conversation(name, bot_id) + + elif func_name == "switch_conversation": + conversation_id = args.get("conversation_id", "") + return self._execute_switch_conversation(conversation_id) + + elif func_name == "list_strategies": + return self._execute_list_strategies() + + else: + return {"response": f"Unknown tool: {func_name}"} + + def _extract_response_from_content(self, content: str) -> str: + """Extract the response field if content is JSON, otherwise return content as-is. + + Handles MiniMax extended thinking format where content might be JSON with: + - {"response": "actual text"} - extract response + - {"thinking": "reasoning", "response": "actual text"} - extract response + - {"thinking": "reasoning"} - no response field, return original content + """ + if not content: + return content + + # If content starts with code block, try to extract JSON from it + stripped = content.strip() + + # Try to find JSON inside code blocks first + json_str = None + code_block_match = re.search(r"```(?:json)?\\s*([\\s\\S]*?)\\s*```", stripped) + if code_block_match: + json_str = code_block_match.group(1).strip() + print(f"DEBUG: Found JSON in code block: {json_str[:100]}...") + + # If not in code block, try to find JSON directly (for nested structures) + if not json_str: + # Try to find JSON object - handle multi-line and nested braces + # Look for patterns like {"response": "..."} or {"thinking": "...", "response": "..."} + json_match = re.search(r'\{(\\{[^}]*\\}|[^}])*\}', stripped, re.DOTALL) + if json_match: + json_str = json_match.group(0) + + if json_str: + try: + parsed = json.loads(json_str) + if isinstance(parsed, dict): + # First priority: look for "response" field + if "response" in parsed: + response = parsed.get("response", "") + if response: + print(f"DEBUG: Extracted response from JSON: {response[:50]}...") + return response + + # Second priority: look for "thinking" field (MiniMax extended thinking) + # Only use thinking if there's no response field at all + if "thinking" in parsed and "response" not in parsed: + thinking = parsed.get("thinking", "") + if thinking: + print(f"DEBUG: No 'response' field in JSON, content appears to be thinking. Returning original.") + return content + + # If we found a JSON object but didn't extract anything useful, + # return original content + return content + except (json.JSONDecodeError, Exception) as e: + print(f"DEBUG: JSON parsing failed: {e}, trying alternative parsing...") + # Try alternative: find response field directly in content + response_match = re.search(r'"response":\s*"([^"]{0,500})"', stripped) + if response_match: + response = response_match.group(1) + # Unescape common sequences + response = response.replace('\\n', '\n').replace('\\"', '"').replace('\\\\', '\\') + print(f"DEBUG: Extracted response via regex: {response[:50]}...") + return response + + # If content doesn't look like JSON, return as-is + return content + + def _get_current_bot_id(self) -> str: + """Get the current bot_id, checking both agent's bot_id and conversation's bot_id.""" + if self.bot_id: + return self.bot_id + + # Check conversation's bot_id if we have a conversation_id + if self.conversation_id: + try: + from ...core.database import get_db + + db = next(get_db()) + try: + conversation = ( + db.query(Conversation) + .filter(Conversation.id == self.conversation_id) + .first() + ) + if conversation and conversation.bot_id: + return conversation.bot_id + finally: + db.close() + except Exception: + pass + + return None + + def _require_bot(self) -> Dict[str, Any]: + """Check if a bot is set, return error if not.""" + bot_id = self._get_current_bot_id() + if not bot_id: + return { + "response": "⚠️ **No bot selected for this conversation.**\n\n" + "Before running backtests or simulations, you need to create or select a bot.\n\n" + "**Options:**\n" + "1. Create a new bot: `create_bot MyBot --strategy Buy when drops 5%`\n" + "2. Select an existing bot: Use `list_bots` to see your bots, then `set_bot `\n\n" + "What would you like to do?", + "thinking": None, + "success": False, + } + return None # Bot exists, proceed def _is_error_output(self, code: int, output: str) -> bool: """Check if the command output contains an error.""" @@ -720,6 +1122,11 @@ class ConversationalAgent: def _execute_backtest_direct(self, message: str) -> Dict[str, Any]: """Execute backtest directly using token from strategy or message.""" + # Check if bot is set + bot_check = self._require_bot() + if bot_check: + return bot_check + parts = message.split() token_address = None timeframe = "1d" @@ -786,6 +1193,11 @@ class ConversationalAgent: def _execute_simulate_direct(self, message: str) -> Dict[str, Any]: """Execute simulate directly using token from strategy or message.""" + # Check if bot is set + bot_check = self._require_bot() + if bot_check: + return bot_check + parts = message.split() action = None token_address = None @@ -849,6 +1261,497 @@ class ConversationalAgent: "success": True, } + def _execute_create_bot(self, name: str, strategy: str = None) -> Dict[str, Any]: + """Create a new trading bot.""" + # Check if user can create a bot (either logged in or anonymous with remaining quota) + user_can_create = False + is_anonymous = False + + try: + from ...core.database import get_db + from ...db.models import Bot, AnonymousUser + from ...services.rate_limiter import RateLimiter + + db = next(get_db()) + try: + if self.user_id: + # Authenticated user - check max 3 bots + bot_count = db.query(Bot).filter(Bot.user_id == self.user_id).count() + if bot_count >= 3: + return { + "response": "❌ You've reached the maximum of 3 bots. Please delete an existing bot to create a new one.", + "thinking": None, + "success": False, + } + user_can_create = True + elif self.anonymous_token: + # Anonymous user - check rate limiter + is_anonymous = True + try: + RateLimiter.check_anonymous_bot_limit(db, self.anonymous_token) + user_can_create = True + except Exception as rate_error: + return { + "response": "❌ You've reached the maximum of 1 bot as an anonymous user. Please login or create an account to create more bots.", + "thinking": None, + "success": False, + } + else: + return { + "response": "❌ You need to be logged in to create a bot. Please login or create an account.", + "thinking": None, + "success": False, + } + + if not user_can_create: + return { + "response": "❌ Unable to create bot at this time.", + "thinking": None, + "success": False, + } + + # Create bot + strategy_config = {"strategy": strategy or "No strategy set yet"} + bot = Bot( + user_id=self.user_id if self.user_id else None, + name=name, + description=f"Bot created via chat: {name}", + strategy_config=strategy_config, + llm_config={}, + ) + db.add(bot) + db.commit() + db.refresh(bot) + + # For anonymous users, mark bot as created + if is_anonymous and self.anonymous_token: + RateLimiter.set_bot_created(db, self.anonymous_token) + + # Set this bot as the current bot for this conversation + if self.conversation_id: + conversation = ( + db.query(Conversation) + .filter(Conversation.id == self.conversation_id) + .first() + ) + if conversation: + conversation.bot_id = bot.id + db.commit() + self.bot_id = bot.id + + anonymous_note = "\n\n📝 **Note:** Your bot will be deleted when you close this browser." if is_anonymous else "" + return { + "response": f"✅ Created bot **{name}**!\n\nBot ID: `{bot.id}`\nStrategy: {strategy or 'Not set yet'}{anonymous_note}\n\nThis bot is now linked to this conversation. You can now run backtests and simulations!", + "thinking": None, + "success": True, + } + finally: + db.close() + except Exception as e: + return { + "response": f"❌ Error creating bot: {str(e)}", + "thinking": None, + "success": False, + } + + def _execute_list_bots(self) -> Dict[str, Any]: + """List all bots for the current user.""" + if not self.user_id and not self.anonymous_token: + return { + "response": "❌ You need to be logged in to list your bots.", + "thinking": None, + "success": False, + } + + try: + from ...core.database import get_db + from ...db.models import Bot, Conversation + + db = next(get_db()) + try: + # Get bots based on user or anonymous + if self.user_id: + bots = db.query(Bot).filter(Bot.user_id == self.user_id).all() + elif self.anonymous_token: + # Get bots linked to anonymous user's conversations + bots = db.query(Bot).join(Conversation).filter( + Conversation.anonymous_token == self.anonymous_token + ).all() + else: + bots = [] + + if not bots: + return { + "response": "You don't have any bots yet. To run a backtest, I need to create one for you. What would you like to name your trading bot? (e.g., 'SHIB Strategy', 'My PEPE Bot')", + "thinking": None, + "success": False, + } + + # Get current bot ID from conversation if available + current_bot_id = self.bot_id + if self.conversation_id and not current_bot_id: + conversation = ( + db.query(Conversation) + .filter(Conversation.id == self.conversation_id) + .first() + ) + if conversation: + current_bot_id = conversation.bot_id + + bot_list = [] + for bot in bots: + status = "✅ Active" if bot.status == "active" else "📝 Draft" + is_current = " *(current)*" if bot.id == current_bot_id else "" + + # Build detailed strategy info + strategy_parts = [] + token_symbol = None + token_address = None + + if bot.strategy_config: + conditions = bot.strategy_config.get("conditions", []) + actions = bot.strategy_config.get("actions", []) + stop_loss = bot.strategy_config.get("stop_loss") + take_profit = bot.strategy_config.get("take_profit") + + # Extract token info + for c in conditions: + if not token_symbol and c.get("token"): + token_symbol = c.get("token") + if not token_address and c.get("token_address"): + token_address = c.get("token_address") + + if conditions: + cond_str = f"{len(conditions)} condition(s)" + # Get first condition type for quick description + first_cond = conditions[0] if conditions else {} + cond_type = first_cond.get("type", "") + threshold = first_cond.get("threshold", 0) + if cond_type == "price_drop": + cond_str += f" (buy on {threshold}% drop)" + elif cond_type == "price_rise": + cond_str += f" (buy on {threshold}% rise)" + strategy_parts.append(cond_str) + + if actions: + strategy_parts.append(f"{len(actions)} action(s)") + + if stop_loss is not None or take_profit is not None: + risk_parts = [] + if stop_loss is not None: + risk_parts.append(f"SL: {stop_loss}%") + if take_profit is not None: + risk_parts.append(f"TP: {take_profit}%") + strategy_parts.append(" ".join(risk_parts)) + + if strategy_parts: + strategy_str = ", ".join(strategy_parts) + token_str = "" + if token_symbol: + token_str = token_symbol.upper() + if token_address: + token_str = f"{token_symbol.upper()} (`{token_address}`)" if token_symbol else f"`{token_address}`" + if token_str: + strategy_str = f"{token_str} - {strategy_str}" + bot_list.append( + f"- **{bot.name}** {status}{is_current}\n ID: `{bot.id}`\n {strategy_str}" + ) + else: + bot_list.append( + f"- **{bot.name}** {status}{is_current}\n ID: `{bot.id}`\n ⚠️ No strategy configured" + ) + + return { + "response": "📋 **Your Bots:**\n\n" + "\n\n".join(bot_list), + "thinking": None, + "success": True, + } + finally: + db.close() + except Exception as e: + return { + "response": f"❌ Error listing bots: {str(e)}", + "thinking": None, + "success": False, + } + + def _execute_set_bot(self, bot_id: str) -> Dict[str, Any]: + """Set (associate) a bot with the current conversation.""" + if not self.user_id and not self.anonymous_token: + return { + "response": "❌ You need to be logged in to set a bot.", + "thinking": None, + "success": False, + } + + if not self.conversation_id: + return { + "response": "❌ No conversation context. Please use this in a conversation.", + "thinking": None, + "success": False, + } + + try: + from ...core.database import get_db + from ...db.models import Bot, Conversation + + db = next(get_db()) + try: + # Verify bot exists and belongs to user (or was created by anonymous user) + if self.user_id: + bot = ( + db.query(Bot) + .filter(Bot.id == bot_id, Bot.user_id == self.user_id) + .first() + ) + elif self.anonymous_token: + # For anonymous users, check if bot is linked to their conversations + bot = db.query(Bot).join(Conversation).filter( + Bot.id == bot_id, + Conversation.anonymous_token == self.anonymous_token + ).first() + else: + bot = None + + if not bot: + return { + "response": "❌ Bot not found or doesn't belong to you. Use `list_bots` to see your available bots.", + "thinking": None, + "success": False, + } + + # Update conversation + conversation = ( + db.query(Conversation) + .filter(Conversation.id == self.conversation_id) + .first() + ) + if not conversation: + return { + "response": "❌ Conversation not found.", + "thinking": None, + "success": False, + } + + conversation.bot_id = bot_id + db.commit() + self.bot_id = bot_id + + return { + "response": f"✅ Switched to bot **{bot.name}**!\n\nThis conversation is now linked to: `{bot.id}`\n\nYou can now run backtests and simulations with this bot!", + "thinking": None, + "success": True, + } + finally: + db.close() + except Exception as e: + return { + "response": f"❌ Error setting bot: {str(e)}", + "thinking": None, + "success": False, + } + + def _execute_get_bot_info(self, bot_id: str = None) -> Dict[str, Any]: + """Get details of a bot.""" + target_bot_id = bot_id or self.bot_id + + if not target_bot_id: + return { + "response": "❌ No bot selected. Use `create_bot` to create one or `set_bot` to select one.", + "thinking": None, + "success": False, + } + + try: + from ...core.database import get_db + from ...db.models import Bot + + db = next(get_db()) + try: + bot = db.query(Bot).filter(Bot.id == target_bot_id).first() + if not bot: + return { + "response": "❌ Bot not found.", + "thinking": None, + "success": False, + } + + # Check access + if self.user_id and bot.user_id != self.user_id: + return { + "response": "❌ You don't have access to this bot.", + "thinking": None, + "success": False, + } + + status = "✅ Active" if bot.status == "active" else "📝 Draft" + + # Build detailed strategy info + strategy_text = "No strategy configured" + token_symbol = None + token_address = None + + if bot.strategy_config: + parts = [] + + # Get strategy description + strategy_name = bot.strategy_config.get("strategy", "") + + # Get conditions + conditions = bot.strategy_config.get("conditions", []) + actions = bot.strategy_config.get("actions", []) + stop_loss = bot.strategy_config.get("stop_loss") + take_profit = bot.strategy_config.get("take_profit") + + # Extract token info from conditions + for c in conditions: + if not token_symbol and c.get("token"): + token_symbol = c.get("token") + if not token_address and c.get("token_address"): + token_address = c.get("token_address") + + if conditions: + cond_parts = [] + for c in conditions: + cond_type = c.get("type", "") + token = c.get("token", "") + token_addr = c.get("token_address", "") + threshold = c.get("threshold", 0) + + if cond_type == "price_drop": + cond_parts.append(f"Buy when price drops {threshold}%" if threshold else "Buy when price drops") + elif cond_type == "price_rise": + cond_parts.append(f"Buy when price rises {threshold}%" if threshold else "Buy when price rises") + elif cond_type == "volume_spike": + cond_parts.append(f"Volume spike {threshold}%" if threshold else "Volume spike") + elif cond_type == "price_level": + cond_parts.append(f"Price level: ${c.get('price', 'N/A')}") + else: + cond_parts.append(f"{cond_type}") + + if cond_parts: + parts.append("**Conditions:**") + for cp in cond_parts: + parts.append(f" • {cp}") + + if actions: + action_parts = [] + for a in actions: + action_type = a.get("type", "") + amount = a.get("amount_percent", 0) + if action_type == "buy": + action_parts.append(f"Buy {amount}% of funds" if amount else "Buy") + elif action_type == "sell": + action_parts.append(f"Sell {amount}%" if amount else "Sell") + else: + action_parts.append(f"{action_type}") + + if action_parts: + parts.append("**Actions:**") + for ap in action_parts: + parts.append(f" • {ap}") + + if stop_loss is not None: + parts.append(f"**Stop Loss:** {stop_loss}%") + + if take_profit is not None: + parts.append(f"**Take Profit:** {take_profit}%") + + if parts: + strategy_text = "\n".join(parts) + elif strategy_name: + strategy_text = strategy_name + + # Build token section + token_section = "" + if token_symbol or token_address: + token_lines = [] + if token_symbol: + token_lines.append(f"**Symbol:** {token_symbol.upper()}") + if token_address: + token_lines.append(f"**Contract:** `{token_address}`") + token_section = "\n" + "\n".join(token_lines) + "\n" + + return { + "response": f"🤖 **Bot: {bot.name}**\n\n" + f"**Status:** {status}\n" + f"**ID:** `{bot.id}`\n" + f"{token_section}" + f"{strategy_text}\n\n" + f"**Created:** {bot.created_at.strftime('%Y-%m-%d %H:%M') if bot.created_at else 'Unknown'}", + "thinking": None, + "success": True, + } + finally: + db.close() + except Exception as e: + return { + "response": f"❌ Error getting bot info: {str(e)}", + "thinking": None, + "success": False, + } + + def _execute_update_strategy(self, strategy: str = None, conditions: List[Dict] = None, actions: List[Dict] = None, stop_loss: float = None, take_profit: float = None) -> Dict[str, Any]: + """Update (save) the trading strategy for a bot.""" + if not self.bot_id: + return { + "response": "❌ No bot selected. Please create or select a bot first using `create_bot` or `set_bot`.", + "thinking": None, + "success": False, + } + + try: + from ...core.database import get_db + from ...db.models import Bot + + db = next(get_db()) + try: + bot = db.query(Bot).filter(Bot.id == self.bot_id).first() + if not bot: + return { + "response": "❌ Bot not found.", + "thinking": None, + "success": False, + } + + # Build strategy config + strategy_config = { + "strategy": strategy or "Trading strategy", + "conditions": conditions or [], + "actions": actions or [], + } + + if stop_loss is not None: + strategy_config["stop_loss"] = stop_loss + if take_profit is not None: + strategy_config["take_profit"] = take_profit + + # Save to database + bot.strategy_config = strategy_config + db.commit() + + conditions_str = f"{len(conditions)} conditions" if conditions else "no conditions" + actions_str = f"{len(actions)} actions" if actions else "no actions" + + return { + "response": f"✅ Strategy saved successfully for bot **{bot.name}**!\n\n" + f"- Conditions: {conditions_str}\n" + f"- Actions: {actions_str}\n" + f"- Stop loss: {stop_loss}%\n" + f"- Take profit: {take_profit}%\n\n" + f"You can now run backtests with this strategy!", + "thinking": None, + "success": True, + } + finally: + db.close() + except Exception as e: + return { + "response": f"❌ Error saving strategy: {str(e)}", + "thinking": None, + "success": False, + } + def chat( self, user_message: str, conversation_history: List[Dict] = None ) -> Dict[str, Any]: @@ -886,14 +1789,51 @@ class ConversationalAgent: 0, {"role": role, "content": msg.get("content", "")} ) - resp = self.client.chat( + # Build system prompt with user authentication context + user_context = "" + if self.user_id: + user_context = "\n\n[USER CONTEXT]\n- User is LOGGED IN (authenticated)\n- User ID: " + self.user_id + "\n- All operations including listing bots, viewing strategies, running backtests are available." + else: + user_context = "\n\n[USER CONTEXT]\n- User is NOT LOGGED IN (anonymous)\n- Limited functionality: Can use search/risk/price tools, but cannot list bots, create bots, or run backtests without logging in.\n- If user wants to see their strategy or run backtests, tell them they need to log in first." + + system_prompt_with_context = SYSTEM_PROMPT_WITH_TOOLS + user_context + + resp = self._chat_with_retry( messages=messages, - system_prompt=SYSTEM_PROMPT_WITH_TOOLS, + system_prompt=system_prompt_with_context, tools=TOOLS, ) result = resp + # Debug: log the raw result + print(f"DEBUG: API result type: {type(result)}") + if isinstance(result, dict): + print(f"DEBUG: API result keys: {result.keys()}") + if result.get('error'): + print(f"DEBUG: API error = {result.get('error')}") + # API returned an error - return error message directly + return { + "response": f"Sorry, I'm having trouble connecting to my AI service right now. Please try again in a moment. ({result.get('error', 'Connection error')[:100]})", + "thinking": None, + "strategy_updated": False, + "strategy_needs_confirmation": False, + "success": False, + } + choices = result.get('choices') + print(f"DEBUG: choices = {choices}") + if choices: + choice = choices[0] if choices else {} + msg = choice.get('message', {}) if isinstance(choice, dict) else {} + print(f"DEBUG: message keys = {msg.keys() if isinstance(msg, dict) else 'N/A'}") + print(f"DEBUG: content = {msg.get('content', '')[:100] if isinstance(msg, dict) else 'N/A'}") + tool_calls = msg.get('tool_calls', []) + print(f"DEBUG: tool_calls = {len(tool_calls) if tool_calls else 0}") + if tool_calls: + for tc in tool_calls: + func = tc.get('function', {}) + print(f"DEBUG: tool call = {func.get('name')}") + # Initialize thinking to None to handle cases where API response # doesn't have the expected message structure (intermittent issue) thinking = None @@ -1281,8 +2221,10 @@ class ConversationalAgent: end_date=end_date, ) + final_response = self._send_tool_result_to_model(func_name, backtest_result, messages) + return { - "response": backtest_result, + "response": final_response, "thinking": thinking, "strategy_updated": False, "strategy_needs_confirmation": False, @@ -1300,17 +2242,126 @@ class ConversationalAgent: kline_interval=kline_interval, ) + final_response = self._send_tool_result_to_model(func_name, sim_result, messages) + return { - "response": sim_result, + "response": final_response, "thinking": thinking, "strategy_updated": False, "strategy_needs_confirmation": False, "success": True, } - content = ( - result.get("choices", [{}])[0].get("message", {}).get("content", "") - ) + elif func_name == "create_bot": + print(f"DEBUG: create_bot called with name={args.get('name')}, strategy={args.get('strategy')}") + name = args.get("name", "") + strategy = args.get("strategy") + + if not name: + return { + "response": "❌ Bot name is required. Please provide a name for your bot.", + "thinking": thinking, + "success": False, + } + + result = self._execute_create_bot(name, strategy) + print(f"DEBUG: create_bot result = {result}") + + final_response = self._send_tool_result_to_model(func_name, result, messages) + + return { + "response": final_response, + "thinking": thinking, + "strategy_updated": False, + "strategy_needs_confirmation": False, + "success": result.get("success", True), + } + + elif func_name == "list_bots": + result = self._execute_list_bots() + + final_response = self._send_tool_result_to_model(func_name, result, messages) + + return { + "response": final_response, + "thinking": thinking, + "strategy_updated": False, + "strategy_needs_confirmation": False, + "success": result.get("success", True), + } + + elif func_name == "set_bot": + bot_id = args.get("bot_id", "") + + if not bot_id: + return { + "response": "❌ Bot ID is required. Use `list_bots` to see your available bots.", + "thinking": thinking, + "success": False, + } + + result = self._execute_set_bot(bot_id) + + final_response = self._send_tool_result_to_model(func_name, result, messages) + + return { + "response": final_response, + "thinking": thinking, + "strategy_updated": False, + "strategy_needs_confirmation": False, + "success": result.get("success", True), + } + + elif func_name == "get_bot_info": + bot_id = args.get("bot_id") + + result = self._execute_get_bot_info(bot_id) + + final_response = self._send_tool_result_to_model(func_name, result, messages) + + return { + "response": final_response, + "thinking": thinking, + "strategy_updated": False, + "strategy_needs_confirmation": False, + "success": result.get("success", True), + } + + elif func_name == "update_strategy": + strategy = args.get("strategy") + conditions = args.get("conditions", []) + actions = args.get("actions", []) + stop_loss = args.get("stop_loss") + take_profit = args.get("take_profit") + + result = self._execute_update_strategy( + strategy=strategy, + conditions=conditions, + actions=actions, + stop_loss=stop_loss, + take_profit=take_profit, + ) + + final_response = self._send_tool_result_to_model(func_name, result, messages) + + return { + "response": final_response, + "thinking": thinking, + "strategy_updated": result.get("success", False), + "strategy_needs_confirmation": False, + "success": result.get("success", True), + } + + content = "" + choices = result.get("choices") + if choices and len(choices) > 0: + message = choices[0].get("message", {}) + content = message.get("content", "") or "" + + # Debug logging + if not content: + print(f"DEBUG: Empty content, result keys: {result.keys() if isinstance(result, dict) else 'not dict'}") + print(f"DEBUG: result = {str(result)[:500]}") thinking_field = None response_text = content @@ -1850,7 +2901,12 @@ Would you like me to adjust the strategy parameters based on these results?""" def get_conversational_agent( - api_key: str = None, model: str = None, bot_id: str = None + api_key: str = None, + model: str = None, + bot_id: str = None, + user_id: str = None, + conversation_id: str = None, + anonymous_token: str = None, ) -> ConversationalAgent: """Get or create a ConversationalAgent instance.""" if api_key is None: @@ -1860,4 +2916,11 @@ def get_conversational_agent( settings = get_settings() model = settings.MINIMAX_MODEL - return ConversationalAgent(api_key=api_key, model=model, bot_id=bot_id) + return ConversationalAgent( + api_key=api_key, + model=model, + bot_id=bot_id, + user_id=user_id, + conversation_id=conversation_id, + anonymous_token=anonymous_token, + ) diff --git a/src/backend/app/services/ai_agent/client.py b/src/backend/app/services/ai_agent/client.py index 91a3a34..b04eac5 100644 --- a/src/backend/app/services/ai_agent/client.py +++ b/src/backend/app/services/ai_agent/client.py @@ -227,27 +227,163 @@ TOOLS = [ }, }, }, + { + "type": "function", + "function": { + "name": "create_bot", + "description": "Create a new trading bot. Use this when user wants to create a new trading bot. Returns the bot ID and confirmation.", + "parameters": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "Name for the new bot (required)", + }, + "strategy": { + "type": "string", + "description": "Trading strategy description in plain English (optional, can be set later)", + }, + }, + "required": ["name"], + }, + }, + }, + { + "type": "function", + "function": { + "name": "list_bots", + "description": "List all trading bots owned by the user. Use this when user wants to see their bots or asks which bots they have.", + "parameters": { + "type": "object", + "properties": {}, + }, + }, + }, + { + "type": "function", + "function": { + "name": "set_bot", + "description": "Set (associate) a bot with the current conversation. Use this when user wants to switch which bot they're working with.", + "parameters": { + "type": "object", + "properties": { + "bot_id": { + "type": "string", + "description": "ID of the bot to set for this conversation (required)", + }, + }, + "required": ["bot_id"], + }, + }, + }, + { + "type": "function", + "function": { + "name": "get_bot_info", + "description": "Get details of a specific bot including name, strategy, and status. Use this when user wants to see details of a bot.", + "parameters": { + "type": "object", + "properties": { + "bot_id": { + "type": "string", + "description": "ID of the bot to get info for (optional, defaults to current bot)", + }, + }, + }, + }, + }, + { + "type": "function", + "function": { + "name": "update_strategy", + "description": "Update (save) the trading strategy for a bot. This SAVES the strategy to the database. ALWAYS call this tool when user wants to configure or update a trading strategy. The strategy will be persisted and used for backtests.", + "parameters": { + "type": "object", + "properties": { + "strategy": { + "type": "string", + "description": "Description of the strategy (e.g., 'Dip buying strategy', 'Mean reversion')", + }, + "conditions": { + "type": "array", + "description": "Array of condition objects. Each condition has: type (price_drop, price_rise, volume_spike, price_level), token, token_address, threshold", + "items": { + "type": "object", + "properties": { + "type": { + "type": "string", + "enum": ["price_drop", "price_rise", "volume_spike", "price_level"], + "description": "Type of condition" + }, + "token": {"type": "string", "description": "Token symbol (e.g., 'SHIB', 'PEPE')"}, + "token_address": {"type": "string", "description": "Token contract address on BSC (e.g., '0x...') - REQUIRED"}, + "threshold": {"type": "number", "description": "Threshold value (e.g., 5 for 5% drop/rise)"}, + }, + "required": ["type", "token_address", "threshold"] + } + }, + "actions": { + "type": "array", + "description": "Array of action objects. Each action has: type (buy, sell, hold), amount_percent", + "items": { + "type": "object", + "properties": { + "type": { + "type": "string", + "enum": ["buy", "sell", "hold"], + "description": "Type of action" + }, + "amount_percent": {"type": "number", "description": "Percentage of funds to use (e.g., 20 for 20%)"}, + }, + "required": ["type", "amount_percent"] + } + }, + "stop_loss": {"type": "number", "description": "Stop loss percentage (e.g., 15 for 15% loss)"}, + "take_profit": {"type": "number", "description": "Take profit percentage (e.g., 20 for 20% gain)"}, + }, + "required": ["conditions", "actions"] + }, + }, + }, ] SYSTEM_PROMPT_WITH_TOOLS = ( SYSTEM_PROMPT + """ -You have access to tools: -- search_tokens(keyword, limit): Search for tokens by keyword. Use it when user asks to search for a token or find tokens by name/symbol. -- get_token(address, chain): Get detailed information about a specific token. Use when user asks for token details. -- get_price(token_ids): Get current price(s) for tokens. Use when user asks for token price. -- get_risk(address, chain): Get risk analysis for a token. Use when user asks about token safety or honeypot analysis. -- get_trending(chain, limit): Get trending tokens on a blockchain. Use when user asks what's trending, top tokens, or popular tokens. -- run_backtest(token_address, timeframe, start_date, end_date): Run a backtest on historical data. Returns performance metrics. Use when user asks to backtest or check historical performance. -- manage_simulation(action, token_address, kline_interval): Manage trading simulations. Actions: 'start' (begin new), 'stop' (stop running), 'status' (check if running), 'results' (get current/latest results). +CRITICAL INSTRUCTIONS: +1. When user asks to run a backtest or simulation, first check if a bot exists using list_bots. +2. If no bot exists, ASK THE USER what they want to name their bot (e.g., "What would you like to name your trading bot?"). +3. When user provides a bot name (after being asked), call create_bot with that name. +4. If a bot exists but has NO STRATEGY SET, the user MUST set up a strategy before running backtests. Ask the user for their trading strategy (e.g., "What token should I monitor?", "What price drop percentage should trigger a buy?", "What percentage of funds should be used?"). Help them configure the strategy. +5. IMPORTANT: When configuring a strategy, you MUST call the update_strategy tool with COMPLETE details: + - conditions: Array of {type: "price_drop"|"price_rise"|"volume_spike", token: "SYMBOL", token_address: "0x...", threshold: number} + - actions: Array of {type: "buy"|"sell", amount_percent: number} + - stop_loss: number (e.g., 5 for 5%) + - take_profit: number (e.g., 15 for 15%) + - ALWAYS include the token_address from search results when configuring strategy! +6. IMPORTANT: After executing ANY tool, you MUST incorporate the ACTUAL tool result into your response. Do NOT ignore what the tool returned. If the tool returned an error, you MUST tell the user about the error - do NOT pretend the operation succeeded. +7. NEVER tell users about internal tool names like "create_bot", "list_bots", etc. Use natural language instead. +8. NEVER say "Let me..." or "I'll..." - IMMEDIATELY call the appropriate tool. If user asks for trending tokens, call get_trending NOW. If user asks for token info, call get_token NOW. Do NOT ask for permission or say you will do something - just do it. +9. When asking for information from the user, be specific and actionable (e.g., "What token do you want to backtest?", "What would you like to name your bot?"). +10. If user asks you to look up/search/find tokens, IMMEDIATELY call search_tokens or get_trending tool. Do not ask follow-up questions first. +11. IMPORTANT: When user says they want to use a token from search results (e.g., "that main PEPE" or "the first one"), ALWAYS extract the token_address from the search results and include it in update_strategy. Do NOT ask for the address again! -When you want to use a tool, respond with: -{ - "thinking": "...", - "response": "Running backtest...", - "tool_call": {"name": "run_backtest", "arguments": {"token_address": "0x...", "timeframe": "1d", "start_date": "2024-01-01", "end_date": "2024-12-01"}} -} +You have access to tools: +- search_tokens(keyword, limit): Search for tokens by keyword/symbol. +- get_token(address, chain): Get detailed token info. +- get_price(token_ids): Get current token prices. +- get_risk(address, chain): Get risk/honeypot analysis. +- get_trending(chain, limit): Get trending tokens. +- run_backtest(token_address, timeframe, start_date, end_date): Run backtest. REQUIRES a bot to be set first. +- manage_simulation(action, token_address, kline_interval): Manage simulations. REQUIRES a bot. +- create_bot(name, strategy): Create a new trading bot. +- list_bots(): List user's bots. +- set_bot(bot_id): Switch bots in conversation. +- get_bot_info(bot_id): Get bot details including strategy conditions and actions. +- update_strategy(conditions, actions, stop_loss, take_profit): Save trading strategy to bot. MUST include token_address in conditions! + +Take action immediately. Do not ask for confirmation. Do not describe what you will do - just do it. """ ) @@ -266,7 +402,7 @@ class MiniMaxClient: system_prompt: str, tools: Optional[List[Dict[str, Any]]] = None, temperature: float = 0.7, - max_tokens: int = 2000, + max_tokens: int = 3000, thinking_budget: int = 1500, ) -> Dict[str, Any]: """Send a chat request to MiniMax API.""" @@ -289,6 +425,13 @@ class MiniMaxClient: payload["tools"] = tools resp = requests.post(self.endpoint, headers=headers, json=payload) + + # Check for HTTP errors + if resp.status_code != 200: + error_text = resp.text + print(f"API Error {resp.status_code}: {error_text[:500]}") + return {"error": f"API returned {resp.status_code}: {error_text[:200]}"} + return resp.json() or {} def check_connection(self) -> bool: diff --git a/src/backend/app/services/ai_agent/mock_client.py b/src/backend/app/services/ai_agent/mock_client.py new file mode 100644 index 0000000..4ec8b0d --- /dev/null +++ b/src/backend/app/services/ai_agent/mock_client.py @@ -0,0 +1,164 @@ +"""Mock client for testing the ConversationalAgent without hitting real APIs.""" + +from typing import List, Dict, Any, Optional + + +class MockMiniMaxClient: + """Mock client that returns predefined responses for testing. + + Usage: + mock = MockMiniMaxClient() + mock.add_response({\"choices\": [...]}) # Add responses in order + mock.add_response({\"choices\": [...]}) # Second call gets this + + agent = ConversationalAgent(client=mock) + result = agent.chat(\"hello\") + """ + + def __init__(self, responses: List[Dict[str, Any]] = None): + self.responses = responses or [] + self.call_count = 0 + self.calls: List[Dict[str, Any]] = [] # Record all calls for assertions + + def add_response(self, response: Dict[str, Any]): + """Add a response to be returned on the next call.""" + self.responses.append(response) + + def chat( + self, + messages: List[Dict[str, str]], + system_prompt: str, + tools: Optional[List[Dict[str, Any]]] = None, + temperature: float = 0.7, + max_tokens: int = 2000, + thinking_budget: int = 1500, + ) -> Dict[str, Any]: + """Return the next predefined response.""" + # Record the call for debugging/tests + self.calls.append({ + "messages": messages, + "system_prompt": system_prompt[:100] if system_prompt else None, + "tool_calls_count": len(tools) if tools else 0, + }) + + if self.call_count < len(self.responses): + response = self.responses[self.call_count] + self.call_count += 1 + return response + + # Default response if no more predefined responses + return { + "choices": [{ + "message": { + "content": "Mock response - no more responses configured", + "role": "assistant", + } + }] + } + + def reset(self): + """Reset call count and calls list.""" + self.call_count = 0 + self.calls = [] + + def verify_call(self, call_index: int, expected_messages: int = None, expected_tool_count: int = None): + """Verify a specific call was made correctly.""" + if call_index >= len(self.calls): + raise AssertionError(f"Call {call_index} was not made. Total calls: {len(self.calls)}") + + call = self.calls[call_index] + if expected_messages is not None: + actual = len(call["messages"]) + if actual != expected_messages: + raise AssertionError( + f"Call {call_index}: expected {expected_messages} messages, got {actual}" + ) + if expected_tool_count is not None: + actual = call["tool_calls_count"] + if actual != expected_tool_count: + raise AssertionError( + f"Call {call_index}: expected {expected_tool_count} tools, got {actual}" + ) + + +class MockMiniMaxClientWithToolCall(MockMiniMaxClient): + """Mock client that generates tool call responses based on message content.""" + + def __init__(self, tool_handlers: Dict[str, Dict[str, Any]] = None): + """tool_handlers: dict mapping tool names to their responses.""" + super().__init__() + self.tool_handlers = tool_handlers or {} + + def chat( + self, + messages: List[Dict[str, str]], + system_prompt: str, + tools: Optional[List[Dict[str, Any]]] = None, + temperature: float = 0.7, + max_tokens: int = 2000, + thinking_budget: int = 1500, + ) -> Dict[str, Any]: + """Check if last message contains a tool call request and return appropriate response.""" + self.calls.append({ + "messages": messages, + "system_prompt": system_prompt[:100] if system_prompt else None, + "tool_calls_count": len(tools) if tools else 0, + }) + + # Get the last message + if not messages: + return {"choices": [{"message": {"content": "No messages", "role": "assistant"}}]} + + last_msg = messages[-1] + + # If it's a tool result, look for the tool that was called + if last_msg.get("role") == "user" and "[TOOL RESULT]" in last_msg.get("content", ""): + # Extract tool name from the content + content = last_msg["content"] + # Format: [TOOL RESULT] tool_name: result + for tool_name in self.tool_handlers: + if f"[TOOL RESULT] {tool_name}:" in content: + return self.tool_handlers[tool_name] + + # Check if we should generate a tool call + last_user_msg = "" + for msg in reversed(messages): + if msg.get("role") == "user" and "[TOOL RESULT]" not in msg.get("content", ""): + last_user_msg = msg.get("content", "") + break + + # Check each tool's trigger + for tool_name, handler in self.tool_handlers.items(): + trigger = handler.get("trigger", "") + if trigger and trigger.lower() in last_user_msg.lower(): + return { + "choices": [{ + "message": { + "content": handler.get("content", ""), + "role": "assistant", + "tool_calls": [{ + "id": f"call_{tool_name}", + "type": "function", + "function": { + "name": tool_name, + "arguments": handler.get("arguments", "{}") + } + }] + } + }] + } + + # Default: return first available response or empty + if self.responses: + response = self.responses[0] + self.call_count += 1 + return response + + return { + "choices": [{ + "message": { + "content": "How can I help you with your trading bot?", + "role": "assistant", + } + }] + } diff --git a/src/backend/app/services/backtest/engine.py b/src/backend/app/services/backtest/engine.py index 76f7450..3c60446 100644 --- a/src/backend/app/services/backtest/engine.py +++ b/src/backend/app/services/backtest/engine.py @@ -93,6 +93,32 @@ class BacktestEngine: self.results = {"error": "No kline data available"} return self.results + # Debug: log first and last few klines to verify price data + print(f"DEBUG BacktestEngine: Got {len(klines)} klines for {token_id}") + if klines: + print(f"DEBUG BacktestEngine: First kline: {klines[0]}") + print(f"DEBUG BacktestEngine: Last kline: {klines[-1]}") + + # Validate Kline data - check for obviously wrong prices + first_close = float(klines[0].get('close', 0)) + last_close = float(klines[-1].get('close', 0)) + + print(f"DEBUG BacktestEngine: first_close={first_close}, last_close={last_close}") + + # If price changes by more than 1000x, data is likely wrong + if first_close > 0 and last_close > 0: + price_ratio = max(first_close, last_close) / min(first_close, last_close) + print(f"DEBUG BacktestEngine: price_ratio={price_ratio:.0f}x") + + if price_ratio > 1000: + self.status = "failed" + self.results = { + "error": f"Kline data appears incorrect. Price changed by {price_ratio:.0f}x during the period. " + f"First price: ${first_close:.8f}, Last price: ${last_close:.8f}. " + f"This may be due to incorrect token data from the API. Please try a different token or timeframe." + } + return self.results + await self._process_klines(klines) self._calculate_metrics() self.status = "completed" @@ -139,6 +165,17 @@ class BacktestEngine: async def _process_klines(self, klines: List[Dict[str, Any]]): self.total_klines = len(klines) + + # Debug: log strategy config + print(f"DEBUG _process_klines: {len(klines)} klines to process") + print(f"DEBUG _process_klines: conditions = {self.conditions}") + print(f"DEBUG _process_klines: actions = {self.actions}") + print(f"DEBUG _process_klines: stop_loss_percent = {self.stop_loss_percent}") + print(f"DEBUG _process_klines: take_profit_percent = {self.take_profit_percent}") + + # Count price drops for debugging + dip_opportunities = 0 + for i, kline in enumerate(klines): if not self.running: break @@ -149,20 +186,28 @@ class BacktestEngine: if price <= 0: continue - self.last_kline_price = price # Track last price for open position valuation + self.last_kline_price = price # Track last price for mark to market timestamp = kline.get("timestamp", 0) if self.position > 0 and self.entry_price is not None: exit_info = self._check_risk_management(price, timestamp) if exit_info: + print(f"DEBUG: Kline {i} - Risk exit triggered: {exit_info['reason']} at price {price}") await self._execute_risk_exit(price, timestamp, exit_info) continue + # Check each condition for condition in self.conditions: - if self._check_condition(condition, klines, i, price): + cond_result = self._check_condition(condition, klines, i, price) + if cond_result: + dip_opportunities += 1 + if self.position == 0: + print(f"DEBUG: Kline {i} - BUY condition triggered: {condition['type']} at price {price}") await self._execute_actions(price, timestamp, condition) break + + print(f"DEBUG _process_klines: Total dip opportunities: {dip_opportunities}") @property def average_entry_price(self) -> Optional[float]: @@ -249,6 +294,9 @@ class BacktestEngine: if prev_price <= 0: return False drop_pct = ((prev_price - current_price) / prev_price) * 100 + # Debug first few to see what's happening + if current_idx < 5 or drop_pct >= threshold: + print(f"DEBUG _check_condition: idx={current_idx}, prev={prev_price}, curr={current_price}, drop={drop_pct:.4f}%, threshold={threshold}, trigger={drop_pct >= threshold}") return drop_pct >= threshold elif cond_type == "price_rise": @@ -291,6 +339,8 @@ class BacktestEngine: amount = self.current_balance * (amount_percent / 100) if action_type == "buy" and self.current_balance >= amount: + # Buy if we have funds available (supports DCA - buy more on each dip) + # position > 0 just means we already have some tokens, we can still buy more quantity = amount / price self.position += quantity self.current_balance -= amount @@ -298,6 +348,7 @@ class BacktestEngine: self.position_token = token self.entry_price = price # Keep last entry price for reference self.entry_time = timestamp + print(f"DEBUG _execute_actions: BUY - amount=${amount:.2f}, price={price}, quantity={quantity}, position={self.position}") self.trades.append( { "type": "buy", @@ -324,22 +375,36 @@ class BacktestEngine: ) elif action_type == "sell" and self.position > 0: - sell_amount = self.position * price + # Sell amount_percent of current position (default 100% if not specified) + sell_percent = action.get("amount_percent", 100) / 100.0 + sell_quantity = self.position * sell_percent + sell_amount = sell_quantity * price self.current_balance += sell_amount + + # Proportionally reduce cost_basis + sold_cost_basis = self.cost_basis * sell_percent + self.cost_basis -= sold_cost_basis + + print(f"DEBUG _execute_actions: SELL - position={self.position}, sell_percent={sell_percent*100}%, quantity={sell_quantity}, price={price}, sell_amount=${sell_amount:.2f}") self.trades.append( { "type": "sell", "token": self.position_token, "price": price, "amount": sell_amount, - "quantity": self.position, + "quantity": sell_quantity, "timestamp": timestamp, "exit_reason": "manual", } ) - self.position = 0 - self.entry_price = None - self.entry_time = None + + # Update remaining position + self.position -= sell_quantity + if self.position <= 0.00000001: # Account for floating point + self.position = 0 + self.entry_price = None + self.cost_basis = 0.0 + self.entry_time = None self.signals.append( { "id": str(uuid.uuid4()), @@ -356,20 +421,48 @@ class BacktestEngine: ) def _calculate_metrics(self): + # Debug: log all trades for analysis + print(f"DEBUG _calculate_metrics: {len(self.trades)} total trades") + buy_trades = [t for t in self.trades if t["type"] == "buy"] + sell_trades = [t for t in self.trades if t["type"] == "sell"] + print(f" Buy trades: {len(buy_trades)}") + print(f" Sell trades: {len(sell_trades)}") + + if buy_trades: + print(f" First buy: amount=${buy_trades[0]['amount']:.2f}, price={buy_trades[0]['price']}, quantity={buy_trades[0]['quantity']}") + print(f" Last buy: amount=${buy_trades[-1]['amount']:.2f}, price={buy_trades[-1]['price']}, quantity={buy_trades[-1]['quantity']}") + + if sell_trades: + print(f" First sell: amount=${sell_trades[0]['amount']:.2f}, price={sell_trades[0]['price']}, exit_reason={sell_trades[0].get('exit_reason')}") + print(f" Last sell: amount=${sell_trades[-1]['amount']:.2f}, price={sell_trades[-1]['price']}, exit_reason={sell_trades[-1].get('exit_reason')}") + # For open positions, use the last kline price to mark to market # If no last kline price, fall back to entry price position_price = self.last_kline_price if position_price is None and self.trades and self.position > 0: position_price = self.trades[-1]["price"] # Fall back to entry price + # Debug logging + print(f"DEBUG _calculate_metrics:") + print(f" initial_balance: {self.initial_balance}") + print(f" current_balance: {self.current_balance}") + print(f" position: {self.position}") + print(f" position_price: {position_price}") + print(f" last_kline_price: {self.last_kline_price}") + # Calculate final balance: use marked-to-market value if position open, otherwise current balance if self.position > 0 and position_price: final_balance = self.current_balance + self.position * position_price else: final_balance = self.current_balance + + print(f" final_balance calculated: {final_balance}") + total_return = ( (final_balance - self.initial_balance) / self.initial_balance ) * 100 + + print(f" total_return calculated: {total_return}%") buy_trades = [t for t in self.trades if t["type"] == "buy"] sell_trades = [t for t in self.trades if t["type"] == "sell"] diff --git a/src/backend/tests/test_agent.py b/src/backend/tests/test_agent.py new file mode 100644 index 0000000..173ceb8 --- /dev/null +++ b/src/backend/tests/test_agent.py @@ -0,0 +1,609 @@ +"""Tests for ConversationalAgent using mock client.""" + +import pytest +import sys +import os + +# Add parent directory to path +sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + +from app.services.ai_agent.agent import ConversationalAgent +from app.services.ai_agent.mock_client import MockMiniMaxClient, MockMiniMaxClientWithToolCall + + +class TestConversationalAgent: + """Test ConversationalAgent with mocked MiniMax API.""" + + def test_greeting_response(self): + """Test that agent responds to greeting.""" + mock = MockMiniMaxClient() + mock.add_response({ + "choices": [{ + "message": { + "content": "Hello! How can I help you with your trading today?", + "role": "assistant", + } + }] + }) + + agent = ConversationalAgent(client=mock) + result = agent.chat("Hello") + + assert "Hello" in result.get("response", "") + assert mock.call_count == 1 + + def test_api_error_returns_error_message(self): + """Test that when API returns an error (like 529 overloaded), we return an error message.""" + mock = MockMiniMaxClient() + + # API returns an error on all 3 retry attempts + for _ in range(3): + mock.add_response({ + "error": "API returned 529: Server overloaded" + }) + + agent = ConversationalAgent(client=mock) + result = agent.chat("Hello") + + # Should return error message, not empty string + response = result.get("response", "") + print(f"Response: {response}") + print(f"Call count: {mock.call_count}") + + assert response != "", "Response should not be empty when API errors" + assert "trouble" in response.lower() or "error" in response.lower() or "sorry" in response.lower(), \ + f"Response should mention error: {response}" + assert result.get("success") == False + + def test_api_empty_choices_returns_error_message(self): + """Test that when API returns choices=None (like 520 error), we return an error message.""" + mock = MockMiniMaxClient() + + # API returns empty choices on all 3 retry attempts + for _ in range(3): + mock.add_response({ + "id": "test-id", + "choices": None, # Empty choices = API error + "model": "MiniMax-M2.7", + "base_resp": {"status_code": 1000, "status_msg": "unknown error, 520"} + }) + + agent = ConversationalAgent(client=mock) + result = agent.chat("Hello") + + # Should return error message, not empty string + response = result.get("response", "") + print(f"Response: {response}") + print(f"Call count: {mock.call_count}") + + assert response != "", "Response should not be empty when API returns empty choices" + assert "trouble" in response.lower() or "error" in response.lower() or "sorry" in response.lower(), \ + f"Response should mention error: {response}" + assert result.get("success") == False + + def test_tool_call_list_bots(self): + """Test that agent calls list_bots tool when asked about bots.""" + mock = MockMiniMaxClient() + + # First call: model decides to call list_bots + mock.add_response({ + "choices": [{ + "finish_reason": "tool_calls", + "message": { + "content": "", + "role": "assistant", + "tool_calls": [{ + "id": "call_1", + "type": "function", + "function": { + "name": "list_bots", + "arguments": "{}" + } + }] + } + }] + }) + + # Second call: after tool result, model gives final response + mock.add_response({ + "choices": [{ + "message": { + "content": "You don't have any bots yet. Would you like to create one?", + "role": "assistant", + } + }] + }) + + # Pass anonymous_token so _execute_list_bots doesn't return error + agent = ConversationalAgent(client=mock, anonymous_token="test-token") + result = agent.chat("What bots do I have?") + + assert mock.call_count == 2 + # The response should be from the second call + assert "bot" in result.get("response", "").lower() + + def test_tool_result_with_empty_content_returns_tool_result(self): + """Test that if second API call returns empty content but has tool_calls, we fallback to tool result.""" + mock = MockMiniMaxClient() + + # First call: model calls list_bots + mock.add_response({ + "choices": [{ + "finish_reason": "tool_calls", + "message": { + "content": "", + "role": "assistant", + "tool_calls": [{ + "id": "call_1", + "type": "function", + "function": { + "name": "list_bots", + "arguments": "{}" + } + }] + } + }] + }) + + # Second call: model calls ANOTHER tool (not providing text) + mock.add_response({ + "choices": [{ + "finish_reason": "tool_calls", + "message": { + "content": "\n", # Whitespace only + "role": "assistant", + "tool_calls": [{ + "id": "call_2", + "type": "function", + "function": { + "name": "get_bot_info", + "arguments": "{}" + } + }] + } + }] + }) + + agent = ConversationalAgent(client=mock) + result = agent.chat("What bots do I have?") + + # Should fallback to the tool result text, not empty string + assert result.get("response", "") != "" + + def test_content_with_tool_calls_returns_content(self): + """Test that if second API call returns BOTH content AND tool_calls, we return the content. + + This tests the exact scenario from production: + - Tool result: 'Backtest failed: Token address not found...' + - Model response: 'Got it! Running the backtest now.' (with tool_calls) + - Expected: Since tool result is an ERROR, we should return the error, NOT model content + """ + mock = MockMiniMaxClient() + + # First call: model calls run_backtest + mock.add_response({ + "choices": [{ + "finish_reason": "tool_calls", + "message": { + "content": "", + "role": "assistant", + "tool_calls": [{ + "id": "call_1", + "type": "function", + "function": { + "name": "run_backtest", + "arguments": '{"token_address": "0x..."}' + } + }] + } + }] + }) + + # Second call: model returns misleading positive content AND has tool_calls + # But tool result was an ERROR, so we should return the error + mock.add_response({ + "choices": [{ + "finish_reason": "tool_calls", + "message": { + "content": "Got it! Running the backtest now.", # Misleading! + "role": "assistant", + "tool_calls": [{ + "id": "call_2", + "type": "function", + "function": { + "name": "get_bot_info", + "arguments": "{}" + } + }] + } + }] + }) + + agent = ConversationalAgent( + client=mock, + conversation_id="test-conv", + anonymous_token="test-token" + ) + result = agent.chat("Run backtest on SHIB") + + # Since tool result is an error, we should return the ERROR, not model content + response = result.get("response", "") + print(f"Response: '{response}'") + + # The key assertion: tool result was an error, so we should return the error + assert "not found" in response.lower() or "error" in response.lower() or "couldn't" in response.lower(), \ + f"Expected error from tool result, got: {response}" + assert "Got it" not in response, f"Should NOT return misleading positive content" + + def test_content_without_tool_calls_returns_content(self): + """Test that if second API call returns content WITHOUT tool_calls, we return the content. + Note: This test uses list_bots which returns a friendly message, not an error.""" + mock = MockMiniMaxClient() + + # First call: model calls list_bots + mock.add_response({ + "choices": [{ + "finish_reason": "tool_calls", + "message": { + "content": "", + "role": "assistant", + "tool_calls": [{ + "id": "call_1", + "type": "function", + "function": { + "name": "list_bots", + "arguments": '{}' + } + }] + } + }] + }) + + # Second call: model returns ONLY content, no tool_calls + # Tool result was "You don't have any bots yet" (not an error keyword), use model content + mock.add_response({ + "choices": [{ + "finish_reason": "stop", + "message": { + "content": "You don't have any bots. Would you like to create one?", # Content only + "role": "assistant", + } + }] + }) + + agent = ConversationalAgent( + client=mock, + conversation_id="test-conv", + anonymous_token="test-token" + ) + result = agent.chat("What bots do I have?") + + response = result.get("response", "") + print(f"Response: '{response}'") + assert "You don't have any bots" in response + + def test_second_api_call_error_returns_tool_result(self): + """Test that if second API call (in _send_tool_result_to_model) returns error, we return tool result.""" + mock = MockMiniMaxClient() + + # First call: model calls run_backtest + mock.add_response({ + "choices": [{ + "finish_reason": "tool_calls", + "message": { + "content": "", + "role": "assistant", + "tool_calls": [{ + "id": "call_1", + "type": "function", + "function": { + "name": "run_backtest", + "arguments": '{}' + } + }] + } + }] + }) + + # Second call: API returns error on all 3 retry attempts + for _ in range(3): + mock.add_response({ + "error": "API returned 529: Server overloaded" + }) + + agent = ConversationalAgent( + client=mock, + conversation_id="test-conv", + anonymous_token="test-token" + ) + result = agent.chat("Run backtest") + + # Should fallback to tool result (backtest not found message), not empty string + response = result.get("response", "") + print(f"Response: '{response}'") + print(f"Call count: {mock.call_count}") + + assert response != "", "Response should not be empty when second API errors" + # The tool result should be "I couldn't find the bot..." + assert "bot" in response.lower() or "couldn't find" in response.lower(), \ + f"Response should contain tool result: {response}" + + def test_chained_tool_calls_with_empty_content(self): + """Test that if model returns empty content but has tool_calls, we execute the next tool. + + This is the exact scenario from production: + - User asks about bots + - Model calls list_bots tool + - Tool returns bot list + - Model responds with EMPTY content but has get_bot_info tool call + - We should execute get_bot_info and continue, NOT return empty string + """ + mock = MockMiniMaxClient() + + # First call: model decides to call list_bots + mock.add_response({ + "choices": [{ + "finish_reason": "tool_calls", + "message": { + "content": "", + "role": "assistant", + "tool_calls": [{ + "id": "call_1", + "type": "function", + "function": { + "name": "list_bots", + "arguments": "{}" + } + }] + } + }] + }) + + # Second call: model returns EMPTY content but wants to call get_bot_info + # This is the BUG scenario - model just wants to do more tool calls + mock.add_response({ + "choices": [{ + "finish_reason": "tool_calls", + "message": { + "content": "", # Empty content! + "role": "assistant", + "tool_calls": [{ + "id": "call_2", + "type": "function", + "function": { + "name": "get_bot_info", + "arguments": '{"bot_id": "test-bot-123"}' + } + }] + } + }] + }) + + # Third call: after get_bot_info, model finally returns content + mock.add_response({ + "choices": [{ + "message": { + "content": "I found your bot 'Test Bot' with 2 strategy conditions configured.", + "role": "assistant", + } + }] + }) + + agent = ConversationalAgent(client=mock, anonymous_token="test-token") + result = agent.chat("Tell me about my bots") + + response = result.get("response", "") + print(f"Response: '{response}'") + print(f"Call count: {mock.call_count}") + + # Should NOT return empty string - should continue with tool calls + assert response != "", "Response should not be empty when model has more tool calls" + # get_bot_info returns error since bot doesn't exist in DB, but we continued the chain + # (which is the key behavior we're testing - it didn't return empty string) + assert "❌" in response or "bot" in response.lower(), f"Response should mention bot or error: {response}" + + def test_json_response_extraction(self): + """Test that JSON-formatted responses are properly extracted.""" + mock = MockMiniMaxClient() + + # Model returns JSON in code block with response field + mock.add_response({ + "choices": [{ + "message": { + "content": "```json\n{\n \"thinking\": \"The user wants a bot. Creating one now.\",\n \"response\": \"✅ Bot created successfully!\"\n}\n```", + "role": "assistant", + } + }] + }) + + agent = ConversationalAgent(client=mock) + result = agent.chat("create a bot") + + response = result.get("response", "") + print(f"Response: '{response}'") + + # Should extract the response field, not show JSON + assert "✅ Bot created successfully!" in response, f"Should contain bot message: {response}" + assert "thinking" not in response.lower() or "json" not in response.lower(), f"Should not contain raw JSON: {response}" + assert "```json" not in response, f"Should not contain code block markers: {response}" + + def test_retry_succeeds_on_second_attempt(self): + """Test that if first API call fails but second succeeds, we use the successful response.""" + mock = MockMiniMaxClient() + + # First attempt fails with error + mock.add_response({"error": "API returned 529: Server overloaded"}) + # Second attempt succeeds + mock.add_response({ + "choices": [{ + "message": { + "content": "Hello! How can I help you?", + "role": "assistant", + } + }] + }) + + agent = ConversationalAgent(client=mock) + result = agent.chat("Hello") + + response = result.get("response", "") + print(f"Response: '{response}'") + print(f"Call count: {mock.call_count}") + + # Should use the successful response from 2nd attempt + assert "Hello" in response + assert "trouble" not in response.lower() + assert mock.call_count == 2 # Two calls: 1 error + 1 success + + def test_model_json_response_is_parsed(self): + """Test that if model returns JSON-formatted response in _send_tool_result_to_model, we extract only the response field.""" + mock = MockMiniMaxClient() + + # User message triggers tool call + mock.add_response({ + "choices": [{ + "finish_reason": "tool_calls", + "message": { + "content": "", + "role": "assistant", + "tool_calls": [{ + "id": "call_1", + "type": "function", + "function": { + "name": "create_bot", + "arguments": '{"name": "TestBot"}' + } + }] + } + }] + }) + + # Model's second response is JSON (this is the bug scenario) + mock.add_response({ + "choices": [{ + "message": { + # Model returns JSON instead of plain text + "content": '{"thinking": "Bot created", "response": "Your bot TestBot is ready! What strategy?", "strategy_update": null}', + "role": "assistant", + } + }] + }) + + agent = ConversationalAgent( + client=mock, + conversation_id="test-conv", + anonymous_token="test-token" + ) + + result = agent.chat("Create a bot named TestBot") + + # The response should NOT contain JSON + response_text = result.get("response", "") + print(f"Response: {response_text}") + + # Should NOT contain JSON artifacts + assert "{\"thinking\":" not in response_text + assert "\"strategy_update\":" not in response_text + assert "```json" not in response_text + + # Should contain the actual response text + assert "bot TestBot is ready" in response_text or "strategy" in response_text.lower() + + def test_create_bot_flow(self): + """Test the full flow of creating a bot.""" + mock = MockMiniMaxClient() + + # First call: model asks for bot name + mock.add_response({ + "choices": [{ + "message": { + "content": "I'd be happy to help you create a trading bot! What would you like to name it?", + "role": "assistant", + } + }] + }) + + # Second call: user provides name, model calls create_bot + mock.add_response({ + "choices": [{ + "finish_reason": "tool_calls", + "message": { + "content": "", + "role": "assistant", + "tool_calls": [{ + "id": "call_create", + "type": "function", + "function": { + "name": "create_bot", + "arguments": '{"name": "TestBot"}' + } + }] + } + }] + }) + + # Third call: after create_bot result, model gives PLAIN TEXT response (not JSON) + mock.add_response({ + "choices": [{ + "message": { + "content": "✅ Your bot 'TestBot' has been created! Now let's set up your trading strategy.", + "role": "assistant", + } + }] + }) + + agent = ConversationalAgent( + client=mock, + conversation_id="test-conv-123", + anonymous_token="test-token" + ) + + # First message - greeting + result1 = agent.chat("I want to run a backtest") + assert mock.call_count == 1 + + # Second message - bot name + result2 = agent.chat("MyBot") + assert mock.call_count == 3 # Two calls due to tool execution + + assert "bot" in result2.get("response", "").lower() + + +class TestMockMiniMaxClient: + """Test the mock client itself.""" + + def test_add_and_retrieve_responses(self): + """Test that responses are returned in order.""" + mock = MockMiniMaxClient() + mock.add_response({"result": "first"}) + mock.add_response({"result": "second"}) + + assert mock.chat({}, "") == {"result": "first"} + assert mock.chat({}, "") == {"result": "second"} + + def test_calls_are_recorded(self): + """Test that all calls are recorded.""" + mock = MockMiniMaxClient() + mock.add_response({"result": "ok"}) + + mock.chat(["msg1"], "system") + mock.chat(["msg2"], "system") + + assert len(mock.calls) == 2 + assert mock.calls[0]["messages"] == ["msg1"] + assert mock.calls[1]["messages"] == ["msg2"] + + def test_default_response_when_exhausted(self): + """Test default response when all predefined responses are used.""" + mock = MockMiniMaxClient() + mock.add_response({"result": "only"}) + + result1 = mock.chat([], "") + result2 = mock.chat([], "") # No more responses + + assert result1 == {"result": "only"} + assert "Mock response" in result2["choices"][0]["message"]["content"] + + +if __name__ == "__main__": + pytest.main([__file__, "-v"]) diff --git a/src/backend/tests/test_backtest_engine.py b/src/backend/tests/test_backtest_engine.py index a554c5e..b8b1381 100644 --- a/src/backend/tests/test_backtest_engine.py +++ b/src/backend/tests/test_backtest_engine.py @@ -1,457 +1,505 @@ -""" -Unit tests for BacktestEngine -Tests stop loss, take profit, and max drawdown calculations -""" +import pytest import asyncio +from datetime import datetime +import sys +import os + +# Add the backend directory to path +sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', 'app')) + from app.services.backtest.engine import BacktestEngine -class TestBacktestEngine: - """Test suite for BacktestEngine""" - - def _run_backtest(self, config, klines): - """Helper to run backtest with given klines""" - engine = BacktestEngine(config) - result = asyncio.run(engine.run_with_klines(klines)) - return engine, result - - def _trace_portfolio(self, engine, initial_balance): - """Print portfolio trace for debugging""" - running_balance = initial_balance - running_position = 0.0 - - print("\nPortfolio Trace:") - for i, trade in enumerate(engine.trades): - if trade["type"] == "buy": - running_position = trade["quantity"] - running_balance -= trade["amount"] - portfolio = running_balance + (running_position * trade["price"]) - print(f" BUY #{i+1}: @${trade['price']} - portfolio=${portfolio:.2f}") - else: - running_balance += trade["amount"] - running_position = 0 - portfolio = running_balance - print(f" SELL #{i+1}: @${trade['price']} ({trade.get('exit_reason', '')}) - portfolio=${portfolio:.2f}") - - if engine.position > 0 and engine.last_kline_price: - final = running_balance + (engine.position * engine.last_kline_price) - print(f" FINAL: position={engine.position:.2f} @ ${engine.last_kline_price} = ${final:.2f}") - print() - - def test_stop_loss_triggers_correctly(self): - """Test stop loss triggers at configured percentage""" - config = { - "bot_id": "test", - "strategy_config": { - "conditions": [{"type": "price_drop", "token": "TEST", "token_address": "0x123", "threshold": 5}], - "actions": [{"type": "buy", "amount_percent": 100}], - "risk_management": {"stop_loss_percent": 5, "take_profit_percent": 10} - }, - "ave_api_key": "test", - "ave_api_plan": "free", - "initial_balance": 10000.0, - } - - # Price sequence that triggers buy then stop loss: - # $110 -> $100 (9% drop, BUY) - # $100 -> $95 (5% drop, STOP LOSS at 5% from $100 = $95) - klines = [ - {"close": "110.0", "timestamp": 1000, "open": "110.0", "high": "110.0", "low": "110.0", "volume": "1000"}, - {"close": "100.0", "timestamp": 2000, "open": "100.0", "high": "100.0", "low": "100.0", "volume": "1000"}, - {"close": "95.0", "timestamp": 3000, "open": "95.0", "high": "95.0", "low": "95.0", "volume": "1000"}, - ] - - engine, result = self._run_backtest(config, klines) - self._trace_portfolio(engine, 10000.0) - - print(f"Results:") - print(f" Trades: {len(engine.trades)} (expected 2)") - print(f" Max drawdown: {result['max_drawdown']}%") - print(f" Total return: {result['total_return']}%") - - assert len(engine.trades) == 2 - assert engine.trades[0]["type"] == "buy" - assert engine.trades[1]["type"] == "sell" - assert engine.trades[1]["exit_reason"] == "stop_loss" - # Max drawdown should be ~5% (stop loss percentage) - assert 3 < result['max_drawdown'] < 8 - # Total return should be ~-5% - assert -8 < result['total_return'] < -3 - - def test_take_profit_triggers(self): - """Test take profit triggers at configured percentage""" - config = { - "bot_id": "test", - "strategy_config": { - "conditions": [{"type": "price_drop", "token": "TEST", "token_address": "0x123", "threshold": 5}], - "actions": [{"type": "buy", "amount_percent": 100}], - "risk_management": {"stop_loss_percent": 5, "take_profit_percent": 10} - }, - "ave_api_key": "test", - "ave_api_plan": "free", - "initial_balance": 10000.0, - } - - # $100 -> $95 (5% drop, BUY) -> $104.5 (10% rise, TAKE PROFIT) - klines = [ - {"close": "100.0", "timestamp": 1000, "open": "100.0", "high": "100.0", "low": "100.0", "volume": "1000"}, - {"close": "95.0", "timestamp": 2000, "open": "95.0", "high": "95.0", "low": "95.0", "volume": "1000"}, - {"close": "104.5", "timestamp": 3000, "open": "104.5", "high": "104.5", "low": "104.5", "volume": "1000"}, - ] - - engine, result = self._run_backtest(config, klines) - self._trace_portfolio(engine, 10000.0) - - print(f"Results:") - print(f" Trades: {len(engine.trades)} (expected 2)") - print(f" Max drawdown: {result['max_drawdown']}%") - print(f" Total return: {result['total_return']}%") - - assert len(engine.trades) == 2 - assert engine.trades[1]["exit_reason"] == "take_profit" - assert result['total_return'] > 0 - - def test_max_drawdown_bounded_by_stop_loss(self): - """Test that max drawdown is bounded by stop loss when position is properly closed""" - config = { - "bot_id": "test", - "strategy_config": { - "conditions": [{"type": "price_drop", "token": "TEST", "token_address": "0x123", "threshold": 5}], - "actions": [{"type": "buy", "amount_percent": 100}], - "risk_management": {"stop_loss_percent": 5, "take_profit_percent": 10} - }, - "ave_api_key": "test", - "ave_api_plan": "free", - "initial_balance": 10000.0, - } - - # $110 -> $100 -> $95 (BUY) -> $90 (STOP LOSS) - klines = [ - {"close": "110.0", "timestamp": 1000, "open": "110.0", "high": "110.0", "low": "110.0", "volume": "1000"}, - {"close": "100.0", "timestamp": 2000, "open": "100.0", "high": "100.0", "low": "100.0", "volume": "1000"}, - {"close": "95.0", "timestamp": 3000, "open": "95.0", "high": "95.0", "low": "95.0", "volume": "1000"}, - {"close": "90.0", "timestamp": 4000, "open": "90.0", "high": "90.0", "low": "90.0", "volume": "1000"}, - ] - - engine, result = self._run_backtest(config, klines) - self._trace_portfolio(engine, 10000.0) - - print(f"Results:") - print(f" Trades: {len(engine.trades)}") - print(f" Max drawdown: {result['max_drawdown']}%") - print(f" Total return: {result['total_return']}%") - - # With 5% stop loss, max drawdown should be around 5% - assert 3 < result['max_drawdown'] < 8 - - def test_open_position_not_closed(self): - """Test scenario where last kline has an open position""" - config = { - "bot_id": "test", - "strategy_config": { - "conditions": [{"type": "price_drop", "token": "TEST", "token_address": "0x123", "threshold": 10}], - "actions": [{"type": "buy", "amount_percent": 100}], - "risk_management": {"stop_loss_percent": 5, "take_profit_percent": 10} - }, - "ave_api_key": "test", - "ave_api_plan": "free", - "initial_balance": 10000.0, - } - - # $100 -> $90 (10% drop, BUY) - and backtest ends here - # Position is open, marked to market at $90 - klines = [ - {"close": "100.0", "timestamp": 1000, "open": "100.0", "high": "100.0", "low": "100.0", "volume": "1000"}, - {"close": "90.0", "timestamp": 2000, "open": "90.0", "high": "90.0", "low": "90.0", "volume": "1000"}, - ] - - engine, result = self._run_backtest(config, klines) - self._trace_portfolio(engine, 10000.0) - - print(f"Results:") - print(f" Trades: {len(engine.trades)}") - print(f" Position open: {engine.position > 0}") - print(f" Entry price: ${engine.entry_price}") - print(f" Last kline price: ${engine.last_kline_price}") - print(f" Max drawdown: {result['max_drawdown']}%") - print(f" Total return: {result['total_return']}%") - - # Position should be open - assert engine.position > 0 - # Entry should be $90 - assert engine.entry_price == 90.0 - # Since entry = last kline price, no unrealized loss - # Max drawdown should be 0% - assert result['max_drawdown'] == 0.0 - - def test_open_position_with_loss(self): - """Test open position where price dropped but stop loss didn't trigger""" - config = { - "bot_id": "test", - "strategy_config": { - "conditions": [{"type": "price_drop", "token": "TEST", "token_address": "0x123", "threshold": 10}], - "actions": [{"type": "buy", "amount_percent": 100}], - "risk_management": {"stop_loss_percent": 5, "take_profit_percent": 10} - }, - "ave_api_key": "test", - "ave_api_plan": "free", - "initial_balance": 10000.0, - } - - # $100 -> $90 (10% drop, BUY at $90) -> $85 (stop loss at 5% from $90 = $85.5) - # $85 > $85.5? No, $85 < $85.5, so stop loss WOULD trigger - # Let me use $86 instead - $86 > $85.5 so no stop loss - klines = [ - {"close": "100.0", "timestamp": 1000, "open": "100.0", "high": "100.0", "low": "100.0", "volume": "1000"}, - {"close": "90.0", "timestamp": 2000, "open": "90.0", "high": "90.0", "low": "90.0", "volume": "1000"}, - {"close": "86.0", "timestamp": 3000, "open": "86.0", "high": "86.0", "low": "86.0", "volume": "1000"}, - ] - - engine, result = self._run_backtest(config, klines) - self._trace_portfolio(engine, 10000.0) - - print(f"Results:") - print(f" Trades: {len(engine.trades)}") - print(f" Position open: {engine.position > 0}") - print(f" Entry price: ${engine.entry_price}") - print(f" Last kline price: ${engine.last_kline_price}") - print(f" Max drawdown: {result['max_drawdown']}%") - print(f" Total return: {result['total_return']}%") - - # Position should be open - assert engine.position > 0 - # Entry = $90, stop = $85.50, last = $86 (above stop) - # Portfolio: $0 + position * $86 - # Position: 10000/90 = 111.11 tokens - # Portfolio at $86: 111.11 * 86 = $9,555.56 - # But we only track portfolio at trade points, so max was $10,000 - # drawdown = (10000 - 9555.56) / 10000 = 4.44% - print(f" Expected max drawdown: ~4.4% (marked to market at $86)") - - def test_multiple_buy_sell_cycles(self): - """Test multiple buy/sell cycles""" - config = { - "bot_id": "test", - "strategy_config": { - "conditions": [{"type": "price_drop", "token": "TEST", "token_address": "0x123", "threshold": 5}], - "actions": [{"type": "buy", "amount_percent": 50}], # 50% of balance - "risk_management": {"stop_loss_percent": 5, "take_profit_percent": 10} - }, - "ave_api_key": "test", - "ave_api_plan": "free", - "initial_balance": 10000.0, - } - - # $100 -> $95 (BUY) -> $104.5 (TAKE PROFIT) -> $95 (BUY) -> $90 (STOP LOSS) - klines = [ - {"close": "100.0", "timestamp": 1000, "open": "100.0", "high": "100.0", "low": "100.0", "volume": "1000"}, - {"close": "95.0", "timestamp": 2000, "open": "95.0", "high": "95.0", "low": "95.0", "volume": "1000"}, # BUY at $95 - {"close": "104.5", "timestamp": 3000, "open": "104.5", "high": "104.5", "low": "104.5", "volume": "1000"}, # TAKE PROFIT - {"close": "95.0", "timestamp": 4000, "open": "95.0", "high": "95.0", "low": "95.0", "volume": "1000"}, # 9% drop - no buy - {"close": "90.0", "timestamp": 5000, "open": "90.0", "high": "90.0", "low": "90.0", "volume": "1000"}, # 10.5% drop from $100 - BUY at $90 - {"close": "85.5", "timestamp": 6000, "open": "85.5", "high": "85.5", "low": "85.5", "volume": "1000"}, # STOP LOSS at 5% from $90 = $85.5 - ] - - engine, result = self._run_backtest(config, klines) - self._trace_portfolio(engine, 10000.0) - - print(f"Results:") - print(f" Trades: {len(engine.trades)}") - print(f" Buy count: {len([t for t in engine.trades if t['type'] == 'buy'])}") - print(f" Sell count: {len([t for t in engine.trades if t['type'] == 'sell'])}") - print(f" Max drawdown: {result['max_drawdown']}%") - print(f" Total return: {result['total_return']}%") +def create_klines(start_price, num_klines, interval=1.0, volatility=0.01): + """Helper to create kline data with predictable price movements. - -def run_tests(): - tests = TestBacktestEngine() - - print("=" * 60) - print("TEST 1: Stop Loss Triggers Correctly") - print("=" * 60) - try: - tests.test_stop_loss_triggers_correctly() - print("PASSED\n") - except AssertionError as e: - print(f"FAILED: {e}\n") - - print("=" * 60) - print("TEST 2: Take Profit Triggers") - print("=" * 60) - try: - tests.test_take_profit_triggers() - print("PASSED\n") - except AssertionError as e: - print(f"FAILED: {e}\n") - - print("=" * 60) - print("TEST 3: Max Drawdown Bounded by Stop Loss") - print("=" * 60) - try: - tests.test_max_drawdown_bounded_by_stop_loss() - print("PASSED\n") - except AssertionError as e: - print(f"FAILED: {e}\n") - - print("=" * 60) - print("TEST 4: Open Position Not Closed") - print("=" * 60) - try: - tests.test_open_position_not_closed() - print("PASSED\n") - except AssertionError as e: - print(f"FAILED: {e}\n") - - print("=" * 60) - print("TEST 5: Open Position With Loss") - print("=" * 60) - try: - tests.test_open_position_with_loss() - print("PASSED\n") - except AssertionError as e: - print(f"FAILED: {e}\n") - - print("=" * 60) - print("TEST 6: Multiple Buy/Sell Cycles") - print("=" * 60) - try: - tests.test_multiple_buy_sell_cycles() - print("PASSED\n") - except AssertionError as e: - print(f"FAILED: {e}\n") - - -def test_dca_multiple_buys(): - """Test that DCA with multiple consecutive buys uses weighted average for stop loss.""" - print("\n" + "=" * 60) - print("TEST 7: DCA With Multiple Consecutive Buys") - print("=" * 60) - - config = { - "bot_id": "test", - "strategy_config": { - "conditions": [{"type": "price_drop", "threshold": 2, "token": "TEST", "token_address": "0x123"}], - "actions": [{"type": "buy", "amount_percent": 20}], - "risk_management": {"stop_loss_percent": 5, "take_profit_percent": 5}, - }, - "initial_balance": 10000.0, - "ave_api_key": "test", - "ave_api_plan": "free", - } - - # 3 consecutive 2% drops = 3 buys at $0.58, $0.57, $0.56 - # Then drop to $0.50 which is below 5% from average (~$0.57 * 0.95 = $0.54) - klines = [ - {"close": "0.60", "timestamp": 1000, "open": "0.60", "high": "0.60", "low": "0.60", "volume": "1000"}, - {"close": "0.588", "timestamp": 2000}, # 2% drop -> BUY 1 @ $0.588 - {"close": "0.576", "timestamp": 3000}, # 2% drop -> BUY 2 @ $0.576 - {"close": "0.565", "timestamp": 4000}, # 2% drop -> BUY 3 @ $0.565 - {"close": "0.50", "timestamp": 5000}, # Below 5% from avg -> STOP LOSS - ] - - test = TestBacktestEngine() - engine, result = test._run_backtest(config, klines) - test._trace_portfolio(engine, 10000.0) - - print(f"\nResults:") - print(f" Trades: {len(engine.trades)} (expected 3: 2 buys + stop loss)") - print(f" Max drawdown: {result['max_drawdown']}%") - print(f" Total return: {result['total_return']}%") - - # Verify: 2 buys + 1 sell (stop loss) = 3 trades - # The 3rd buy @ $0.565 doesn't happen because stop loss triggers at $0.5 first - assert len(engine.trades) == 3, f"Expected 3 trades, got {len(engine.trades)}" - - # Verify last trade is stop loss - last_trade = engine.trades[-1] - assert last_trade["type"] == "sell", "Last trade should be sell" - assert last_trade.get("exit_reason") == "stop_loss", f"Last trade should be stop_loss, got {last_trade.get('exit_reason')}" - - # Verify max drawdown is reasonable (close to stop loss %) - # Actual loss should be around 5% from weighted average - assert result['max_drawdown'] < 10, f"Max drawdown {result['max_drawdown']}% is too high for 5% stop loss" - - # Position is now 0 after stop loss, so avg_entry_price is None - print(f" Position closed: {engine.position == 0}") - print(f" Final balance: ${engine.current_balance:.2f}") - print("PASSED") - return True - - -def test_stop_loss_always_results_in_loss(): - """Test that stop loss ALWAYS results in a loss, never a gain. - - This tests the scenario where: - - You start with $10,000 - - Price keeps dropping, triggering multiple buys - - Stop loss triggers, selling your entire position - - Final balance MUST be less than initial balance + Args: + start_price: Starting price + num_klines: Number of klines to create + interval: Price change per kline (can be positive or negative) + volatility: Random noise factor (0.01 = 1%) """ - print("\n" + "=" * 60) - print("TEST 8: Stop Loss Always Results In Loss") - print("=" * 60) + import random + klines = [] + price = start_price + base_time = 1704067200 # 2024-01-01 00:00:00 UTC + + for i in range(num_klines): + # Add some randomness + noise = (random.random() - 0.5) * 2 * volatility * price + price = max(0.00000001, price + interval + noise) + + open_price = price - (random.random() * volatility * price) + close_price = price + high_price = max(open_price, close_price) + (random.random() * volatility * price) + low_price = min(open_price, close_price) - (random.random() * volatility * price) + + klines.append({ + "open": str(open_price), + "high": str(high_price), + "low": str(low_price), + "close": str(close_price), + "volume": str(1000 + random.random() * 100), + "amount": str(1000 * price), + "time": base_time + (i * 3600) # 1 hour intervals + }) + + return klines + + +class MockAveClient: + """Mock AVE client that returns test klines.""" + + def __init__(self, klines): + self.klines = klines + + async def get_klines(self, token_id, interval, limit, start_time=None, end_time=None): + return self.klines + + +class TestBacktestEngine: + """Test cases for BacktestEngine.""" + + @pytest.fixture + def base_config(self): + """Base config for backtest.""" + return { + "bot_id": "test-bot-123", + "token": "0xtest", + "chain": "bsc", + "timeframe": "1h", + "start_date": "2024-01-01", + "end_date": "2024-01-02", + "ave_api_key": "test-key", + "ave_api_plan": "free", + "initial_balance": 10000.0, + } + + @pytest.fixture + def simple_strategy(self): + """Simple strategy: buy on 1% drop, no auto sell.""" + return { + "conditions": [ + {"type": "price_drop", "token": "TEST", "token_address": "0xtest", "threshold": 1.0} + ], + "actions": [ + {"type": "buy", "amount_percent": 10} + ], + "risk_management": {} + } + + @pytest.fixture + def partial_sell_strategy(self): + """Strategy with partial sells: buy on 1% drop, sell 50% on rise (via risk management take profit).""" + return { + "conditions": [ + {"type": "price_drop", "token": "TEST", "token_address": "0xtest", "threshold": 1.0} + ], + "actions": [ + {"type": "buy", "amount_percent": 10} + ], + "risk_management": { + "take_profit_percent": 1.5 # 1.5% take profit to trigger on price rise + } + } + + @pytest.fixture + def stop_loss_strategy(self): + """Strategy with stop loss and take profit.""" + return { + "conditions": [ + {"type": "price_drop", "token": "TEST", "token_address": "0xtest", "threshold": 1.0} + ], + "actions": [ + {"type": "buy", "amount_percent": 10} + ], + "risk_management": { + "stop_loss_percent": 5, # 5% stop loss + "take_profit_percent": 10 # 10% take profit + } + } + + def test_single_buy_and_hold(self, base_config, simple_strategy): + """Test buying once and holding (no sell triggers).""" + # Create klines that drop 0.5% each (below 1% threshold, no buy) + # Then rise 0.5% each (still no sell since no position) + klines = create_klines(100, 10, interval=0.5) # Rising trend + + config = {**base_config, "strategy_config": simple_strategy} + engine = BacktestEngine(config) + engine.ave_client = MockAveClient(klines) + + results = asyncio.run(engine.run()) + + print(f"Results: {results}") + # Should have 0 trades since price never dropped 1% + assert results.get("total_trades") == 0 + assert results.get("final_balance") == 10000.0 + + def test_multiple_dips_multiple_buys(self, base_config, simple_strategy): + """Test multiple dips triggering multiple buys (DCA).""" + # Create price that drops 1.5% then rises 0.5%, repeats + # This should trigger buy on each drop + klines = [] + price = 100.0 + base_time = 1704067200 + + for i in range(20): + if i % 3 == 0: + # Drop by 1.5% + price = price * 0.985 # 1.5% drop + else: + # Rise by 0.5% + price = price * 1.005 + + klines.append({ + "open": str(price * 0.99), + "high": str(price * 1.01), + "low": str(price * 0.98), + "close": str(price), + "volume": "1000", + "amount": str(1000 * price), + "time": base_time + (i * 3600) + }) + + config = {**base_config, "strategy_config": simple_strategy} + engine = BacktestEngine(config) + engine.ave_client = MockAveClient(klines) + + results = asyncio.run(engine.run()) + + print(f"Results: {results}") + print(f"Trades: {engine.trades}") + + # Should have multiple buys (6-7 dips at 1.5% threshold out of ~7 drops) + assert results.get("total_trades") >= 6 + buy_trades = [t for t in engine.trades if t["type"] == "buy"] + assert len(buy_trades) >= 6 + + # Should end with position > 0 (still holding since no sell triggers) + assert engine.position > 0 + + def test_partial_sells(self, base_config, partial_sell_strategy): + """Test partial sells - selling some portion via take profit.""" + # Create: drop 1.5% (buy), rise 1.5% (sell via take profit), drop 1.5% (buy), rise 1.5% (sell via take profit) + klines = [] + price = 100.0 + base_time = 1704067200 + + for i in range(8): + if i % 2 == 0: + # Even: drop 1.5% (should trigger buy) + price = price * 0.985 + else: + # Odd: rise 1.5% (should trigger take profit sell) + price = price * 1.015 + + klines.append({ + "open": str(price * 0.99), + "high": str(price * 1.01), + "low": str(price * 0.98), + "close": str(price), + "volume": "1000", + "amount": str(1000 * price), + "time": base_time + (i * 3600) + }) + + config = {**base_config, "strategy_config": partial_sell_strategy} + engine = BacktestEngine(config) + engine.ave_client = MockAveClient(klines) + + results = asyncio.run(engine.run()) + + print(f"Results: {results}") + print(f"Trades: {engine.trades}") + + # Multiple cycles happen due to price oscillation + # At minimum we should have some trades + assert results.get("total_trades") >= 2 + + buy_trades = [t for t in engine.trades if t["type"] == "buy"] + sell_trades = [t for t in engine.trades if t["type"] == "sell"] + + # Should have executed some trades + assert len(buy_trades) >= 1 + assert len(sell_trades) >= 1 + + # Should have made profit from the sells + assert results.get("total_return") > 0 + + def test_stop_loss_trigger(self, base_config, stop_loss_strategy): + """Test stop loss triggers correctly.""" + # Create: buy, then continue dropping to trigger stop loss + klines = [] + base_time = 1704067200 + + # Kline 0: reference price (skipped due to idx=0 check) + klines.append({ + "open": "100", + "high": "101", + "low": "99", + "close": "100", + "volume": "1000", + "amount": "100000", + "time": base_time + }) + + # Kline 1: drop triggers buy at 98.5 + klines.append({ + "open": "100", + "high": "101", + "low": "98", + "close": "98.5", # 1.5% drop from 100 + "volume": "1000", + "amount": "98500", + "time": base_time + 3600 + }) + + # Kline 2: price rises slightly, no condition trigger + klines.append({ + "open": "98.5", + "high": "100", + "low": "98", + "close": "99", + "volume": "1000", + "amount": "99000", + "time": base_time + 7200 + }) + + # Kline 3: price drops below stop loss + # Entry was 98.5, stop loss is 5%, so SL = 98.5 * 0.95 = 93.575 + # This close (92) is below SL + klines.append({ + "open": "99", + "high": "100", + "low": "90", # Well below stop loss + "close": "92", # Below stop loss (93.575) + "volume": "1000", + "amount": "92000", + "time": base_time + 10800 + }) + + config = {**base_config, "strategy_config": stop_loss_strategy} + engine = BacktestEngine(config) + engine.ave_client = MockAveClient(klines) + + results = asyncio.run(engine.run()) + + print(f"Results: {results}") + print(f"Trades: {engine.trades}") + print(f"DEBUG: stop_loss_percent = {engine.stop_loss_percent}") + print(f"DEBUG: take_profit_percent = {engine.take_profit_percent}") + + # Should have 2 trades: 1 buy, 1 sell (stop loss) + assert results.get("total_trades") == 2 + + sell_trades = [t for t in engine.trades if t["type"] == "sell"] + assert len(sell_trades) == 1 + assert sell_trades[0]["exit_reason"] == "stop_loss" + + # Should have lost money (stop loss triggered) + assert results.get("total_return") < 0 + assert results.get("final_balance") < 10000.0 + + sell_trades = [t for t in engine.trades if t["type"] == "sell"] + assert len(sell_trades) == 1 + assert sell_trades[0]["exit_reason"] == "stop_loss" + + # Should have lost money (stop loss triggered) + assert results.get("total_return") < 0 + assert results.get("final_balance") < 10000.0 + + def test_take_profit_trigger(self, base_config, stop_loss_strategy): + """Test take profit triggers correctly.""" + # Create: buy, then price rises to trigger take profit + klines = [] + base_time = 1704067200 - config = { - "bot_id": "test", - "strategy_config": { - "conditions": [{"type": "price_drop", "threshold": 2, "token": "TEST", "token_address": "0x123"}], - "actions": [{"type": "buy", "amount_percent": 20}], - "risk_management": {"stop_loss_percent": 5, "take_profit_percent": 5}, - }, - "initial_balance": 10000.0, - "ave_api_key": "test", - "ave_api_plan": "free", - } + # Kline 0: reference price (skipped due to idx=0) + klines.append({ + "open": "100", + "high": "101", + "low": "99", + "close": "100", + "volume": "1000", + "amount": "100000", + "time": base_time + }) - # Price scenario: drops each kline, triggering multiple buys - # Final drop triggers stop loss - # - # $0.60 -> $0.588 (2% drop) -> BUY 1 @ $0.588 - # $0.588 -> $0.576 (2% drop) -> BUY 2 @ $0.576 - # $0.576 -> $0.565 (2% drop) -> BUY 3 @ $0.565 - # $0.565 -> $0.535 (5.3% drop) -> STOP LOSS @ $0.535 (5% from weighted avg ~$0.576) - klines = [ - {"close": "0.60", "timestamp": 1000}, - {"close": "0.588", "timestamp": 2000}, # BUY 1 - {"close": "0.576", "timestamp": 3000}, # BUY 2 - {"close": "0.565", "timestamp": 4000}, # BUY 3 - {"close": "0.535", "timestamp": 5000}, # STOP LOSS - ] + # Kline 1: drop triggers buy at 98.5 (1.5% drop from 100) + klines.append({ + "open": "100", + "high": "101", + "low": "98", + "close": "98.5", + "volume": "1000", + "amount": "98500", + "time": base_time + 3600 + }) - test = TestBacktestEngine() - engine, result = test._run_backtest(config, klines) + # Kline 2: price stays roughly flat + klines.append({ + "open": "98.5", + "high": "99", + "low": "98", + "close": "98.8", + "volume": "1000", + "amount": "98800", + "time": base_time + 7200 + }) - print(f"\nSetup:") - print(f" Initial balance: $10,000") - print(f" Stop loss: 5%") - print(f" Each buy: 20% of current balance") - print(f"\nTrades:") - for i, trade in enumerate(engine.trades): - exit_info = f" ({trade.get('exit_reason', '')})" if 'exit_reason' in trade else "" - print(f" {i+1}. {trade['type']} @ ${trade['price']} - ${trade['amount']:.2f}{exit_info}") + # Kline 3: price rises above take profit + # Entry was 98.5, take profit is 10%, so TP = 98.5 * 1.10 = 108.35 + klines.append({ + "open": "98.8", + "high": "120", # Way above TP + "low": "98", + "close": "115", # Above 108.35 + "volume": "1000", + "amount": "115000", + "time": base_time + 10800 + }) - print(f"\nResults:") - print(f" Final balance: ${engine.current_balance:.2f}") - print(f" Total return: {result['total_return']:.2f}%") - print(f" Max drawdown: {result['max_drawdown']:.2f}%") + config = {**base_config, "strategy_config": stop_loss_strategy} + engine = BacktestEngine(config) + engine.ave_client = MockAveClient(klines) - # CRITICAL ASSERTION: Stop loss MUST result in loss - assert engine.current_balance < 10000.0, \ - f"BUG: Stop loss resulted in GAIN! Balance went from $10,000 to ${engine.current_balance:.2f}" + results = asyncio.run(engine.run()) - # Also verify total return is negative - assert result['total_return'] < 0, \ - f"BUG: Total return is positive ({result['total_return']:.2f}%) after stop loss!" + print(f"Results: {results}") + print(f"Trades: {engine.trades}") + print(f"DEBUG: stop_loss_percent = {engine.stop_loss_percent}") + print(f"DEBUG: take_profit_percent = {engine.take_profit_percent}") - # Max drawdown should reflect the actual loss (close to stop loss %) - assert result['max_drawdown'] < 10, \ - f"Max drawdown ({result['max_drawdown']:.2f}%) seems too high" + # Should have 2 trades: 1 buy, 1 sell (take profit) + assert results.get("total_trades") == 2 - print(f"\n✓ PASSED: Stop loss correctly resulted in ${10000 - engine.current_balance:.2f} loss") - return True + sell_trades = [t for t in engine.trades if t["type"] == "sell"] + assert len(sell_trades) == 1 + assert sell_trades[0]["exit_reason"] == "take_profit" + + # Should have made profit (take profit triggered) + assert results.get("total_return") > 0 + assert results.get("final_balance") > 10000.0 + + def test_full_cycle_dip_buy_sell(self, base_config): + """Test a complete cycle: buy on dip, then sell via take profit.""" + # Strategy: buy 10% on 1% dip, take profit 2% to sell + strategy = { + "conditions": [ + {"type": "price_drop", "token": "TEST", "token_address": "0xtest", "threshold": 1.0} + ], + "actions": [ + {"type": "buy", "amount_percent": 10} + ], + "risk_management": { + "take_profit_percent": 2.0 # Sell when price rises 2% + } + } + + klines = [] + base_time = 1704067200 + + # Klines: + # 0: price 100 (reference) + # 1: price 98.5 - 1.5% drop, triggers buy at 98.5 + # 2: price 100.5 - 2% rise from 98.5 = 100.47, triggers take profit + klines.append({ + "open": "100", "high": "101", "low": "99", "close": "100", + "volume": "1000", "amount": "100000", "time": base_time + }) + klines.append({ + "open": "100", "high": "101", "low": "97.5", "close": "98.5", + "volume": "1000", "amount": "98500", "time": base_time + 3600 + }) + klines.append({ + "open": "98.5", "high": "101", "low": "98", "close": "100.5", + "volume": "1000", "amount": "100500", "time": base_time + 7200 + }) + + config = {**base_config, "strategy_config": strategy} + engine = BacktestEngine(config) + engine.ave_client = MockAveClient(klines) + + results = asyncio.run(engine.run()) + + print(f"Results: {results}") + print(f"Trades: {engine.trades}") + + # Should have 2 trades: 1 buy, 1 sell (take profit) + assert results.get("total_trades") == 2 + + buy_trades = [t for t in engine.trades if t["type"] == "buy"] + sell_trades = [t for t in engine.trades if t["type"] == "sell"] + + assert len(buy_trades) == 1 + assert len(sell_trades) == 1 + assert sell_trades[0]["exit_reason"] == "take_profit" + + # Should have made profit + assert results.get("total_return") > 0 + + def test_multiple_buys_then_multiple_sells(self, base_config): + """Test multiple buys followed by multiple sells via take profit.""" + # Create strategy: buy 10% on 2% dip, take profit 2% to sell + strategy = { + "conditions": [ + {"type": "price_drop", "token": "TEST", "token_address": "0xtest", "threshold": 2.0} + ], + "actions": [ + {"type": "buy", "amount_percent": 10} + ], + "risk_management": { + "take_profit_percent": 2.5 # Sell when price rises 2.5% (slightly above entry drop) + } + } + + # Price pattern: drop 2.5% (buy), rise 2.5% (take profit sells), repeat 3 times + klines = [] + base_time = 1704067200 + price = 100.0 + + for i in range(12): + if i % 2 == 0: + price = price * 0.975 # Drop 2.5% - triggers buy + else: + price = price * 1.026 # Rise 2.5% - triggers take profit sell + + klines.append({ + "open": str(price * 0.99), + "high": str(price * 1.01), + "low": str(price * 0.98), + "close": str(price), + "volume": "1000", + "amount": str(1000 * price), + "time": base_time + (i * 3600) + }) + + config = {**base_config, "strategy_config": strategy} + engine = BacktestEngine(config) + engine.ave_client = MockAveClient(klines) + + results = asyncio.run(engine.run()) + + print(f"Results: {results}") + print(f"Trades: {engine.trades}") + + # Price oscillates creating multiple dip/sell cycles + # Should have 10 trades: 5 buys, 5 sells (via take profit) + assert results.get("total_trades") == 10 + + buy_trades = [t for t in engine.trades if t["type"] == "buy"] + sell_trades = [t for t in engine.trades if t["type"] == "sell"] + + assert len(buy_trades) == 5 + assert len(sell_trades) == 5 + + # Position should be 0 after all sells + assert engine.position == 0 + + # Should have profitable trades + assert results.get("total_return") > 0 if __name__ == "__main__": - run_tests() - test_dca_multiple_buys() - test_stop_loss_always_results_in_loss() + pytest.main([__file__, "-v"]) diff --git a/src/frontend/src/lib/api/client.ts b/src/frontend/src/lib/api/client.ts index a435e3b..c13e3cd 100644 --- a/src/frontend/src/lib/api/client.ts +++ b/src/frontend/src/lib/api/client.ts @@ -21,6 +21,16 @@ function getAuthHeaders(): HeadersInit { return token ? { Authorization: `Bearer ${token}`, 'Content-Type': 'application/json' } : { 'Content-Type': 'application/json' }; } +class ApiError extends Error { + status: number; + + constructor(message: string, status: number) { + super(message); + this.name = 'ApiError'; + this.status = status; + } +} + async function handleResponse(response: Response): Promise { if (!response.ok) { const error = await response.json().catch(() => ({ detail: 'An error occurred' })); @@ -37,7 +47,7 @@ async function handleResponse(response: Response): Promise { errorMessage = `HTTP error ${response.status}`; } - throw new Error(errorMessage); + throw new ApiError(errorMessage, response.status); } return response.json(); } diff --git a/src/frontend/src/lib/components/AnonymousBanner.svelte b/src/frontend/src/lib/components/AnonymousBanner.svelte index 848c48a..d4e2ef0 100644 --- a/src/frontend/src/lib/components/AnonymousBanner.svelte +++ b/src/frontend/src/lib/components/AnonymousBanner.svelte @@ -9,51 +9,60 @@ const limit = 50; -
- {#if showWarning} - - Warning: You've used {chatCount}/{limit} messages. - Login to continue - - {:else} - - Your progress is not saved. - Login to save - - {/if} +
+
\ No newline at end of file + diff --git a/src/frontend/src/lib/components/AppHeader.svelte b/src/frontend/src/lib/components/AppHeader.svelte new file mode 100644 index 0000000..88e2803 --- /dev/null +++ b/src/frontend/src/lib/components/AppHeader.svelte @@ -0,0 +1,115 @@ + + +
+
+ + {#if $isAuthenticated} + Dashboard + {/if} +
+ +
+ {#if $isAuthenticated} + + + {:else} + Login + Register + {/if} +
+
+ + diff --git a/src/frontend/src/lib/components/BotCard.svelte b/src/frontend/src/lib/components/BotCard.svelte index 69c7147..a128d30 100644 --- a/src/frontend/src/lib/components/BotCard.svelte +++ b/src/frontend/src/lib/components/BotCard.svelte @@ -3,24 +3,21 @@ interface Props { bot: Bot; - onOpen?: (botId: string) => void; onDelete?: (botId: string) => void; showActions?: boolean; } - let { bot, onOpen, onDelete, showActions = true }: Props = $props(); - - function handleOpen() { - onOpen?.(bot.id); - } + let { bot, onDelete, showActions = true }: Props = $props(); function handleDelete(e: Event) { + e.preventDefault(); e.stopPropagation(); onDelete?.(bot.id); } -
e.key === 'Enter' && handleOpen()}> +
+

{bot.name}

{#if bot.description} @@ -29,8 +26,8 @@ {bot.status}
{#if showActions} -
e.stopPropagation()} role="group"> - +
+ Open
{/if} @@ -38,11 +35,11 @@ \ No newline at end of file + diff --git a/src/frontend/src/lib/components/ChatArea.svelte b/src/frontend/src/lib/components/ChatArea.svelte index 6d3fd83..096c550 100644 --- a/src/frontend/src/lib/components/ChatArea.svelte +++ b/src/frontend/src/lib/components/ChatArea.svelte @@ -1,6 +1,6 @@ -
+
{#if !conversationId} -
+
Select a conversation or start a new one
{:else if messages.length === 0 && !isLoading} -
+
Send a message to start the conversation
{:else} - {#each messages as msg (msg.id)} -
-
- {#each renderContent(msg.content) as segment} - {#if segment.type === 'bold'} - {segment.content} - {:else if segment.type === 'italic'} - {segment.content} - {:else if segment.type === 'code'} - {segment.content} - {:else if segment.type === 'codeBlock'} - 
{segment.content}
- {:else if segment.type === 'link'} - {segment.content} - {:else if segment.type === 'list' && segment.items} -
    - {#each segment.items as item} -
  • {@html renderInline(parseInlineElements(item))}
    • - {/each} -
- {:else if segment.type === 'lineBreak'} -
- {:else} - {segment.content} - {/if} - {/each} +
+ {#each messages as msg (msg.id)} +
+
+ {#each renderContent(msg.content) as segment} + {#if segment.type === 'bold'} + {segment.content} + {:else if segment.type === 'italic'} + {segment.content} + {:else if segment.type === 'code'} + {segment.content} + {:else if segment.type === 'codeBlock'} + 
{segment.content}
+ {:else if segment.type === 'link'} + {segment.content} + {:else if segment.type === 'list' && segment.items} +
    + {#each segment.items as item} +
  • {item}
    • + {/each} +
+ {:else if segment.type === 'lineBreak'} +
+ {:else} + {segment.content} + {/if} + {/each} +
+
+ {new Date(msg.created_at).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })} +
-
- {new Date(msg.created_at).toLocaleTimeString()} -
-
- {/each} + {/each} +
{/if} {#if isLoading} -
-
+
+
@@ -115,73 +82,70 @@
\ No newline at end of file + diff --git a/src/frontend/src/lib/components/ChatInput.svelte b/src/frontend/src/lib/components/ChatInput.svelte index fe9395c..a2cc9b3 100644 --- a/src/frontend/src/lib/components/ChatInput.svelte +++ b/src/frontend/src/lib/components/ChatInput.svelte @@ -1,19 +1,22 @@ -
+
-
\ No newline at end of file + + button:disabled { + opacity: 0.5; + cursor: not-allowed; + } + diff --git a/src/frontend/src/lib/components/ChatInterface.svelte b/src/frontend/src/lib/components/ChatInterface.svelte index 16ba05f..1c9df63 100644 --- a/src/frontend/src/lib/components/ChatInterface.svelte +++ b/src/frontend/src/lib/components/ChatInterface.svelte @@ -3,16 +3,24 @@ import type { ChatMessage } from '$lib/stores/chatStore'; import { parseMarkdown, parseInlineElements, type InlineSegment } from '$lib/utils/markdown'; + interface ToolGroup { + category: string; + label: string; + requiresBot: boolean; + tools: ToolItem[]; + } + interface ToolItem { name: string; description: string; command: string; } - const TOOLS: { category: string; label: string; tools: ToolItem[] }[] = [ + const TOOLS: ToolGroup[] = [ { category: 'randebu', label: '🤖 Randebu Built-in', + requiresBot: true, tools: [ { name: 'backtest', description: 'Run strategy backtest', command: '/backtest' }, { name: 'simulate', description: 'Start/stop simulation', command: '/simulate' }, @@ -22,6 +30,7 @@ { category: 'ave', label: '☁️ AVE Cloud Skills', + requiresBot: false, tools: [ { name: 'search', description: 'Token search', command: '/search' }, { name: 'trending', description: 'Popular tokens', command: '/trending' }, @@ -36,8 +45,11 @@ bot: Bot | null; messages: ChatMessage[]; isSending?: boolean; + isBlocked?: boolean; + blockedReason?: string | null; onSendMessage: (message: string) => void; onSelectBot?: (botId: string) => void; + onLogin?: () => void; availableBots?: Bot[]; showBotSelector?: boolean; } @@ -46,8 +58,11 @@ bot, messages, isSending = false, + isBlocked = false, + blockedReason = null, onSendMessage, onSelectBot, + onLogin, availableBots = [], showBotSelector = false }: Props = $props(); @@ -60,7 +75,24 @@ let selectedIndex = $state(0); // Use $derived for filteredTools - let filteredTools = $derived(messageInput.startsWith('/') ? TOOLS.flatMap(t => t.tools).filter(tool => tool.name.toLowerCase().startsWith(messageInput.slice(1).toLowerCase()) || tool.command.toLowerCase().startsWith(messageInput.slice(1).toLowerCase())) : []); + // Filter tools based on whether user has a bot + let availableTools = $derived( + TOOLS.flatMap(t => !t.requiresBot || bot ? t.tools : []) + ); + + let filteredTools = $derived( + messageInput.startsWith('/') + ? availableTools.filter(tool => + tool.name.toLowerCase().startsWith(messageInput.slice(1).toLowerCase()) || + tool.command.toLowerCase().startsWith(messageInput.slice(1).toLowerCase()) + ) + : [] + ); + + // Get visible tool groups for the menu + let visibleGroups = $derived( + TOOLS.filter(group => !group.requiresBot || bot) + ); function handleSend() { if (!messageInput.trim()) return; @@ -305,12 +337,37 @@ {/if}
- {#if bot} -
+
+ {#if isBlocked} +
+
🚫
+
+ {#if blockedReason === 'message_limit'} +

Message Limit Reached

+

You've used all 50 messages as an anonymous user.

+

Login to continue chatting with unlimited messages.

+ {:else if blockedReason === 'bot_limit'} +

Bot Limit Reached

+

You've created the maximum of 1 bot as an anonymous user.

+

Login to create more bots.

+ {:else if blockedReason === 'backtest_limit'} +

Backtest Limit Reached

+

You've run the maximum of 1 backtest as an anonymous user.

+

Login to run more backtests.

+ {:else} +

Action Blocked

+

Please login to continue.

+ {/if} + +
+
+ {:else} {#if showSlashMenu && filteredTools.length > 0}
Available Commands
- {#each TOOLS as group} + {#each visibleGroups as group} {#if group.tools.some(t => filteredTools.includes(t))}
{group.label}
{#each group.tools.filter(t => filteredTools.includes(t)) as tool, i} @@ -325,7 +382,13 @@ {/each} {/if} {/each} -
Press Tab to select, Enter to send
+
+ {#if !bot} + Login to access bot commands + {:else} + Press Tab to select, Enter to send + {/if} +
{/if} - -
- {/if} + {/if} +
- \ No newline at end of file + + @media (max-width: 1024px) { + .sidebar-right { + display: none; + } + } + + @media (max-width: 768px) { + .sidebar-left { + width: 100%; + position: absolute; + left: 0; + top: 0; + bottom: 0; + z-index: 100; + background: #0f0f0f; + } + } + diff --git a/src/frontend/src/lib/components/ConversationList.svelte b/src/frontend/src/lib/components/ConversationList.svelte index 4ce2794..97efd6b 100644 --- a/src/frontend/src/lib/components/ConversationList.svelte +++ b/src/frontend/src/lib/components/ConversationList.svelte @@ -28,10 +28,7 @@ setConversations(data); } catch (e) { error = e instanceof Error ? e.message : 'Failed to load conversations'; - if (error.includes('not authenticated') || error.includes('401')) { - console.log('Anonymous user - conversations list empty'); - setConversations([]); - } + setConversations([]); } finally { loading = false; } @@ -63,142 +60,119 @@ } function isActiveConversation(convId: string): boolean { - let currentId = ''; - const unsub = page.subscribe(p => { - currentId = p.params.conversationId || ''; - }); - unsub(); - return currentId === convId; + return $page.params.conversationId === convId; } -
-
-
-
+
{#if loading} -
Loading...
+
Loading...
{:else if error} -
{error}
+
{error}
{:else if conversations.length === 0} -
No conversations yet
+
No conversations yet
{:else} {#each conversations as conv (conv.id)} -
goto(`/chat/${conv.id}`)} - role="button" - tabindex="0" - onkeydown={(e) => e.key === 'Enter' && goto(`/chat/${conv.id}`)} > -
{conv.title || 'New Chat'}
-
{formatDate(conv.updated_at)}
-
+
{conv.title || 'New Chat'}
+
{formatDate(conv.updated_at)}
+ {/each} {/if}
\ No newline at end of file + diff --git a/src/frontend/src/lib/components/index.ts b/src/frontend/src/lib/components/index.ts index 555c567..d59b05b 100644 --- a/src/frontend/src/lib/components/index.ts +++ b/src/frontend/src/lib/components/index.ts @@ -15,4 +15,5 @@ export { default as ChatArea } from './ChatArea.svelte'; export { default as ChatInput } from './ChatInput.svelte'; export { default as BotInfoPanel } from './BotInfoPanel.svelte'; export { default as AnonymousBanner } from './AnonymousBanner.svelte'; -export { default as CandlestickLoader } from './CandlestickLoader.svelte'; \ No newline at end of file +export { default as CandlestickLoader } from './CandlestickLoader.svelte'; +export { default as AppHeader } from './AppHeader.svelte'; \ No newline at end of file diff --git a/src/frontend/src/lib/stores/chatStore.ts b/src/frontend/src/lib/stores/chatStore.ts index 42c5182..3f6481b 100644 --- a/src/frontend/src/lib/stores/chatStore.ts +++ b/src/frontend/src/lib/stores/chatStore.ts @@ -10,7 +10,7 @@ export interface ChatMessage { } // Fallback UUID generator for environments where crypto.randomUUID is not available -function generateId(): string { +export function generateId(): string { if (typeof crypto !== 'undefined' && typeof crypto.randomUUID === 'function') { return crypto.randomUUID(); } diff --git a/src/frontend/src/lib/utils/markdown.ts b/src/frontend/src/lib/utils/markdown.ts index 5cc3013..5f81bc8 100644 --- a/src/frontend/src/lib/utils/markdown.ts +++ b/src/frontend/src/lib/utils/markdown.ts @@ -14,7 +14,7 @@ export interface ParsedSegment { content: string; items?: string[]; headers?: InlineSegment[][]; - rows?: InlineSegment[][]; + rows?: InlineSegment[][][]; } export function parseMarkdown(text: string): ParsedSegment[] { diff --git a/src/frontend/src/routes/+layout.svelte b/src/frontend/src/routes/+layout.svelte index 382983a..f397d67 100644 --- a/src/frontend/src/routes/+layout.svelte +++ b/src/frontend/src/routes/+layout.svelte @@ -7,6 +7,13 @@ onMount(() => { initAuth(); + + // Reset anonymous counts on layout load (for debugging) + const count = localStorage.getItem('anonymous_chat_count'); + if (count && parseInt(count) >= 50) { + console.log('Resetting anonymous_chat_count from', count, 'to 0'); + localStorage.setItem('anonymous_chat_count', '0'); + } }); diff --git a/src/frontend/src/routes/+page.svelte b/src/frontend/src/routes/+page.svelte index c2c136a..31cf1ab 100644 --- a/src/frontend/src/routes/+page.svelte +++ b/src/frontend/src/routes/+page.svelte @@ -16,8 +16,7 @@

Randebu

Create trading bots through conversation with AI

- Get Started - Login + Try Now - Free
diff --git a/src/frontend/src/routes/bot/[id]/+page.svelte b/src/frontend/src/routes/bot/[id]/+page.svelte index 6818dd0..82065e5 100644 --- a/src/frontend/src/routes/bot/[id]/+page.svelte +++ b/src/frontend/src/routes/bot/[id]/+page.svelte @@ -53,7 +53,7 @@ isSending = true; // Add user's message immediately so it shows even before API response - addMessage({ role: 'user', content: message }); + addMessage({ role: 'user', content: message, thinking: null }); try { // Add timeout to prevent hanging requests diff --git a/src/frontend/src/routes/chat/+page.svelte b/src/frontend/src/routes/chat/+page.svelte index 3c8f16c..5732dd7 100644 --- a/src/frontend/src/routes/chat/+page.svelte +++ b/src/frontend/src/routes/chat/+page.svelte @@ -1,41 +1,110 @@ Chat - Randebu -{#if !$isAuthenticated} - -{/if} +
+ - -
-

Select a conversation or start a new one

+ {#if !$isAuthenticated} + + {/if} + +
+ +
+
+

Start a Conversation

+

Select a conversation from the sidebar or create a new one

+ +
+
+
- +
\ No newline at end of file + + p { + font-size: 1rem; + color: #888; + margin: 0 0 1.5rem; + } + + .btn { + padding: 0.75rem 1.5rem; + border-radius: 12px; + font-size: 1rem; + font-weight: 500; + cursor: pointer; + border: none; + transition: transform 0.2s; + } + + .btn-primary { + background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); + color: white; + } + + .btn:hover { + transform: translateY(-2px); + } + diff --git a/src/frontend/src/routes/chat/[conversationId]/+page.svelte b/src/frontend/src/routes/chat/[conversationId]/+page.svelte index 66765d3..6ef0f65 100644 --- a/src/frontend/src/routes/chat/[conversationId]/+page.svelte +++ b/src/frontend/src/routes/chat/[conversationId]/+page.svelte @@ -1,28 +1,54 @@ Chat - Randebu -{#if !$isAuthenticated} - -{/if} +
+ - -
- {#if error} -
- {error} + {#if !$isAuthenticated} + + {/if} + +
+ + {#if error} +
+ {error} +
+ {/if} + + {#if isLoading} +
+ +
+ {:else if conversationId} + goto('/login')} + /> + {:else} +
+ Select a conversation or start a new one +
+ {/if} + + + + {#if showBacktestModal} +
showBacktestModal = false}> +
e.stopPropagation()}> +

Run Backtest

+
{ + e.preventDefault(); + const form = e.target as HTMLFormElement; + const fd = new FormData(form); + runBacktest({ + token_address: fd.get('token_address') as string, + timeframe: fd.get('timeframe') as string, + start_date: fd.get('start_date') as string, + end_date: fd.get('end_date') as string + }); + }}> +
+ + +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+ + +
+
+
{/if} - {#if isLoading} -
- -
- {:else if conversationId} - - - {:else} -
- Select a conversation or start a new one + + {#if showSimulateModal} +
showSimulateModal = false}> +
e.stopPropagation()}> +

Run Simulation

+
{ + e.preventDefault(); + const form = e.target as HTMLFormElement; + const fd = new FormData(form); + runSimulate({ + token_address: fd.get('token_address') as string, + kline_interval: fd.get('kline_interval') as string, + action: 'start' + }); + }}> +
+ + +
+
+ + +
+
+ + +
+
+
{/if}
- +
\ No newline at end of file + diff --git a/src/frontend/src/routes/dashboard/+page.svelte b/src/frontend/src/routes/dashboard/+page.svelte index 8cad6b4..75e1263 100644 --- a/src/frontend/src/routes/dashboard/+page.svelte +++ b/src/frontend/src/routes/dashboard/+page.svelte @@ -40,7 +40,7 @@ showCreateModal = false; newBotName = ''; newBotDescription = ''; - goto(`/bot/${bot.id}`); + goto(`/chat/${bot.id}`); } catch (e) { createError = e instanceof Error ? e.message : 'Failed to create bot'; } finally { @@ -96,7 +96,7 @@ {:else}
{#each $botsStore as bot} - goto(`/bot/${id}`)} onDelete={deleteBot} /> + {/each}
{/if} diff --git a/src/frontend/src/routes/home/+page.svelte b/src/frontend/src/routes/home/+page.svelte index 947bfec..11fd2cf 100644 --- a/src/frontend/src/routes/home/+page.svelte +++ b/src/frontend/src/routes/home/+page.svelte @@ -1,28 +1,166 @@ - -
-

Select a conversation or start a new one

+ + Randebu - AI Trading Bot Platform + + +
+ + + {#if !$isAuthenticated} + + {/if} + +
+ +
+
+

Welcome to Randebu

+

Create trading bots through conversation with AI

+ +
+
+
1
+
+

Describe Your Strategy

+

Tell our AI what kind of trading you want in plain English

+
+
+
+
2
+
+

Backtest & Validate

+

Test your strategy against historical data

+
+
+
+
3
+
+

Simulate & Monitor

+

Run real-time simulations and watch for signals

+
+
+
+ +

Select a conversation from the left or start a new one to begin

+
+
+
- +
\ No newline at end of file + + .subtitle { + font-size: 1.2rem; + color: #888; + margin: 0 0 2.5rem; + } + + .steps { + display: flex; + flex-direction: column; + gap: 1.5rem; + text-align: left; + } + + .step { + display: flex; + align-items: flex-start; + gap: 1rem; + } + + .step-number { + width: 32px; + height: 32px; + border-radius: 50%; + background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); + color: white; + display: flex; + align-items: center; + justify-content: center; + font-weight: 600; + flex-shrink: 0; + } + + .step-content h3 { + margin: 0 0 0.25rem; + font-size: 1.1rem; + color: #fff; + } + + .step-content p { + margin: 0; + font-size: 0.9rem; + color: #888; + } + + .hint { + margin-top: 2.5rem; + font-size: 0.9rem; + color: #666; + } +