Refactor switch_providers and update related functions
This commit is contained in:
+11
-23
@@ -86,7 +86,7 @@ async def handle_message(update: Update, context: ContextTypes.DEFAULT_TYPE) ->
|
|||||||
|
|
||||||
tool_response = call_tool(tool_call)
|
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)
|
messages.append(formatted_result)
|
||||||
|
|
||||||
response = ai_provider.get_chat_response([{"role": "system", "content": system_prompt}] + messages)
|
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
|
toolUseCount += 1
|
||||||
|
|
||||||
if toolUseCount == 0:
|
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})
|
conversation_history[user_id].append({"role": "assistant", "content": assistant_reply})
|
||||||
|
|
||||||
if len(conversation_history[user_id]) > 20:
|
if len(conversation_history[user_id]) > 20:
|
||||||
conversation_history[user_id] = 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(ai_provider.get_reply_text(response))
|
||||||
await update.message.reply_text(reply_text)
|
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logging.error(f"An error occurred: {str(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:
|
async def switch(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
|
||||||
global ai_provider
|
global ai_provider
|
||||||
if isinstance(ai_provider, OpenAIProvider):
|
model = ai_provider.switch_model()
|
||||||
ai_provider.use_smart_model = not ai_provider.use_smart_model
|
logging.info(f"Switched to model: {model}")
|
||||||
ai_provider.model = ai_provider.get_model()
|
await update.message.reply_text(f"Switched to model: {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:
|
async def switch_providers(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
|
||||||
await clear(update, context)
|
await clear(update, context)
|
||||||
global ai_provider
|
global ai_provider
|
||||||
if isinstance(ai_provider, AnthropicProvider):
|
new_provider_name = "openai" if isinstance(ai_provider, AnthropicProvider) else "anthropic"
|
||||||
ai_provider = create_ai_provider("openai")
|
ai_provider = create_ai_provider(new_provider_name)
|
||||||
logging.info("Switched to OpenAI provider")
|
logging.info(f"Switched to {new_provider_name} provider")
|
||||||
await update.message.reply_text("Switched to OpenAI provider")
|
await update.message.reply_text(f"Switched to {new_provider_name} 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:
|
async def status(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
|
||||||
if isinstance(ai_provider, AnthropicProvider):
|
await update.message.reply_text(f"Currently using {ai_provider.__class__.__name__}: {ai_provider.get_model()}")
|
||||||
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:
|
def main() -> None:
|
||||||
# Create the Application and pass it your bot's token
|
# Create the Application and pass it your bot's token
|
||||||
|
|||||||
Reference in New Issue
Block a user