Update app.py

app.py

@@ -178,7 +178,6 @@ def find_product_nutrients(product_info_from_db):
             if 'sodium' in item['name'].lower():
                 salt += item['values'][0]['value']
 
-    #How to get Salt?
     if added_sugar is not None and added_sugar > 0 and sugar is None:
         sugar = added_sugar
     elif total_sugar is not None and total_sugar > 0 and added_sugar is None and sugar is None:
@@ -355,9 +354,24 @@ def analyze_processing_level(ingredients, assistant_id):
         assistant_id=assistant_id,
         include=["step_details.tool_calls[*].file_search.results[*].content"]
     )
-    
-    messages = list(client.beta.threads.messages.list(thread_id=thread.id, run_id=run.id))
 
+    # Polling loop to wait for a response in the thread
+    messages = []
+    max_retries = 10  # You can set a maximum retry limit
+    retries = 0
+    wait_time = 2  # Seconds to wait between retries
+
+    while retries < max_retries:
+        messages = list(client.beta.threads.messages.list(thread_id=thread.id, run_id=run.id))
+        if messages:  # If we receive any messages, break the loop
+            break
+        retries += 1
+        time.sleep(wait_time)
+
+    # Check if we got the message content
+    if not messages:
+        raise TimeoutError("Processing Claims : No messages were returned after polling.")
+        
     message_content = messages[0].content[0].text
     annotations = message_content.annotations
     #citations = []
@@ -388,8 +402,24 @@ def analyze_harmful_ingredients(ingredients, assistant_id):
         assistant_id=assistant_id,
         include=["step_details.tool_calls[*].file_search.results[*].content"]
     )
-    
-    messages = list(client.beta.threads.messages.list(thread_id=thread.id, run_id=run.id))
+
+    # Polling loop to wait for a response in the thread
+    messages = []
+    max_retries = 10  # You can set a maximum retry limit
+    retries = 0
+    wait_time = 2  # Seconds to wait between retries
+
+    while retries < max_retries:
+        messages = list(client.beta.threads.messages.list(thread_id=thread.id, run_id=run.id))
+        if messages:  # If we receive any messages, break the loop
+            break
+        retries += 1
+        time.sleep(wait_time)
+
+    # Check if we got the message content
+    if not messages:
+        raise TimeoutError("Processing Claims : No messages were returned after polling.")
+        
     message_content = messages[0].content[0].text
     annotations = message_content.annotations
 
@@ -444,8 +474,23 @@ The output must be in JSON format as follows:
         include=["step_details.tool_calls[*].file_search.results[*].content"]
     )
     
-    messages = list(client.beta.threads.messages.list(thread_id=thread.id, run_id=run.id))
-
+    # Polling loop to wait for a response in the thread
+    messages = []
+    max_retries = 10  # You can set a maximum retry limit
+    retries = 0
+    wait_time = 2  # Seconds to wait between retries
+
+    while retries < max_retries:
+        messages = list(client.beta.threads.messages.list(thread_id=thread.id, run_id=run.id))
+        if messages:  # If we receive any messages, break the loop
+            break
+        retries += 1
+        time.sleep(wait_time)
+
+    # Check if we got the message content
+    if not messages:
+        raise TimeoutError("Processing Claims : No messages were returned after polling.")
+        
     message_content = messages[0].content[0].text
     
       
@@ -534,10 +579,11 @@ Claims Analysis:
         ]
     )
 
-    return f"{brand_name} {product_name} -- " + completion.choices[0].message.content
+    return f"Brand: {brand_name}\n\nProduct: {product_name}\n\nAnalysis:\n\n{completion.choices[0].message.content}"
 
 
 def analyze_product(product_info_raw, system_prompt):
+    
     global assistant1, assistant2, assistant3
     
     if product_info_raw != "{}":
@@ -559,6 +605,10 @@ def analyze_product(product_info_raw, system_prompt):
         if nutritional_information:
             product_type, calories, sugar, salt, serving_size = find_product_nutrients(product_info_from_db)
             nutrient_analysis = analyze_nutrients(product_type, calories, sugar, salt, serving_size)
+            if product_type is not None and serving_size is not None:                                                          
+                nutrient_analysis = analyze_nutrients(product_type, calories, sugar, salt, serving_size)                       
+            else:                                                                                                              
+                return "product not found because product information in the db is corrupt"   
             print(f"DEBUG ! nutrient analysis is {nutrient_analysis}")
 
             nutrient_analysis_rda_data = rda_analysis(nutritional_information, serving_size)
@@ -566,8 +616,7 @@ def analyze_product(product_info_raw, system_prompt):
             print(f"DEBUG : nutrient_analysis_rda_data['nutritionPerServing'] : {nutrient_analysis_rda_data['nutritionPerServing']}")
             print(f"DEBUG : nutrient_analysis_rda_data['userServingSize'] : {nutrient_analysis_rda_data['userServingSize']}")
             
-            if nutrient_analysis_rda_data:
-                nutrient_analysis_rda = find_nutrition(nutrient_analysis_rda_data)
+            nutrient_analysis_rda = find_nutrition(nutrient_analysis_rda_data)
             print(f"DEBUG ! RDA nutrient analysis is {nutrient_analysis_rda}")
             
             #Call GPT for nutrient analysis
@@ -581,6 +630,7 @@ def analyze_product(product_info_raw, system_prompt):
             claims_analysis = analyze_claims(claims_list, ingredients_list, assistant3.id) if claims_list else ""
                 
         final_analysis = generate_final_analysis(brand_name, product_name, nutritional_level, processing_level, harmful_ingredient_analysis, claims_analysis, system_prompt)
+
         return final_analysis
     else:
         return "I'm sorry, product information could not be extracted from the url."    
@@ -612,6 +662,8 @@ def chatbot_response(image_urls_str, product_name_by_user, data_extractor_url, s
             with st.spinner("Analyzing the product... This may take a moment."):
                 product_info_raw = get_product_data_from_db(product_name_by_user, data_extractor_url)
                 print(f"DEBUG product_info_raw from name: {product_info_raw}")
+                if product_info_raw == "{}":
+                    return [], "product not found because product information in the db is corrupt"
                 if 'error' not in json.loads(product_info_raw).keys():
                     final_analysis = analyze_product(product_info_raw, system_prompt)
                     return [], final_analysis