Assistant - fix token counting issue for conversations containing images

Author: vertyco

assistant/assistant.py

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

assistant/common/api.py

@@ -405,7 +405,14 @@ async def pop(role: str) -> int:
                 if "name" in removed:
                     reduction += 1
                 if content := removed.get("content"):
-                    reduction += await self.count_tokens(content, model)
+                    if isinstance(content, list):
+                        for i in content:
+                            if i["type"] == "text":
+                                reduction += await self.count_tokens(i["text"], model)
+                            else:
+                                reduction += 2
+                    else:
+                        reduction += await self.count_tokens(str(content), model)
                 elif tool_calls := removed.get("tool_calls"):
                     reduction += await self.count_tokens(str(tool_calls), model)
                 elif function_call := removed.get("function_call"):