Update app.py

app.py

@@ -4,7 +4,7 @@ from dotenv import load_dotenv
 import os
 import logging
 
-# Load environment variables from .env file
+# Load environment variables
 load_dotenv()
 
 # Set up logging
@@ -13,7 +13,7 @@ logger = logging.getLogger(__name__)
 
 app = Flask(__name__, template_folder='templates', static_folder='static')
 
-# Function to get Salesforce connection
+# Salesforce connection function
 def get_salesforce_connection():
     try:
         sf = Salesforce(
@@ -28,15 +28,15 @@ def get_salesforce_connection():
         logger.error(f"Error connecting to Salesforce: {e}")
         return None
 
-# Initialize Salesforce connection globally
+# Initialize Salesforce connection
 sf = get_salesforce_connection()
 
 @app.route('/')
 def index():
     return render_template('index.html')
 
-# Fetch all menu items (names and images) from Salesforce
-@app.route('/get_menu_items', methods=['GET'])
+# Fetch menu items with dietary filter
+@app.route('/get_menu_items', methods=['POST'])
 def get_menu_items():
     global sf
     if not sf:
@@ -44,21 +44,59 @@ def get_menu_items():
         if not sf:
             return jsonify({"error": "Unable to connect to Salesforce"}), 500
 
+    dietary_preference = request.json.get('dietary_preference', 'both').lower()
     try:
-        soql = "SELECT Name, Image_URL__c FROM Sector_Detail__c LIMIT 200"
+        soql = "SELECT Name, Image_URL__c, Category__c FROM Sector_Detail__c"
+        if dietary_preference == 'vegetarian':
+            soql += " WHERE Category__c = 'Veg'"
+        elif dietary_preference == 'non-vegetarian':
+            soql += " WHERE Category__c = 'Non-Veg'"
+        soql += " LIMIT 200"
+        
         logger.info(f"Executing SOQL query: {soql}")
         result = sf.query(soql)
         menu_items = [
-            {"name": record['Name'], "image_url": record.get('Image_URL__c', '')}
+            {
+                "name": record['Name'],
+                "image_url": record.get('Image_URL__c', ''),
+                "category": record.get('Category__c', '')
+            }
             for record in result['records'] if 'Name' in record
         ]
-        logger.info(f"Fetched {len(menu_items)} menu items")
+        logger.info(f"Fetched {len(menu_items)} menu items for {dietary_preference}")
         return jsonify({"menu_items": menu_items})
     except Exception as e:
         logger.error(f"Failed to fetch menu items: {str(e)}")
         return jsonify({"error": "Failed to fetch menu items from Salesforce"}), 500
 
-# Fetch details (description and ingredients) for a specific menu item
+# Fetch suggestions based on search term
+@app.route('/suggest_items', methods=['POST'])
+def suggest_items():
+    global sf
+    if not sf:
+        sf = get_salesforce_connection()
+        if not sf:
+            return jsonify({"error": "Unable to connect to Salesforce"}), 500
+
+    search_term = request.json.get('search_term', '').strip()
+    if not search_term:
+        return jsonify({"error": "Search term is required"}), 400
+
+    try:
+        soql = f"SELECT Name, Image_URL__c FROM Sector_Detail__c WHERE Name LIKE '%{search_term}%' OR Ingredients__c LIKE '%{search_term}%' LIMIT 10"
+        logger.info(f"Executing SOQL query: {soql}")
+        result = sf.query(soql)
+        suggestions = [
+            {"name": record['Name'], "image_url": record.get('Image_URL__c', '')}
+            for record in result['records'] if 'Name' in record
+        ]
+        logger.info(f"Fetched {len(suggestions)} suggestions for '{search_term}'")
+        return jsonify({"suggestions": suggestions})
+    except Exception as e:
+        logger.error(f"Failed to fetch suggestions: {str(e)}")
+        return jsonify({"error": "Failed to fetch suggestions from Salesforce"}), 500
+
+# Fetch item details with fallback to menu items
 @app.route('/get_item_details', methods=['POST'])
 def get_item_details():
     global sf
@@ -72,12 +110,26 @@ def get_item_details():
         return jsonify({"error": "Item name is required"}), 400
 
     try:
-        soql = f"SELECT Name, Description__c, Ingredients__c, Image_URL__c FROM Sector_Detail__c WHERE Name = '{item_name}' LIMIT 1"
+        # Case-insensitive search for exact or partial match
+        soql = f"SELECT Name, Description__c, Ingredients__c, Image_URL__c FROM Sector_Detail__c WHERE Name LIKE '%{item_name}%' LIMIT 1"
         logger.info(f"Executing SOQL query: {soql}")
         result = sf.query(soql)
 
         if result['totalSize'] == 0:
-            return jsonify({"error": f"No item found with name '{item_name}'"}), 404
+            # Fallback: Check if it exists in menu items
+            soql_fallback = f"SELECT Name, Image_URL__c FROM Sector_Detail__c WHERE Name LIKE '%{item_name}%' LIMIT 1"
+            result_fallback = sf.query(soql_fallback)
+            if result_fallback['totalSize'] > 0:
+                record = result_fallback['records'][0]
+                item_details = {
+                    "name": record.get('Name', ''),
+                    "description": "Description not available",
+                    "ingredients": "Ingredients not listed",
+                    "image_url": record.get('Image_URL__c', '')
+                }
+                logger.info(f"Fallback: Found '{item_name}' in menu items")
+                return jsonify({"item_details": item_details})
+            return jsonify({"error": f"No item found matching '{item_name}'"}), 404
 
         record = result['records'][0]
         item_details = {
@@ -86,38 +138,11 @@ def get_item_details():
             "ingredients": record.get('Ingredients__c', 'No ingredients listed'),
             "image_url": record.get('Image_URL__c', '')
         }
-        logger.info(f"Fetched details for {item_name}")
+        logger.info(f"Fetched details for '{item_name}'")
         return jsonify({"item_details": item_details})
     except Exception as e:
         logger.error(f"Failed to fetch item details: {str(e)}")
         return jsonify({"error": "Failed to fetch item details from Salesforce"}), 500
 
-# Suggest suitable items based on user input
-@app.route('/suggest_items', methods=['POST'])
-def suggest_items():
-    global sf
-    if not sf:
-        sf = get_salesforce_connection()
-        if not sf:
-            return jsonify({"error": "Unable to connect to Salesforce"}), 500
-
-    search_term = request.json.get('search_term', '').strip().lower()
-    if not search_term:
-        return jsonify({"error": "Search term is required"}), 400
-
-    try:
-        soql = f"SELECT Name, Image_URL__c FROM Sector_Detail__c WHERE Name LIKE '%{search_term}%' OR Ingredients__c LIKE '%{search_term}%' LIMIT 10"
-        logger.info(f"Executing SOQL query: {soql}")
-        result = sf.query(soql)
-        suggestions = [
-            {"name": record['Name'], "image_url": record.get('Image_URL__c', '')}
-            for record in result['records'] if 'Name' in record
-        ]
-        logger.info(f"Fetched {len(suggestions)} suggestions for '{search_term}'")
-        return jsonify({"suggestions": suggestions})
-    except Exception as e:
-        logger.error(f"Failed to fetch suggestions: {str(e)}")
-        return jsonify({"error": "Failed to fetch suggestions from Salesforce"}), 500
-
 if __name__ == '__main__':
     app.run(debug=True, host='0.0.0.0', port=7860)