Update app.py

app.py

@@ -1,30 +1,9 @@
-import os
-import hashlib
-import time
-import threading
+from flask import Flask, render_template, request, jsonify, Response
 import requests
-from flask import Flask, render_template, request, jsonify, Response, send_file, url_for
 from bs4 import BeautifulSoup
-from flask_caching import Cache
 
 app = Flask(__name__)
 
-# Configure in-memory caching for non-image routes
-app.config['CACHE_TYPE'] = 'SimpleCache'
-app.config['CACHE_DEFAULT_TIMEOUT'] = 300  # Cache responses for 5 minutes
-cache = Cache(app)
-
-# Directory to store cached images
-CACHE_DIR = "cache_images"
-if not os.path.exists(CACHE_DIR):
-    os.makedirs(CACHE_DIR)
-
-def get_cache_filename(url):
-    """Generate a unique filename for a given URL."""
-    h = hashlib.md5(url.encode('utf-8')).hexdigest()
-    # Here we assume JPEG. You might want to derive extension from url or headers.
-    return os.path.join(CACHE_DIR, f"{h}.jpg")
-
 # Internal mapping of crops to pests (for the form)
 CROP_TO_PESTS = {
     "Sorgum": ["FallArmyWorm"],
@@ -50,19 +29,48 @@ CROP_MAPPING = {
     "Soybean": "2",
     "Sugarcane": "8",
     "Tur": "5",
-    "Sorgum": "6"
+    "Sorgum": "6"  # Adjust if needed
 }
 
 # Map our internal pest names to external page values per crop.
 PEST_MAPPING = {
-    "Cotton": {"FallArmyWorm": "71"},
-    "Gram": {"H.armigera": "72", "Wilt": "73"},
-    "Maize": {"FallArmyWorm": "74"},
-    "Rice": {"Blast": "75", "GallMidge": "76", "YSB": "77", "PlantHopper": "78", "BlueBeetle": "79", "BacterialLeafBlight": "80"},
-    "Soybean": {"Girdlebeetle": "81", "H.armigera": "82", "Semilooper": "83", "Spodoptera": "84", "StemFLy": "85"},
-    "Tur": {"Wilt": "86", "Webbed_Leaves": "87", "Pod_damage": "88"},
-    "Sugarcane": {"FallArmyGrub": "89", "WhiteGrub": "90"},
-    "Sorgum": {"FallArmyWorm": "91"}
+    "Cotton": {
+        "FallArmyWorm": "71"
+    },
+    "Gram": {
+        "H.armigera": "72",
+        "Wilt": "73"
+    },
+    "Maize": {
+        "FallArmyWorm": "74"
+    },
+    "Rice": {
+        "Blast": "75",
+        "GallMidge": "76",
+        "YSB": "77",
+        "PlantHopper": "78",
+        "BlueBeetle": "79",
+        "BacterialLeafBlight": "80"
+    },
+    "Soybean": {
+        "Girdlebeetle": "81",
+        "H.armigera": "82",
+        "Semilooper": "83",
+        "Spodoptera": "84",
+        "StemFLy": "85"
+    },
+    "Tur": {
+        "Wilt": "86",
+        "Webbed_Leaves": "87",
+        "Pod_damage": "88"
+    },
+    "Sugarcane": {
+        "FallArmyGrub": "89",
+        "WhiteGrub": "90"
+    },
+    "Sorgum": {
+        "FallArmyWorm": "91"
+    }
 }
 
 # Parameter codes and labels for the final image URL
@@ -83,13 +91,13 @@ def index():
     week = request.args.get('week', '')
     param = request.args.get('param', '')
 
-    image_url_param = ""
+    image_url = ""
     if crop and pest and year and week and param:
         # Build the external image URL (using HTTP)
         base_url = f"http://www.icar-crida.res.in:8080/naip/gisimages/{crop}/{year}/{pest}_"
         external_image_url = f"{base_url}{param}{week}.jpg"
-        # Instead of proxying on every request, pass the external URL to the template.
-        image_url_param = external_image_url
+        # Instead of using the external HTTP URL directly, we build our proxy URL
+        image_url = f"/proxy-image?url={external_image_url}"
 
     return render_template('index.html',
                            crops=list(CROP_TO_PESTS.keys()),
@@ -101,11 +109,9 @@ def index():
                            selected_year=year,
                            selected_week=week,
                            selected_param=param,
-                           image_url_param=image_url_param)
+                           image_url=image_url)
 
-# Cache this route based on its query string.
 @app.route('/fetch_weeks')
-@cache.cached(timeout=300, query_string=True)
 def fetch_weeks():
     crop = request.args.get('crop', '')
     pest = request.args.get('pest', '')
@@ -134,27 +140,19 @@ def fetch_weeks():
         weeks = [str(i) for i in range(1, 53)]
     return jsonify({"weeks": weeks})
 
-# New endpoint to serve a locally cached image file.
-@app.route('/cached-image')
-def cached_image_route():
+@app.route('/proxy-image')
+def proxy_image():
+    # Get the external URL from the query parameter
     external_url = request.args.get('url')
     if not external_url:
         return "Missing URL", 400
 
-    cache_filename = get_cache_filename(external_url)
-    if os.path.exists(cache_filename):
-        return send_file(cache_filename, mimetype="image/jpeg")
-    else:
-        try:
-            resp = requests.get(external_url, timeout=10)
-            if resp.status_code == 200:
-                with open(cache_filename, "wb") as f:
-                    f.write(resp.content)
-                return send_file(cache_filename, mimetype=resp.headers.get('Content-Type', 'image/jpeg'))
-            else:
-                return "Error downloading image", resp.status_code
-        except Exception as e:
-            return str(e), 500
+    try:
+        # Fetch the image from the external server
+        resp = requests.get(external_url, timeout=10)
+        return Response(resp.content, mimetype=resp.headers.get('Content-Type', 'image/jpeg'))
+    except Exception as e:
+        return str(e), 500
 
 if __name__ == '__main__':
-    app.run(debug=True)
+    app.run(debug=True)