Update recommender/graph_retrieval_vectordb.py

recommender/graph_retrieval_vectordb.py

@@ -3,8 +3,8 @@ from neo4j import GraphDatabase
 import os
 import numpy as np
 import faiss
-from data import card_descriptions,eligibility_df
 from neo4j.exceptions import ServiceUnavailable, TransientError
+from data import card_descriptions,eligibility_df
 
 #neo4j credentials
 NEO4J_URI = os.environ.get("NEO4J_URI")
@@ -19,7 +19,8 @@ def get_driver():
     return _driver
 
 #generating cypher query
-def generate_cypher(user_query, query_intent, include_cobranded):
+
+def generate_cypher(user_query, query_intent):
     genai.configure(api_key='AIzaSyAHoi9xbYAThtjXlyF_IKFtruoWYoUCjJQ')  
     model3 = genai.GenerativeModel('gemini-1.5-flash-latest')
     print("inside cypher query gen")
@@ -27,7 +28,6 @@ def generate_cypher(user_query, query_intent, include_cobranded):
     context_note = f"""
         Contextual Flags:
         - FD Card intent: {query_intent}
-        - Include co-branded cards: {include_cobranded}
     """
 
     cypher_prompt = f"""
@@ -54,7 +54,6 @@ def generate_cypher(user_query, query_intent, include_cobranded):
         - If fuel is mentioned, include both `Fuel Benefits` and `Fuel Surcharge Waiver`.
         - **ALWAYS** match features using: `f.name IN [...]` — even if there is only **one** feature.
         
-        
         Valid values:
         - card_type: 'FD Card' or 'Regular'
         - premium: true (no concept of false — just include it if applicable)
@@ -62,11 +61,12 @@ def generate_cypher(user_query, query_intent, include_cobranded):
         
         MANDATORY Condition Rules:
         - If FD Card intent is true → include: `c.card_type = 'FD Card'`
-        - Else → include: `c.card_type = 'Regular'`
+        - Else → include: `c.card_type = 'Regular'` 
         - If the query is based on beginners or students or people with no or low credit history then use FD Card.
         - If the query uses words like "premium", "elite", "luxury", "exclusive", "infinia", "black", etc. → include: `AND c.premium = true`
         - If the query includes low spending, without high spending or budget → include: `(c.premium IS NULL OR c.premium = false)`
-        - If include co-branded is false → include: `AND (c.co_branded IS NULL OR c.co_branded = false)`
+        - If the user query does not mentions about co-branded cards then don't consider that property. 
+        - If user says no need co-branded cards only then include → include: `AND (c.co_branded IS NULL OR c.co_branded = false)`
         - Use exact values for `bank_name` as in the database: ["SBI", "HDFC", "Axis", "ICICI", "YES", "HSBC", "IDFC", "American Express", "SMB", "Federal Bank", "AU Bank", "IDBI", "Kotak Mahindra Bank","IndusInd","RBL"]
         - Do not add bank after the name of the bank if it is not mentioned in the datase list.
         - These conditions are **MANDATORY**. If they apply, include them in the `WHERE` clause. Do not skip them.
@@ -74,15 +74,16 @@ def generate_cypher(user_query, query_intent, include_cobranded):
         ---
         
         Available features:
-          "General Cashback", "Fuel Surcharge Waiver", "Fuel Benefits", "Welcome Bonus",
-          "Airport Lounge Access", "General Reward Points", "Domestic Travel Benefits",
-          "Movie Benefits", "Flight Discounts", "International Travel Benefits",
-          "Hotel Benefits", "Dining Benefits", "Daily Spends (Grocery)", "Railway Benefits",
-          "Travel Benefits", "Railway Lounge", "Insurance", "Utility",
-          "E-commerce Platform Benefits", "Air Miles", "Spa Access Benefits",
-          "Lifestyle & Luxury Perks", "Golf Access & Perks", "Online Shopping Benefits",
-          "UPI Transaction Support", "Health Benefits", "EMI Conversion Options",
-          "No Forex Markup Fee", "Roadside Assistance", "Rupay Network Support",Super Premium Cards
+          'Fuel Surcharge Waiver','Insurance','Shopping Benefits','Airport Lounge Access','Co-Branded',
+          'Daily Spends (Grocery)','Dining Benefits','Domestic Travel Benefits','Entertainment',
+          'General Reward Points','Movie Benefits','Rupay Network Support','Student',
+          'UPI Transaction Support','Welcome Bonus','International Travel Benefits','premium',
+          'Flight Discounts','Hotel Benefits','Travel Benefits','Railway Benefits','Railway Lounge',
+          'Utility','Beginners (Entry Level)','E-commerce Platform Benefits','Air Miles',
+          'Jewellery Spends','Concierge Services','Food Delivery Benefits','Lifestyle & Luxury Perks',
+          'Spa Access Benefits','Golf Access & Perks','Super Premium','Frequent Flyer Benefits',
+          'Health Benefits','Rent Payment Benefits','Education','Lifetime Free','Roadside Assistance',
+          'EMI Conversion Options','No Forex Markup Fee','Secured FD Based','Cashback','Fuel Benefits','Business'
         
         ---
         
@@ -131,6 +132,7 @@ def generate_cypher(user_query, query_intent, include_cobranded):
 
     return cypher_code
 
+
 #generating embeddings (run only once)
 def chunk_text(text, chunk_size=1):
     sentences = text.split("; ")
@@ -194,12 +196,12 @@ def eligibility_filter(cards, user_income, user_cibil, user_age,min_joining_fee,
 
 
 
-#function for retrieving cards from knowledge graph
+#function for retrieving cards from knowledge graph and put into vector storage
 class Neo4jConnectionError(Exception):
     pass
 
 def run_cypher_query(user_query, query, use_eligibility, user_income, user_cibil, user_age,
-                     min_joining_fee, max_joining_fee, min_annual_fee, max_annual_fee, excluded_cards, max_retries=3, retry_delay=2):
+                     min_joining_fee, max_joining_fee, min_annual_fee, max_annual_fee,excluded_cards, max_retries=3, retry_delay=2):
     
     attempt = 0
     while attempt < max_retries: