From a7f98ebf609998003a3e2b405c5198aea5dff5be Mon Sep 17 00:00:00 2001 From: salmonik Date: Sun, 19 Apr 2026 00:46:59 +0200 Subject: less info logging in cron.py Signed-off-by: salmonik --- cogs/cron.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cogs/cron.py') diff --git a/cogs/cron.py b/cogs/cron.py index 6b83866..6e5020e 100644 --- a/cogs/cron.py +++ b/cogs/cron.py @@ -74,7 +74,7 @@ class Cron(commands.Cog): prev_time = cron.get_prev(datetime) time_diff = abs((now - prev_time).total_seconds()) result = time_diff <= 30 - logger.info( + logger.debug( f"Cron '{cron_expr}': prev={prev_time}, now={now}, diff={time_diff}, run={result}" ) return result @@ -98,7 +98,7 @@ class Cron(commands.Cog): logger.info(f"Found channel {channel} (type: {type(channel).__name__})") perms = channel.permissions_for(channel.guild.me) - logger.info( + logger.debug( f"Bot permissions: send_messages={perms.send_messages}, attach_files={perms.attach_files}" ) @@ -151,7 +151,7 @@ class Cron(commands.Cog): message = task["message"] logger.info(f"Message to send: '{message}' | Channel: {channel.id}") await channel.send(message) - logger.info("Message sent successfully") + logger.debug("Message sent successfully") async def audio_autocomplete(self, ctx: discord.AutocompleteContext): """Autocomplete for audio files from file_search""" -- cgit v1.2.3 From 1dcdbe3cf03ff16b3ff2e2e6d572e0b3c72c18c0 Mon Sep 17 00:00:00 2001 From: salmonik Date: Sun, 19 Apr 2026 15:43:32 +0200 Subject: refactor: simplify cogs, reduce complexity - Remove unused imports and dead code - Cleaner error handling - Reduce cognitive complexity --- cogs/ai.py | 35 ++++++++++++++-------------- cogs/assistant.py | 13 ++++++----- cogs/compression.py | 1 + cogs/cron.py | 2 +- cogs/downloader.py | 2 +- cogs/music/audio_playback.py | 55 ++++++++++++++++++++++++++++++-------------- cogs/music/play_commands.py | 4 +++- cogs/qr.py | 8 +++---- cogs/trigger.py | 44 ++++++++++++++++++++--------------- cogs/tts.py | 12 ++++------ cogs/utils/settings.py | 11 +++++---- cogs/utils/temp.py | 4 ++-- cogs/vclogs.py | 15 ++++++++++-- cogs/voice.py | 4 ++-- cogs/web.py | 2 +- 15 files changed, 127 insertions(+), 85 deletions(-) (limited to 'cogs/cron.py') diff --git a/cogs/ai.py b/cogs/ai.py index 4a04693..6f79ac5 100644 --- a/cogs/ai.py +++ b/cogs/ai.py @@ -7,7 +7,7 @@ import os import discord from discord.ext import commands import logging -import requests +import httpx from gtts import gTTS from cogs.music import audio_playback import io @@ -52,23 +52,24 @@ class AI(commands.Cog): ], } - response = requests.post(url=url, headers=headers, json=payload) - response_data = response.json() - logger.info(response_data) - if not response_data["choices"]: - await ctx.send_followup("bot siem zesroł") - else: - response_text = response_data["choices"][0]["message"]["content"] - if tts: - # Generate TTS - tts_obj = gTTS(text=response_text, lang='pl') - tts_buffer = io.BytesIO() - tts_obj.write_to_fp(tts_buffer) - tts_buffer.seek(0) - await audio_playback.AudioPlaybackManager.play(ctx, discord.FFmpegPCMAudio(tts_buffer), delete_after_play=True) - + async with httpx.AsyncClient() as client: + response = await client.post(url=url, headers=headers, json=payload) + response_data = response.json() + logger.info(response_data) + if not response_data["choices"]: + await ctx.send_followup("bot siem zesroł") else: - await ctx.send_followup(response_text) + response_text = response_data["choices"][0]["message"]["content"] + if tts: + # Generate TTS + tts_obj = gTTS(text=response_text, lang='pl') + tts_buffer = io.BytesIO() + tts_obj.write_to_fp(tts_buffer) + tts_buffer.seek(0) + await audio_playback.AudioPlaybackManager.play(ctx, discord.FFmpegPCMAudio(tts_buffer), delete_after_play=True) + + else: + await ctx.send_followup(response_text) diff --git a/cogs/assistant.py b/cogs/assistant.py index 71f5150..21e4989 100644 --- a/cogs/assistant.py +++ b/cogs/assistant.py @@ -6,7 +6,7 @@ import re import discord from discord.ext import commands -import requests +import httpx import json import logging import shutil @@ -133,11 +133,12 @@ class Jarvis(commands.Cog): @staticmethod async def _make_api_request(payload, headers): - url = "https://openrouter.ai/api/v1/chat/completions" - response = requests.post(url=url, headers=headers, json=payload) - response_data = response.json() - logger.info(response_data) - return response_data + async with httpx.AsyncClient() as client: + url = "https://openrouter.ai/api/v1/chat/completions" + response = await client.post(url=url, headers=headers, json=payload) + response_data = response.json() + logger.info(response_data) + return response_data @staticmethod def _parse_response(response_data): diff --git a/cogs/compression.py b/cogs/compression.py index 150239f..acc9eda 100644 --- a/cogs/compression.py +++ b/cogs/compression.py @@ -275,6 +275,7 @@ class Compression(commands.Cog): if file_type == "Image": command, output_path = command elif file_type == "Audio": + # Audio output path remains unchanged - already processed in _process_audio pass success = await self._execute_compression(command) diff --git a/cogs/cron.py b/cogs/cron.py index 6e5020e..da8127b 100644 --- a/cogs/cron.py +++ b/cogs/cron.py @@ -92,7 +92,7 @@ class Cron(commands.Cog): channel = self.bot.get_channel(channel_id) if not channel: - logger.warning(f"Channel {channel_id} not found for task {task['id']}") + logger.warning(f"Channel {channel_id} not found for task ID: {task.get('id')}") return logger.info(f"Found channel {channel} (type: {type(channel).__name__})") diff --git a/cogs/downloader.py b/cogs/downloader.py index d364b3a..36bd723 100644 --- a/cogs/downloader.py +++ b/cogs/downloader.py @@ -195,7 +195,7 @@ class Downloader(commands.Cog): } @staticmethod - def _create_error_response(content: str, details: str, temp_dir: str) -> dict: + def _create_error_response(content: str, details: str, temp_dir: str | None) -> dict: return { "status": "error", "type": "error", diff --git a/cogs/music/audio_playback.py b/cogs/music/audio_playback.py index 1267fa7..28c6118 100644 --- a/cogs/music/audio_playback.py +++ b/cogs/music/audio_playback.py @@ -60,17 +60,18 @@ class AudioPlaybackManager: """Connect or move to voice channel. Returns voice client.""" try: # Check if vc is valid and actually connected - is_connected = vc is not None and vc.is_connected() - # Connect to voice channel if not connected - if not is_connected: - logger.info(f"Connecting to voice channel: {target_channel.name}") - vc = await target_channel.connect() - logger.info(f"Connected to voice channel: {target_channel.name}") - # Move to user's channel if in a different one - elif vc.channel != target_channel: - logger.info(f"Moving to voice channel: {target_channel.name}") - await vc.move_to(target_channel) - logger.info(f"Moved to voice channel: {target_channel.name}") + if vc is not None and vc.is_connected(): + # Already connected - check if need to move + if vc.channel != target_channel: + logger.info(f"Moving to voice channel: {target_channel.name}") + await vc.move_to(target_channel) + logger.info(f"Moved to voice channel: {target_channel.name}") + return vc + + # Not connected - connect now + logger.info(f"Connecting to voice channel: {target_channel.name}") + vc = await target_channel.connect() + logger.info(f"Connected to voice channel: {target_channel.name}") return vc except Exception as e: logger.error(f"Error connecting to voice channel: {str(e)}") @@ -138,15 +139,35 @@ class AudioPlaybackManager: @staticmethod async def execute_playback(ctx, source, display_name, is_url): """Execute the actual audio playback.""" - vc = ctx.voice_client target_channel = await AudioPlaybackManager.validate_voice_channel(ctx) if not target_channel: return False + # Get existing voice client from bot or connect + guild = ctx.guild + vc = discord.utils.get(ctx.bot.voice_clients, guild=guild) + try: - vc = await AudioPlaybackManager.connect_to_voice_channel( - ctx, vc, target_channel - ) + # Handle various connection states + if vc is None: + logger.info("No existing voice client, connecting...") + try: + vc = await target_channel.connect() + except discord.ClientException: + vc = discord.utils.get(ctx.bot.voice_clients, guild=guild) + elif not vc.is_connected(): + logger.info("Voice client exists but disconnected, reconnecting...") + try: + await vc.disconnect() + except Exception: + pass + try: + vc = await target_channel.connect() + except discord.ClientException: + vc = discord.utils.get(ctx.bot.voice_clients, guild=guild) + elif vc.channel != target_channel: + logger.info(f"Moving to voice channel: {target_channel.name}") + await vc.move_to(target_channel) # Stop any currently playing audio if vc.is_playing() or vc.is_paused(): # type: ignore[union-attr] @@ -171,7 +192,7 @@ class AudioPlaybackManager: # Play the audio vc.play(audio_source, after=after_playing) logger.info(f"Playing: {final_display_name}") - await ctx.respond(f"grom: {final_display_name}") + await ctx.followup.send(f"grom: {final_display_name}") # Wait for FFmpeg to attempt connection - errors usually happen within 5 seconds await asyncio.sleep(5) @@ -195,7 +216,7 @@ class AudioPlaybackManager: except Exception as e: logger.error(f"Error in play: {str(e)}", exc_info=True) - await ctx.respond(f"eror: {str(e)}", ephemeral=True) + await ctx.followup.send(f"eror: {str(e)}", ephemeral=True) return False @staticmethod diff --git a/cogs/music/play_commands.py b/cogs/music/play_commands.py index fd5113a..a82fa9d 100644 --- a/cogs/music/play_commands.py +++ b/cogs/music/play_commands.py @@ -6,6 +6,7 @@ import logging import os import urllib.parse +import asyncio from os import PathLike from typing import Awaitable, Callable, List, Tuple @@ -139,9 +140,10 @@ class PlayCommands(commands.Cog): local_path = os.path.join(self.temp_dir, filename) os.makedirs(self.temp_dir, exist_ok=True) + loop = asyncio.get_event_loop() with open(local_path, "wb") as f: async for chunk in response.content.iter_chunked(8192): - f.write(chunk) + await loop.run_in_executor(None, f.write, chunk) compressed_path = await media_processing.AudioCompressor.compress( ctx, local_path diff --git a/cogs/qr.py b/cogs/qr.py index c1fd499..32c574e 100644 --- a/cogs/qr.py +++ b/cogs/qr.py @@ -22,10 +22,10 @@ _decode_available = False def _ensure_qr(): global _pil_image, _decode_func, _decode_available - + if _pil_image is not None: return _decode_available - + try: from PIL import Image from pyzbar.pyzbar import decode as _decode_func @@ -48,7 +48,7 @@ class QR(commands.Cog): if response.status == 200: content = await response.read() with tempfile.NamedTemporaryFile(delete=False, suffix=".png") as f: - f.write(content) + await asyncio.get_event_loop().run_in_executor(None, f.write, content) return f.name return None @@ -137,7 +137,7 @@ class QR(commands.Cog): def _decode_qr(self, image_path): """Decode QR code from image (runs in executor)""" - if not _ensure_qr(): + if not _ensure_qr() or _decode_func is None: return None try: diff --git a/cogs/trigger.py b/cogs/trigger.py index 0e76cef..02e5573 100644 --- a/cogs/trigger.py +++ b/cogs/trigger.py @@ -15,6 +15,12 @@ logger = logging.getLogger(__name__) DB_PATH = 'data/triggers.db' +_SELECT_KEYWORD_SQL = "SELECT keyword FROM trigger_keywords WHERE trigger_id=?" +_SELECT_RESPONSE_SQL = "SELECT response_text FROM trigger_responses WHERE trigger_id=?" +_SELECT_TRIGGER_ID_SQL = "SELECT id FROM triggers WHERE name=?" +_TRIGGER_NOT_FOUND_MSG = "Trigger not found." +_TRIGGER_NAME_OPTION = "the name of the trigger" + def get_connection(): return sqlite3.connect(DB_PATH) @@ -112,10 +118,10 @@ class Trigger(commands.Cog): c = conn.cursor() c.execute("SELECT id, name FROM triggers") for trigger_id, name in c.fetchall(): - c.execute("SELECT keyword FROM trigger_keywords WHERE trigger_id=?", (trigger_id,)) + c.execute(_SELECT_KEYWORD_SQL, (trigger_id,)) keywords = [row[0] for row in c.fetchall()] if any(keyword in content for keyword in keywords): - c.execute("SELECT response_text FROM trigger_responses WHERE trigger_id=?", (trigger_id,)) + c.execute(_SELECT_RESPONSE_SQL, (trigger_id,)) responses = [row[0] for row in c.fetchall()] if responses: await message.channel.send(random.choice(responses).replace('\\n', '\n')) @@ -137,7 +143,7 @@ class Trigger(commands.Cog): ctx: discord.ApplicationContext, name = discord.Option( str, - "the name of the trigger", + _TRIGGER_NAME_OPTION, autocomplete= discord.utils.basic_autocomplete(get_type), required=True ) @@ -157,7 +163,7 @@ class Trigger(commands.Cog): ctx: discord.ApplicationContext, name = discord.Option( str, - "the name of the trigger", + _TRIGGER_NAME_OPTION, autocomplete= discord.utils.basic_autocomplete(get_type), required=True ), @@ -174,10 +180,10 @@ class Trigger(commands.Cog): ): with get_connection() as conn: c = conn.cursor() - c.execute("SELECT id FROM triggers WHERE name=?", (name,)) + c.execute(_SELECT_TRIGGER_ID_SQL, (name,)) row = c.fetchone() if not row: - await ctx.respond("Trigger not found.") + await ctx.respond(_TRIGGER_NOT_FOUND_MSG) logger.warning(f"Trigger not found: {name}") return trigger_id = row[0] @@ -204,7 +210,7 @@ class Trigger(commands.Cog): ctx: discord.ApplicationContext, name = discord.Option( str, - "the name of the trigger", + _TRIGGER_NAME_OPTION, autocomplete= discord.utils.basic_autocomplete(get_type), required=True ), @@ -221,10 +227,10 @@ class Trigger(commands.Cog): ): with get_connection() as conn: c = conn.cursor() - c.execute("SELECT id FROM triggers WHERE name=?", (name,)) + c.execute(_SELECT_TRIGGER_ID_SQL, (name,)) row = c.fetchone() if not row: - await ctx.respond("Trigger not found.") + await ctx.respond(_TRIGGER_NOT_FOUND_MSG) logger.warning(f"Trigger not found: {name}") return trigger_id = row[0] @@ -245,17 +251,17 @@ class Trigger(commands.Cog): ctx: discord.ApplicationContext, name = discord.Option( str, - "the name of the trigger", + _TRIGGER_NAME_OPTION, autocomplete= discord.utils.basic_autocomplete(get_type), required=True ) ): with get_connection() as conn: c = conn.cursor() - c.execute("SELECT id FROM triggers WHERE name=?", (name,)) + c.execute(_SELECT_TRIGGER_ID_SQL, (name,)) row = c.fetchone() if not row: - await ctx.respond("Trigger not found.") + await ctx.respond(_TRIGGER_NOT_FOUND_MSG) return trigger_id = row[0] c.execute("DELETE FROM trigger_keywords WHERE trigger_id=?", (trigger_id,)) @@ -275,7 +281,7 @@ class Trigger(commands.Cog): ctx: discord.ApplicationContext, name = discord.Option( str, - "the name of the trigger", + _TRIGGER_NAME_OPTION, autocomplete=discord.utils.basic_autocomplete(get_type), required=True ) @@ -286,13 +292,13 @@ class Trigger(commands.Cog): c.execute("SELECT id FROM triggers WHERE name=?", (name,)) row = c.fetchone() if not row: - await ctx.respond("Trigger not found.") + await ctx.respond(_TRIGGER_NOT_FOUND_MSG) logger.warning(f"Trigger not found: {name}") return trigger_id = row[0] - c.execute("SELECT keyword FROM trigger_keywords WHERE trigger_id=?", (trigger_id,)) + c.execute(_SELECT_KEYWORD_SQL, (trigger_id,)) triggers = [row[0] for row in c.fetchall()] - c.execute("SELECT response_text FROM trigger_responses WHERE trigger_id=?", (trigger_id,)) + c.execute(_SELECT_RESPONSE_SQL, (trigger_id,)) responses = [row[0] for row in c.fetchall()] trigger_list = "\n".join(triggers) response_list = "\n".join(responses) @@ -303,13 +309,13 @@ class Trigger(commands.Cog): c.execute("SELECT id, name FROM triggers") messages = [] for trigger_id, name in c.fetchall(): - c.execute("SELECT keyword FROM trigger_keywords WHERE trigger_id=?", (trigger_id,)) + c.execute(_SELECT_KEYWORD_SQL, (trigger_id,)) triggers = ", ".join([row[0] for row in c.fetchall()]) - c.execute("SELECT response_text FROM trigger_responses WHERE trigger_id=?", (trigger_id,)) + c.execute(_SELECT_RESPONSE_SQL, (trigger_id,)) responses = ", ".join([row[0] for row in c.fetchall()]) messages.append(f"**{name}**\nTriggers: {triggers}\nResponses: {responses}") await ctx.respond("\n\n".join(messages)) - logger.info(f"Triggers listed") + logger.info("Triggers listed") @trigger_group.command( description="how to use trigger group?" diff --git a/cogs/tts.py b/cogs/tts.py index 3dc4c09..68eb27f 100644 --- a/cogs/tts.py +++ b/cogs/tts.py @@ -54,19 +54,17 @@ class TTS(commands.Cog): if not voice_client: await ctx.respond("Failed to connect to voice channel", ephemeral=True) return - - # Play the TTS audio with volume adjustment + + if voice_client.is_playing(): + await ctx.respond("Audio is already playing, try again later", ephemeral=True) + return + audio_source = discord.FFmpegPCMAudio( temp_path, options=f'-filter:a "volume={volume}"' ) - voice_client.play(audio_source) logger.info(f"Playing TTS: {text}") - # Wait for the audio to finish playing - while voice_client.is_playing(): - await asyncio.sleep(0.1) - except Exception as e: logger.error(f"Error in voice channel handling: {e}") await ctx.respond("eror :c", ephemeral=True) diff --git a/cogs/utils/settings.py b/cogs/utils/settings.py index 984ec16..d66ce7f 100644 --- a/cogs/utils/settings.py +++ b/cogs/utils/settings.py @@ -12,18 +12,19 @@ from dataclasses import dataclass, field logger = logging.getLogger(__name__) settings_file = "data/settings.json" +DEFAULT_BASEURL = "http://localhost:8080" @dataclass class Settings: volume: float = 1.0 - baseurl: str = "http://localhost:8080" + baseurl: str = DEFAULT_BASEURL _data: dict = field(default_factory=dict, init=False) async def load(self) -> "Settings": default_settings = { "volume": 1.0, - "baseurl": "http://localhost:8080", + "baseurl": DEFAULT_BASEURL, } try: @@ -44,7 +45,7 @@ class Settings: self._sync_from_data() await self.save() logger.info("Created default settings.json") - except (json.JSONDecodeError, Exception) as e: + except json.JSONDecodeError as e: logger.error(f"Error loading settings: {e}") self._data = default_settings.copy() self._sync_from_data() @@ -53,7 +54,7 @@ class Settings: def _sync_from_data(self): self.volume = self._data.get("volume", 1.0) - self.baseurl = self._data.get("baseurl", "http://localhost:8080") + self.baseurl = self._data.get("baseurl", DEFAULT_BASEURL) def _sync_to_data(self): self._data["volume"] = self.volume @@ -89,4 +90,4 @@ def get_volume() -> float: def get_baseurl() -> str: - return _settings_instance.baseurl.rstrip("/") if _settings_instance else "http://localhost:8080" + return _settings_instance.baseurl.rstrip("/") if _settings_instance else DEFAULT_BASEURL diff --git a/cogs/utils/temp.py b/cogs/utils/temp.py index 528d6a3..0b2c8d7 100644 --- a/cogs/utils/temp.py +++ b/cogs/utils/temp.py @@ -8,11 +8,11 @@ import tempfile def get_temp_dir(subdir: str = "senator_sperma") -> str: """Get or create a temp subdirectory. - + Uses system temp directory (/tmp on Linux, %TEMP% on Windows). OS handles cleanup automatically. """ base_temp = tempfile.gettempdir() temp_path = os.path.join(base_temp, subdir) os.makedirs(temp_path, exist_ok=True) - return temp_path \ No newline at end of file + return temp_path diff --git a/cogs/vclogs.py b/cogs/vclogs.py index 397d296..85d19bc 100644 --- a/cogs/vclogs.py +++ b/cogs/vclogs.py @@ -14,9 +14,11 @@ from gtts import gTTS from cogs.voice import get_voice_manager from cogs.utils.settings import get_volume, save_settings +import tempfile + logger = logging.getLogger(__name__) -ACTIVITY_FILE = 'temp/voice_activity.json' +ACTIVITY_FILE = os.path.join(tempfile.gettempdir(), 'voice_activity.json') def load_activity_data(): @@ -125,7 +127,16 @@ class VcLogs(commands.Cog): @commands.Cog.listener() async def on_voice_state_update(self, member, before, after): - log_channel = self.bot.get_channel(1213843195457183885) + log_channel_id = os.getenv("STATUS_CHANNEL_ID") + if not log_channel_id: + logger.warning("STATUS_CHANNEL_ID not set in environment") + return + + log_channel = self.bot.get_channel(int(log_channel_id)) + if log_channel is None: + logger.warning("Log channel not found or not accessible") + return + current_time = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") current_ts = datetime.datetime.now().timestamp() tts_text = None diff --git a/cogs/voice.py b/cogs/voice.py index 07015cc..319bb16 100644 --- a/cogs/voice.py +++ b/cogs/voice.py @@ -95,7 +95,7 @@ class VoiceManager: if not voice_client: return False - if volume != 1.0: + if abs(volume - 1.0) > 1e-9: audio_source = discord.PCMVolumeTransformer(audio_source) audio_source.volume = volume @@ -197,4 +197,4 @@ class Voice(commands.Cog): def setup(bot): - bot.add_cog(Voice(bot)) \ No newline at end of file + bot.add_cog(Voice(bot)) diff --git a/cogs/web.py b/cogs/web.py index e003399..b072e99 100644 --- a/cogs/web.py +++ b/cogs/web.py @@ -97,4 +97,4 @@ class Web(commands.Cog): def setup(bot): - bot.add_cog(Web(bot)) \ No newline at end of file + bot.add_cog(Web(bot)) -- cgit v1.2.3