From 3c4e8dadd669a70694ae095d9b1d8409c82252f2 Mon Sep 17 00:00:00 2001
From: glide-the <2533736852@qq.com>
Date: Sun, 31 Mar 2024 19:45:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E9=BB=98=E8=AE=A4=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 model-providers/model_providers.yaml           |  2 +-
 .../bootstrap_web/openai_bootstrap_web.py      | 18 ++++++++++--------
 .../core/bootstrap/openai_protocol.py          |  6 +++---
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/model-providers/model_providers.yaml b/model-providers/model_providers.yaml
index 86171fb1..d88736b3 100644
--- a/model-providers/model_providers.yaml
+++ b/model-providers/model_providers.yaml
@@ -24,6 +24,6 @@ xinference:
       model_type: 'llm'
       model_credentials:
         server_url: 'http://127.0.0.1:9997/'
-        model_uid: 'gpt-3.5-turbo'
+        model_uid: 'chatglm3-6b'
 
 
diff --git a/model-providers/model_providers/bootstrap_web/openai_bootstrap_web.py b/model-providers/model_providers/bootstrap_web/openai_bootstrap_web.py
index 31b2cb77..9e20d7aa 100644
--- a/model-providers/model_providers/bootstrap_web/openai_bootstrap_web.py
+++ b/model-providers/model_providers/bootstrap_web/openai_bootstrap_web.py
@@ -398,14 +398,16 @@ class RESTFulOpenAIBootstrapBaseWeb(OpenAIBootstrapBaseWeb):
             _convert_to_message(message) for message in chat_request.messages
         ]
 
-        tools = [
-            PromptMessageTool(
-                name=f.function.name,
-                description=f.function.description,
-                parameters=f.function.parameters,
-            )
-            for f in chat_request.tools
-        ]
+        tools = []
+        if chat_request.tools:
+            tools = [
+                PromptMessageTool(
+                    name=f.function.name,
+                    description=f.function.description,
+                    parameters=f.function.parameters,
+                )
+                for f in chat_request.tools
+            ]
         if chat_request.functions:
             tools.extend(
                 [
diff --git a/model-providers/model_providers/core/bootstrap/openai_protocol.py b/model-providers/model_providers/core/bootstrap/openai_protocol.py
index ec5ddc3f..2945c0ba 100644
--- a/model-providers/model_providers/core/bootstrap/openai_protocol.py
+++ b/model-providers/model_providers/core/bootstrap/openai_protocol.py
@@ -140,11 +140,11 @@ class ChatCompletionRequest(BaseModel):
     tools: Optional[List[FunctionAvailable]] = None
     functions: Optional[List[FunctionDefinition]] = None
     function_call: Optional[FunctionCallDefinition] = None
-    temperature: Optional[float] = None
-    top_p: Optional[float] = None
+    temperature: Optional[float] = 0.75
+    top_p: Optional[float] = 0.75
     top_k: Optional[float] = None
     n: int = 1
-    max_tokens: Optional[int] = None
+    max_tokens: Optional[int] = 256
     stop: Optional[list[str]] = None
     stream: Optional[bool] = False