Update app.py

app.py

@@ -5,7 +5,7 @@ import requests
 import json
 import matplotlib
 
-matplotlib.use('Agg')  # headless backend for servers
+matplotlib.use('Agg')
 import matplotlib.pyplot as plt
 import io
 import base64
@@ -14,23 +14,13 @@ from twilio.twiml.messaging_response import MessagingResponse
 import threading
 import os
 import time
-import secrets  # For generating a secure secret key
+import secrets
 
 app = Flask(__name__)
 
-# --- Configuration for Flask Session ---
-# Use an environment variable for the secret key in production.
-# For development, a random key can be generated, but it will change on each restart,
-# invalidating existing sessions.
 app.secret_key = os.getenv('FLASK_SECRET_KEY', secrets.token_hex(24))
-# Note: For multi-process deployments (like Gunicorn with multiple workers),
-# client-side sessions (default Flask sessions) can still work as long as
-# the SECRET_KEY is consistent across all workers. For server-side sessions
-# (e.g., using Flask-Session with Redis), additional setup is required.
 
-
-# --- Load the pre-trained SVM model ---
-svm_poly_model = None  # Initialize to None
+svm_poly_model = None
 try:
     svm_poly_model = joblib.load('svm_poly_model.pkl')
     print("SVM model loaded successfully.")
@@ -39,7 +29,6 @@ except FileNotFoundError:
 except Exception as e:
     print(f"Error loading SVM model: {e}")
 
-# --- Data Mappings for the 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,
@@ -48,23 +37,20 @@ crop_type_mapping = {
 soil_type_mapping = {'DRY': 0, 'HUMID': 1, 'WET': 2}
 weather_condition_mapping = {'NORMAL': 0, 'RAINY': 1, 'SUNNY': 2, 'WINDY': 3}
 
-# --- API Keys and Credentials ---
 WEATHER_API_KEY = os.getenv('WEATHER_API', 'ee75ffd59875aa5ca6c207e594336b30')
 TWILIO_ACCOUNT_SID = os.getenv('TWILIO_ACCOUNT_SID', 'ACe45f7038c5338a153d1126ca6d547c84')
 TWILIO_AUTH_TOKEN = os.getenv('TWILIO_AUTH_TOKEN', '48b9eea898885ef395d48edc74924340')
 TWILIO_PHONE_NUMBER = 'whatsapp:+14155238886'
-USER_PHONE_NUMBER = os.getenv('FARMER_PHONE_NUMBER', 'whatsapp:+919763059811')  # The farmer's WhatsApp number
+USER_PHONE_NUMBER = os.getenv('FARMER_PHONE_NUMBER', 'whatsapp:+919763059811')
 
-# Initialize Twilio Client
 twilio_client = Client(TWILIO_ACCOUNT_SID, TWILIO_AUTH_TOKEN)
 
 
 def get_weather(city: str):
-    """Fetches weather data from OpenWeatherMap API."""
     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()  # Raise an exception for HTTP errors
+        response.raise_for_status()
         data = response.json()
         if data.get('cod') == 200:
             return (data['main']['temp'], data['main']['humidity'],
@@ -79,7 +65,6 @@ def get_weather(city: str):
 
 
 def send_whatsapp_message(to_number, body_text):
-    """General function to send WhatsApp messages via Twilio."""
     try:
         message = twilio_client.messages.create(
             from_=TWILIO_PHONE_NUMBER,
@@ -93,9 +78,7 @@ def send_whatsapp_message(to_number, body_text):
         return None
 
 
-# Modified to accept parameters directly
 def trigger_irrigation_complete(crop_type, city, estimated_time_duration, time_unit, user_phone):
-    """Function called by the timer when irrigation is finished."""
     message_text = (
         f"✅ Irrigation Complete!\n\n"
         f"Crop: {crop_type}\n"
@@ -105,105 +88,73 @@ def trigger_irrigation_complete(crop_type, city, estimated_time_duration, time_u
     )
     send_whatsapp_message(user_phone, message_text)
     print(f"Irrigation complete message sent to {user_phone} after {estimated_time_duration:.2f} {time_unit}.")
-    # No need to clear session data here, as this function runs in a separate thread.
-    # Session data will be cleared on the next user interaction or upon explicit clearing.
 
 
-# --- Matplotlib PNG gauges helper ---
 import math
 from matplotlib.patches import Wedge, Circle
 
 
 def fig_to_datauri(fig, fmt='png', dpi=150):
-    """Converts a matplotlib figure to a base64 data URI."""
     buf = io.BytesIO()
-    fig.savefig(buf, format=fmt, bbox_inches='tight', dpi=dpi)  #
+    fig.savefig(buf, format=fmt, bbox_inches='tight', dpi=dpi)
     buf.seek(0)
     data = base64.b64encode(buf.read()).decode('ascii')
-    plt.close(fig)  # Essential to prevent memory leaks in a web app
+    plt.close(fig)
     return f"data:image/{fmt};base64,{data}"
 
 
 def draw_gauge(value, max_value, title="", unit=""):
-    """Draws a semi-circular gauge using matplotlib."""
-    # Clamp the value between 0 and max_value
     val = max(0.0, min(value, max_value))
-    # Calculate the ratio (0.0 to 1.0)
     ratio = val / float(max_value) if max_value > 0 else 0.0
-    # Angles for semicircle: left (180) -> right (0)
     start_angle, end_angle = 180, 0
-    # Calculate the angle where the filled part stops
     angle = start_angle + (end_angle - start_angle) * ratio
 
     fig, ax = plt.subplots(figsize=(5, 3))
     ax.set_aspect('equal')
     ax.axis('off')
 
-    # --- COLOR CHANGES HERE ---
-    
-    # Background arc (full gauge)
-    # Changed from '#ececec' (light gray) to '#4CAF50' (Green)
     bg_wedge = Wedge((0, 0), 1.0, 180, 0, facecolor='#4CAF50', edgecolor='none', width=0.3)
-
-
-
-
-
-
     ax.add_patch(bg_wedge)
 
-    # Foreground arc (value representation)
-    # Changed from '#4169e1' (Royal Blue) to '#FFFFFF' (White)
     fg_wedge = Wedge((0, 0), 1.0, 180, angle, facecolor='#FFFFFF', edgecolor='none', width=0.3)
     ax.add_patch(fg_wedge)
-    
-    # --------------------------
 
-    # Draw ticks and labels
     num_ticks = 6
     for i in range(num_ticks + 1):
         t_ratio = i / float(num_ticks)
+        t_angle = math.radians(180 - (180 * t_ratio))
         inner_r, outer_r = 0.7, 0.9
         xi_inner, yi_inner = inner_r * math.cos(t_angle), inner_r * math.sin(t_angle)
         xi_outer, yi_outer = outer_r * math.cos(t_angle), outer_r * math.sin(t_angle)
-        # Ticks might need to be slightly darker or lighter depending on the green you chose
         ax.plot([xi_inner, xi_outer], [yi_inner, yi_outer], color='#333', lw=1)
 
-        # Label positioning
         lbl_r = 0.55
         xl, yl = lbl_r * math.cos(t_angle), lbl_r * math.sin(t_angle)
         lbl_val = int(round(max_value * t_ratio))
         ax.text(xl, yl, str(lbl_val), horizontalalignment='center', verticalalignment='center', fontsize=8, color='#333')
 
-    # Needle
     needle_length = 0.85
     needle_angle = math.radians(angle)
     xn, yn = needle_length * math.cos(needle_angle), needle_length * math.sin(needle_angle)
     ax.plot([0, xn], [0, yn], color='red', lw=2)
-    # Center circle
     center = Circle((0, 0), 0.05, color='black')
     ax.add_patch(center)
 
-    # Title and value text
     ax.text(0, -0.15, f"{title}", horizontalalignment='center', verticalalignment='center', fontsize=10, weight='bold')
-    # Kept the value text dark green, which should still look good
     ax.text(0, -0.32, f"{val:.2f} {unit}", horizontalalignment='center', verticalalignment='center', fontsize=10, color='#216e39')
 
-    # Adjust limits to fit the semi-circle and text
     ax.set_xlim(-1.05, 1.05)
     ax.set_ylim(-0.35, 1.05)
 
     return fig
 
-# --- Flask Routes ---
-
 @app.route('/')
 def index():
     return render_template('index.html')
 
 
 @app.route('/fetch_weather', methods=['GET'])
-def fetch_weather_route():  # Renamed to avoid clash with utility function
+def fetch_weather_route():
     city = request.args.get('city')
     if city:
         temperature, humidity, description, pressure = get_weather(city)
@@ -224,7 +175,6 @@ def predict():
     if svm_poly_model is None:
         return "Model not loaded, cannot perform prediction.", 500
 
-    # Clear previous session data for a new prediction
     session.pop('irrigation_params', None)
 
     crop_type = request.form['crop_type']
@@ -250,7 +200,6 @@ def predict():
                              'WINDY' if 'wind' in desc_lower else
                              'NORMAL')
 
-    # Basic input validation for mappings
     if crop_type not in crop_type_mapping or soil_type not in soil_type_mapping:
         return "Invalid Crop Type or Soil Type.", 400
 
@@ -269,7 +218,6 @@ def predict():
     else:
         time_unit, display_time = "minutes", estimated_time_seconds / 60
 
-    # Store all necessary data in the user session
     session['irrigation_params'] = {
         "estimated_time_seconds": estimated_time_seconds,
         "estimated_time_duration": display_time,
@@ -292,7 +240,6 @@ def predict():
     )
     send_whatsapp_message(USER_PHONE_NUMBER, message_to_farmer)
 
-    # --- Matplotlib PNG gauges (embedded as data URIs) ---
     water_img = None
     time_img = None
     try:
@@ -323,20 +270,16 @@ def twilio_reply():
     message_body = request.values.get('Body', '').strip()
     resp = MessagingResponse()
 
-    # Retrieve irrigation parameters from session
     irrigation_params = session.get('irrigation_params')
 
     if message_body == "1":
         if irrigation_params and 'estimated_time_seconds' in irrigation_params:
             duration_sec = irrigation_params['estimated_time_seconds']
 
-            # Update session state for monitoring
             irrigation_params['monitoring_active'] = True
             irrigation_params['timer_start_time'] = time.time()
-            session['irrigation_params'] = irrigation_params  # Save updated session
+            session['irrigation_params'] = irrigation_params
 
-            # Start the background timer to run the completion function
-            # Pass all necessary details to the timer callback
             timer = threading.Timer(duration_sec, trigger_irrigation_complete, args=[
                 irrigation_params['crop_type'],
                 irrigation_params['city'],
@@ -344,7 +287,7 @@ def twilio_reply():
                 irrigation_params['time_unit'],
                 USER_PHONE_NUMBER
             ])
-            timer.daemon = True  # Allow main program to exit even if timer is running
+            timer.daemon = True
             timer.start()
 
             resp.message(
@@ -353,18 +296,15 @@ def twilio_reply():
             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.")
-        session.pop('irrigation_params', None)  # Clear params from session
+        session.pop('irrigation_params', None)
     else:
         resp.message("Invalid reply. Please reply '1' to start or '0' to cancel.")
 
     return str(resp)
 
 
-# --- NEW ENDPOINT FOR UI POLLING ---
 @app.route('/monitoring_status')
 def monitoring_status():
-    """Provides the current monitoring status to the front-end."""
-    # Retrieve irrigation parameters from session
     irrigation_params = session.get('irrigation_params')
 
     if not irrigation_params:
@@ -378,21 +318,17 @@ def monitoring_status():
         total_duration = irrigation_params.get("estimated_time_seconds", 0)
         elapsed_time = time.time() - start_time
         time_remaining = max(0, total_duration - elapsed_time)
-        # If time_remaining is 0 or less, consider irrigation complete for monitoring UI
         if time_remaining <= 0:
             is_active = False
-            session.pop('irrigation_params', None)  # Automatically clear session if timer finished
+            session.pop('irrigation_params', None)
             print("Monitoring status detected irrigation completion and cleared session.")
 
     return jsonify({
         "monitoring": is_active,
         "time_remaining": time_remaining,
-        "total_duration": irrigation_params.get("estimated_time_seconds", 0)  # Added total duration for progress bar
+        "total_duration": irrigation_params.get("estimated_time_seconds", 0)
     })
 
 
 if __name__ == "__main__":
-    # In a production environment, set FLASK_SECRET_KEY as an environment variable
-    # e.g., export FLASK_SECRET_KEY='your_very_secret_and_long_random_key_here'
-    # app.run(host="0.0.0.0", port=7860, debug=False) # debug=False for production
     app.run(host="0.0.0.0", port=7860, debug=True)