From 43d3cf2c71f9c46ee6a0eb6ac0b74bdb3fd2b073 Mon Sep 17 00:00:00 2001 From: "Paul Gauthier (aider)" Date: Thu, 29 Aug 2024 06:30:37 -0700 Subject: [PATCH] refactor: move format_settings function to separate file --- aider/format_settings.py | 17 +++++++++++++++++ aider/main.py | 17 +---------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/aider/format_settings.py b/aider/format_settings.py index e69de29bb..37b50d22c 100644 --- a/aider/format_settings.py +++ b/aider/format_settings.py @@ -0,0 +1,17 @@ +from aider.utils import scrub_sensitive_info + +def format_settings(parser, args): + show = scrub_sensitive_info(args, parser.format_values()) + # clean up the headings for consistency w/ new lines + heading_env = "Environment Variables:" + heading_defaults = "Defaults:" + if heading_env in show: + show = show.replace(heading_env, "\n" + heading_env) + show = show.replace(heading_defaults, "\n" + heading_defaults) + show += "\n" + show += "Option settings:\n" + for arg, val in sorted(vars(args).items()): + if val: + val = scrub_sensitive_info(args, str(val)) + show += f" - {arg}: {val}\n" # noqa: E221 + return show diff --git a/aider/main.py b/aider/main.py index 5724990eb..3617ff9e4 100644 --- a/aider/main.py +++ b/aider/main.py @@ -10,6 +10,7 @@ from dotenv import load_dotenv from prompt_toolkit.enums import EditingMode from aider import __version__, models, utils +from aider.format_settings import format_settings from aider.args import get_parser from aider.coders import Coder from aider.commands import Commands, SwitchCoder @@ -132,22 +133,6 @@ def check_gitignore(git_root, io, ask=True): io.tool_output(f"Added {pat} to .gitignore") -def format_settings(parser, args): - show = scrub_sensitive_info(args, parser.format_values()) - # clean up the headings for consistency w/ new lines - heading_env = "Environment Variables:" - heading_defaults = "Defaults:" - if heading_env in show: - show = show.replace(heading_env, "\n" + heading_env) - show = show.replace(heading_defaults, "\n" + heading_defaults) - show += "\n" - show += "Option settings:\n" - for arg, val in sorted(vars(args).items()): - if val: - val = scrub_sensitive_info(args, str(val)) - show += f" - {arg}: {val}\n" # noqa: E221 - return show - def scrub_sensitive_info(args, text): # Replace sensitive information with last 4 characters