aicli 0.1.1 → 0.2.6

data/lib/aicli/helpers/llm.rb

@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+require 'ruby_llm'
+
+module AiCli
+  module Helpers
+    module Llm
+      PROVIDERS = %w[openai anthropic].freeze
+
+      DEFAULT_MODELS = {
+        'openai' => 'gpt-4o-mini',
+        'anthropic' => 'claude-sonnet-4-6'
+      }.freeze
+
+      module_function
+
+      def configure!(config)
+        provider = normalize_provider(config['PROVIDER'])
+        ensure_credentials!(config, provider)
+
+        RubyLLM.configure do |c|
+          openai_key = config['OPENAI_KEY'].to_s
+          anthropic_key = config['ANTHROPIC_KEY'].to_s
+          endpoint = config['OPENAI_API_ENDPOINT'].to_s
+
+          c.openai_api_key = openai_key unless openai_key.empty?
+          c.anthropic_api_key = anthropic_key unless anthropic_key.empty?
+
+          if !endpoint.empty? && endpoint != 'https://api.openai.com/v1'
+            c.openai_api_base = endpoint.sub(%r{/+\z}, '')
+          end
+        end
+
+        provider
+      end
+
+      def build_chat(config)
+        provider, model = resolve_provider_and_model(config)
+        ensure_credentials!(config, provider)
+
+        configure!(config.merge('PROVIDER' => provider, 'MODEL' => model))
+
+        opts = { model: model, provider: provider.to_sym }
+        opts[:assume_model_exists] = true unless model_known?(model, provider)
+        RubyLLM.chat(**opts)
+      end
+
+      # Returns [provider, model], fixing mismatches against the RubyLLM registry.
+      def resolve_provider_and_model(config)
+        provider = normalize_provider(config['PROVIDER'])
+        model = config['MODEL'].to_s
+        model = default_model_for(provider) if model.empty?
+
+        model_provider = provider_for_model(model)
+        if model_provider && model_provider != provider
+          # Prefer the provider that actually owns the selected model.
+          provider = model_provider
+        elsif model_provider.nil? && !model_known?(model, provider)
+          # Unknown id for this provider: fall back to a safe default.
+          model = default_model_for(provider)
+        end
+
+        [provider, model]
+      end
+
+      def provider_for_model(model_id)
+        return nil if model_id.to_s.empty?
+
+        info = RubyLLM.models.find(model_id)
+        normalize_provider(info.provider)
+      rescue StandardError
+        # Try each known provider explicitly (aliases can be provider-specific).
+        PROVIDERS.each do |provider|
+          return provider if model_known?(model_id, provider)
+        end
+        nil
+      end
+
+      def list_chat_models(provider)
+        provider = normalize_provider(provider)
+
+        RubyLLM.models.chat_models
+               .by_provider(provider.to_sym)
+               .select { |m| text_chat_model?(m) }
+               .sort_by { |m| [m.name.to_s.downcase, m.id] }
+               .map { |m| { 'id' => m.id, 'name' => m.name.to_s } }
+      end
+
+      def default_model_for(provider)
+        DEFAULT_MODELS.fetch(normalize_provider(provider), DEFAULT_MODELS['openai'])
+      end
+
+      def normalize_provider(provider)
+        value = provider.to_s.downcase
+        PROVIDERS.include?(value) ? value : 'openai'
+      end
+
+      def ensure_credentials!(config, provider = nil)
+        provider = normalize_provider(provider || config['PROVIDER'])
+
+        case provider
+        when 'anthropic'
+          if config['ANTHROPIC_KEY'].to_s.empty?
+            raise KnownError,
+                  "Please set your Anthropic API key via `#{Constants::COMMAND_NAME} config set ANTHROPIC_KEY=<your token>`"
+          end
+        else
+          if config['OPENAI_KEY'].to_s.empty?
+            raise KnownError,
+                  "Please set your OpenAI API key via `#{Constants::COMMAND_NAME} config set OPENAI_KEY=<your token>`"
+          end
+        end
+      end
+
+      def model_known?(model, provider)
+        RubyLLM.models.find(model, provider.to_sym)
+        true
+      rescue StandardError
+        false
+      end
+
+      def text_chat_model?(model)
+        outputs = Array(model.modalities&.output).map(&:to_s)
+        return false unless outputs.include?('text')
+
+        !model.id.match?(/tts|transcribe|realtime|whisper|embedding|moderation|dall-e|imagen|search-preview|babbage|davinci|ada-|curie|instruct/i)
+      end
+    end
+  end
+end

data/lib/aicli/prompt.rb

@@ -14,14 +14,12 @@ module AiCli
       init_i18n
 
       config = Helpers::Config.get
-      key = config['OPENAI_KEY']
-      model = config['MODEL']
-      api_endpoint = config['OPENAI_API_ENDPOINT']
       skip_explanation = silent_mode || config['SILENT_MODE']
 
       pastel = Pastel.new
       puts ''
-      puts "┌  #{pastel.cyan(Helpers::Constants::PROJECT_NAME)}"
+      puts pastel.cyan(Helpers::Constants::PROJECT_NAME)
+      puts pastel.dim("#{config['PROVIDER']} / #{config['MODEL']}")
 
       the_prompt = use_prompt.nil? || use_prompt.strip.empty? ? ask_prompt : use_prompt
 
@@ -30,9 +28,7 @@ module AiCli
 
       result = Helpers::Completion.get_script_and_info(
         prompt: the_prompt,
-        key: key,
-        model: model,
-        api_endpoint: api_endpoint
+        config: config
       )
 
       spinner.success(Helpers::I18n.t('Your script') + ':')
@@ -40,8 +36,8 @@ module AiCli
       script = result[:read_script].call(->(chunk) { print chunk })
       puts ''
       puts ''
-      puts pastel.dim('•')
 
+      explanation_text = ''
       unless skip_explanation
         spinner = TTY::Spinner.new("[:spinner] #{Helpers::I18n.t('Getting explanation...')}", format: :dots)
         spinner.auto_spin
@@ -50,22 +46,21 @@ module AiCli
         if info.nil? || info.empty?
           explanation = Helpers::Completion.get_explanation(
             script: script,
-            key: key,
-            model: model,
-            api_endpoint: api_endpoint
+            config: config
           )
           spinner.success(Helpers::I18n.t('Explanation') + ':')
           puts ''
-          explanation[:read_explanation].call(->(chunk) { print chunk })
+          explanation_text = explanation[:read_explanation].call(->(chunk) { print chunk })
           puts ''
           puts ''
-          puts pastel.dim('•')
         else
+          explanation_text = info
           spinner.success(Helpers::I18n.t('Explanation') + ':')
         end
       end
 
-      run_or_revise_flow(script, key, model, api_endpoint, silent_mode)
+      append_prompt_context(the_prompt, script, explanation_text)
+      run_or_revise_flow(script, config, silent_mode)
     end
 
     def init_i18n
@@ -85,14 +80,32 @@ module AiCli
     end
 
     def ask_prompt(initial = nil)
-      prompt = TTY::Prompt.new(interrupt: :exit)
-      prompt.ask(Helpers::I18n.t('What would you like me to do?')) do |q|
-        q.required true
-        q.default initial || Helpers::I18n.t('Say hello')
-        q.validate(/.+/, Helpers::I18n.t('Please enter a prompt.'))
+      prompt = TTY::Prompt.new(interrupt: :error)
+      Helpers::Context.seed_prompt_history(prompt)
+
+      loop do
+        begin
+          return prompt.ask(Helpers::I18n.t('What would you like me to do?')) do |q|
+            q.required true
+            q.default initial || Helpers::I18n.t('Say hello')
+            q.validate(/.+/, Helpers::I18n.t('Please enter a prompt.'))
+          end
+        rescue TTY::Reader::InputInterrupt
+          print "\r\e[2K"
+        end
       end
     end
 
+    def append_prompt_context(user_prompt, script, explanation)
+      assistant = +"```\n#{script}\n```"
+      assistant << "\n\n#{explanation}" unless explanation.to_s.strip.empty?
+
+      messages = Helpers::Context.load_messages
+      messages << { 'role' => 'user', 'content' => user_prompt.to_s }
+      messages << { 'role' => 'assistant', 'content' => assistant }
+      Helpers::Context.save_messages(messages)
+    end
+
     def ask_revision
       prompt = TTY::Prompt.new(interrupt: :exit)
       prompt.ask(Helpers::I18n.t('What would you like me to change in this script?')) do |q|
@@ -102,14 +115,13 @@ module AiCli
     end
 
     def run_script(script)
-      pastel = Pastel.new
-      puts "└  #{Helpers::I18n.t('Running')}: #{script}"
+      puts "#{Helpers::I18n.t('Running')}: #{script}"
       puts ''
       system(ENV['SHELL'] || 'bash', '-c', script)
       Helpers::ShellHistory.append(script)
     end
 
-    def run_or_revise_flow(script, key, model, api_endpoint, silent_mode)
+    def run_or_revise_flow(script, config, silent_mode)
       prompt = TTY::Prompt.new(interrupt: :exit)
       empty_script = script.strip.empty?
 
@@ -132,18 +144,17 @@ module AiCli
         new_script = prompt.ask(Helpers::I18n.t('you can edit script here'), default: script)
         run_script(new_script) if new_script && !new_script.empty?
       when :revise
-        revision_flow(script, key, model, api_endpoint, silent_mode)
+        revision_flow(script, config, silent_mode)
       when :copy
         Clipboard.copy(script)
-        puts "└  #{Helpers::I18n.t('Copied to clipboard!')}"
+        puts Helpers::I18n.t('Copied to clipboard!')
       when :cancel
-        puts "└  #{Helpers::I18n.t('Goodbye!')}"
+        puts Helpers::I18n.t('Goodbye!')
         exit 0
       end
     end
 
-    def revision_flow(current_script, key, model, api_endpoint, silent_mode)
-      pastel = Pastel.new
+    def revision_flow(current_script, config, silent_mode)
       revision = ask_revision
 
       spinner = TTY::Spinner.new("[:spinner] #{Helpers::I18n.t('Loading...')}", format: :dots)
@@ -152,9 +163,7 @@ module AiCli
       result = Helpers::Completion.get_revision(
         prompt: revision,
         code: current_script,
-        key: key,
-        model: model,
-        api_endpoint: api_endpoint
+        config: config
       )
 
       spinner.success(Helpers::I18n.t('Your new script') + ':')
@@ -162,7 +171,6 @@ module AiCli
       script = result[:read_script].call(->(chunk) { print chunk })
       puts ''
       puts ''
-      puts pastel.dim('•')
 
       unless silent_mode
         info_spinner = TTY::Spinner.new("[:spinner] #{Helpers::I18n.t('Getting explanation...')}", format: :dots)
@@ -170,9 +178,7 @@ module AiCli
 
         explanation = Helpers::Completion.get_explanation(
           script: script,
-          key: key,
-          model: model,
-          api_endpoint: api_endpoint
+          config: config
         )
 
         info_spinner.success(Helpers::I18n.t('Explanation') + ':')
@@ -180,13 +186,13 @@ module AiCli
         explanation[:read_explanation].call(->(chunk) { print chunk })
         puts ''
         puts ''
-        puts pastel.dim('•')
       end
 
-      run_or_revise_flow(script, key, model, api_endpoint, silent_mode)
+      run_or_revise_flow(script, config, silent_mode)
     end
 
     private_class_method :init_i18n, :examples, :ask_prompt, :ask_revision,
-                         :run_script, :run_or_revise_flow, :revision_flow
+                         :run_script, :run_or_revise_flow, :revision_flow,
+                         :append_prompt_context
   end
 end

data/lib/aicli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AiCli
-  VERSION = '0.1.1'
+  VERSION = '0.2.6'
 end

data/lib/aicli.rb

@@ -7,8 +7,10 @@ require_relative 'aicli/helpers/i18n'
 require_relative 'aicli/helpers/os_detect'
 require_relative 'aicli/helpers/strip_regex_patterns'
 require_relative 'aicli/helpers/shell_history'
+require_relative 'aicli/helpers/llm'
 require_relative 'aicli/helpers/completion'
 require_relative 'aicli/helpers/config'
+require_relative 'aicli/helpers/context'
 require_relative 'aicli/prompt'
 require_relative 'aicli/commands/chat'
 require_relative 'aicli/commands/config'

data/locales/en.yml

@@ -8,14 +8,20 @@ Please set your OpenAI API key via `ai config set OPENAI_KEY=<your token>`: Plea
   set your OpenAI API key via `ai config set OPENAI_KEY=<your token>`
 Set config: Set config
 Enter your OpenAI API key: Enter your OpenAI API key
+Enter your Anthropic API key: Enter your Anthropic API key
 "(not set)": "(not set)"
+Provider: Provider
+Pick a provider: Pick a provider
 OpenAI Key: OpenAI Key
+Anthropic Key: Anthropic Key
 Please enter a key: Please enter a key
 OpenAI API Endpoint: OpenAI API Endpoint
 Enter your OpenAI API Endpoint: Enter your OpenAI API Endpoint
 Silent Mode: Silent Mode
 Enable silent mode?: Enable silent mode?
 Model: Model
+Pick a model.: Pick a model.
+No models found for this provider.: No models found for this provider.
 Enter the model you want to use: Enter the model you want to use
 Language: Language
 Enter the language you want to use: Enter the language you want to use
@@ -35,6 +41,7 @@ Loading...: Loading...
 Getting explanation...: Getting explanation...
 Explanation: Explanation
 Run this script?: Run this script?
+Run it?: Run it?
 Revise this script?: Revise this script?
 'Yes': 'Yes'
 Lets go!: Lets go!
@@ -59,3 +66,6 @@ Please open a Bug report with the information above: Please open a Bug report wi
   the information above
 Prompt to run: Prompt to run
 You: You
+Ask for a shell command. Type exit to quit.: Ask for a shell command. Type exit to quit.
+Restored context: Restored context
+messages: messages

data/locales/it.yml

@@ -8,14 +8,20 @@ Please set your OpenAI API key via `ai config set OPENAI_KEY=<your token>`: Per
   imposta la tua chiave API OpenAI tramite `ai config set OPENAI_KEY=<your token>`
 Set config: Imposta la configurazione
 Enter your OpenAI API key: Inserisci la tua chiave API OpenAI
+Enter your Anthropic API key: Inserisci la tua chiave API Anthropic
 "(not set)": "(non impostato)"
+Provider: Provider
+Pick a provider: Scegli un provider
 OpenAI Key: Chiave OpenAI
+Anthropic Key: Chiave Anthropic
 Please enter a key: Per favore inserisci una chiave
 OpenAI API Endpoint: Endpoint API OpenAI
 Enter your OpenAI API Endpoint: Inserisci il tuo endpoint API OpenAI
 Silent Mode: Modalità silenziosa
 Enable silent mode?: Abilitare la modalità silenziosa?
 Model: Modello
+Pick a model.: Scegli un modello.
+No models found for this provider.: Nessun modello trovato per questo provider.
 Enter the model you want to use: Inserisci il modello che vuoi utilizzare
 Language: Lingua
 Enter the language you want to use: Inserisci la lingua che vuoi utilizzare
@@ -35,6 +41,7 @@ Loading...: Caricamento...
 Getting explanation...: Ottieni spiegazione...
 Explanation: Spiegazione
 Run this script?: Esegui questo script?
+Run it?: Lo eseguo?
 Revise this script?: Rivedi questo script?
 'Yes': Si
 Lets go!: Vai!
@@ -58,3 +65,6 @@ Please open a Bug report with the information above: Apri un report di bug con l
   informazioni sopra
 Prompt to run: Prompt da eseguire
 You: Tu
+Ask for a shell command. Type exit to quit.: Chiedi un comando shell. Digita exit per uscire.
+Restored context: Contesto ripristinato
+messages: messaggi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aicli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.6
 platform: ruby
 authors:
 - Antonio Molinari
@@ -37,6 +37,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: ruby_llm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -102,8 +116,10 @@ files:
 - lib/aicli/helpers/completion.rb
 - lib/aicli/helpers/config.rb
 - lib/aicli/helpers/constants.rb
+- lib/aicli/helpers/context.rb
 - lib/aicli/helpers/error.rb
 - lib/aicli/helpers/i18n.rb
+- lib/aicli/helpers/llm.rb
 - lib/aicli/helpers/os_detect.rb
 - lib/aicli/helpers/shell_history.rb
 - lib/aicli/helpers/strip_regex_patterns.rb