removing the tools calls

Reviewed-on: #2

.gitignore

@@ -1 +1,2 @@
-scripts/.env
+scripts/.env
+v2/.env

Dockerfile

@@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y \
     && rm -rf /var/lib/apt/lists/*
 
 # Install required packages
-RUN pip install --no-cache-dir discord.py python-dotenv openai
+RUN pip install --no-cache-dir discord.py python-dotenv openai requests asyncio
 
 # Copy the bot script
 COPY /scripts/discordbot.py .

scripts/discordbot.py

@@ -1,42 +1,99 @@
+import os
 import discord
 from discord.ext import commands
 from openai import OpenAI
-import os
+import base64
+import requests
+from io import BytesIO
+from collections import deque
 from dotenv import load_dotenv
+import json
+import datetime
+import aiohttp
+from typing import Dict, Any, List
 
 # Load environment variables
 load_dotenv()
 
+# Get environment variables
+DISCORD_TOKEN = os.getenv('DISCORD_TOKEN')
+OPENAI_API_KEY = os.getenv('OPENAI_API_KEY')
+OPENWEBUI_API_BASE = os.getenv('OPENWEBUI_API_BASE')
+MODEL_NAME = os.getenv('MODEL_NAME')
+
 # Configure OpenAI client to point to OpenWebUI
 client = OpenAI(
     api_key=os.getenv('OPENAI_API_KEY'),
     base_url=os.getenv('OPENWEBUI_API_BASE')  # e.g., "http://localhost:8080/v1"
 )
 
+# Configure OpenAI
+# TODO: The 'openai.api_base' option isn't read in the client API. You will need to pass it when you instantiate the client, e.g. 'OpenAI(base_url=OPENWEBUI_API_BASE)'
+# openai.api_base = OPENWEBUI_API_BASE
+
 # Initialize Discord bot
 intents = discord.Intents.default()
 intents.message_content = True
-bot = commands.Bot(command_prefix="!", intents=intents)
+intents.messages = True
+bot = commands.Bot(command_prefix='!', intents=intents)
+
+# Message history cache
+channel_history = {}
+
+async def download_image(url):
+    response = requests.get(url)
+    if response.status_code == 200:
+        image_data = BytesIO(response.content)
+        base64_image = base64.b64encode(image_data.read()).decode('utf-8')
+        return base64_image
+    return None
+
+async def get_chat_history(channel, limit=100):
+    messages = []
+    async for message in channel.history(limit=limit):
+        content = f"{message.author.name}: {message.content}"
+        
+        # Handle attachments (images)
+        for attachment in message.attachments:
+            if any(attachment.filename.lower().endswith(ext) for ext in ['.png', '.jpg', '.jpeg', '.gif', '.webp']):
+                content += f" [Image: {attachment.url}]"
+        
+        messages.append(content)
+    return "\n".join(reversed(messages))
+
+
+async def get_ai_response(context, user_message, image_urls=None):
+    
+    system_message = f"\"\"\"Previous conversation context:{context}"""
+
+    messages = [
+        {"role": "system", "content": system_message},
+        {"role": "user", "content": [] if image_urls else user_message}
+    ]
+    
+    # Handle messages with images differently
+    if image_urls:
+        content_parts = [{"type": "text", "text": user_message}]
+        
+        for url in image_urls:
+            base64_image = await download_image(url)
+            if base64_image:
+                content_parts.append({
+                    "type": "image_url",
+                    "image_url": {
+                        "url": f"data:image/jpeg;base64,{base64_image}"
+                    }
+                })
+        messages[1]["content"] = content_parts
 
-async def get_ai_response(prompt):
     try:
         response = client.chat.completions.create(
-            model=os.getenv('MODEL_NAME') or "us.anthropic.claude-3-5-sonnet-20241022-v2:0",  # OpenWebUI should handle this regardless
-            messages=[
-                {"role": "user", "content": prompt}
-            ],
-            temperature=0.7,
-            max_tokens=500
+            model=MODEL_NAME,
+            messages=messages
         )
         return response.choices[0].message.content
     except Exception as e:
-        print(f"Error getting AI response: {e}")
-        return "Sorry, I encountered an error while processing your request."
-
-
-@bot.event
-async def on_ready():
-    print(f'{bot.user} has connected to Discord!')
+        return f"Error: {str(e)}"
 
 @bot.event
 async def on_message(message):
@@ -44,41 +101,49 @@ async def on_message(message):
     if message.author == bot.user:
         return
 
-    # Check if the bot is mentioned in the message
-    if bot.user in message.mentions:
-        # Remove the bot mention and get the actual prompt
-        prompt = message.content.replace(f'<@{bot.user.id}>', '').strip()
-        
-        # If there's no prompt after mentioning the bot
-        if not prompt:
-            await message.channel.send("Hello! How can I help you?")
-            return
+    should_respond = False
 
-        # Show typing indicator while processing
+    # Check if bot was mentioned
+    if bot.user in message.mentions:
+        should_respond = True
+
+    # Check if message is a DM
+    if isinstance(message.channel, discord.DMChannel):
+        should_respond = True
+
+    if should_respond:
         async with message.channel.typing():
-            # Get response from OpenWebUI
-            response = await get_ai_response(prompt)
-            
-            # Send the response
-            # Split long messages if they exceed Discord's character limit
-            if len(response) > 2000:
-                # Split the response into chunks of 2000 characters
-                chunks = [response[i:i+2000] for i in range(0, len(response), 2000)]
-                for chunk in chunks:
-                    await message.channel.send(chunk)
-            else:
-                await message.channel.send(response)
+            # Get chat history
+            history = await get_chat_history(message.channel)
+
+            # Remove bot mention from the message
+            user_message = message.content.replace(f'<@{bot.user.id}>', '').strip()
+
+            # Collect image URLs from the message
+            image_urls = []
+            for attachment in message.attachments:
+                if any(attachment.filename.lower().endswith(ext) for ext in ['.png', '.jpg', '.jpeg', '.gif', '.webp']):
+                    image_urls.append(attachment.url)
+
+            # Get AI response
+            response = await get_ai_response(history, user_message, image_urls)
+
+            # Send response
+            await message.reply(response)
 
     await bot.process_commands(message)
 
-def main():
-    # Get the Discord token from environment variables
-    discord_token = os.getenv('DISCORD_TOKEN')
-    if not discord_token:
-        raise ValueError("Discord token not found in environment variables")
+@bot.event
+async def on_ready():
+    print(f'{bot.user} has connected to Discord!')
 
-    # Run the bot
-    bot.run(discord_token)
+
+def main():
+    if not all([DISCORD_TOKEN, OPENAI_API_KEY, OPENWEBUI_API_BASE, MODEL_NAME]):
+        print("Error: Missing required environment variables")
+        return
+
+    bot.run(DISCORD_TOKEN)
 
 if __name__ == "__main__":
-    main()
+    main()

scripts/requirements.txt

@@ -0,0 +1,4 @@
+discord.py
+openai
+python-dotenv
+requests

v2/.env.example

@@ -0,0 +1,4 @@
+DISCORD_TOKEN=your_discord_bot_token
+OPENAI_API_KEY=your_openai_api_key
+OPENWEBUI_API_BASE=http://your.api.endpoint/v1
+MODEL_NAME="Your_Model_Name"

v2/bot.py

@@ -0,0 +1,139 @@
+import os
+import discord
+from discord.ext import commands
+from openai import OpenAI
+import base64
+import requests
+from io import BytesIO
+from collections import deque
+from dotenv import load_dotenv
+
+# Load environment variables
+load_dotenv()
+
+# Get environment variables
+DISCORD_TOKEN = os.getenv('DISCORD_TOKEN')
+OPENAI_API_KEY = os.getenv('OPENAI_API_KEY')
+OPENWEBUI_API_BASE = os.getenv('OPENWEBUI_API_BASE')
+MODEL_NAME = os.getenv('MODEL_NAME')
+
+# Configure OpenAI client to point to OpenWebUI
+client = OpenAI(
+    api_key=os.getenv('OPENAI_API_KEY'),
+    base_url=os.getenv('OPENWEBUI_API_BASE')  # e.g., "http://localhost:8080/v1"
+)
+
+# Configure OpenAI
+# TODO: The 'openai.api_base' option isn't read in the client API. You will need to pass it when you instantiate the client, e.g. 'OpenAI(base_url=OPENWEBUI_API_BASE)'
+# openai.api_base = OPENWEBUI_API_BASE
+
+# Initialize Discord bot
+intents = discord.Intents.default()
+intents.message_content = True
+intents.messages = True
+bot = commands.Bot(command_prefix='!', intents=intents)
+
+# Message history cache
+channel_history = {}
+
+async def download_image(url):
+    response = requests.get(url)
+    if response.status_code == 200:
+        image_data = BytesIO(response.content)
+        base64_image = base64.b64encode(image_data.read()).decode('utf-8')
+        return base64_image
+    return None
+
+async def get_chat_history(channel, limit=100):
+    messages = []
+    async for message in channel.history(limit=limit):
+        content = f"{message.author.name}: {message.content}"
+        
+        # Handle attachments (images)
+        for attachment in message.attachments:
+            if any(attachment.filename.lower().endswith(ext) for ext in ['.png', '.jpg', '.jpeg', '.gif', '.webp']):
+                content += f" [Image: {attachment.url}]"
+        
+        messages.append(content)
+    return "\n".join(reversed(messages))
+
+async def get_ai_response(context, user_message, image_urls=None):
+    messages = [{"role": "user", "content": []}]
+    
+    # Add text content
+    text_content = f"##CONTEXT##\n{context}\n##ENDCONTEXT##\n\n{user_message}"
+    messages[0]["content"].append({"type": "text", "text": text_content})
+    
+    # Add image content if present
+    if image_urls:
+        for url in image_urls:
+            base64_image = await download_image(url)
+            if base64_image:
+                messages[0]["content"].append({
+                    "type": "image_url",
+                    "image_url": {
+                        "url": f"data:image/jpeg;base64,{base64_image}"
+                    }
+                })
+
+    try:
+        response = client.chat.completions.create(
+            model=MODEL_NAME,
+            messages=messages
+        )
+        return response.choices[0].message.content
+    except Exception as e:
+        return f"Error: {str(e)}"
+
+@bot.event
+async def on_message(message):
+    # Ignore messages from the bot itself
+    if message.author == bot.user:
+        return
+
+    should_respond = False
+
+    # Check if bot was mentioned
+    if bot.user in message.mentions:
+        should_respond = True
+
+    # Check if message is a DM
+    if isinstance(message.channel, discord.DMChannel):
+        should_respond = True
+
+    if should_respond:
+        async with message.channel.typing():
+            # Get chat history
+            history = await get_chat_history(message.channel)
+
+            # Remove bot mention from the message
+            user_message = message.content.replace(f'<@{bot.user.id}>', '').strip()
+
+            # Collect image URLs from the message
+            image_urls = []
+            for attachment in message.attachments:
+                if any(attachment.filename.lower().endswith(ext) for ext in ['.png', '.jpg', '.jpeg', '.gif', '.webp']):
+                    image_urls.append(attachment.url)
+
+            # Get AI response
+            response = await get_ai_response(history, user_message, image_urls)
+
+            # Send response
+            await message.reply(response)
+
+    await bot.process_commands(message)
+
+@bot.event
+async def on_ready():
+    print(f'{bot.user} has connected to Discord!')
+
+
+def main():
+    if not all([DISCORD_TOKEN, OPENAI_API_KEY, OPENWEBUI_API_BASE, MODEL_NAME]):
+        print("Error: Missing required environment variables")
+        return
+
+    bot.run(DISCORD_TOKEN)
+
+if __name__ == "__main__":
+    main()

v2/requirements.txt

@@ -0,0 +1,4 @@
+discord.py
+openai
+python-dotenv
+requests