From bd9e6d7f58daca9537b90fcf0d8af807b8d3e763 Mon Sep 17 00:00:00 2001 From: "Paul Gauthier (aider)" Date: Mon, 26 Aug 2024 15:46:26 -0700 Subject: [PATCH] refactor: Move format_tokens function to utils.py --- aider/coders/base_coder.py | 11 ++--------- aider/utils.py | 8 ++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py index dc746bd4e..c89ed965b 100755 --- a/aider/coders/base_coder.py +++ b/aider/coders/base_coder.py @@ -22,7 +22,8 @@ import git from rich.console import Console, Text from rich.markdown import Markdown -from aider import __version__, models, prompts, urls, utils +from aider import __version__, models, prompts, urls +from aider.utils import format_tokens, utils from aider.commands import Commands from aider.history import ChatSummary from aider.io import ConfirmGroup, InputOutput @@ -1488,14 +1489,6 @@ class Coder: self.message_tokens_received += completion_tokens - def format_tokens(count): - if count < 1000: - return f"{count}" - elif count < 10000: - return f"{count / 1000:.1f}k" - else: - return f"{round(count / 1000)}k" - tokens_report = f"Tokens: {format_tokens(self.message_tokens_sent)} sent" if cache_write_tokens: diff --git a/aider/utils.py b/aider/utils.py index 7191d6e3c..3647e0aac 100644 --- a/aider/utils.py +++ b/aider/utils.py @@ -280,6 +280,14 @@ def find_common_root(abs_fnames): else: return safe_abs_path(os.getcwd()) +def format_tokens(count): + if count < 1000: + return f"{count}" + elif count < 10000: + return f"{count / 1000:.1f}k" + else: + return f"{round(count / 1000)}k" + def check_pip_install_extra(io, module, prompt, pip_install_cmd): try: