Update app.py

app.py

@@ -1,34 +1,39 @@
 from flask import Flask, render_template, request, jsonify
-from simple_salesforce import Salesforce
+from simple_salesforce import Salesforce, SalesforceLogin
 from dotenv import load_dotenv
 import os
 import logging
+import time
 
 # Load environment variables
 load_dotenv()
 
 # Set up logging
-logging.basicConfig(level=logging.INFO)
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
 logger = logging.getLogger(__name__)
 
 app = Flask(__name__, template_folder='templates', static_folder='static')
 
-# Salesforce connection function
-def get_salesforce_connection():
-    try:
-        sf = Salesforce(
-            username=os.getenv('SFDC_USERNAME'),
-            password=os.getenv('SFDC_PASSWORD'),
-            security_token=os.getenv('SFDC_SECURITY_TOKEN'),
-            domain=os.getenv('SFDC_DOMAIN', 'login')
-        )
-        logger.info("Successfully connected to Salesforce")
-        return sf
-    except Exception as e:
-        logger.error(f"Error connecting to Salesforce: {e}")
-        return None
-
-# Initialize Salesforce connection
+# Salesforce connection function with retry logic
+def get_salesforce_connection(retries=3, delay=2):
+    for attempt in range(retries):
+        try:
+            sf = Salesforce(
+                username=os.getenv('SFDC_USERNAME'),
+                password=os.getenv('SFDC_PASSWORD'),
+                security_token=os.getenv('SFDC_SECURITY_TOKEN'),
+                domain=os.getenv('SFDC_DOMAIN', 'login')
+            )
+            logger.info("Successfully connected to Salesforce")
+            return sf
+        except Exception as e:
+            logger.error(f"Attempt {attempt + 1}/{retries} - Error connecting to Salesforce: {str(e)}")
+            if attempt < retries - 1:
+                time.sleep(delay)
+    logger.critical("Failed to connect to Salesforce after retries")
+    return None
+
+# Initialize Salesforce connection globally
 sf = get_salesforce_connection()
 
 @app.route('/')
@@ -42,7 +47,7 @@ def get_menu_items():
     if not sf:
         sf = get_salesforce_connection()
         if not sf:
-            return jsonify({"error": "Unable to connect to Salesforce"}), 500
+            return jsonify({"error": "Unable to connect to Salesforce after retries"}), 500
 
     dietary_preference = request.json.get('dietary_preference', 'both').lower()
     try:
@@ -53,16 +58,20 @@ def get_menu_items():
             soql += " WHERE Category__c = 'Non-Veg'"
         soql += " LIMIT 200"
         
-        logger.info(f"Executing SOQL query: {soql}")
+        logger.info(f"Executing SOQL query for {dietary_preference}: {soql}")
         result = sf.query(soql)
         menu_items = [
             {
                 "name": record['Name'],
-                "image_url": record.get('Image_URL__c', ''),
+                "image_url": record.get('Image_URL__c', 'https://via.placeholder.com/60'),
                 "category": record.get('Category__c', '')
             }
             for record in result['records'] if 'Name' in record
         ]
+        if not menu_items:
+            logger.warning(f"No items found for {dietary_preference}")
+            return jsonify({"menu_items": [], "message": f"No {dietary_preference} items found in Salesforce"})
+        
         logger.info(f"Fetched {len(menu_items)} menu items for {dietary_preference}")
         return jsonify({"menu_items": menu_items})
     except Exception as e:
@@ -76,7 +85,7 @@ def suggest_items():
     if not sf:
         sf = get_salesforce_connection()
         if not sf:
-            return jsonify({"error": "Unable to connect to Salesforce"}), 500
+            return jsonify({"error": "Unable to connect to Salesforce after retries"}), 500
 
     search_term = request.json.get('search_term', '').strip()
     if not search_term:
@@ -84,10 +93,10 @@ def suggest_items():
 
     try:
         soql = f"SELECT Name, Image_URL__c FROM Ingredient_Object__c WHERE Name LIKE '%{search_term}%' OR Ingredients__c LIKE '%{search_term}%' LIMIT 10"
-        logger.info(f"Executing SOQL query: {soql}")
+        logger.info(f"Executing SOQL query for suggestions: {soql}")
         result = sf.query(soql)
         suggestions = [
-            {"name": record['Name'], "image_url": record.get('Image_URL__c', '')}
+            {"name": record['Name'], "image_url": record.get('Image_URL__c', 'https://via.placeholder.com/60')}
             for record in result['records'] if 'Name' in record
         ]
         logger.info(f"Fetched {len(suggestions)} suggestions for '{search_term}'")
@@ -96,14 +105,14 @@ def suggest_items():
         logger.error(f"Failed to fetch suggestions: {str(e)}")
         return jsonify({"error": "Failed to fetch suggestions from Salesforce"}), 500
 
-# Fetch item details
+# Fetch item details with fallback
 @app.route('/get_item_details', methods=['POST'])
 def get_item_details():
     global sf
     if not sf:
         sf = get_salesforce_connection()
         if not sf:
-            return jsonify({"error": "Unable to connect to Salesforce"}), 500
+            return jsonify({"error": "Unable to connect to Salesforce after retries"}), 500
 
     item_name = request.json.get('item_name', '').strip()
     if not item_name:
@@ -111,7 +120,7 @@ def get_item_details():
 
     try:
         soql = f"SELECT Name, Description__c, Ingredients__c, Image_URL__c FROM Ingredient_Object__c WHERE Name LIKE '%{item_name}%' LIMIT 1"
-        logger.info(f"Executing SOQL query: {soql}")
+        logger.info(f"Executing SOQL query for item details: {soql}")
         result = sf.query(soql)
 
         if result['totalSize'] == 0:
@@ -123,7 +132,7 @@ def get_item_details():
                     "name": record.get('Name', ''),
                     "description": "Description not available",
                     "ingredients": "Ingredients not listed",
-                    "image_url": record.get('Image_URL__c', '')
+                    "image_url": record.get('Image_URL__c', 'https://via.placeholder.com/60')
                 }
                 logger.info(f"Fallback: Found '{item_name}' in menu items")
                 return jsonify({"item_details": item_details})
@@ -134,7 +143,7 @@ def get_item_details():
             "name": record.get('Name', ''),
             "description": record.get('Description__c', 'No description available'),
             "ingredients": record.get('Ingredients__c', 'No ingredients listed'),
-            "image_url": record.get('Image_URL__c', '')
+            "image_url": record.get('Image_URL__c', 'https://via.placeholder.com/60')
         }
         logger.info(f"Fetched details for '{item_name}'")
         return jsonify({"item_details": item_details})
@@ -149,17 +158,16 @@ def submit_ingredients():
     if not sf:
         sf = get_salesforce_connection()
         if not sf:
-            return jsonify({"error": "Unable to connect to Salesforce"}), 500
+            return jsonify({"error": "Unable to connect to Salesforce after retries"}), 500
 
     ingredients = request.json.get('ingredients', [])
     if not ingredients:
         return jsonify({"error": "No ingredients provided"}), 400
 
     try:
-        # Create a new record in Ingredient_Object__c with the selected ingredients
         ingredient_names = ", ".join(ingredients)
         sf.Ingredient_Object__c.create({
-            'Name': f"User Selection {ingredient_names[:50]}",  # Truncate if too long
+            'Name': f"User Selection {ingredient_names[:50]}",  # Truncate to fit Salesforce limits
             'Ingredients__c': ingredient_names
         })
         logger.info(f"Submitted ingredients to Salesforce: {ingredient_names}")