Skip to content

Commit edb8f5d

Browse files
fix: format
1 parent e010266 commit edb8f5d

11 files changed

+46
-42
lines changed

sqladmin/application.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
from collections import defaultdict
21
import inspect
32
import logging
3+
from collections import defaultdict
44
from types import MethodType
55
from typing import (
66
TYPE_CHECKING,
@@ -189,14 +189,14 @@ def _handle_action_decorated_func(
189189
func, "_label"
190190
)
191191
if getattr(func, "_add_in_detail"):
192-
view_instance._custom_actions_in_detail[getattr(func, "_slug")] = (
193-
getattr(func, "_label")
194-
)
192+
view_instance._custom_actions_in_detail[
193+
getattr(func, "_slug")
194+
] = getattr(func, "_label")
195195

196196
if getattr(func, "_confirmation_message"):
197-
view_instance._custom_actions_confirmation[getattr(func, "_slug")] = (
198-
getattr(func, "_confirmation_message")
199-
)
197+
view_instance._custom_actions_confirmation[
198+
getattr(func, "_slug")
199+
] = getattr(func, "_confirmation_message")
200200

201201
def _handle_expose_decorated_func(
202202
self,
@@ -208,7 +208,7 @@ def _handle_expose_decorated_func(
208208
self.admin.register(
209209
HTTPRouteHandler(
210210
"/admin" + getattr(func, "_path"),
211-
name="admin:" +getattr(func, "_identity"),
211+
name="admin:" + getattr(func, "_identity"),
212212
http_method=getattr(func, "_methods"),
213213
include_in_schema=getattr(func, "_include_in_schema"),
214214
)(func)

sqladmin/fields.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,8 @@ def process_formdata(self, valuelist: list) -> None:
374374
class Select2TagsField(fields.SelectField):
375375
widget = sqladmin_widgets.Select2TagsWidget()
376376

377-
def pre_validate(self, form: Form) -> None: ...
377+
def pre_validate(self, form: Form) -> None:
378+
...
378379

379380
def process_formdata(self, valuelist: list) -> None:
380381
self.data = valuelist

tests/test_ajax.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import pytest
44
from httpx import AsyncClient
5+
from litestar import Litestar
56
from sqlalchemy import Column, ForeignKey, Integer, String, select
67
from sqlalchemy.ext.asyncio import AsyncSession
78
from sqlalchemy.orm import declarative_base, relationship, selectinload, sessionmaker
8-
from litestar import Litestar
99

1010
from sqladmin import Admin, ModelView
1111
from sqladmin.ajax import create_ajax_loader

tests/test_application.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
from sqlalchemy import Column, Integer, String
2-
from sqlalchemy.orm import declarative_base
3-
from litestar import Litestar, route
1+
from litestar import Litestar, Request, route
42
from litestar.datastructures import MutableScopeHeaders as MutableHeaders
53
from litestar.middleware import DefineMiddleware as Middleware
6-
from litestar import Request
74
from litestar.response import Response
85
from litestar.testing import TestClient
96
from litestar.types import ASGIApp, Message, Receive, Scope, Send
7+
from sqlalchemy import Column, Integer, String
8+
from sqlalchemy.orm import declarative_base
109

1110
from sqladmin import Admin, ModelView
1211
from tests.common import sync_engine as engine
@@ -87,7 +86,6 @@ async def send_wrapper(message: Message) -> None:
8786

8887

8988
def test_get_save_redirect_url():
90-
9189
@route("/x/{identity:str}", http_method=["POST"])
9290
async def index(request: Request) -> Response:
9391
obj = User(id=1)
@@ -134,7 +132,8 @@ def test_normalize_wtform_fields() -> None:
134132
app = Litestar()
135133
admin = Admin(app=app, engine=engine)
136134

137-
class DataModelAdmin(ModelView, model=DataModel): ...
135+
class DataModelAdmin(ModelView, model=DataModel):
136+
...
138137

139138
datamodel = DataModel(id=1, data="abcdef")
140139
admin.add_view(DataModelAdmin)
@@ -145,7 +144,8 @@ def test_denormalize_wtform_fields() -> None:
145144
app = Litestar()
146145
admin = Admin(app=app, engine=engine)
147146

148-
class DataModelAdmin(ModelView, model=DataModel): ...
147+
class DataModelAdmin(ModelView, model=DataModel):
148+
...
149149

150150
datamodel = DataModel(id=1, data="abcdef")
151151
admin.add_view(DataModelAdmin)

tests/test_base_view.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
from typing import Generator
22

33
import pytest
4-
from sqlalchemy.orm import declarative_base
5-
from litestar import Litestar
6-
from litestar import Request, Response
4+
from litestar import Litestar, Request, Response
75
from litestar.testing import TestClient
6+
from sqlalchemy.orm import declarative_base
87

98
from sqladmin import Admin, BaseView, expose
109
from tests.common import sync_engine as engine

tests/test_menu.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
from litestar.testing import RequestFactory
12
from sqlalchemy import Column, Integer, String
23
from sqlalchemy.orm import declarative_base
3-
from litestar.testing import RequestFactory
4+
45
from sqladmin import ModelView
56
from sqladmin._menu import CategoryMenu, ItemMenu, Menu, ViewMenu
67

tests/test_models.py

+15-9
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
from typing import Generator
33

44
import pytest
5+
from litestar import Litestar, Request
6+
from litestar.testing import RequestFactory
57
from markupsafe import Markup
68
from sqlalchemy import Boolean, Column, Enum, ForeignKey, Integer, String, select
79
from sqlalchemy.dialects.postgresql import UUID
810
from sqlalchemy.orm import declarative_base, relationship, sessionmaker
911
from sqlalchemy.sql.expression import Select
10-
from litestar import Litestar
11-
from litestar import Request
12-
from litestar.testing import RequestFactory
1312

1413
from sqladmin import Admin, ModelView
1514
from sqladmin.exceptions import InvalidModelError
@@ -178,7 +177,8 @@ class UserAdmin(ModelView, model=User):
178177

179178

180179
async def test_column_formatters_default() -> None:
181-
class ProfileAdmin(ModelView, model=Profile): ...
180+
class ProfileAdmin(ModelView, model=Profile):
181+
...
182182

183183
user = User(id=1, name="Long Name")
184184
profile = Profile(user=user, is_active=True)
@@ -341,7 +341,8 @@ class PostgresModel(Base):
341341

342342

343343
def test_model_default_sort() -> None:
344-
class UserAdmin(ModelView, model=User): ...
344+
class UserAdmin(ModelView, model=User):
345+
...
345346

346347
assert UserAdmin()._get_default_sort() == [("id", False)]
347348

@@ -417,19 +418,24 @@ class UserAdmin(ModelView, model=User):
417418

418419

419420
def test_sort_query() -> None:
420-
class AddressAdmin(ModelView, model=Address): ...
421+
class AddressAdmin(ModelView, model=Address):
422+
...
421423

422424
query = select(Address)
423425

424-
request = RequestFactory().get("/", query_params={"sortBy":"id", "sort":"asc"})
426+
request = RequestFactory().get("/", query_params={"sortBy": "id", "sort": "asc"})
425427
stmt = AddressAdmin().sort_query(query, request)
426428
assert "ORDER BY addresses.id ASC" in str(stmt)
427429

428-
request = RequestFactory().get("/", query_params={"sortBy":"user.name", "sort":"desc"})
430+
request = RequestFactory().get(
431+
"/", query_params={"sortBy": "user.name", "sort": "desc"}
432+
)
429433
stmt = AddressAdmin().sort_query(query, request)
430434
assert "ORDER BY users.name DESC" in str(stmt)
431435

432-
request = RequestFactory().get("/", query_params={"sortBy":"user.profile.role", "sort":"asc"})
436+
request = RequestFactory().get(
437+
"/", query_params={"sortBy": "user.profile.role", "sort": "asc"}
438+
)
433439
stmt = AddressAdmin().sort_query(query, request)
434440
assert "ORDER BY profiles.role ASC" in str(stmt)
435441

tests/test_models_action.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
from unittest.mock import Mock
33

44
import pytest
5+
from litestar import Litestar, Request
6+
from litestar.response import Redirect as RedirectResponse
7+
from litestar.response import Response
8+
from litestar.testing import TestClient
59
from sqlalchemy import Column, Integer
610
from sqlalchemy.orm import declarative_base, sessionmaker
7-
from litestar import Litestar
8-
from litestar import Request
9-
from litestar.response import Redirect as RedirectResponse, Response
10-
from litestar.testing import TestClient
1111

1212
from sqladmin import Admin, ModelView
1313
from sqladmin.application import action

tests/test_views/test_multi_pk_view.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
from typing import Any, Generator
22

33
import pytest
4-
from sqlalchemy import Column, ForeignKey, ForeignKeyConstraint, Integer, String
5-
from sqlalchemy.orm import declarative_base, relationship, sessionmaker
64
from litestar import Litestar
75
from litestar.testing import TestClient
6+
from sqlalchemy import Column, ForeignKey, ForeignKeyConstraint, Integer, String
7+
from sqlalchemy.orm import declarative_base, relationship, sessionmaker
88

99
from sqladmin import Admin, ModelView
1010
from tests.common import sync_engine as engine
@@ -132,7 +132,6 @@ class ReviewComplaintAdmin(ModelView, model=ReviewComplaint):
132132

133133
def base_content():
134134
with session_maker() as session:
135-
136135
session.add(Movie(id=1, name="Python"))
137136
session.add(Movie(id=2, name="Cobra"))
138137
session.add(Movie(id=3, name="Cobra 2"))

tests/test_views/test_view_async.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
import pytest
55
from httpx import AsyncClient
6+
from litestar import Litestar, Request
67
from sqlalchemy import (
78
JSON,
89
BigInteger,
@@ -17,8 +18,6 @@
1718
)
1819
from sqlalchemy.ext.asyncio import AsyncSession
1920
from sqlalchemy.orm import declarative_base, relationship, selectinload, sessionmaker
20-
from litestar import Litestar
21-
from litestar import Request
2221

2322
from sqladmin import Admin, ModelView
2423
from tests.common import async_engine as engine

tests/test_views/test_view_sync.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
from typing import Any, Generator
33

44
import pytest
5+
from litestar import Litestar, Request
6+
from litestar.testing import TestClient
57
from sqlalchemy import (
68
JSON,
79
Column,
@@ -14,9 +16,6 @@
1416
select,
1517
)
1618
from sqlalchemy.orm import declarative_base, relationship, selectinload, sessionmaker
17-
from litestar import Litestar
18-
from litestar import Request
19-
from litestar.testing import TestClient
2019

2120
from sqladmin import Admin, ModelView
2221
from tests.common import sync_engine as engine

0 commit comments

Comments
 (0)