Update api/utils.py

api/utils.py

@@ -147,7 +147,6 @@ def create_chat_completion_data(
     prompt_tokens: int = 0,
     completion_tokens: int = 0,
     finish_reason: Optional[str] = None,
-    function_call: Optional[Dict] = None,
 ) -> Dict[str, Any]:
     usage = None
     if finish_reason == "stop":
@@ -162,22 +161,15 @@ def create_chat_completion_data(
         "created": timestamp,
         "model": model,
         "system_fingerprint": system_fingerprint,
-        "choices": [{
-            "index": 0,
-            "delta": {
-                "content": content if not function_call else None,
-                "role": "assistant",
-                "function_call": function_call
-            },
-            "finish_reason": finish_reason
-        }],
+        "choices": [{"index": 0, "delta": {"content": content, "role": "assistant"}, "finish_reason": finish_reason}],
         "usage": usage,
     }
 
-def message_to_dict(message, model_prefix: Optional[str] = None, tools: Optional[List[Dict]] = None) -> Dict[str, Any]:
+def message_to_dict(message, model_prefix: Optional[str] = None):
     """
     Convert a ChatRequest message to a dict for the request payload.
-    Supports function calling, images, and model prefixes.
+    Supports up to three images with type-based structure and sends multiple formats.
+    Prepends model_prefix to text content if specified.
     """
     content = ""
     images_data = []
@@ -250,7 +242,7 @@ async def process_streaming_response(request: ChatRequest):
         logger.error("No h-value for validation.")
         raise HTTPException(status_code=500, detail="Missing h-value.")
 
-    messages = [message_to_dict(msg, model_prefix=model_prefix, tools=request.tools) for msg in request.messages]
+    messages = [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages]
 
     json_data = {
         "agentMode": agent_mode,
@@ -328,27 +320,7 @@ async def process_streaming_response(request: ChatRequest):
                         final_snapzion_links.extend(snapzion_urls)
                     cleaned_content = strip_model_prefix(chunk, model_prefix)
                     completion_tokens += calculate_tokens(cleaned_content, request.model)
-                    
-                    # Handle function call responses
-                    function_call = None
-                    if cleaned_content and cleaned_content.startswith("{"):
-                        try:
-                            function_call = json.loads(cleaned_content)
-                            cleaned_content = None  # Content must be null for function calls
-                        except json.JSONDecodeError:
-                            pass
-                    
-                    yield "data: " + json.dumps(create_chat_completion_data(
-                        cleaned_content, 
-                        request.model,
-                        timestamp,
-                        request_id,
-                        system_fingerprint,
-                        prompt_tokens,
-                        completion_tokens,
-                        finish_reason=None,
-                        function_call=function_call
-                    )) + "\n\n"
+                    yield "data: " + json.dumps(create_chat_completion_data(cleaned_content, request.model, timestamp, request_id, system_fingerprint, prompt_tokens, completion_tokens)) + "\n\n"
                 yield "data: " + json.dumps(create_chat_completion_data("", request.model, timestamp, request_id, system_fingerprint, prompt_tokens, completion_tokens, "stop")) + "\n\n"
                 yield "data: [DONE]\n\n"
         except httpx.HTTPStatusError as e:
@@ -402,7 +374,7 @@ async def process_non_streaming_response(request: ChatRequest):
         logger.error("Failed to retrieve h-value.")
         raise HTTPException(status_code=500, detail="Missing h-value.")
 
-    messages = [message_to_dict(msg, model_prefix=model_prefix, tools=request.tools) for msg in request.messages]
+    messages = [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages]
 
     json_data = {
         "agentMode": agent_mode,