style: 优化代码格式和清理冗余
This commit is contained in:
parent
effbcba7ee
commit
ceb676d79c
@ -171,9 +171,7 @@ class Config(SimpleConfig):
|
|||||||
self.enable_web_search = True
|
self.enable_web_search = True
|
||||||
|
|
||||||
self.valuable_model_provider = [k for k, v in self.model_provider_status.items() if v]
|
self.valuable_model_provider = [k for k, v in self.model_provider_status.items() if v]
|
||||||
assert len(self.valuable_model_provider) > 0, (
|
assert len(self.valuable_model_provider) > 0, "No model provider available, please check your `.env` file."
|
||||||
"No model provider available, please check your `.env` file."
|
|
||||||
)
|
|
||||||
|
|
||||||
def load(self):
|
def load(self):
|
||||||
"""根据传入的文件覆盖掉默认配置"""
|
"""根据传入的文件覆盖掉默认配置"""
|
||||||
@ -223,5 +221,4 @@ class Config(SimpleConfig):
|
|||||||
return json.loads(str(self))
|
return json.loads(str(self))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
config = Config()
|
config = Config()
|
||||||
|
|||||||
@ -5,7 +5,7 @@ from openai import OpenAI
|
|||||||
from tenacity import before_sleep_log, retry, retry_if_exception_type, stop_after_attempt, wait_exponential
|
from tenacity import before_sleep_log, retry, retry_if_exception_type, stop_after_attempt, wait_exponential
|
||||||
|
|
||||||
from src import config
|
from src import config
|
||||||
from src.utils import get_docker_safe_url, logger
|
from src.utils import logger
|
||||||
|
|
||||||
|
|
||||||
class OpenAIBase:
|
class OpenAIBase:
|
||||||
@ -79,8 +79,6 @@ class OpenModel(OpenAIBase):
|
|||||||
super().__init__(api_key=api_key, base_url=base_url, model_name=model_name)
|
super().__init__(api_key=api_key, base_url=base_url, model_name=model_name)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class GeneralResponse:
|
class GeneralResponse:
|
||||||
def __init__(self, content):
|
def __init__(self, content):
|
||||||
self.content = content
|
self.content = content
|
||||||
@ -110,8 +108,6 @@ def select_model(model_provider, model_name=None):
|
|||||||
raise ValueError(f"Model provider {model_provider} load failed, {e} \n {traceback.format_exc()}")
|
raise ValueError(f"Model provider {model_provider} load failed, {e} \n {traceback.format_exc()}")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
async def test_chat_model_status(provider: str, model_name: str) -> dict:
|
async def test_chat_model_status(provider: str, model_name: str) -> dict:
|
||||||
"""
|
"""
|
||||||
测试指定聊天模型的状态
|
测试指定聊天模型的状态
|
||||||
|
|||||||
@ -15,9 +15,7 @@ async def test_graph_routes_require_auth(test_client):
|
|||||||
|
|
||||||
|
|
||||||
async def test_standard_user_cannot_access_graph_endpoints(test_client, standard_user):
|
async def test_standard_user_cannot_access_graph_endpoints(test_client, standard_user):
|
||||||
response = await test_client.get(
|
response = await test_client.get("/api/graph/lightrag/databases", headers=standard_user["headers"])
|
||||||
"/api/graph/lightrag/databases", headers=standard_user["headers"]
|
|
||||||
)
|
|
||||||
assert response.status_code == 403
|
assert response.status_code == 403
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -47,7 +47,5 @@ async def test_knowledge_routes_enforce_permissions(test_client, standard_user,
|
|||||||
forbidden_list = await test_client.get("/api/knowledge/databases", headers=standard_user["headers"])
|
forbidden_list = await test_client.get("/api/knowledge/databases", headers=standard_user["headers"])
|
||||||
assert forbidden_list.status_code == 403
|
assert forbidden_list.status_code == 403
|
||||||
|
|
||||||
forbidden_get = await test_client.get(
|
forbidden_get = await test_client.get(f"/api/knowledge/databases/{db_id}", headers=standard_user["headers"])
|
||||||
f"/api/knowledge/databases/{db_id}", headers=standard_user["headers"]
|
|
||||||
)
|
|
||||||
assert forbidden_get.status_code == 403
|
assert forbidden_get.status_code == 403
|
||||||
|
|||||||
@ -25,9 +25,7 @@ async def test_info_endpoint_is_public(test_client):
|
|||||||
|
|
||||||
async def test_config_endpoints_require_admin(test_client, standard_user):
|
async def test_config_endpoints_require_admin(test_client, standard_user):
|
||||||
assert (await test_client.get("/api/system/config")).status_code == 401
|
assert (await test_client.get("/api/system/config")).status_code == 401
|
||||||
assert (
|
assert (await test_client.get("/api/system/config", headers=standard_user["headers"])).status_code == 403
|
||||||
await test_client.get("/api/system/config", headers=standard_user["headers"])
|
|
||||||
).status_code == 403
|
|
||||||
|
|
||||||
|
|
||||||
async def test_admin_can_fetch_config_and_reload_info(test_client, admin_headers):
|
async def test_admin_can_fetch_config_and_reload_info(test_client, admin_headers):
|
||||||
|
|||||||
@ -139,7 +139,9 @@ async def knowledge_database(test_client: httpx.AsyncClient, admin_headers: dict
|
|||||||
headers=admin_headers,
|
headers=admin_headers,
|
||||||
)
|
)
|
||||||
if create_response.status_code != 200:
|
if create_response.status_code != 200:
|
||||||
pytest.fail(f"Failed to create knowledge database (status={create_response.status_code}): {create_response.text}")
|
pytest.fail(
|
||||||
|
f"Failed to create knowledge database (status={create_response.status_code}): {create_response.text}"
|
||||||
|
)
|
||||||
|
|
||||||
db_payload = create_response.json()
|
db_payload = create_response.json()
|
||||||
db_id = db_payload["db_id"]
|
db_id = db_payload["db_id"]
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user