From aa3e17dae665c30a68116ca49f1effbbb8d8744a Mon Sep 17 00:00:00 2001
From: "Paul Gauthier (aider)" <aider@paulg.org>
Date: Thu, 1 Aug 2024 14:49:54 -0300
Subject: [PATCH] refactor: Refactor ChatSummary initialization and remove
 max_chat_history_tokens param from Coder

---
 aider/coders/base_coder.py | 9 ++++-----
 aider/main.py              | 7 ++++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py
index edb510484..64c7d5a92 100755
--- a/aider/coders/base_coder.py
+++ b/aider/coders/base_coder.py
@@ -23,6 +23,7 @@ from rich.markdown import Markdown
 from aider import __version__, models, prompts, urls, utils
 from aider.commands import Commands
 from aider.history import ChatSummary
+from aider.coders import Coder
 from aider.io import InputOutput
 from aider.linter import Linter
 from aider.llm import litellm
@@ -206,7 +207,6 @@ class Coder:
         use_git=True,
         cur_messages=None,
         done_messages=None,
-        max_chat_history_tokens=None,
         restore_chat_history=False,
         auto_lint=True,
         auto_test=False,
@@ -215,6 +215,7 @@ class Coder:
         aider_commit_hashes=None,
         map_mul_no_files=8,
         commands=None,
+        summarizer=None,
     ):
         if not fnames:
             fnames = []
@@ -319,11 +320,9 @@ class Coder:
                 map_mul_no_files=map_mul_no_files,
             )
 
-        if max_chat_history_tokens is None:
-            max_chat_history_tokens = self.main_model.max_chat_history_tokens
-        self.summarizer = ChatSummary(
+        self.summarizer = summarizer or ChatSummary(
             [self.main_model, self.main_model.weak_model],
-            max_chat_history_tokens,
+            self.main_model.max_chat_history_tokens,
         )
 
         self.summarizer_thread = None
diff --git a/aider/main.py b/aider/main.py
index 510af07c2..8c4ff7d0e 100644
--- a/aider/main.py
+++ b/aider/main.py
@@ -477,6 +477,11 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
 
     commands = Commands(io, None, verify_ssl=args.verify_ssl)
 
+    summarizer = ChatSummary(
+        [main_model, main_model.weak_model],
+        args.max_chat_history_tokens,
+    )
+
     try:
         coder = Coder.create(
             main_model=main_model,
@@ -495,13 +500,13 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
             code_theme=args.code_theme,
             stream=args.stream,
             use_git=args.git,
-            max_chat_history_tokens=args.max_chat_history_tokens,
             restore_chat_history=args.restore_chat_history,
             auto_lint=args.auto_lint,
             auto_test=args.auto_test,
             lint_cmds=lint_cmds,
             test_cmd=args.test_cmd,
             commands=commands,
+            summarizer=summarizer,
         )
 
     except ValueError as err: