Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/dstack/_internal/server/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,8 @@ async def migrate():

async def get_session():
async with db.get_session() as session:
async with session as s:
yield s
await s.commit()
yield session
await session.commit()


get_session_ctx = asynccontextmanager(get_session)
Expand Down
1 change: 1 addition & 0 deletions src/dstack/_internal/server/services/projects.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ async def delete_projects(
name=new_project_name,
)
)
await session.commit()


async def add_project_member(
Expand Down
2 changes: 2 additions & 0 deletions src/dstack/_internal/server/services/repos.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ async def update_repo(
creds=repo.creds,
)
)
await session.commit()
return repo


Expand All @@ -126,6 +127,7 @@ async def delete_repos(
await session.execute(
delete(RepoModel).where(RepoModel.project_id == project.id, RepoModel.name.in_(repos_ids))
)
await session.commit()


async def upload_code(
Expand Down
1 change: 1 addition & 0 deletions src/dstack/_internal/server/services/runs.py
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ async def delete_runs(
)
.values(deleted=True)
)
await session.commit()


def run_model_to_run(run_model: RunModel, include_job_submissions: bool = True) -> Run:
Expand Down
3 changes: 3 additions & 0 deletions src/dstack/_internal/server/services/users.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,15 @@ async def update_user(
.where(UserModel.name == username)
.values(global_role=global_role, email=email)
)
await session.commit()
return await get_user_model_by_name_or_error(session=session, username=username)


async def refresh_user_token(session: AsyncSession, username: str) -> Optional[UserModel]:
await session.execute(
update(UserModel).where(UserModel.name == username).values(token=uuid.uuid4())
)
await session.commit()
return await get_user_model_by_name(session=session, username=username)


Expand All @@ -101,6 +103,7 @@ async def delete_users(
usernames: List[str],
):
await session.execute(delete(UserModel).where(UserModel.name.in_(usernames)))
await session.commit()


async def get_user_model_by_name(session: AsyncSession, username: str) -> Optional[UserModel]:
Expand Down
5 changes: 2 additions & 3 deletions src/tests/_internal/server/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,5 @@ async def test_db():
@pytest_asyncio.fixture
async def session():
async with db.get_session() as session:
async with session as s:
yield s
await s.commit()
yield session
await session.commit()