Skip to content

Commit 79785c2

Browse files
committed
[DOP-25282] Fix WPS warnings
1 parent 17760e7 commit 79785c2

File tree

44 files changed

+184
-110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+184
-110
lines changed

pyproject.toml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -455,22 +455,28 @@ ignore = [
455455
"E704",
456456
# WPS220 Found too deep nesting: 34 > 20
457457
"WPS220",
458+
# WPS412 Found `__init__.py` module with logic
459+
"WPS412",
460+
# WPS410 Found wrong metadata variable: __all__
461+
"WPS410",
458462
]
459463

460464
per-file-ignores = [
461-
# F401 imported but unused
462-
# WPS410 Found wrong metadata variable: __all__
463-
# WPS412 Found `__init__.py` module with logic
464-
"__init__.py:F401,WPS410,WPS412",
465465
# WPS102 Found incorrect module name pattern
466466
# WPS432 Found magic number: 256
467467
"*migrations/*.py:WPS102,WPS432",
468468
"*db/models/*.py:WPS102,WPS432",
469+
"*db/mixins/*.py:WPS102,WPS432",
470+
# WPS432 Found magic number: 180
471+
"*settings/*.py:WPS432",
469472
# WPS404 Found complex default value
470473
"*server/api/*.py:WPS404",
471474
# WPS237 Found a too complex `f` string
472475
"*exceptions/*.py:WPS237",
473476
"*exceptions/__init__.py:F40,WPS410",
477+
# WPS201 Found module with too many imports: 30 > 25
478+
# WPS203 Found module with too many imported names: 55 > 50
479+
"syncmaster/worker/controller.py:WPS201,WPS203",
474480
# TAE001 too few type annotations
475481
# WPS231 Found function with too much cognitive complexity
476482
# S101 Use of assert detected. The enclosed code will be removed when compiling to optimised byte code.

syncmaster/db/migrations/env.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def get_next_revision_id():
4747
id_num = int(id_part)
4848
existing_ids.append(id_num)
4949
except ValueError:
50-
continue
50+
pass
5151

5252
if existing_ids:
5353
next_id = max(existing_ids) + 1

syncmaster/db/mixins/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,9 @@
33
from syncmaster.db.mixins.deletable import DeletableMixin
44
from syncmaster.db.mixins.resource import ResourceMixin
55
from syncmaster.db.mixins.timestamp import TimestampMixin
6+
7+
__all__ = [
8+
"DeletableMixin",
9+
"ResourceMixin",
10+
"TimestampMixin",
11+
]

syncmaster/db/models/__init__.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,20 @@
99
from syncmaster.db.models.run import Run, RunType, Status
1010
from syncmaster.db.models.transfer import Transfer
1111
from syncmaster.db.models.user import User
12+
13+
__all__ = [
14+
"Base",
15+
"User",
16+
"Group",
17+
"UserGroup",
18+
"GroupMemberRole",
19+
"Connection",
20+
"ConnectionType",
21+
"Transfer",
22+
"Queue",
23+
"Run",
24+
"RunType",
25+
"Status",
26+
"AuthData",
27+
"APSchedulerJob",
28+
]

syncmaster/db/models/group.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,4 @@ class UserGroup(Base):
109109
ChoiceType(GroupMemberRole),
110110
nullable=False,
111111
)
112+
group: Mapped[Group] = relationship(viewonly=True)

syncmaster/db/repositories/base.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ async def _read_by_id(self, id: int, **kwargs: Any) -> Model:
2929
raise EntityNotFoundError
3030
return obj
3131

32-
@staticmethod
33-
def _model_as_dict(model: Model) -> dict[str, Any]:
32+
def _model_as_dict(self, model: Model) -> dict[str, Any]:
3433
d = []
3534
for c in model.__table__.columns:
3635
if c.name in ("id", "search_vector"):

syncmaster/db/repositories/connection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ async def copy(
132132
except IntegrityError as integrity_error:
133133
self._raise_error(integrity_error)
134134

135-
def _raise_error(self, err: DBAPIError) -> NoReturn:
135+
def _raise_error(self, err: DBAPIError) -> NoReturn: # noqa: WPS238
136136
constraint = err.__cause__.__cause__.constraint_name
137137
if constraint == "fk__connection__group_id__group":
138138
raise GroupNotFoundError from err

syncmaster/db/repositories/group.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ async def delete_user(
361361
await self._session.delete(user_group)
362362
await self._session.flush()
363363

364-
def _raise_error(self, err: DBAPIError) -> NoReturn:
364+
def _raise_error(self, err: DBAPIError) -> NoReturn: # noqa: WPS238
365365
constraint = err.__cause__.__cause__.constraint_name
366366

367367
if constraint == "fk__group__owner_id__user":

syncmaster/db/repositories/queue.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ async def get_group_permission(self, user: User, group_id: int) -> Permission:
137137

138138
return Permission.DELETE
139139

140-
async def get_resource_permission(self, user: User, resource_id: int) -> Permission:
140+
async def get_resource_permission(self, user: User, resource_id: int) -> Permission: # noqa: WPS212
141141
"""
142142
Method for determining CRUD rights in a repository (self.model) for a resource
143143
'DEVELOPER' does not have WRITE permission in the QUEUE repository
@@ -192,8 +192,7 @@ async def get_resource_permission(self, user: User, resource_id: int) -> Permiss
192192

193193
return Permission.DELETE
194194

195-
@staticmethod
196-
def _raise_error(err: DBAPIError) -> NoReturn:
195+
def _raise_error(self, err: DBAPIError) -> NoReturn:
197196
constraint = err.__cause__.__cause__.constraint_name
198197
if constraint == "uq__queue__slug":
199198
raise DuplicatedQueueNameError

syncmaster/db/repositories/repository_with_owner.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414

1515
class RepositoryWithOwner(Repository, Generic[Model]):
16-
async def get_resource_permission(self, user: User, resource_id: int) -> Permission:
16+
async def get_resource_permission(self, user: User, resource_id: int) -> Permission: # noqa: WPS212
1717
"""Method for determining CRUD rights in a repository (self.model) for a resource"""
1818
is_exists = await self._session.get(self._model, resource_id)
1919

@@ -68,7 +68,7 @@ async def get_resource_permission(self, user: User, resource_id: int) -> Permiss
6868

6969
return Permission.DELETE # Maintainer
7070

71-
async def get_group_permission(self, user: User, group_id: int) -> Permission:
71+
async def get_group_permission(self, user: User, group_id: int) -> Permission: # noqa: WPS212
7272
"""Method for determining CRUD permissions in the specified group"""
7373
owner_query = (
7474
(

0 commit comments

Comments
 (0)