API: Modify tool calling for wider compat

When revisiting tool calls, the formats have more or less become standard.
For greater compatibility with templates, primarily use the message.tools
parameter and remove the extra custom metadata that is no longer required.

However, unlike other backends, tabbyAPI still uses template metadata
to declare what the tool start string is. This allows for template-level
customization along with giving more power to the user while the server
exists to consume rather than work on a case-by-case basis.

Signed-off-by: kingbri <8082010+kingbri1@users.noreply.github.com>

endpoints/OAI/types/chat_completion.py

@@ -5,7 +5,7 @@ from typing import Literal, Union, List, Optional, Dict
 from uuid import uuid4
 
 from endpoints.OAI.types.common import UsageStats, CommonCompletionRequest
-from endpoints.OAI.types.tools import ToolSpec, ToolCall, tool_call_schema
+from endpoints.OAI.types.tools import ToolSpec, ToolCall
 
 
 class ChatCompletionLogprob(BaseModel):
@@ -73,15 +73,6 @@ class ChatCompletionRequest(CommonCompletionRequest):
     tools: Optional[List[ToolSpec]] = None
     functions: Optional[List[Dict]] = None
 
-    # Typically collected from Chat Template.
-    # Don't include this in the OpenAPI docs
-    # TODO: Use these custom parameters
-    tool_call_start: SkipJsonSchema[Optional[List[Union[str, int]]]] = Field(
-        default_factory=list
-    )
-    tool_call_end: SkipJsonSchema[Optional[str]] = None
-    tool_call_schema: SkipJsonSchema[Optional[dict]] = tool_call_schema
-
     # Chat completions requests do not have a BOS token preference. Backend
     # respects the tokenization config for the individual model.
     add_bos_token: Optional[bool] = None

endpoints/OAI/types/tools.py

@@ -1,30 +1,6 @@
 from pydantic import BaseModel
 from typing import Dict, Literal
 
-tool_call_schema = {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "type": "array",
-    "items": {
-        "type": "object",
-        "properties": {
-            "id": {"type": "string"},
-            "function": {
-                "type": "object",
-                "properties": {
-                    "name": {"type": "string"},
-                    "arguments": {
-                        # Converted to OAI's string in post process
-                        "type": "object"
-                    },
-                },
-                "required": ["name", "arguments"],
-            },
-            "type": {"type": "string", "enum": ["function"]},
-        },
-        "required": ["id", "function", "type"],
-    },
-}
-
 
 class Function(BaseModel):
     """Represents a description of a tool function."""