Update app.py

app.py

@@ -1,17 +1,11 @@
 import streamlit as st
 import os
 import sys
-import requests
 
 # Add the 'utils' directory to sys.path so Python can find modules within it
 sys.path.append(os.path.join(os.path.dirname(__file__), "utils"))
 
-# Importing the necessary function
 from utils.forex_signals import generate_forex_signals
-from config import RISK_LEVELS  # Assuming config.py defines risk levels if needed
-
-# List of allowed usernames
-ALLOWED_USERNAMES = ["ddilloud", "ved", "aditya", "karlmax", "bento"]
 
 # Streamlit page configuration
 st.set_page_config(page_title="AI Forex Bot", page_icon=":guardsman:", layout="wide")
@@ -24,6 +18,8 @@ if not st.session_state.authenticated:
     st.title("Authentication Required")
     username = st.text_input("Enter your username", "")
     if st.button("Login"):
+        # Simple authentication
+        ALLOWED_USERNAMES = ["ddilloud", "ved", "aditya", "karlmax", "bento"]
         if username in ALLOWED_USERNAMES:
             st.session_state.authenticated = True
             st.success("Login successful! Welcome!")
@@ -33,60 +29,42 @@ else:
     # Title of the application
     st.title("AI Forex Trading Bot")
 
-    # Description
     st.markdown("""
-        This tool is for informational purposes only and does not provide financial advice. Forex trading involves significant risk, including potential loss of capital. 
-        Users should exercise caution, conduct their own research, and consult a licensed financial advisor. Use at your own risk.
+        This tool provides forex trading signals based on AI analysis and is for informational purposes only. 
+        Use at your own risk as forex trading involves substantial risk of loss.
     """)
 
-    # Automatically fetch the user's timezone using IPInfo API
-    access_token = "37b621e95809fa"  # Replace with your actual IPInfo API token
-    try:
-        response = requests.get(f"https://ipinfo.io/json?token={access_token}")
-        response.raise_for_status()
-        user_timezone = response.json().get("timezone", "UTC")
-    except requests.exceptions.RequestException:
-        user_timezone = "UTC"  # Default to UTC if the API call fails
-
     # Sidebar for user inputs
     st.sidebar.header("User Input")
-
-    # Get user trading capital
     trading_capital = st.sidebar.number_input("Enter Trading Capital (USD)", min_value=1, max_value=10000, value=1000)
+    market_risk = st.sidebar.selectbox("Select Market Risk Level", ["Low", "Medium", "High"])
+    additional_pairs = [
+        "EUR/USD", "GBP/USD", "USD/JPY", "AUD/USD", "CAD/JPY", 
+        "NZD/USD", "CHF/JPY", "AUD/JPY", "GBP/CHF", "EUR/GBP"
+    ]
 
-    # Get user market risk level
-    market_risk = st.sidebar.selectbox("Select Market Risk Level", options=["Low", "Medium", "High"])
-
-    # Display the detected timezone
-    st.sidebar.write(f"**Detected Timezone**: {user_timezone}")
-
-    # When the user presses the button, generate trading signals
     if st.sidebar.button("Get Trading Signals"):
         try:
-            # List of currency pairs to generate signals for
-            additional_pairs = ['EUR/USD', 'GBP/USD', 'USD/JPY', 'AUD/USD', 'CAD/JPY', 'NZD/USD', 'CHF/JPY', 'AUD/JPY', 'GBP/CHF', 'EUR/GBP']
-
-            # Generate signals
-            signals = generate_forex_signals(trading_capital, market_risk, user_timezone, additional_pairs=additional_pairs)
-
-            # Display the best signal
-            best_signal = signals["best_signal"]
-            st.subheader("Best Recommended Forex Trade")
-            st.write(f"**Currency Pair**: {best_signal['currency_pair']}")
-            st.write(f"**Entry Time**: {best_signal['entry_time']}")
-            st.write(f"**Exit Time**: {best_signal['exit_time']}")
-            st.write(f"**ROI**: {best_signal['roi']}%")
-            st.write(f"**Signal Strength**: {best_signal['signal_strength']}")
-
-            # Display all signals
-            st.subheader("All Generated Signals")
-            for signal in signals["all_signals"]:
-                st.write(f"**Currency Pair**: {signal['currency_pair']}")
-                st.write(f"**Entry Time**: {signal['entry_time']}")
-                st.write(f"**Exit Time**: {signal['exit_time']}")
-                st.write(f"**ROI**: {signal['roi']}%")
-                st.write(f"**Signal Strength**: {signal['signal_strength']}")
-                st.markdown("---")
+            signals = generate_forex_signals(trading_capital, market_risk, "UTC", additional_pairs)
+
+            if signals["best_signal"]:
+                best_signal = signals["best_signal"]
+                st.subheader("Best Recommended Forex Trade")
+                st.write(f"**Currency Pair**: {best_signal['currency_pair']}")
+                st.write(f"**Entry Time**: {best_signal['entry_time']}")
+                st.write(f"**Exit Time**: {best_signal['exit_time']}")
+                st.write(f"**ROI**: {best_signal['roi']}%")
+                st.write(f"**Signal Strength**: {best_signal['signal_strength']}")
+
+                st.subheader("All Generated Signals")
+                for signal in signals["all_signals"]:
+                    st.write(f"**Currency Pair**: {signal['currency_pair']}")
+                    st.write(f"**Entry Time**: {signal['entry_time']}")
+                    st.write(f"**Exit Time**: {signal['exit_time']}")
+                    st.write(f"**ROI**: {signal['roi']}%")
+                    st.write(f"**Signal Strength**: {signal['signal_strength']}")
+                    st.markdown("---")
+            else:
+                st.warning("No signals were generated. Please try again later.")
         except Exception as e:
-            st.error(f"Error: {str(e)}")
-
+            st.error(f"An error occurred: {str(e)}")