Update app.py

app.py

@@ -10,7 +10,7 @@ from datetime import datetime
 load_dotenv()
 
 # Set up logging
-logging.basicConfig(level=logging.INFO)
+logging.basicConfig(level=logging.DEBUG)
 logger = logging.getLogger(__name__)
 
 app = Flask(__name__, template_folder='templates', static_folder='static')
@@ -35,7 +35,7 @@ sf = get_salesforce_connection()
 
 @app.route('/')
 def index():
-    return render_template('chef-bot.html')
+    return render_template('index.html')
 
 @app.route('/static/<path:filename>')
 def static_files(filename):
@@ -50,18 +50,19 @@ def get_ingredients():
             return jsonify({"error": "Unable to connect to Salesforce"}), 500
 
     try:
-        soql = "SELECT Name, Category__c FROM Sector_Detail__c WHERE Category__c = 'Both'"
+        soql = "SELECT Name, Image_URL__c, Category__c FROM Sector_Detail__c WHERE Category__c = 'Both'"
         soql += " LIMIT 200"
-        logger.info(f"Executing SOQL query for Sector_Detail__c: {soql}")
+        logger.debug(f"Executing SOQL query for Sector_Detail__c: {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
         ]
-        logger.info(f"Fetched {len(ingredients)} ingredients from Sector_Detail__c")
+        logger.debug(f"Fetched {len(ingredients)} ingredients from Sector_Detail__c")
         return jsonify({"ingredients": ingredients})
     except Exception as e:
         logger.error(f"Failed to fetch ingredients: {str(e)}")
@@ -79,45 +80,37 @@ def get_menu_items():
     data = request.json
     dietary_preference = data.get('dietary_preference', 'both').lower()
     search_term = data.get('search_term', '').strip()
-    source = data.get('source', 'Menu_Item__c')
 
     try:
-        items = []
-        if source == 'Menu_Item__c':
-            soql_menu = "SELECT Name, Description__c, Image1__c, Ingredientsinfo__c, NutritionalInfo__c, Price__c, Sector__c, Spice_Levels__c, Veg_NonVeg__c, Category__c, Dynamic_Dish__c FROM Menu_Item__c"
-            if search_term:
-                soql_menu += f" WHERE Name LIKE '%{search_term}%'"
-            elif dietary_preference == 'vegetarian':
-                soql_menu += " WHERE Veg_NonVeg__c = 'Vegetarian'"
-            elif dietary_preference == 'non-vegetarian':
-                soql_menu += " WHERE Veg_NonVeg__c = 'Non-Vegetarian'"
-            soql_menu += " LIMIT 200"
-            logger.info(f"Executing SOQL query for Menu_Item__c: {soql_menu}")
-            result_menu = sf.query(soql_menu)
-            menu_items = [
-                {
-                    "name": record['Name'],
-                    "description": record.get('Description__c', 'No description available'),
-                    "image_url": record.get('Image1__c', ''),
-                    "ingredients": record.get('Ingredientsinfo__c', ''),
-                    "nutritional_info": record.get('NutritionalInfo__c', ''),
-                    "price": record.get('Price__c', 0.0),
-                    "sector": record.get('Sector__c', ''),
-                    "spice_levels": record.get('Spice_Levels__c', ''),
-                    "veg_nonveg": record.get('Veg_NonVeg__c', ''),
-                    "category": record.get('Category__c', ''),
-                    "dynamic_dish": record.get('Dynamic_Dish__c', False),
-                    "source": "Menu_Item__c"
-                }
-                for record in result_menu['records'] if 'Name' in record
-            ]
-            items.extend(menu_items)
-
-        logger.info(f"Fetched {len(items)} items from {source} for {dietary_preference or search_term}")
-        return jsonify({"menu_items": items})
+        soql_menu = "SELECT Name, Description__c, Image1__c, Image2__c, Ingredientsinfo__c, Price__c, Section__c, Veg_NonVeg__c, Total_Ordered__c FROM Menu_Item__c"
+        if search_term:
+            soql_menu += f" WHERE Name LIKE '%{search_term}%'"
+        elif dietary_preference == 'vegetarian':
+            soql_menu += " WHERE Veg_NonVeg__c = 'Vegetarian'"
+        elif dietary_preference == 'non-vegetarian':
+            soql_menu += " WHERE Veg_NonVeg__c = 'Non-Vegetarian'"
+        soql_menu += " LIMIT 200"
+        logger.debug(f"Executing SOQL query for Menu_Item__c: {soql_menu}")
+        result_menu = sf.query(soql_menu)
+        menu_items = [
+            {
+                "name": record['Name'],
+                "description": record.get('Description__c', 'No description available'),
+                "image_url": record.get('Image1__c', '') or record.get('Image2__c', ''),
+                "ingredients": record.get('Ingredientsinfo__c', ''),
+                "price": record.get('Price__c', 0.0),
+                "section": record.get('Section__c', ''),
+                "veg_nonveg": record.get('Veg_NonVeg__c', ''),
+                "total_ordered": record.get('Total_Ordered__c', 0),
+                "source": "Menu_Item__c"
+            }
+            for record in result_menu['records'] if 'Name' in record
+        ]
+        logger.debug(f"Fetched {len(menu_items)} menu items")
+        return jsonify({"menu_items": menu_items})
     except Exception as e:
-        logger.error(f"Failed to fetch items: {str(e)}")
-        return jsonify({"error": f"Failed to fetch items from Salesforce: {str(e)}"}), 500
+        logger.error(f"Failed to fetch menu items: {str(e)}")
+        return jsonify({"error": f"Failed to fetch menu items from Salesforce: {str(e)}"}), 500
 
 @app.route('/get_related_menu_items', methods=['POST'])
 def get_related_menu_items():
@@ -135,32 +128,29 @@ def get_related_menu_items():
         return jsonify({"error": "Ingredient name is required"}), 400
 
     try:
-        soql = "SELECT Name, Description__c, Image1__c, Ingredientsinfo__c, NutritionalInfo__c, Price__c, Sector__c, Spice_Levels__c, Veg_NonVeg__c, Category__c, Dynamic_Dish__c FROM Menu_Item__c WHERE Ingredientsinfo__c LIKE '%" + ingredient_name + "%'"
+        soql = "SELECT Name, Description__c, Image1__c, Image2__c, Ingredientsinfo__c, Price__c, Section__c, Veg_NonVeg__c, Total_Ordered__c FROM Menu_Item__c WHERE Ingredientsinfo__c LIKE '%" + ingredient_name + "%'"
         if dietary_preference == 'vegetarian':
             soql += " AND Veg_NonVeg__c = 'Vegetarian'"
         elif dietary_preference == 'non-vegetarian':
             soql += " AND Veg_NonVeg__c = 'Non-Vegetarian'"
         soql += " LIMIT 200"
-        logger.info(f"Executing SOQL query for related Menu_Item__c: {soql}")
+        logger.debug(f"Executing SOQL query for related Menu_Item__c: {soql}")
         result = sf.query(soql)
         menu_items = [
             {
                 "name": record['Name'],
                 "description": record.get('Description__c', 'No description available'),
-                "image_url": record.get('Image1__c', ''),
+                "image_url": record.get('Image1__c', '') or record.get('Image2__c', ''),
                 "ingredients": record.get('Ingredientsinfo__c', ''),
-                "nutritional_info": record.get('NutritionalInfo__c', ''),
                 "price": record.get('Price__c', 0.0),
-                "sector": record.get('Sector__c', ''),
-                "spice_levels": record.get('Spice_Levels__c', ''),
+                "section": record.get('Section__c', ''),
                 "veg_nonveg": record.get('Veg_NonVeg__c', ''),
-                "category": record.get('Category__c', ''),
-                "dynamic_dish": record.get('Dynamic_Dish__c', False),
+                "total_ordered": record.get('Total_Ordered__c', 0),
                 "source": "Menu_Item__c"
             }
             for record in result['records'] if 'Name' in record
         ]
-        logger.info(f"Fetched {len(menu_items)} related menu items for {ingredient_name}")
+        logger.debug(f"Fetched {len(menu_items)} related menu items for {ingredient_name}")
         return jsonify({"menu_items": menu_items})
     except Exception as e:
         logger.error(f"Failed to fetch related menu items: {str(e)}")
@@ -174,11 +164,13 @@ def submit_ingredients():
         if not sf:
             return jsonify({"error": "Unable to connect to Salesforce"}), 500
 
-    items = request.json.get('items', [])
-    custom_order_name = request.json.get('custom_order_name', '')
-    ingredients_info = request.json.get('ingredients_info', '')
+    data = request.json
+    items = data.get('items', [])
+    custom_order_name = data.get('custom_order_name', '')
+    ingredients_info = data.get('ingredients_info', '')
+
     if not items:
-        return jsonify({"error": "No items to submit"}), 400
+        return jsonify({'error': 'No items selected'}), 400
 
     try:
         ingredient_name = custom_order_name or f"Order_{datetime.now().strftime('%Y%m%d')}_{uuid.uuid4().hex[:8]}"
@@ -198,7 +190,7 @@ def submit_ingredients():
                 'Ingredientsinfo__c': ingredients_info or item.get('ingredientsInfo', '')
             })
 
-        logger.info(f"Submitted {len(items)} items under {ingredient_name}")
+        logger.debug(f"Submitted {len(items)} items under {ingredient_name}")
         return jsonify({"success": f"Submitted {len(items)} items under {ingredient_name}", "ingredient_name": ingredient_name})
     except Exception as e:
         logger.error(f"Failed to submit items: {str(e)}")