Assistant - updates for local llms, include names for collab convos

Author: vertyco

.gitignore

@@ -195,3 +195,4 @@ locallm/
 llm/
 bedrocktools/
 kingdoms/
+dungeon/

assistant/assistant.py

@@ -54,7 +54,7 @@ class Assistant(
     """
 
     __author__ = "[vertyco](https://github.com/vertyco/vrt-cogs)"
-    __version__ = "6.12.20"
+    __version__ = "6.12.21"
 
     def format_help_for_context(self, ctx):
         helpcmd = super().format_help_for_context(ctx)

assistant/common/calls.py

@@ -66,28 +66,28 @@ async def request_chat_completion_raw(
         if seed and model in SUPPORTS_SEED:
             kwargs["seed"] = seed
 
-        if functions and model not in NO_DEVELOPER_ROLE:
-            if model in SUPPORTS_TOOLS:
-                tools = []
-                for func in functions:
-                    function = {"type": "function", "function": func, "name": func["name"]}
-                    tools.append(function)
-                if tools:
-                    kwargs["tools"] = tools
-                    # If passing tools, make sure the messages payload has no "function_call" key
-                    for idx, message in enumerate(messages):
-                        if "function_call" in message:
-                            # Remove the message from the payload
-                            del kwargs["messages"][idx]
-
-            else:
-                kwargs["functions"] = functions
-                # If passing functions, make sure the messages payload has no tool calls
+    if functions and model not in NO_DEVELOPER_ROLE:
+        if model in SUPPORTS_TOOLS:
+            tools = []
+            for func in functions:
+                function = {"type": "function", "function": func, "name": func["name"]}
+                tools.append(function)
+            if tools:
+                kwargs["tools"] = tools
+                # If passing tools, make sure the messages payload has no "function_call" key
                 for idx, message in enumerate(messages):
-                    if "tool_calls" in message:
+                    if "function_call" in message:
                         # Remove the message from the payload
                         del kwargs["messages"][idx]
 
+        else:
+            kwargs["functions"] = functions
+            # If passing functions, make sure the messages payload has no tool calls
+            for idx, message in enumerate(messages):
+                if "tool_calls" in message:
+                    # Remove the message from the payload
+                    del kwargs["messages"][idx]
+
     add_breadcrumb(
         category="api",
         message=f"Calling request_chat_completion_raw: {model}",

assistant/common/chat.py

@@ -132,7 +132,15 @@ async def handle_message(
             else:
                 question += f"\n\n### Uploaded File ({i.filename}):\n{text}\n"
 
-        mem_id = message.channel.id if conf.collab_convos else message.author.id
+        if conf.collab_convos:
+            mem_id = message.channel.id
+            if message.author.name == message.author.display_name:
+                question = f"@{message.author.name}: {question}"
+            else:
+                question = f"@{message.author.name}({message.author.display_name}): {question}"
+        else:
+            mem_id = message.author.id
+
         conversation = self.db.get_conversation(mem_id, message.channel.id, message.guild.id)
 
         # If referencing a message that isnt part of the user's conversation, include the context
@@ -148,7 +156,12 @@ async def handle_message(
                         include = False
 
                 if include:
-                    question = f"# {ref.author.name} SAID:\n{ref.content}\n\n# REPLY\n{question}"
+                    ref_author: discord.User | discord.Member = ref.author
+                    if ref_author.display_name == ref_author.name:
+                        name = f"@{ref_author.name}"
+                    else:
+                        name = f"@{ref_author.name}({ref_author.display_name})"
+                    question = f"{name}: {ref.content}\n\n# REPLY\n{question}"
 
         if get_last_message:
             reply = conversation.messages[-1]["content"] if conversation.messages else _("No message history!")
@@ -267,6 +280,9 @@ async def get_chat_response(
             functions.extend(prepped_function_calls)
             mapping.update(prepped_function_map)
 
+        if not conf.use_function_calls and functions:
+            functions = []
+
         mem_id = author if isinstance(author, int) else author.id
         chan_id = channel if isinstance(channel, int) else channel.id
         if conf.collab_convos: