Bugfix: Fix soil advice multi-turn conversation logic to prevent session hijacking

executable_code/app.py

@@ -147,8 +147,11 @@ def chatbot_route():
         return handle_soil_conditions(user_message)
 
     # Check for active session context
-    if session.get('intent') == 'recommend_crop':
+    intent = session.get('intent')
+    if intent == 'recommend_crop':
         return recommend_crop(user_message)
+    elif intent == 'soil_advice':
+        return handle_soil_conditions(user_message)
 
     # Determine Intent via ML if no clear keyword found
     intent_label = classify_intent(user_message)
@@ -340,6 +343,7 @@ def recommend_crop(user_message):
 
 def handle_soil_conditions(user_message):
     try:
+        session['intent'] = 'soil_advice'
         crop_list = ["bajra", "barley", "turmeric", "tur", "sugarcane", "soybeans",
                     "ragi", "potato", "onion", "maize", "ladyfinger", "jute",
                     "jowar", "green gram", "cotton", "coffee", "chickpea",
@@ -347,24 +351,29 @@ def handle_soil_conditions(user_message):
 
         user_message_lower = user_message.lower()
         
-        # Try to find crop first
-        crop_found = None
+        # 1. Attempt to find a crop in the current message or retrieve from session
+        crop_found = session.get('soil_crop')
         for c in crop_list:
             if c in user_message_lower:
                 crop_found = c
+                session['soil_crop'] = c
                 break
 
         if not crop_found:
             return jsonify({'reply': "🌿 Which crop would you like soil advice for? (e.g., 'soil for rice')", 'status': 'need_crop'})
 
-        # Try to find location (look for 'in [location]')
+        # 2. Attempt to find location
         location = None
+        # Check if the user used the 'in [location]' format
         if ' in ' in user_message_lower:
             parts = user_message_lower.split(' in ')
             location = parts[1].strip()
+        # If no 'in', and we ALREADY had the crop, treat the whole message as the location
+        elif session.get('soil_crop') and user_message_lower not in ['soil', 'soil analysis', session.get('soil_crop')]:
+            location = user_message.strip()
         
         if not location:
-            return jsonify({'reply': f"📍 I've got {crop_found.title()}. Now, which <b>location</b> (district) are you planting in?", 'status': 'need_location'})
+            return jsonify({'reply': f"📍 I've got <b>{crop_found.title()}</b>. Now, which <b>location</b> (district) are you planting in?", 'status': 'need_location'})
 
         temperature, humidity, rainfall = fetch_weather_data(location)
         
@@ -391,6 +400,10 @@ def handle_soil_conditions(user_message):
             f"<br>📊 <b>Soil Balance Chart:</b>"
         )
 
+        # Clear intent after success
+        session.pop('intent', None)
+        session.pop('soil_crop', None)
+
         return jsonify({
             'reply': reply_message, 
             'status': 'success',
@@ -398,7 +411,7 @@ def handle_soil_conditions(user_message):
                 'labels': ["Nitrogen", "Phosphorus", "Potassium", "pH Value"],
                 'values': vals
             },
-            'chart_type': 'soil_requirement'
+            'chart_type': 'input_analysis'
         })
 
     except Exception as e: