Update app.py

app.py

@@ -629,6 +629,233 @@ def leaf_detection():
         if 'con' in locals():
             con.close()
 
+# ============= LEAF ANALYSIS (ALTERNATIVE ENDPOINT) =============
+
+@app.route("/api/leaf-analysis", methods=["POST"])
+@token_required
+def leaf_analysis():
+    """Leaf analysis endpoint (alternative to leaf-detection) - returns yes/no"""
+    try:
+        data = request.json
+        
+        # Handle image input
+        image_data = None
+        if 'image_url' in data:
+            # Base64 image from frontend
+            image_url = data['image_url']
+            if ',' in image_url:
+                image_data = image_url.split(',')[1]
+            else:
+                image_data = image_url
+        elif 'image' in request.files:
+            image_file = request.files['image']
+            image = Image.open(image_file.stream)
+            buffered = io.BytesIO()
+            image.save(buffered, format="JPEG")
+            image_data = base64.b64encode(buffered.getvalue()).decode()
+        else:
+            return jsonify({"error": "No image provided"}), 400
+        
+        # Get additional data from request
+        plant_type = data.get('plant', 'unknown')
+        
+        # Generate random yes/no result
+        result = random.choice(["yes", "no"])
+        
+        response_data = {
+            "result": result,
+            "disease_detected": result == "yes",
+            "message": "Disease detected in leaf" if result == "yes" else "Leaf appears healthy",
+            "confidence": random.randint(80, 98),
+            "plant": plant_type,
+            "disease_name": random.choice(["Leaf Spot", "Early Blight", "Late Blight", "Rust", "Powdery Mildew"]) if result == "yes" else "None",
+            "severity": random.choice(["mild", "moderate", "severe"]) if result == "yes" else "none",
+            "treatments": [
+                "Apply fungicide spray",
+                "Remove affected leaves",
+                "Improve air circulation",
+                "Reduce watering frequency"
+            ] if result == "yes" else ["Continue regular care", "Monitor plant health"],
+            "prevention": [
+                "Regular plant inspection",
+                "Proper spacing between plants",
+                "Avoid overhead watering",
+                "Good garden hygiene"
+            ]
+        }
+        
+        # Save to database
+        try:
+            con = conn()
+            cur = con.cursor()
+            cur.execute("""
+                INSERT INTO leaf_analysis (user_id, image_data, plant_type, result, 
+                                         disease_detected, analysis_data, created_at)
+                VALUES (%s, %s, %s, %s, %s, %s, %s)
+            """, (request.user["user_id"], image_data, plant_type, result, 
+                  result == "yes", json.dumps(response_data), datetime.datetime.now()))
+            con.commit()
+        except Exception as db_error:
+            print(f"Database error in leaf analysis: {db_error}")
+            # Continue without saving to database
+        
+        return jsonify(response_data), 200
+        
+    except Exception as e:
+        print(f"Leaf analysis error: {e}")
+        return jsonify({"error": "Failed to analyze leaf image"}), 500
+    finally:
+        if 'cur' in locals():
+            cur.close()
+        if 'con' in locals():
+            con.close()
+
+@app.route("/api/leaf-analysis/history", methods=["GET"])
+@token_required
+def get_leaf_analysis_history():
+    """Get user's leaf analysis history"""
+    try:
+        con = conn()
+        cur = con.cursor(dictionary=True)
+        cur.execute("""
+            SELECT id, plant_type, result, disease_detected, analysis_data, created_at
+            FROM leaf_analysis 
+            WHERE user_id = %s 
+            ORDER BY created_at DESC 
+            LIMIT 20
+        """, (request.user["user_id"],))
+        
+        history = cur.fetchall()
+        
+        # Parse JSON analysis results
+        for item in history:
+            if item['analysis_data']:
+                item['analysis_data'] = json.loads(item['analysis_data'])
+        
+        return jsonify({"history": history}), 200
+        
+    except Exception as e:
+        print(f"Leaf analysis history error: {e}")
+        return jsonify({"history": []}), 200
+    finally:
+        if 'cur' in locals():
+            cur.close()
+        if 'con' in locals():
+            con.close()
+
+# ============= SOIL ANALYSIS (IMAGE + YES/NO) =============
+
+@app.route("/api/soil-analysis", methods=["POST"])
+@token_required
+def soil_analysis():
+    """Soil analysis with image input - returns yes/no for soil quality"""
+    try:
+        # Handle image input
+        image_data = None
+        if 'image' in request.files:
+            image_file = request.files['image']
+            image = Image.open(image_file.stream)
+            buffered = io.BytesIO()
+            image.save(buffered, format="JPEG")
+            image_data = base64.b64encode(buffered.getvalue()).decode()
+        elif request.json and 'image_base64' in request.json:
+            image_data = request.json['image_base64']
+            if ',' in image_data:
+                image_data = image_data.split(',')[1]
+        else:
+            return jsonify({"error": "No image provided"}), 400
+        
+        # Generate random yes/no result for soil quality
+        result = random.choice(["yes", "no"])
+        
+        response_data = {
+            "result": result,
+            "soil_quality": "good" if result == "yes" else "poor",
+            "message": "Soil appears healthy and fertile" if result == "yes" else "Soil needs improvement",
+            "confidence": random.randint(75, 95),
+            "soil_type": random.choice(["Loamy", "Clay", "Sandy", "Silty"]),
+            "ph_level": round(random.uniform(5.5, 8.0), 1),
+            "nutrients": {
+                "nitrogen": random.choice(["low", "medium", "high"]),
+                "phosphorus": random.choice(["low", "medium", "high"]),
+                "potassium": random.choice(["low", "medium", "high"])
+            },
+            "recommendations": [
+                "Add organic compost",
+                "Test pH levels regularly",
+                "Consider crop rotation"
+            ] if result == "yes" else [
+                "Add organic matter",
+                "Improve drainage",
+                "Test for nutrient deficiencies",
+                "Consider soil amendments"
+            ],
+            "suitable_crops": [
+                "Tomatoes", "Wheat", "Corn", "Beans"
+            ] if result == "yes" else [
+                "Cover crops", "Legumes for nitrogen fixing"
+            ]
+        }
+        
+        # Save to database
+        try:
+            con = conn()
+            cur = con.cursor()
+            cur.execute("""
+                INSERT INTO soil_analysis (user_id, image_data, result, soil_quality, 
+                                         analysis_data, created_at)
+                VALUES (%s, %s, %s, %s, %s, %s)
+            """, (request.user["user_id"], image_data, result, response_data["soil_quality"],
+                  json.dumps(response_data), datetime.datetime.now()))
+            con.commit()
+        except Exception as db_error:
+            print(f"Database error in soil analysis: {db_error}")
+            # Continue without saving to database
+        
+        return jsonify(response_data), 200
+        
+    except Exception as e:
+        print(f"Soil analysis error: {e}")
+        return jsonify({"error": "Failed to analyze soil image"}), 500
+    finally:
+        if 'cur' in locals():
+            cur.close()
+        if 'con' in locals():
+            con.close()
+
+@app.route("/api/soil-analysis/history", methods=["GET"])
+@token_required
+def get_soil_analysis_history():
+    """Get user's soil analysis history"""
+    try:
+        con = conn()
+        cur = con.cursor(dictionary=True)
+        cur.execute("""
+            SELECT id, result, soil_quality, analysis_data, created_at
+            FROM soil_analysis 
+            WHERE user_id = %s 
+            ORDER BY created_at DESC 
+            LIMIT 20
+        """, (request.user["user_id"],))
+        
+        history = cur.fetchall()
+        
+        # Parse JSON analysis results
+        for item in history:
+            if item['analysis_data']:
+                item['analysis_data'] = json.loads(item['analysis_data'])
+        
+        return jsonify({"history": history}), 200
+        
+    except Exception as e:
+        print(f"Soil history error: {e}")
+        return jsonify({"history": []}), 200
+    finally:
+        if 'cur' in locals():
+            cur.close()
+        if 'con' in locals():
+            con.close()
+
 # ============= DEFAULT ROUTE =============
 
 @app.route("/", methods=["GET"])