APi Calls#3

nlp_service.py

@@ -666,7 +666,9 @@ def call_gemini_api(text, api_key):
     # Example using Google AI Generative Language API (adjust model and endpoint as needed)
     # Ensure you have the google-generativeai library installed (`pip install google-generativeai`)
     # and the API key is correctly set as an environment variable.
-    api_endpoint = f"https://generativelanguage.googleapis.com/v1beta/models/gemini-pro:generateContent?key={api_key}"
+    # Use a current model and the v1 endpoint
+    model_name = "gemini-2.0-flash-lite" # Updated model name
+    api_endpoint = f"https://generativelanguage.googleapis.com/v1/models/{model_name}:generateContent?key={api_key}"
     headers = {
         "Content-Type": "application/json"
     }
@@ -679,17 +681,17 @@ Text: "{text}"
 
 Desired JSON output format:
 {{
-  "action": "add_expense" | "query_expense",
+  "action": "add_expense" | "query_expense" | "unknown" | "info",
   "status": "success" | "failed",
-  "message": "Confirmation or result summary",
-  "details": {{ // Only for add_expense
+  "message": "Confirmation or result summary or explanation",
+  "details": {{ // Only for add_expense if successful
     "amount": <float>,
-    "currency": "<string>",
-    "category": "<string>",
-    "merchant": "<string>",
+    "currency": "<string>", // e.g., "₹", "$", "EUR"
+    "category": "<string>", // e.g., "food", "travel", "shopping"
+    "merchant": "<string>", // e.g., "Starbucks", "Amazon"
     "date": "YYYY-MM-DD"
   }},
-  "criteria": {{ // Only for query_expense
+  "criteria": {{ // Only for query_expense if successful
     "category": "<string>",
     "merchant": "<string>",
     "start_date": "YYYY-MM-DD",
@@ -697,7 +699,12 @@ Desired JSON output format:
   }}
 }}
 
-If the intent is unclear or details are missing, set action to "unknown" and status to "failed".
+- If the intent is clearly 'add_expense' and details can be extracted, use action "add_expense" and status "success". Include extracted details.
+- If the intent is clearly 'query_expense' and criteria can be extracted, use action "query_expense" and status "success". Include extracted criteria.
+- If the intent is unclear, details are missing for adding, or it's a general question/statement not related to adding/querying expenses, use action "unknown" or "info" and status "failed" or "success" respectively. Provide a helpful message.
+- Ensure date format is YYYY-MM-DD.
+- Default currency to "₹" if not specified.
+- Default category to "Uncategorized" if not specified.
 Provide only the JSON output.
 """
 

requirements.txt

@@ -1,6 +1,6 @@
 Pillow
 flask
-# requests # Removed as NLP is called directly now
+requests # Re-added for Gemini API call
 paddlepaddle
 paddleocr
 spacy>=3.0.0 # Added spaCy