From 4ff5b0e115284331cceb528fc717f48130a5f81e Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Fri, 12 May 2023 13:55:03 -0700 Subject: [PATCH] Refactor InputOutput class to accept history_file as an argument and remove it from get_input method. --- aider/coder.py | 7 +++---- aider/getinput.py | 7 ++++--- aider/main.py | 6 ++++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/aider/coder.py b/aider/coder.py index 16c786f73..44620cd92 100755 --- a/aider/coder.py +++ b/aider/coder.py @@ -29,12 +29,11 @@ class Coder: last_aider_commit_hash = None last_asked_for_commit_time = 0 - def __init__(self, main_model, fnames, pretty, history_file, show_diffs, auto_commits, yes): + def __init__(self, main_model, fnames, pretty, show_diffs, auto_commits, io): self.abs_fnames = set() - self.io = getinput.InputOutput(pretty, yes) + self.io = io - self.history_file = history_file self.auto_commits = auto_commits if pretty: @@ -196,7 +195,7 @@ class Coder: return True def run_loop(self): - inp = self.io.get_input(self.history_file, self.abs_fnames, self.commands) + inp = self.io.get_input(self.abs_fnames, self.commands) self.num_control_c = 0 diff --git a/aider/getinput.py b/aider/getinput.py index 873910aed..df911e0c0 100644 --- a/aider/getinput.py +++ b/aider/getinput.py @@ -52,9 +52,10 @@ class FileContentCompleter(Completer): class InputOutput: - def __init__(self, pretty, yes): + def __init__(self, pretty, yes, history_file): self.pretty = pretty self.yes = yes + self.history_file = history_file if pretty: self.console = Console() @@ -74,7 +75,7 @@ class InputOutput: console.print() return input_line - def get_input(self, history_file, fnames, commands): + def get_input(self, fnames, commands): if self.pretty: self.console.rule() else: @@ -112,7 +113,7 @@ class InputOutput: line = prompt( show, completer=completer_instance, - history=FileHistory(history_file), + history=FileHistory(self.history_file), style=style, reserve_space_for_menu=4, complete_style=CompleteStyle.MULTI_COLUMN, diff --git a/aider/main.py b/aider/main.py index 6692219cd..8276fe545 100644 --- a/aider/main.py +++ b/aider/main.py @@ -3,7 +3,7 @@ import sys import argparse from dotenv import load_dotenv from aider.coder import Coder - +from aider.getinput import InputOutput def main(args=None): if args is None: @@ -75,8 +75,10 @@ def main(args=None): fnames = args.files pretty = args.pretty + io = InputOutput(args.pretty, args.yes, args.history_file) + coder = Coder( - args.model, fnames, pretty, args.history_file, args.show_diffs, args.auto_commits, args.yes + args.model, fnames, pretty, args.show_diffs, args.auto_commits, io, ) coder.commit(ask=True, prefix="wip: ", which="repo_files")