Update app.py

app.py

@@ -52,7 +52,7 @@ def init_app():
     init_predictor()
 
 
-def predict_roi(miner_name, region, prediction_date):
+def predict_roi(miner_name,region,prediction_date,machine_price,machine_hashrate,machine_power,machine_efficiency,electricity_rate):
     """Make prediction for a specific date"""
     try:
         window_size = 30
@@ -60,6 +60,19 @@ def predict_roi(miner_name, region, prediction_date):
         # Convert prediction_date to datetime
         if isinstance(prediction_date, str):
             prediction_date = datetime.strptime(prediction_date, '%Y-%m-%d')
+
+        miner_price = float(machine_price)
+        miner_hashrate = float(machine_hashrate)
+        machine_power = float(machine_power)
+        machine_efficiency = float(machine_efficiency)
+        electricity_rate = float(electricity_rate)
+
+        print(f"User machine specs:")
+        print(f"  Price:           {miner_price}")
+        print(f"  Hashrate (TH/s): {miner_hashrate}")
+        print(f"  Power (W):       {machine_power}")
+        print(f"  Efficiency:      {machine_efficiency}")
+        print(f"  Elec rate:       {electricity_rate} USD/kWh")
         
         print(f"\n{'='*80}")
         print(f"PREDICTION REQUEST")
@@ -88,31 +101,22 @@ def predict_roi(miner_name, region, prediction_date):
         print(f"✅ Got {len(blockchain_df)} days of data")
         print(f"   Date range: {blockchain_df['date'].min().date()} to {blockchain_df['date'].max().date()}")
         
-        # Fetch ASIC price for the selected date
-        print(f"\n💰 Fetching ASIC price for {prediction_date.date()}...")
-        miner_prices, data_available = fetch_asic_price_for_date(prediction_date)
-        
-        if not data_available:
-            warning_html = f"""
-            <div style='background: #f39c12; color: white; padding: 15px; border-radius: 10px; margin-bottom: 20px;'>
-                <h3 style='margin: 0;'>⚠️ Warning: Price Data Unavailable</h3>
-                <p style='margin: 10px 0 0 0;'>
-                    No ASIC price data available for {prediction_date.date()}.
-                    Using fallback prices (approximate market values).
-                </p>
-            </div>
-            """
-        else:
-            warning_html = ""
-        
-        miner_price = miner_prices.get(miner_name, FALLBACK_PRICES.get(miner_name, 2500))
-        price_source = "API" if data_available else "Fallback"
-        
-        print(f"   Price for {miner_name}: ${miner_price:,.2f} ({price_source})")
+        price_source = "User input"
+        print(f"   Using user-provided price for {miner_name}: ${miner_price:,.2f}")
         
         # Get sequence (now uses blockchain_df which is date-specific)
         print(f"\n🔧 Preparing features...")
-        sequence, _, pred_date = get_latest_sequence(blockchain_df, miner_name, miner_price, region, window_size)
+        sequence, _, pred_date = get_latest_sequence(
+            blockchain_df,
+            miner_name,
+            miner_price,
+            region,
+            window_size,
+            machine_hashrate=miner_hashrate,
+            power=machine_power,
+            efficiency=machine_efficiency,
+            electricity_rate=electricity_rate,
+        )
         print(f"✅ Sequence prepared: {sequence.shape}")
         
         # Predict
@@ -121,7 +125,17 @@ def predict_roi(miner_name, region, prediction_date):
         print(f"✅ Prediction: {result['predicted_label']} ({result['confidence']:.1%})")
         
         # Create displays
-        miner_info = create_miner_info(miner_name, miner_price, region, price_source, prediction_date)
+        miner_info = create_miner_info(
+            miner_name,
+            miner_price,
+            region,
+            price_source,
+            prediction_date,
+            miner_hashrate,
+            machine_power,
+            machine_efficiency,
+            electricity_rate,
+        )
         prediction_html = warning_html + create_prediction_html(result, pred_date, window_size)
         confidence_chart = create_confidence_chart(result['probabilities'])
         price_chart = create_price_chart(blockchain_df, window_size)
@@ -145,42 +159,61 @@ def predict_roi(miner_name, region, prediction_date):
         return error, error, None, None
 
 
-def create_miner_info(miner_name, price, region, source, prediction_date):
+def create_miner_info(
+    miner_name,
+    price,
+    region,
+    source,
+    prediction_date,
+    machine_hashrate,
+    machine_power,
+    machine_efficiency,
+    electricity_rate,
+):
+    """
+    Display miner info using user-provided specs (price, hashrate, power, efficiency, elec rate).
+    We still use MINER_SPECS only to get the pretty full_name.
+    """
     specs = MINER_SPECS[miner_name]
-    # Daily electricity rate for the prediction date (with fallback beyond CSV range)
-    elec_rate = get_electricity_rate(region, prediction_date.date())
-    daily_cost = (specs['power'] * 24 / 1000) * elec_rate
-    
-    # Color coding for source
+    full_name = specs["full_name"]
+
+    elec_rate = float(electricity_rate)
+    daily_cost = (float(machine_power) * 24.0 / 1000.0) * elec_rate
+
+    # Color coding for price source
     if source == "API":
         badge_color = "#27ae60"  # Green
+    elif source == "User input":
+        badge_color = "#3498db"  # Blue
     else:
-        badge_color = "#e74c3c"  # Red for fallback
-    
+        badge_color = "#e74c3c"  # Red
+
     return f"""
     <div style="background: #1e1e1e; padding: 20px; border-radius: 10px; border: 1px solid #333; color: #ffffff;">
-        <h3 style="color: #F7931A; margin-top: 0;">{specs['full_name']}</h3>
+        <h3 style="color: #F7931A; margin-top: 0;">{full_name}</h3>
         <div style="display: grid; grid-template-columns: 1fr 1fr; gap: 15px;">
             <div>
-                <p style="color: #ffffff;"><strong style="color: #ffffff;">Hashrate:</strong> {specs['hashrate']} TH/s</p>
-                <p style="color: #ffffff;"><strong style="color: #ffffff;">Power:</strong> {specs['power']} W</p>
-                <p style="color: #ffffff;"><strong style="color: #ffffff;">Efficiency:</strong> {specs['efficiency']} W/TH</p>
+                <p><strong>Hashrate:</strong> {machine_hashrate:.2f} TH/s</p>
+                <p><strong>Power:</strong> {machine_power:.1f} W</p>
+                <p><strong>Efficiency:</strong> {machine_efficiency:.2f} W/TH</p>
             </div>
             <div>
-                <p style="color: #ffffff;"><strong style="color: #ffffff;">Price ({prediction_date.date()}):</strong> ${price:,.2f} 
-                   <span style="background: {badge_color}; color: white; padding: 2px 8px; border-radius: 4px; font-size: 0.8em;">{source}</span>
+                <p>
+                    <strong>Price ({prediction_date.date()}):</strong> ${price:,.2f}
+                    <span style="background: {badge_color}; color: white; padding: 2px 8px; border-radius: 4px; font-size: 0.8em;">
+                        {source}
+                    </span>
                 </p>
-                <p style="color: #ffffff;"><strong style="color: #ffffff;">Region:</strong> {region.title()}</p>
-                <p style="color: #ffffff;"><strong style="color: #ffffff;">Electricity:</strong> ${elec_rate:.4f}/kWh</p>
+                <p><strong>Region:</strong> {region.title()}</p>
+                <p><strong>Electricity rate:</strong> {elec_rate:.4f} USD/kWh</p>
+                <p><strong>Estimated daily elec cost:</strong> ${daily_cost:,.2f}</p>
             </div>
         </div>
-        <div style="margin-top: 15px; padding-top: 15px; border-top: 1px solid #333;">
-            <p style="color: #ffffff;"><strong style="color: #ffffff;">Daily Electricity Cost:</strong> ${daily_cost:.2f}</p>
-        </div>
     </div>
     """
 
 
+
 def create_prediction_html(result, date, window):
     label = result['predicted_label']
     conf = result['confidence']
@@ -261,6 +294,31 @@ def create_interface():
                     placeholder="2024-12-08",
                     elem_classes="date-input"
                 )
+                machine_price = gr.Number(
+                    label="Machine price (USD)",
+                    value=2500.0,  # you can choose a nicer default
+                    precision=2,
+                )
+                machine_hashrate = gr.Number(
+                    label="Machine hashrate (TH/s)",
+                    value=100.0,
+                    precision=2,
+                )
+                machine_power = gr.Number(
+                    label="Power (W)",
+                    value=3000.0,
+                    precision=1,
+                )
+                machine_efficiency = gr.Number(
+                    label="Efficiency (W/TH)",
+                    value=30.0,
+                    precision=2,
+                )
+                electricity_rate = gr.Number(
+                    label="Electricity rate (USD/kWh)",
+                    value=ELECTRICITY_RATES["texas"],  # 0.1549 by default
+                    precision=4,
+                )
                 
                 btn = gr.Button("🔮 Predict ROI", variant="primary", size="lg")
                 
@@ -291,7 +349,20 @@ def create_interface():
                     conf_plot = gr.Plot()
                     price_plot = gr.Plot()
         
-        btn.click(fn=predict_roi, inputs=[miner, region, prediction_date], outputs=[miner_info, prediction, conf_plot, price_plot])
+        btn.click(
+            fn=predict_roi,
+            inputs=[
+                miner,
+                region,
+                prediction_date,
+                machine_price,
+                machine_hashrate,
+                machine_power,
+                machine_efficiency,
+                electricity_rate,
+            ],
+            outputs=[miner_info, prediction, conf_plot, price_plot],
+        )
     
     return app