Update app.py

app.py

@@ -33,34 +33,33 @@ trade_type= "PERPETUAL" # perpetual or delivery
 # Authenticate using the service account info
 creds = Credentials.from_service_account_info(service_account_info, scopes=scopes)
 client = gspread.authorize(creds)
-sheet_mapping = {
-    "usdm": "usdmHistory",
-    "coinm": "coinmHistory",
-    "copyTraders": "copyTradersHistory",
-    "okx": "okx"
-}
-
-# Streamlit UI
-st.title("Google Sheets Selector")
 
-# Dropdown to select an option
-option = st.selectbox(
-    "Select a Sheet",
-    ("usdm", "coinm", "copyTraders", "okx")
-)
+# The ID of the Google Sheet (found in the URL of the sheet)
+sheet_id = "1I_PuAeWTaRC4OhS5BA5gv0XQCA17VlIjpA1MvOlzVA8"
 
-st.button("Load Sheet"):
-    # Get the selected sheet name
-sheet_name = sheet_mapping[option]
-    
-    # Open the Google Sheet and select the worksheet
-sheet_id = "1I_PuAeWTaRC4OhS5BA5gv0XQCA17VlIjpA1MvOlzVA8"  # Replace with your actual Sheet ID
+# Open the Google Sheet by sheet ID
 workbook = client.open_by_key(sheet_id)
-sheet = workbook.worksheet(sheet_name)
-    
-    # Fetch data from the worksheet and display it
-data = sheet.get_all_records()
-df = pd.DataFrame(data)
+
+# Select the specific sheet in the workbook'
+
+options = ["Select an option", "usdmHistory", "coinmHistory", "copyLeaderBoard"]
+
+# Dropdown menu to select the sheet
+selected_sheet = st.selectbox("Select a worksheet:", options)
+
+# Ensure a valid selection is made
+if selected_sheet != "Select an option":
+    sheet = workbook.worksheet(selected_sheet)
+    st.write(f"Selected sheet: {selected_sheet}")
+else:
+    st.write("Please select a worksheet.")
+
+
+# Extract the data from the Google Sheet into a pandas DataFrame
+data = sheet.get_all_values()
+
+headers = data.pop(0)
+df = pd.DataFrame(data, columns=headers)
 
 
 
@@ -110,7 +109,10 @@ df = df.apply(lambda col: col.map(convert_str_to_list_or_keep))
 
 df['positionClosed'] = False
 
-uid_input = str.upper(st.text_input("Enter U_IDs to filter"))
+if selected_sheet == "copyLeaderBoard":
+    uid_input = int(st.text_input("Enter U_IDs to filter"))
+else:
+    uid_input = str.upper(st.text_input("Enter U_IDs to filter"))
 
 option = st.radio("Choose an option:", ["Show Position History", "Show Live Positions"])
 
@@ -190,7 +192,10 @@ if df is not None and uid_input:
             
             if 'symbol' in trade_list[i]:
                 symbol = trade_list[i]['symbol']
-                side  ="buy" if trade_list[i]['amount']>0 else "sell"
+                if selected_sheet == "copyLeaderBoard":
+                    side  ="buy" if float(trade_list[i]['amount'])>0 else "sell"
+                else:
+                    side  ="buy" if trade_list[i]['amount']>0 else "sell"
                 amount = trade_list[i]['amount']
                 symbol = trade_list[i]['symbol']     
                 trade_list[i]['side'] =side
@@ -211,18 +216,19 @@ if df is not None and uid_input:
                                 # Extract symbol and amount
                                 symbol = new_position.get('symbol')
                                 amount = new_position.get('amount')
-                                if start==False:
-                                    start_time = new_position.get('updateTime')
-                                    year = start_time[0]
-                                    month = start_time[1]
-                                    day = start_time[2]
-                                    hour =start_time[3]
-                                    minute =start_time[4]
-                                    seconds = start_time[5]
-                                    dt = datetime(year, month, day, hour, minute, seconds)
-                                    human_readable_format = dt.strftime('%B %d, %Y, %I:%M:%S %p')     
-                                    st.subheader(f"Data from {human_readable_format}")
-                                    start=True 
+                                if selected_sheet != "copyLeaderBoard":
+                                    if start==False:
+                                        start_time = new_position.get('updateTime')
+                                        year = start_time[0]
+                                        month = start_time[1]
+                                        day = start_time[2]
+                                        hour =start_time[3]
+                                        minute =start_time[4]
+                                        seconds = start_time[5]
+                                        dt = datetime(year, month, day, hour, minute, seconds)
+                                        human_readable_format = dt.strftime('%B %d, %Y, %I:%M:%S %p')     
+                                        st.subheader(f"Data from {human_readable_format}")
+                                        start=True 
                                 # if start==False:
                                 #     
                                 #     start =True
@@ -253,21 +259,21 @@ if df is not None and uid_input:
                     for position in trade_list[j]['positions']:
                         # Check if 'Modified' is in the position and is a dict
                         if 'Modified' in position and isinstance(position['Modified'], dict):
-                            
-                            if start==False:
-                                    for k,v in position.items():
-                                        start_time = v['updateTime']
-                                    
-                                    year = start_time[0]
-                                    month = start_time[1]
-                                    day = start_time[2]
-                                    hour =start_time[3]
-                                    minute =start_time[4]
-                                    seconds = start_time[5]
-                                    dt = datetime(year, month, day, hour, minute, seconds)
-                                    human_readable_format = dt.strftime('%d-%m-%Y %H:%M:%S')   
-                                    st.subheader(f"Data from {human_readable_format}")
-                                    start=True 
+                            if selected_sheet != "copyLeaderBoard":
+                                if start==False:
+                                        for k,v in position.items():
+                                            start_time = v['updateTime']
+                                        
+                                        year = start_time[0]
+                                        month = start_time[1]
+                                        day = start_time[2]
+                                        hour =start_time[3]
+                                        minute =start_time[4]
+                                        seconds = start_time[5]
+                                        dt = datetime(year, month, day, hour, minute, seconds)
+                                        human_readable_format = dt.strftime('%d-%m-%Y %H:%M:%S')   
+                                        st.subheader(f"Data from {human_readable_format}")
+                                        start=True 
                             modified_amount = get_amounts_from_positions_and_closed_trades(position)
                             modified_symbol = get_symbols_from_positions_and_closed_trades(position)
 
@@ -281,7 +287,10 @@ if df is not None and uid_input:
                                     st.header(f"Data is from {datetime.now}")
                                     start =True
                                 position['Modified']['side'] = modified_side
-                                position['Modified']['changeInAmount'] = amount - modified_amount if modified_amount < 0 else modified_amount - amount
+                                if selected_sheet =="copyLeaderBoard":
+                                    position['Modified']['changeInAmount'] = float(amount) - modified_amount if modified_amount < 0 else modified_amount - float(amount)
+                                else:
+                                    position['Modified']['changeInAmount'] = amount - modified_amount if modified_amount < 0 else modified_amount - amount
                                 position['Modified']['i'] = i
                                 amount = modified_amount
                                 unique_lists.append(trade_list[j])
@@ -308,14 +317,19 @@ if df is not None and uid_input:
                                 closed_side = "sell"
 
                             if symbol == closed_symbol and side == closed_side:
-                                if start==False:
-                                    for k,v in position.items():
-                                        start_time = v['updateTime']
-                                    start =True
+                                if selected_sheet != "copyLeaderBoard":
+                                    if start==False:
+                                        for k,v in position.items():
+                                            start_time = v['updateTime']
+                                        start =True
                                 
                                 closed_trades_dict['side'] = closed_side
                                 trade_info = closed_trades_dict['trade_info']
-                                trade_info['changeInAmount'] = amount - closed_amount if closed_amount < 0 else closed_amount - amount
+                                if selected_sheet =="copyLeaderBoard":
+                                    trade_info['changeInAmount'] = float(amount) - closed_amount if closed_amount < 0 else closed_amount - float(amount)
+                                else:
+
+                                    trade_info['changeInAmount'] = amount - closed_amount if closed_amount < 0 else closed_amount - amount
                                 amount = closed_amount
                                 closed_trades_dict['trade_info']['i'] = i  # Store index 'i' inside 'ClosedTrades'
                                 closed_trades_dict['trade_info']['closed'] = True
@@ -414,25 +428,46 @@ if df is not None and uid_input:
         
         if position_history:
             df_history = pd.DataFrame(position_history)
+
+            if selected_sheet == "copyLeaderBoard":
+                df_history['changeInAmount'] = pd.to_numeric(df_history['changeInAmount'], errors='coerce')
+                df_history['markPrice'] = pd.to_numeric(df_history['markPrice'], errors='coerce')
+                df_history['entryPrice'] = pd.to_numeric(df_history['entryPrice'], errors='coerce')
+            # df_history['amount'] = pd.to_numeric(df['amount'],errors='coerce')
+
+# Replace NaN with 0 or handle as required
+                df_history.fillna(0, inplace=True)
             
             # Update the global timestamp with the last update from history
             
             
             # Create a transformed DataFrame for display
-            df_transformed = pd.DataFrame({
-                'Pair/Asset': df_history['symbol'],
-                'is long': df_history['side'],
-                'Current size after change': df_history['amount'],
-                'Change in size in Asset': df_history['changeInAmount'],
-                'Change in size in USDT': df_history['changeInAmount'] * -(df_history['markPrice']),
-                'Entry price': df_history['entryPrice'],
-                'Exit price': df_history['markPrice'],
-                'pnl in usdt': df_history['pnl'],
-                'pnl in %': df_history['roe'],
-                'Leverage': df_history['leverage'],
-                'updatedTime': df_history['updateTime']
-            })
-            
+            if selected_sheet != "copyLeaderBoard":
+                df_transformed = pd.DataFrame({
+                    'Pair/Asset': df_history['symbol'],
+                    'is long': df_history['side'],
+                    'Current size after change': df_history['amount'],
+                    'Change in size in Asset': df_history['changeInAmount'],
+                    'Change in size in USDT': df_history['changeInAmount'] * -(df_history['markPrice']),
+                    'Entry price': df_history['entryPrice'],
+                    'Exit price': df_history['markPrice'],
+                    'pnl in usdt': df_history['pnl'],
+                    'pnl in %': df_history['roe'],
+                    'Leverage': df_history['leverage'],
+                    'updatedTime': df_history['updateTime']
+                })
+            else:
+                 df_transformed = pd.DataFrame({
+                    'Pair/Asset': df_history['symbol'],
+                    'is long': df_history['side'],
+                    'Current size after change': df_history['amount'],
+                    'Change in size in Asset': df_history['changeInAmount'],
+                    'Change in size in USDT': df_history['changeInAmount'] * -(df_history['markPrice']),
+                    'Entry price': df_history['entryPrice'],
+                    'Exit price': df_history['markPrice'],
+                    'Leverage': df_history['leverage'],
+                })
+                 
             if 'closed' in df_history.columns:
                 df_transformed['Position closed'] = df_history['closed']
             
@@ -468,21 +503,34 @@ if df is not None and uid_input:
         df_starting = pd.DataFrame(starting_position)
         
         for index, row in df_starting.iterrows():
-            side = True if row['amount'] > 0 else False
+            if selected_sheet =="copyLeaderBoard":
+                  side = True if float(row['amount']) > 0 else False
+            else:
+                 side = True if row['amount'] > 0 else False
             is_closed = isClosed(row['i'])
             
             # Generate a unique key for the button
             button_key = f"position_{row['i']}"
             
             # Display a button for each trade position
-            if st.button(
+            if selected_sheet != "copyLeaderBoard":
+                if st.button(
+                    f"{row['symbol']} : Long: {side}, Entry Price: {row['entryPrice']}, "
+                    f"Market Price: {row['markPrice']}, Amount: {row['amount']}, "
+                    f"Leverage: {row['leverage']}, TradeTakenAt: {row['updateTime']}, "
+                    f"lastUpdated: {lastUpdated(row['i'])}, isClosed: {is_closed}",
+                    key=button_key
+                ):
+                    show_position_history(row['i'])
+
+            else:
+                if st.button(
                 f"{row['symbol']} : Long: {side}, Entry Price: {row['entryPrice']}, "
                 f"Market Price: {row['markPrice']}, Amount: {row['amount']}, "
-                f"Leverage: {row['leverage']}, TradeTakenAt: {row['updateTime']}, "
-                f"lastUpdated: {lastUpdated(row['i'])}, isClosed: {is_closed}",
+                f"Leverage: {row['leverage']}, isClosed: {is_closed}",
                 key=button_key
-            ):
-                show_position_history(row['i'])
+                ):
+                    show_position_history(row['i'])
 
     if __name__ == "__main__":
         main()