From 2b2ab3994df3cbbab5a477e9da1cc19bc202bd5c Mon Sep 17 00:00:00 2001
From: "Paul Gauthier (aider)" <aider@paulg.org>
Date: Thu, 29 Aug 2024 06:31:35 -0700
Subject: [PATCH] refactor: move scrub_sensitive_info to format_settings.py

---
 aider/format_settings.py | 10 +++++++++-
 aider/main.py            | 13 +------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/aider/format_settings.py b/aider/format_settings.py
index 49d45eb94..0ad54aa51 100644
--- a/aider/format_settings.py
+++ b/aider/format_settings.py
@@ -1,4 +1,12 @@
-from aider.utils import scrub_sensitive_info
+def scrub_sensitive_info(args, text):
+    # Replace sensitive information with last 4 characters
+    if text and args.openai_api_key:
+        last_4 = args.openai_api_key[-4:]
+        text = text.replace(args.openai_api_key, f"...{last_4}")
+    if text and args.anthropic_api_key:
+        last_4 = args.anthropic_api_key[-4:]
+        text = text.replace(args.anthropic_api_key, f"...{last_4}")
+    return text
 
 
 def format_settings(parser, args):
diff --git a/aider/main.py b/aider/main.py
index 46d783c63..888b86ed3 100644
--- a/aider/main.py
+++ b/aider/main.py
@@ -13,7 +13,7 @@ from aider import __version__, models, utils
 from aider.args import get_parser
 from aider.coders import Coder
 from aider.commands import Commands, SwitchCoder
-from aider.format_settings import format_settings
+from aider.format_settings import format_settings, scrub_sensitive_info
 from aider.history import ChatSummary
 from aider.io import InputOutput
 from aider.llm import litellm  # noqa: F401; properly init litellm on launch
@@ -133,17 +133,6 @@ def check_gitignore(git_root, io, ask=True):
     io.tool_output(f"Added {pat} to .gitignore")
 
 
-def scrub_sensitive_info(args, text):
-    # Replace sensitive information with last 4 characters
-    if text and args.openai_api_key:
-        last_4 = args.openai_api_key[-4:]
-        text = text.replace(args.openai_api_key, f"...{last_4}")
-    if text and args.anthropic_api_key:
-        last_4 = args.anthropic_api_key[-4:]
-        text = text.replace(args.anthropic_api_key, f"...{last_4}")
-    return text
-
-
 def check_streamlit_install(io):
     return utils.check_pip_install_extra(
         io,