From c6847859b003805fcbcfdb427cbfcb9caa1b290e Mon Sep 17 00:00:00 2001 From: Saurab-Shrestha Date: Tue, 7 May 2024 15:41:28 +0545 Subject: [PATCH] Removed / from audit routes --- .env | 4 ++-- private_gpt/launcher.py | 2 +- .../server/completions/completions_router.py | 5 +---- private_gpt/users/api/v1/routers/audits.py | 20 ++++++++--------- .../users/api/v1/routers/departments.py | 2 +- private_gpt/users/api/v1/routers/documents.py | 2 +- private_gpt/users/schemas/audit.py | 22 +++++++++---------- 7 files changed, 27 insertions(+), 30 deletions(-) diff --git a/.env b/.env index 7609f830..4082b8c0 100644 --- a/.env +++ b/.env @@ -1,11 +1,11 @@ PORT=8000 ENVIRONMENT=dev -DB_HOST=db +DB_HOST=localhost DB_USER=postgres DB_PORT=5432 DB_PASSWORD=admin -DB_NAME=QuickGpt +DB_NAME=GPT SUPER_ADMIN_EMAIL=superadmin@email.com SUPER_ADMIN_PASSWORD=supersecretpassword diff --git a/private_gpt/launcher.py b/private_gpt/launcher.py index fb31c96e..c2b15fb4 100644 --- a/private_gpt/launcher.py +++ b/private_gpt/launcher.py @@ -54,7 +54,7 @@ def create_app(root_injector: Injector) -> FastAPI: "http://192.168.1.98", "http://192.168.1.98:3000", "http://localhost:3000","https://globaldocquery.gibl.com.np/", "http://127.0.0.1/", "http://localhost/", "http://localhost:80", "http://192.168.1.131", 'http://192.168.1.131:3000' , "http://192.168.1.127", 'http://192.168.1.127:3000' - , "http://192.168.1.89", 'http://192.168.1.89:3000' + , "http://192.168.1.89", 'http://192.168.1.89:3000', ], allow_methods=["DELETE", "GET", "POST", "PUT", "OPTIONS", "PATCH"], allow_headers=["*"], diff --git a/private_gpt/server/completions/completions_router.py b/private_gpt/server/completions/completions_router.py index 5408bbef..99971d62 100644 --- a/private_gpt/server/completions/completions_router.py +++ b/private_gpt/server/completions/completions_router.py @@ -232,7 +232,4 @@ async def prompt_completion( except Exception as e: print(traceback.format_exc()) logger.error(f"There was an error: {str(e)}") - raise HTTPException( - status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, - detail="Internal Server Error", - ) \ No newline at end of file + raise \ No newline at end of file diff --git a/private_gpt/users/api/v1/routers/audits.py b/private_gpt/users/api/v1/routers/audits.py index 18d17528..aea9e41e 100644 --- a/private_gpt/users/api/v1/routers/audits.py +++ b/private_gpt/users/api/v1/routers/audits.py @@ -40,26 +40,26 @@ def list_auditlog( logs = crud.audit.get_multi_desc(db, skip=skip, limit=limit) return convert_audit_logs(db, logs) -@router.get("filter/", response_model=List[schemas.Audit]) +@router.get("/filter", response_model=List[schemas.Audit]) def filter_auditlog( db: Session = Depends(deps.get_db), filter_in= Depends(schemas.AuditFilter), - # current_user: models.User = Security( - # deps.get_current_user, - # scopes=[Role.SUPER_ADMIN["name"]], - # ), + current_user: models.User = Security( + deps.get_current_user, + scopes=[Role.SUPER_ADMIN["name"]], + ), ) -> List[schemas.Audit]: logs = crud.audit.filter(db, obj_in=filter_in) return convert_audit_logs(db, logs) -@router.get("download/") +@router.get("/download") def download_auditlog( db: Session = Depends(deps.get_db), filter_in= Depends(schemas.ExcelFilter), - # current_user: models.User = Security( - # deps.get_current_user, - # scopes=[Role.SUPER_ADMIN["name"]], - # ), + current_user: models.User = Security( + deps.get_current_user, + scopes=[Role.SUPER_ADMIN["name"]], + ), ): logs = crud.audit.excel_filter(db, obj_in=filter_in) username = filter_in.username if filter_in.username else None diff --git a/private_gpt/users/api/v1/routers/departments.py b/private_gpt/users/api/v1/routers/departments.py index 54bdcbc8..4283b5ca 100644 --- a/private_gpt/users/api/v1/routers/departments.py +++ b/private_gpt/users/api/v1/routers/departments.py @@ -49,7 +49,7 @@ def list_departments( """ try: role = current_user.user_role.role.name if current_user.user_role else None - if role == "SUPER_ADMIN": + if (role == "SUPER_ADMIN") or (role == "OPERATOR"): deps = crud.department.get_multi(db) else: deps = crud.department.get_multi_department( diff --git a/private_gpt/users/api/v1/routers/documents.py b/private_gpt/users/api/v1/routers/documents.py index c47b8039..c025c030 100644 --- a/private_gpt/users/api/v1/routers/documents.py +++ b/private_gpt/users/api/v1/routers/documents.py @@ -366,7 +366,7 @@ async def verify_documents( checker = schemas.DocumentCheckerUpdate( action_type=MakerCheckerActionType.UPDATE, status=MakerCheckerStatus.APPROVED, - is_enabled=False, + is_enabled=True, verified_at=datetime.now(), verified_by=current_user.id, verified=True, diff --git a/private_gpt/users/schemas/audit.py b/private_gpt/users/schemas/audit.py index c2a6aab8..86825ad7 100644 --- a/private_gpt/users/schemas/audit.py +++ b/private_gpt/users/schemas/audit.py @@ -5,11 +5,11 @@ from pydantic import BaseModel class AuditBase(BaseModel): id: int - model: str - user_id: int - action: str - details: dict - ip_address: str + model: Optional[str] = None + user_id: Optional[int] = None + action: Optional[str] = None + details: Optional[dict] = None + ip_address: Optional[str] = None timestamp: Optional[datetime] @@ -29,12 +29,12 @@ class AuditInDB(AuditBase): class Audit(BaseModel): id: int - model: str - username: str - action: str - details: dict - timestamp: Optional[datetime] - ip_address: str + model: Optional[str] = None + username: Optional[str] = None + action: Optional[str] = None + details: Optional[dict] = None + timestamp: Optional[datetime]= None + ip_address: Optional[str] = None class GetAudit(BaseModel):