zlei6/ragflow
1
0
Fork 0
mirror of https://github.com/infiniflow/ragflow.git synced 2026-06-29 15:31:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refact: Tenant api (#14288)

Browse Source 
### What problem does this PR solve?

Refact: Tenant api

### Type of change

- [x] Refactoring
This commit is contained in:
Magicbook1108
2026-04-22 20:00:32 +08:00
committed by GitHub
parent 1434f8ade8
commit d1c62fc19d
5 changed files with 96 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
api/apps/tenant_app.py → api/apps/restful_apis/tenant_api.py
View File

@@ -1,5 +1,5 @@
# #
# Copyright 2024 The InfiniFlow Authors. All Rights Reserved. # Copyright 2026 The InfiniFlow Authors. All Rights Reserved.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@@ -13,48 +13,56 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
import logging
import asyncio import asyncio
import logging
from api.apps import current_user, login_required
from api.db import UserTenantRole from api.db import UserTenantRole
from api.db.db_models import UserTenant from api.db.db_models import UserTenant
from api.db.services.user_service import UserTenantService, UserService from api.db.services.user_service import UserService, UserTenantService
from api.utils.api_utils import (
get_data_error_result,
get_json_result,
get_request_json,
server_error_response,
validate_request,
)
from api.utils.web_utils import send_invite_email
from common import settings
from common.constants import RetCode, StatusEnum from common.constants import RetCode, StatusEnum
from common.misc_utils import get_uuid from common.misc_utils import get_uuid
from common.time_utils import delta_seconds from common.time_utils import delta_seconds
from api.utils.api_utils import get_data_error_result, get_json_result, get_request_json, server_error_response, validate_request
from api.utils.web_utils import send_invite_email
from common import settings
from api.apps import login_required, current_user
@manager.route("/<tenant_id>/user/list", methods=["GET"]) # noqa: F821 @manager.route("/tenants/<tenant_id>/users", methods=["GET"]) # noqa: F821
@login_required @login_required
def user_list(tenant_id): def user_list(tenant_id):
if current_user.id != tenant_id: if current_user.id != tenant_id:
return get_json_result( return get_json_result(
data=False, data=False,
message='No authorization.', message="No authorization.",
code=RetCode.AUTHENTICATION_ERROR) code=RetCode.AUTHENTICATION_ERROR,
)
try: try:
users = UserTenantService.get_by_tenant_id(tenant_id) users = UserTenantService.get_by_tenant_id(tenant_id)
for u in users: for user in users:
u["delta_seconds"] = delta_seconds(str(u["update_date"])) user["delta_seconds"] = delta_seconds(str(user["update_date"]))
return get_json_result(data=users) return get_json_result(data=users)
except Exception as e: except Exception as exc:
return server_error_response(e) return server_error_response(exc)
@manager.route('/<tenant_id>/user', methods=['POST']) # noqa: F821 @manager.route("/tenants/<tenant_id>/users", methods=["POST"]) # noqa: F821
@login_required @login_required
@validate_request("email") @validate_request("email")
async def create(tenant_id): async def create(tenant_id):
if current_user.id != tenant_id: if current_user.id != tenant_id:
return get_json_result( return get_json_result(
data=False, data=False,
message='No authorization.', message="No authorization.",
code=RetCode.AUTHENTICATION_ERROR) code=RetCode.AUTHENTICATION_ERROR,
)
req = await get_request_json() req = await get_request_json()
invite_user_email = req["email"] invite_user_email = req["email"]
@@ -71,7 +79,8 @@ async def create(tenant_id):
if user_tenant_role == UserTenantRole.OWNER: if user_tenant_role == UserTenantRole.OWNER:
return get_data_error_result(message=f"{invite_user_email} is the owner of the team.") return get_data_error_result(message=f"{invite_user_email} is the owner of the team.")
return get_data_error_result( return get_data_error_result(
message=f"{invite_user_email} is in the team, but the role: {user_tenant_role} is invalid.") message=f"{invite_user_email} is in the team, but the role: {user_tenant_role} is invalid."
)
UserTenantService.save( UserTenantService.save(
id=get_uuid(), id=get_uuid(),
@@ -79,10 +88,10 @@ async def create(tenant_id):
tenant_id=tenant_id, tenant_id=tenant_id,
invited_by=current_user.id, invited_by=current_user.id,
role=UserTenantRole.INVITE, role=UserTenantRole.INVITE,
status=StatusEnum.VALID.value) status=StatusEnum.VALID.value,
)
try: try:
user_name = "" user_name = ""
_, user = UserService.get_by_id(current_user.id) _, user = UserService.get_by_id(current_user.id)
if user: if user:
@@ -93,52 +102,62 @@ async def create(tenant_id):
to_email=invite_user_email, to_email=invite_user_email,
invite_url=settings.MAIL_FRONTEND_URL, invite_url=settings.MAIL_FRONTEND_URL,
tenant_id=tenant_id, tenant_id=tenant_id,
inviter=user_name or current_user.email inviter=user_name or current_user.email,
) )
) )
except Exception as e: except Exception as exc:
logging.exception(f"Failed to send invite email to {invite_user_email}: {e}") logging.exception(f"Failed to send invite email to {invite_user_email}: {exc}")
return get_json_result(data=False, message="Failed to send invite email.", code=RetCode.SERVER_ERROR) return get_json_result(
usr = invite_users[0].to_dict() data=False,
usr = {k: v for k, v in usr.items() if k in ["id", "avatar", "email", "nickname"]} message="Failed to send invite email.",
code=RetCode.SERVER_ERROR,
)
return get_json_result(data=usr) user = invite_users[0].to_dict()
user = {k: v for k, v in user.items() if k in ["id", "avatar", "email", "nickname"]}
return get_json_result(data=user)
@manager.route('/<tenant_id>/user/<user_id>', methods=['DELETE']) # noqa: F821 @manager.route("/tenants/<tenant_id>/users", methods=["DELETE"]) # noqa: F821
@login_required @login_required
def rm(tenant_id, user_id): @validate_request("user_id")
async def rm(tenant_id):
req = await get_request_json()
user_id = req["user_id"]
if current_user.id != tenant_id and current_user.id != user_id: if current_user.id != tenant_id and current_user.id != user_id:
return get_json_result( return get_json_result(
data=False, data=False,
message='No authorization.', message="No authorization.",
code=RetCode.AUTHENTICATION_ERROR) code=RetCode.AUTHENTICATION_ERROR,
)
try: try:
UserTenantService.filter_delete([UserTenant.tenant_id == tenant_id, UserTenant.user_id == user_id]) UserTenantService.filter_delete([UserTenant.tenant_id == tenant_id, UserTenant.user_id == user_id])
return get_json_result(data=True) return get_json_result(data=True)
except Exception as e: except Exception as exc:
return server_error_response(e) return server_error_response(exc)
@manager.route("/list", methods=["GET"]) # noqa: F821 @manager.route("/tenants", methods=["GET"]) # noqa: F821
@login_required @login_required
def tenant_list(): def tenant_list():
try: try:
users = UserTenantService.get_tenants_by_user_id(current_user.id) users = UserTenantService.get_tenants_by_user_id(current_user.id)
for u in users: for user in users:
u["delta_seconds"] = delta_seconds(str(u["update_date"])) user["delta_seconds"] = delta_seconds(str(user["update_date"]))
return get_json_result(data=users) return get_json_result(data=users)
except Exception as e: except Exception as exc:
return server_error_response(e) return server_error_response(exc)
@manager.route("/agree/<tenant_id>", methods=["PUT"]) # noqa: F821 @manager.route("/tenants/<tenant_id>", methods=["PATCH"]) # noqa: F821
@login_required @login_required
def agree(tenant_id): def agree(tenant_id):
try: try:
UserTenantService.filter_update([UserTenant.tenant_id == tenant_id, UserTenant.user_id == current_user.id], UserTenantService.filter_update(
{"role": UserTenantRole.NORMAL}) [UserTenant.tenant_id == tenant_id, UserTenant.user_id == current_user.id],
{"role": UserTenantRole.NORMAL},
)
return get_json_result(data=True) return get_json_result(data=True)
except Exception as e: except Exception as exc:
return server_error_response(e) return server_error_response(exc)

17
sdk/python/test.py Normal file
View File

@@ -0,0 +1,17 @@
from .ragflow_sdk import RAGFlow
rag_object = RAGFlow(api_key="ragflow-FDfRECsXDRagsKPxb_EfZdDPcmngavSgYEzbU_Blgq4", base_url="http://localhost:9222")
assistant = rag_object.get_agent("b0bc46e43dfc11f1b4ff84ba59bc54d9")
session = assistant.create_session()
print("\n==================== Miss R =====================\n")
print("Hello. What can I do for you?")
while True:
question = input("\n==================== User =====================\n> ")
print("\n==================== Miss R =====================\n")
cont = ""
for ans in session.ask(question, stream=True):
print(ans.content[len(cont):], end='', flush=True)
cont = ans.content

9
test/testcases/test_web_api/test_user_app/test_tenant_app_unit.py
View File

@@ -180,7 +180,7 @@ def _load_tenant_module(monkeypatch):
common_pkg.settings = settings_mod common_pkg.settings = settings_mod
sys.modules.pop("test_tenant_app_unit_module", None) sys.modules.pop("test_tenant_app_unit_module", None)
module_path = repo_root / "api" / "apps" / "tenant_app.py" module_path = repo_root / "api" / "apps" / "restful_apis" / "tenant_api.py"
spec = importlib.util.spec_from_file_location("test_tenant_app_unit_module", module_path) spec = importlib.util.spec_from_file_location("test_tenant_app_unit_module", module_path)
module = importlib.util.module_from_spec(spec) module = importlib.util.module_from_spec(spec)
module.manager = _DummyManager() module.manager = _DummyManager()
@@ -268,20 +268,21 @@ def test_rm_and_tenant_list_matrix_unit(monkeypatch):
module = _load_tenant_module(monkeypatch) module = _load_tenant_module(monkeypatch)
module.current_user.id = "outsider" module.current_user.id = "outsider"
res = module.rm("tenant-1", "user-2") _set_request_json(monkeypatch, module, {"user_id": "user-2"})
res = _run(module.rm("tenant-1"))
assert res["code"] == module.RetCode.AUTHENTICATION_ERROR, res assert res["code"] == module.RetCode.AUTHENTICATION_ERROR, res
assert res["message"] == "No authorization.", res assert res["message"] == "No authorization.", res
module.current_user.id = "tenant-1" module.current_user.id = "tenant-1"
deleted = [] deleted = []
monkeypatch.setattr(module.UserTenantService, "filter_delete", lambda conditions: deleted.append(conditions) or True) monkeypatch.setattr(module.UserTenantService, "filter_delete", lambda conditions: deleted.append(conditions) or True)
res = module.rm("tenant-1", "user-2") res = _run(module.rm("tenant-1"))
assert res["code"] == 0, res assert res["code"] == 0, res
assert res["data"] is True, res assert res["data"] is True, res
assert deleted, "filter_delete should be called" assert deleted, "filter_delete should be called"
monkeypatch.setattr(module.UserTenantService, "filter_delete", lambda _conditions: (_ for _ in ()).throw(RuntimeError("rm boom"))) monkeypatch.setattr(module.UserTenantService, "filter_delete", lambda _conditions: (_ for _ in ()).throw(RuntimeError("rm boom")))
res = module.rm("tenant-1", "user-2") res = _run(module.rm("tenant-1"))
assert res["code"] == 100, res assert res["code"] == 100, res
assert "rm boom" in res["message"], res assert "rm boom" in res["message"], res

7
web/src/services/user-service.ts
View File

@@ -139,11 +139,14 @@ export const deleteTenantUser = ({
}: { }: {
tenantId: string; tenantId: string;
userId: string; userId: string;
}) => request.delete(api.deleteTenantUser(tenantId, userId)); }) =>
request.delete(api.deleteTenantUser(tenantId), {
data: { userId },
});
export const listTenant = () => request.get(api.listTenant); export const listTenant = () => request.get(api.listTenant);
export const agreeTenant = (tenantId: string) => export const agreeTenant = (tenantId: string) =>
request.put(api.agreeTenant(tenantId)); request.patch(api.agreeTenant(tenantId));
export default userService; export default userService;

12
web/src/utils/api.ts
View File

@@ -16,13 +16,13 @@ export default {
loginChannel: (channel: string) => `${webAPI}/user/login/${channel}`, loginChannel: (channel: string) => `${webAPI}/user/login/${channel}`,
// team // team
addTenantUser: (tenantId: string) => `${webAPI}/tenant/${tenantId}/user`, addTenantUser: (tenantId: string) => `${restAPIv1}/tenants/${tenantId}/users`,
listTenantUser: (tenantId: string) => listTenantUser: (tenantId: string) =>
`${webAPI}/tenant/${tenantId}/user/list`, `${restAPIv1}/tenants/${tenantId}/users`,
deleteTenantUser: (tenantId: string, userId: string) => deleteTenantUser: (tenantId: string) =>
`${webAPI}/tenant/${tenantId}/user/${userId}`, `${restAPIv1}/tenants/${tenantId}/users`,
listTenant: `${webAPI}/tenant/list`, listTenant: `${restAPIv1}/tenants`,
agreeTenant: (tenantId: string) => `${webAPI}/tenant/agree/${tenantId}`, agreeTenant: (tenantId: string) => `${restAPIv1}/tenants/${tenantId}`,
// llm model // llm model
factoriesList: `${webAPI}/llm/factories`, factoriesList: `${webAPI}/llm/factories`,