askcii 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fdbbba27b8846c738014ebaab5466f00b2a73b74c2b5c898bee87bd60752f6d
-  data.tar.gz: 737756f8559f8f518829b440d5a8d273a70d331731da02ed5be06230b0cad467
+  metadata.gz: fdbabf6bbd313aa11a7868b5df4630a85798e6a59311872bc04cebeaa2ac49e3
+  data.tar.gz: cff4449b247c8dcfe5273e122b054d72e54f57866f905854fd94aa39ee8e8547
 SHA512:
-  metadata.gz: c2a8b74fd5e2ef08a7c1f386964f3a9ccae35e9e0d1ec9f37b28253a420f1849f909fbac88452b9615f5bb928db6814871633b68bd48ec376f2c1afb4951a089
-  data.tar.gz: 7bbd8c8a9157c5d7439be1d49dd20db68bb99ca9ef7fc47a9b4cd9a9c8372ebf89521a0edfdb4745587367852d72e017ef1f5fabd2e4cf153f92bfa2c259f31f
+  metadata.gz: 5ca4009158417d0eee5a4452c4ec5c49fefedabdeb22495a2f6b6d08136391f19535e9468113c164f714e0a382eb8b57244e56027d6b824f23132fea679a4d29
+  data.tar.gz: ee32e1ab823d7a2dc53445e3fa7cf064993272571512f6c4b18966bbb08c87163158262387521d073d5bfa0c158f80b8ab808f05c98f8e330aaaa555122814f2

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    askcii (0.1.0)
+    askcii (0.3.0)
       amalgalite (~> 1.9)
-      ruby_llm (= 1.3.0)
+      ruby_llm (= 1.5.1)
       sequel (~> 5.92)
 
 GEM
@@ -14,6 +14,7 @@ GEM
     arrayfields (4.9.2)
     base64 (0.2.0)
     bigdecimal (3.1.9)
+    csv (3.3.5)
     event_stream_parser (1.0.0)
     faraday (2.13.1)
       faraday-net_http (>= 2.0, < 3.5)
@@ -32,8 +33,9 @@ GEM
     multipart-post (2.4.1)
     net-http (0.6.0)
       uri
+    ostruct (0.6.3)
     rake (13.2.1)
-    ruby_llm (1.3.0)
+    ruby_llm (1.5.1)
       base64
       event_stream_parser (~> 1)
       faraday (>= 1.10.0)
@@ -61,7 +63,9 @@ PLATFORMS
 
 DEPENDENCIES
   askcii!
+  csv (~> 3.0)
   minitest (~> 5.25)
+  ostruct (~> 0.6)
   rake (~> 13.0)
 
 BUNDLED WITH

data/Rakefile

@@ -1,8 +1,24 @@
 # frozen_string_literal: true
 
 require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require 'rake/testtask'
 
-RSpec::Core::RakeTask.new(:spec)
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
+end
 
-task default: :spec
+Rake::TestTask.new(:comprehensive) do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/comprehensive_test.rb']
+end
+
+Rake::TestTask.new(:simple) do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/simple_test.rb']
+end
+
+task default: :comprehensive

data/askcii.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'askcii'
   spec.version       = Askcii::VERSION
   spec.authors       = ['Roel Bondoc']
-  spec.email         = ['roelbondoc@example.com']
+  spec.email         = ['rsbondoc@gmail.com']
 
   spec.summary       = 'Command line application for LLM interactions'
   spec.description   = 'A terminal-friendly interface for interacting with LLM models'
@@ -27,9 +27,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'amalgalite', '~> 1.9'
-  spec.add_dependency 'ruby_llm', '1.3.0'
+  spec.add_dependency 'ruby_llm', '1.5.1'
   spec.add_dependency 'sequel', '~> 5.92'
 
+  spec.add_development_dependency 'csv', '~> 3.0'
   spec.add_development_dependency 'minitest', '~> 5.25'
+  spec.add_development_dependency 'ostruct', '~> 0.6'
   spec.add_development_dependency 'rake', '~> 13.0'
 end

data/lib/askcii/application.rb

@@ -23,19 +23,20 @@ module Askcii
         exit 0
       end
 
-      if @cli.show_usage?
-        puts @cli.usage_message
-        exit 1
-      end
-
       selected_config = determine_configuration
       configure_llm(selected_config)
 
       chat_session = ChatSession.new(@cli.options, selected_config)
       chat_session.handle_last_response if @cli.last_response?
 
-      input = read_stdin_input
-      chat_session.execute_chat(@cli.prompt, input)
+      prompt, input = determine_prompt_and_input
+
+      if prompt.empty? && input.nil?
+        puts @cli.usage_message
+        exit 1
+      end
+
+      chat_session.execute_chat(prompt, input)
     end
 
     private
@@ -61,6 +62,21 @@ module Askcii
       Askcii.configure_llm(selected_config)
     end
 
+    def determine_prompt_and_input
+      stdin_content = read_stdin_input
+
+      if @cli.prompt.empty? && stdin_content
+        # No prompt provided via args, use stdin as prompt
+        [stdin_content.strip, nil]
+      elsif !@cli.prompt.empty? && stdin_content
+        # Both prompt and stdin provided, use stdin as input context
+        [@cli.prompt, stdin_content]
+      else
+        # Only prompt provided (or neither)
+        [@cli.prompt, nil]
+      end
+    end
+
     def read_stdin_input
       return nil if $stdin.tty?
 

data/lib/askcii/chat_session.rb

@@ -16,7 +16,7 @@ module Askcii
       model_id = @selected_config['model_id']
       chat_record = Askcii::Chat.find_or_create(context: context, model_id: model_id)
 
-      last_message = chat_record.messages.where(role: 'assistant').last
+      last_message = chat_record.messages.select { |msg| msg.role == 'assistant' }.last
       if last_message
         puts last_message.content
         exit 0

data/lib/askcii/cli.rb

@@ -23,7 +23,7 @@ module Askcii
     end
 
     def show_usage?
-      @prompt.empty? && !configure? && !last_response?
+      false # Usage logic is now handled in Application class
     end
 
     def configure?
@@ -50,8 +50,10 @@ module Askcii
       <<~USAGE
         Usage:
           askcii [options] 'Your prompt here'
-          echo 'Your prompt here' | askcii 'Your prompt here'
-          askcii 'Your prompt here' < prompt.txt
+          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)

data/lib/askcii/configuration_manager.rb

@@ -20,6 +20,67 @@ module Askcii
       '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
@@ -85,7 +146,7 @@ module Askcii
       return unless api_key || provider == 'ollama'
 
       endpoint = get_api_endpoint(provider)
-      model_id = get_model_id
+      model_id = get_model_id(provider)
 
       return unless model_id
 
@@ -136,16 +197,48 @@ module Askcii
       api_endpoint.empty? ? default_endpoint : api_endpoint
     end
 
-    def get_model_id
-      print 'Enter model ID: '
-      model_id = $stdin.gets.chomp
+    def get_model_id(provider)
+      provider_config = PROVIDER_MODELS[provider]
 
-      if model_id.empty?
-        puts 'Model ID is required.'
-        return nil
-      end
+      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
 
-      model_id
+        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

data/lib/askcii/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: askcii
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Roel Bondoc
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -51,6 +51,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.92'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -65,6 +79,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.25'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +109,7 @@ dependencies:
         version: '13.0'
 description: A terminal-friendly interface for interacting with LLM models
 email:
-- roelbondoc@example.com
+- rsbondoc@gmail.com
 executables:
 - askcii
 extensions: []