From 5fbcd358bf13385995158fc1efab165db75f36d4 Mon Sep 17 00:00:00 2001 From: bucolucas Date: Sun, 18 Aug 2024 13:18:38 -0500 Subject: [PATCH 01/10] Refactor AI providers using Strategy Pattern --- telegram_inference_bot.py | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/telegram_inference_bot.py b/telegram_inference_bot.py index 855c16b..9f725fa 100644 --- a/telegram_inference_bot.py +++ b/telegram_inference_bot.py @@ -116,31 +116,19 @@ def call_tool(function_call): async def switch(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: global ai_provider - if isinstance(ai_provider, OpenAIProvider): - ai_provider.use_smart_model = not ai_provider.use_smart_model - model = ai_provider.get_model() - logging.info(f"Switched to model: {model}") - await update.message.reply_text(f"Switched to model: {model}") - else: - await update.message.reply_text("Switching models is only available for OpenAI provider.") + model = ai_provider.switch_model() + logging.info(f"Switched to model: {model}") + await update.message.reply_text(f"Switched to model: {model}") async def switch_providers(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: await clear(update, context) global ai_provider - if isinstance(ai_provider, AnthropicProvider): - ai_provider = create_ai_provider("openai") - logging.info("Switched to OpenAI provider") - await update.message.reply_text("Switched to OpenAI provider") - else: - ai_provider = create_ai_provider("anthropic") - logging.info("Switched to Anthropic provider") - await update.message.reply_text("Switched to Anthropic provider") + ai_provider = create_ai_provider("openai" if ai_provider.name == "anthropic" else "anthropic") + logging.info(f"Switched to {ai_provider.name} provider") + await update.message.reply_text(f"Switched to {ai_provider.name} provider") async def status(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: - if isinstance(ai_provider, AnthropicProvider): - await update.message.reply_text(f"Currently using Anthropic: {ai_provider.model}") - else: - await update.message.reply_text(f"Currently using OpenAI: {ai_provider.get_model()}") + await update.message.reply_text(f"Currently using {ai_provider.name}: {ai_provider.get_model()}") def main() -> None: # Create the Application and pass it your bot's token From 5e02468a8b898380aa3e7ed6aacd0d1f5fc3ca97 Mon Sep 17 00:00:00 2001 From: bucolucas Date: Sun, 18 Aug 2024 13:20:33 -0500 Subject: [PATCH 02/10] Update AI provider usage and imports --- telegram_inference_bot.py | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/telegram_inference_bot.py b/telegram_inference_bot.py index 9f725fa..dfb2692 100644 --- a/telegram_inference_bot.py +++ b/telegram_inference_bot.py @@ -7,7 +7,7 @@ from telegram import Update from telegram.ext import Application, CommandHandler, MessageHandler, filters, ContextTypes from dotenv import load_dotenv from tools.base_tool import BaseTool -from ai_providers import create_ai_provider +from ai_providers import create_ai_provider, AnthropicProvider, OpenAIProvider # Load environment variables load_dotenv() @@ -86,7 +86,7 @@ async def handle_message(update: Update, context: ContextTypes.DEFAULT_TYPE) -> tool_response = call_tool(tool_call) - formatted_result = ai_provider.format_tool_result(tool_call, tool_response) + formatted_result = {"role": "function", "name": function_name, "content": json.dumps(tool_response)} messages.append(formatted_result) response = ai_provider.get_chat_response([{"role": "system", "content": system_prompt}] + messages) @@ -95,13 +95,14 @@ async def handle_message(update: Update, context: ContextTypes.DEFAULT_TYPE) -> toolUseCount += 1 if toolUseCount == 0: - assistant_reply = ai_provider.format_assistant_reply(response) + assistant_reply = response.content[0].text if isinstance(ai_provider, AnthropicProvider) else response.choices[0].message.content conversation_history[user_id].append({"role": "assistant", "content": assistant_reply}) if len(conversation_history[user_id]) > 20: conversation_history[user_id] = conversation_history[user_id][-20:] - await update.message.reply_text(ai_provider.get_reply_text(response)) + reply_text = response.content[0].text if isinstance(ai_provider, AnthropicProvider) else response.choices[0].message.content + await update.message.reply_text(reply_text) except Exception as e: logging.error(f"An error occurred: {str(e)}") @@ -116,19 +117,31 @@ def call_tool(function_call): async def switch(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: global ai_provider - model = ai_provider.switch_model() - logging.info(f"Switched to model: {model}") - await update.message.reply_text(f"Switched to model: {model}") + if isinstance(ai_provider, OpenAIProvider): + ai_provider.use_smart_model = not ai_provider.use_smart_model + ai_provider.model = ai_provider.get_model() + logging.info(f"Switched to model: {ai_provider.model}") + await update.message.reply_text(f"Switched to model: {ai_provider.model}") + else: + await update.message.reply_text("Switching models is only available for OpenAI provider.") async def switch_providers(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: await clear(update, context) global ai_provider - ai_provider = create_ai_provider("openai" if ai_provider.name == "anthropic" else "anthropic") - logging.info(f"Switched to {ai_provider.name} provider") - await update.message.reply_text(f"Switched to {ai_provider.name} provider") + if isinstance(ai_provider, AnthropicProvider): + ai_provider = create_ai_provider("openai") + logging.info("Switched to OpenAI provider") + await update.message.reply_text("Switched to OpenAI provider") + else: + ai_provider = create_ai_provider("anthropic") + logging.info("Switched to Anthropic provider") + await update.message.reply_text("Switched to Anthropic provider") async def status(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: - await update.message.reply_text(f"Currently using {ai_provider.name}: {ai_provider.get_model()}") + if isinstance(ai_provider, AnthropicProvider): + await update.message.reply_text(f"Currently using Anthropic: {ai_provider.model}") + else: + await update.message.reply_text(f"Currently using OpenAI: {ai_provider.model}") def main() -> None: # Create the Application and pass it your bot's token From 8179937d0673124e6acc88f9a6706f5d4d94ea0e Mon Sep 17 00:00:00 2001 From: bucolucas Date: Sun, 18 Aug 2024 13:22:01 -0500 Subject: [PATCH 03/10] Refactor switch_providers and update related functions --- telegram_inference_bot.py | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/telegram_inference_bot.py b/telegram_inference_bot.py index dfb2692..b1ef7fe 100644 --- a/telegram_inference_bot.py +++ b/telegram_inference_bot.py @@ -86,7 +86,7 @@ async def handle_message(update: Update, context: ContextTypes.DEFAULT_TYPE) -> tool_response = call_tool(tool_call) - formatted_result = {"role": "function", "name": function_name, "content": json.dumps(tool_response)} + formatted_result = ai_provider.format_tool_result(tool_call, tool_response) messages.append(formatted_result) response = ai_provider.get_chat_response([{"role": "system", "content": system_prompt}] + messages) @@ -95,14 +95,13 @@ async def handle_message(update: Update, context: ContextTypes.DEFAULT_TYPE) -> toolUseCount += 1 if toolUseCount == 0: - assistant_reply = response.content[0].text if isinstance(ai_provider, AnthropicProvider) else response.choices[0].message.content + assistant_reply = ai_provider.format_assistant_reply(response) conversation_history[user_id].append({"role": "assistant", "content": assistant_reply}) if len(conversation_history[user_id]) > 20: conversation_history[user_id] = conversation_history[user_id][-20:] - reply_text = response.content[0].text if isinstance(ai_provider, AnthropicProvider) else response.choices[0].message.content - await update.message.reply_text(reply_text) + await update.message.reply_text(ai_provider.get_reply_text(response)) except Exception as e: logging.error(f"An error occurred: {str(e)}") @@ -117,31 +116,20 @@ def call_tool(function_call): async def switch(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: global ai_provider - if isinstance(ai_provider, OpenAIProvider): - ai_provider.use_smart_model = not ai_provider.use_smart_model - ai_provider.model = ai_provider.get_model() - logging.info(f"Switched to model: {ai_provider.model}") - await update.message.reply_text(f"Switched to model: {ai_provider.model}") - else: - await update.message.reply_text("Switching models is only available for OpenAI provider.") + model = ai_provider.switch_model() + logging.info(f"Switched to model: {model}") + await update.message.reply_text(f"Switched to model: {model}") async def switch_providers(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: await clear(update, context) global ai_provider - if isinstance(ai_provider, AnthropicProvider): - ai_provider = create_ai_provider("openai") - logging.info("Switched to OpenAI provider") - await update.message.reply_text("Switched to OpenAI provider") - else: - ai_provider = create_ai_provider("anthropic") - logging.info("Switched to Anthropic provider") - await update.message.reply_text("Switched to Anthropic provider") + new_provider_name = "openai" if isinstance(ai_provider, AnthropicProvider) else "anthropic" + ai_provider = create_ai_provider(new_provider_name) + logging.info(f"Switched to {new_provider_name} provider") + await update.message.reply_text(f"Switched to {new_provider_name} provider") async def status(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: - if isinstance(ai_provider, AnthropicProvider): - await update.message.reply_text(f"Currently using Anthropic: {ai_provider.model}") - else: - await update.message.reply_text(f"Currently using OpenAI: {ai_provider.model}") + await update.message.reply_text(f"Currently using {ai_provider.__class__.__name__}: {ai_provider.get_model()}") def main() -> None: # Create the Application and pass it your bot's token From 4db613f7505864013382f68f059080c05523089e Mon Sep 17 00:00:00 2001 From: bucolucas Date: Sun, 18 Aug 2024 13:24:06 -0500 Subject: [PATCH 04/10] Enhance status command with verbose and useful information --- telegram_inference_bot.py | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/telegram_inference_bot.py b/telegram_inference_bot.py index b1ef7fe..43b42ee 100644 --- a/telegram_inference_bot.py +++ b/telegram_inference_bot.py @@ -129,7 +129,43 @@ async def switch_providers(update: Update, context: ContextTypes.DEFAULT_TYPE) - await update.message.reply_text(f"Switched to {new_provider_name} provider") async def status(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: - await update.message.reply_text(f"Currently using {ai_provider.__class__.__name__}: {ai_provider.get_model()}") + global ai_provider, conversation_history, tools + + provider_name = ai_provider.__class__.__name__ + model = ai_provider.get_model() + + total_conversations = sum(len(history) for history in conversation_history.values()) + active_users = len(conversation_history) + + available_tools = [tool.__class__.__name__ for tool in tools] + + status_message = f""" +🤖 Bot Status Report 🤖 + +AI Provider: {provider_name} +Current Model: {model} + +📊 Usage Statistics: +• Total Conversations: {total_conversations} +• Active Users: {active_users} + +🛠 Available Tools ({len(available_tools)}): +{', '.join(available_tools)} + +💡 Commands: +• /start - Start the bot +• /clear - Clear conversation history +• /switch - Switch AI model (OpenAI only) +• /toggle - Toggle between AI providers +• /status - Show this status report + +🔧 System Info: +• Python version: {os.sys.version.split()[0]} +• Telegram Bot API version: {Application.VERSION} +""" + + logging.info("Status command executed") + await update.message.reply_text(status_message) def main() -> None: # Create the Application and pass it your bot's token From bcdb6cf0d9035f1523f3fe385819cc60422d19e6 Mon Sep 17 00:00:00 2001 From: Jonathan Lucas Date: Sun, 18 Aug 2024 13:33:12 -0500 Subject: [PATCH 05/10] updated gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c3f2f07..b79925f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ __pycache__/ # Virtual environment .venv/ +venv/ env/ # IDE files From be7d9c781709e28575f0daa5e5d63983e409ab50 Mon Sep 17 00:00:00 2001 From: bucolucas Date: Sun, 18 Aug 2024 13:42:14 -0500 Subject: [PATCH 06/10] Add missing imports to ai_providers.py --- ai_providers.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ai_providers.py b/ai_providers.py index 957e0e2..9f020df 100644 --- a/ai_providers.py +++ b/ai_providers.py @@ -1,8 +1,10 @@ import os import json +import logging import anthropic from openai import OpenAI from abc import ABC, abstractmethod +from functions import functions class AIProvider(ABC): @abstractmethod @@ -56,7 +58,7 @@ class AnthropicProvider(AIProvider): "description": function['description'], "input_schema": function['parameters'] if function['parameters'] not in [None, {}] else {"type": "object", "properties": {"param1": {"type": "string", "description": "Unnecessary"}}, "required": []} } - for function in functions # This assumes 'functions' is globally accessible + for function in functions ] class OpenAIProvider(AIProvider): @@ -72,7 +74,7 @@ class OpenAIProvider(AIProvider): response = self.client.chat.completions.create( model=self.model, messages=self.format_messages(messages), - functions=functions, # This assumes 'functions' is globally accessible + functions=functions, function_call="auto", max_tokens=self.get_max_tokens() ) From 5563760626693c1490187a7cb5fdc145466cb546 Mon Sep 17 00:00:00 2001 From: bucolucas Date: Sun, 18 Aug 2024 13:45:34 -0500 Subject: [PATCH 07/10] Fix import issue in ai_providers.py --- ai_providers.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ai_providers.py b/ai_providers.py index 9f020df..6b92b95 100644 --- a/ai_providers.py +++ b/ai_providers.py @@ -4,7 +4,11 @@ import logging import anthropic from openai import OpenAI from abc import ABC, abstractmethod -from functions import functions +from tools.github_tool import GitHubTool + +# Initialize GitHubTool and get functions +github_tool = GitHubTool() +functions = github_tool.get_functions() class AIProvider(ABC): @abstractmethod From 35bea5933fff978cd4dc5e74ae289ddfbead9d5b Mon Sep 17 00:00:00 2001 From: bucolucas Date: Sun, 18 Aug 2024 13:50:37 -0500 Subject: [PATCH 08/10] Add format_assistant_reply and get_reply_text methods to AnthropicProvider --- ai_providers.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ai_providers.py b/ai_providers.py index 6b92b95..74d7cd9 100644 --- a/ai_providers.py +++ b/ai_providers.py @@ -65,6 +65,18 @@ class AnthropicProvider(AIProvider): for function in functions ] + def format_assistant_reply(self, response): + for message in response.content: + if message.type == "text": + return message.text + return "" + + def get_reply_text(self, response): + return self.format_assistant_reply(response) + + def get_model(self): + return self.model + class OpenAIProvider(AIProvider): def __init__(self, use_smart_model=True): self.client = OpenAI() From 3bb69b71e1e8eaf5106f1ebf57522b41ff15ad05 Mon Sep 17 00:00:00 2001 From: bucolucas Date: Sun, 18 Aug 2024 13:53:35 -0500 Subject: [PATCH 09/10] Fix status function to use telegram library version --- telegram_inference_bot.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/telegram_inference_bot.py b/telegram_inference_bot.py index 43b42ee..b2425e4 100644 --- a/telegram_inference_bot.py +++ b/telegram_inference_bot.py @@ -3,7 +3,7 @@ import os import importlib import inspect import logging -from telegram import Update +from telegram import Update, __version__ as telegram_version from telegram.ext import Application, CommandHandler, MessageHandler, filters, ContextTypes from dotenv import load_dotenv from tools.base_tool import BaseTool @@ -161,7 +161,7 @@ Current Model: {model} 🔧 System Info: • Python version: {os.sys.version.split()[0]} -• Telegram Bot API version: {Application.VERSION} +• Telegram Bot API version: {telegram_version} """ logging.info("Status command executed") From a0f2682660649658366e5679213051d1f03556f8 Mon Sep 17 00:00:00 2001 From: bucolucas Date: Sun, 18 Aug 2024 13:59:34 -0500 Subject: [PATCH 10/10] Add format_tool_result method to AIProvider classes --- ai_providers.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/ai_providers.py b/ai_providers.py index 74d7cd9..2b983f0 100644 --- a/ai_providers.py +++ b/ai_providers.py @@ -23,6 +23,10 @@ class AIProvider(ABC): def format_tool_calls(self, response): pass + @abstractmethod + def format_tool_result(self, tool_call, tool_response): + pass + class AnthropicProvider(AIProvider): def __init__(self): self.client = anthropic.Anthropic( @@ -77,6 +81,13 @@ class AnthropicProvider(AIProvider): def get_model(self): return self.model + def format_tool_result(self, tool_call, tool_response): + return { + "role": "function", + "name": tool_call.name, + "content": json.dumps(tool_response) + } + class OpenAIProvider(AIProvider): def __init__(self, use_smart_model=True): self.client = OpenAI() @@ -109,6 +120,13 @@ class OpenAIProvider(AIProvider): def get_max_tokens(self): return 4096 if self.model == "gpt-4o" else 16384 + def format_tool_result(self, tool_call, tool_response): + return { + "role": "function", + "name": tool_call.name, + "content": json.dumps(tool_response) + } + def create_ai_provider(provider_name="anthropic", use_smart_model=True): if provider_name.lower() == "anthropic": return AnthropicProvider()