removed merge conflicts

Author: yeonholee50

ranking_client.py

@@ -69,13 +69,14 @@ def process_ticker(ticker, mongo_client):
    try:
 
       current_price = None
-      
-      while current_price is None:
+      retries = 0
+      while current_price is None and retries <= 3:
          try:
             current_price = get_latest_price(ticker)
          except Exception as fetch_error:
             logging.warning(f"Error fetching price for {ticker}. Retrying... {fetch_error}")
             time.sleep(10)
+            retries += 1
 
       indicator_tb = mongo_client.IndicatorsDatabase
       indicator_collection = indicator_tb.Indicators
@@ -275,13 +276,15 @@ def update_portfolio_values(client):
           # Cache should be updated every 60 seconds 
 
           current_price = None
-          while current_price is None:
+          retries = 0
+          while current_price is None and retries <= 3:
             try:
                # get latest price shouldn't cache - we should also do a delay
                current_price = get_latest_price(ticker)
             except:
                print(f"Error fetching price for {ticker}. Retrying...")
                time.sleep(120)
+               retries += 1
                # Will sleep 120 seconds before retrying to get latest price
           print(f"Current price of {ticker}: {current_price}")
           # Calculate the value of the holding

trading_client.py

@@ -90,17 +90,26 @@ def process_ticker(ticker, client, trading_client, data_client, mongo_client, st
         try:
             decisions_and_quantities = []
             current_price = None
+<<<<<<< HEAD
             count = 0
             while current_price is None:
+=======
+            retries = 0
+            while current_price is None and retries <= 3:
+>>>>>>> 7405e36910fffc98319dcd8dd3570b7d0c276822
                 try:
                     current_price = get_latest_price(ticker)
                 except Exception as fetch_error:
                     count+=1
                     logging.warning(f"Error fetching price for {ticker}. Retrying... {fetch_error}")
                     time.sleep(10)
+<<<<<<< HEAD
                     if count == 3:
                         logging.error(f"Failed to fetch price for {ticker}. Exiting process_ticker function.")
                         return
+=======
+                    retries += 1
+>>>>>>> 7405e36910fffc98319dcd8dd3570b7d0c276822
             print(f"Current price of {ticker}: {current_price}")
 
             asset_collection = mongo_client.trades.assets_quantities