Update app.py

app.py

@@ -1,4 +1,4 @@
-from flask import Flask, render_template, request, jsonify
+from flask import Flask, render_template, request, jsonify, send_from_directory
 from simple_salesforce import Salesforce
 from dotenv import load_dotenv
 import os
@@ -37,6 +37,36 @@ sf = get_salesforce_connection()
 def index():
     return render_template('chef-bot.html')
 
+@app.route('/static/<path:filename>')
+def static_files(filename):
+    return send_from_directory(app.static_folder, filename)
+
+@app.route('/get_ingredients', methods=['POST'])
+def get_ingredients():
+    global sf
+    if not sf:
+        sf = get_salesforce_connection()
+        if not sf:
+            return jsonify({"error": "Unable to connect to Salesforce"}), 500
+
+    try:
+        soql = "SELECT Name, Category__c FROM Sector_Detail__c WHERE Category__c = 'Both'"
+        soql += " LIMIT 200"
+        logger.info(f"Executing SOQL query for Sector_Detail__c: {soql}")
+        result = sf.query(soql)
+        ingredients = [
+            {
+                "name": record['Name'],
+                "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")
+        return jsonify({"ingredients": ingredients})
+    except Exception as e:
+        logger.error(f"Failed to fetch ingredients: {str(e)}")
+        return jsonify({"error": f"Failed to fetch ingredients from Salesforce: {str(e)}"}), 500
+
 @app.route('/get_menu_items', methods=['POST'])
 def get_menu_items():
     global sf
@@ -49,160 +79,95 @@ 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 = []
-        # Query Sector_Detail__c for dietary preferences
-        if not search_term:
-            soql_sector = "SELECT Name, Image_URL__c, Category__c, Description__c FROM Sector_Detail__c"
-            if dietary_preference == 'vegetarian':
-                soql_sector += " WHERE Category__c = 'Veg'"
+        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_sector += " WHERE Category__c = 'Non-Veg'"
-            soql_sector += " LIMIT 200"
-            logger.info(f"Executing SOQL query for Sector_Detail__c: {soql_sector}")
-            result_sector = sf.query(soql_sector)
-            sector_items = [
+                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'],
-                    "image_url": record.get('Image_URL__c', ''),
-                    "category": record.get('Category__c', ''),
                     "description": record.get('Description__c', 'No description available'),
-                    "source": "Sector_Detail__c"
+                    "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_sector['records'] if 'Name' in record
+                for record in result_menu['records'] if 'Name' in record
             ]
-            items.extend(sector_items)
-
-        # Query 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)
+            items.extend(menu_items)
 
-        logger.info(f"Fetched {len(items)} items (Sector_Detail__c: {len([i for i in items if i['source'] == 'Sector_Detail__c'])}, Menu_Item__c: {len([i for i in items if i['source'] == 'Menu_Item__c'])}) for {dietary_preference or search_term}")
+        logger.info(f"Fetched {len(items)} items from {source} for {dietary_preference or search_term}")
         return jsonify({"menu_items": 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
 
-@app.route('/get_sector_item_details', methods=['POST'])
-def get_sector_item_details():
+@app.route('/get_related_menu_items', methods=['POST'])
+def get_related_menu_items():
     global sf
     if not sf:
         sf = get_salesforce_connection()
         if not sf:
             return jsonify({"error": "Unable to connect to Salesforce"}), 500
 
-    item_name = request.json.get('item_name', '').strip()
-    if not item_name:
-        return jsonify({"error": "Item name is required"}), 400
-
-    try:
-        soql = f"SELECT Name, Image_URL__c, Category__c, Description__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 matching '{item_name}' in Sector_Detail__c"}), 404
-
-        record = result['records'][0]
-        item_details = {
-            "name": record.get('Name', ''),
-            "image_url": record.get('Image_URL__c', 'https://via.placeholder.com/30'),
-            "category": record.get('Category__c', ''),
-            "description": record.get('Description__c', 'No description available'),
-            "source": "Sector_Detail__c"
-        }
-        logger.info(f"Fetched details for '{item_name}' from Sector_Detail__c")
-        return jsonify({"item_details": item_details})
-    except Exception as e:
-        logger.error(f"Failed to fetch item details from Sector_Detail__c: {str(e)}")
-        return jsonify({"error": f"Failed to fetch item details from Salesforce: {str(e)}"}), 500
-
-@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
+    data = request.json
+    ingredient_name = data.get('ingredient_name', '').strip()
+    dietary_preference = data.get('dietary_preference', 'both').lower()
 
-    search_term = request.json.get('search_term', '').strip()
-    if not search_term:
-        return jsonify({"error": "Search term is required"}), 400
+    if not ingredient_name:
+        return jsonify({"error": "Ingredient name is required"}), 400
 
     try:
-        soql = f"SELECT Ingredient_Name__c, Image_URL__c FROM Ingredient_Object__c WHERE Ingredient_Name__c LIKE '%{search_term}%' LIMIT 10"
-        logger.info(f"Executing SOQL query: {soql}")
+        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 + "%'"
+        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}")
         result = sf.query(soql)
-        suggestions = [
-            {"name": record['Ingredient_Name__c'], "image_url": record.get('Image_URL__c', '')}
-            for record in result['records'] if 'Ingredient_Name__c' in record
+        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['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": f"Failed to fetch suggestions: {str(e)}"}), 500
-
-@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
-
-    item_name = request.json.get('item_name', '').strip()
-    if not item_name:
-        return jsonify({"error": "Item name is required"}), 400
-
-    try:
-        soql = f"SELECT Ingredient_Name__c, Image_URL__c FROM Ingredient_Object__c WHERE Ingredient_Name__c 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 matching '{item_name}' in Ingredient_Object__c"}), 404
-
-        record = result['records'][0]
-        item_details = {
-            "name": record.get('Ingredient_Name__c', ''),
-            "image_url": record.get('Image_URL__c', ''),
-            "source": "Ingredient_Object__c"
-        }
-        logger.info(f"Fetched details for '{item_name}' from Ingredient_Object__c")
-        return jsonify({"item_details": item_details})
+        logger.info(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 item details: {str(e)}")
-        return jsonify({"error": f"Failed to fetch item details: {str(e)}"}), 500
+        logger.error(f"Failed to fetch related menu items: {str(e)}")
+        return jsonify({"error": f"Failed to fetch related menu items from Salesforce: {str(e)}"}), 500
 
-@app.route('/submit_items', methods=['POST'])
-def submit_items():
+@app.route('/submit_ingredients', methods=['POST'])
+def submit_ingredients():
     global sf
     if not sf:
         sf = get_salesforce_connection()
@@ -211,6 +176,7 @@ def submit_items():
 
     items = request.json.get('items', [])
     custom_order_name = request.json.get('custom_order_name', '')
+    ingredients_info = request.json.get('ingredients_info', '')
     if not items:
         return jsonify({"error": "No items to submit"}), 400
 
@@ -221,14 +187,15 @@ def submit_items():
 
         for item in items:
             item_description = item['description']
-            if item.get('additionalIngredients'):
-                item_description += f", with {', '.join(item['additionalIngredients'])}"
+            if item.get('ingredientsInfo'):
+                item_description += f", additional info: {item['ingredientsInfo']}"
             sf.Ingredient_Object__c.create({
                 'Ingredient_Name__c': ingredient_name,
                 'Category__c': item.get('category', ''),
-                'Description__c': f"{item_description} - {description}",
+                'Description__c': item_description,
                 'Image_URL__c': item.get('image_url', ''),
-                'Quantity__c': item.get('quantity', 1)
+                'Quantity__c': item.get('quantity', 1),
+                'Ingredientsinfo__c': ingredients_info or item.get('ingredientsInfo', '')
             })
 
         logger.info(f"Submitted {len(items)} items under {ingredient_name}")