[HOTFIX] fix bug in the format method of ollama and litellm (#230)

modelscope · May 17, 2024 · 1f22e67 · 1f22e67
1 parent 54d3a3c
commit 1f22e67
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/src/agentscope/models/litellm_model.py b/src/agentscope/models/litellm_model.py
@@ -236,20 +236,18 @@ def format(
                 )
 
         if len(dialogue) != 0:
+            dialogue_history = "\n".join(dialogue)
+
             system_content_template.extend(
-                ["## Dialogue History", "{dialogue_history}"],
+                ["## Dialogue History", dialogue_history],
             )
 
-        dialogue_history = "\n".join(dialogue)
-
-        system_content_template = "\n".join(system_content_template)
+        system_content = "\n".join(system_content_template)
 
         messages = [
             {
                 "role": "user",
-                "content": system_content_template.format(
-                    dialogue_history=dialogue_history,
-                ),
+                "content": system_content,
             },
         ]
 

diff --git a/src/agentscope/models/ollama_model.py b/src/agentscope/models/ollama_model.py
@@ -256,19 +256,17 @@ def format(
                 images.append(unit.url)
 
         if len(dialogue) != 0:
+            dialogue_history = "\n".join(dialogue)
+
             system_content_template.extend(
-                ["## Dialogue History", "{dialogue_history}"],
+                ["## Dialogue History", dialogue_history],
             )
 
-        dialogue_history = "\n".join(dialogue)
-
-        system_content_template = "\n".join(system_content_template)
+        system_content = "\n".join(system_content_template)
 
         system_message = {
             "role": "system",
-            "content": system_content_template.format(
-                dialogue_history=dialogue_history,
-            ),
+            "content": system_content,
         }
 
         if len(images) != 0: