fidelity-api 0.0.3__tar.gz → 0.0.5__tar.gz

{fidelity-api-0.0.3/fidelity_api.egg-info → fidelity-api-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fidelity-api
-Version: 0.0.3
+Version: 0.0.5
 Summary: An unofficial API for Fidelity
 Home-page: https://github.com/kennyboy106/fidelity-api
 Author: Kenneth Tang

{fidelity-api-0.0.3 → fidelity-api-0.0.5}/fidelity/fidelity.py

@@ -263,103 +263,131 @@ class FidelityAutomation:
                     }
             }
             ```
+        None
+            If an error occured
         """
-        # Go to positions page
-        self.page.wait_for_load_state(state="load")
-        self.page.goto("https://digital.fidelity.com/ftgw/digital/portfolio/positions")
-        self.wait_for_loading_sign()
-
-        # Download the positions as a csv
-        with self.page.expect_download() as download_info:
-            self.page.get_by_label("Download Positions").click()
-        download = download_info.value
-        cur = os.getcwd()
-        positions_csv = os.path.join(cur, download.suggested_filename)
-        # Create a copy to work on with the proper file name known
-        download.save_as(positions_csv)
-
-        csv_file = open(positions_csv, newline="", encoding="utf-8-sig")
-
-        reader = csv.DictReader(csv_file)
-        # Ensure all fields we want are present
-        required_elements = [
-            "Account Number",
-            "Account Name",
-            "Symbol",
-            "Description",
-            "Quantity",
-            "Last Price",
-            "Current Value",
-        ]
-        intersection_set = set(reader.fieldnames).intersection(set(required_elements))
-        if len(intersection_set) != len(required_elements):
-            raise Exception("Not enough elements in fidelity positions csv")
-
-        for row in reader:
-            # Skip empty rows
-            if row["Account Number"] is None:
-                continue
-            # Last couple of rows have some disclaimers, filter those out
-            if "and" in row["Account Number"]:
-                break
-            # Skip accounts that start with 'Y' (Fidelity managed)
-            if row["Account Number"][0] == "Y":
-                continue
-            # Get the value and remove '$' from it
-            val = str(row["Current Value"]).replace("$", "").replace("-", "")
-            # Get the last price
-            last_price = str(row["Last Price"]).replace("$", "").replace("-", "")
-            # Get quantity
-            quantity = str(row["Quantity"]).replace("-", "")
-            # Get ticker
-            ticker = str(row["Symbol"])
-
-            # Don't include this if present
-            if "Pending" in ticker:
-                continue
-            # If the value isn't present, move to next row
-            if len(val) == 0:
-                continue
-            # If the last price isn't available, just use the current value
-            if len(last_price) == 0:
-                last_price = val
-            # If the quantity is missing set it to 1 (For SPAXX or any other cash position)
-            if len(quantity) == 0:
-                quantity = 1
+        try:
+            # Go to positions page
+            self.page.wait_for_load_state(state="load")
+            self.page.goto("https://digital.fidelity.com/ftgw/digital/portfolio/positions")
             
-            # Check for anything that isn't a number 
-            try:
-                float(val)
-            except ValueError:
-                val = 0
-            try:
-                float(last_price)
-            except ValueError:
-                last_price = 0
+            # This double wait is necessary. If you remove it, I'll kill you
+            self.wait_for_loading_sign()
+            self.page.wait_for_timeout(1000)
+            self.wait_for_loading_sign()
+
+            # Download the positions as a csv #
+            # See if new UI is present
+            new_ui = True
             try:
-                float(quantity)
-            except ValueError:
-                quantity = 0
-
-            # Create list of dictionary for stock found
-            stock_list = [create_stock_dict(ticker, float(quantity), float(last_price), float(val))]
-            # Try setting in the account dict without overwrite
-            if not self.set_account_dict(
-                account_num=row["Account Number"],
-                balance=float(val),
-                nickname=row["Account Name"],
-                stocks=stock_list,
-                overwrite=False,
-            ):
-                # If the account exists already, add to it
-                self.add_stock_to_account_dict(row["Account Number"], stock_list[0])
+                self.page.get_by_role("button", name="Available Actions").click(timeout=2000)
+                with self.page.expect_download() as download_info:
+                    self.page.get_by_role("menuitem", name="Download").click()
+                download = download_info.value
+            except PlaywrightTimeoutError:
+                new_ui = False
+            if not new_ui:
+                try:
+                    # Use the old UI
+                    with self.page.expect_download() as download_info:
+                        self.page.get_by_label("Download Positions").click()
+                    download = download_info.value
+                except PlaywrightTimeoutError:
+                    return None
+            # Get absolute path to file
+            cur = os.getcwd()
+            positions_csv = os.path.join(cur, download.suggested_filename)
+            # Create a copy to work on with the proper file name known
+            download.save_as(positions_csv)
+
+            csv_file = open(positions_csv, newline="", encoding="utf-8-sig")
+
+            reader = csv.DictReader(csv_file)
+            # Ensure all fields we want are present
+            required_elements = [
+                "Account Number",
+                "Account Name",
+                "Symbol",
+                "Description",
+                "Quantity",
+                "Last Price",
+                "Last Price Change",
+                "Current Value",
+            ]
+            intersection_set = set(reader.fieldnames).intersection(set(required_elements))
+            if len(intersection_set) != len(required_elements):
+                raise Exception("Not enough elements in fidelity positions csv")
+
+            for row in reader:
+                # Skip empty rows
+                if row["Account Number"] is None:
+                    continue
+                # Last couple of rows have some disclaimers, filter those out
+                if "and" in row["Account Number"]:
+                    break
+                # Skip accounts that start with 'Y' (Fidelity managed)
+                if row["Account Number"][0] == "Y":
+                    continue
+                # Get the value and remove '$' from it
+                cur_val = str(row["Current Value"]).replace("$", "").replace("-", "")
+                # Get the last price
+                last_price = str(row["Last Price"]).replace("$", "").replace("-", "")
+                # Get the last price change
+                last_price_change = str(row["Last Price Change"]).replace("$", "")
+                # Get quantity
+                quantity = str(row["Quantity"]).replace("-", "")
+                # Get ticker
+                ticker = str(row["Symbol"])
+
+                # Catch any pending activity with special handling
+                if "Pending" in ticker:
+                    cur_val = last_price_change
+                # If the value isn't present, move to next row
+                if len(cur_val) == 0:
+                    continue
+                # If the last price isn't available, just use the current value
+                if len(last_price) == 0:
+                    last_price = cur_val
+                # If the quantity is missing set it to 1 (For SPAXX or any other cash position)
+                if len(quantity) == 0:
+                    quantity = 1
+                
+                # Check for anything that isn't a number 
+                try:
+                    float(cur_val)
+                except ValueError:
+                    cur_val = 0
+                try:
+                    float(last_price)
+                except ValueError:
+                    last_price = 0
+                try:
+                    float(quantity)
+                except ValueError:
+                    quantity = 0
+
+                # Create list of dictionary for stock found
+                stock_list = [create_stock_dict(ticker, float(quantity), float(last_price), float(cur_val))]
+                # Try setting in the account dict without overwrite
+                if not self.set_account_dict(
+                    account_num=row["Account Number"],
+                    balance=float(cur_val),
+                    nickname=row["Account Name"],
+                    stocks=stock_list,
+                    overwrite=False,
+                ):
+                    # If the account exists already, add to it
+                    self.add_stock_to_account_dict(row["Account Number"], stock_list[0])
 
-        # Close the file
-        csv_file.close()
-        # Delete the file
-        os.remove(positions_csv)
+            # Close the file
+            csv_file.close()
+            # Delete the file
+            os.remove(positions_csv)
 
-        return self.account_dict
+            return self.account_dict
+        except Exception as e:
+            print(f"Error in getAccountInfo: {e}")
+            return None
 
     def set_account_dict(self, account_num: str, balance: float = None, withdrawal_balance: float = None, nickname: str = None, stocks: list = None, overwrite: bool = False):
         """
@@ -414,8 +442,8 @@ class FidelityAutomation:
 
             # Use the info given
             self.account_dict[account_num] = {
-                "balance": balance if balance is not None else 0.0,
-                "withdrawal_balance": withdrawal_balance if withdrawal_balance is not None else 0.0,
+                "balance": round(balance, 2) if balance is not None else 0.0,
+                "withdrawal_balance": round(withdrawal_balance, 2) if withdrawal_balance is not None else 0.0,
                 "nickname": nickname,
                 "stocks": stocks if stocks is not None else []
             }
@@ -440,10 +468,10 @@ class FidelityAutomation:
         if account_num in self.account_dict:
             if overwrite:
                 self.account_dict[account_num]["stocks"] = [stock]
-                self.account_dict[account_num]["balance"] = stock["value"]
+                self.account_dict[account_num]["balance"] = round(stock["value"], 2)
             else:
                 self.account_dict[account_num]["stocks"].append(stock)
-                self.account_dict[account_num]["balance"] += stock["value"]
+                self.account_dict[account_num]["balance"] += round(stock["value"], 2)
             return True
         return False
 
@@ -1057,6 +1085,7 @@ class FidelityAutomation:
             available_balance = float(available_balance.replace("$", "").replace(",", ""))
 
             # Check if there's enough balance
+            transfer_amount = round(transfer_amount, 2)
             if transfer_amount > available_balance:
                 print(f"Insufficient funds. Available: ${available_balance}, Attempted transfer: ${transfer_amount}")
                 return False
@@ -1244,6 +1273,7 @@ class FidelityAutomation:
         signs = [self.page.locator("div:nth-child(2) > .loading-spinner-mask-after").first,
                  self.page.locator(".pvd-spinner__mask-inner").first,
                  self.page.locator("pvd-loading-spinner").first,
+                 self.page.locator(".pvd3-spinner-root > .pvd-spinner__spinner > .pvd-spinner__visual > div > .pvd-spinner__mask-inner").first,
                 ]
         for sign in signs:
             sign.wait_for(timeout=timeout, state="hidden")
@@ -1291,6 +1321,7 @@ class FidelityAutomation:
 
             # Click it
             selected_entry.click()
+            self.page.wait_for_timeout(50)
 
             # Click the rename button
             self.page.get_by_role("button", name="Rename").click()

{fidelity-api-0.0.3 → fidelity-api-0.0.5/fidelity_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fidelity-api
-Version: 0.0.3
+Version: 0.0.5
 Summary: An unofficial API for Fidelity
 Home-page: https://github.com/kennyboy106/fidelity-api
 Author: Kenneth Tang

{fidelity-api-0.0.3 → fidelity-api-0.0.5}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as f:
 
 setup(
     name="fidelity-api",
-    version="0.0.3",
+    version="0.0.5",
     author="Kenneth Tang",
     description="An unofficial API for Fidelity",
     long_description=long_description,