From 22dff7f2147fefb8ca05cad9ee7c73ab470dc6ab Mon Sep 17 00:00:00 2001
From: konrad <konrad1984@icloud.com>
Date: Thu, 22 Feb 2024 14:41:48 +0000
Subject: [PATCH] dall-e-3 support

---
 README.md  | 9 ++++-----
 chatgpt.py | 3 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 9ab0fa2..b11d6c1 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,8 @@ $ cp example-chat.conf chat.conf
 
 Edit chat.conf and change variables. Example configuration for IRCNet:
 
-**There is a new variable "context", it's optional: you can leave it blank or enter what you want the bot to know and how you want the bot to behave. This will work only with models connecting to endpoint /v1/chat/completions.**
+Variable "context" is optional: you can leave it blank or enter what you want the bot to know and how you want the bot to behave. This will work only with models connecting to endpoint /v1/chat/completions
 
-**e.g.: You are an ironic and arrogant bot on the #linux channel, James and Mark are on the channel with you. James loves to play guitar and Mark is a footballer. You speak Scottish slang.**
 ```
 [openai]
 api_key = sk-XXXXXXXXXXXXXXX
@@ -82,15 +81,15 @@ ChatGPT IRC Bot can use three API endpoints:
 
 Following models support endpoint /v1/chat/completions:
 
-> gpt-4, gpt-4-0613, gpt-4-1106-preview, gpt-4-vision-preview, gpt-4-32k, gpt-4-32k-0613, gpt-3.5-turbo, gpt-3.5-turbo-0613, gpt-3.5-turbo-16k, gpt-3.5-turbo-16k-0613
+> gpt-4, gpt-4-turbo-preview, gpt-4-vision-preview, gpt-4-32k, gpt-3.5-turbo, gpt-3.5-turbo-16k, fine-tuned versions of gpt-3.5-turbo
 
 Models that support /v1/completions (Legacy):
 
-> gpt-3.5-turbo-instruct, text-davinci-003, text-davinci-002, text-davinci-001, text-curie-001, text-babbage-001, text-ada-001, davinci, curie, babbage, ada, babbage-002, davinci-002
+> gpt-3.5-turbo-instruct, babbage-002, davinci-002
 
 Create an image using endpoint /v1/images/generations:
 
-> dalle
+> dall-e-2, dall-e-3
 
 More details about models: https://platform.openai.com/docs/models
 
diff --git a/chatgpt.py b/chatgpt.py
index 830efa9..e205fb1 100644
--- a/chatgpt.py
+++ b/chatgpt.py
@@ -37,6 +37,7 @@ password = config.get('irc', 'password')
 # Define the list of models
 completion_models = ["gpt-3.5-turbo-instruct", "text-davinci-003", "text-davinci-002", "text-davinci-001", "text-curie-001", "text-babbage-001", "text-ada-001", "davinci", "curie", "babbage", "ada", "babbage-002", "davinci-002"]
 chatcompletion_models = ["gpt-4", "gpt-4-1106-preview", "gpt-4-vision-preview", "gpt-4-0613", "gpt-4-32k", "gpt-4-32k-0613", "gpt-3.5-turbo", "gpt-3.5-turbo-0613", "gpt-3.5-turbo-16k", "gpt-3.5-turbo-16k-0613"]
+images_models = ["dall-e-2", "dall-e-3"]
 
 # Connect to IRC server
 def connect(server, port, usessl, password, ident, realname, nickname, channels):
@@ -165,7 +166,7 @@ while True:
                 except Exception as e:
                     print("Error: " + str(e))
                     irc.send(bytes(f"PRIVMSG {channel} :An unexpected error occurred. {str(e)}\n", "UTF-8"))
-            elif model == "dalle":
+            elif model in images_models:
                 try:
                     response = openai.Image.create(
                     prompt="Q: " + question + "\nA:",