app.py

app.py

@@ -2,7 +2,7 @@ import gradio as gr
 import requests
 import pandas as pd
 import plotly.graph_objs as go
-from datetime import datetime
+from datetime import datetime, timedelta
 
 # Fallback data for demonstration purposes
 fallback_historical_data = {
@@ -20,12 +20,14 @@ fallback_current_prices = {
 
 # Function to fetch current price from CoinGecko with fallback to CryptoCompare
 def fetch_current_price(coin_id):
+    # Mapping between CoinGecko and CryptoCompare coin symbols
     compare_symbol_map = {
         'bitcoin': 'BTC',
         'ethereum': 'ETH',
         'binancecoin': 'BNB',
     }
 
+    # API URLs
     gecko_url = f"https://api.coingecko.com/api/v3/simple/price?ids={coin_id}&vs_currencies=usd"
     compare_url = f"https://min-api.cryptocompare.com/data/price?fsym={compare_symbol_map.get(coin_id, 'BTC')}&tsyms=USD"
 
@@ -34,10 +36,7 @@ def fetch_current_price(coin_id):
         response = requests.get(gecko_url, timeout=10)
         response.raise_for_status()
         data = response.json()
-        if coin_id in data and 'usd' in data[coin_id]:
-            return f"${data[coin_id]['usd']:.2f} (from CoinGecko)"
-        else:
-            return f"Unexpected response from CoinGecko: {data}"
+        return f"${data[coin_id]['usd']:.2f} (from CoinGecko)"
     except requests.exceptions.RequestException as gecko_error:
         print(f"Error fetching price from CoinGecko: {gecko_error}")
         
@@ -46,10 +45,7 @@ def fetch_current_price(coin_id):
             response = requests.get(compare_url, timeout=10)
             response.raise_for_status()
             data = response.json()
-            if 'USD' in data:
-                return f"${data['USD']:.2f} (from CryptoCompare)"
-            else:
-                return f"Unexpected response from CryptoCompare: {data}"
+            return f"${data['USD']:.2f} (from CryptoCompare)"
         except requests.exceptions.RequestException as compare_error:
             print(f"Error fetching price from CryptoCompare: {compare_error}")
             return "Price data not available"
@@ -66,12 +62,19 @@ def fetch_historical_data(coin_id, from_timestamp, to_timestamp):
         print(f"Error fetching historical data: {e}")
         return fallback_historical_data.get(coin_id, f"Error fetching historical data for {coin_id}")
 
+# Convert date string to timestamp
+def date_to_timestamp(date_str):
+    return int(pd.Timestamp(date_str).timestamp())
+
 # Function to plot historical prices using Plotly
-def plot_historical_prices(coin_name, start_date, end_date):
+def plot_historical_prices(coin_name, days_back):
     try:
-        # Convert date strings to timestamps
-        from_timestamp = int(pd.Timestamp(start_date).timestamp())
-        to_timestamp = int(pd.Timestamp(end_date).timestamp())
+        # Set dynamic date range: from X days ago to today
+        to_date = datetime.now()
+        from_date = to_date - timedelta(days=days_back)
+        
+        from_timestamp = int(from_date.timestamp())
+        to_timestamp = int(to_date.timestamp())
         
         prices = fetch_historical_data(coin_name, from_timestamp, to_timestamp)
         
@@ -83,7 +86,7 @@ def plot_historical_prices(coin_name, start_date, end_date):
         
         fig = go.Figure()
         fig.add_trace(go.Scatter(x=df['date'], y=df['price'], mode='lines', name=coin_name))
-        fig.update_layout(title=f'{coin_name.capitalize()} Prices from {start_date} to {end_date}', 
+        fig.update_layout(title=f'{coin_name.capitalize()} Prices (Last {days_back} Days)', 
                           xaxis_title='Date', yaxis_title='Price (USD)')
         return fig
     except Exception as e:
@@ -146,19 +149,26 @@ crypto_price_chart_interface = gr.Interface(
     fn=plot_historical_prices,
     inputs=[
         gr.Dropdown(choices=['bitcoin', 'ethereum', 'binancecoin'], label="Cryptocurrency"),
-        gr.Date(label="Start Date", value="2024-01-01"),
-        gr.Date(label="End Date", value=datetime.now().strftime('%Y-%m-%d'))
+        gr.Slider(minimum=1, maximum=365, step=1, value=30, label="Number of Days Back")
     ],
     outputs=gr.Plot(label="Cryptocurrency Price Chart"),
-    title="Cryptocurrency Price Chart (Custom Date Range)"
+    title="Cryptocurrency Price Chart (Last X Days)"
+)
+
+# Current Price Interface
+current_price_interface = gr.Interface(
+    fn=fetch_current_price,
+    inputs=gr.Dropdown(choices=['bitcoin', 'ethereum', 'binancecoin'], label="Cryptocurrency"),
+    outputs=gr.Textbox(label="Current Price"),
+    title="Current Cryptocurrency Price"
 )
 
 # Combining all interfaces into a single tabbed app
 block = gr.TabbedInterface(
-    [crypto_price_chart_interface, real_time_trade_interface, btc_analysis_interface],
-    tab_names=["Price Chart", "Real-Time Trade Data", "AI BTC Analysis"]
+    [crypto_price_chart_interface, current_price_interface, real_time_trade_interface, btc_analysis_interface],
+    tab_names=["Price Chart", "Current Price", "Real-Time Trade Data", "AI BTC Analysis"]
 )
 
 # Launch the Gradio app
 if __name__ == "__main__":
-    block.launch()
+    block.launch()