aligned anthropic with openai; minor changes to openai

prem_utils/connectors/anthropic.py

@@ -84,15 +84,33 @@ def preprocess_messages(self, messages):
 
     def _get_content(self, response, tools=False):
         if tools:
-            return {"content": response.content[0].text, "role": "assistant", "tools": []}
+            return {"content": response.content[0].text, "role": "assistant", "tool_calls": []}
         else:
             tool_messages = filter(lambda x: "input" in x.__dir__() and "name" in x.__dir__(), response.content)
             return {
                 "content": "",
                 "role": "assistant",
-                "tools": [{"input": tool_message.input, "name": tool_message.name} for tool_message in tool_messages],
+                "tool_calls": [
+                    {"function_arguments": tool_message.input, "name": tool_message.name, "type": "function"}
+                    for tool_message in tool_messages
+                ],
             }
 
+    def _parse_tools(self, tools: list[dict[str, any]]):
+        if not tools:
+            return []
+        parsed_tools = []
+
+        for tool in tools:
+            transformed_tool = {
+                "name": tool["function"]["name"],
+                "description": tool["function"]["description"],
+                "input_schema": tool["function"]["parameters"],
+            }
+            parsed_tools.append(transformed_tool)
+
+        return parsed_tools
+
     async def chat_completion(
         self,
         model: str,
@@ -107,8 +125,9 @@ async def chat_completion(
         stream: bool = False,
         temperature: float = 1,
         top_p: float = 1,
-        tools=[],
+        tools=None,
     ):
+        tools = self._parse_tools(tools)
         if tools != [] and stream:
             raise errors.PremProviderError(
                 "Cannot use tools with stream=True",

prem_utils/connectors/openai.py

@@ -85,8 +85,15 @@ async def chat_completion(
         temperature: float = 1,
         top_p: float = 1,
         tools=None,
-        tool_choice=None,
     ):
+        if tools is not None and stream:
+            raise errors.PremProviderError(
+                "Cannot use tools with stream=True",
+                provider="openai",
+                model=model,
+                provider_message="Cannot use tools with stream=True",
+            )
+
         if self.prompt_template is not None:
             messages = self.apply_prompt_template(messages)
 
@@ -103,7 +110,6 @@ async def chat_completion(
             top_p=top_p,
             logprobs=log_probs,
             logit_bias=logit_bias,
-            tool_choice=tool_choice,
             tools=tools,
         )
         try: