Update app.py

app.py

@@ -9,11 +9,9 @@ from twilio.twiml.messaging_response import MessagingResponse
 import threading
 import os
 
-
 app = Flask(__name__)
 
 # --- Global variable to store the latest irrigation parameters ---
-# This acts as a temporary session to hold data between the prediction and the WhatsApp confirmation.
 last_irrigation_params = {}
 
 # --- Load the pre-trained SVM model ---
@@ -24,22 +22,20 @@ except FileNotFoundError:
     svm_poly_model = None
 
 # --- Data Mappings for the Model ---
-# These mappings convert categorical form inputs into numerical values for the SVM model.
 crop_type_mapping = {
-    'BANANA': 0, 'BEAN': 1, 'CABBAGE': 2, 'CITRUS': 3, 'COTTON': 4, 'MAIZE': 5, 
-    'MELON': 6, 'MUSTARD': 7, 'ONION': 8, 'OTHER': 9, 'POTATO': 10, 'RICE': 11, 
+    'BANANA': 0, 'BEAN': 1, 'CABBAGE': 2, 'CITRUS': 3, 'COTTON': 4, 'MAIZE': 5,
+    'MELON': 6, 'MUSTARD': 7, 'ONION': 8, 'OTHER': 9, 'POTATO': 10, 'RICE': 11,
     'SOYABEAN': 12, 'SUGARCANE': 13, 'TOMATO': 14, 'WHEAT': 15
 }
 soil_type_mapping = {'DRY': 0, 'HUMID': 1, 'WET': 2}
 weather_condition_mapping = {'NORMAL': 0, 'RAINY': 1, 'SUNNY': 2, 'WINDY': 3}
 
 # --- API Keys and Credentials ---
-# It's highly recommended to use environment variables for security.
 WEATHER_API_KEY = os.getenv('WEATHER_API', 'ee75ffd59875aa5ca6c207e594336b30')
 TWILIO_ACCOUNT_SID = os.getenv('TWILIO_ACCOUNT_SID', 'AC490e071f8d01bf0df2f03d086c788d87')
 TWILIO_AUTH_TOKEN = os.getenv('TWILIO_AUTH_TOKEN', '224b23b950ad5a4052aba15893fdf083')
 TWILIO_PHONE_NUMBER = 'whatsapp:+14155238886'
-USER_PHONE_NUMBER = 'whatsapp:+917559355282' # The farmer's WhatsApp number
+USER_PHONE_NUMBER = 'whatsapp:+917559355282'  # The farmer's WhatsApp number
 
 # Initialize Twilio Client
 twilio_client = Client(TWILIO_ACCOUNT_SID, TWILIO_AUTH_TOKEN)
@@ -49,10 +45,10 @@ def get_weather(city: str):
     url = f"https://api.openweathermap.org/data/2.5/weather?q={city}&appid={WEATHER_API_KEY}&units=metric"
     try:
         response = requests.get(url)
-        response.raise_for_status()  # Raises an HTTPError for bad responses (4xx or 5xx)
+        response.raise_for_status()
         data = response.json()
-        
-        if data['cod'] == 200:
+
+        if data.get('cod') == 200:
             weather_description = data['weather'][0]['description']
             temperature = data['main']['temp']
             humidity = data['main']['humidity']
@@ -62,7 +58,7 @@ def get_weather(city: str):
         print(f"Error fetching weather data: {e}")
     except (KeyError, json.JSONDecodeError):
         print("Error parsing weather data.")
-        
+
     return None, None, None, None
 
 def send_whatsapp_message(to_number, body_text):
@@ -105,12 +101,10 @@ def trigger_irrigation_complete():
 
 @app.route('/')
 def index():
-    """Renders the main input page."""
     return render_template('index.html')
 
 @app.route('/fetch_weather', methods=['GET'])
 def fetch_weather():
-    """API endpoint to fetch weather data for the front-end."""
     city = request.args.get('city')
     if city:
         temperature, humidity, description, pressure = get_weather(city)
@@ -125,21 +119,18 @@ def fetch_weather():
 
 @app.route('/predict', methods=['POST'])
 def predict():
-    """Handles form submission, runs prediction, and shows results."""
     if svm_poly_model is None:
         return "Model not loaded, cannot perform prediction.", 500
-        
+
     global last_irrigation_params
 
-    # --- 1. Get Form Data ---
     crop_type = request.form['crop_type']
     soil_type = request.form['soil_type']
     city = request.form['city']
     motor_capacity = float(request.form['motor_capacity'])
 
-    # --- 2. Get Weather Data ---
     temperature, humidity, description, pressure = get_weather(city)
-    if temperature is None: # Fallback if API fails
+    if temperature is None:
         temperature, humidity, description, pressure = 32.0, 60, "Not Available", 1012
         weather_condition = 'NORMAL'
     else:
@@ -149,7 +140,6 @@ def predict():
                              'WINDY' if 'wind' in desc_lower else
                              'NORMAL')
 
-    # --- 3. Prepare Data for Model ---
     user_data = pd.DataFrame({
         'CROP TYPE': [crop_type_mapping.get(crop_type)],
         'SOIL TYPE': [soil_type_mapping.get(soil_type)],
@@ -157,10 +147,8 @@ def predict():
         'WEATHER CONDITION': [weather_condition_mapping.get(weather_condition)]
     })
 
-    # --- 4. Predict Water Requirement ---
     water_requirement = svm_poly_model.predict(user_data)[0]
 
-    # --- 5. Calculate Motor On-Time ---
     estimated_time_seconds = (water_requirement / motor_capacity) if motor_capacity > 0 else 0
     if estimated_time_seconds < 120:
         time_unit = "seconds"
@@ -169,7 +157,6 @@ def predict():
         time_unit = "minutes"
         display_time = estimated_time_seconds / 60
 
-    # --- 6. Store Parameters and Send WhatsApp ---
     last_irrigation_params = {
         "estimated_time_seconds": estimated_time_seconds,
         "estimated_time_duration": display_time,
@@ -190,7 +177,6 @@ def predict():
     )
     send_whatsapp_message(USER_PHONE_NUMBER, message_to_farmer)
 
-    # --- 7. Create Gauge Charts for UI ---
     water_gauge = go.Figure(go.Indicator(
         mode="gauge+number", value=water_requirement, title={"text": "Water Req (m³/sq.m)"},
         gauge={"axis": {"range": [None, 100]}, "bar": {"color": "royalblue"}}
@@ -200,7 +186,6 @@ def predict():
         gauge={"axis": {"range": [None, 60 if time_unit == 'seconds' else 120]}, "bar": {"color": "green"}}
     ))
 
-    # --- 8. Render Results Page ---
     return render_template('predict.html',
                            water_requirement=round(water_requirement, 2),
                            estimated_time_duration=round(display_time, 2),
@@ -211,7 +196,6 @@ def predict():
 
 @app.route('/twilio_reply', methods=['POST'])
 def twilio_reply():
-    """Handles incoming WhatsApp replies to start or cancel the motor."""
     global last_irrigation_params
     message_body = request.values.get('Body', '').strip()
     resp = MessagingResponse()
@@ -219,33 +203,51 @@ def twilio_reply():
     if message_body == "1":
         if last_irrigation_params and 'estimated_time_seconds' in last_irrigation_params:
             duration_sec = last_irrigation_params['estimated_time_seconds']
-            
+
             # Start a background timer thread
             timer = threading.Timer(duration_sec, trigger_irrigation_complete)
             timer.daemon = True
             timer.start()
-            
+
             resp.message(f"✅ Motor started! Irrigation will run for {last_irrigation_params['estimated_time_duration']:.2f} {last_irrigation_params['time_unit']} and will stop automatically.")
         else:
             resp.message("❌ Error: No pending irrigation task found. Please submit a new prediction first.")
     elif message_body == "0":
         resp.message("👍 Motor start has been canceled.")
-        last_irrigation_params = {} # Clear params
+        last_irrigation_params = {}  # Clear params
     else:
         resp.message("Invalid reply. Please reply '1' to start the motor or '0' to cancel.")
 
     return str(resp)
 
-# Dummy endpoints called from front-end JS, actual logic is handled via WhatsApp reply
+# --- UPDATED: start_motor now performs the same server-side start as twilio '1' ---
 @app.route('/start_motor', methods=['POST'])
 def start_motor():
-    return jsonify({"status": "motor_start_request_logged"})
+    """Called from front-end. Starts server-side timer (same effect as twilio '1')."""
+    global last_irrigation_params
+    if last_irrigation_params and 'estimated_time_seconds' in last_irrigation_params:
+        duration_sec = last_irrigation_params['estimated_time_seconds']
+
+        # Start server-side timer which will call trigger_irrigation_complete()
+        timer = threading.Timer(duration_sec, trigger_irrigation_complete)
+        timer.daemon = True
+        timer.start()
+
+        # Send confirmation to farmer via WhatsApp (optional but helpful)
+        send_whatsapp_message(USER_PHONE_NUMBER,
+                              f"✅ Motor started (via UI). It will run for {last_irrigation_params['estimated_time_duration']:.2f} {last_irrigation_params['time_unit']} and stop automatically.")
+
+        return jsonify({
+            "status": "motor_started",
+            "estimated_time_duration": last_irrigation_params['estimated_time_duration'],
+            "time_unit": last_irrigation_params['time_unit']
+        })
+    else:
+        return jsonify({"status": "no_pending_task"}), 400
 
 @app.route('/irrigation_complete', methods=['POST'])
 def irrigation_complete():
     return jsonify({"status": "irrigation_complete_request_logged"})
 
-
 if __name__ == "__main__":
-    # For development, use debug=True. For production, use a proper WSGI server like Gunicorn.
-    app.run(host="0.0.0.0", port=7860, debug=True)
+    app.run(host="0.0.0.0", port=7860, debug=True)