Update app/utils.py

app/utils.py

@@ -137,28 +137,23 @@ class AllergyAnalyzer:
         tokens = nltk.word_tokenize(text)
         return [w.lower() for w in tokens if w.isalpha()]
     
-    def check_database_allergens(self, token, user_allergens):
-        """التحقق من وجود الحساسيات في قاعدة البيانات"""
+    def find_allergy_for_token(self, token):
+        """البحث عن الحساسية المقابلة للتوكن في ملف الإكسل"""
         results = []
-        for allergy in user_allergens:
-            if allergy in self.allergy_dict and token in self.allergy_dict[allergy]:
+        for allergy, ingredients in self.allergy_dict.items():
+            if token in ingredients:
                 results.append(allergy)
         return results
     
-    def check_allergy_risk(self, ingredient, allergy_type, api_key):
+    def check_allergy_risk(self, ingredient, api_key):
         """الاستعلام من Claude API عن الحساسيات"""
         prompt = f"""
-You are a professional food safety expert specializing in allergen classification and risk assessment. Your task is critical because allergic reactions to {allergy_type} can be severe or even life-threatening.
+You are a professional food safety expert specializing in allergen classification. 
+Please analyze the ingredient '{ingredient}' and determine which of the following major allergen categories it belongs to:
+dairy, eggs, peanuts, soy, tree nuts, wheat, fish, shellfish, sesame.
 
-Please analyze the ingredient '{ingredient}' and determine whether it contains or is derived from {allergy_type}, posing a potential allergy risk for individuals with {allergy_type} allergies.
-
-⚠️ *Important Guidelines:*
-- Base your answer strictly on scientific classification and allergen presence.
-- Do NOT rely solely on word similarity—consider actual ingredient composition.
-- If '{ingredient}' contains {allergy_type} proteins or poses a high cross-allergy risk, answer *'Yes'*.
-- If it is completely unrelated and safe for individuals with {allergy_type} allergies, answer *'No'*.
-
-🚨 *Final Answer:* Only respond with *'Yes'* or *'No'*. Do NOT provide explanations.
+Return only the allergen category name if found, or 'None' if not found.
+Example responses: 'dairy', 'eggs', 'None', etc.
 """
         url = "https://api.anthropic.com/v1/messages"
         headers = {
@@ -178,14 +173,15 @@ Please analyze the ingredient '{ingredient}' and determine whether it contains o
             json_response = response.json()
             
             if "content" in json_response and isinstance(json_response["content"], list):
-                return json_response["content"][0]["text"].strip().lower() == 'yes'
-            return False
+                result = json_response["content"][0]["text"].strip().lower()
+                return result if result in self.allergy_dict else None
+            return None
             
         except Exception as e:
             logger.error(f"Error querying Claude API: {str(e)}")
-            return False
+            return None
     
-    def analyze_image(self, image, user_allergens, claude_api_key=None):
+    def analyze_image(self, image, claude_api_key=None):
         """تحليل الصورة مباشرة للكشف عن الحساسيات"""
         try:
             # استخراج النص من الصورة
@@ -200,7 +196,7 @@ Please analyze the ingredient '{ingredient}' and determine whether it contains o
             
             # التحقق من كل token في قاعدة البيانات
             for token in tokens:
-                db_results = self.check_database_allergens(token, user_allergens)
+                db_results = self.find_allergy_for_token(token)
                 
                 if db_results:
                     for allergy in db_results:
@@ -210,12 +206,12 @@ Please analyze the ingredient '{ingredient}' and determine whether it contains o
                         database_matches[allergy].append(token)
                 elif claude_api_key:
                     # إذا لم توجد في قاعدة البيانات، نستخدم Claude API
-                    for allergy in user_allergens:
-                        if self.check_allergy_risk(token, allergy, claude_api_key):
-                            detected_allergens.add(allergy)
-                            if allergy not in claude_matches:
-                                claude_matches[allergy] = []
-                            claude_matches[allergy].append(token)
+                    api_result = self.check_allergy_risk(token, claude_api_key)
+                    if api_result:
+                        detected_allergens.add(api_result)
+                        if api_result not in claude_matches:
+                            claude_matches[api_result] = []
+                        claude_matches[api_result].append(token)
             
             return {
                 "extracted_text": extracted_text,