bug fix

routers/analysis.py

@@ -8,7 +8,7 @@ import pytz
 from sqlalchemy.orm import Session
 from typing import List, Dict, Any
 from db.models import User, Ingredient
-from interfaces.ingredientModels import IngredientAnalysisResult, IngredientRequest
+from interfaces.ingredientModels import IngredientAnalysisResult, IngredientRequest, ProductAnalysisResponse
 from interfaces.productModels import ProductIngredientsRequest
 from logger_manager import log_info, log_error
 from db.database import get_db,SessionLocal
@@ -17,6 +17,7 @@ from dotenv import load_dotenv
 from langsmith import traceable
 from services.ingredientFinderAgent import IngredientInfoAgentLangGraph
 from services.productAnalyzerAgent import analyze_product_ingredients
+from services.auth_service import get_current_user
 from utils.db_utils import ingredient_db_to_pydantic
 from services.analysis_service import get_product_data_by_marker_id as get_analysis_service_data
 from utils.ingredient_utils import process_single_ingredient

services/analysis_service.py

@@ -22,14 +22,14 @@ def get_product_data_by_marker_id(db: Session, target_id: str):
 
         if not marker:
             log_info(f"No marker found for target ID: {target_id}")
-            return {"found": False, "message": f"No product found for marker ID: {target_id}"}
+            return None
 
         # Get the product associated with the marker
         product = db.query(Product).filter(Product.id == marker.product_id).first()
 
         if not product:
             log_info(f"No product found for product_id: {marker.product_id} linked to marker ID: {target_id}")
-            return {"found": False, "message": f"No product found for marker ID: {target_id}"}
+            return None
 
         log_info(f"Product found for marker ID {target_id}: {product.name}")
 
@@ -40,5 +40,4 @@ def get_product_data_by_marker_id(db: Session, target_id: str):
 
     except Exception as e:
         log_error(f"Error retrieving product data for marker ID {target_id}: {str(e)}", e)
-        # Return a structured error response
-        return {"found": False, "message": "An error occurred while retrieving product data."}
+        return None

utils/analysis_utils.py

@@ -1,6 +1,6 @@
 from typing import Dict, Any, Optional
 
-def format_analysis_response(product_data: Optional[Dict[str, Any]]) -> Dict[str, Any]:
+def format_product_analysis_response(product_data) -> Dict[str, Any]:
     """
     Formats the retrieved product analysis data into a consistent response structure.
 
@@ -22,36 +22,34 @@ def format_analysis_response(product_data: Optional[Dict[str, Any]]) -> Dict[str
             "manufacturing_info": None,
         }
 
-    # Assuming product_data is a dictionary representing the joined data from product, ingredients, etc.
-    # Adjust field names based on your actual database schema and query results.
-    safety_score_value = product_data.get("safety_score")
+    safety_score_value = product_data.safety_score
     safety_score_isPresent = safety_score_value is not None
 
     return {
         "found": True,
         "safety_score": {
-            "calculated": safety_score_calculated,
+            "isPresent": safety_score_isPresent,
             "value": safety_score_value,
         },
         "product_info": {
-            "id": product_data.get("product_id"),
-            "name": product_data.get("product_name"),
-            "barcode": product_data.get("product_barcode"),
-            "image_url": product_data.get("product_image_url"),
-            "brand": product_data.get("product_brand"),
-            "manufacturing_places": product_data.get("product_manufacturing_places"),
-            "stores": product_data.get("product_stores"),
-            "countries": product_data.get("product_countries"),
-        } if product_data.get("product_id") is not None else None,
+            "id": product_data.id,
+            "name": product_data.name,
+            "barcode": product_data.barcode,
+            "image_url": product_data.image_url,
+            "brand": product_data.brand,
+            "manufacturing_places": product_data.manufacturing_places,
+            "stores": product_data.stores,
+            "countries": product_data.countries,
+        } if product_data.id is not None else None,
         "ingredient_info": {
-            "ingredients_text": product_data.get("ingredients_text"),
-            "ingredients_analysis": product_data.get("ingredients_analysis"),
-            "additives": product_data.get("additives"),
-        } if product_data.get("ingredients_text") is not None else None,
+            "ingredients_text": product_data.ingredients_text,
+            "ingredients_analysis": product_data.ingredients_analysis,
+            "additives": product_data.additives,
+        } if product_data.ingredients_text is not None else None,
         "allergen_info": {
-            "allergens": product_data.get("allergens"),
-            "traces": product_data.get("traces"),
-        } if product_data.get("allergens") is not None or product_data.get("traces") is not None else None,
+            "allergens": product_data.allergens,
+            "traces": product_data.traces,
+        } if product_data.allergens is not None or product_data.traces is not None else None,
         "diet_info": {
             "vegan": product_data.get("vegan"),
             "vegetarian": product_data.get("vegetarian"),