refactored

cache/cache.py

@@ -37,8 +37,8 @@ from sqlalchemy import and_, join, select
 from auth.orm import Author, AuthorFollower
 from orm.shout import Shout, ShoutAuthor, ShoutTopic
 from orm.topic import Topic, TopicFollower
-from services.db import local_session
-from services.redis import redis
+from storage.db import local_session
+from storage.redis import redis
 from utils.encoders import fast_json_dumps
 from utils.logger import root_logger as logger
 

cache/precache.py

@@ -3,14 +3,15 @@ import traceback
 
 from sqlalchemy import and_, join, select
 
+from auth.orm import Author, AuthorFollower
+
 # Импорт Author, AuthorFollower отложен для избежания циклических импортов
 from cache.cache import cache_author, cache_topic
 from orm.shout import Shout, ShoutAuthor, ShoutReactionsFollower, ShoutTopic
 from orm.topic import Topic, TopicFollower
 from resolvers.stat import get_with_stat
-from auth.orm import Author, AuthorFollower
-from services.db import local_session
-from services.redis import redis
+from storage.db import local_session
+from storage.redis import redis
 from utils.encoders import fast_json_dumps
 from utils.logger import root_logger as logger
 

cache/revalidator.py

@@ -9,7 +9,7 @@ from cache.cache import (
     invalidate_cache_by_prefix,
 )
 from resolvers.stat import get_with_stat
-from services.redis import redis
+from storage.redis import redis
 from utils.logger import root_logger as logger
 
 CACHE_REVALIDATION_INTERVAL = 300  # 5 minutes

cache/triggers.py

@@ -1,12 +1,13 @@
 from sqlalchemy import event
 
+from auth.orm import Author, AuthorFollower
+
 # Импорт Author, AuthorFollower отложен для избежания циклических импортов
 from cache.revalidator import revalidation_manager
 from orm.reaction import Reaction, ReactionKind
 from orm.shout import Shout, ShoutAuthor, ShoutReactionsFollower
 from orm.topic import Topic, TopicFollower
-from services.db import local_session
-from auth.orm import Author, AuthorFollower
+from storage.db import local_session
 from utils.logger import root_logger as logger