Upload llmdolphin.py

llmdolphin.py

@@ -8,6 +8,7 @@ from llama_cpp_agent.chat_history.messages import Roles
 from ja_to_danbooru.ja_to_danbooru import jatags_to_danbooru_tags
 import wrapt_timeout_decorator
 from pathlib import Path
+from llama_cpp_agent.messages_formatter import MessagesFormatter
 from formatter import mistral_v1_formatter, mistral_v2_formatter, mistral_v3_tekken_formatter
 
 llm_models_dir = "./llm_models"
@@ -819,8 +820,9 @@ llm_formats = {
     "PHI 3": MessagesFormatterType.PHI_3,
     "Autocoder": MessagesFormatterType.AUTOCODER,
     "DeepSeek Coder v2": MessagesFormatterType.DEEP_SEEK_CODER_2,
-    "Gemma 2": MessagesFormatterType.ALPACA,
+    "Gemma 2": MessagesFormatterType.GEMMA_2,
     "Qwen2": MessagesFormatterType.OPEN_CHAT,
+    "Open Interpreter": MessagesFormatterType.OPEN_INTERPRETER,
     "Mistral Tokenizer V1": mistral_v1_formatter,
     "Mistral Tokenizer V2": mistral_v2_formatter,
     "Mistral Tokenizer V3 - Tekken": mistral_v3_tekken_formatter,
@@ -1243,7 +1245,8 @@ def dolphin_respond(
     agent = LlamaCppAgent(
         provider,
         system_prompt=f"{system_message}",
-        predefined_messages_formatter_type=chat_template,
+        predefined_messages_formatter_type=chat_template if not isinstance(chat_template, MessagesFormatter) else None,
+        custom_messages_formatter=chat_template if isinstance(chat_template, MessagesFormatter) else None,
         debug_output=False
     )
     
@@ -1337,7 +1340,8 @@ def dolphin_respond_auto(
     agent = LlamaCppAgent(
         provider,
         system_prompt=f"{system_message}",
-        predefined_messages_formatter_type=chat_template,
+        predefined_messages_formatter_type=chat_template if not isinstance(chat_template, MessagesFormatter) else None,
+        custom_messages_formatter=chat_template if isinstance(chat_template, MessagesFormatter) else None,
         debug_output=False
     )
     
@@ -1432,7 +1436,8 @@ def respond_playground(
     agent = LlamaCppAgent(
         provider,
         system_prompt=f"{system_message}",
-        predefined_messages_formatter_type=chat_template,
+        predefined_messages_formatter_type=chat_template if not isinstance(chat_template, MessagesFormatter) else None,
+        custom_messages_formatter=chat_template if isinstance(chat_template, MessagesFormatter) else None,
         debug_output=False
     )