Reverting the tools commit (#2404)

mem0/llms/openai.py

@@ -9,17 +9,7 @@ from mem0.llms.base import LLMBase
 
 
 class OpenAILLM(LLMBase):
-    """
-    A class to interact with OpenAI or OpenRouter APIs for generating responses using LLMs.
-    """
-
     def __init__(self, config: Optional[BaseLlmConfig] = None):
-        """
-        Initializes the OpenAILLM instance.
-
-        Args:
-            config (Optional[BaseLlmConfig]): Configuration for the LLM, including model, API key, and base URLs.
-        """
         super().__init__(config)
 
         if not self.config.model:
@@ -34,27 +24,57 @@ class OpenAILLM(LLMBase):
             )
         else:
             api_key = self.config.api_key or os.getenv("OPENAI_API_KEY")
-            base_url = (
-                self.config.openai_base_url
-                or os.getenv("OPENAI_API_BASE")
-                or "https://api.openai.com/v1"
-            )
+            base_url = self.config.openai_base_url or os.getenv("OPENAI_API_BASE") or "https://api.openai.com/v1"
             self.client = OpenAI(api_key=api_key, base_url=base_url)
 
+    def _parse_response(self, response, tools):
+        """
+        Process the response based on whether tools are used or not.
+
+        Args:
+            response: The raw response from API.
+            tools: The list of tools provided in the request.
+
+        Returns:
+            str or dict: The processed response.
+        """
+        if tools:
+            processed_response = {
+                "content": response.choices[0].message.content,
+                "tool_calls": [],
+            }
+
+            if response.choices[0].message.tool_calls:
+                for tool_call in response.choices[0].message.tool_calls:
+                    processed_response["tool_calls"].append(
+                        {
+                            "name": tool_call.function.name,
+                            "arguments": json.loads(tool_call.function.arguments),
+                        }
+                    )
+
+            return processed_response
+        else:
+            return response.choices[0].message.content
+
     def generate_response(
         self,
         messages: List[Dict[str, str]],
-        response_format: Optional[str] = None,
-    ) -> str:
+        response_format=None,
+        tools: Optional[List[Dict]] = None,
+        tool_choice: str = "auto",
+    ):
         """
-        Generates a response based on the provided messages using OpenAI or OpenRouter.
+        Generate a response based on the given messages using OpenAI.
 
         Args:
-            messages (List[Dict[str, str]]): A list of message dictionaries containing 'role' and 'content'.
-            response_format (Optional[str]): The format of the response. Defaults to None.
+            messages (list): List of message dicts containing 'role' and 'content'.
+            response_format (str or object, optional): Format of the response. Defaults to "text".
+            tools (list, optional): List of tools that the model can call. Defaults to None.
+            tool_choice (str, optional): Tool choice method. Defaults to "auto".
 
         Returns:
-            str: The generated response from the model.
+            str: The generated response.
         """
         params = {
             "model": self.config.model,
@@ -82,6 +102,9 @@ class OpenAILLM(LLMBase):
 
         if response_format:
             params["response_format"] = response_format
+        if tools:  # TODO: Remove tools if no issues found with new memory addition logic
+            params["tools"] = tools
+            params["tool_choice"] = tool_choice
 
         response = self.client.chat.completions.create(**params)
-        return response.choices[0].message.content
+        return self._parse_response(response, tools)