moved

cache/cache.py

@@ -7,9 +7,9 @@ from orm.author import Author, AuthorFollower
 from orm.topic import Topic, TopicFollower
 from orm.shout import Shout, ShoutAuthor, ShoutTopic
 from services.db import local_session
-from services.encoders import CustomJSONEncoder
+from utils.encoders import CustomJSONEncoder
-from services.rediscache import redis
+from cache.rediscache import redis
-from services.logger import root_logger as logger
+from utils.logger import root_logger as logger
 
 DEFAULT_FOLLOWS = {
     "topics": [],

cache/precache.py

@@ -6,11 +6,11 @@ from orm.author import Author, AuthorFollower
 from orm.shout import Shout, ShoutAuthor, ShoutTopic
 from orm.topic import Topic, TopicFollower
 from resolvers.stat import get_with_stat
-from services.cache import cache_author, cache_topic
+from cache.cache import cache_author, cache_topic
 from services.db import local_session
-from services.encoders import CustomJSONEncoder
+from utils.encoders import CustomJSONEncoder
-from services.logger import root_logger as logger
+from utils.logger import root_logger as logger
-from services.rediscache import redis
+from cache.rediscache import redis
 
 
 async def precache_authors_followers(author_id, session):

cache/revalidator.py

@@ -1,6 +1,6 @@
 import asyncio
-from services.logger import root_logger as logger
+from utils.logger import root_logger as logger
-from services.cache import get_cached_author, cache_author, cache_topic, get_cached_topic
+from cache.cache import get_cached_author, cache_author, cache_topic, get_cached_topic
 
 
 class CacheRevalidationManager:

cache/triggers.py

@@ -3,8 +3,8 @@ from orm.author import Author, AuthorFollower
 from orm.reaction import Reaction
 from orm.shout import Shout, ShoutAuthor
 from orm.topic import Topic, TopicFollower
-from services.revalidator import revalidation_manager
+from cache.revalidator import revalidation_manager
-from services.logger import root_logger as logger
+from utils.logger import root_logger as logger
 
 
 def after_update_handler(mapper, connection, target):

cache/unread.py

@@ -1,6 +1,6 @@
 import json
 
-from services.rediscache import redis
+from cache.rediscache import redis
 
 
 async def get_unread_counter(chat_id: str, author_id: int) -> int:

main.py

@@ -8,14 +8,14 @@ from starlette.applications import Starlette
 from starlette.routing import Route
 
 from services.exception import ExceptionHandlerMiddleware
-from services.precache import precache_data
-from services.rediscache import redis
 from services.schema import resolvers
 from services.search import search_service
 from services.sentry import start_sentry
 from services.viewed import ViewedStorage
 from services.webhook import WebhookEndpoint
-from services.revalidator import revalidation_manager
+from cache.precache import precache_data
+from cache.rediscache import redis
+from cache.revalidator import revalidation_manager
 from settings import DEV_SERVER_PID_FILE_NAME, MODE
 
 import_module("resolvers")

orm/notification.py

@@ -7,7 +7,7 @@ from sqlalchemy.orm import relationship
 
 from orm.author import Author
 from services.db import Base, engine
-from services.logger import root_logger as logger
+from utils.logger import root_logger as logger
 
 
 class NotificationEntity(Enumeration):

resolvers/__init__.py

@@ -49,7 +49,7 @@ from resolvers.topic import (
     get_topics_by_author,
     get_topics_by_community,
 )
-from services.triggers import events_register
+from cache.triggers import events_register
 
 events_register()
 

resolvers/author.py

@@ -8,7 +8,7 @@ from orm.shout import ShoutAuthor, ShoutTopic
 from orm.topic import Topic
 from resolvers.stat import get_with_stat
 from services.auth import login_required
-from services.cache import (
+from cache.cache import (
     cache_author,
     get_cached_author,
     get_cached_author_by_user_id,
@@ -17,7 +17,7 @@ from services.cache import (
     get_cached_follower_topics,
 )
 from services.db import local_session
-from services.logger import root_logger as logger
+from utils.logger import root_logger as logger
 from services.schema import mutation, query
 
 

resolvers/editor.py

@@ -12,10 +12,10 @@ from orm.topic import Topic
 from resolvers.follower import follow, unfollow
 from resolvers.stat import get_with_stat
 from services.auth import login_required
-from services.cache import cache_author, cache_topic
+from cache.cache import cache_author, cache_topic
 from services.db import local_session
-from services.diff import apply_diff, get_diff
+from utils.diff import apply_diff, get_diff
-from services.logger import root_logger as logger
+from utils.logger import root_logger as logger
 from services.notify import notify_shout
 from services.schema import mutation, query
 from services.search import search_service

resolvers/follower.py

@@ -10,7 +10,7 @@ from orm.shout import Shout, ShoutReactionsFollower
 from orm.topic import Topic, TopicFollower
 from resolvers.stat import get_with_stat
 from services.auth import login_required
-from services.cache import cache_author, cache_topic, get_cached_follower_authors, get_cached_follower_topics
+from cache.cache import cache_author, cache_topic, get_cached_follower_authors, get_cached_follower_topics
 from services.db import local_session
 from services.notify import notify_follower
 from services.schema import mutation, query

resolvers/notifier.py

@@ -12,7 +12,7 @@ from orm.notification import Notification, NotificationAction, NotificationEntit
 from orm.shout import Shout
 from services.auth import login_required
 from services.db import local_session
-from services.logger import root_logger as logger
+from utils.logger import root_logger as logger
 from services.schema import mutation, query
 
 

resolvers/reaction.py

@@ -14,7 +14,7 @@ from resolvers.follower import follow
 from resolvers.stat import update_author_stat
 from services.auth import add_user_role, login_required
 from services.db import local_session
-from services.logger import root_logger as logger
+from utils.logger import root_logger as logger
 from services.notify import notify_reaction
 from services.schema import mutation, query
 from services.viewed import ViewedStorage

resolvers/reader.py

@@ -19,7 +19,7 @@ from resolvers.reaction import add_reaction_stat_columns
 from resolvers.topic import get_topics_random
 from services.auth import login_required
 from services.db import local_session
-from services.logger import root_logger as logger
+from utils.logger import root_logger as logger
 from services.schema import query
 from services.search import search_text
 from services.viewed import ViewedStorage

resolvers/stat.py

@@ -7,9 +7,9 @@ from orm.author import Author, AuthorFollower
 from orm.reaction import Reaction, ReactionKind
 from orm.shout import Shout, ShoutAuthor, ShoutTopic
 from orm.topic import Topic, TopicFollower
-from services.cache import cache_author
+from cache.cache import cache_author
 from services.db import local_session
-from services.logger import root_logger as logger
+from utils.logger import root_logger as logger
 
 
 def add_topic_stat_columns(q):

resolvers/topic.py

@@ -5,10 +5,10 @@ from orm.shout import ShoutTopic
 from orm.topic import Topic
 from resolvers.stat import get_with_stat
 from services.auth import login_required
-from services.cache import get_cached_topic_authors, get_cached_topic_by_slug, get_cached_topic_followers
+from cache.cache import get_cached_topic_authors, get_cached_topic_by_slug, get_cached_topic_followers
 from services.db import local_session
-from services.logger import root_logger as logger
+from utils.logger import root_logger as logger
-from services.memorycache import cache_region
+from cache.memorycache import cache_region
 from services.schema import mutation, query
 
 

server.py

@@ -3,7 +3,7 @@ import subprocess
 from granian.constants import Interfaces
 from granian.server import Granian
 
-from services.logger import root_logger as logger
+from utils.logger import root_logger as logger
 from settings import PORT
 
 

services/auth.py

@@ -3,8 +3,8 @@ from functools import wraps
 import httpx
 
 from resolvers.stat import get_with_stat
-from services.cache import get_cached_author_by_user_id
+from cache.cache import get_cached_author_by_user_id
-from services.logger import root_logger as logger
+from utils.logger import root_logger as logger
 from settings import ADMIN_SECRET, AUTH_URL
 
 

services/db.py

@@ -10,7 +10,7 @@ from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import Session, configure_mappers
 from sqlalchemy.sql.schema import Table
 
-from services.logger import root_logger as logger
+from utils.logger import root_logger as logger
 from settings import DB_URL
 
 # from sqlalchemy_searchable import make_searchable

services/notify.py

@@ -2,8 +2,8 @@ import json
 
 from orm.notification import Notification
 from services.db import local_session
-from services.logger import root_logger as logger
+from utils.logger import root_logger as logger
-from services.rediscache import redis
+from cache.rediscache import redis
 
 
 def save_notification(action: str, entity: str, payload):

services/search.py

@@ -5,8 +5,8 @@ import os
 
 from opensearchpy import OpenSearch
 
-from services.encoders import CustomJSONEncoder
+from utils.encoders import CustomJSONEncoder
-from services.rediscache import redis
+from cache.rediscache import redis
 
 # Set redis logging level to suppress DEBUG messages
 logger = logging.getLogger("search")

services/webhook.py

@@ -10,7 +10,7 @@ from starlette.responses import JSONResponse
 
 from orm.author import Author
 from resolvers.stat import get_with_stat
-from services.cache import cache_author
+from cache.cache import cache_author
 from services.db import local_session