Skip to content

Commit 12797f1

Browse files
committed
Move SortDirection in common.py
1 parent 85753e0 commit 12797f1

File tree

6 files changed

+19
-13
lines changed

6 files changed

+19
-13
lines changed
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
from .async_ import SQLAlchemyAsyncRepository
2-
from .base_repository import SortDirection
3-
from .common import CursorPaginatedResult, CursorReference, PaginatedResult
2+
from .common import (
3+
CursorPaginatedResult,
4+
CursorReference,
5+
PaginatedResult,
6+
SortDirection,
7+
)
48
from .sync import SQLAlchemyRepository

sqlalchemy_bind_manager/_repository/async_.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
from ..exceptions import InvalidConfig, ModelNotFound
2020
from .base_repository import (
2121
BaseRepository,
22-
SortDirection,
2322
)
2423
from .common import (
2524
MODEL,
2625
PRIMARY_KEY,
2726
CursorPaginatedResult,
2827
CursorReference,
2928
PaginatedResult,
29+
SortDirection,
3030
)
3131
from .result_presenters import CursorPaginatedResultPresenter, PaginatedResultPresenter
3232

sqlalchemy_bind_manager/_repository/base_repository.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
from abc import ABC
2-
from enum import Enum
3-
from functools import partial
42
from typing import (
53
Any,
64
Generic,
@@ -11,7 +9,7 @@
119
Union,
1210
)
1311

14-
from sqlalchemy import asc, desc, func, inspect, select
12+
from sqlalchemy import asc, func, inspect, select
1513
from sqlalchemy.orm import Mapper, aliased, class_mapper, lazyload
1614
from sqlalchemy.orm.exc import UnmappedClassError
1715
from sqlalchemy.sql import Select
@@ -21,14 +19,10 @@
2119
from .common import (
2220
MODEL,
2321
CursorReference,
22+
SortDirection,
2423
)
2524

2625

27-
class SortDirection(Enum):
28-
ASC = partial(asc)
29-
DESC = partial(desc)
30-
31-
3226
class BaseRepository(Generic[MODEL], ABC):
3327
_max_query_limit: int = 50
3428
_model: Type[MODEL]

sqlalchemy_bind_manager/_repository/common.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
from enum import Enum
2+
from functools import partial
13
from typing import Generic, List, TypeVar, Union
24

35
from pydantic import BaseModel, StrictInt, StrictStr
46
from pydantic.generics import GenericModel
7+
from sqlalchemy import asc, desc
58

69
MODEL = TypeVar("MODEL")
710
PRIMARY_KEY = Union[str, int, tuple, dict]
@@ -38,3 +41,8 @@ class CursorPageInfo(BaseModel):
3841
class CursorPaginatedResult(GenericModel, Generic[MODEL]):
3942
items: List[MODEL]
4043
page_info: CursorPageInfo
44+
45+
46+
class SortDirection(Enum):
47+
ASC = partial(asc)
48+
DESC = partial(desc)

sqlalchemy_bind_manager/_repository/sync.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
from ..exceptions import InvalidConfig, ModelNotFound
2020
from .base_repository import (
2121
BaseRepository,
22-
SortDirection,
2322
)
2423
from .common import (
2524
MODEL,
2625
PRIMARY_KEY,
2726
CursorPaginatedResult,
2827
CursorReference,
2928
PaginatedResult,
29+
SortDirection,
3030
)
3131
from .result_presenters import CursorPaginatedResultPresenter, PaginatedResultPresenter
3232

sqlalchemy_bind_manager/protocols.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
runtime_checkable,
1010
)
1111

12+
from sqlalchemy_bind_manager._repository import SortDirection
1213
from sqlalchemy_bind_manager._repository.common import (
1314
MODEL,
1415
PRIMARY_KEY,
@@ -17,7 +18,6 @@
1718
CursorPaginatedResult,
1819
CursorReference,
1920
PaginatedResult,
20-
SortDirection,
2121
)
2222

2323

0 commit comments

Comments
 (0)