From e524e9e0ed81983374571bdcb52556a95f20a8f0 Mon Sep 17 00:00:00 2001 From: xiamuceer Date: Tue, 4 Nov 2025 16:01:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:numpy=E6=9E=84=E5=BB=BA=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/api/memories.py | 2 +- backend/app/api/settings.py | 16 ++++++++-------- backend/app/models/settings.py | 2 +- backend/app/schemas/settings.py | 2 +- backend/requirements.txt | 3 ++- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/backend/app/api/memories.py b/backend/app/api/memories.py index 47a10b9..68e0d16 100644 --- a/backend/app/api/memories.py +++ b/backend/app/api/memories.py @@ -61,7 +61,7 @@ async def analyze_chapter( api_provider=settings.api_provider, api_key=settings.api_key, api_base_url=settings.api_base_url, - model_name=settings.model_name, + model_name=settings.llm_model, temperature=settings.temperature, max_tokens=settings.max_tokens ) diff --git a/backend/app/api/settings.py b/backend/app/api/settings.py index e5a6d20..0f3bf20 100644 --- a/backend/app/api/settings.py +++ b/backend/app/api/settings.py @@ -28,7 +28,7 @@ def read_env_defaults() -> Dict[str, Any]: "api_provider": app_settings.default_ai_provider, "api_key": app_settings.openai_api_key or app_settings.anthropic_api_key or "", "api_base_url": app_settings.openai_base_url or app_settings.anthropic_base_url or "", - "model_name": app_settings.default_model, + "llm_model": app_settings.default_model, "temperature": app_settings.default_temperature, "max_tokens": app_settings.default_max_tokens, } @@ -71,7 +71,7 @@ async def get_user_ai_service( api_provider=settings.api_provider, api_key=settings.api_key, api_base_url=settings.api_base_url or "", - model_name=settings.model_name, + model_name=settings.llm_model, temperature=settings.temperature, max_tokens=settings.max_tokens ) @@ -305,7 +305,7 @@ class ApiTestRequest(BaseModel): api_key: str api_base_url: str provider: str - model_name: str + llm_model: str @router.post("/test") @@ -322,7 +322,7 @@ async def test_api_connection(data: ApiTestRequest): api_key = data.api_key api_base_url = data.api_base_url provider = data.provider - model_name = data.model_name + llm_model = data.llm_model import time try: @@ -333,7 +333,7 @@ async def test_api_connection(data: ApiTestRequest): api_provider=provider, api_key=api_key, api_base_url=api_base_url, - default_model=model_name, + default_model=llm_model, default_temperature=0.7, default_max_tokens=100 ) @@ -343,13 +343,13 @@ async def test_api_connection(data: ApiTestRequest): logger.info(f"🧪 开始测试 API 连接") logger.info(f" - 提供商: {provider}") - logger.info(f" - 模型: {model_name}") + logger.info(f" - 模型: {llm_model}") logger.info(f" - Base URL: {api_base_url}") response = await test_service.generate_text( prompt=test_prompt, provider=provider, - model=model_name, + model=llm_model, temperature=0.7, max_tokens=8000 ) @@ -366,7 +366,7 @@ async def test_api_connection(data: ApiTestRequest): "message": "API 连接测试成功", "response_time_ms": response_time, "provider": provider, - "model": model_name, + "model": llm_model, "response_preview": response[:100] if response and len(response) > 100 else response, "details": { "api_available": True, diff --git a/backend/app/models/settings.py b/backend/app/models/settings.py index 7aaa646..eaf7b4c 100644 --- a/backend/app/models/settings.py +++ b/backend/app/models/settings.py @@ -14,7 +14,7 @@ class Settings(Base): api_provider = Column(String(50), default="openai", comment="API提供商") api_key = Column(String(500), comment="API密钥") api_base_url = Column(String(500), comment="自定义API地址") - model_name = Column(String(100), default="gpt-4", comment="模型名称") + llm_model = Column(String(100), default="gpt-4", comment="模型名称") temperature = Column(Float, default=0.7, comment="温度参数") max_tokens = Column(Integer, default=2000, comment="最大token数") preferences = Column(Text, comment="其他偏好设置(JSON)") diff --git a/backend/app/schemas/settings.py b/backend/app/schemas/settings.py index 442a967..03b48f6 100644 --- a/backend/app/schemas/settings.py +++ b/backend/app/schemas/settings.py @@ -11,7 +11,7 @@ class SettingsBase(BaseModel): api_provider: Optional[str] = Field(default="openai", description="API提供商") api_key: Optional[str] = Field(default=None, description="API密钥") api_base_url: Optional[str] = Field(default=None, description="自定义API地址") - model_name: Optional[str] = Field(default="gpt-4", description="模型名称") + llm_model: Optional[str] = Field(default="gpt-4", description="模型名称") temperature: Optional[float] = Field(default=0.7, ge=0.0, le=2.0, description="温度参数") max_tokens: Optional[int] = Field(default=2000, ge=1, description="最大token数") preferences: Optional[str] = Field(default=None, description="其他偏好设置(JSON)") diff --git a/backend/requirements.txt b/backend/requirements.txt index 94eec74..e88ef46 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -21,4 +21,5 @@ python-dotenv==1.0.0 # 向量数据库和Embedding (长期记忆系统) chromadb>=0.5.0 -sentence-transformers>=2.3.1 \ No newline at end of file +sentence-transformers>=2.3.1 +numpy==1。26.4 \ No newline at end of file