Update app/api/routes.py

app/api/routes.py

@@ -2,37 +2,16 @@ from flask import Blueprint, Response, request, jsonify, current_app
 from app.models.recipe import Recipe
 import json
 import asyncio
-import os
 from app.services import extraction
 from app.services import image_query 
 
-api_bp = Blueprint('api', __name__, url_prefix='/api')
-
-@api_bp.route('/', methods=['GET'])
-def health_check():
-    return jsonify({
-        "status": "healthy",
-        "message": "Recipe Rover API is running",
-        "endpoints": {
-            "form_data": "/api/form-data [GET]",
-            "recommend": "/api/recommend [POST]",
-            "extract_recipe": "/api/extract-recipe-attributes [POST]",
-            "analyze_image": "/api/analyze-food-image [POST]"
-        }
-    })
-    
+api_bp = Blueprint('api', __name__)
+
 @api_bp.route('/form-data', methods=['GET'])
 def get_form_data():
-    # Use os.path.join to create a platform-independent path
-    file_path = os.path.join(os.getcwd(), 'form_data.json')
-    try:
-        with open(file_path, 'r') as file:
-            data = file.read()
-        return data
-    except FileNotFoundError:
-        return jsonify({"error": f"File not found at {file_path}"}), 404
-    except Exception as e:
-        return jsonify({"error": str(e)}), 500
+    with open('form_data.json', 'r') as file:
+        data = json.load(file)
+    return jsonify(data)
 
 @api_bp.route('/recommend', methods=['POST'])
 async def recommend_recipes():  # Make this function async
@@ -53,6 +32,11 @@ async def recommend_recipes():  # Make this function async
     except ValueError:
         return jsonify({"error": "Calories and time must be integers if provided"}), 400
 
+    feature_weights_recommend = {
+        'ingredients': 0.15, 'category': 0.25, 'dietary': 0.20,
+        'calories': 0.10, 'time': 0.10, 'keywords': 0.10, 'keywords_name': 0.10
+    }
+
     # Use await to call the async function
     recommendations = await current_app.recommendation_system.get_recommendations(
         category=category,
@@ -61,7 +45,8 @@ async def recommend_recipes():  # Make this function async
         calories=calories,
         time=time,
         keywords=keywords,
-        keywords_name=keywords_name
+        keywords_name=keywords_name,
+        feature_weights=feature_weights_recommend
     )
 
     return jsonify([vars(recipe) for recipe in recommendations])
@@ -83,6 +68,11 @@ async def recommend_recipes2():
         # Check if extraction was successful
         if 'error' in extracted_info:
             return jsonify(extracted_info), 500
+        
+        feature_weights_extract = {
+            'ingredients': 0.50, 'category': 0.0, 'dietary': 0.0,
+            'calories': 0.0, 'time': 0.0, 'keywords': 0.40, 'keywords_name': 0.10
+        }
 
         # Access the extracted attributes
         category = extracted_info.get('category', '')
@@ -90,6 +80,7 @@ async def recommend_recipes2():
         time = extracted_info.get('time', None)
         keywords = extracted_info.get('keywords', [])
         keywords_name = extracted_info.get('keywords_name', [])
+        ingredients = extracted_info.get('ingredients', [])
 
         # Convert calories and time to integers if they exist
         try:
@@ -101,11 +92,12 @@ async def recommend_recipes2():
         # Get recommendations using the recommendation system
         recommendations = await current_app.recommendation_system.get_recommendations(
             category=category,
-            ingredients=[],  # Adjust if you plan to add ingredients in the extraction function
+            ingredients=ingredients,  # Adjust if you plan to add ingredients in the extraction function
             calories=calories,
             time=time,
             keywords=keywords,
-            keywords_name=keywords_name
+            keywords_name=keywords_name,
+            feature_weights=feature_weights_extract
         )
 
         # Convert recommendations to JSON-serializable format
@@ -138,12 +130,18 @@ async def handle_analyze_food_image():
         if 'error' in extracted_info:
             return jsonify(extracted_info), 500
 
+        feature_weights_extract = {
+            'ingredients': 0.50, 'category': 0.0, 'dietary': 0.0,
+            'calories': 0.0, 'time': 0.0, 'keywords': 0.40, 'keywords_name': 0.10
+        }
+
         # Access the extracted attributes
         category = extracted_info.get('category', '')
         calories = extracted_info.get('calories', None)
         time = extracted_info.get('time', None)
         keywords = extracted_info.get('keywords', [])
         keywords_name = extracted_info.get('keywords_name', [])
+        ingredients = extracted_info.get('ingredients', [])
 
         # Convert calories and time to integers if they exist
         try:
@@ -155,11 +153,12 @@ async def handle_analyze_food_image():
         # Get recommendations using the recommendation system
         recommendations = await current_app.recommendation_system.get_recommendations(
             category=category,
-            ingredients=[],  # Adjust if you plan to add ingredients in the extraction function
+            ingredients=ingredients,  # Adjust if you plan to add ingredients in the extraction function
             calories=calories,
             time=time,
             keywords=keywords,
-            keywords_name=keywords_name
+            keywords_name=keywords_name,
+            feature_weights=feature_weights_extract
         )
 
         # Convert recommendations to JSON-serializable format