diff --git a/bot/bot.py b/bot/bot.py
index 0336397..4a8178f 100644
--- a/bot/bot.py
+++ b/bot/bot.py
@@ -185,9 +185,9 @@ async def _vision_message_handle_fn(
user_id = update.message.from_user.id
current_model = db.get_user_attribute(user_id, "current_model")
- if current_model != "gpt-4-vision-preview":
+ if current_model != "gpt-4-vision-preview" and current_model != "gpt-4o":
await update.message.reply_text(
- "🥲 Images processing is only available for gpt-4-vision-preview model. Please change your settings in /settings",
+ "🥲 Images processing is only available for gpt-4-vision-preview and gpt-4o model. Please change your settings in /settings",
parse_mode=ParseMode.HTML,
)
return
@@ -459,11 +459,14 @@ async def message_handle(update: Update, context: CallbackContext, message=None,
await update.message.reply_text(text, parse_mode=ParseMode.HTML)
async with user_semaphores[user_id]:
- if current_model == "gpt-4-vision-preview" or update.message.photo is not None and len(update.message.photo) > 0:
- logger.error('gpt-4-vision-preview')
- if current_model != "gpt-4-vision-preview":
- current_model = "gpt-4-vision-preview"
- db.set_user_attribute(user_id, "current_model", "gpt-4-vision-preview")
+ if current_model == "gpt-4-vision-preview" or current_model == "gpt-4o" or update.message.photo is not None and len(update.message.photo) > 0:
+
+ logger.error(current_model)
+ # What is this? ^^^
+
+ if current_model != "gpt-4o" and current_model != "gpt-4-vision-preview":
+ current_model = "gpt-4o"
+ db.set_user_attribute(user_id, "current_model", "gpt-4o")
task = asyncio.create_task(
_vision_message_handle_fn(update, context, use_new_dialog_timeout=use_new_dialog_timeout)
)
@@ -869,4 +872,4 @@ def run_bot() -> None:
if __name__ == "__main__":
- run_bot()
\ No newline at end of file
+ run_bot()
diff --git a/bot/openai_utils.py b/bot/openai_utils.py
index 005f801..1245058 100644
--- a/bot/openai_utils.py
+++ b/bot/openai_utils.py
@@ -26,7 +26,7 @@ OPENAI_COMPLETION_OPTIONS = {
class ChatGPT:
def __init__(self, model="gpt-3.5-turbo"):
- assert model in {"text-davinci-003", "gpt-3.5-turbo-16k", "gpt-3.5-turbo", "gpt-4", "gpt-4-1106-preview", "gpt-4-vision-preview"}, f"Unknown model: {model}"
+ assert model in {"text-davinci-003", "gpt-3.5-turbo-16k", "gpt-3.5-turbo", "gpt-4", "gpt-4o", "gpt-4-1106-preview", "gpt-4-vision-preview"}, f"Unknown model: {model}"
self.model = model
async def send_message(self, message, dialog_messages=[], chat_mode="assistant"):
@@ -37,7 +37,7 @@ class ChatGPT:
answer = None
while answer is None:
try:
- if self.model in {"gpt-3.5-turbo-16k", "gpt-3.5-turbo", "gpt-4", "gpt-4-1106-preview", "gpt-4-vision-preview"}:
+ if self.model in {"gpt-3.5-turbo-16k", "gpt-3.5-turbo", "gpt-4", "gpt-4o", "gpt-4-1106-preview", "gpt-4-vision-preview"}:
messages = self._generate_prompt_messages(message, dialog_messages, chat_mode)
r = await openai.ChatCompletion.acreate(
@@ -78,7 +78,7 @@ class ChatGPT:
answer = None
while answer is None:
try:
- if self.model in {"gpt-3.5-turbo-16k", "gpt-3.5-turbo", "gpt-4", "gpt-4-1106-preview"}:
+ if self.model in {"gpt-3.5-turbo-16k", "gpt-3.5-turbo", "gpt-4","gpt-4o", "gpt-4-1106-preview"}:
messages = self._generate_prompt_messages(message, dialog_messages, chat_mode)
r_gen = await openai.ChatCompletion.acreate(
@@ -138,7 +138,7 @@ class ChatGPT:
answer = None
while answer is None:
try:
- if self.model == "gpt-4-vision-preview":
+ if self.model == "gpt-4-vision-preview" or self.model == "gpt-4o":
messages = self._generate_prompt_messages(
message, dialog_messages, chat_mode, image_buffer
)
@@ -186,7 +186,7 @@ class ChatGPT:
answer = None
while answer is None:
try:
- if self.model == "gpt-4-vision-preview":
+ if self.model == "gpt-4-vision-preview" or self.model == "gpt-4o":
messages = self._generate_prompt_messages(
message, dialog_messages, chat_mode, image_buffer
)
@@ -269,8 +269,12 @@ class ChatGPT:
"text": message,
},
{
- "type": "image",
- "image": self._encode_image(image_buffer),
+ "type": "image_url",
+ "image_url" : {
+
+ "url": f"data:image/jpeg;base64,{self._encode_image(image_buffer)}",
+ "detail":"high"
+ }
}
]
}
@@ -303,6 +307,9 @@ class ChatGPT:
elif model == "gpt-4-vision-preview":
tokens_per_message = 3
tokens_per_name = 1
+ elif model == "gpt-4o":
+ tokens_per_message = 3
+ tokens_per_name = 1
else:
raise ValueError(f"Unknown model: {model}")
@@ -354,4 +361,4 @@ async def generate_images(prompt, n_images=4, size="512x512"):
async def is_content_acceptable(prompt):
r = await openai.Moderation.acreate(input=prompt)
- return not all(r.results[0].categories.values())
\ No newline at end of file
+ return not all(r.results[0].categories.values())
diff --git a/config/models.yml b/config/models.yml
index ebd1bc9..a13c30f 100644
--- a/config/models.yml
+++ b/config/models.yml
@@ -1,4 +1,4 @@
-available_text_models: ["gpt-3.5-turbo", "gpt-3.5-turbo-16k", "gpt-4-1106-preview", "gpt-4-vision-preview", "gpt-4", "text-davinci-003"]
+available_text_models: ["gpt-3.5-turbo", "gpt-3.5-turbo-16k", "gpt-4-1106-preview", "gpt-4-vision-preview", "gpt-4", "text-davinci-003", "gpt-4o"]
info:
gpt-3.5-turbo:
@@ -65,6 +65,18 @@ info:
smart: 5
fast: 4
cheap: 3
+ gpt-4o:
+ type: chat_completion
+ name: GPT-4o
+ description: GPT-4o is a special variant of GPT-4 designed for optimal performance and accuracy. Suitable for complex and detailed tasks.
+
+ price_per_1000_input_tokens: 0.03
+ price_per_1000_output_tokens: 0.06
+
+ scores:
+ smart: 5
+ fast: 2
+ cheap: 2
text-davinci-003:
type: completion
@@ -85,4 +97,4 @@ info:
whisper:
type: audio
- price_per_1_min: 0.006
\ No newline at end of file
+ price_per_1_min: 0.006