MeUtils 2025.2.6.19.56.59__py3-none-any.whl → 2025.2.11.18.25.28__py3-none-any.whl

meutils/schemas/openai_types.py

@@ -74,13 +74,13 @@ class ChatCompletionChunk(_ChatCompletionChunk):
 
 
 chat_completion = ChatCompletion(
-    choices=[Choice(message=ChatCompletionMessage(content=""))]
+    choices=[Choice(message=ChatCompletionMessage(reasoning_content="", content=""))]
 )
 chat_completion_chunk = ChatCompletionChunk(
-    choices=[ChunkChoice(delta=ChoiceDelta(content=""))]
+    choices=[ChunkChoice(delta=ChoiceDelta(reasoning_content="", content=""))]
 )
 chat_completion_chunk_stop = ChatCompletionChunk(
-    choices=[ChunkChoice(delta=ChoiceDelta(content=""), finish_reason="stop")]
+    choices=[ChunkChoice(delta=ChoiceDelta(reasoning_content="", content=""), finish_reason="stop")]
 )
 
 
@@ -352,15 +352,19 @@ if __name__ == '__main__':
     #
     #
     # print(A(n=11))
-    messages = [
-        {
-            "role": "user",
-            "content": [{'role': 'user', 'content': [{"type": "image_url", "image_url": "这是个图片链接"}]}]
-        },
-
-        # {'role': 'user', 'content': [{"type": "image_url", "image_url": {"url": "这是个图片链接"}}]},
-    ]
-
-    r = ChatCompletionRequest(model="gpt-3.5-turbo", messages=messages)
-    r.messages[-1]['content'] = [{"type": "image_url", "image_url": {"url": r.urls[-1]}}]
-    print(r)
+    # messages = [
+    #     {
+    #         "role": "user",
+    #         "content": [{'role': 'user', 'content': [{"type": "image_url", "image_url": "这是个图片链接"}]}]
+    #     },
+    #
+    #     # {'role': 'user', 'content': [{"type": "image_url", "image_url": {"url": "这是个图片链接"}}]},
+    # ]
+    #
+    # r = ChatCompletionRequest(model="gpt-3.5-turbo", messages=messages)
+    # r.messages[-1]['content'] = [{"type": "image_url", "image_url": {"url": r.urls[-1]}}]
+    # print(r)
+
+    print(chat_completion_chunk)
+    print(chat_completion)
+    print(chat_completion_chunk_stop)

meutils/serving/fastapi/exceptions/http_error.py

@@ -42,6 +42,7 @@ async def general_exception_handler(request: Request, exc: Exception):
 
 
 async def chatfire_api_exception_handler(request: Request, exc: Exception):
+
     content = {
         "error":
             {
@@ -54,7 +55,6 @@ async def chatfire_api_exception_handler(request: Request, exc: Exception):
 
     # 默认值
     reps = None
-    request_json = {"body": await request.body()}
     if isinstance(exc, (HTTPStatusError, APIStatusError)):
         status_code = exc.response.status_code or 500
 
@@ -71,7 +71,7 @@ async def chatfire_api_exception_handler(request: Request, exc: Exception):
     if any(code in content_detail for code in {'451', }):
         content_detail = ""
 
-    send_message([request_json, content, content_detail])
+    send_message([content, content_detail])
 
     return reps or JSONResponse(
         content=content,