ai_refactor 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa9421b9791dda3c02b930e63d0fa7bd3dc587d121a0b3748a0f9d8c649f98a3
-  data.tar.gz: a5cb385968939847ebb1ceb1d663b1926e410fce0571fa2ab7463440347c0f50
+  metadata.gz: 725fb1da5fc311d3740687d97fa3b6c3c4292a3b531f467ea1d8ff9e734608bc
+  data.tar.gz: 4c16d310c643ae1158442816a9f863961ae151bb4ae486c965e96340342e2d44
 SHA512:
-  metadata.gz: 6ff997f0533fe95da7f0361789d88b4a73ecd8fbd82a1f54179fbce3b6a3b466c40330ae615a00f850e549212fe2463ba60ca4467cc0d9f65bbd6679f326dff1
-  data.tar.gz: 5898b17ebaa96c24a89cae1ff741a53d3afbb7a6c4844f52a271ddfecc1ebc1923026324601cb98e56b5aed0d673bba5d583d388a7a936e4cc86b272e1858bd8
+  metadata.gz: d0f380ef54a29be017b23c2caaa4491ee6304dc410e52ab6e11038b9f30c30a09a04597f3342332f464007e0e932f5b81112f712d46c584b2728d51bee61c036
+  data.tar.gz: 9ffa29857815cb73daef7d6902bf7301dc80e36361b0451d3d3df1b7921b1c0978ef16ea7963c544b893db1bd0d6db34120378aa6a7ae4ac5add0831e4b61dbf

data/CHANGELOG.md

@@ -1,5 +1,58 @@
-## [Unreleased]
+# AI Refactor Changelog
+
+## [0.4.0] - 2023-08-15
+
+### Added
+
+- Support for providing files as context for prompt.
+- Output path configuration made available to all refactors.
+- New refactor to write minitest tests for classes
+- New refactor to write changelog entries.
+- 'review' prompt CLI switch without invoking AI.
+- CLI switch to control output overwrite behaviour.
+- Extra text context for prompts via command line with -x
+- Support for .ai_refactor config file which can provide default options/switches for prompts.
+
+### Changed
+
+- Moved to using zeitwerk for loading and dotenv.
+- Simple registry for refactors and change in naming convention.
+- Updated diff prompt option and fixes for new structure.
+- Reorganised refactors.
+- Tweaked rspec to minitest prompt.
+- Fixed check for custom prompt path.
+- Updated docs.
+
+### Fixed
+
+- Fixed reference to built in prompt paths.
+
+## [0.3.1] - 2023-05-25
+
+### Added
+
+- Added support for outputting to file from generic refactor.
+
+## [0.2.0] - 2023-05-24
+
+### Added
+
+- Introduced a generic refactor type which uses the user supplied prompt and outputs to stdout.
+- Added support for outputting to file from generic refactor.
+- Added a prompt for rspec_to_minitest.
+
+### Fixed
+
+- Fixed example.
 
 ## [0.1.0] - 2023-05-19
 
-- Initial release
+### Added
+
+- First version of CLI.
+
+### Changed
+
+- Gem dependencies are not open-ended.
+- Renamed to clean up intention.
+- Updated docs.

data/Gemfile

@@ -10,3 +10,5 @@ gem "rake", "~> 13.0"
 gem "minitest", "~> 5.0"
 
 gem "standard", "~> 1.3"
+
+gem "dotenv"

data/Gemfile.lock

@@ -1,16 +1,18 @@
 PATH
   remote: .
   specs:
-    ai_refactor (0.3.0)
+    ai_refactor (0.4.0)
       colorize (< 2.0)
       open3 (< 2.0)
       ruby-openai (>= 3.4.0, < 5.0)
+      zeitwerk (~> 2.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
     colorize (0.8.1)
+    dotenv (2.8.1)
     faraday (2.7.4)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
@@ -62,12 +64,14 @@ GEM
       lint_roller (~> 1.0)
       rubocop-performance (~> 1.16.0)
     unicode-display_width (2.4.2)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   arm64-darwin-22
 
 DEPENDENCIES
   ai_refactor!
+  dotenv
   minitest (~> 5.0)
   rake (~> 13.0)
   standard (~> 1.3)

data/README.md

@@ -1,20 +1,24 @@
-# AI Refactor
+# AI Refactor for Ruby
 
-AI Refactor is an experimental tool to see how AI (specifically [OpenAI's ChatGPT](https://platform.openai.com/)) can be used to help apply refactoring to code.
+AI Refactor is an experimental tool to use AI to help apply refactoring to code.
 
-The goal is **not** that the AI decides what refactoring to do, but rather, given refactoring tasks specified by the human user,
-the AI can help identify which code to change and apply the relevant refactor.
+__The goal for AI Refactor is to help apply repetitive refactoring tasks, not to replace human mind that decides what refactoring is needed.__
 
-This is based on the assumption that the LLM AIs are pretty good at identifying patterns.
+AI Refactor currently uses [OpenAI's ChatGPT](https://platform.openai.com/).
+
+The tool lets the human user prompt the AI with explicit refactoring tasks, and can be run on one or more files at a time. 
+The tool then uses a LLM to apply the relevant refactor, and if appropriate, checks results by running tests and comparing output.
+
+The focus of the tool is work with the Ruby programming language ecosystem, but it can be used with any language. 
 
 ## Available refactors
 
 Currently available:
 
-- `generic`
-- `rspec_to_minitest_rails`
+- `rails/minitest/rspec_to_minitest`: convert RSpec specs to minitest tests in Rails apps
+- `generic`: provide your own prompt for the AI and run against the input files
 
-### `rspec_to_minitest_rails`
+### `rails/minitest/rspec_to_minitest`
 
 Converts RSpec tests to minitest tests for Rails test suites (ie generated minitest tests are actually `ActiveSupport::TestCase`s).
 
@@ -23,20 +27,17 @@ The tool first runs the original RSpec spec file and then runs the generated min
 The comparison is simply the count of successful and failed tests but this is probably enough to determine if the conversion worked.
 
 ```shellq
-stephen$ OPENAI_API_KEY=my-key ai_refactor rspec_to_minitest_rails spec/models/my_thing_spec.rb -v
-AI Refactor 1 files(s)/dir(s) '["spec/models/my_thing_spec.rb"]' with rspec_to_minitest_rails refactor
+stephen$ OPENAI_API_KEY=my-key ai_refactor rails/minitest/rspec_to_minitest spec/models/my_thing_spec.rb
+AI Refactor 1 files(s)/dir(s) '["spec/models/my_thing_spec.rb"]' with rails/minitest/rspec_to_minitest refactor
 ====================
 Processing spec/models/my_thing_spec.rb...
-[Run spec spec/models/my_thing_spec.rb... (bundle exec rspec spec/models/my_thing_spec.rb)]
-Do you wish to overwrite test/models/my_thing_test.rb? (y/n)
-y
-[Converting spec/models/my_thing_spec.rb...]
-[Generate AI output. Generation attempts left: 3]
-[OpenAI finished, with reason 'stop'...]
-[Used tokens: 1869]
-[Converted spec/models/my_thing_spec.rb to test/models/my_thing_test.rb...]
-[Run generated test file test/models/my_thing_test.rb (bundle exec rails test test/models/my_thing_test.rb)...]
-[Done converting spec/models/my_thing_spec.rb to test/models/my_thing_test.rb...]
+
+Original test run results:
+>> Examples: 41, Failures: 0, Pendings: 0
+
+Translated test file results:
+>> Runs: 41, Failures: 0, Skips: 0
+
 No differences found! Conversion worked!
 Refactor succeeded on spec/models/my_thing_spec.rb
 
@@ -47,7 +48,17 @@ Done processing all files!
 
 Applies the refactor specified by prompting the AI with the user supplied prompt. You must supply a prompt file with the `-p` option.
 
-The output is written to `stdout`.
+The output is written to `stdout`, or to a file with the `--output` option. 
+
+### `minitest/write_test_for_class`
+
+Writes a minitest test for a given class. The output will, by default, be put into a directory named `test` in the current directory,
+in a path that matches the input file path, with a `_test.rb` suffix.
+
+For example, if the input file is `app/stuff/my_thing.rb` the output will be written to `test/app/stuff/my_thing_test.rb`.
+
+This refactor can benefit from being passed related files as context, for example, if the class under test inherits from another class,
+then context can be used to provide the parent class.
 
 ## Installation
 
@@ -66,19 +77,52 @@ See `ai_refactor --help` for more information.
 ```
 Usage: ai_refactor REFACTOR_TYPE INPUT_FILE_OR_DIR [options]
 
-Where REFACTOR_TYPE is one of: ["generic", "rspec_to_minitest_rails", "minitest_to_rspec"]
+Where REFACTOR_TYPE is one of: ["generic" ... (run ai_refactor --help for full list of refactor types)]
 
+    -o, --output [FILE]              Write output to given file instead of stdout. If no path provided will overwrite input file (will prompt to overwrite existing files). Some refactor tasks will write out to a new file by default. This option will override the tasks default behaviour.
+    -O, --output-template TEMPLATE   Write outputs to files instead of stdout. The template is used to create the output name, where the it can have substitutions, '[FILE]', '[NAME]', '[DIR]', '[REFACTOR]' & '[EXT]'. Eg `[DIR]/[NAME]_[REFACTOR][EXT]` (will prompt to overwrite existing files)
+    -c, --context CONTEXT_FILES      Specify one or more files to use as context for the AI. The contents of these files will be prepended to the prompt sent to the AI.
+    -r, --review-prompt              Show the prompt that will be sent to ChatGPT but do not actually call ChatGPT or make changes to files.
     -p, --prompt PROMPT_FILE         Specify path to a text file that contains the ChatGPT 'system' prompt.
-    -c, --continue [MAX_MESSAGES]    If ChatGPT stops generating due to the maximum token count being reached, continue to generate more messages, until a stop condition or MAX_MESSAGES. MAX_MESSAGES defaults to 3
-    -m, --model MODEL_NAME           Specify a ChatGPT model to use (default gpt-3.5-turbo).
+    -f, --diffs                      Request AI generate diffs of changes rather than writing out the whole file.
+    -C, --continue [MAX_MESSAGES]    If ChatGPT stops generating due to the maximum token count being reached, continue to generate more messages, until a stop condition or MAX_MESSAGES. MAX_MESSAGES defaults to 3
+    -m, --model MODEL_NAME           Specify a ChatGPT model to use (default gpt-4).
         --temperature TEMP           Specify the temperature parameter for ChatGPT (default 0.7).
         --max-tokens MAX_TOKENS      Specify the max number of tokens of output ChatGPT can generate. Max will depend on the size of the prompt (default 1500)
     -t, --timeout SECONDS            Specify the max wait time for ChatGPT response.
+        --overwrite ANSWER           Always overwrite existing output files, 'y' for yes, 'n' for no, or 'a' for ask. Default to ask.
     -v, --verbose                    Show extra output and progress info
     -d, --debug                      Show debugging output to help diagnose issues
     -h, --help                       Prints this help
 ```
 
+## Outputs
+
+Some refactor tasks will write out to a new file by default, others to stdout.
+
+The `--output` lets you specify a file to write to instead of the Refactors default behaviour.
+
+If `--output` is used without a value it overwrites the input with a prompt to overwrite existing files.
+
+You can also output to a file using a template, `--output-template` to determine the output file name given a template string:
+
+The template is used to create the output name, where the it can have substitutions, '[FILE]', '[NAME]', '[DIR]', '[REFACTOR]' & '[EXT]'.
+
+Eg `--output-template "[DIR]/[NAME]_[REFACTOR][EXT]"`
+
+eg for the input `my_dir/my_class.rb`
+- `[FILE]`: `my_class.rb`
+- `[NAME]`: `my_class`
+- `[DIR]`: `my_dir`
+- `[REFACTOR]`: `generic`
+- `[EXT]`: `.rb`
+
+
+## Note on performance and ChatGPT version
+
+_The quality of results depend very much on the version of ChatGPT being used._
+
+I have tested with both 3.5 and 4 and see **significantly** better performance with version 4.
 
 ## Development
 

data/Rakefile

@@ -6,7 +6,7 @@ require "rake/testtask"
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
-  t.test_files = FileList["test/**/test_*.rb"]
+  t.test_files = FileList["test/**/*_test.rb"]
 end
 
 require "standard/rake"

data/ai_refactor.gemspec

@@ -32,4 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "colorize", "< 2.0"
   spec.add_dependency "open3", "< 2.0"
   spec.add_dependency "ruby-openai", ">= 3.4.0", "< 5.0"
+  spec.add_dependency "zeitwerk", "~> 2.6"
 end

data/exe/ai_refactor

@@ -3,26 +3,53 @@
 require "optparse"
 require "colorize"
 require "openai"
+require "shellwords"
 require_relative "../lib/ai_refactor"
 
+require "dotenv/load"
+
 options = {}
 
 supported_refactors = AIRefactor::Refactors.all
-supported_names = AIRefactor::Refactors.names
+descriptions = AIRefactor::Refactors.descriptions
 
 # General options for all refactor types
 option_parser = OptionParser.new do |parser|
-  parser.banner = "Usage: ai_refactor REFACTOR_TYPE INPUT_FILE_OR_DIR [options]\n\nWhere REFACTOR_TYPE is one of: #{supported_names}\n\n"
+  parser.banner = "Usage: ai_refactor REFACTOR_TYPE INPUT_FILE_OR_DIR [options]\n\nWhere REFACTOR_TYPE is one of: \n- #{descriptions.to_a.map { |refactor| refactor.join(": ") }.join("\n- ")}\n\n"
+
+  parser.on("-o", "--output [FILE]", String, "Write output to given file instead of stdout. If no path provided will overwrite input file (will prompt to overwrite existing files). Some refactor tasks will write out to a new file by default. This option will override the tasks default behaviour.") do |f|
+    options[:output_file_path] = f
+  end
+
+  parser.on("-O", "--output-template TEMPLATE", String, "Write outputs to files instead of stdout. The template is used to create the output name, where the it can have substitutions, '[FILE]', '[NAME]', '[DIR]', '[REFACTOR]' & '[EXT]'. Eg `[DIR]/[NAME]_[REFACTOR][EXT]` (will prompt to overwrite existing files)") do |t|
+    options[:output_template_path] = t
+  end
+
+  parser.on("-c", "--context CONTEXT_FILES", Array, "Specify one or more files to use as context for the AI. The contents of these files will be prepended to the prompt sent to the AI.") do |c|
+    options[:context_file_paths] = c
+  end
+
+  parser.on("-x", "--extra CONTEXT_TEXT", String, "Specify some text to be prepended to the prompt sent to the AI as extra information of note.") do |c|
+    options[:context_text] = c
+  end
+
+  parser.on("-r", "--review-prompt", "Show the prompt that will be sent to ChatGPT but do not actually call ChatGPT or make changes to files.") do
+    options[:review_prompt] = true
+  end
 
   parser.on("-p", "--prompt PROMPT_FILE", String, "Specify path to a text file that contains the ChatGPT 'system' prompt.") do |f|
     options[:prompt_file_path] = f
   end
 
-  parser.on("-c", "--continue [MAX_MESSAGES]", Integer, "If ChatGPT stops generating due to the maximum token count being reached, continue to generate more messages, until a stop condition or MAX_MESSAGES. MAX_MESSAGES defaults to 3") do |c|
+  parser.on("-f", "--diffs", "Request AI generate diffs of changes rather than writing out the whole file.") do
+    options[:diff] = true
+  end
+
+  parser.on("-C", "--continue [MAX_MESSAGES]", Integer, "If ChatGPT stops generating due to the maximum token count being reached, continue to generate more messages, until a stop condition or MAX_MESSAGES. MAX_MESSAGES defaults to 3") do |c|
     options[:ai_max_attempts] = c || 3
   end
 
-  parser.on("-m", "--model MODEL_NAME", String, "Specify a ChatGPT model to use (default gpt-3.5-turbo).") do |m|
+  parser.on("-m", "--model MODEL_NAME", String, "Specify a ChatGPT model to use (default gpt-4).") do |m|
     options[:ai_model] = m
   end
 
@@ -38,6 +65,14 @@ option_parser = OptionParser.new do |parser|
     options[:ai_timeout] = m
   end
 
+  parser.on("--overwrite ANSWER", "Always overwrite existing output files, 'y' for yes, 'n' for no, or 'a' for ask. Default to ask.") do |a|
+    options[:overwrite] = a
+  end
+
+  parser.on("-N", "--no", "Never overwrite existing output files, same as --overwrite=n.") do |a|
+    options[:overwrite] = "n"
+  end
+
   parser.on("-v", "--verbose", "Show extra output and progress info") do
     options[:verbose] = true
   end
@@ -53,6 +88,22 @@ option_parser = OptionParser.new do |parser|
 
   parser.separator ""
 
+  # Example in Refactor class:
+  #
+  # class << self
+  #   def command_line_options
+  #     [
+  #       {
+  #         key: :my_option_key,
+  #         short: "-s",
+  #         long: "--long-form-cli-param [FILE]",
+  #         type: String,
+  #         help: "help text"
+  #       },
+  #       ...
+  #     ]
+  #   end
+  # end
   supported_refactors.each do |name, refactorer|
     parser.separator "For refactor type '#{name}':" if refactorer.command_line_options.size.positive?
     refactorer.command_line_options.each do |option|
@@ -65,55 +116,38 @@ option_parser = OptionParser.new do |parser|
   end
 end
 
-option_parser.parse!
-
-logger = AIRefactor::Logger.new(verbose: options[:verbose], debug: options[:debug])
+# Load config from ~/.ai_refactor or .ai_refactor
+home_config_file_path = File.expand_path("~/.ai_refactor")
+local_config_file_path = File.join(Dir.pwd, ".ai_refactor")
 
-refactoring_type = ARGV.shift
-input_file_path = ARGV
+arguments = ARGV.dup
 
-if !AIRefactor::Refactors.supported?(refactoring_type) || input_file_path.nil? || input_file_path.empty?
-  puts option_parser.help
-  exit 1
+config_file_path = if File.exist?(local_config_file_path)
+  local_config_file_path
+elsif File.exist?(home_config_file_path)
+  home_config_file_path
 end
-
-OpenAI.configure do |config|
-  config.access_token = ENV.fetch("OPENAI_API_KEY")
-  config.organization_id = ENV.fetch("OPENAI_ORGANIZATION_ID", nil)
-  config.request_timeout = options[:ai_timeout] || 240
+if config_file_path
+  config_string = File.read(config_file_path)
+  config_lines = config_string.split(/\n+/).reject { |s| s =~ /\A\s*#/ }
+  arguments += config_lines.flat_map(&:shellsplit)
 end
 
-refactorer = AIRefactor::Refactors.get(refactoring_type)
+option_parser.parse!(arguments)
 
-inputs = input_file_path.map do |path|
-  File.exist?(path) ? path : Dir.glob(path)
-end.flatten
+logger = AIRefactor::Logger.new(verbose: options[:verbose], debug: options[:debug])
 
-logger.info "AI Refactor #{inputs.size} files(s)/dir(s) '#{input_file_path}' with #{refactorer.refactor_name} refactor\n"
-logger.info "====================\n"
+if config_file_path
+  logger.info "Loaded config from '#{config_file_path}'..."
+end
 
-return_values = inputs.map do |file|
-  logger.info "Processing #{file}..."
+job = ::AIRefactor::Cli.new(refactoring_type: arguments.shift, inputs: arguments, options: options, logger: logger)
 
-  refactor = refactorer.new(file, options, logger)
-  refactor_returned = refactor.run
-  failed = refactor_returned == false
-  if failed
-    logger.warn "Refactor failed on #{file}\nFailed due to: #{refactor.failed_message}\n"
-  else
-    logger.success "Refactor succeeded on #{file}\n"
-    if refactor_returned.is_a?(String)
-      logger.info "Refactor #{file} output:\n\n#{refactor_returned}\n\n"
-    end
-  end
-  failed ? [file, refactor.failed_message] : true
+unless job.valid?
+  puts option_parser.help
+  exit 1
 end
 
-if return_values.all?(true)
-  logger.success "All files processed successfully!"
-else
-  files = return_values.select { |v| v != true }
-  logger.warn "Some files failed to process:\n#{files.map { |f| "#{f[0]} :\n > #{f[1]}" }.join("\n")}"
+unless job.run
+  exit 1
 end
-
-logger.info "Done processing all files!"

data/lib/ai_refactor/cli.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module AIRefactor
+  class Cli
+    def initialize(refactoring_type:, inputs:, options:, logger:)
+      @refactoring_type = refactoring_type
+      @inputs = inputs
+      @options = options
+      @logger = logger
+    end
+
+    attr_reader :refactoring_type, :inputs, :options, :logger
+
+    def valid?
+      return false unless refactorer
+      inputs_valid = refactorer.takes_input_files? ? !(inputs.nil? || inputs.empty?) : true
+      AIRefactor::Refactors.supported?(refactoring_type) && inputs_valid
+    end
+
+    def run
+      return false unless valid?
+
+      OpenAI.configure do |config|
+        config.access_token = ENV.fetch("OPENAI_API_KEY")
+        config.organization_id = ENV.fetch("OPENAI_ORGANIZATION_ID", nil)
+        config.request_timeout = options[:ai_timeout] || 240
+      end
+
+      if refactorer.takes_input_files?
+        expanded_inputs = inputs.map do |path|
+          File.exist?(path) ? path : Dir.glob(path)
+        end.flatten
+
+        logger.info "AI Refactor #{expanded_inputs.size} files(s)/dir(s) '#{expanded_inputs}' with #{refactorer.refactor_name} refactor\n"
+        logger.info "====================\n"
+
+        return_values = expanded_inputs.map do |file|
+          logger.info "Processing #{file}..."
+
+          refactor = refactorer.new(file, options, logger)
+          refactor_returned = refactor.run
+          failed = refactor_returned == false
+          if failed
+            logger.warn "Refactor failed on #{file}\nFailed due to: #{refactor.failed_message}\n"
+          else
+            logger.success "Refactor succeeded on #{file}\n"
+            if refactor_returned.is_a?(String)
+              logger.info "Refactor #{file} output:\n\n#{refactor_returned}\n\n"
+            end
+          end
+          failed ? [file, refactor.failed_message] : true
+        end
+
+        if return_values.all?(true)
+          logger.success "All files processed successfully!"
+        else
+          files = return_values.select { |v| v != true }
+          logger.warn "Some files failed to process:\n#{files.map { |f| "#{f[0]} :\n > #{f[1]}" }.join("\n")}"
+        end
+
+        logger.info "Done processing all files!"
+      else
+        name = refactorer.refactor_name
+        logger.info "AI Refactor - #{name} refactor\n"
+        logger.info "====================\n"
+        refactor = refactorer.new(nil, options, logger)
+        refactor_returned = refactor.run
+        failed = refactor_returned == false
+        if failed
+          logger.warn "Refactor failed with #{name}\nFailed due to: #{refactor.failed_message}\n"
+        else
+          logger.success "Refactor succeeded with #{name}\n"
+          if refactor_returned.is_a?(String)
+            logger.info "Refactor output:\n\n#{refactor_returned}\n\n"
+          end
+        end
+      end
+    end
+
+    private
+
+    def refactorer
+      @refactorer ||= AIRefactor::Refactors.get(refactoring_type)
+    end
+  end
+end

data/lib/ai_refactor/context.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module AIRefactor
+  class Context
+    def initialize(files:, text:, logger:)
+      @files = files
+      @text = text
+      @logger = logger
+    end
+
+    def prepare_context
+      context = read_contexts&.compact
+      file_context = (context && context.size.positive?) ? "Here is some related files:\n\n#{context.join("\n")}" : ""
+      if @text.nil? || @text.empty?
+        file_context
+      else
+        "Also note: #{@text}\n\n#{file_context}"
+      end
+    end
+
+    private
+
+    def read_contexts
+      @files&.map do |file|
+        unless File.exist?(file)
+          @logger.warn "Context file #{file} does not exist"
+          next
+        end
+        "#---\n# File '#{file}':\n\n```#{File.read(file)}```\n"
+      end
+    end
+  end
+end

data/lib/ai_refactor/file_processor.rb

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
 
+require "fileutils"
 require "openai"
 require "json"
 
 module AIRefactor
   class FileProcessor
-    attr_reader :file_path, :output_path, :logger
+    attr_reader :input_file_path, :output_path, :logger, :options
 
-    def initialize(input_path:, prompt_file_path:, ai_client:, logger:, output_path: nil)
-      @file_path = input_path
-      @prompt_file_path = prompt_file_path
+    def initialize(prompt:, ai_client:, logger:, output_path: nil, options: {})
+      @prompt = prompt
       @ai_client = ai_client
       @logger = logger
       @output_path = output_path
+      @options = options
     end
 
     def output_exists?
@@ -20,20 +21,26 @@ module AIRefactor
       File.exist?(output_path)
     end
 
-    def process!(options)
-      logger.debug("Processing #{file_path} with prompt in #{@prompt_file_path}")
-      prompt = File.read(@prompt_file_path)
-      input = File.read(@file_path)
-      messages = [
-        {role: "system", content: prompt},
-        {role: "user", content: "Convert: ```#{input}```"}
-      ]
-      content, finished_reason, usage = generate_next_message(messages, prompt, options, options[:ai_max_attempts] || 3)
+    def process!
+      logger.debug("Processing #{@prompt.input_file_path} with prompt in #{@prompt.prompt_file_path}")
+      logger.debug("Options: #{options.inspect}")
+      messages = @prompt.chat_messages
+      if options[:review_prompt]
+        logger.info "Review prompt:\n"
+        messages.each do |message|
+          logger.info "\n-- Start of prompt for Role #{message[:role]} --\n"
+          logger.info message[:content]
+          logger.info "\n-- End of prompt for Role #{message[:role]} --\n"
+        end
+        return [nil, "Skipped as review prompt was requested", nil]
+      end
+
+      content, finished_reason, usage = generate_next_message(messages, options, ai_max_attempts)
 
       content = if content && content.length > 0
         processed = block_given? ? yield(content) : content
         if output_path
-          File.write(output_path, processed)
+          write_output(output_path, processed)
           logger.verbose "Wrote output to #{output_path}..."
         end
         processed
@@ -44,14 +51,18 @@ module AIRefactor
 
     private
 
-    def generate_next_message(messages, prompt, options, attempts_left)
+    def ai_max_attempts
+      options[:ai_max_attempts] || 1
+    end
+
+    def generate_next_message(messages, options, attempts_left)
       logger.verbose "Generate AI output. Generation attempts left: #{attempts_left}"
       logger.debug "Options: #{options.inspect}"
       logger.debug "Messages: #{messages.inspect}"
 
       response = @ai_client.chat(
         parameters: {
-          model: options[:ai_model] || "gpt-3.5-turbo",
+          model: options[:ai_model] || "gpt-4",
           messages: messages,
           temperature: options[:ai_temperature] || 0.7,
           max_tokens: options[:ai_max_tokens] || 1500
@@ -69,7 +80,7 @@ module AIRefactor
         generate_next_message(messages + [
           {role: "assistant", content: content},
           {role: "user", content: "Continue"}
-        ], prompt, options, attempts_left - 1)
+        ], options, attempts_left - 1)
       else
         previous_messages = messages.filter { |m| m[:role] == "assistant" }.map { |m| m[:content] }.join
         content = if previous_messages.length > 0
@@ -80,5 +91,11 @@ module AIRefactor
         [content, finished_reason, response["usage"]]
       end
     end
+
+    def write_output(output_path, processed)
+      dir = File.dirname(output_path)
+      FileUtils.mkdir_p(dir) unless File.directory?(dir)
+      File.write(output_path, processed)
+    end
   end
 end