Skip to content

Commit 1577f83

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 9662c1f commit 1577f83

2 files changed

Lines changed: 22 additions & 16 deletions

File tree

src/database/users.py

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,27 @@ def groups(self) -> list[UserGroup]:
7676

7777
def get_user_resource_count(*, user_id: int, expdb: Connection) -> int:
7878
"""Return the total number of datasets, flows, and runs owned by the user."""
79-
dataset_count = expdb.execute(
80-
text("SELECT COUNT(*) FROM dataset WHERE uploader = :user_id"),
81-
parameters={"user_id": user_id},
82-
).scalar() or 0
83-
flow_count = expdb.execute(
84-
text("SELECT COUNT(*) FROM implementation WHERE uploader = :user_id"),
85-
parameters={"user_id": user_id},
86-
).scalar() or 0
87-
run_count = expdb.execute(
88-
text("SELECT COUNT(*) FROM run WHERE uploader = :user_id"),
89-
parameters={"user_id": user_id},
90-
).scalar() or 0
79+
dataset_count = (
80+
expdb.execute(
81+
text("SELECT COUNT(*) FROM dataset WHERE uploader = :user_id"),
82+
parameters={"user_id": user_id},
83+
).scalar()
84+
or 0
85+
)
86+
flow_count = (
87+
expdb.execute(
88+
text("SELECT COUNT(*) FROM implementation WHERE uploader = :user_id"),
89+
parameters={"user_id": user_id},
90+
).scalar()
91+
or 0
92+
)
93+
run_count = (
94+
expdb.execute(
95+
text("SELECT COUNT(*) FROM run WHERE uploader = :user_id"),
96+
parameters={"user_id": user_id},
97+
).scalar()
98+
or 0
99+
)
91100
return int(dataset_count) + int(flow_count) + int(run_count)
92101

93102

src/routers/openml/users.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
from sqlalchemy import Connection
66

77
from core.errors import UserError
8-
from database.users import UserGroup, delete_user, get_user_resource_count
8+
from database.users import User, UserGroup, delete_user, get_user_resource_count
99
from routers.dependencies import expdb_connection, fetch_user, userdb_connection
10-
from database.users import User
1110

1211
router = APIRouter(prefix="/users", tags=["users"])
1312

@@ -43,8 +42,6 @@ def delete_account(
4342
)
4443

4544
# Verify the target user exists
46-
from database.users import get_user_id_for # noqa: PLC0415
47-
4845
# Check user exists by querying for them directly
4946
from sqlalchemy import text
5047

0 commit comments

Comments
 (0)