Merge pull request #5 from luisrx7/dev

add plots to better visualize the results of checker script

Author: luisrx7

README.md

@@ -12,6 +12,7 @@ Welcome to the AviatorStratChecker repository! This project aims to provide a po
 
 - Effortlessly scrape Aviator game data from 22bet.
 - Design, simulate, and fine-tune strategies using historical data.
+- Automatically bet using your own strategies.
 - Collaborate with the community by contributing to the project.
 
 ## Getting Started
@@ -46,15 +47,20 @@ To set up and use AviatorStratChecker, follow these simple steps:
    password = "your-password"
    ```
 
-5. **Run Selenium using Docker:**
+5. **Install docker and docker-compose:**
+   - [Docker](https://docs.docker.com/get-docker/)
+   - [Docker Compose](https://docs.docker.com/compose/install/)
+
+
+6. **Run Selenium using Docker:**
    ```bash
    docker-compose up
    ```
 
 
-5. **Execute the script to start gathering live results:**
+7. **Execute the script to start gathering live results:**
    ```bash
-   python main.py
+   python scrape.py
    ```
 
 
@@ -84,6 +90,37 @@ To set up and use AviatorStratChecker, follow these simple steps:
    python checker.py
    ```
 
+
+## After finding a good strategy
+
+1. **Edit the file autobet.py to add your strategy:**
+   ```python
+   from strats.custom_strats import BestStrat
+   
+   def main():
+    strat = BestStrat(
+        description="BestStrat - Example",
+        start_balance=3000,
+        base_bet=0.1,
+        max_bet=0.5,
+        multiplier=1.9,
+        max_bets=10000,
+    )
+   ```
+2. **Run the autobet.py script to start betting:**
+   ```bash
+   python autobet.py
+   ```
+
+## TODO
+   - Add tests to the existing Strats
+   - Add tests to the code
+   - Find some way to scrape past data from the game (maybe using requests)
+   - Add a way to save the data to a database instead of a csv file
+   - Add a way to compare strategies
+   - Add better indicators to the strategies to help the user to decide which one to use
+
+
 ## Contributing
 We welcome contributions! If you encounter any issues or have suggestions, please open an issue or submit a pull request.
 

autobet.py

@@ -30,14 +30,13 @@ def signal_handler(sig, frame):
 
 
 
-
 def main():
     strat = DAlembertStrat(
         description="DAlembertStrat",
         start_balance=3000,
         base_bet=0.1,
-        max_bet=1,
-        multiplier=2,
+        max_bet=0.5,
+        multiplier=1.9,
         max_bets=10000,
     )
 
@@ -55,7 +54,7 @@ def main():
                 last_result = aviator.get_last_game_result()
                 aviator.process_bet(float(last_result))
                 aviator.add_to_log(last_result)
-                print(f"balance: {aviator.get_balance()}")
+                logging.info(f"balance: {aviator.get_balance()}")
         except Exception as e:
             console.print_exception(show_locals=True)
             logging.error(e)

aviator/aviator.py

@@ -12,6 +12,10 @@
 from selenium.webdriver.support.wait import WebDriverWait
 from selenium.common.exceptions import StaleElementReferenceException, NoSuchElementException
 
+import logging
+
+logger = logging.getLogger(__name__)
+
 class Aviator(Browser):
     '''
     this class will interact with the browser
@@ -49,15 +53,15 @@ def login(self):
 
     def logged_in(self):
         if self.debug:
-            print("checking if logged in")
+            logger.debug("checking if logged in")
         element = helium.S("#user-money")
         if element.exists():
             if self.debug:
-                print("logged in")
+                logger.debug("logged in")
             return True
         else:
             if self.debug:
-                print("not logged in")
+                logger.debug("not logged in")
             return False
 
 
@@ -66,26 +70,26 @@ def in_game(self):
         check if we are in game
         '''
         if self.debug:
-            print("checking if in game")
+            logger.debug("checking if in game")
 
         element = self.find_elements(By.XPATH, vars.game_name, timeout=0.5)
         if element or self.driver.title == "Aviator":
             if self.debug:
-                print("in game")
+                logger.debug("in game")
             return True
 
         if self.debug:
-            print("not in game")
+            logger.debug("not in game")
         return False            
 
     def get_last_game_result(self):
         '''
         get last game result
         '''
         # if self.debug:
-        #     print("getting last game result")
+        #     logger.debug("getting last game result")
 
-        element = self.find_elements(By.XPATH, vars.last_game_result, timeout=0.5)
+        element = self.find_elements(By.XPATH, vars.last_game_result, timeout=1)
 
         if element is not None:
             return element.text.strip().replace("x", "")
@@ -102,23 +106,23 @@ def process_bet(self, result):
         if not warn the user that a strat is not defined
         '''
         if self.debug:
-            print(f"processing bet for result {result}")
+            logger.debug(f"processing bet for result {result}")
         if self.strat is None:
-            print("WARNING: no strat defined")
+            logger.debug("WARNING: no strat defined")
             return False
 
         self.strat.calculate_bet(result)
         if self.debug:
-            print(f"bet: {self.strat.bet}, multiplier: {self.strat.multiplier}")
+            logger.debug(f"bet: {self.strat.bet}, multiplier: {self.strat.multiplier}")
 
         if self.strat.bet == 0 or self.strat.multiplier == 0:
             if self.debug:
-                print("bet or multiplier is 0, not placing bet")
+                logger.debug("bet or multiplier is 0, not placing bet")
             return False        
 
         if self.place_bet(self.strat.bet, self.strat.multiplier) is False:
             if self.debug:
-                print("could not place bet")
+                logger.debug("could not place bet")
             return False
 
         self.strat.gamble()
@@ -132,6 +136,10 @@ def get_game_results(self):
 
         # Find the div element with class "payouts-block"
         payouts_div = self.find_elements(By.CLASS_NAME, "payouts-block")
+        if payouts_div is None:
+            if self.debug:
+                logger.debug("could not get game results")
+            return []
 
         # Find all elements with class "bubble-multiplier" within the payouts div
         multiplier_elements = payouts_div.find_elements(By.CLASS_NAME, "bubble-multiplier")
@@ -152,11 +160,11 @@ def get_game_results(self):
 
         if len(results) > 0:
             # if self.debug:
-            #     print("got game results")
+            #     logger.debug("got game results")
             return results
         else:
             if self.debug:
-                print("could not get game results")
+                logger.debug("could not get game results")
 
 
         return []
@@ -167,18 +175,28 @@ def get_balance(self):
         get balance
         '''
         if self.debug:
-            print("getting balance")
+            logger.debug("getting balance")
         element = self.find_elements(By.XPATH, vars.balance)
         #element is a span with the balance
         if element:
             if self.debug:
-                print("got balance")
+                logger.debug("got balance")
             return element.text
         else:
             if self.debug:
-                print("could not get balance")
+                logger.debug("could not get balance")
             return None
 
+
+    def disconnected(self):
+        '''
+            check if disconnected warning is displayed
+        '''
+        disconnected_element = self.find_elements(By.XPATH, vars.disconnected_warning, timeout=0.5)
+        if disconnected_element is not None:
+            return True
+        return False
+
     def wait_for_game_to_finish(self):
         '''
         wait for game to finish
@@ -188,24 +206,30 @@ def wait_for_game_to_finish(self):
         '''
 
         if self.debug:
-            print("waiting for game to finish")
+            logger.debug("waiting for game to finish")
         last_result = self.get_last_game_result()
         while True:
-            if self.get_last_game_result() != last_result:
+            if self.disconnected():
+                if self.debug:
+                    logger.debug("disconnected")
                 break
+            result = self.get_last_game_result()
+            if result is not None:
+                if result != last_result :
+                    break
             if self.debug:
-                print(".", end="")
+                logger.debug(".", end="")
             time.sleep(0.1)
         if self.debug:
-            print("\ngame finished")
+            logger.debug("\ngame finished")
 
     def add_to_log(self, result):
         '''
         add result to results.txt in this 
         format timestamp (format dd-mm-yyyy hh:mm:ss),result
         '''
         if self.debug:
-            print(f"adding result {result}  to log")
+            logger.debug(f"adding result {result}  to log")
         with open("results.txt", "a") as f:
             f.write(f"{datetime.now().strftime('%d-%m-%Y %H:%M:%S')},{result}\n")
 
@@ -215,15 +239,15 @@ def setup_auto_bet(self):
         click the buttons to setup auto cashout
         '''
         if self.debug:
-            print("setting up auto bet")
+            logger.debug("setting up auto bet")
 
         if self.click_button(vars.bet_type_button) is False:
             if self.debug:
-                print("could not click bet type button")
+                logger.debug("could not click bet type button")
             return False
         if self.click_button(vars.auto_cashout_button) is False:
             if self.debug:
-                print("could not click auto cashout button")
+                logger.debug("could not click auto cashout button")
             return False
 
 
@@ -232,22 +256,22 @@ def place_bet(self,amount, multiplier):
         place bet with amount and multiplier
         '''
         if self.debug:
-            print(f"setting bet amount to {amount} at multiplier {multiplier}")
+            logger.debug(f"setting bet amount to {amount} at multiplier {multiplier}")
 
 
         if self.send_keys(vars.bet_amount_input_box, str(amount)) is False:
             if self.debug:
-                print("could not set bet amount")
+                logger.debug("could not set bet amount")
             return False
 
         if self.send_keys(vars.multiplier_input_box, str(multiplier)) is False:
             if self.debug:
-                print("could not set multiplier")
+                logger.debug("could not set multiplier")
             return False
 
         if self.click_button(vars.place_bet_button) is False:
             if self.debug:
-                print("could not click place bet button")
+                logger.debug("could not click place bet button")
             return False
 
         return True

aviator/vars.py

@@ -24,4 +24,9 @@
 place_bet_button = '/html/body/app-root/app-game/div/div[1]/div[2]/div/div[2]/div[3]/app-bet-controls/div/app-bet-control[1]/div/div[1]/div[2]/button'
 
 bet_amount_input_box = '/html/body/app-root/app-game/div/div[1]/div[2]/div/div[2]/div[3]/app-bet-controls/div/app-bet-control[1]/div/div[1]/div[1]/app-spinner/div/div[2]/input'
-multiplier_input_box = '/html/body/app-root/app-game/div/div[1]/div[2]/div/div[2]/div[3]/app-bet-controls/div/app-bet-control[1]/div/div[3]/div[2]/div[2]/div/app-spinner/div/div[2]/input'
+multiplier_input_box = '/html/body/app-root/app-game/div/div[1]/div[2]/div/div[2]/div[3]/app-bet-controls/div/app-bet-control[1]/div/div[3]/div[2]/div[2]/div/app-spinner/div/div[2]/input'
+
+
+#disconnected
+
+disconnected_warning = '/html/body/app-root/app-disconnect-message/div/div[2]/div'