From 22c60cad1a73b795b921a73fe21e2e6280eeb604 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Fri, 27 Sep 2024 16:43:17 -0700 Subject: [PATCH 1/4] refactor: Replace `extra_params` with `extra_headers` in cache warming request --- aider/coders/base_coder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py index 364ad5871..2c6072a66 100755 --- a/aider/coders/base_coder.py +++ b/aider/coders/base_coder.py @@ -1077,7 +1077,7 @@ class Coder: messages=self.cache_warming_chunks.cacheable_messages(), stream=False, max_tokens=1, - extra_params=self.main_model.extra_params, + extra_headers=self.main_model.extra_headers, ) except Exception as err: self.io.tool_warning(f"Cache warming error: {str(err)}") From f7818c69944f2129c8ff66572d99121f7f31b0b9 Mon Sep 17 00:00:00 2001 From: "Paul Gauthier (aider)" Date: Fri, 27 Sep 2024 16:43:18 -0700 Subject: [PATCH 2/4] feat: Use **kwargs for extra_params in warm_cache_worker --- aider/coders/base_coder.py | 1 + 1 file changed, 1 insertion(+) diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py index 2c6072a66..8548b75b0 100755 --- a/aider/coders/base_coder.py +++ b/aider/coders/base_coder.py @@ -1078,6 +1078,7 @@ class Coder: stream=False, max_tokens=1, extra_headers=self.main_model.extra_headers, + **self.main_model.extra_params # Use **kwargs here ) except Exception as err: self.io.tool_warning(f"Cache warming error: {str(err)}") From aab01086a292bbf27a77e54763fe6c7730e4180c Mon Sep 17 00:00:00 2001 From: "Paul Gauthier (aider)" Date: Fri, 27 Sep 2024 16:43:24 -0700 Subject: [PATCH 3/4] style: fix formatting in base_coder.py --- aider/coders/base_coder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py index 8548b75b0..5537bb8ed 100755 --- a/aider/coders/base_coder.py +++ b/aider/coders/base_coder.py @@ -1078,7 +1078,7 @@ class Coder: stream=False, max_tokens=1, extra_headers=self.main_model.extra_headers, - **self.main_model.extra_params # Use **kwargs here + **self.main_model.extra_params, # Use **kwargs here ) except Exception as err: self.io.tool_warning(f"Cache warming error: {str(err)}") From 7e4e6782d1651dd77d278181073655f973874153 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Fri, 27 Sep 2024 16:46:03 -0700 Subject: [PATCH 4/4] fix: set max_tokens to 1 for cache warming --- aider/coders/base_coder.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py index 5537bb8ed..55bf2b32f 100755 --- a/aider/coders/base_coder.py +++ b/aider/coders/base_coder.py @@ -1071,14 +1071,15 @@ class Coder: self.warming_pings_left -= 1 self.next_cache_warm = time.time() + delay + kwargs = self.main_model.extra_params or dict() + kwargs["max_tokens"] = 1 + try: completion = litellm.completion( model=self.main_model.name, messages=self.cache_warming_chunks.cacheable_messages(), stream=False, - max_tokens=1, - extra_headers=self.main_model.extra_headers, - **self.main_model.extra_params, # Use **kwargs here + **kwargs, ) except Exception as err: self.io.tool_warning(f"Cache warming error: {str(err)}")