Update app.py

app.py

@@ -11,11 +11,19 @@ api_key = os.getenv('GEMINI_API_KEY')
 # Replace with your actual Gemini API key
 client = genai.Client(api_key=api_key)
 
+def validate_coordinates(lat, lon):
+    """Validate and convert latitude and longitude to float."""
+    try:
+        return float(lat), float(lon)
+    except (TypeError, ValueError):
+        return None, None
+
 
 @app.route('/')
 def index():
     return render_template('index.html')
 
+
 @app.route('/get_weather_data', methods=['GET'])
 def get_weather_data():
     """
@@ -40,8 +48,7 @@ def get_weather_data():
             "hourly": "relative_humidity_2m,soil_moisture_3_to_9cm,cloudcover,windspeed_10m",
             "timezone": "auto"
         }
-        # Added timeout to prevent hanging indefinitely
-        resp = requests.get(forecast_url, params=forecast_params, timeout=10)
+        resp = requests.get(forecast_url, params=forecast_params)
         resp.raise_for_status()
         data = resp.json()
 
@@ -83,32 +90,9 @@ def get_weather_data():
         return jsonify({"error": str(e)}), 500
 
 
-def validate_coordinates(lat, lon):
-    """Convert and validate latitude and longitude values."""
-    try:
-        return float(lat), float(lon)
-    except (TypeError, ValueError):
-        return None, None
-
-# Mapping of soil property short codes to user-friendly names
-PARAMETER_NAMES = {
-    "bdod": "Bulk Density",
-    "cec": "CEC",
-    "cfvo": "Field Capacity",
-    "clay": "Clay Content",
-    "nitrogen": "Nitrogen",
-    "ocd": "Organic Carbon Density",
-    "phh2o": "Soil pH",
-    "sand": "Sand Content",
-    "silt": "Silt Content",
-    "soc": "Soil Organic Carbon",
-    "wv0010": "Volumetric Water Content (0-10cm)",
-    "wv0033": "Volumetric Water Content (10-33cm)",
-    "wv1500": "Volumetric Water Content (1500kPa)"
-}
-
 @app.route('/get_soil_properties', methods=['GET'])
 def get_soil_properties():
+    """Fetch soil properties using SoilGrids API and map to user-friendly names."""
     lat = request.args.get('lat')
     lon = request.args.get('lon')
     lat, lon = validate_coordinates(lat, lon)
@@ -116,39 +100,45 @@ def get_soil_properties():
         return jsonify({"error": "Invalid coordinates"}), 400
 
     try:
-        # Use the correct host; note that rest.isric.org is now used instead of rest.soilgrids.org
         prop_url = "https://rest.isric.org/soilgrids/v2.0/properties/query"
-        # Provide the soil property codes as a comma-separated string
-        properties = "bdod,cec,cfvo,clay,nitrogen,ocd,phh2o,sand,silt,soc,wv0010,wv0033,wv1500"
         prop_params = {
-            "lat": lat,
-            "lon": lon,
-            "property": properties,
+            "lon": str(lon),
+            "lat": str(lat),
+            "property": [
+                "bdod", "cec", "cfvo", "clay", "nitrogen",
+                "ocd", "phh2o", "sand", "silt",
+                "soc", "wv0010", "wv0033", "wv1500"
+            ],
             "depth": "5-15cm",
             "value": "mean"
         }
         headers = {"accept": "application/json"}
-        response = requests.get(prop_url, params=prop_params, headers=headers, timeout=10)
+        response = requests.get(prop_url, params=prop_params, headers=headers)
         response.raise_for_status()
         prop_data = response.json()
 
-        # Uncomment the following line to print the entire API response for debugging:
-        # print(json.dumps(prop_data, indent=2))
-
         table_data = []
-        # Loop through each layer in the response
+        PARAMETER_NAMES = {
+            "bdod": "Bulk Density",
+            "cec": "CEC",
+            "cfvo": "Field Capacity",
+            "clay": "Clay",
+            "nitrogen": "Nitrogen",
+            "ocd": "Organic Carbon Density",
+            "phh2o": "pH",
+            "sand": "Sand",
+            "silt": "Silt",
+            "soc": "Soil Organic Carbon",
+            "wv0010": "Volumetric Water Content (0-10cm)",
+            "wv0033": "Volumetric Water Content (10-33cm)",
+            "wv1500": "Volumetric Water Content (1500)"
+        }
         for layer in prop_data.get('properties', {}).get('layers', []):
             parameter = layer.get('name')
             display_name = PARAMETER_NAMES.get(parameter, parameter)
-            depths = layer.get('depths', [])
-            if not depths:
-                continue
-            # Extract the mean value from the first depth entry
-            value_dict = depths[0].get('values', {})
-            value = value_dict.get('mean')
+            value = layer.get('depths', [{}])[0].get('values', {}).get('mean')
             if value is None:
                 continue
-            # Convert values for specific parameters
             if parameter in ["wv0010", "wv0033", "wv1500"]:
                 final_value = value / 10.0
                 unit = layer.get('unit_measure', {}).get("target_units", "")
@@ -159,11 +149,11 @@ def get_soil_properties():
                 final_value = value
                 unit = layer.get('unit_measure', {}).get("mapped_units", "")
             table_data.append([display_name, final_value, unit])
+
         return jsonify({"soil_properties": table_data})
     except Exception as e:
         return jsonify({"error": str(e)}), 500
 
-    
 def call_gemini_api(input_data):
     language = input_data.get('language', 'English')
     prompt = f"""
@@ -208,8 +198,6 @@ Create a visually appealing, farmer-friendly pest outbreak report in Markdown wi
 13. Do not include long paragraphs; keep the language simple and the report well-formatted.
 14. Highlight important points (such as key damages, recommendations, pest names, key seasons) with yellow highlighters (only highlight key points, not the text).
 Please provide the complete report in {language} language only.
-also note that i want poepr format heaidng green stlying tables, and proper hihglighting all prpepr ,proper rendering of tbales in first attmept itself and tkaer care of it in evry sttrmept not dynamic everytime,should be uniform everytime
-okay and dont print any other useless contiant like imrovments done, disclaimer,stlying imroved eetc..
 """
     response = client.models.generate_content(
         model="gemini-2.0-flash",
@@ -217,6 +205,7 @@ okay and dont print any other useless contiant like imrovments done, disclaimer,
     )
     return response.text
 
+
 @app.route('/predict', methods=['POST'])
 def predict():
     form_data = request.form.to_dict()
@@ -347,4 +336,4 @@ def predict():
 
 
 if __name__ == '__main__':
-    app.run(debug=True)
+    app.run(debug=True)