Skip to content

Commit 5ca77f9

Browse files
Apply pre-commit formatting fixes to PR2
1 parent 8b103a6 commit 5ca77f9

4 files changed

Lines changed: 18 additions & 13 deletions

File tree

src/dstack/_internal/server/routers/projects.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
ProjectManager,
2020
ProjectManagerOrPublicJoin,
2121
ProjectManagerOrSelfLeave,
22-
ProjectMember,
2322
ProjectMemberOrPublicAccess,
2423
)
2524
from dstack._internal.server.services import projects

src/dstack/_internal/server/security/permissions.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ class ProjectManager:
7171
"""
7272
Allows project admins and managers to manage projects.
7373
"""
74+
7475
async def __call__(
7576
self,
7677
project_name: str,
@@ -83,16 +84,16 @@ async def __call__(
8384
project = await get_project_model_by_name(session=session, project_name=project_name)
8485
if project is None:
8586
raise error_not_found()
86-
87+
8788
# Global admin can always manage projects
8889
if user.global_role == GlobalRole.ADMIN:
8990
return user, project
90-
91+
9192
# Project managers and admins can manage projects
9293
project_role = get_user_project_role(user=user, project=project)
9394
if project_role in [ProjectRole.ADMIN, ProjectRole.MANAGER]:
9495
return user, project
95-
96+
9697
raise error_forbidden()
9798

9899

src/dstack/_internal/server/services/projects.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ def _is_project_admin(
618618
# Check if user is the project owner
619619
if user.id == project.owner_id:
620620
return True
621-
621+
622622
# Check if user has admin role in project members
623623
for m in project.members:
624624
if user.id == m.user_id:

src/tests/_internal/server/routers/test_projects.py

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@ async def test_returns_projects(self, test_db, session: AsyncSession, client: As
4949
created_at=datetime(2023, 1, 2, 3, 4, tzinfo=timezone.utc),
5050
)
5151
await add_project_member(
52-
session=session,
53-
project=project,
54-
user=user,
55-
project_role=ProjectRole.ADMIN
52+
session=session, project=project, user=user, project_role=ProjectRole.ADMIN
5653
)
5754
await create_backend(
5855
session=session,
@@ -1812,7 +1809,9 @@ async def test_project_manager_can_update_visibility(
18121809
):
18131810
# Setup project with admin and manager
18141811
admin_user = await create_user(session=session, name="admin", global_role=GlobalRole.USER)
1815-
manager_user = await create_user(session=session, name="manager", global_role=GlobalRole.USER)
1812+
manager_user = await create_user(
1813+
session=session, name="manager", global_role=GlobalRole.USER
1814+
)
18161815
project = await create_project(session=session, owner=admin_user, is_public=False)
18171816
await add_project_member(
18181817
session=session, project=project, user=admin_user, project_role=ProjectRole.ADMIN
@@ -1861,7 +1860,9 @@ async def test_non_member_cannot_update_visibility(
18611860
):
18621861
# Setup project with admin and separate non-member user
18631862
admin_user = await create_user(session=session, name="admin", global_role=GlobalRole.USER)
1864-
non_member_user = await create_user(session=session, name="nonmember", global_role=GlobalRole.USER)
1863+
non_member_user = await create_user(
1864+
session=session, name="nonmember", global_role=GlobalRole.USER
1865+
)
18651866
project = await create_project(session=session, owner=admin_user, is_public=False)
18661867
await add_project_member(
18671868
session=session, project=project, user=admin_user, project_role=ProjectRole.ADMIN
@@ -1881,8 +1882,12 @@ async def test_global_admin_can_update_any_project_visibility(
18811882
self, test_db, session: AsyncSession, client: AsyncClient
18821883
):
18831884
# Setup project with regular owner and global admin
1884-
project_owner = await create_user(session=session, name="owner", global_role=GlobalRole.USER)
1885-
global_admin = await create_user(session=session, name="admin", global_role=GlobalRole.ADMIN)
1885+
project_owner = await create_user(
1886+
session=session, name="owner", global_role=GlobalRole.USER
1887+
)
1888+
global_admin = await create_user(
1889+
session=session, name="admin", global_role=GlobalRole.ADMIN
1890+
)
18861891
project = await create_project(session=session, owner=project_owner, is_public=False)
18871892
await add_project_member(
18881893
session=session, project=project, user=project_owner, project_role=ProjectRole.ADMIN

0 commit comments

Comments
 (0)