chore: Always import modules; drop "from" imports

Always import modules instead of variables, functions, classes.

Bug: #49
Change-Id: I2b529abbd849ec13c71282b3268e5b4bbee6b5a4

Author: winstonsung

app.py

@@ -3,26 +3,26 @@
 """
 
 # Third-party imports
-from discord import Bot
-from discord.ext.commands import Cog
+import discord
+import discord.ext.commands
 
 
-class Build(Cog):
+class Build(discord.ext.commands.Cog):
     """
     Attributes:
-        bot (Bot): Instance of discord.Bot.
+        bot (discord.Bot): Instance of discord.Bot.
     """
 
-    bot: Bot
+    bot: discord.Bot
     """
-    bot (Bot): Instance of discord.Bot.
+    bot (discord.Bot): Instance of discord.Bot.
     """
 
-    def __init__(self, bot: Bot) -> None:
+    def __init__(self, bot: discord.Bot) -> None:
         """
         Constructor function.
 
         Parameters:
-            bot (Bot): Instance of discord.Bot.
+            bot (discord.Bot): Instance of discord.Bot.
         """
         self.bot = bot

build/build.py

@@ -2,14 +2,13 @@
 import asyncio
 import json
 import os
-from random import choice
+import random
 
 # Third-party imports
 import discord
 
 # Local imports
-from cog.core.sql import link_sql
-from cog.core.sql import end
+import cog.core.sql
 
 
 def open_json():
@@ -23,10 +22,10 @@ def open_json():
 
 
 def get_total_points():
-    connection, cursor = link_sql()
+    connection, cursor = cog.core.sql.link_sql()
     cursor.execute("SELECT SUM(point) FROM `user`")
     points = cursor.fetchone()[0]
-    end(connection, cursor)
+    cog.core.sql.end(connection, cursor)
     return points
 
 
@@ -68,6 +67,6 @@ async def change_status(bot):
         "debug",
     ]
     while not bot.is_closed():
-        status = choice(announcements)
+        status = random.choice(announcements)
         await bot.change_presence(activity=discord.Game(name=status))
         await asyncio.sleep(10)

channel_check.py

@@ -1,2 +1,6 @@
-def setup(bot):
+# Third-party imports
+import discord
+
+
+def setup(bot: discord.Bot):
     pass

cog/__init__.py

@@ -1,17 +1,11 @@
-# Standard imports
-# import csv
-# from datetime import datetime, timedelta
-# import json
-# import os
-
 # Third-party imports
 import discord
-from build.build import Build
 
 # Local imports
+import build.build
 
 
-class ManagerCommand(Build):
+class ManagerCommand(build.build.Build):
     @discord.slash_command(name="reload", description="你是管理員才讓你用")
     async def reload(self, ctx, package):
         if not ctx.author.guild_permissions.administrator:
@@ -24,14 +18,14 @@ async def reload(self, ctx, package):
     async def announce(
         self,
         ctx,
-        channel: discord.Option(
+        channel: discord.abc.GuildChannel = discord.Option(
             discord.abc.GuildChannel,
             "要發布到的頻道",
             # 一般文字頻道與公告頻道都可以選
             channel_types=[discord.ChannelType.text, discord.ChannelType.news],
         ),
-        content: discord.Option(str, "公告內容，輸入 \\n 可換行"),
-        ping: discord.Option(
+        content: str = discord.Option(str, "公告內容，輸入 \\n 可換行"),
+        ping: str = discord.Option(
             str,
             "要不要標註大家",
             choices=["不標註", "@here", "@everyone"],
@@ -69,5 +63,5 @@ async def announce(
         await ctx.respond(f"公告已發布到 {channel.mention}！", ephemeral=True)
 
 
-def setup(bot):
+def setup(bot: discord.Bot):
     bot.add_cog(ManagerCommand(bot))

cog/admin.py

@@ -1,19 +1,19 @@
 # Standard imports
-from datetime import datetime
+import datetime
 import traceback
 
 # Third-party imports
 import discord
-from discord.ext import commands
+import discord.ext.commands
 
 # Local imports
-from build.build import Build
-from cog.core.sql import link_sql, read, write, end
-from cog.core.sendgift import send_gift_button
+import build.build
+import cog.core.sendgift
+import cog.core.sql
 
 
-class SendGift(Build):
-    @commands.Cog.listener()
+class SendGift(build.build.Build):
+    @discord.ext.commands.Cog.listener()
     async def on_ready(self) -> None:
         self.bot.add_view(self.Gift())
 
@@ -27,24 +27,26 @@ def __init__(self):
         # 發送獎勵
         @staticmethod
         def __reward(uid: int, username: str, bonus_type: str, bonus: int) -> None:
-            connection, cursor = link_sql()
-            current_point = read(uid, bonus_type, cursor)
-            write(uid, bonus_type, current_point + bonus, cursor)
-            end(connection, cursor)
-            print(f"{uid} {username} get {bonus} {bonus_type} by Gift {datetime.now()}")
+            connection, cursor = cog.core.sql.link_sql()
+            current_point = cog.core.sql.read(uid, bonus_type, cursor)
+            cog.core.sql.write(uid, bonus_type, current_point + bonus, cursor)
+            cog.core.sql.end(connection, cursor)
+            print(
+                f"{uid} {username} get {bonus} {bonus_type} by Gift {datetime.datetime.now()}"
+            )
 
         # 存資料庫存取按鈕屬性(包括獎勵類型、數量)
         def __get_btn_attr(self, btn_id: int):
             try:
-                connection, cursor = link_sql()
+                connection, cursor = cog.core.sql.link_sql()
                 cursor.execute(
                     f"SELECT type, count FROM `gift` WHERE `btnID`={btn_id} and `received`=0"
                 )
                 ret = cursor.fetchall()
                 if len(ret) == 0:
                     return None, None
                 cursor.execute(f"UPDATE `gift` SET `received`=1 WHERE `btnID`={btn_id}")
-                end(connection, cursor)
+                cog.core.sql.end(connection, cursor)
                 return ret[0][0], ret[0][1]  # type, count
             except Exception as e:
                 print(e)
@@ -64,7 +66,7 @@ async def get_gift(self, button: discord.ui.Button, ctx) -> None:
                 await ctx.response.edit_message(view=self)
                 button.disabled = True  # 關閉按鈕，避免重複點擊
                 print(
-                    f"{ctx.user.id},{ctx.user} throw error by get_gift {datetime.now()}"
+                    f"{ctx.user.id},{ctx.user} throw error by get_gift {datetime.datetime.now()}"
                 )
                 return await ctx.respond(
                     "好像出了點問題，你可能已經領過或伺服器內部錯誤。若有異議請在收到此訊息兩天內截圖此畫面提交客服單回報",
@@ -85,11 +87,11 @@ def cache_users_by_name(self):
     async def send_dm_gift(
         self,
         ctx,
-        target_str: discord.Option(
+        target_str: str = discord.Option(
             str, "發送對象（用半形逗號分隔多個使用者名稱）", required=True
         ),
-        gift_type: discord.Option(str, "送禮內容", choices=["電電點", "抽獎券"]),
-        count: discord.Option(int, "數量"),
+        gift_type: str = discord.Option(str, "送禮內容", choices=["電電點", "抽獎券"]),
+        count: int = discord.Option(int, "數量"),
     ) -> None:
         if not ctx.author.guild_permissions.administrator:
             await ctx.respond("你沒有權限使用這個指令！", ephemeral=True)
@@ -126,7 +128,7 @@ async def fetch_user_by_name(name):
                     return
             # DM 一個 Embed 和領取按鈕
             for target_user in target_users:
-                await send_gift_button(
+                await cog.core.sendgift.send_gift_button(
                     self, target_user, gift_type, count, manager.name
                 )
             # 管理者介面提示
@@ -138,5 +140,5 @@ async def fetch_user_by_name(name):
             await ctx.respond(f"伺服器內部出現錯誤：{e}", ephemeral=True)
 
 
-def setup(bot):
+def setup(bot: discord.Bot):
     bot.add_cog(SendGift(bot))

cog/admin_gift.py

@@ -1,6 +1,3 @@
-# Standard imports
-# import json
-
 # Third-party imports
 import requests
 

cog/api/api.py

@@ -7,24 +7,22 @@
 """
 
 # Standard imports
+import collections
 import os
 import time
-from collections import defaultdict
-from collections import deque
 
 # Third-party imports
-from discord.ext import commands
-from dotenv import load_dotenv
-from google import genai
-from google.genai import errors
-from google.genai import types
+import discord.ext.commands
+import dotenv
+import google.genai
+import google.genai.errors
+import google.genai.types
 import openai
 
 # Local imports
-from cog.core.sql import end
-from cog.core.sql import link_sql
+import cog.core.sql
 
-load_dotenv(f"{os.getcwd()}/.env")
+dotenv.load_dotenv(f"{os.getcwd()}/.env")
 
 # 免費額度內每日請求數最多、付費也最便宜的模型
 # 額度與定價見 https://ai.google.dev/pricing
@@ -81,16 +79,16 @@ def load_knowledge():
 if KNOWLEDGE:
     SYSTEM_PROMPT += "\n\n以下是你知道的事實，回答相關問題時以此為準：\n" + KNOWLEDGE
 
-GENERATE_CONFIG = types.GenerateContentConfig(
+GENERATE_CONFIG = google.genai.types.GenerateContentConfig(
     system_instruction=SYSTEM_PROMPT,
     max_output_tokens=MAX_REPLY_TOKENS,
     # 關閉 thinking 以節省 token（flash 系列適用；
     # 若改用 gemini-2.5-pro 需移除這行）
-    thinking_config=types.ThinkingConfig(thinking_budget=0),
+    thinking_config=google.genai.types.ThinkingConfig(thinking_budget=0),
 )
 
 
-class Chat(commands.Cog):
+class Chat(discord.ext.commands.Cog):
     """
     @中電喵 聊天功能。
 
@@ -104,17 +102,21 @@ class Chat(commands.Cog):
 
     def __init__(self, bot):
         self.bot = bot
-        self.client = genai.Client(api_key=GEMINI_API_KEY) if GEMINI_API_KEY else None
+        self.client = (
+            google.genai.Client(api_key=GEMINI_API_KEY) if GEMINI_API_KEY else None
+        )
         self.groq = (
             openai.AsyncOpenAI(base_url=GROQ_BASE_URL, api_key=GROQ_API_KEY)
             if GROQ_API_KEY
             else None
         )
         # 每個頻道各自保留一小段對話歷史，超過上限自動丟棄最舊的
-        self.history = defaultdict(lambda: deque(maxlen=HISTORY_LIMIT))
+        self.history = collections.defaultdict(
+            lambda: collections.deque(maxlen=HISTORY_LIMIT)
+        )
         self.last_used = {}
 
-    @commands.Cog.listener()
+    @discord.ext.commands.Cog.listener()
     async def on_message(self, message):
         # 機器人發言不可當成觸發條件，必須排除
         if message.author.bot:
@@ -204,10 +206,10 @@ def get_chat_nick(user_id):
         """
 
         try:
-            connection, cursor = link_sql()
+            connection, cursor = cog.core.sql.link_sql()
             cursor.execute("SELECT nickname FROM chat_nick WHERE uid = %s", (user_id,))
             ret = cursor.fetchall()
-            end(connection, cursor)
+            cog.core.sql.end(connection, cursor)
             if ret and ret[0][0]:
                 return ret[0][0]
         # 資料庫掛掉不該讓聊天功能跟著掛
@@ -291,7 +293,7 @@ async def generate(self, contents):
 
         try:
             return await self._generate_gemini(CHAT_MODEL, contents)
-        except errors.APIError as exception:
+        except google.genai.errors.APIError as exception:
             if exception.code not in (429, 500, 503) or FALLBACK_MODEL == CHAT_MODEL:
                 raise
             print(
@@ -301,7 +303,7 @@ async def generate(self, contents):
 
         try:
             return await self._generate_gemini(FALLBACK_MODEL, contents)
-        except errors.APIError as exception:
+        except google.genai.errors.APIError as exception:
             if self.groq is None or exception.code not in (429, 500, 503):
                 raise
             print(
@@ -330,10 +332,10 @@ async def chat(self, message, content):
         display_name = (
             self.get_chat_nick(message.author.id) or message.author.display_name
         )
-        user_content = types.Content(
+        user_content = google.genai.types.Content(
             role="user",
             parts=[
-                types.Part(text=f"{display_name}：{content}"),
+                google.genai.types.Part(text=f"{display_name}：{content}"),
             ],
         )
 
@@ -342,7 +344,7 @@ async def chat(self, message, content):
                 reply_text, model_used, tokens_in, tokens_out = await self.generate(
                     list(channel_history) + [user_content]
                 )
-        except errors.APIError as exception:
+        except google.genai.errors.APIError as exception:
             if exception.code == 429:
                 # 免費額度的每分鐘上限滿了，約一分鐘後就會恢復
                 await message.reply(
@@ -371,7 +373,9 @@ async def chat(self, message, content):
         # 對話成立才寫入歷史，讓後續對話有前後文
         channel_history.append(user_content)
         channel_history.append(
-            types.Content(role="model", parts=[types.Part(text=reply_text)])
+            google.genai.types.Content(
+                role="model", parts=[google.genai.types.Part(text=reply_text)]
+            )
         )
 
         # 紀錄 token 用量，方便追蹤免費額度
@@ -384,5 +388,5 @@ async def chat(self, message, content):
         await message.reply(reply_text[:2000], mention_author=False)
 
 
-def setup(bot):
+def setup(bot: discord.Bot):
     bot.add_cog(Chat(bot))