Update app.py

app.py

@@ -350,171 +350,7 @@ Rules:
         Returns:
             List of messages with their IDs
         """
-        return self.manager.get_history(chat_id, user_id).tool_calls
-                    ]
-                })
-                
-                # Execute all tool calls
-                for tool_call in message.tool_calls:
-                    function_name = tool_call.function.name
-                    function_args = json.loads(tool_call.function.arguments)
-                    
-                    logger.info(f"Calling function: {function_name} with args: {function_args}")
-                    
-                    # Call the function
-                    function_result = self.call_function(function_name, function_args)
-                    
-                    # Add function result to messages
-                    messages.append({
-                        "role": "tool",
-                        "tool_call_id": tool_call.id,
-                        "content": json.dumps(function_result)
-                    })
-                
-                # Add final system prompt for generating response
-                messages.append({
-                    "role": "system",
-                    "content": self.final_system
-                })
-                
-                # Get final response
-                final_response = self.client.chat.completions.create(
-                    model=self.config.model_name,
-                    messages=messages,
-                    temperature=self.config.temperature
-                )
-                response_content = final_response.choices[0].message.content
-            else:
-                response_content = message.content
-
-            # Add messages to conversation history with unique IDs
-            user_msg = self.manager.add_message(chat_id, user_id, "user", user_message, image_url)
-            assistant_msg = self.manager.add_message(chat_id, user_id, "assistant", response_content)
-            
-            return {
-                "response": response_content,
-                "chat_id": chat_id,
-                "is_new_chat": is_new_chat,
-                "user_message_id": user_msg.get("message_id"),
-                "assistant_message_id": assistant_msg.get("message_id"),
-                "total_messages": len(self.manager.get_history(chat_id, user_id))
-            }
-            
-        except Exception as e:
-            logger.error(f"Error processing query for chat {chat_id}, user {user_id}: {e}")
-            return {
-                "error": f"I apologize, but I encountered an error: {str(e)}. Please try again or rephrase your question.",
-                "chat_id": chat_id or self.manager.generate_chat_id(user_id) if user_id else None,
-                "is_new_chat": True,
-                "user_message_id": None,
-                "assistant_message_id": None,
-                "total_messages": 0
-            }.tool_calls
-                    ]
-                })
-                
-                # Execute all tool calls
-                for tool_call in message.tool_calls:
-                    function_name = tool_call.function.name
-                    function_args = json.loads(tool_call.function.arguments)
-                    
-                    logger.info(f"Calling function: {function_name} with args: {function_args}")
-                    
-                    # Call the function
-                    function_result = self.call_function(function_name, function_args)
-                    
-                    # Add function result to messages
-                    messages.append({
-                        "role": "tool",
-                        "tool_call_id": tool_call.id,
-                        "content": json.dumps(function_result)
-                    })
-                
-                # Add final system prompt for generating response
-                messages.append({
-                    "role": "system",
-                    "content": self.final_system
-                })
-                
-                # Get final response
-                final_response = self.client.chat.completions.create(
-                    model=self.config.model_name,
-                    messages=messages,
-                    temperature=self.config.temperature
-                )
-                response_content = final_response.choices[0].message.content
-            else:
-                response_content = message.content
-
-            # Add messages to conversation history with unique IDs
-            user_msg = self.manager.add_message(chat_id, "user", user_message, image_url)
-            assistant_msg = self.manager.add_message(chat_id, "assistant", response_content)
-            
-            return {
-                "response": response_content,
-                "chat_id": chat_id,
-                "is_new_chat": is_new_chat,
-                "user_message_id": user_msg.get("message_id"),
-                "assistant_message_id": assistant_msg.get("message_id"),
-                "total_messages": len(self.manager.get_history(chat_id))
-            }
-            
-        except Exception as e:
-            logger.error(f"Error processing query for chat {chat_id}: {e}")
-            return {
-                "error": f"I apologize, but I encountered an error: {str(e)}. Please try again or rephrase your question.",
-                "chat_id": chat_id or self.manager.generate_chat_id(),
-                "is_new_chat": True,
-                "user_message_id": None,
-                "assistant_message_id": None,
-                "total_messages": 0
-            }
-    
-    def get_chat_info(self, chat_id: str) -> Dict[str, Any]:
-        """
-        Get information about a specific chat
-        
-        Args:
-            chat_id: The chat ID to get information for
-            
-        Returns:
-            Dictionary with chat information
-        """
-        return self.manager.get_chat_info(chat_id)
-    
-    def get_all_chats(self) -> List[Dict[str, Any]]:
-        """
-        Get all chat sessions
-        
-        Returns:
-            List of chat session information
-        """
-        return self.manager.get_all_chat_sessions()
-    
-    def clear_history(self, chat_id: str) -> bool:
-        """
-        Clear conversation history for a specific chat
-        
-        Args:
-            chat_id: The ID of the chat to clear
-        
-        Returns:
-            True if deletion was successful, False otherwise
-        """
-        logger.info(f"Clearing history for chat: {chat_id}")
-        return self.manager.delete_history(chat_id)
-    
-    def get_messages(self, chat_id: str) -> List[Dict[str, Any]]:
-        """
-        Get all messages for a specific chat
-        
-        Args:
-            chat_id: The chat ID to get messages for
-            
-        Returns:
-            List of messages with their IDs
-        """
-        return self.manager.get_history(chat_id)
+        return self.manager.get_history(chat_id, user_id)
 
 
 # Utility class for generating example queries (can be used for testing)
@@ -571,7 +407,7 @@ def test_conversation_management():
         
         # Test 1: New conversation
         print("\n=== Test 1: New Conversation ===")
-        result1 = assistant.process_query("Hello, I need help with farming")
+        result1 = assistant.process_query("Hello, I need help with farming", "test_user_123")
         print(f"Chat ID: {result1['chat_id']}")
         print(f"Is new chat: {result1['is_new_chat']}")
         print(f"User message ID: {result1['user_message_id']}")
@@ -581,7 +417,7 @@ def test_conversation_management():
         # Test 2: Continue conversation
         print("\n=== Test 2: Continue Conversation ===")
         chat_id = result1['chat_id']
-        result2 = assistant.process_query("What crops grow well in sandy soil?", chat_id=chat_id)
+        result2 = assistant.process_query("What crops grow well in sandy soil?", "test_user_123", chat_id=chat_id)
         print(f"Chat ID: {result2['chat_id']}")
         print(f"Is new chat: {result2['is_new_chat']}")
         print(f"User message ID: {result2['user_message_id']}")
@@ -590,20 +426,20 @@ def test_conversation_management():
         
         # Test 3: Get messages
         print(f"\n=== Test 3: Messages in chat {chat_id} ===")
-        messages = assistant.get_messages(chat_id)
+        messages = assistant.get_messages(chat_id, "test_user_123")
         for msg in messages:
             print(f"  Message {msg.get('message_id')}: {msg.get('role')} - {msg.get('content')[:50]}...")
         
         # Test 4: User-defined chat ID
         print("\n=== Test 4: User-defined Chat ID ===")
         custom_chat_id = "my_farming_chat_2024"
-        result3 = assistant.process_query("Tell me about wheat farming", chat_id=custom_chat_id)
+        result3 = assistant.process_query("Tell me about wheat farming", "test_user_123", chat_id=custom_chat_id)
         print(f"Custom chat ID: {result3['chat_id']}")
         print(f"Is new chat: {result3['is_new_chat']}")
         
         # Test 5: Get all chats
         print("\n=== Test 5: All Chats ===")
-        all_chats = assistant.get_all_chats()
+        all_chats = assistant.get_all_chats("test_user_123")
         for chat in all_chats[:3]:  # Show first 3
             print(f"  {chat.get('session_id')}: {chat.get('title')} ({chat.get('message_count')} messages)")