feat: Update main script for WebSocket support

- Add asyncio event loop handling
- Add proper WebSocket initialization
- Add graceful shutdown handling
- Update configuration for real-time data
- Remove polling interval

Author: JumpiiX

traid/main.py

@@ -1,5 +1,6 @@
 """Main entry point for trading bot."""
 from decimal import Decimal
+import asyncio
 from traid.runner import TradingBotRunner
 
 def get_user_config():
@@ -15,15 +16,14 @@ def get_user_config():
         except:
             print("Invalid input! Please enter a valid number.")
 
-def main():
-    """Run trading bot."""
+async def run_bot():
+    """Run trading bot with WebSocket connection."""
     # Get user configuration
     INITIAL_BALANCE = get_user_config()
 
     # Fixed configuration
     SYMBOL = "BTC/USDT"
-    TIMEFRAME = "1h"
-    UPDATE_INTERVAL = 3600  # 1 hour in seconds
+    TIMEFRAME = "1m"  # 1 minute for more frequent updates
 
     print(f"\nStarting bot with:")
     print(f"Initial Portfolio: {INITIAL_BALANCE} USDT")
@@ -34,17 +34,25 @@ def main():
     bot = TradingBotRunner(
         symbol=SYMBOL,
         timeframe=TIMEFRAME,
-        initial_balance=INITIAL_BALANCE,
-        update_interval=UPDATE_INTERVAL
+        initial_balance=INITIAL_BALANCE
     )
 
     try:
-        bot.start()
-        input("\nPress Enter to stop the bot...\n")
+        await bot.start()
+        print("\nBot is running with real-time data. Press Ctrl+C to stop.")
+        while True:
+            await asyncio.sleep(1)
     except KeyboardInterrupt:
         print("\nStopping bot...")
     finally:
-        bot.stop()
+        await bot.stop()
+
+def main():
+    """Entry point."""
+    try:
+        asyncio.run(run_bot())
+    except KeyboardInterrupt:
+        print("\nBot stopped by user.")
 
 if __name__ == "__main__":
     main()

traid/trading/execution.py

@@ -116,17 +116,21 @@ def _can_buy(self, timestamp: int) -> bool:
         Returns:
             bool: True if buy conditions are met
         """
-        # Check trade interval
-        if timestamp - self._last_trade_time < self._min_trade_interval:
-            return False
+        # Calculate total portfolio value currently in positions
+        total_position_value = Decimal("0")
+        for symbol, volume in self.simulator.positions.items():
+            if symbol in self.simulator.current_prices:
+                total_position_value += volume * self.simulator.current_prices[symbol]
 
-        # Check consecutive trades
-        if self._consecutive_trades >= 3:  # Maximum 3 consecutive trades
+        # Don't use more than 80% of total available balance
+        available_portfolio = self.simulator.balance.available * Decimal("0.8")
+        if total_position_value >= available_portfolio:
             return False
 
-        # Check if we already have a position
-        current_position = self.simulator.positions.get(self.symbol, Decimal("0"))
-        if current_position > 0:
+        # Maximum 20% of portfolio per position
+        position_size = self._calculate_position_size(self.simulator.current_prices[self.symbol])
+        max_position_value = self.simulator.balance.available * Decimal("0.2")
+        if position_size * self.simulator.current_prices[self.symbol] > max_position_value:
             return False
 
         return True
@@ -140,15 +144,26 @@ def _can_sell(self, timestamp: int) -> bool:
         Returns:
             bool: True if sell conditions are met
         """
-        # Check trade interval
-        if timestamp - self._last_trade_time < self._min_trade_interval:
+        # Can sell if we have a position
+        current_position = self.simulator.positions.get(self.symbol, Decimal("0"))
+        if current_position <= 0:
             return False
 
-        # Check consecutive trades
-        if self._consecutive_trades >= 3:
-            return False
+        # Calculate current position value
+        position_value = current_position * self.simulator.current_prices[self.symbol]
 
-        return True
+        # Calculate profit/loss percentage
+        buy_trades = [t for t in self.trades if t['type'] == 'buy' and t['symbol'] == self.symbol]
+        if not buy_trades:
+            return True
+
+        avg_buy_price = sum(Decimal(str(t['price'])) * Decimal(str(t['volume'])) for t in buy_trades) / \
+                        sum(Decimal(str(t['volume'])) for t in buy_trades)
+
+        profit_percentage = (self.simulator.current_prices[self.symbol] - avg_buy_price) / avg_buy_price * 100
+
+        # Sell if profit is above 5% or loss is more than 2%
+        return profit_percentage >= 5 or profit_percentage <= -2
 
     def _calculate_position_size(self, price: Decimal) -> Decimal:
         """Calculate appropriate position size based on current balance.