upgrade schema, resolvers, panel added

cache/cache.py

@@ -29,12 +29,12 @@ for new cache operations.
 
 import asyncio
 import json
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, List, Optional
 
 import orjson
 from sqlalchemy import and_, join, select
 
-from orm.author import Author, AuthorFollower
+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
@@ -78,7 +78,7 @@ async def cache_topic(topic: dict):
 async def cache_author(author: dict):
     payload = json.dumps(author, cls=CustomJSONEncoder)
     await asyncio.gather(
-        redis.execute("SET", f"author:user:{author['user'].strip()}", str(author["id"])),
+        redis.execute("SET", f"author:slug:{author['slug'].strip()}", str(author["id"])),
         redis.execute("SET", f"author:id:{author['id']}", payload),
     )
 
@@ -359,7 +359,13 @@ async def get_cached_topic_authors(topic_id: int):
                 select(ShoutAuthor.author)
                 .select_from(join(ShoutTopic, Shout, ShoutTopic.shout == Shout.id))
                 .join(ShoutAuthor, ShoutAuthor.shout == Shout.id)
-                .where(and_(ShoutTopic.topic == topic_id, Shout.published_at.is_not(None), Shout.deleted_at.is_(None)))
+                .where(
+                    and_(
+                        ShoutTopic.topic == topic_id,
+                        Shout.published_at.is_not(None),
+                        Shout.deleted_at.is_(None),
+                    )
+                )
             )
             authors_ids = [author_id for (author_id,) in session.execute(query).all()]
             # Cache the retrieved author IDs

cache/precache.py

@@ -4,7 +4,7 @@ import json
 from sqlalchemy import and_, join, select
 
 from cache.cache import cache_author, cache_topic
-from orm.author import Author, AuthorFollower
+from auth.orm import Author, AuthorFollower
 from orm.shout import Shout, ShoutAuthor, ShoutReactionsFollower, ShoutTopic
 from orm.topic import Topic, TopicFollower
 from resolvers.stat import get_with_stat
@@ -29,7 +29,9 @@ async def precache_authors_followers(author_id, session):
 async def precache_authors_follows(author_id, session):
     follows_topics_query = select(TopicFollower.topic).where(TopicFollower.follower == author_id)
     follows_authors_query = select(AuthorFollower.author).where(AuthorFollower.follower == author_id)
-    follows_shouts_query = select(ShoutReactionsFollower.shout).where(ShoutReactionsFollower.follower == author_id)
+    follows_shouts_query = select(ShoutReactionsFollower.shout).where(
+        ShoutReactionsFollower.follower == author_id
+    )
 
     follows_topics = {row[0] for row in session.execute(follows_topics_query) if row[0]}
     follows_authors = {row[0] for row in session.execute(follows_authors_query) if row[0]}
@@ -111,17 +113,18 @@ async def precache_data():
             logger.info(f"{len(topics)} topics and their followings precached")
 
             # authors
-            authors = get_with_stat(select(Author).where(Author.user.is_not(None)))
-            logger.info(f"{len(authors)} authors found in database")
+            authors = get_with_stat(select(Author))
+            # logger.info(f"{len(authors)} authors found in database")
             for author in authors:
                 if isinstance(author, Author):
                     profile = author.dict()
                     author_id = profile.get("id")
-                    user_id = profile.get("user", "").strip()
-                    if author_id and user_id:
+                    # user_id = profile.get("user", "").strip()
+                    if author_id:  # and user_id:
                         await cache_author(profile)
                         await asyncio.gather(
-                            precache_authors_followers(author_id, session), precache_authors_follows(author_id, session)
+                            precache_authors_followers(author_id, session),
+                            precache_authors_follows(author_id, session),
                         )
                 else:
                     logger.error(f"fail caching {author}")

cache/revalidator.py

@@ -28,13 +28,12 @@ class CacheRevalidationManager:
         """Запуск фонового воркера для ревалидации кэша."""
         # Проверяем, что у нас есть соединение с Redis
         if not self._redis._client:
-            logger.warning("Redis connection not established. Waiting for connection...")
             try:
                 await self._redis.connect()
                 logger.info("Redis connection established for revalidation manager")
             except Exception as e:
                 logger.error(f"Failed to connect to Redis: {e}")
-                
+
         self.task = asyncio.create_task(self.revalidate_cache())
 
     async def revalidate_cache(self):
@@ -53,7 +52,7 @@ class CacheRevalidationManager:
         # Проверяем соединение с Redis
         if not self._redis._client:
             return  # Выходим из метода, если не удалось подключиться
-                
+
         async with self.lock:
             # Ревалидация кэша авторов
             if self.items_to_revalidate["authors"]:

cache/triggers.py

@@ -1,7 +1,7 @@
 from sqlalchemy import event
 
 from cache.revalidator import revalidation_manager
-from orm.author import Author, AuthorFollower
+from auth.orm import Author, AuthorFollower
 from orm.reaction import Reaction, ReactionKind
 from orm.shout import Shout, ShoutAuthor, ShoutReactionsFollower
 from orm.topic import Topic, TopicFollower