Update app.py

app.py

@@ -9,43 +9,48 @@ from urllib.parse import quote
 
 app = Flask(__name__)
 
+# ==============================
+# Folder Setup
+# ==============================
 UPLOAD_FOLDER = "static/generated"
 os.makedirs(UPLOAD_FOLDER, exist_ok=True)
 
 # ==============================
-# 🔗 Google Sheet Config
+# Google Sheet Configuration
 # ==============================
 SHEET_ID = "1F90Q1scHpX4U_OIBDA_yZF3BozUGfJtl-1XucV4XBCM"
 GID = "0"
 
-# 🔥 More reliable export format
 GOOGLE_SHEET_CSV = f"https://docs.google.com/spreadsheets/d/{SHEET_ID}/gviz/tq?tqx=out:csv&gid={GID}"
 
 
 # ==============================
-# Fetch Google Sheet Data
+# Fetch Sheet Data (Safe Version)
 # ==============================
 def fetch_sheet():
     try:
         response = requests.get(GOOGLE_SHEET_CSV)
-        print("Status Code:", response.status_code)
 
         if response.status_code != 200:
-            print("Sheet not accessible")
+            print("❌ Google Sheet not accessible")
             return None
 
-        if "html" in response.text.lower():
-            print("Received HTML instead of CSV")
+        if len(response.text.strip()) == 0:
+            print("❌ Empty Sheet Response")
             return None
 
         df = pd.read_csv(StringIO(response.text))
 
-        print("Columns Found:", df.columns.tolist())
+        if df.empty:
+            print("❌ Sheet is empty")
+            return None
 
+        # Clean column names
         df.columns = df.columns.str.strip().str.lower()
 
         if "asset id" not in df.columns:
-            print("Column 'asset id' missing")
+            print("❌ Column 'Asset ID' not found")
+            print("Available columns:", df.columns.tolist())
             return None
 
         df.rename(columns={"asset id": "Asset ID"}, inplace=True)
@@ -53,12 +58,12 @@ def fetch_sheet():
         return df
 
     except Exception as e:
-        print("ERROR fetching sheet:", e)
+        print("❌ Sheet Error:", e)
         return None
 
 
 # ==============================
-# Debug Route (VERY IMPORTANT)
+# Debug Route
 # ==============================
 @app.route("/test")
 def test():
@@ -81,104 +86,118 @@ def home():
 # ==============================
 @app.route("/generate", methods=["POST"])
 def generate_qr():
+    try:
+        asset_id = request.form.get("data", "").strip()
+        fill_color = request.form.get("fill_color", "black")
+        back_color = request.form.get("back_color", "white")
+        size = int(request.form.get("size", 10))
+        logo = request.files.get("logo")
 
-    asset_id = request.form["data"].strip()
-    fill_color = request.form["fill_color"]
-    back_color = request.form["back_color"]
-    size = int(request.form["size"])
-    logo = request.files.get("logo")
-
-    df = fetch_sheet()
-    if df is None:
-        return render_template("index.html", error="Unable to fetch sheet")
-
-    df["Asset ID"] = df["Asset ID"].astype(str).str.strip()
-
-    result = df[df["Asset ID"].str.lower() == asset_id.lower()]
-
-    if result.empty:
-        return render_template("index.html", error="❌ Asset Not Found")
+        if not asset_id:
+            return render_template("index.html", error="Enter Asset ID")
 
-    row = result.iloc[0]
+        df = fetch_sheet()
+        if df is None:
+            return render_template("index.html", error="Unable to fetch sheet")
 
-    # 🔥 Correct base URL
-    asset_url = request.url_root + "asset/" + quote(asset_id)
+        df["Asset ID"] = df["Asset ID"].astype(str).str.strip()
 
-    qr = qrcode.QRCode(
-        version=None,
-        error_correction=qrcode.constants.ERROR_CORRECT_H,
-        box_size=size,
-        border=4,
-    )
+        result = df[df["Asset ID"].str.lower() == asset_id.lower()]
 
-    qr.add_data(asset_url)
-    qr.make(fit=True)
+        if result.empty:
+            return render_template("index.html", error="❌ Asset Not Found")
 
-    img = qr.make_image(fill_color=fill_color, back_color=back_color).convert("RGB")
+        row = result.iloc[0]
 
-    # Add Logo
-    if logo and logo.filename != "":
-        logo_img = Image.open(logo)
-        logo_size = img.size[0] // 4
-        logo_img = logo_img.resize((logo_size, logo_size))
+        # Generate URL for QR
+        asset_url = request.url_root + "asset/" + quote(asset_id)
 
-        pos = (
-            (img.size[0] - logo_size) // 2,
-            (img.size[1] - logo_size) // 2
+        qr = qrcode.QRCode(
+            error_correction=qrcode.constants.ERROR_CORRECT_H,
+            box_size=size,
+            border=4,
         )
 
-        img.paste(logo_img, pos)
-
-    qr_path = os.path.join(UPLOAD_FOLDER, "qr.png")
-    img.save(qr_path)
-
-    asset_info = {
-        "Asset ID": row.get("Asset ID", ""),
-        "Asset Type": row.get("asset type", ""),
-        "Asset Name": row.get("asset name", ""),
-        "Allotted To": row.get("allotted to", ""),
-        "Department": row.get("department", ""),
-    }
+        qr.add_data(asset_url)
+        qr.make(fit=True)
+
+        img = qr.make_image(
+            fill_color=fill_color,
+            back_color=back_color
+        ).convert("RGB")
+
+        # Add Logo if uploaded
+        if logo and logo.filename != "":
+            try:
+                logo_img = Image.open(logo)
+                logo_size = img.size[0] // 4
+                logo_img = logo_img.resize((logo_size, logo_size))
+
+                pos = (
+                    (img.size[0] - logo_size) // 2,
+                    (img.size[1] - logo_size) // 2
+                )
+
+                img.paste(logo_img, pos)
+            except:
+                print("Logo Error - Skipping logo")
+
+        qr_path = os.path.join(UPLOAD_FOLDER, "qr.png")
+        img.save(qr_path)
+
+        asset_info = {
+            "Asset ID": row.get("Asset ID", ""),
+            "Asset Type": row.get("asset type", ""),
+            "Asset Name": row.get("asset name", ""),
+            "Allotted To": row.get("allotted to", ""),
+            "Department": row.get("department", ""),
+        }
+
+        return render_template(
+            "index.html",
+            qr_image="generated/qr.png",
+            asset=asset_info
+        )
 
-    return render_template(
-        "index.html",
-        qr_image="generated/qr.png",
-        asset=asset_info
-    )
+    except Exception as e:
+        return f"❌ Application Error: {str(e)}"
 
 
 # ==============================
-# Asset Detail Page
+# Asset Details Page (QR Opens This)
 # ==============================
 @app.route("/asset/<path:asset_id>")
 def show_asset(asset_id):
+    try:
+        df = fetch_sheet()
+        if df is None:
+            return "<h3>Unable to fetch data</h3>"
 
-    df = fetch_sheet()
-    if df is None:
-        return "<h3>Unable to fetch data</h3>"
+        df["Asset ID"] = df["Asset ID"].astype(str).str.strip()
 
-    df["Asset ID"] = df["Asset ID"].astype(str).str.strip()
+        result = df[df["Asset ID"].str.lower() == asset_id.lower()]
 
-    result = df[df["Asset ID"].str.lower() == asset_id.lower()]
+        if result.empty:
+            return "<h3>Asset Not Found</h3>"
 
-    if result.empty:
-        return "<h3>Asset Not Found</h3>"
+        row = result.iloc[0]
 
-    row = result.iloc[0]
+        asset_info = {
+            "Asset ID": row.get("Asset ID", ""),
+            "Asset Type": row.get("asset type", ""),
+            "Asset Name": row.get("asset name", ""),
+            "Allotted To": row.get("allotted to", ""),
+            "Department": row.get("department", ""),
+        }
 
-    asset_info = {
-        "Asset ID": row.get("Asset ID", ""),
-        "Asset Type": row.get("asset type", ""),
-        "Asset Name": row.get("asset name", ""),
-        "Allotted To": row.get("allotted to", ""),
-        "Department": row.get("department", ""),
-    }
+        return render_template("asset_card.html", asset=asset_info)
 
-    return render_template("asset_card.html", asset=asset_info)
+    except Exception as e:
+        return f"<h3>Error: {str(e)}</h3>"
 
 
 # ==============================
-# Run App
+# Run Server
 # ==============================
 if __name__ == "__main__":
-    app.run(host="0.0.0.0", port=7860)
+    app.run(host="0.0.0.0", port=7860, debug=True)