Update app.py

app.py

@@ -1,53 +1,48 @@
 from flask import Flask, render_template, request, jsonify
-from simple_salesforce import Salesforce, SalesforceLogin
+from simple_salesforce import Salesforce
 from dotenv import load_dotenv
 import os
 import logging
-import time
 
 # Load environment variables
 load_dotenv()
 
 # Set up logging
-logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
+logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
 app = Flask(__name__, template_folder='templates', static_folder='static')
 
-# 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
+# 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
 sf = get_salesforce_connection()
 
 @app.route('/')
 def index():
     return render_template('index.html')
 
-# Fetch menu items with dietary filter
+# Fetch menu items from Ingredient_Object__c
 @app.route('/get_menu_items', methods=['POST'])
 def get_menu_items():
     global sf
     if not sf:
         sf = get_salesforce_connection()
         if not sf:
-            return jsonify({"error": "Unable to connect to Salesforce after retries"}), 500
+            return jsonify({"error": "Unable to connect to Salesforce"}), 500
 
     dietary_preference = request.json.get('dietary_preference', 'both').lower()
     try:
@@ -58,34 +53,30 @@ def get_menu_items():
             soql += " WHERE Category__c = 'Non-Veg'"
         soql += " LIMIT 200"
         
-        logger.info(f"Executing SOQL query for {dietary_preference}: {soql}")
+        logger.info(f"Executing SOQL query: {soql}")
         result = sf.query(soql)
         menu_items = [
             {
                 "name": record['Name'],
-                "image_url": record.get('Image_URL__c', 'https://via.placeholder.com/60'),
+                "image_url": record.get('Image_URL__c', ''),
                 "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:
         logger.error(f"Failed to fetch menu items: {str(e)}")
         return jsonify({"error": "Failed to fetch menu items from Salesforce"}), 500
 
-# Fetch suggestions based on search term
+# Fetch suggestions from Ingredient_Object__c
 @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 after retries"}), 500
+            return jsonify({"error": "Unable to connect to Salesforce"}), 500
 
     search_term = request.json.get('search_term', '').strip()
     if not search_term:
@@ -93,10 +84,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 for suggestions: {soql}")
+        logger.info(f"Executing SOQL query: {soql}")
         result = sf.query(soql)
         suggestions = [
-            {"name": record['Name'], "image_url": record.get('Image_URL__c', 'https://via.placeholder.com/60')}
+            {"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}'")
@@ -105,14 +96,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 with fallback
+# Fetch item details from Ingredient_Object__c
 @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 after retries"}), 500
+            return jsonify({"error": "Unable to connect to Salesforce"}), 500
 
     item_name = request.json.get('item_name', '').strip()
     if not item_name:
@@ -120,7 +111,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 for item details: {soql}")
+        logger.info(f"Executing SOQL query: {soql}")
         result = sf.query(soql)
 
         if result['totalSize'] == 0:
@@ -132,7 +123,7 @@ def get_item_details():
                     "name": record.get('Name', ''),
                     "description": "Description not available",
                     "ingredients": "Ingredients not listed",
-                    "image_url": record.get('Image_URL__c', 'https://via.placeholder.com/60')
+                    "image_url": record.get('Image_URL__c', '')
                 }
                 logger.info(f"Fallback: Found '{item_name}' in menu items")
                 return jsonify({"item_details": item_details})
@@ -143,7 +134,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', 'https://via.placeholder.com/60')
+            "image_url": record.get('Image_URL__c', '')
         }
         logger.info(f"Fetched details for '{item_name}'")
         return jsonify({"item_details": item_details})
@@ -151,30 +142,34 @@ def get_item_details():
         logger.error(f"Failed to fetch item details: {str(e)}")
         return jsonify({"error": "Failed to fetch item details from Salesforce"}), 500
 
-# Submit selected items to Salesforce
-@app.route('/submit_ingredients', methods=['POST'])
-def submit_ingredients():
+# Submit selected items to Ingredient_Object__c
+@app.route('/submit_items', methods=['POST'])
+def submit_items():
     global sf
     if not sf:
         sf = get_salesforce_connection()
         if not sf:
-            return jsonify({"error": "Unable to connect to Salesforce after retries"}), 500
+            return jsonify({"error": "Unable to connect to Salesforce"}), 500
 
-    ingredients = request.json.get('ingredients', [])
-    if not ingredients:
-        return jsonify({"error": "No ingredients provided"}), 400
+    items = request.json.get('items', [])
+    if not items:
+        return jsonify({"error": "No items to submit"}), 400
 
     try:
-        ingredient_names = ", ".join(ingredients)
-        sf.Ingredient_Object__c.create({
-            '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}")
-        return jsonify({"success": "Ingredients submitted successfully"})
+        for item in items:
+            # Create a new record in Ingredient_Object__c
+            sf.Ingredient_Object__c.create({
+                'Name': item['name'],
+                'Description__c': item['description'],
+                'Ingredients__c': item['ingredients'],
+                'Image_URL__c': item['image_url'],
+                'Category__c': item.get('category', 'Both')  # Default to 'Both' if not provided
+            })
+            logger.info(f"Submitted item to Salesforce: {item['name']}")
+        return jsonify({"success": f"Successfully submitted {len(items)} items to Salesforce"})
     except Exception as e:
-        logger.error(f"Failed to submit ingredients: {str(e)}")
-        return jsonify({"error": "Failed to submit ingredients to Salesforce"}), 500
+        logger.error(f"Failed to submit items: {str(e)}")
+        return jsonify({"error": "Failed to submit items to Salesforce"}), 500
 
 if __name__ == '__main__':
     app.run(debug=True, host='0.0.0.0', port=7860)