update sth. at 2025-03-03 19:31:17

app.py

@@ -4,11 +4,8 @@ import torch
 import gradio as gr
 from fastapi import FastAPI, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
-from pydantic import BaseModel, Field, root_validator
-from typing import List, Dict, Optional
-from functools import lru_cache
-from threading import Lock
-import uvicorn
+from pydantic import BaseModel, Field, model_validator
+from typing import List, Dict, Optional, Any
 
 class EmbeddingRequest(BaseModel):
     # 强制锁定模型参数
@@ -23,7 +20,8 @@ class EmbeddingRequest(BaseModel):
     prompt: Optional[str] = Field(None, description="输入文本（兼容Ollama格式）")
 
     # 自动合并输入字段
-    @root_validator(pre=True)
+    @model_validator(mode='before')
+    @classmethod
     def merge_input_fields(cls, values):
         input_fields = ["inputs", "input", "prompt"]
         for field in input_fields:
@@ -36,10 +34,13 @@ class EmbeddingRequest(BaseModel):
 
 class EmbeddingResponse(BaseModel):
     object: str = "list"
-    data: List
+    data: List[Dict[str, Any]]
     model: str
     usage: Dict[str, int]
 
+    class Config:
+        arbitrary_types_allowed = True
+
 class EmbeddingService:
     def __init__(self):
         self._true_model_name = "jinaai/jina-embeddings-v3"  # 硬编码模型名称