diff --git a/docker/bisheng/config/config.yaml b/docker/bisheng/config/config.yaml index 9a4fa2683..d160a3d3c 100644 --- a/docker/bisheng/config/config.yaml +++ b/docker/bisheng/config/config.yaml @@ -28,7 +28,7 @@ vector_stores: is_partition: !env ${BS_MILVUS_IS_PARTITION} partition_suffix: !env ${BS_MILVUS_PARTITION_SUFFIX} elasticsearch: - elasticsearch_url: !env ${BS_ELASTICSEARCH_URL} + url: !env ${BS_ELASTICSEARCH_URL} ssl_verify: !env ${BS_ELASTICSEARCH_SSL_VERIFY} diff --git a/src/backend/bisheng/api/v2/assistant.py b/src/backend/bisheng/api/v2/assistant.py index 431f47b5c..6c797fdc5 100644 --- a/src/backend/bisheng/api/v2/assistant.py +++ b/src/backend/bisheng/api/v2/assistant.py @@ -18,6 +18,7 @@ from bisheng.api.v1.schemas import OpenAIChatCompletionResp, OpenAIChatCompletio AssistantInfo, OpenAIChoice from bisheng.api.v2.utils import get_default_operator from bisheng.chat.types import WorkType +from bisheng.settings import settings router = APIRouter(prefix='/assistant', tags=['OpenAPI', 'Assistant']) @@ -115,6 +116,9 @@ async def get_assistant_info(request: Request, assistant_id: UUID): 获取助手信息, 用系统配置里的default_operator.user的用户信息来做权限校验 """ logger.info(f'act=get_default_operator assistant_id={assistant_id}, ip={get_request_ip(request)}') + # 判断下配置是否打开 + if not settings.get_from_db("default_operator").get("enable_guest_access"): + raise HTTPException(status_code=403, detail="无权限访问") login_user = get_default_operator() return AssistantService.get_assistant_info(assistant_id, login_user) diff --git a/src/backend/bisheng/api/v2/flow.py b/src/backend/bisheng/api/v2/flow.py index 25e132701..0213be887 100644 --- a/src/backend/bisheng/api/v2/flow.py +++ b/src/backend/bisheng/api/v2/flow.py @@ -9,6 +9,7 @@ from bisheng.api.v1.schemas import resp_200 from bisheng.api.v2.assistant import get_default_operator from bisheng.database.models.flow import FlowDao from bisheng.settings import settings + router = APIRouter(prefix='/flows', tags=['OpenAPI', 'FlowV2']) @@ -19,7 +20,7 @@ def get_flow(request: Request, flow_id: UUID): """ logger.info(f"public_get_flow ip: {request.client.host} flow_id:{flow_id}") # 判断下配置是否打开 - if settings.get_from_db("default_operator").get("api_need_login"): + if not settings.get_from_db("default_operator").get("enable_guest_access"): raise HTTPException(status_code=403, detail="无权限访问") default_user = get_default_operator() login_user = UserPayload(**{ diff --git a/src/backend/bisheng/initdb_config.yaml b/src/backend/bisheng/initdb_config.yaml index 7ab038a2e..3ae8ed64d 100644 --- a/src/backend/bisheng/initdb_config.yaml +++ b/src/backend/bisheng/initdb_config.yaml @@ -9,7 +9,7 @@ llm_request: default_operator: # 使用免登录链接的方式需要配置,因为免登录链接相当于不知道用户信息,我们系统会自动把这些行为记录到某个用户头上,这里用来配置该用户的id user: 1 - api_need_login: false # 是否需要登录才能使用,默认为false,代表可以通过免登录链接的方式使用 + enable_guest_access: true # 免登录链接是否可访问 # 密码安全相关配置 password_conf: