update:server连接api (#747)

* update:server连接manager-api

* update:读取智能体模型配置

* update:添加默认模型的按钮

* update:优化配置读取方式

* update：server兼容manager接口改造

* update:优化私有配置加载

* update:加载私有模型配置

main/xiaozhi-server/core/providers/llm/gemini/gemini.py

@@ -4,15 +4,17 @@ from core.providers.llm.base import LLMProviderBase
 from config.logger import setup_logging
 import requests
 import json
+
 TAG = __name__
 logger = setup_logging()
 
+
 class LLMProvider(LLMProviderBase):
     def __init__(self, config):
         """初始化Gemini LLM Provider"""
         self.model_name = config.get("model_name", "gemini-1.5-pro")
         self.api_key = config.get("api_key")
-        self.http_proxy=config.get("http_proxy")
+        self.http_proxy = config.get("http_proxy")
         self.https_proxy = config.get("https_proxy")
         have_key = check_model_key("LLM", self.api_key)
 
@@ -22,7 +24,7 @@ class LLMProvider(LLMProviderBase):
         try:
             # 初始化Gemini客户端
             # 配置代理（如果提供了代理配置）
-            self.proxies=None
+            self.proxies = None
             if self.http_proxy is not "" or self.https_proxy is not "":
 
                 self.proxies = {
@@ -62,19 +64,16 @@ class LLMProvider(LLMProviderBase):
                 role = "model" if msg["role"] == "assistant" else "user"
                 content = msg["content"].strip()
                 if content:
-                    chat_history.append({
-                        "role": role,
-                        "parts": [{"text":content}]
-
-                    })
+                    chat_history.append({"role": role, "parts": [{"text": content}]})
 
             # 获取当前消息
             current_msg = dialogue[-1]["content"]
 
             # 构建请求体
             request_body = {
-                "contents": chat_history + [{"role": "user", "parts": [{"text":current_msg}]}],
-                "generationConfig": self.generation_config
+                "contents": chat_history
+                + [{"role": "user", "parts": [{"text": current_msg}]}],
+                "generationConfig": self.generation_config,
             }
 
             # 构建请求URL
@@ -87,11 +86,17 @@ class LLMProvider(LLMProviderBase):
 
             # 发送POST请求,经测试手动 request 无法使用 stream 模式
             if self.proxies:
-                response = requests.post(url, headers=headers, json=request_body, stream=False, proxies=self.proxies)
+                response = requests.post(
+                    url,
+                    headers=headers,
+                    json=request_body,
+                    stream=False,
+                    proxies=self.proxies,
+                )
                 try:
                     data = response.json()  # 直接解析JSON
-                    if 'candidates' in data and data['candidates']:
-                        yield data['candidates'][0]['content']['parts'][0]['text']
+                    if "candidates" in data and data["candidates"]:
+                        yield data["candidates"][0]["content"]["parts"][0]["text"]
                     else:
                         yield "未找到候选回复。"
                 except json.JSONDecodeError as e:
@@ -104,13 +109,11 @@ class LLMProvider(LLMProviderBase):
 
                 # 发送消息并获取流式响应
                 response = chat.send_message(
-                    current_msg,
-                    stream=True,
-                    generation_config=self.generation_config
+                    current_msg, stream=True, generation_config=self.generation_config
                 )
                 # 处理流式响应
                 for chunk in response:
-                    if hasattr(chunk, 'text') and chunk.text:
+                    if hasattr(chunk, "text") and chunk.text:
                         yield chunk.text
 
         except Exception as e:
@@ -125,9 +128,6 @@ class LLMProvider(LLMProviderBase):
             else:
                 yield f"【Gemini服务响应异常: {error_msg}】"
 
-
-
-
         except requests.exceptions.RequestException as e:
             yield f"请求失败：{e}"
         except json.JSONDecodeError as e:

main/xiaozhi-server/core/providers/llm/openai/openai.py

@@ -11,7 +11,7 @@ class LLMProvider(LLMProviderBase):
     def __init__(self, config):
         self.model_name = config.get("model_name")
         self.api_key = config.get("api_key")
-        if 'base_url' in config:
+        if "base_url" in config:
             self.base_url = config.get("base_url")
         else:
             self.base_url = config.get("url")
@@ -33,18 +33,22 @@ class LLMProvider(LLMProviderBase):
             for chunk in responses:
                 try:
                     # 检查是否存在有效的choice且content不为空
-                    delta = chunk.choices[0].delta if getattr(chunk, 'choices', None) else None
-                    content = delta.content if hasattr(delta, 'content') else ''
+                    delta = (
+                        chunk.choices[0].delta
+                        if getattr(chunk, "choices", None)
+                        else None
+                    )
+                    content = delta.content if hasattr(delta, "content") else ""
                 except IndexError:
-                    content = ''
+                    content = ""
                 if content:
                     # 处理标签跨多个chunk的情况
-                    if '<think>' in content:
+                    if "<think>" in content:
                         is_active = False
-                        content = content.split('<think>')[0]
-                    if '</think>' in content:
+                        content = content.split("<think>")[0]
+                    if "</think>" in content:
                         is_active = True
-                        content = content.split('</think>')[-1]
+                        content = content.split("</think>")[-1]
                     if is_active:
                         yield content
 
@@ -54,10 +58,7 @@ class LLMProvider(LLMProviderBase):
     def response_with_functions(self, session_id, dialogue, functions=None):
         try:
             stream = self.client.chat.completions.create(
-                model=self.model_name,
-                messages=dialogue,
-                stream=True,
-                tools=functions
+                model=self.model_name, messages=dialogue, stream=True, tools=functions
             )
 
             for chunk in stream: