refac

backend/apps/ollama/main.py

@@ -728,8 +728,10 @@ async def generate_chat_completion(
     )
 
     payload = {
-        **form_data.model_dump(exclude_none=True),
+        **form_data.model_dump(exclude_none=True, exclude=["metadata"]),
     }
+    if "metadata" in payload:
+        del payload["metadata"]
 
     model_id = form_data.model
     model_info = Models.get_model_by_id(model_id)
@@ -894,9 +896,9 @@ async def generate_openai_chat_completion(
 ):
     form_data = OpenAIChatCompletionForm(**form_data)
 
-    payload = {
-        **form_data.model_dump(exclude_none=True),
-    }
+    payload = {**form_data}
+    if "metadata" in payload:
+        del payload["metadata"]
 
     model_id = form_data.model
     model_info = Models.get_model_by_id(model_id)

backend/apps/openai/main.py

@@ -357,6 +357,8 @@ async def generate_chat_completion(
 ):
     idx = 0
     payload = {**form_data}
+    if "metadata" in payload:
+        del payload["metadata"]
 
     model_id = form_data.get("model")
     model_info = Models.get_model_by_id(model_id)

backend/apps/webui/main.py

@@ -20,7 +20,6 @@ from apps.webui.routers import (
 )
 from apps.webui.models.functions import Functions
 from apps.webui.models.models import Models
-
 from apps.webui.utils import load_function_module_by_id
 
 from utils.misc import stream_message_template
@@ -53,7 +52,7 @@ import uuid
 import time
 import json
 
-from typing import Iterator, Generator
+from typing import Iterator, Generator, Optional
 from pydantic import BaseModel
 
 app = FastAPI()
@@ -193,6 +192,14 @@ async def generate_function_chat_completion(form_data, user):
     model_id = form_data.get("model")
     model_info = Models.get_model_by_id(model_id)
 
+    metadata = None
+    if "metadata" in form_data:
+        metadata = form_data["metadata"]
+        del form_data["metadata"]
+
+    if metadata:
+        print(metadata)
+
     if model_info:
         if model_info.base_model_id:
             form_data["model"] = model_info.base_model_id