From f8f2746603be556a365f6efb6f0da9acada07d5e Mon Sep 17 00:00:00 2001 From: Igor Ilic Date: Thu, 24 Oct 2024 17:18:50 +0200 Subject: [PATCH] refactor: Move permission router inside routers folder, add cognify router Moved permissions router in it's routers folder, added cognify router Refactor #COG-334 --- cognee/api/client.py | 25 ++++++----------- cognee/api/v1/cognify/routers/__init__.py | 1 + .../v1/cognify/routers/get_cognify_router.py | 27 +++++++++++++++++++ cognee/api/v1/permissions/routers/__init__.py | 1 + .../{ => routers}/get_permissions_router.py | 0 5 files changed, 37 insertions(+), 17 deletions(-) create mode 100644 cognee/api/v1/cognify/routers/__init__.py create mode 100644 cognee/api/v1/cognify/routers/get_cognify_router.py create mode 100644 cognee/api/v1/permissions/routers/__init__.py rename cognee/api/v1/permissions/{ => routers}/get_permissions_router.py (100%) diff --git a/cognee/api/client.py b/cognee/api/client.py index 7aeddd795..29efad813 100644 --- a/cognee/api/client.py +++ b/cognee/api/client.py @@ -64,8 +64,9 @@ app.add_middleware( from cognee.api.v1.users.routers import get_auth_router, get_register_router,\ get_reset_password_router, get_verify_router, get_users_router -from cognee.api.v1.permissions.get_permissions_router import get_permissions_router -from cognee.api.v1.settings.routers.get_settings_router import get_settings_router +from cognee.api.v1.permissions.routers import get_permissions_router +from cognee.api.v1.settings.routers import get_settings_router +from cognee.api.v1.cognify.routers import get_cognify_router from cognee.api.v1.search.routers import get_search_router from fastapi import Request @@ -313,21 +314,11 @@ async def add( content = {"error": str(error)} ) - -class CognifyPayloadDTO(BaseModel): - datasets: List[str] - -@app.post("/api/v1/cognify", response_model = None) -async def cognify(payload: CognifyPayloadDTO, user: User = Depends(get_authenticated_user)): - """ This endpoint is responsible for the cognitive processing of the content.""" - from cognee.api.v1.cognify.cognify_v2 import cognify as cognee_cognify - try: - await cognee_cognify(payload.datasets, user) - except Exception as error: - return JSONResponse( - status_code = 409, - content = {"error": str(error)} - ) +app.include_router( + get_cognify_router(), + prefix="/api/v1/cognify", + tags=["cognify"] +) app.include_router( get_search_router(), diff --git a/cognee/api/v1/cognify/routers/__init__.py b/cognee/api/v1/cognify/routers/__init__.py new file mode 100644 index 000000000..c6d52bfa2 --- /dev/null +++ b/cognee/api/v1/cognify/routers/__init__.py @@ -0,0 +1 @@ +from .get_cognify_router import get_cognify_router \ No newline at end of file diff --git a/cognee/api/v1/cognify/routers/get_cognify_router.py b/cognee/api/v1/cognify/routers/get_cognify_router.py new file mode 100644 index 000000000..987c15d8a --- /dev/null +++ b/cognee/api/v1/cognify/routers/get_cognify_router.py @@ -0,0 +1,27 @@ +from fastapi import APIRouter +from typing import List +from pydantic import BaseModel +from cognee.modules.users.models import User +from fastapi.responses import JSONResponse +from cognee.modules.users.methods import get_authenticated_user +from fastapi import Depends + +def get_cognify_router(): + router = APIRouter() + + class CognifyPayloadDTO(BaseModel): + datasets: List[str] + + @router.post("/", response_model=None) + async def cognify(payload: CognifyPayloadDTO, user: User = Depends(get_authenticated_user)): + """ This endpoint is responsible for the cognitive processing of the content.""" + from cognee.api.v1.cognify.cognify_v2 import cognify as cognee_cognify + try: + await cognee_cognify(payload.datasets, user) + except Exception as error: + return JSONResponse( + status_code=409, + content={"error": str(error)} + ) + + return router \ No newline at end of file diff --git a/cognee/api/v1/permissions/routers/__init__.py b/cognee/api/v1/permissions/routers/__init__.py new file mode 100644 index 000000000..986b52c3e --- /dev/null +++ b/cognee/api/v1/permissions/routers/__init__.py @@ -0,0 +1 @@ +from .get_permissions_router import get_permissions_router \ No newline at end of file diff --git a/cognee/api/v1/permissions/get_permissions_router.py b/cognee/api/v1/permissions/routers/get_permissions_router.py similarity index 100% rename from cognee/api/v1/permissions/get_permissions_router.py rename to cognee/api/v1/permissions/routers/get_permissions_router.py