askcii 0.1.0 → 0.3.0

data/lib/askcii/cli.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+require 'optparse'
+
+module Askcii
+  class CLI
+    attr_reader :options, :prompt
+
+    def initialize(args = ARGV.dup)
+      @args = args
+      @options = {}
+      @prompt = nil
+    end
+
+    def parse!
+      option_parser.parse!(@args)
+      @prompt = @args.join(' ')
+      self
+    end
+
+    def show_help?
+      @options[:help]
+    end
+
+    def show_usage?
+      false # Usage logic is now handled in Application class
+    end
+
+    def configure?
+      @options[:configure]
+    end
+
+    def last_response?
+      @options[:last_response]
+    end
+
+    def private?
+      @options[:private]
+    end
+
+    def model_config_id
+      @options[:model_config_id]
+    end
+
+    def help_message
+      option_parser.to_s
+    end
+
+    def usage_message
+      <<~USAGE
+        Usage:
+          askcii [options] 'Your prompt here'
+          echo 'Your prompt here' | askcii                    # Use piped text as prompt
+          echo 'Context text' | askcii 'Your prompt here'     # Use piped text as context
+          askcii 'Your prompt here' < prompt.txt              # Use file content as context
+          cat prompt.txt | askcii                             # Use file content as prompt
+          askcii -p (start a private session)
+          askcii -r (to get the last response)
+          askcii -c (manage configurations)
+          askcii -m 2 (use configuration ID 2)
+
+        Options:
+          -p, --private         Start a private session and do not record
+          -r, --last-response   Output the last response
+          -c, --configure       Manage configurations
+          -m, --model ID        Use specific configuration ID
+          -h, --help            Show help
+      USAGE
+    end
+
+    private
+
+    def option_parser
+      @option_parser ||= OptionParser.new do |opts|
+        opts.banner = "Usage: askcii [options] 'Your prompt here'"
+
+        opts.on('-p', '--private', 'Start a private session and do not record') do
+          @options[:private] = true
+        end
+
+        opts.on('-r', '--last-response', 'Output the last response') do
+          @options[:last_response] = true
+        end
+
+        opts.on('-c', '--configure', 'Manage configurations') do
+          @options[:configure] = true
+        end
+
+        opts.on('-m', '--model ID', 'Use specific configuration ID') do |model_id|
+          @options[:model_config_id] = model_id
+        end
+
+        opts.on('-h', '--help', 'Show this help message') do
+          @options[:help] = true
+        end
+      end
+    end
+  end
+end

data/lib/askcii/configuration_manager.rb

@@ -0,0 +1,285 @@
+# frozen_string_literal: true
+
+module Askcii
+  class ConfigurationManager
+    PROVIDER_MAP = {
+      '1' => 'openai',
+      '2' => 'anthropic',
+      '3' => 'gemini',
+      '4' => 'deepseek',
+      '5' => 'openrouter',
+      '6' => 'ollama'
+    }.freeze
+
+    DEFAULT_ENDPOINTS = {
+      'openai' => 'https://api.openai.com/v1',
+      'anthropic' => 'https://api.anthropic.com',
+      'gemini' => 'https://generativelanguage.googleapis.com/v1',
+      'deepseek' => 'https://api.deepseek.com/v1',
+      'openrouter' => 'https://openrouter.ai/api/v1',
+      'ollama' => 'http://localhost:11434/v1'
+    }.freeze
+
+    PROVIDER_MODELS = {
+      'openai' => {
+        default: 'gpt-4o',
+        models: [
+          'gpt-4o',
+          'gpt-4o-mini',
+          'gpt-4-turbo',
+          'gpt-4',
+          'gpt-3.5-turbo'
+        ]
+      },
+      'anthropic' => {
+        default: 'claude-3-5-sonnet-20241022',
+        models: [
+          'claude-3-5-sonnet-20241022',
+          'claude-3-5-haiku-20241022',
+          'claude-3-opus-20240229',
+          'claude-3-sonnet-20240229',
+          'claude-3-haiku-20240307'
+        ]
+      },
+      'gemini' => {
+        default: 'gemini-pro',
+        models: [
+          'gemini-pro',
+          'gemini-pro-vision',
+          'gemini-1.5-pro',
+          'gemini-1.5-flash'
+        ]
+      },
+      'deepseek' => {
+        default: 'deepseek-chat',
+        models: %w[
+          deepseek-chat
+          deepseek-coder
+        ]
+      },
+      'openrouter' => {
+        default: 'anthropic/claude-3.5-sonnet',
+        models: [
+          'anthropic/claude-3.5-sonnet',
+          'openai/gpt-4o',
+          'google/gemini-pro',
+          'meta-llama/llama-3.1-405b-instruct',
+          'anthropic/claude-3-opus',
+          'openai/gpt-4-turbo'
+        ]
+      },
+      'ollama' => {
+        default: 'llama3.2',
+        models: [
+          'llama3.2',
+          'llama3.1',
+          'mistral',
+          'codellama',
+          'phi3',
+          'gemma2'
+        ]
+      }
+    }.freeze
+
+    def run
+      show_current_configurations
+      show_menu
+      handle_user_choice
+    end
+
+    private
+
+    def show_current_configurations
+      puts 'Configuration Management'
+      puts '======================'
+
+      configs = Askcii::Config.configurations
+      default_id = Askcii::Config.default_configuration_id
+
+      if configs.empty?
+        puts 'No configurations found.'
+      else
+        puts 'Current configurations:'
+        configs.each do |config|
+          marker = config['id'] == default_id ? ' (default)' : ''
+          provider_info = config['provider'] ? " [#{config['provider']}]" : ''
+          puts "  #{config['id']}. #{config['name']}#{provider_info}#{marker}"
+        end
+        puts
+      end
+    end
+
+    def show_menu
+      puts 'Options:'
+      puts '  1. Add new configuration'
+      puts '  2. Set default configuration'
+      puts '  3. Delete configuration'
+      puts '  4. Exit'
+      print 'Select option (1-4): '
+    end
+
+    def handle_user_choice
+      choice = $stdin.gets.chomp
+
+      case choice
+      when '1'
+        add_new_configuration
+      when '2'
+        set_default_configuration
+      when '3'
+        delete_configuration
+      when '4'
+        puts 'Exiting.'
+      else
+        puts 'Invalid option.'
+      end
+    end
+
+    def add_new_configuration
+      print 'Enter configuration name: '
+      name = $stdin.gets.chomp
+
+      provider = select_provider
+      return unless provider
+
+      api_key = get_api_key(provider)
+      return unless api_key || provider == 'ollama'
+
+      endpoint = get_api_endpoint(provider)
+      model_id = get_model_id(provider)
+
+      return unless model_id
+
+      name = model_id if name.empty?
+      Askcii::Config.add_configuration(name, api_key || '', endpoint, model_id, provider)
+      puts 'Configuration added successfully!'
+    end
+
+    def select_provider
+      puts 'Select provider:'
+      puts '  1. OpenAI'
+      puts '  2. Anthropic'
+      puts '  3. Gemini'
+      puts '  4. DeepSeek'
+      puts '  5. OpenRouter'
+      puts '  6. Ollama (no API key needed)'
+      print 'Provider (1-6): '
+
+      provider_choice = $stdin.gets.chomp
+      provider = PROVIDER_MAP[provider_choice]
+
+      if provider.nil?
+        puts 'Invalid provider selection.'
+        return nil
+      end
+
+      provider
+    end
+
+    def get_api_key(provider)
+      return '' if provider == 'ollama'
+
+      print "Enter #{provider.capitalize} API key: "
+      api_key = $stdin.gets.chomp
+
+      if api_key.empty?
+        puts 'API key is required for this provider.'
+        return nil
+      end
+
+      api_key
+    end
+
+    def get_api_endpoint(provider)
+      default_endpoint = DEFAULT_ENDPOINTS[provider]
+      print "Enter API endpoint (default: #{default_endpoint}): "
+      api_endpoint = $stdin.gets.chomp
+      api_endpoint.empty? ? default_endpoint : api_endpoint
+    end
+
+    def get_model_id(provider)
+      provider_config = PROVIDER_MODELS[provider]
+
+      if provider_config
+        default_model = provider_config[:default]
+        available_models = provider_config[:models]
+
+        puts "\nAvailable models for #{provider.capitalize}:"
+        available_models.each_with_index do |model, index|
+          marker = model == default_model ? ' (recommended)' : ''
+          puts "  #{index + 1}. #{model}#{marker}"
+        end
+
+        puts "  #{available_models.length + 1}. Enter custom model ID"
+        print "\nSelect model (1-#{available_models.length + 1}) or press Enter for default [#{default_model}]: "
+
+        choice = $stdin.gets.chomp
+
+        if choice.empty?
+          default_model
+        elsif choice.to_i.between?(1, available_models.length)
+          available_models[choice.to_i - 1]
+        elsif choice.to_i == available_models.length + 1
+          print 'Enter custom model ID: '
+          custom_model = $stdin.gets.chomp
+          custom_model.empty? ? nil : custom_model
+        else
+          puts 'Invalid selection.'
+          nil
+        end
+      else
+        # Fallback for unknown providers
+        print 'Enter model ID: '
+        model_id = $stdin.gets.chomp
+
+        if model_id.empty?
+          puts 'Model ID is required.'
+          return nil
+        end
+
+        model_id
+      end
+    end
+
+    def set_default_configuration
+      configs = Askcii::Config.configurations
+
+      if configs.empty?
+        puts 'No configurations available to set as default.'
+        return
+      end
+
+      print 'Enter configuration ID to set as default: '
+      new_default = $stdin.gets.chomp
+
+      if configs.any? { |c| c['id'] == new_default }
+        Askcii::Config.set_default_configuration(new_default)
+        puts "Configuration #{new_default} set as default."
+      else
+        puts 'Invalid configuration ID.'
+      end
+    end
+
+    def delete_configuration
+      configs = Askcii::Config.configurations
+
+      if configs.empty?
+        puts 'No configurations available to delete.'
+        return
+      end
+
+      print 'Enter configuration ID to delete: '
+      delete_id = $stdin.gets.chomp
+
+      if configs.any? { |c| c['id'] == delete_id }
+        if Askcii::Config.delete_configuration(delete_id)
+          puts "Configuration #{delete_id} deleted successfully."
+        else
+          puts 'Failed to delete configuration.'
+        end
+      else
+        puts 'Invalid configuration ID.'
+      end
+    end
+  end
+end

data/lib/askcii/models/chat.rb

@@ -5,9 +5,12 @@ module Askcii
     one_to_many :messages, class: 'Askcii::Message', key: :chat_id
 
     def to_llm
+      current_config = Askcii::Config.current_configuration
+      provider_symbol = current_config['provider'] ? current_config['provider'].to_sym : :openai
+
       @chat = RubyLLM.chat(
         model: model_id,
-        provider: :openai,
+        provider: provider_symbol,
         assume_model_exists: true
       )
       messages.each do |msg|

data/lib/askcii/models/config.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'json'
+
 module Askcii
   class Config < Sequel::Model(Askcii.database[:configs])
     def self.set(key, value)
@@ -9,9 +11,10 @@ module Askcii
 
     def self.get(key)
       config = find(key: key)
-      config ? config.value : nil
+      config&.value
     end
 
+    # Legacy methods for backward compatibility
     def self.api_key
       get('api_key')
     end
@@ -23,5 +26,89 @@ module Askcii
     def self.model_id
       get('model_id')
     end
+
+    # New multi-configuration methods
+    def self.configurations
+      where(Sequel.like(:key, 'config_%')).map do |config|
+        config_data = JSON.parse(config.value)
+        config_data.merge('id' => config.key.split('_', 2)[1])
+      end
+    rescue JSON::ParserError
+      []
+    end
+
+    def self.add_configuration(name, api_key, api_endpoint, model_id, provider)
+      config_data = {
+        'name' => name,
+        'api_key' => api_key,
+        'api_endpoint' => api_endpoint,
+        'model_id' => model_id,
+        'provider' => provider
+      }
+
+      # Find the next available ID
+      existing_ids = configurations.map { |c| c['id'].to_i }.sort
+      next_id = existing_ids.empty? ? 1 : existing_ids.last + 1
+
+      set("config_#{next_id}", config_data.to_json)
+    end
+
+    def self.get_configuration(id)
+      config = get("config_#{id}")
+      return nil unless config
+
+      JSON.parse(config)
+    rescue JSON::ParserError
+      nil
+    end
+
+    def self.default_configuration_id
+      get('default_config_id') || '1'
+    end
+
+    def self.set_default_configuration(id)
+      set('default_config_id', id.to_s)
+    end
+
+    def self.delete_configuration(id)
+      config = find(key: "config_#{id}")
+      return false unless config
+
+      # Check if this is the default configuration
+      if default_configuration_id == id.to_s
+        # Reset default to the first remaining configuration
+        remaining_configs = configurations.reject { |c| c['id'] == id.to_s }
+        if remaining_configs.any?
+          set_default_configuration(remaining_configs.first['id'])
+        else
+          # If no configurations remain, clear the default
+          config_record = find(key: 'default_config_id')
+          config_record&.delete
+        end
+      end
+
+      config.delete
+      true
+    end
+
+    def self.current_configuration
+      default_id = default_configuration_id
+      config = get_configuration(default_id)
+
+      # Fallback to legacy configuration if no multi-configs exist
+      if config.nil? && configurations.empty?
+        {
+          'api_key' => api_key,
+          'api_endpoint' => api_endpoint,
+          'model_id' => model_id,
+          'provider' => 'openai'
+        }
+      else
+        # Ensure provider is set for backward compatibility
+        config ||= {}
+        config['provider'] ||= 'openai'
+        config
+      end
+    end
   end
 end

data/lib/askcii/models/message.rb

@@ -7,7 +7,7 @@ module Askcii
     def to_llm
       RubyLLM::Message.new(
         role: role.to_sym,
-        content: content,
+        content: content.to_s.encode('UTF-8', undef: :replace),
         tool_calls: {},
         tool_call_id: nil,
         input_tokens: input_tokens,

data/lib/askcii/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Askcii
-  VERSION = '0.1.0'
+  VERSION = '0.3.0'
 end

data/lib/askcii.rb

@@ -3,7 +3,6 @@
 require 'sequel'
 require 'fileutils'
 require 'ruby_llm'
-require 'ruby_llm/model_info'
 require_relative './askcii/version'
 
 module Askcii
@@ -22,46 +21,75 @@ module Askcii
 
   # Initialize the database
   def self.setup_database
-    database.create_table :chats do
-      primary_key :id
-      String :model_id, null: true
-      String :context, null: true
-      Datetime :created_at, null: false, default: Sequel::CURRENT_TIMESTAMP
-    end unless database.table_exists?(:chats)
+    unless database.table_exists?(:chats)
+      database.create_table :chats do
+        primary_key :id
+        String :model_id, null: true
+        String :context, null: true
+        Datetime :created_at, null: false, default: Sequel::CURRENT_TIMESTAMP
+      end
+    end
 
-    database.create_table :messages do
-      primary_key :id
-      foreign_key :chat_id, :chats, null: false
-      String :role, null: true
-      Text :content, null: true
-      String :model_id, null: true
-      Integer :input_tokens, null: true
-      Integer :output_tokens, null: true
-      Datetime :created_at, null: false, default: Sequel::CURRENT_TIMESTAMP
-    end unless database.table_exists?(:messages)
+    unless database.table_exists?(:messages)
+      database.create_table :messages do
+        primary_key :id
+        foreign_key :chat_id, :chats, null: false
+        String :role, null: true
+        Text :content, null: true
+        String :model_id, null: true
+        Integer :input_tokens, null: true
+        Integer :output_tokens, null: true
+        Datetime :created_at, null: false, default: Sequel::CURRENT_TIMESTAMP
+      end
+    end
+
+    return if database.table_exists?(:configs)
 
     database.create_table :configs do
       primary_key :id
       String :key, null: false, unique: true
       Text :value, null: true
-    end unless database.table_exists?(:configs)
+    end
   end
 
-  def self.configure_llm
+  def self.configure_llm(selected_config = nil)
     RubyLLM.configure do |config|
       config.log_file = '/dev/null'
 
-      # Try to get configuration from the database first, then fallback to ENV variables
-      config.openai_api_key = begin
-        Askcii::Config.api_key || ENV['ASKCII_API_KEY'] || 'blank'
-      rescue StandardError
-        ENV['ASKCII_API_KEY'] || 'blank'
-      end
+      if selected_config
+        provider = selected_config['provider'] || 'openai'
+        api_key = selected_config['api_key']
 
-      config.openai_api_base = begin
-        Askcii::Config.api_endpoint || ENV['ASKCII_API_ENDPOINT'] || 'http://localhost:11434/v1'
-      rescue StandardError
-        ENV['ASKCII_API_ENDPOINT'] || 'http://localhost:11434/v1'
+        # Set the appropriate API key based on provider
+        case provider.downcase
+        when 'openai'
+          config.openai_api_key = api_key || 'blank'
+          config.openai_api_base = selected_config['api_endpoint'] || 'https://api.openai.com/v1'
+        when 'anthropic'
+          config.anthropic_api_key = api_key || 'blank'
+        when 'gemini'
+          config.gemini_api_key = api_key || 'blank'
+        when 'deepseek'
+          config.deepseek_api_key = api_key || 'blank'
+        when 'openrouter'
+          config.openrouter_api_key = api_key || 'blank'
+        when 'ollama'
+          # Ollama doesn't need an API key
+          config.openai_api_base = selected_config['api_endpoint'] || 'http://localhost:11434/v1'
+        end
+      else
+        # Legacy configuration fallback
+        config.openai_api_key = begin
+          Askcii::Config.api_key || ENV['ASKCII_API_KEY'] || 'blank'
+        rescue StandardError
+          ENV['ASKCII_API_KEY'] || 'blank'
+        end
+
+        config.openai_api_base = begin
+          Askcii::Config.api_endpoint || ENV['ASKCII_API_ENDPOINT'] || 'http://localhost:11434/v1'
+        rescue StandardError
+          ENV['ASKCII_API_ENDPOINT'] || 'http://localhost:11434/v1'
+        end
       end
     end
   end
@@ -71,4 +99,8 @@ module Askcii
     require_relative './askcii/models/message'
     require_relative './askcii/models/config'
   end
+
+  def self.require_application
+    require_relative './askcii/application'
+  end
 end