Update app.py

app.py

@@ -6,9 +6,9 @@ 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 model_inference.py
+# Importing the necessary function
 from model_inference import generate_forex_signals
-from config import RISK_LEVELS  # Assuming config.py is in the root directory
+from config import RISK_LEVELS  # Assuming config.py defines risk levels if needed
 
 # Streamlit page configuration
 st.set_page_config(page_title="AI Forex Bot", page_icon=":guardsman:", layout="wide")
@@ -16,57 +16,58 @@ st.set_page_config(page_title="AI Forex Bot", page_icon=":guardsman:", layout="w
 # Title of the application
 st.title("AI Forex Trading Bot")
 
-# Description of how the bot works
+# Description
 st.markdown("""
-    This AI-powered Forex Bot provides real-time trading signals using a combination of historical data, sentiment analysis, and macroeconomic factors.
-    You can enter your trading capital and select a risk level to get personalized trading recommendations.
+    This AI-powered Forex Bot provides trading signals for multiple currency pairs: EUR/USD, GBP/USD, and USD/JPY.
+    Enter your trading capital and select a risk level to get recommendations.
 """)
 
+# 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 (1 USD to 10,000 USD)
+# Get user trading capital
 trading_capital = st.sidebar.number_input("Enter Trading Capital (USD)", min_value=1, max_value=10000, value=1000)
 
-# Get user market risk level (Low, Medium, High)
+# Get user market risk level
 market_risk = st.sidebar.selectbox("Select Market Risk Level", options=["Low", "Medium", "High"])
 
-# Function to get user's timezone based on their IP address
-def get_user_timezone():
-    try:
-        # Get the public IP address of the user
-        response = requests.get(f'https://ipinfo.io?token=37b621e95809fa')
-        data = response.json()
-        
-        # Extract the timezone information from the response
-        user_timezone = data['timezone']
-        return user_timezone
-    except Exception as e:
-        print(f"Error fetching timezone: {e}")
-        return 'UTC'  # Fallback to UTC if there's an error
-
-# Get user's timezone automatically using IP address
-user_timezone = get_user_timezone()
+# Display the detected timezone
+st.sidebar.write(f"**Detected Timezone**: {user_timezone}")
 
-# Display the inputs
-st.write(f"**Trading Capital**: ${trading_capital}")
-st.write(f"**Market Risk Level**: {market_risk}")
-st.write(f"**Timezone**: {user_timezone}")
-
-# When user presses the "Get Trading Signals" button, run the model inference
+# When the user presses the button, generate trading signals
 if st.sidebar.button("Get Trading Signals"):
-    # Call the function to generate forex signals from model_inference.py
     try:
-        signals = generate_forex_signals(trading_capital, market_risk)
-        
-        # Display the results in the main area
-        st.subheader("Recommended Forex Trade")
-        st.write(f"**Currency Pair**: {signals['currency_pair']}")
-        st.write(f"**Entry Time**: {signals['entry_time']}")
-        st.write(f"**Exit Time**: {signals['exit_time']}")
-        st.write(f"**ROI**: {signals['roi']}%")
-        st.write(f"**Signal Strength**: {signals['signal_strength']}")
+        # Generate signals
+        signals = generate_forex_signals(trading_capital, market_risk, user_timezone)
+
+        # 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("---")
     except Exception as e:
         st.error(f"Error: {str(e)}")
 
+