🐛 fix(functionscalls.py): fix typo in FunctionCallError class name

✨ feat(functionscalls.py): add error handling for missing arguments in function calls
🐛 fix(makeprompt.py): fix typo in function_call variable name
🔀 chore(gpt-3.5-turbo.txt): update instructions to only use provided functions

src/functionscalls.py

@@ -149,6 +149,8 @@ font_matches = {
 
 unsplash_random_image_url = "https://source.unsplash.com/random"
 
+class FuntionCallError(Exception):
+    pass
 
 async def get_final_url(url):
     async with aiohttp.ClientSession() as session:
@@ -168,8 +170,12 @@ async def do_async_request(url, json=True):
 
 
 async def add_reaction_to_last_message(
-    message_to_react_to: discord.Message, emoji, message=""
+    message_to_react_to: discord.Message, arguments: dict
 ):  
+    emoji = arguments.get("emoji", "")
+    if emoji == "":
+        raise FuntionCallError("No emoji provided")
+    message = arguments.get("message", "")
     if message == "":
         await message_to_react_to.add_reaction(emoji)
     else:
@@ -177,13 +183,20 @@ async def add_reaction_to_last_message(
         await message_to_react_to.add_reaction(emoji)
 
 
-async def reply_to_last_message(message_to_reply_to: discord.Message, message):
+async def reply_to_last_message(message_to_reply_to: discord.Message, arguments: dict):
+    message = arguments.get("message", "")
+    if message == "":
+        raise FuntionCallError("No message provided")
     await message_to_reply_to.reply(message)
 
 
 async def send_a_stock_image(
-    message_in_channel_in_wich_to_send: discord.Message, query: str, message: str = ""
+    message_in_channel_in_wich_to_send: discord.Message, arguments: dict
 ):
+    query = arguments.get("query", "")
+    if query == "":
+        raise FuntionCallError("No query provided")
+    message = arguments.get("message", "")
     query = query.replace(" ", "+")
     image_url = f"{unsplash_random_image_url}?{query}"
     final_url = await get_final_url(image_url)
@@ -192,18 +205,28 @@ async def send_a_stock_image(
 
 
 async def create_a_thread(
-    channel_in_which_to_create_the_thread: discord.TextChannel, name: str, message: str
+    called_by: discord.Message, arguments: dict
 ):
+    name = arguments.get("name", "")
+    if name == "":
+        raise FuntionCallError("No name provided")
+    message = arguments.get("message", "")
+    if message == "":
+        raise FuntionCallError("No message provided")
+    channel_in_which_to_create_the_thread = called_by.channel
     msg = await channel_in_which_to_create_the_thread.send(message)
     await msg.create_thread(name=name)
 
 
 async def send_a_gif(
     message_in_channel_in_wich_to_send: discord.Message,
-    query: str,
+    arguments: dict,
-    message: str = "",
-    limit: int = 15,
 ):
+    query = arguments.get("query", "")
+    if query == "":
+        raise FuntionCallError("No query provided")
+    message = arguments.get("message", "")
+    limit = arguments.get("limit", 15)
     query = query.replace(" ", "+")
     image_url = f"{tenor_api_url}{query}&limit={limit}"
     response = await do_async_request(image_url)
@@ -215,10 +238,16 @@ async def send_a_gif(
 
 async def send_ascii_art_text(
     message_in_channel_in_wich_to_send: discord.Message,
-    text: str,
+    arguments: dict,
-    font: str = "standard",
-    message: str = "",
 ):
+    text = arguments.get("text", "")
+    if text == "":
+        raise FuntionCallError("No text provided")
+    font = arguments.get("font", "standard")
+    message = arguments.get("message", "")
+    if font not in font_matches:
+        raise FuntionCallError("Invalid font")
+    
     font = font_matches[font]
     text = text.replace(" ", "+")
     asciiiar_url = (
@@ -251,8 +280,12 @@ async def send_ascii_art_text(
 
 
 async def send_ascii_art_image(
-    message_in_channel_in_wich_to_send: discord.Message, query: str, message: str = ""
+    message_in_channel_in_wich_to_send: discord.Message, arguments: dict
 ):
+    query = arguments.get("query", "")
+    if query == "":
+        raise FuntionCallError("No query provided")
+    message = arguments.get("message", "")
     query = query.replace(" ", "-")
     asciiiar_url = f"https://emojicombos.com/{query}"
     response = await do_async_request(asciiiar_url, json=False)
@@ -264,3 +297,14 @@ async def send_ascii_art_image(
     combo = random.choice(combos)
     message = f"```\n{combo}```\n{message}"
     await message_in_channel_in_wich_to_send.channel.send(message)
+
+functions_matching = {
+    "add_reaction_to_last_message": add_reaction_to_last_message,
+    "reply_to_last_message": reply_to_last_message,
+    "send_a_stock_image": send_a_stock_image,
+    "send_a_gif": send_a_gif,
+    "send_ascii_art_text": send_ascii_art_text,
+    "send_ascii_art_image": send_ascii_art_image,
+    "create_a_thread": create_a_thread,
+
+}

src/makeprompt.py

@@ -141,14 +141,16 @@ async def chatgpt_process(
         model=model,
         messages=msgs,
         functions=called_functions,
-        # function_call="auto",
+        function_call="auto",
     )
-    print(msgs)
+    print(f"messages: {msgs}")
     response = response["choices"][0]["message"]  # type: ignore
+    print(f"response: {response}")
     if response.get("function_call"):
         function_call = response.get("function_call")
         name = function_call.get("name", "")
         arguments = function_call.get("arguments", {})
+        print(f"arguments: {arguments}")
         arguments = json.loads(arguments)
         if name == "add_reaction_to_last_message":
             if arguments.get("emoji"):

src/prompts/gpt-3.5-turbo.txt

@@ -17,6 +17,7 @@ Format text using markdown:
 - Use level 1, 2 and 3 headers (using #, ## and ###) to make titles. For example: # Title 1 ## Title 2 ### Title 3. Alternatively as titles you can use the ascii art text function.
 
 You can use function calls or answer normally. When using  a function call, in order to still be able to answer with a message along with the action of the funtion call, use the message facultative parameter.
+Only use the functions you have been provided with.
 
 You can also reply with a gif, by using the gif function call. Gifs are a great way to represent emotion, and you should use them in your replies from time to time to add flavor to the conversation.