Update app.py

app.py

@@ -157,12 +157,13 @@ Rules:
         from alert import execute_function
         return execute_function(function_name, kwargs)
     
-    def process_query(self, user_message: str, chat_id: Optional[str] = None, image_url: Optional[str] = None) -> Dict[str, Any]:
+    def process_query(self, user_message: str, user_id: str, chat_id: Optional[str] = None, image_url: Optional[str] = None) -> Dict[str, Any]:
         """
-        Process user query with improved conversation management
+        Process user query with user authentication and improved conversation management
         
         Args:
             user_message: The user's message
+            user_id: The user ID for authentication and isolation
             chat_id: Optional chat ID. If None, generates a new one
             image_url: Optional image URL
             
@@ -170,20 +171,31 @@ Rules:
             Dictionary containing response, chat_id, and message IDs
         """
         try:
+            # Validate user_id
+            if not user_id:
+                return {
+                    "error": "User ID is required for authentication",
+                    "chat_id": None,
+                    "is_new_chat": True,
+                    "user_message_id": None,
+                    "assistant_message_id": None,
+                    "total_messages": 0
+                }
+            
             # Handle chat ID
             if not chat_id:
-                chat_id = self.manager.generate_chat_id()
+                chat_id = self.manager.generate_chat_id(user_id)
                 is_new_chat = True
-                logger.info(f"Generated new chat ID: {chat_id}")
+                logger.info(f"Generated new chat ID: {chat_id} for user: {user_id}")
             else:
-                is_new_chat = not self.manager.chat_exists(chat_id)
+                is_new_chat = not self.manager.chat_exists(chat_id, user_id)
                 if is_new_chat:
-                    logger.info(f"Creating new chat with provided ID: {chat_id}")
+                    logger.info(f"Creating new chat with provided ID: {chat_id} for user: {user_id}")
                 else:
-                    logger.info(f"Continuing existing chat: {chat_id}")
+                    logger.info(f"Continuing existing chat: {chat_id} for user: {user_id}")
             
-            # Get conversation history
-            conversation_history = self.manager.get_history(chat_id)
+            # Get conversation history for this user
+            conversation_history = self.manager.get_history(chat_id, user_id)
             
             # Prepare messages for AI
             messages = [{"role": "system", "content": self.system_prompt}]
@@ -264,6 +276,65 @@ Rules:
             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)