From 5eff7ec9d00fa835a76c354bad7cc7f284d28b11 Mon Sep 17 00:00:00 2001 From: zhaoqingang <zhaoqg0118@163.com> Date: 星期四, 26 十二月 2024 13:51:27 +0800 Subject: [PATCH] 新增用户增加rg数据同步 --- app/service/ragflow.py | 36 +++++++++++++++++++++++------------- 1 files changed, 23 insertions(+), 13 deletions(-) diff --git a/app/service/ragflow.py b/app/service/ragflow.py index ac24e47..f10902f 100644 --- a/app/service/ragflow.py +++ b/app/service/ragflow.py @@ -36,7 +36,7 @@ else: return {} - async def register(self, username: str, password: str): + async def register(self, username: str, password: str, token:str=""): password = RagflowCrypto(settings.PUBLIC_KEY, settings.PRIVATE_KEY).encrypt(password) async with httpx.AsyncClient() as client: response = await client.post( @@ -178,7 +178,7 @@ data = {"email": email, "user_id": user_id} async with httpx.AsyncClient(timeout=60) as client: response = await client.post(url, headers=headers, json=data) - print(response) + print(response.text) if response.status_code != 200: raise Exception(f"Ragflow add user to tenant failed: {response.text}") @@ -212,16 +212,26 @@ # logger.info("set_user_password:{}".format(data)) return data + async def agree_tenant_role(self, token: str, tenant_id: str) -> str: + url = f"{self.base_url}/v1/tenant/agree/{tenant_id}" + headers = {"Authorization": token} + data = {} + async with httpx.AsyncClient(timeout=60) as client: + response = await client.put(url, headers=headers, json=data) + print(response.text) + if response.status_code != 200: + raise Exception(f"Ragflow add user to tenant failed: {response.text}") + if __name__ == "__main__": - # async def a(): - # a = RagflowService("http://192.168.20.119:11080") - # b = await a.get_knowledge_list("ImY3ZTZlZWQwYTY2NTExZWY5ZmFiMDI0MmFjMTMwMDA2Ig.Zzxwmw.uI_HAWzOkipQuga1aeQtoeIc3IM", 1, - # 10) - # print(b) - # - # import asyncio - # - # asyncio.run(a()) - password = RagflowCrypto(settings.PUBLIC_KEY, settings.PRIVATE_KEY).encrypt("123456") - print(password) + async def a(): + a = RagflowService("http://192.168.20.119:11080") + b = await a.agree_tenant_role("ImQ3MGY1NGFhYzFkZjExZWY5MDFmMDI0MmFjMTMwMDA2Ig.Z2qJfA.hJX4rPnnmlkUzpjIl0YGcM-yp1M", "fe24dd2c9be611ef92880242ac160006") + print(b) + print(b) + + import asyncio + + asyncio.run(a()) + # password = RagflowCrypto(settings.PUBLIC_KEY, settings.PRIVATE_KEY).encrypt("123456") + # print(password) -- Gitblit v1.8.0