diff --git a/.env b/.env index aabef866..48179c0b 100644 --- a/.env +++ b/.env @@ -4,7 +4,7 @@ ENVIRONMENT=dev DB_HOST=localhost DB_USER=postgres DB_PORT=5432 -DB_PASSWORD=quick +DB_PASSWORD=admin DB_NAME=QuickGpt SUPER_ADMIN_EMAIL=superadmin@email.com diff --git a/private_gpt/home.py b/private_gpt/home.py index d02a5c53..1b499fc8 100644 --- a/private_gpt/home.py +++ b/private_gpt/home.py @@ -81,6 +81,7 @@ class Home: if completion_gen.sources: full_response += SOURCES_SEPARATOR cur_sources = Source.curate_sources(completion_gen.sources) + sources_text = "\n".join( f'{index}. {source.file} (page {source.page})' for index, source in enumerate(cur_sources, start=1) diff --git a/private_gpt/users/api/v1/routers/auth.py b/private_gpt/users/api/v1/routers/auth.py index 98040169..eb07abef 100644 --- a/private_gpt/users/api/v1/routers/auth.py +++ b/private_gpt/users/api/v1/routers/auth.py @@ -115,15 +115,7 @@ def login_access_token( @router.post("/login/refresh-token", response_model=schemas.TokenSchema) -def refresh_ - - - - - - - -access_token( +def refresh_access_token( db: Session = Depends(deps.get_db), refresh_token: str = Body(..., embed=True), ) -> Any: @@ -150,57 +142,6 @@ def register( *, db: Session = Depends(deps.get_db), email: str = Body(...), - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - fullname: str = Body(...), company_id: int = Body(None, title="Company ID", description="Company ID for the user (if applicable)"), diff --git a/private_gpt/users/api/v1/routers/users.py b/private_gpt/users/api/v1/routers/users.py index b943ad85..c3a93922 100644 --- a/private_gpt/users/api/v1/routers/users.py +++ b/private_gpt/users/api/v1/routers/users.py @@ -84,13 +84,13 @@ def create_user( def update_username( *, db: Session = Depends(deps.get_db), - fullname: str = Body(...), current_user: models.User = Depends(deps.get_current_user), + update_in: schemas.UsernameUpdate, ) -> Any: """ Update own username. """ - user_in = schemas.UserUpdate(fullname=fullname, email=current_user.email, company_id=current_user.company_id) + user_in = schemas.UserUpdate(fullname=update_in.fullname, email=current_user.email, company_id=current_user.company_id) user = crud.user.update(db, db_obj=current_user, obj_in=user_in) user_data = schemas.UserBaseSchema( email=user.email, diff --git a/private_gpt/users/schemas/__init__.py b/private_gpt/users/schemas/__init__.py index 180915d5..808d8724 100644 --- a/private_gpt/users/schemas/__init__.py +++ b/private_gpt/users/schemas/__init__.py @@ -1,6 +1,6 @@ from .role import Role, RoleCreate, RoleInDB, RoleUpdate from .token import TokenSchema, TokenPayload -from .user import User, UserCreate, UserInDB, UserUpdate, UserBaseSchema, Profile +from .user import User, UserCreate, UserInDB, UserUpdate, UserBaseSchema, Profile, UsernameUpdate from .user_role import UserRole, UserRoleCreate, UserRoleInDB, UserRoleUpdate from .subscription import Subscription, SubscriptionBase, SubscriptionCreate, SubscriptionUpdate from .company import Company, CompanyBase, CompanyCreate, CompanyUpdate \ No newline at end of file diff --git a/private_gpt/users/schemas/user.py b/private_gpt/users/schemas/user.py index c50a3882..ffabbdb2 100644 --- a/private_gpt/users/schemas/user.py +++ b/private_gpt/users/schemas/user.py @@ -17,6 +17,8 @@ class UserBaseSchema(BaseModel): class UserCreate(UserBaseSchema): password: str = Field(alias="password") +class UsernameUpdate(BaseModel): + fullname: str class UserUpdate(UserBaseSchema): last_login: Optional[datetime] = None