Merge pull request #6 from kpj2006/main

Zahnentferner · web-flow · commit e13f1e0dd2fc · 2026-06-15T13:23:00.000+03:00
feat: add gap logging functionality and improve bot thread management
diff --git a/.gitignore b/.gitignore
@@ -326,4 +326,6 @@ TSWLatexianTemp*
 #*Notes.bib
 
 venv/
-.env
+.env
+__pycache__/
+.commandcode/
diff --git a/bot.py b/bot.py
@@ -1,8 +1,11 @@
 import os
+import json
 import logging
 import discord
 import httpx
 import asyncio
+from datetime import datetime, timezone
+from pathlib import Path
 from dotenv import load_dotenv
 
 # Configure logging
@@ -18,6 +21,8 @@
 OLLAMA_MODEL = os.getenv('OLLAMA_MODEL', 'llama3.2')
 SKILL_FILE_PATH = os.getenv('SKILL_FILE_PATH', '.clinerules')
 OLLAMA_URL = "http://localhost:11434/api/generate"
+GAP_LOG_PATH = Path("gap_log.json")
+MAX_RETRIES = 3
 
 # Initialize bot with intents
 intents = discord.Intents.default()
@@ -27,6 +32,41 @@
 # Lock to prevent Ollama requests from clashing
 ollama_lock = asyncio.Lock()
 
+THREAD_HISTORY_LIMIT = 10  # messages to pull from thread as conversation context
+
+
+def _load_gap_log():
+    if GAP_LOG_PATH.exists():
+        try:
+            with open(GAP_LOG_PATH, "r", encoding="utf-8") as f:
+                return json.load(f)
+        except json.JSONDecodeError:
+            logger.warning("gap_log.json corrupted, starting fresh")
+    return []
+
+
+def _save_gap_log(entries):
+    GAP_LOG_PATH.parent.mkdir(parents=True, exist_ok=True)
+    with open(GAP_LOG_PATH, "w", encoding="utf-8") as f:
+        json.dump(entries, f, indent=2, default=str)
+
+gap_log_lock = asyncio.Lock()
+
+async def _log_gap(query, reason, thread_id=None):
+ async with gap_log_lock:
+    entry = {
+        "timestamp": datetime.now(timezone.utc).isoformat(),
+        "query": query,
+        "reason": reason,
+    }
+    if thread_id:
+        entry["thread_id"] = thread_id
+    entries = _load_gap_log()
+    entries.append(entry)
+    _save_gap_log(entries)
+    logger.info(f"Gap logged: {reason} — query: {query[:80]}")
+
+
 def load_skill_context() -> str:
     """Load context from the local skill file."""
     try:
@@ -37,8 +77,9 @@ def load_skill_context() -> str:
         logger.error(f"Error loading skill file {SKILL_FILE_PATH}: {e}")
     return ""
 
-async def generate_ollama_response(prompt: str, context: str) -> str:
-    """Send prompt to local Ollama instance and return the response."""
+
+async def generate_ollama_response(prompt: str, context: str) -> tuple[str, bool]:
+    """Send prompt to local Ollama instance. Returns (response_text, used_llm_fallback)."""
     if context:
         system_prompt = f"You are a helpful contributor assistant for AOSSIE.\n\nContext guidelines:\n{context}"
     else:
@@ -51,37 +92,149 @@ async def generate_ollama_response(prompt: str, context: str) -> str:
         "stream": False
     }
 
+    for attempt in range(1, MAX_RETRIES + 1):
+        try:
+            async with httpx.AsyncClient(timeout=120.0) as http_client:
+                response = await http_client.post(OLLAMA_URL, json=payload)
+                response.raise_for_status()
+                data = response.json()
+                text = data.get("response", "")
+                if text:
+                    return text, False  # False = Ollama succeeded, no fallback gap
+                logger.warning(f"Empty Ollama response (attempt {attempt}/{MAX_RETRIES})")
+        except httpx.TimeoutException:
+            logger.error(f"Ollama timed out (attempt {attempt}/{MAX_RETRIES})")
+        except httpx.RequestError as e:
+            logger.error(f"Ollama unreachable (attempt {attempt}/{MAX_RETRIES}): {e}")
+        except Exception as e:
+            logger.error(f"Ollama error (attempt {attempt}/{MAX_RETRIES}): {e}")
+        if attempt < MAX_RETRIES:
+            await asyncio.sleep(2)
+
+    return "I'm sorry, the local AI model is currently unavailable. Please try again later or ask a maintainer.", True
+
+
+async def _build_conversation_context(thread: discord.Thread, current_author: discord.User, current_query: str) -> str:
+    """Pull recent thread history and format it as conversation context for Ollama."""
+    history_parts = []
+    try:
+        async for msg in thread.history(limit=THREAD_HISTORY_LIMIT, oldest_first=True):
+            if msg.author.bot:
+                history_parts.append(f"Bot: {msg.content[:300]}")
+            else:
+                history_parts.append(f"{msg.author.display_name}: {msg.content[:300]}")
+    except Exception as e:
+        logger.error(f"Error fetching thread history for {thread.id}: {e}")
+
+    if not history_parts:
+        return ""
+
+    return (
+        "Previous conversation in this thread:\n" +
+        "\n".join(history_parts) +
+        f"\n\nCurrent question from {current_author.display_name}: {current_query}"
+    )
+
+
+async def _get_or_create_thread(message: discord.Message, channel: discord.TextChannel) -> discord.Thread | None:
+    """If message is already in a thread, return that thread. Otherwise create a new one.
+    One thread per conversation — never reuses threads by user ID. Returns None on failure."""
+    if isinstance(message.channel, discord.Thread):
+        thread = message.channel
+        if not thread.archived and not thread.locked:
+            return thread
+        logger.warning(f"Thread {thread.id} is archived/locked — creating a new one")
+        return None # cannot create thread from message already in a thread
+
     try:
-        async with httpx.AsyncClient(timeout=120.0) as http_client:
-            response = await http_client.post(OLLAMA_URL, json=payload)
-            response.raise_for_status()
-            data = response.json()
-            return data.get("response", "Error: No response text found in Ollama reply.")
-    except httpx.TimeoutException:
-        logger.error("Ollama request timed out.")
-        return "I'm sorry, the local AI model timed out while thinking. Please try again later."
-    except httpx.RequestError as e:
-        logger.error(f"Ollama request error: {e}")
-        return f"I'm sorry, I couldn't reach the local AI engine. Ensure Ollama is running at localhost:11434."
+        author = message.author
+        thread = await message.create_thread(
+            name=f"Q&A: {author.display_name} — {message.content[:50]}",
+            auto_archive_duration=1440,  # 24 hours
+        )
+        logger.info(f"Created thread {thread.id} for {author.name} — query: {message.content[:80]}")
+        return thread
+    except discord.Forbidden:
+        logger.error(f"Cannot create thread — missing permissions in channel {channel.id}")
+    except discord.HTTPException as e:
+        logger.error(f"Discord API error creating thread: {e}")
     except Exception as e:
-        logger.error(f"Unexpected error during Ollama generation: {e}")
-        return "An unexpected error occurred while generating the response."
+        logger.error(f"Unexpected error creating thread for {message.author.id}: {e}")
+    return None
+
 
 async def process_message(message: discord.Message):
-    """Process a single message and generate a reply safely."""
-    if message.author.bot or message.channel.id != DISCORD_CHANNEL_ID_INT:
+    """Process a single message: new messages in the main channel spawn a thread,
+    messages in existing threads continue the conversation there."""
+    if message.author.bot:
         return
 
-    # Use lock to ensure only one message is processed by Ollama at a time
+    is_in_thread = isinstance(message.channel, discord.Thread)
+    is_in_configured_channel = message.channel.id == DISCORD_CHANNEL_ID_INT
+
+    if not is_in_thread and not is_in_configured_channel:
+        return
+
+    author = message.author
+
+    if is_in_thread:
+        thread = message.channel
+        if thread.archived or thread.locked:
+            logger.warning(f"Thread {thread.id} is archived/locked — cannot respond")
+            return
+    else:
+        channel = message.channel
+        thread = await _get_or_create_thread(message, channel)
+        if not thread:
+            _log_gap(message.content, "thread_creation_failed")
+            try:
+                await message.reply(
+                    "I couldn't create a thread to answer your question. Please ask a maintainer for help."
+                )
+            except Exception:
+                pass
+            return
+
     async with ollama_lock:
-        async with message.channel.typing():
+        try:
+            await asyncio.sleep(1)  # let Discord register the new thread
+            async with thread.typing():
+                pass
+        except Exception as e:
+            logger.warning(f"Could not trigger typing indicator in thread {thread.id}: {e}")
+
+        try:
             skill_context = load_skill_context()
-            response_text = await generate_ollama_response(message.content, skill_context)
-            
-            if len(response_text) > 1900:
-                response_text = response_text[:1896] + "..."
+            conversation_context = await _build_conversation_context(thread, author, message.content)
+
+            if conversation_context:
+                full_prompt = conversation_context
+            else:
+                full_prompt = message.content
+
+            response_text, used_fallback = await generate_ollama_response(full_prompt, skill_context)
+
+            if used_fallback or not skill_context:
+                _log_gap(
+                    message.content,
+                    "ollama_unavailable" if used_fallback else "no_skill_context",
+                    thread_id=thread.id,
+                )
+        except Exception as e:
+            logger.error(f"Unexpected error processing message from {author.name}: {e}")
+            response_text = "An unexpected error occurred. Please try again or ask a maintainer."
+            _log_gap(message.content, f"processing_error: {e}", thread_id=thread.id)
+
+        if len(response_text) > 1900:
+            response_text = response_text[:1896] + "..."
+
+        try:
+            await thread.send(response_text)
+        except discord.Forbidden:
+            logger.error(f"Cannot send message to thread {thread.id}")
+        except discord.HTTPException as e:
+            logger.error(f"Error sending to thread {thread.id}: {e}")
 
-            await message.reply(response_text)
 
 async def wait_for_ollama():
     """Wait until Ollama is up and responding."""
@@ -98,50 +251,51 @@ async def wait_for_ollama():
         logger.info("Ollama not reachable yet. Retrying in 10 seconds...")
         await asyncio.sleep(10)
 
+
 @client.event
 async def on_ready():
     logger.info(f"Logged in as {client.user.name} ({client.user.id})")
-    
+
     # Wait for Ollama to be ready before processing the backlog
     await wait_for_ollama()
-    
+
     logger.info("Checking for missed messages...")
-    
+
     try:
         channel = await client.fetch_channel(DISCORD_CHANNEL_ID_INT)
-        
+
         # Find the last message sent by the bot
         last_bot_msg = None
         async for msg in channel.history(limit=50):
             if msg.author.id == client.user.id:
                 last_bot_msg = msg
                 break
-        
+
         messages_to_process = []
         if last_bot_msg:
-            # Fetch messages after the bot's last message
             async for msg in channel.history(after=last_bot_msg, oldest_first=True):
                 if not msg.author.bot:
                     messages_to_process.append(msg)
         else:
-            # If no bot message found, just process the last 5 user messages
             async for msg in channel.history(limit=5, oldest_first=True):
                 if not msg.author.bot:
                     messages_to_process.append(msg)
-                    
+
         logger.info(f"Found {len(messages_to_process)} missed messages. Processing...")
         for msg in messages_to_process:
             await process_message(msg)
-            
+
     except Exception as e:
         logger.error(f"Error fetching missed messages: {e}")
 
     logger.info("AOSSIE Contributor Assistant MVP is fully ready.")
 
+
 @client.event
 async def on_message(message: discord.Message):
     await process_message(message)
 
+
 if __name__ == "__main__":
     if not DISCORD_TOKEN:
         logger.critical("DISCORD_TOKEN is missing from environment. Exiting.")
@@ -160,4 +314,4 @@ async def on_message(message: discord.Message):
         exit(1)
 
     logger.info("Starting bot...")
-    client.run(DISCORD_TOKEN)
+    client.run(DISCORD_TOKEN)
diff --git a/gap_log.json b/gap_log.json
@@ -0,0 +1,32 @@
+[
+  {
+    "timestamp": "2026-06-11T06:28:50.131419+00:00",
+    "query": "hi",
+    "reason": "ollama_unavailable",
+    "thread_id": 1514516717588451369
+  },
+  {
+    "timestamp": "2026-06-11T06:29:33.996652+00:00",
+    "query": "hi",
+    "reason": "ollama_unavailable",
+    "thread_id": 1514516902330896445
+  },
+  {
+    "timestamp": "2026-06-11T06:43:02.871048+00:00",
+    "query": "hi",
+    "reason": "ollama_unavailable",
+    "thread_id": 1514520294717526096
+  },
+  {
+    "timestamp": "2026-06-11T06:43:09.796853+00:00",
+    "query": "hi",
+    "reason": "ollama_unavailable",
+    "thread_id": 1514520323834511490
+  },
+  {
+    "timestamp": "2026-06-11T06:43:47.538207+00:00",
+    "query": "hi",
+    "reason": "ollama_unavailable",
+    "thread_id": 1514520482131607553
+  }
+]
diff --git a/start_bot_hidden.vbs b/start_bot_hidden.vbs
@@ -0,0 +1,7 @@
+Set WshShell = CreateObject("WScript.Shell")
+Dim botDir
+Set WshShell = CreateObject("WScript.Shell")
+Set fso = CreateObject("Scripting.FileSystemObject")
+Dim botDir
+botDir = fso.GetParentFolderName(WScript.ScriptFullName)
+WshShell.Run "cmd /c cd /d """ & botDir & """ && venv\Scripts\python.exe bot.py", 0, False
