Changed supabase query

controller.py

@@ -76,6 +76,7 @@ class CsvUrlRequest(BaseModel):
     
 class ImageRequest(BaseModel):
     image_path: str
+    chat_id: str
     
 class FileProps(BaseModel):
     fileName: str
@@ -176,7 +177,7 @@ async def get_image(request: ImageRequest, authorization: str = Header(None)):
         image_file_path = request.image_path
         unique_file_name =f'{str(uuid.uuid4())}.png'
         logger.info("Uploading the chart to supabase...")
-        image_public_url = await upload_file_to_supabase(f"{image_file_path}", unique_file_name)
+        image_public_url = await upload_file_to_supabase(f"{image_file_path}", unique_file_name, chat_id=request.chat_id)
         logger.info("Image uploaded to Supabase and Image URL is... ", {image_public_url})
         os.remove(image_file_path)
         return {"image_url": image_public_url}
@@ -219,15 +220,7 @@ def groq_chat(csv_url: str, question: str):
             current_api_key = groq_api_keys[current_groq_key_index]
 
         try:
-            # Delete cache file if exists
-            # cache_db_path = "/app/cache/cache_db_0.11.db"
-            # if os.path.exists(cache_db_path):
-            #     try:
-            #         os.remove(cache_db_path)
-            #         print(f"Deleted cache DB file: {cache_db_path}")
-            #     except Exception as e:
-            #         print(f"Error deleting cache DB file: {e}")
-
+           
             data = clean_data(csv_url)
             llm = ChatGroq(model=model_name, api_key=current_api_key)
             # Generate unique filename using UUID
@@ -347,9 +340,10 @@ async def csv_chat(request: Dict, authorization: str = Header(None)):
         detailed_answer = request.get("detailed_answer")
         conversation_history = request.get("conversation_history", [])
         generate_report = request.get("generate_report")
+        chat_id = request.get("chat_id")
         
         if generate_report is True:
-            report_files = await generate_csv_report(csv_url, query)
+            report_files = await generate_csv_report(csv_url, query, chat_id)
             if report_files is not None:
                 return {"answer": jsonable_encoder(report_files)}
 
@@ -363,7 +357,7 @@ async def csv_chat(request: Dict, authorization: str = Header(None)):
         # Orchestrate the execution
         if detailed_answer is True:
            orchestrator_answer = await asyncio.to_thread(
-            csv_orchestrator_chat, decoded_url, query, conversation_history
+            csv_orchestrator_chat, decoded_url, query, conversation_history, chat_id
            )
            if orchestrator_answer is not None:
               return {"answer": jsonable_encoder(orchestrator_answer)}
@@ -851,9 +845,10 @@ async def csv_chart(request: dict, authorization: str = Header(None)):
         detailed_answer = request.get("detailed_answer", False)
         conversation_history = request.get("conversation_history", [])
         generate_report = request.get("generate_report", False)
+        chat_id = request.get("chat_id", "")
         
         if generate_report is True:
-            report_files = await generate_csv_report(csv_url, query)
+            report_files = await generate_csv_report(csv_url, query, chat_id)
             if report_files is not None:
                 return {"orchestrator_response": jsonable_encoder(report_files)}
 
@@ -867,7 +862,7 @@ async def csv_chart(request: dict, authorization: str = Header(None)):
             if isinstance(langchain_result, list) and len(langchain_result) > 0:
                 unique_file_name =f'{str(uuid.uuid4())}.png'
                 logger.info("Uploading the chart to supabase...")
-                image_public_url = await upload_file_to_supabase(f"{langchain_result[0]}", unique_file_name)
+                image_public_url = await upload_file_to_supabase(f"{langchain_result[0]}", unique_file_name, chat_id=chat_id)
                 logger.info("Image uploaded to Supabase and Image URL is... ", {image_public_url})
                 os.remove(langchain_result[0])
                 return {"image_url": image_public_url}
@@ -876,7 +871,7 @@ async def csv_chart(request: dict, authorization: str = Header(None)):
         # Use orchestrator to handle the user's chart query first
         if detailed_answer is True:
            orchestrator_answer = await asyncio.to_thread(
-             csv_orchestrator_chat, csv_url, query, conversation_history
+             csv_orchestrator_chat, csv_url, query, conversation_history, chat_id
            )
         
            if orchestrator_answer is not None:
@@ -890,7 +885,7 @@ async def csv_chart(request: dict, authorization: str = Header(None)):
         if isinstance(groq_result, str) and groq_result != "Chart not generated":
             unique_file_name =f'{str(uuid.uuid4())}.png'
             logger.info("Uploading the chart to supabase...")
-            image_public_url = await upload_file_to_supabase(f"{groq_result}", unique_file_name)
+            image_public_url = await upload_file_to_supabase(f"{groq_result}", unique_file_name, chat_id=chat_id)
             logger.info("Image uploaded to Supabase and Image URL is... ", {image_public_url})
             os.remove(groq_result)
             return {"image_url": image_public_url}
@@ -905,7 +900,7 @@ async def csv_chart(request: dict, authorization: str = Header(None)):
         if isinstance(langchain_paths, list) and len(langchain_paths) > 0:
            unique_file_name =f'{str(uuid.uuid4())}.png'
            logger.info("Uploading the chart to supabase...")
-           image_public_url = await upload_file_to_supabase(f"{langchain_paths[0]}", unique_file_name)
+           image_public_url = await upload_file_to_supabase(f"{langchain_paths[0]}", unique_file_name, chat_id=chat_id)
            logger.info("Image uploaded to Supabase and Image URL is... ", {image_public_url})
            os.remove(langchain_paths[0])
            return {"image_url": image_public_url}

gemini_report_generator.py

@@ -288,7 +288,7 @@ def gemini_llm_chat(csv_url: str, query: str) -> Dict[str, Any]:
         }
         
 
-async def generate_csv_report(csv_url: str, query: str) -> FileBoxProps:
+async def generate_csv_report(csv_url: str, query: str, chat_id: str) -> FileBoxProps:
     try:
         result = gemini_llm_chat(csv_url, query)
         logger.info(f"Raw result from gemini_llm_chat: {result}")
@@ -306,7 +306,8 @@ async def generate_csv_report(csv_url: str, query: str) -> FileBoxProps:
                         unique_file_name = f"{uuid.uuid4()}_{file_name}"
                         public_url = await upload_file_to_supabase(
                             file_path=csv_path,
-                            file_name=unique_file_name
+                            file_name=unique_file_name,
+                            chat_id=chat_id
                         )
                         csv_files.append(FileProps(
                             fileName=file_name,
@@ -326,7 +327,8 @@ async def generate_csv_report(csv_url: str, query: str) -> FileBoxProps:
                         unique_file_name = f"{uuid.uuid4()}_{file_name}"
                         public_url = await upload_file_to_supabase(
                             file_path=img_path,
-                            file_name=unique_file_name
+                            file_name=unique_file_name,
+                            chat_id=chat_id
                         )
                         image_files.append(FileProps(
                             fileName=file_name,

orchestrator_agent.py

@@ -56,7 +56,7 @@ async def generate_csv_answer(csv_url: str, user_questions: List[str]) -> Any:
         answers.append(dict(question=question, answer=answer))
     return answers
 
-async def generate_chart(csv_url: str, user_questions: List[str]) -> Any:
+async def generate_chart(csv_url: str, user_questions: List[str], chat_id: str) -> Any:
     
     """
     This function generates charts for the given user questions using the CSV URL.
@@ -84,13 +84,13 @@ async def generate_chart(csv_url: str, user_questions: List[str]) -> Any:
     charts = []
     # Loop through the user questions and generate charts for each
     for question in user_questions:
-        chart = await csv_chart(csv_url, question)
+        chart = await csv_chart(csv_url, question, chat_id)
         charts.append(dict(question=question, image_url=chart))
     
     return charts
 
 # Function to create an agent with a specific CSV URL
-def create_agent(csv_url: str, api_key: str, conversation_history: List) -> Agent:
+def create_agent(csv_url: str, api_key: str, conversation_history: List, chat_id: str) -> Agent:
     csv_metadata = get_csv_basic_info(csv_url)
     
     system_prompt = f"""
@@ -115,6 +115,7 @@ def create_agent(csv_url: str, api_key: str, conversation_history: List) -> Agen
 - **Dataset:** {csv_url}
 - **Metadata:** {csv_metadata}
 - **History:** {conversation_history}
+- **Chat ID:** {chat_id}
 
 ## Required Output:
 For every question return:
@@ -133,7 +134,7 @@ For every question return:
         system_prompt=system_prompt
     )
 
-def csv_orchestrator_chat(csv_url: str, user_question: str, conversation_history: List) -> str:
+def csv_orchestrator_chat(csv_url: str, user_question: str, conversation_history: List, chat_id: str) -> str:
     print("CSV URL:", csv_url)
     print("User questions:", user_question)
 
@@ -141,7 +142,7 @@ def csv_orchestrator_chat(csv_url: str, user_question: str, conversation_history
     for api_key in GEMINI_API_KEYS:
         try:
             print(f"Attempting with API key: {api_key}")
-            agent = create_agent(csv_url, api_key, conversation_history)
+            agent = create_agent(csv_url, api_key, conversation_history, chat_id)
             result = agent.run_sync(user_question)
             print("Orchestrator Result:", result.data)
             return result.data

orchestrator_functions.py

@@ -569,7 +569,7 @@ async def csv_chat(csv_url: str, query: str):
 
 
 
-async def csv_chart(csv_url: str, query: str):
+async def csv_chart(csv_url: str, query: str, chat_id: str):
     """
     Generate a chart based on the provided CSV URL and query.
     Prioritizes OpenAI, then raw Groq, then LangChain Gemini, and finally LangChain Groq as fallback.
@@ -590,10 +590,10 @@ async def csv_chart(csv_url: str, query: str):
     - dict: {"image_url": "https://storage.example.com/chart_uuid.png"}
     """
     
-    async def upload_and_return(image_path: str) -> dict:
+    async def upload_and_return(image_path: str, chat_id: str) -> dict:
         """Helper function to handle image uploads"""
         unique_name = f'{uuid.uuid4()}.png'
-        public_url = await upload_file_to_supabase(image_path, unique_name)
+        public_url = await upload_file_to_supabase(image_path, unique_name, chat_id)
         logger.info(f"Uploaded chart: {public_url}")
         os.remove(image_path) # Remove the local image file after upload
         return {"image_url": public_url}
@@ -605,7 +605,7 @@ async def csv_chart(csv_url: str, query: str):
             logger.info(f"OpenAI chart result:", openai_result)
 
             if openai_result and openai_result != 'Chart not generated':
-                return await upload_and_return(openai_result)
+                return await upload_and_return(openai_result, chat_id)
 
             raise Exception("OpenAI failed to generate chart")
 
@@ -617,7 +617,7 @@ async def csv_chart(csv_url: str, query: str):
                 logger.info(f"Raw Groq chart result:", groq_result)
             
                 if groq_result and groq_result != 'Chart not generated':
-                    return await upload_and_return(groq_result)
+                    return await upload_and_return(groq_result, chat_id)
                 
                 raise Exception("Raw Groq failed to generate chart")
             
@@ -634,11 +634,11 @@ async def csv_chart(csv_url: str, query: str):
                     # --- i) If Gemini result is a string, return it ---
                     if gemini_result and isinstance(gemini_result, str):
                         clean_path = gemini_result.strip()
-                        return await upload_and_return(clean_path)
+                        return await upload_and_return(clean_path, chat_id)
                 
                     # --- ii) If Gemini result is a list, return the first element ---
                     if gemini_result and isinstance(gemini_result, list) and len(gemini_result) > 0:
-                        return await upload_and_return(gemini_result[0])
+                        return await upload_and_return(gemini_result[0], chat_id)
                     
                     raise Exception("LangChain Gemini returned empty result")
                 
@@ -653,7 +653,7 @@ async def csv_chart(csv_url: str, query: str):
                         logger.info("LangChain Groq chart result:", lc_groq_paths)
                     
                         if isinstance(lc_groq_paths, list) and lc_groq_paths:
-                            return await upload_and_return(lc_groq_paths[0])
+                            return await upload_and_return(lc_groq_paths[0], chat_id)
                         
                         return {"error": "All chart generation methods failed"}
                     

supabase_service.py

@@ -15,10 +15,10 @@ supabase: Client = create_client(SUPABASE_URL, SUPABASE_KEY)
 # Define the bucket name (you can create one in the Supabase Storage section)
 BUCKET_NAME = "csvcharts"
 
-async def upload_file_to_supabase(file_path: str, file_name: str) -> str:
+async def upload_file_to_supabase(file_path: str, file_name: str, chat_id: str) -> str:
     """
     Uploads an image to Supabase Storage and returns the public URL.
-    Also saves the mapping between public_url and chart_name in the database.
+    Saves the mapping between public_url, chart_name, and chat_id in the database.
     """
     if not os.path.exists(file_path):
         raise FileNotFoundError(f"The file {file_path} does not exist.")
@@ -35,13 +35,16 @@ async def upload_file_to_supabase(file_path: str, file_name: str) -> str:
     public_url = supabase.storage.from_(BUCKET_NAME).get_public_url(file_name)
     print("Public URL:", public_url)
 
-    # Save the mapping to the database
+    # Save the mapping to the database including chat_id
     try:
         supabase.table("chart_mappings").insert({
             "public_url": public_url,
-            "chart_name": file_name
+            "chart_name": file_name,
+            "chat_id": chat_id
         }).execute()
     except Exception as e:
+        # Try to delete the uploaded file if DB insertion fails
+        supabase.storage.from_(BUCKET_NAME).remove([file_name])
         raise Exception(f"Failed to save mapping to database: {e}")
 
     return public_url