aia 0.3.20 → 0.4.2

data/lib/aia/main.rb

@@ -4,7 +4,8 @@ module AIA ; end
 
 require_relative 'config'
 require_relative 'cli'
-require_relative 'prompt_processing'
+require_relative 'directives'
+require_relative 'prompt'
 require_relative 'logging'
 require_relative 'tools'
 
@@ -12,26 +13,58 @@ require_relative 'tools'
 # of a single class.
 
 class AIA::Main
-  include AIA::PromptProcessing
 
-  attr_accessor :logger, :tools
+  attr_accessor :logger, :tools, :backend
+
+  def initialize(args= ARGV)    
+    AIA::Tools.load_tools
 
-  def initialize(args= ARGV)
     AIA::Cli.new(args)
 
     @logger = AIA::Logging.new(AIA.config.log_file)
-    AIA::Tools.load_tools
+
+    @logger.info(AIA.config) if AIA.config.debug? || AIA.config.verbose?
+
+    @prompt = AIA::Prompt.new.prompt
+
+    @engine = AIA::Directives.new(prompt: @prompt)
 
     # TODO: still should verify that the tools are ion the $PATH
     # tools.class.verify_tools
   end
 
 
+  def speak(what)
+    return unless AIA.config.speak?
+    # MacOS uses the say command
+    system "say #{Shellwords.escape(what)}"
+  end
+
+
+  # Function to setup the Reline history with a maximum depth
+  def setup_reline_history(max_history_size=5)
+    Reline::HISTORY.clear
+    # Reline::HISTORY.max_size = max_history_size
+  end
+
+
+  # Function to prompt the user with a question using reline
+  def ask_question_with_reline(prompt)
+    answer = Reline.readline(prompt)
+    Reline::HISTORY.push(answer) unless answer.nil? || Reline::HISTORY.to_a.include?(answer)
+    answer
+    rescue Interrupt
+      ''
+  end
+
+
   def call
-    get_prompt
-    process_prompt
-    
-    # send_prompt_to_external_command
+    @engine.execute_my_directives
+
+    if AIA.config.chat?
+      AIA.config.output_file = STDOUT 
+      AIA.config.extra = "--quiet" if 'mods' == AIA.config.backend
+    end
 
     # TODO: the context_files left in the @arguments array
     #       should be verified BEFORE asking the user for a
@@ -56,15 +89,63 @@ class AIA::Main
 
     abort "backend not found: #{AIA.config.backend}" if backend_klass.nil?
 
-    backend = backend_klass.new(
-                text:           @prompt.to_s,
-                files:          AIA.config.arguments    # FIXME: want validated context files
-              )
+    the_prompt = @prompt.to_s
+
+    if AIA.config.terse?
+      the_prompt.prepend "Be terse in your response. "
+    end
+
+    @backend  = backend_klass.new(
+                  text:           the_prompt,
+                  files:          AIA.config.arguments    # FIXME: want validated context files
+                )
+
 
     result  = backend.run
 
     AIA.config.output_file.write result
 
     logger.prompt_result(@prompt, result)
+
+
+    if AIA.config.chat?
+      setup_reline_history
+      speak result
+      lets_chat 
+    end
+  end
+
+
+  def lets_chat
+    if 'mods' == AIA.config.backend
+      AIA.config.extra += " -C"
+    end
+    
+    backend.text = ask_question_with_reline("\nFollow Up: ")
+    
+    until backend.text.empty?
+      if AIA.config.terse?
+        backend.text.prepend "Be terse in your response. "
+      end
+      
+      logger.info "Follow Up: #{backend.text}"
+      response = backend.run
+      
+      speak response
+
+      puts "\nResponse: #{response}"
+      logger.info "Response: #{backend.run}"
+  
+      # TODO: Allow user to enter a directive; loop
+      #       until answer is not a directive
+      #
+      # while !directive do
+      backend.text = ask_question_with_reline("\nFollow Up: ")
+      
+      speak backend.text
+
+      # execute the directive
+      # end
+    end
   end
 end

data/lib/aia/prompt.rb

@@ -0,0 +1,279 @@
+# lib/aia/prompt.rb
+
+require 'reline'
+
+class AIA::Prompt
+  #
+  # used when no prompt_id is provided but there
+  # are extra parameters that need to be passed
+  # to the backend.  For example "aia -- --settings"
+  #
+  class Fake
+    def id          = '_fake_'
+    def path        = '_fake_'
+    def keywords    = []
+    def directives  = []
+    def to_s        = ''
+  end
+
+  KW_HISTORY_MAX = 5
+
+  attr_reader :prompt
+
+  # setting build: false supports unit testing.
+  def initialize(build: true)
+    if AIA.config.role.empty?
+      @role = nil
+    else
+      AIA.config.arguments.prepend AIA.config.role
+      get_prompt
+      @role = @prompt.dup
+    end
+
+    get_prompt
+
+    unless @role.nil?
+      @prompt.text.prepend @role.text
+    end
+
+    process_prompt if build
+  end
+
+
+  # Fetch the first argument which should be the prompt id
+  def get_prompt
+    prompt_id = AIA.config.arguments.shift
+
+    unless prompt_id
+      if AIA.config.extra.empty?
+        abort("Please provide a prompt id") 
+      else
+        @prompt = Fake.new
+        return
+      end
+    end
+
+    search_for_a_matching_prompt(prompt_id) unless existing_prompt?(prompt_id)
+    edit_prompt if AIA.config.edit?
+  end
+
+
+  # Check if a prompt with the given id already exists.  If so, use it.
+  def existing_prompt?(prompt_id)
+    @prompt = PromptManager::Prompt.get(id: prompt_id)
+    true
+  rescue ArgumentError
+    false
+  end
+
+
+  # Process the prompt's associated keywords and parameters
+  def process_prompt
+    unless @prompt.keywords.empty?
+      replace_keywords
+      @prompt.build
+      @prompt.save
+    end
+  end
+
+
+  def replace_keywords
+    puts
+    puts "ID: #{@prompt.id}"
+    
+    show_prompt_without_comments
+
+    puts "\nPress up/down arrow to scroll through history."
+    puts "Type new input or edit the current input."
+    puts  "Quit #{MY_NAME} with a CNTL-D or a CNTL-C"
+    puts
+    @prompt.keywords.each do |kw|
+      value = keyword_value(kw, @prompt.parameters[kw])
+      
+      unless value.nil? || value.strip.empty?
+        value_inx = @prompt.parameters[kw].index(value)
+        
+        if value_inx
+          @prompt.parameters[kw].delete_at(value_inx)
+        end
+
+        # The most recent value for this kw will always be
+        # in the last position
+        @prompt.parameters[kw] << value
+        @prompt.parameters[kw].shift if @prompt.parameters[kw].size > KW_HISTORY_MAX
+      end
+    end
+  end
+
+
+  # Function to setup the Reline history with a maximum depth
+  def setup_reline_history(max_history_size=5)
+    Reline::HISTORY.clear
+    # Reline::HISTORY.max_size = max_history_size
+  end
+
+
+  # Function to prompt the user with a question using reline
+  def ask_question_with_reline(prompt)
+    answer = Reline.readline(prompt)
+    Reline::HISTORY.push(answer) unless answer.nil? || Reline::HISTORY.to_a.include?(answer)
+    answer
+    rescue Interrupt
+      ''
+  end
+
+
+  # query the user for a value to the keyword allow the
+  # reuse of the previous value shown as the default
+  #
+  # FIXME:  Ruby v3.3.0 drops readline in favor or reline
+  #         internally it redirects "require 'readline'" to Reline
+  #         puts lipstick on the pig so that you can continue to
+  #         use the Readline namespace
+  #
+  def keyword_value(kw, history_array)
+    setup_reline_history
+    
+    default = history_array.last
+
+    Array(history_array).each { |entry| Reline::HISTORY.push(entry) unless entry.nil? || entry.empty? }
+
+    puts "Parameter #{kw} ..."
+
+    if default&.empty?
+      user_prompt = "\n-=> "
+    else
+      user_prompt = "\n(#{default}) -=>"
+    end
+
+    a_string = ask_question_with_reline(user_prompt)
+
+    if a_string.nil?
+      puts "okay. Come back soon."
+      exit
+    end
+
+    puts
+    a_string.empty? ? default : a_string
+  end
+
+
+  # Search for a prompt with a matching id or keyword
+  def search_for_a_matching_prompt(prompt_id)
+    # TODO: using the rgfzf version of the search_proc should only
+    #       return a single prompt_id
+    found_prompts = PromptManager::Prompt.search(prompt_id)
+
+    if found_prompts.empty?
+      if AIA.config.edit?
+        create_prompt(prompt_id)
+        edit_prompt
+      else
+        abort <<~EOS
+          
+          No prompts where found for: #{prompt_id}
+          To create a prompt with this ID use the --edit option
+          like this:
+            #{MY_NAME} #{prompt_id} --edit
+
+        EOS
+      end
+    else    
+      prompt_id     = 1 == found_prompts.size ? found_prompts.first : handle_multiple_prompts(found_prompts, prompt_id)
+      @prompt       = PromptManager::Prompt.get(id: prompt_id)
+    end
+  end
+
+
+  def handle_multiple_prompts(found_these, while_looking_for_this)
+    raise ArgumentError, "Argument is not an Array" unless found_these.is_a?(Array)
+    
+    # TODO: Make this a class constant for defaults; make the header content
+    #       a parameter so it can be varied.
+    fzf_options       = [
+      "--tabstop=2",  # 2 soaces for a tab
+      "--header='Prompt IDs which contain: #{while_looking_for_this}\nPress ESC to cancel.'",
+      "--header-first",
+      "--prompt='Search term: '",
+      '--delimiter :',
+      "--preview 'cat $PROMPTS_DIR/{1}.txt'",
+      "--preview-window=down:50%:wrap"
+    ].join(' ') 
+
+
+    # Create a temporary file to hold the list of strings
+    temp_file = Tempfile.new('fzf-input')
+
+    begin
+      # Write all strings to the temp file
+      temp_file.puts(found_these)
+      temp_file.close
+
+      # Execute fzf command-line utility to allow selection
+      selected = `cat #{temp_file.path} | fzf #{fzf_options}`.strip
+
+      # Check if fzf actually returned a string; if not, return nil
+      result = selected.empty? ? nil : selected
+    ensure
+      # Ensure that the tempfile is closed and unlinked
+      temp_file.unlink
+    end
+
+    exit unless result
+
+    result
+  end
+
+
+  def create_prompt(prompt_id)
+    @prompt = PromptManager::Prompt.create(id: prompt_id)
+    # TODO: consider a configurable prompt template
+    #       ERB ???
+  end
+
+
+  def edit_prompt
+    # FIXME: replace with the editor from the configuration
+    
+    @editor   = AIA::Subl.new(
+                  file: @prompt.path
+                )
+    
+    @editor.run # blocks until file is closed
+
+    AIA.config[:edit?] = false # turn off the --edit switch
+
+    # reload the edited prompt
+    @prompt = PromptManager::Prompt.get(id: @prompt.id)
+  end
+
+
+  def show_prompt_without_comments
+    puts remove_comments.wrap(indent: 4)
+  end
+
+
+  # removes comments and directives
+  def remove_comments
+    lines           = @prompt.text
+                        .split("\n")
+                        .reject{|a_line| 
+                          a_line.strip.start_with?('#') ||
+                          a_line.strip.start_with?('//')
+                        }
+
+    # Remove empty lines at the start of the prompt
+    #
+    lines = lines.drop_while(&:empty?)
+
+    # Drop all the lines at __END__ and after
+    #
+    logical_end_inx = lines.index("__END__")
+
+    if logical_end_inx
+      lines[0...logical_end_inx] # NOTE: ... means to not include last index
+    else
+      lines
+    end.join("\n") 
+  end
+end

data/lib/aia/tools/backend_common.rb

@@ -0,0 +1,76 @@
+# aia/lib/aia/tools/backend_common.rb
+
+# Used by both the AIA::Mods and AIA::Sgpt classes
+
+module AIA::BackendCommon
+  attr_accessor :command, :text, :files, :parameters
+
+  def initialize(text: "", files: [])
+    @text       = text
+    @files      = files
+    @parameters = self.class::DEFAULT_PARAMETERS.dup
+    build_command
+  end
+
+  def sanitize(input)
+    Shellwords.escape(input)
+  end
+  def build_command
+    @parameters += " --model #{AIA.config.model} " if AIA.config.model
+    @parameters += AIA.config.extra
+
+    set_parameter_from_directives
+
+    @command = "#{meta.name} #{@parameters} "
+    @command += sanitize(text)
+
+    puts @command if AIA.config.debug?
+
+    @command
+  end
+
+  def set_parameter_from_directives
+    AIA.config.directives.each do |entry|
+      directive, value = entry
+      if self.class::DIRECTIVES.include?(directive)
+        @parameters += " --#{directive} #{sanitize(value)}" unless @parameters.include?(directive)
+      end
+    end
+  end
+
+  def run
+    case @files.size
+    when 0
+      @result = `#{build_command}`
+    when 1
+      @result = `#{build_command} < #{@files.first}`
+    else
+      create_temp_file_with_contexts
+      run_with_temp_file
+      clean_up_temp_file
+    end
+
+    @result
+  end
+
+  def create_temp_file_with_contexts
+    @temp_file = Tempfile.new("#{self.class::COMMAND_NAME}-context")
+
+    @files.each do |file|
+      content = File.read(file)
+      @temp_file.write(content)
+      @temp_file.write("\n")
+    end
+
+    @temp_file.close
+  end
+
+  def run_with_temp_file
+    command = "#{build_command} < #{@temp_file.path}"
+    @result = `#{command}`
+  end
+
+  def clean_up_temp_file
+    @temp_file.unlink if @temp_file
+  end
+end

data/lib/aia/tools/mods.rb

@@ -1,6 +1,9 @@
 # lib/aia/tools/mods.rb
 
+require_relative 'backend_common'
+
 class AIA::Mods < AIA::Tools
+  include AIA::BackendCommon
 
   meta(
     name:     'mods',
@@ -12,141 +15,67 @@ class AIA::Mods < AIA::Tools
 
   
   DEFAULT_PARAMETERS = [
+    # "--no-cache",           # do not save prompt and response
     "--no-limit"              # no limit on input context
   ].join(' ').freeze
 
-  attr_accessor :command, :text, :files
-
-
-  def initialize(
-      text:           "", # prompt text after keyword replacement
-      files:          []  # context file paths (Array of Pathname)
-    )
-
-    @text           = text
-    @files          = files
-
-    build_command
-  end
-
-
-  def sanitize(input)
-    Shellwords.escape(input)
-  end
-
-
-  def build_command
-    parameters  = DEFAULT_PARAMETERS.dup + " "
-    parameters += "-f "                     if AIA.config.markdown?
-    parameters += "-m #{AIA.config.model} " if AIA.config.model
-    parameters += AIA.config.extra
-    @command    = "mods #{parameters} "
-    @command   += sanitize(@text)
-
-    # context = @files.join(' ')
-    #
-    # unless context.empty?
-    #   if @files.size > 1
-    #     # FIXME:  This syntax breaks mods which does not know how
-    #     #         to read the temporary file descriptor created
-    #     #         by the shell
-    #     @command += " <(cat #{context})"
-    #   else
-    #     @command += " < #{context}"
-    #   end
-    # end
-
-    @command
-  end
-
 
-  def run
-    case @files.size
-    when 0
-      @result = `#{build_command}`
-    when 1
-      @result = `#{build_command} < #{@files.first}`
-    else
-      create_temp_file_with_contexts
-      run_mods_with_temp_file
-      clean_up_temp_file
-    end
-    
-    @result
-  end
-  
-  
-  # Create a temporary file that concatenates all contexts,
-  # to be used as STDIN for the 'mods' utility
-  def create_temp_file_with_contexts
-    @temp_file = Tempfile.new('mods-context')
-
-    @files.each do |file|
-      content = File.read(file)
-      @temp_file.write(content)
-      @temp_file.write("\n")
-    end
-
-    @temp_file.close
-  end
-  
-
-  # Run 'mods' with the temporary file as STDIN
-  def run_mods_with_temp_file
-    command = "#{build_command} < #{@temp_file.path}"
-    @result = `#{command}`
-  end
-  
-
-  # Clean up the temporary file after use
-  def clean_up_temp_file
-    @temp_file.unlink if @temp_file
-  end
+  DIRECTIVES = %w[
+    api        
+    fanciness  
+    http-proxy 
+    max-retries
+    max-tokens 
+    no-cache
+    no-limit  
+    quiet      
+    raw        
+    status-text
+    temp       
+    title      
+    topp       
+  ]
 end
 
 __END__
 
 
-    
-
-
 ##########################################################
 
-
 GPT on the command line. Built for pipelines.
 
 Usage:
   mods [OPTIONS] [PREFIX TERM]
 
 Options:
-  -m, --model                                  Default model (gpt-3.5-turbo, gpt-4, ggml-gpt4all-j...).
-  -a, --api                                    OpenAI compatible REST API (openai, localai).
-  -x, --http-proxy                             HTTP proxy to use for API requests.
-  -f, --format                                 Ask for the response to be formatted as markdown unless otherwise set.
-  -r, --raw                                    Render output as raw text when connected to a TTY.
-  -P, --prompt                                 Include the prompt from the arguments and stdin, truncate stdin to specified number of lines.
-  -p, --prompt-args                            Include the prompt from the arguments in the response.
-  -c, --continue                               Continue from the last response or a given save title.
-  -C, --continue-last                          Continue from the last response.
-  -l, --list                                   Lists saved conversations.
-  -t, --title                                  Saves the current conversation with the given title.
-  -d, --delete                                 Deletes a saved conversation with the given title or ID.
-  -s, --show                                   Show a saved conversation with the given title or ID.
-  -S, --show-last                              Show a the last saved conversation.
-  -q, --quiet                                  Quiet mode (hide the spinner while loading and stderr messages for success).
-  -h, --help                                   Show help and exit.
-  -v, --version                                Show version and exit.
-  --max-retries                                Maximum number of times to retry API calls.
-  --no-limit                                   Turn off the client-side limit on the size of the input into the model.
-  --max-tokens                                 Maximum number of tokens in response.
-  --temp                                       Temperature (randomness) of results, from 0.0 to 2.0.
-  --topp                                       TopP, an alternative to temperature that narrows response, from 0.0 to 1.0.
-  --fanciness                                  Your desired level of fanciness.
-  --status-text                                Text to show while generating.
-  --no-cache                                   Disables caching of the prompt/response.
-  --reset-settings                             Backup your old settings file and reset everything to the defaults.
-  --settings                                   Open settings in your $EDITOR.
-  --dirs                                       Print the directories in which mods store its data
+  -m, --model           Default model (gpt-3.5-turbo, gpt-4, ggml-gpt4all-j...).
+  -a, --api             OpenAI compatible REST API (openai, localai).
+  -x, --http-proxy      HTTP proxy to use for API requests.
+  -f, --format          Ask for the response to be formatted as markdown unless otherwise set.
+  -r, --raw             Render output as raw text when connected to a TTY.
+  -P, --prompt          Include the prompt from the arguments and stdin, truncate stdin to specified number of lines.
+  -p, --prompt-args     Include the prompt from the arguments in the response.
+  -c, --continue        Continue from the last response or a given save title.
+  -C, --continue-last   Continue from the last response.
+  -l, --list            Lists saved conversations.
+  -t, --title           Saves the current conversation with the given title.
+  -d, --delete          Deletes a saved conversation with the given title or ID.
+  -s, --show            Show a saved conversation with the given title or ID.
+  -S, --show-last       Show a the last saved conversation.
+  -q, --quiet           Quiet mode (hide the spinner while loading and stderr messages for success).
+  -h, --help            Show help and exit.
+  -v, --version         Show version and exit.
+  --max-retries         Maximum number of times to retry API calls.
+  --no-limit            Turn off the client-side limit on the size of the input into the model.
+  --max-tokens          Maximum number of tokens in response.
+  --temp                Temperature (randomness) of results, from 0.0 to 2.0.
+  --topp                TopP, an alternative to temperature that narrows response, from 0.0 to 1.0.
+  --fanciness           Your desired level of fanciness.
+  --status-text         Text to show while generating.
+  --no-cache            Disables caching of the prompt/response.
+  --reset-settings      Backup your old settings file and reset everything to the defaults.
+  --settings            Open settings in your $EDITOR.
+  --dirs                Print the directories in which mods store its data
 
 Example:
   # Editorialize your video files