Imports Optimizations, Time (conversion) command and Time parser util.

Author: MrChuw

.pre-commit-config.yaml

@@ -5,6 +5,8 @@ repos:
       - id: check-yaml
       - id: end-of-file-fixer
       - id: trailing-whitespace
+      - id: pretty-format-json
+        args: ['--autofix', '--no-sort-keys', '--indent=4', '--top-keys=comma']
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.14.6
     hooks:

bot/apis/best_logs/api.py

@@ -4,7 +4,6 @@
 from typing import TYPE_CHECKING, TypeVar
 
 from aiohttp import ClientResponse
-from aiohttp_client_cache import CachedSession
 from yarl import URL
 
 from bot.utils.singleton import Singleton
@@ -25,6 +24,8 @@
 )
 
 if TYPE_CHECKING:
+    from aiohttp_client_cache import CachedSession
+
     from bot.bot import Context, Gorenmu
 
 T = TypeVar("T")

bot/apis/color.py

@@ -1,7 +1,12 @@
+from __future__ import annotations
+
 from dataclasses import dataclass
+from typing import TYPE_CHECKING
 
 import loguru
-from aiohttp_client_cache import CachedSession
+
+if TYPE_CHECKING:
+    from aiohttp_client_cache import CachedSession
 
 
 @dataclass

bot/apis/currency.py

@@ -1,7 +1,12 @@
+from __future__ import annotations
+
 from dataclasses import dataclass
+from typing import TYPE_CHECKING
 
 import loguru
-from aiohttp_client_cache import CachedSession
+
+if TYPE_CHECKING:
+    from aiohttp_client_cache import CachedSession
 
 
 @dataclass

bot/apis/dictionary.py

@@ -1,7 +1,12 @@
+from __future__ import annotations
+
 from dataclasses import dataclass
+from typing import TYPE_CHECKING
 
 import loguru
-from aiohttp_client_cache import CachedSession
+
+if TYPE_CHECKING:
+    from aiohttp_client_cache import CachedSession
 
 
 @dataclass

bot/apis/emotes.py

@@ -5,9 +5,9 @@
 from datetime import timedelta
 from typing import TYPE_CHECKING
 
-from aiohttp_client_cache import CachedSession
-
 if TYPE_CHECKING:
+    from aiohttp_client_cache import CachedSession
+
     from bot.bot import Gorenmu
     from bot.ext import TranslationBase
     from bot.models import User

bot/apis/ivrfi/api.py

@@ -2,7 +2,6 @@
 
 from typing import TYPE_CHECKING
 
-from aiohttp_client_cache import CachedSession
 from yarl import URL
 
 from bot.utils.singleton import Singleton
@@ -11,6 +10,8 @@
 from .parsers.user import UserElement
 
 if TYPE_CHECKING:
+    from aiohttp_client_cache import CachedSession
+
     from bot.bot import Gorenmu
 
 

bot/apis/translate/base.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 """base translator class"""
 
 __copyright__ = "Copyright (C) 2020 Nidhal Baccouri"  # NOQA
@@ -6,8 +7,7 @@
 from typing import List, Optional, Union
 
 import aiohttp
-from aiohttp_client_cache import CachedSession
-from bs4 import BeautifulSoup
+
 
 from .constants import BASE_URLS, GOOGLE_LANGUAGES_TO_CODES
 from .exceptions import (
@@ -20,6 +20,10 @@
     TranslationNotFound,
 )
 
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from aiohttp_client_cache import CachedSession
 
 class GoogleTranslator:
     """
@@ -42,6 +46,8 @@ def __init__(
         @param source: source language to translate from
         @param target: target language to translate to
         """
+        from bs4 import BeautifulSoup
+        self.bs4 = BeautifulSoup
         if element_query is None:
             element_query = {"class": "t0"}
         self.session: aiohttp.ClientResponse | CachedSession = session
@@ -127,7 +133,7 @@ async def translate(self, text: str, **kwargs) -> str | None:
             if request_failed(status_code=response.status):
                 raise RequestError()
 
-            soup = BeautifulSoup(await response.text(), "html.parser")
+            soup = self.bs4(await response.text(), "html.parser")
 
             element = soup.find(self._element_tag, self._element_query)
             response.close()

bot/bot.py

@@ -7,9 +7,6 @@
 from typing import TYPE_CHECKING
 
 import twitchio
-from aiocache.backends.memcached import MemcachedCache
-from aiocache.backends.memory import SimpleMemoryCache
-from aiocache.backends.redis import RedisCache
 from twitchio.ext import commands
 from twitchio.ext.commands import CommandErrorPayload
 
@@ -22,10 +19,14 @@
     LifecycleHandler,
     TokensHandler,
 )
-from bot.utils import Cache, Config, MemCache, TimeTools
+from bot.utils import Cache, Config, MemCache  # , TimeTools
 
 if TYPE_CHECKING:
     # from bot.api import api, api_start
+    from aiocache.backends.memcached import MemcachedCache
+    from aiocache.backends.memory import SimpleMemoryCache
+    from aiocache.backends.redis import RedisCache
+
     from bot.ext import Context
 
 
@@ -53,7 +54,7 @@ def __init__(self, configs: Config, case_insensitive: bool, log: Logger, adapter
         self.CommandHandler: CommandHandler = CommandHandler(bot=self)
         self.LifecycleHandler: LifecycleHandler = LifecycleHandler(bot=self)
         self.ContextHandler: ContextHandler = ContextHandler(bot=self)
-        self.TimeTools: TimeTools = TimeTools()
+        # self.TimeTools: TimeTools = TimeTools()
 
     async def add_token(self, token: str, refresh: str) -> twitchio.authentication.ValidateTokenPayload:
         return await self.TokensHandler.add_token(token, refresh)

bot/cogs/afk/commands/afk.py

@@ -4,8 +4,8 @@
 from typing import TYPE_CHECKING
 
 from bot.ext import Context, Response, commands
-from bot.ext.named_tuples import RAfkNamedTuple
 from bot.models import Status
+from bot.types.named_tuples import RAfkNamedTuple
 
 from .translations import Translations
 
@@ -69,7 +69,7 @@ async def return_from_afk(self, ctx: Context) -> Response | bool:
             return False
         status = translations.AFK.afks(ctx).get(user_status.alias)
         humanize = translations.SupportTools.TimeTools.Humanize(ctx)
-        a_time = humanize.created_a_time(user_status.updated_at, ctx.user.timezone_)
+        a_time = humanize.created_a_time(user_status.updated_at, ctx.user.tz)
         clock_emojis = {
             0.0: "🕛",
             0.5: "🕧",
@@ -96,7 +96,7 @@ async def return_from_afk(self, ctx: Context) -> Response | bool:
             11.0: "🕚",
             11.5: "🕦",
         }
-        delta = datetime.now(ctx.user.timezone_) - user_status.updated_at.astimezone(ctx.user.timezone_)
+        delta = datetime.now(ctx.user.tz) - user_status.updated_at.astimezone(ctx.user.tz)
         rounded_hours = round(((delta.total_seconds() / 3600) % 12) * 2) / 2
         clock_emoji = clock_emojis.get(rounded_hours, "🕛")