deepsource fixes

allyAPI.py

@@ -65,10 +65,8 @@ def ally_holdings(ao, ctx=None, loop=None):
                     ao.set_account_totals(key, account, value)
                 # Print account stock holdings
                 ah = obj.holdings()
-                # Test if holdings is empty. Supposedly len and index are faster than .empty
-                if len(ah.index) == 0:
-                    printAndDiscord(f"{key}: No holdings found", ctx, loop)
-                else:
+                # Test if holdings is empty
+                if len(ah.index) > 0:
                     account_symbols = (ah["sym"].values).tolist()
                     qty = (ah["qty"].values).tolist()
                     current_price = (ah["marketvalue"].values).tolist()
@@ -173,8 +171,8 @@ def ally_transaction(
                                 ally_transaction(
                                     obj, action, s, amount, new_price, time, DRY, ctx, loop, True, account
                                 )
-                            except Exception as e:
-                                printAndDiscord(f"{key}: Failed to place limit order: {e}", ctx, loop)
+                            except Exception as ex:
+                                printAndDiscord(f"{key}: Failed to place limit order: {ex}", ctx, loop)
                         else:
                             printAndDiscord(f"{key}: Error placing limit order: {e}", ctx, loop)
                     elif type(price) is not str:

fidelityAPI.py

@@ -175,9 +175,8 @@ def fidelity_holdings(fidelity_o, ctx=None, loop=None):
     print("==============================")
     print()
     for key in fidelity_o.get_account_numbers():
-        # for account in fidelity_o.get_account_numbers(key):
         driver = fidelity_o.get_logged_in_objects(key)
-        # Get account holdings
+        # Get account holdings since holdings is not yet implemented
         fidelity_account_numbers(driver, ctx=ctx, loop=loop, name=key)
 
 

helperAPI.py

@@ -13,6 +13,7 @@
 from webdriver_manager.chrome import ChromeDriverManager
 from webdriver_manager.core.os_manager import ChromeType
 
+
 class Brokerage:
     def __init__(self, name):
         self.__name = name  # Name of brokerage
@@ -65,14 +66,12 @@ def get_name(self):
     def get_account_numbers(self, parent_name=None):
         if parent_name is None:
             return self.__account_numbers
-        else:
-            return self.__account_numbers.get(parent_name, [])
+        return self.__account_numbers.get(parent_name, [])
 
     def get_logged_in_objects(self, parent_name=None):
         if parent_name is None:
             return self.__logged_in_objects
-        else:
-            return self.__logged_in_objects.get(parent_name, [])
+        return self.__logged_in_objects.get(parent_name, [])
 
     def get_holdings(self, parent_name=None, account_name=None):
         if parent_name is None:
@@ -93,8 +92,7 @@ def get_account_totals(self, parent_name=None, account_name=None):
     def get_account_types(self, parent_name, account_name=None):
         if account_name is None:
             return self.__account_types.get(parent_name, {})
-        else:
-            return self.__account_types.get(parent_name, {}).get(account_name, "")
+        return self.__account_types.get(parent_name, {}).get(account_name, "")
 
     def __str__(self):
         return textwrap.dedent(f"""
@@ -123,8 +121,8 @@ def check_if_page_loaded(driver):
 def getDriver(DOCKER=False):
     # Check for custom driver version else use latest
     load_dotenv()
-    if os.getenv("CHROMEDRIVER_VERSION"):
-        version = os.getenv("CHROMEDRIVER_VERSION", "latest")
+    if os.getenv("WEBDRIVER_VERSION"):
+        version = os.getenv("WEBDRIVER_VERSION", "latest")
         print(f"Using chromedriver version {version}")
     else:
         print("Using latest chromedriver version")
@@ -183,7 +181,7 @@ def printHoldings(brokerObj, ctx=None, loop=None):
             printAndDiscord(f"{key} ({account}):", ctx, loop)
             holdings = brokerObj.get_holdings(key, account)
             if holdings == {}:
-                printAndDiscord(f"No holdings found", ctx, loop)
+                printAndDiscord("No holdings found", ctx, loop)
             else:
                 print_string = ""
                 for stock in holdings:
@@ -193,4 +191,4 @@ def printHoldings(brokerObj, ctx=None, loop=None):
                     print_string += f"{stock}: {quantity} @ ${format(price, '0.2f')} = ${format(total, '0.2f')}\n"
                 printAndDiscord(print_string, ctx, loop)
             printAndDiscord(f"Total: ${format(brokerObj.get_account_totals(key, account), '0.2f')}\n", ctx, loop)
-    printAndDiscord(f"==============================", ctx, loop)
+    printAndDiscord("==============================", ctx, loop)

schwabAPI.py

@@ -71,6 +71,7 @@ def schwab_holdings(schwab_o, ctx=None, loop=None):
                 continue
         printHoldings(schwab_o, ctx, loop)
 
+
 def schwab_transaction(
     schwab_o, action, stock, amount, price, time, DRY=True, ctx=None, loop=None
 ):

tradierAPI.py

@@ -63,7 +63,7 @@ def tradier_init(TRADIER_EXTERNAL=None):
                 tradier_obj.set_account_totals(name, an, 0)
         # Get balances
         tradier_obj.set_logged_in_object(name, account)
-    print(f"Logged in to Tradier!")
+    print("Logged in to Tradier!")
     return tradier_obj