merge master

zhaoqingang

2025-02-13 25bf0a51088fa0d0acdc39c6096cc45d699f63a1

 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(
@@ -48,13 +48,13 @@
                raise Exception(f"Ragflow registration failed: {response.text}")
            return self._handle_response(response)

    async def login(self, username: str, password: str) -> str:
    async def login(self, username: str, password: str, email="") -> str:
        password = RagflowCrypto(settings.PUBLIC_KEY, settings.PRIVATE_KEY).encrypt(password)
        async with httpx.AsyncClient() as client:
            response = await client.post(
                f"{self.base_url}/v1/user/login",
                headers={'Content-Type': 'application/json'},
                json={"email": f"{username}@example.com", "password": password}
                json={"email": email if email else f"{username}@example.com", "password": password}
            )
            if response.status_code != 200:
                raise Exception(f"Ragflow login failed: {response.text}")
@@ -100,7 +100,7 @@
                    "id": item["id"],
                    "name": item["name"],
                    "updated_time": item["update_time"],
                    "update_date": datetime.utcfromtimestamp(item["update_time"] / 1000.0).strftime('%Y-%m-%d %H:%M:%S')
                    "update_date": datetime.fromtimestamp(item["update_time"] / 1000.0).strftime('%Y-%m-%d %H:%M:%S')
                }
                for item in data
                if "id" in item and "name" in item and item["name"]
@@ -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,15 +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)
        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)