handler v12

handler.py

@@ -104,18 +104,73 @@ class EndpointHandler:
                     # Split response into text and function call
                     parts = response.split("Calling function:", 1)
                     text_response = parts[0].strip()
-                    function_call = "Calling function:" + parts[1].strip()
+                    function_call = parts[1].strip()
                     
                     logger.info(f"Function call: {function_call}")
                     logger.info(f"Text response: {text_response}")
-                    # Return both text and tool message
-                    return {"result": [{"text": text_response}]},
-                        #{"generations": [{"text": function_call, "type": "tool"}]}
+                    
+                    # Return in Anthropic format with tool calls
+                    return {
+                        "result": {
+                            "metadata": {
+                                "finishReason": "end_turn",
+                                "contentFilterMetadata": None
+                            },
+                            "output": {
+                                "messageType": "ASSISTANT",
+                                "metadata": {
+                                    "messageType": "ASSISTANT"
+                                },
+                                "toolCalls": [{
+                                    "type": "function",
+                                    "function": {
+                                        "name": function_call.split("(")[0].strip(),
+                                        "arguments": function_call.split("(")[1].rstrip(")")
+                                    }
+                                }],
+                                "content": text_response
+                            }
+                        },
+                        "metadata": {
+                            "id": f"msg_{int(time.time()*1000)}",
+                            "model": "granite-3.1-8b",
+                            "usage": {
+                                "promptTokens": len(inputs["input_ids"][0]),
+                                "generationTokens": len(output_tokens[0]) - len(inputs["input_ids"][0]),
+                                "totalTokens": len(output_tokens[0])
+                            }
+                        }
+                    }
             else:
                 response = output_text
                 
             logger.info(f"Generated response: {json.dumps(response)}")
-            return {"result": [{"text": response}]}
+            # Return in Anthropic format without tool calls
+            return {
+                "result": {
+                    "metadata": {
+                        "finishReason": "end_turn",
+                        "contentFilterMetadata": None
+                    },
+                    "output": {
+                        "messageType": "ASSISTANT",
+                        "metadata": {
+                            "messageType": "ASSISTANT"
+                        },
+                        "toolCalls": [],
+                        "content": response
+                    }
+                },
+                "metadata": {
+                    "id": f"msg_{int(time.time()*1000)}",
+                    "model": "granite-3.1-8b",
+                    "usage": {
+                        "promptTokens": len(inputs["input_ids"][0]),
+                        "generationTokens": len(output_tokens[0]) - len(inputs["input_ids"][0]),
+                        "totalTokens": len(output_tokens[0])
+                    }
+                }
+            }
             
         except Exception as e:
             logger.error(f"Error during generation: {str(e)}", exc_info=True)