refactored

storages/reactions.py

@@ -1,9 +1,9 @@
 import asyncio
 from sqlalchemy import and_, desc, func
-from sqlalchemy.orm import selectinload, joinedload
-from orm.base import local_session
+from sqlalchemy.orm import joinedload
+from base.orm import local_session
 from orm.reaction import Reaction, ReactionKind
-from orm.topic import ShoutTopic, Topic
+from orm.topic import ShoutTopic
 
 
 def kind_to_rate(kind) -> int:

storages/roles.py

@@ -1,7 +1,6 @@
 
 import asyncio
 from sqlalchemy.orm import selectinload
-
 from orm.rbac import Role
 
 class RoleStorage:

storages/shoutauthor.py

@@ -1,6 +1,6 @@
 
 import asyncio
-from orm.base import local_session
+from base.orm import local_session
 from orm.shout import ShoutAuthor
 
 

storages/shoutscache.py

@@ -3,7 +3,7 @@ import asyncio
 from datetime import datetime, timedelta
 from sqlalchemy import and_, desc, func, select
 from sqlalchemy.orm import selectinload
-from orm.base import local_session
+from base.orm import local_session
 from orm.reaction import Reaction
 from orm.shout import Shout
 from storages.reactions import ReactionsStorage

storages/topics.py

@@ -1,4 +1,3 @@
-
 import asyncio
 from orm.topic import Topic
 

storages/topicstat.py

@@ -1,7 +1,5 @@
-
-
 import asyncio
-from orm.base import local_session
+from base.orm import local_session
 from storages.shoutauthor import ShoutAuthorStorage
 from orm.topic import ShoutTopic, TopicFollower
 from typing import Dict

storages/users.py

@@ -1,4 +1,3 @@
-
 import asyncio
 from sqlalchemy.orm import selectinload
 from orm.user import User

storages/viewed.py

@@ -1,9 +1,8 @@
-
 import asyncio
 from datetime import datetime
 from sqlalchemy import Column, DateTime, ForeignKey, Integer
 from sqlalchemy.orm.attributes import flag_modified
-from orm.base import Base, local_session
+from base.orm import Base, local_session
 
 
 class ViewedByDay(Base):