Update app.py

app.py

@@ -4,12 +4,16 @@ from dotenv import load_dotenv
 import os
 import logging
 
-logging.basicConfig(level=logging.DEBUG)
-
+# Load environment variables from .env file
 load_dotenv()
 
+# Set up logging
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+
 app = Flask(__name__, template_folder='templates', static_folder='static')
 
+# Function to get Salesforce connection
 def get_salesforce_connection():
     try:
         sf = Salesforce(
@@ -18,11 +22,13 @@ def get_salesforce_connection():
             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:
-        print(f"Error connecting to Salesforce: {e}")
+        logger.error(f"Error connecting to Salesforce: {e}")
         return None
 
+# Initialize Salesforce connection
 sf = get_salesforce_connection()
 
 @app.route('/')
@@ -35,35 +41,51 @@ def serve_static(filename):
 
 @app.route('/get_ingredients', methods=['POST'])
 def get_ingredients():
-    dietary_preference = request.json.get('dietary_preference', '').strip().lower()
-    logging.debug(f"Received dietary preference: {dietary_preference}")
-
-    if dietary_preference == 'vegetable':
-        logging.debug("Fetching ingredients for Vegetables...")
-        soql = "SELECT Name, Image_URL__c, Category__c FROM Sector_Detail__c WHERE Category__c = 'Veg' LIMIT 200"
-    elif dietary_preference == 'non-vegetarian':
-        logging.debug("Fetching ingredients for Non-Vegetarian...")
-        soql = "SELECT Name, Image_URL__c, Category__c FROM Sector_Detail__c WHERE Category__c = 'Non-Veg' LIMIT 200"
-    else:
-        logging.debug("Invalid dietary preference received.")
-        return jsonify({"error": "Invalid dietary preference."}), 400
+    global sf
+    if not sf:
+        sf = get_salesforce_connection()
+        if not sf:
+            return jsonify({"error": "Failed to connect to Salesforce"}), 500
+
+    dietary_preference = request.json.get('dietary_preference', '').lower()
+    
+    # Map dietary preference to SOQL condition
+    preference_map = {
+        'vegetarian': "Category__c = 'Veg'",
+        'non-vegetarian': "Category__c = 'Non-Veg'",
+        'both': None  # No condition to fetch all records
+    }
+    condition = preference_map.get(dietary_preference)
 
     try:
+        # Construct the base query
+        soql = "SELECT Name, Image_URL__c, Category__c FROM Sector_Detail__c"
+        if condition:
+            soql += f" WHERE {condition}"
+        soql += " LIMIT 200"
+
+        logger.info(f"Executing SOQL query: {soql}")
         result = sf.query(soql)
         ingredients = [
             {"name": record['Name'], "image_url": record.get('Image_URL__c', ''), "category": record.get('Category__c', '')}
             for record in result['records'] if 'Name' in record
         ]
-        logging.debug(f"Fetched ingredients: {[ing['name'] + ' (' + ing['category'] + ')' for ing in ingredients]}")
+        logger.info(f"Fetched {len(ingredients)} ingredients: {[ing['name'] + ' (' + ing['category'] + ')' for ing in ingredients]}")
         return jsonify({"ingredients": ingredients})
     except Exception as e:
-        logging.error(f"Error while fetching ingredients: {str(e)}")
+        logger.error(f"Failed to fetch ingredients: {str(e)}")
         return jsonify({"error": f"Failed to fetch ingredients: {str(e)}"}), 500
 
 @app.route('/get_menu_items_by_ingredients', methods=['POST'])
 def get_menu_items_by_ingredients():
+    global sf
+    if not sf:
+        sf = get_salesforce_connection()
+        if not sf:
+            return jsonify({"error": "Failed to connect to Salesforce"}), 500
+
     ingredients = request.json.get('ingredients', '').strip().lower()
-    logging.debug(f"Received ingredients: {ingredients}")
+    logger.info(f"Received ingredients: {ingredients}")
 
     # Assuming Menu_Items__c object has an Ingredients__c field to match with selected ingredients
     soql = f"SELECT Item_Name__c, Image_URL__c FROM Menu_Items__c WHERE Ingredients__c LIKE '%{ingredients}%' LIMIT 200"
@@ -74,10 +96,10 @@ def get_menu_items_by_ingredients():
             {"name": record['Item_Name__c'], "image_url": record.get('Image_URL__c', '')}
             for record in result['records'] if 'Item_Name__c' in record
         ]
-        logging.debug(f"Fetched {len(menu_items)} menu items.")
+        logger.info(f"Fetched {len(menu_items)} menu items.")
         return jsonify({"menu_items": menu_items})
     except Exception as e:
-        logging.error(f"Error while fetching menu items: {str(e)}")
+        logger.error(f"Error while fetching menu items: {str(e)}")
         return jsonify({"error": f"Failed to fetch menu items: {str(e)}"}), 500
 
 @app.route('/submit_ingredients', methods=['POST'])
@@ -88,8 +110,8 @@ def submit_ingredients():
     if not ingredients:
         return jsonify({'error': 'No ingredients selected'}), 400
     
-    logging.debug(f"Ingredients submitted: {ingredients}")
+    logger.info(f"Ingredients submitted: {ingredients}")
     return jsonify({'success': True})
 
 if __name__ == '__main__':
-    app.run(debug=True, host='0.0.0.0', port=7860) 
+    app.run(debug=True, host='0.0.0.0', port=7860)