Update app.py

app.py

@@ -6,6 +6,7 @@ import logging
 import uuid
 from datetime import datetime
 
+
 # Load environment variables
 load_dotenv()
 
@@ -126,6 +127,7 @@ def get_menu_items():
     if not sf:
         sf = get_salesforce_connection()
         if not sf:
+            logger.error("Salesforce connection failed after retry")
             return jsonify({"error": "Unable to connect to Salesforce"}), 500
 
     data = request.json
@@ -133,56 +135,63 @@ def get_menu_items():
     search_term = data.get('search_term', '').strip()
     try:
         items = []
+        # Query Sector_Detail__c for dietary preferences
         if not search_term:
-            soql = "SELECT Name, Image_URL__c, Category__c, Description__c FROM Sector_Detail__c"
-            if dietary_preference == 'vegetarian':
-                soql += " WHERE Category__c = 'Veg'"
-            elif dietary_preference == 'non-vegetarian':
-                soql += " WHERE Category__c = 'Non-Veg'"
-            soql += " LIMIT 200"
-            result = sf.query(soql)
-            items = [
-                {
-                    "name": r['Name'],
-                    "image_url": r.get('Image_URL__c', ''),
-                    "category": r.get('Category__c', ''),
-                    "description": r.get('Description__c', 'No description'),
-                    "source": "Sector_Detail__c"
-                }
-                for r in result['records'] if 'Name' in r
-            ]
-        else:
-            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"
-            soql_menu += f" WHERE Name LIKE '%{search_term}%' OR Ingredientsinfo__c LIKE '%{search_term}%'"
+            soql_sector = "SELECT Name, Image_URL__c, Category__c, Description__c FROM Sector_Detail__c"
             if dietary_preference == 'vegetarian':
-                soql_menu += " AND Veg_NonVeg__c = 'Vegetarian'"
+                soql_sector += " WHERE Category__c = 'Veg'"
             elif dietary_preference == 'non-vegetarian':
-                soql_menu += " AND 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 = [
+                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 = [
                 {
                     "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', ''),
+                    "image_url": record.get('Image_URL__c', ''),
                     "category": record.get('Category__c', ''),
-                    "dynamic_dish": record.get('Dynamic_Dish__c', False),
-                    "source": "Menu_Item__c"
+                    "description": record.get('Description__c', 'No description available'),
+                    "source": "Sector_Detail__c"
                 }
-                for record in result_menu['records'] if 'Name' in record
+                for record in result_sector['records'] if 'Name' in record
             ]
-            items.extend(menu_items)
+            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}%' OR Ingredientsinfo__c 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 (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}")
         return jsonify({"menu_items": items})
     except Exception as e:
-        logger.error(f"Failed to fetch items: {e}")
-        return jsonify({"error": f"Failed to fetch items: {e}"}), 500
+        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():
@@ -209,13 +218,14 @@ def get_sector_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')
+            "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: {e}")
-        return jsonify({"error": f"Failed to fetch item details: {e}"}), 500
+        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():
@@ -240,8 +250,8 @@ def suggest_items():
         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: {e}")
-        return jsonify({"error": f"Failed to fetch suggestions: {e}"}), 500
+        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():
@@ -266,13 +276,14 @@ def get_item_details():
         record = result['records'][0]
         item_details = {
             "name": record.get('Ingredient_Name__c', ''),
-            "image_url": record.get('Image_URL__c', '')
+            "image_url": record.get('Image_URL__c', ''),
+            "source": "Ingredient_Object__c"
         }
-        logger.info(f"Fetched details for '{item_name}'")
+        logger.info(f"Fetched details for '{item_name}' from Ingredient_Object__c")
         return jsonify({"item_details": item_details})
     except Exception as e:
-        logger.error(f"Failed to fetch item details: {e}")
-        return jsonify({"error": f"Failed to fetch item details: {e}"}), 500
+        logger.error(f"Failed to fetch item details: {str(e)}")
+        return jsonify({"error": f"Failed to fetch item details: {str(e)}"}), 500
 
 @app.route('/submit_items', methods=['POST'])
 def submit_items():
@@ -301,10 +312,11 @@ def submit_items():
                 'Quantity__c': item.get('quantity', 1)
             })
 
+        logger.info(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: {e}")
-        return jsonify({"error": f"Failed to submit items: {e}"}), 500
+        logger.error(f"Failed to submit items: {str(e)}")
+        return jsonify({"error": f"Failed to submit items: {str(e)}"}), 500
 
 @app.route('/get_item_info', methods=['POST'])
 def get_item_info():
@@ -317,7 +329,7 @@ def get_item_info():
         soql = f"SELECT Name, Description__c FROM Sector_Detail__c WHERE Name LIKE '%{item_name}%' LIMIT 1"
         result = sf.query(soql)
         if result['totalSize'] == 0:
-            return jsonify({"error": f"No item found matching '{item_name}'"}), 404
+            return jsonify({"error": f"No item found matching '{item_name}' in Sector_Detail__c"}), 404
 
         record = result['records'][0]
         base_info = record.get('Description__c', 'No description available')
@@ -339,8 +351,8 @@ def get_item_info():
         logger.info(f"Generated info for '{item_name}'")
         return jsonify({"item_info": item_info})
     except Exception as e:
-        logger.error(f"Failed to get item info: {e}")
-        return jsonify({"error": f"Failed to get item info: {e}"}), 500
+        logger.error(f"Failed to get item info: {str(e)}")
+        return jsonify({"error": f"Failed to get item info: {str(e)}"}), 500
 
 @app.route('/chat', methods=['POST'])
 def chat():
@@ -351,7 +363,7 @@ def chat():
 
     response = get_chatgpt_response(user_message, session_id)
     logger.info(f"Chat response sent: {response}")
-    return jsonify({"response": response, "search_term": user_message})
+    return jsonify({"response": response})
 
 if __name__ == '__main__':
     app.run(debug=True, host='0.0.0.0', port=7860)