n2b 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '00568c10ff4e0c1684ef83fe6579d40ac1d89623fbd704db4810b3b031fffb40'
-  data.tar.gz: e6f22194fadffcf43ed553bb37693607a49b2a9fe2a614748d9b3ae8e415eb30
+  metadata.gz: a202dae3ba4645542ae044ca8c2e924c34673907ecbcc4bd123ac054fb1493eb
+  data.tar.gz: b308ead565a4ce70433f52551370246d2c4f1043e76d314f0ba5d4f7224f7a92
 SHA512:
-  metadata.gz: f40a0f2829fc6b2cfcdf512c08bf2a754d41e3fed6bdbbfbe6d63cfde7aa9318b6f8256dea2655e0dfea5485e5bfc358faaae3ee643905ed1c873d2770e62c21
-  data.tar.gz: 054066fa79caf2cdc0077017abf6e01d4b06ed361199d0d9471549a232c77af63adf613642056f12aceb300894329ed832c607a4dcf4e537ba5dfa9a4d0fc6fb
+  metadata.gz: 9bcb6e988ca781399ff84c8189aa37c4ddface4cc6dc5474b9f22793b10b5de10c82bba7c8d2475bf0f0a030ea4c638fb4136ec2b5d98871a84affb60a5a5ab7
+  data.tar.gz: 598a4d9a0a684a8d95bbb644d2ba799b32e617868be56cc4e5d661d4ee6646cd42389c0315a60175546faadcdb0c4fde1742ca9270e3b9a9500d3f77c933d935

data/README.md

@@ -1,11 +1,12 @@
 # N2B: Natural Language to Bash Commands Converter
 
-N2B (Natural to Bash) is a Ruby gem that converts natural language instructions into executable shell commands using the Claude AI API. It's designed to help users quickly generate shell commands without needing to remember exact syntax.
+N2B (Natural to Bash) is a Ruby gem that converts natural language instructions into executable shell commands using the Claude AI or OpenAI API. It's designed to help users quickly generate shell commands without needing to remember exact syntax.
 
 ## Features
 
 - Convert natural language to shell commands
 - Support for multiple Claude AI models (Haiku, Sonnet, Sonnet 3.5)
+- Support for OpenAI models
 - Option to execute generated commands directly
 - Configurable privacy settings
 - Shell history integration

data/lib/n2b/llm/claude.rb

@@ -0,0 +1,50 @@
+module N2M
+  module Llm
+    class Claude
+      API_URI = URI.parse('https://api.anthropic.com/v1/messages')
+      MODELS = { 'haiku' =>  'claude-3-haiku-20240307', 'sonnet' => 'claude-3-sonnet-20240229', 'sonnet35' => 'claude-3-5-sonnet-20240620' }
+
+      def initialize(config)
+        @config = config
+      end
+
+      def make_request( content)
+        uri = URI.parse('https://api.anthropic.com/v1/messages')
+        request = Net::HTTP::Post.new(uri)
+        request.content_type = 'application/json'
+        request['X-API-Key'] = @config['access_key']
+        request['anthropic-version'] = '2023-06-01'
+      
+        request.body = JSON.dump({
+          "model" => MODELS[@config['model']],
+          "max_tokens" => 1024,
+          "messages" => [
+            {
+              "role" => "user",
+              "content" => content 
+            }
+          ]
+        })
+
+        response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+          http.request(request)
+        end
+        # check for errors
+        if response.code != '200'
+          puts "Error: #{response.code} #{response.message}"
+          puts response.body
+          exit 1
+        end
+        answer = JSON.parse(response.body)['content'].first['text'] 
+        begin 
+          # removee everything before the first { and after the last }
+          answer = answer.sub(/.*\{(.*)\}.*/m, '{\1}')
+          answer = JSON.parse(answer)
+        rescue JSON::ParserError
+          answer = { 'commands' => answer.split("\n"), explanation: answer}
+        end
+        answer
+      end
+    end 
+  end
+end

data/lib/n2b/llm/open_ai.rb

@@ -0,0 +1,53 @@
+require 'net/http'
+require 'json'
+require 'uri'
+
+module N2M
+  module Llm
+    class OpenAi
+      API_URI = URI.parse('https://api.openai.com/v1/chat/completions')
+      MODELS = { 'gpt-4o' =>  'gpt-4o', 'gpt-35' => 'gpt-3.5-turbo-1106' }
+
+      def initialize(config)
+        @config = config
+      end
+
+      def make_request(content)
+        request = Net::HTTP::Post.new(API_URI)
+        request.content_type = 'application/json'
+        request['Authorization'] = "Bearer #{@config['access_key']}"
+
+        request.body = JSON.dump({
+          "model" => MODELS[@config['model']],
+          response_format: { type: 'json_object' },
+          "messages" => [
+            {
+              "role" => "user",
+              "content" => content
+            }]
+        })
+
+        response = Net::HTTP.start(API_URI.hostname, API_URI.port, use_ssl: true) do |http|
+          http.request(request)
+        end
+
+        # check for errors
+        if response.code != '200'
+          puts "Error: #{response.code} #{response.message}"
+          puts response.body
+          exit 1
+        end
+        puts JSON.parse(response.body)
+        answer = JSON.parse(response.body)['choices'].first['message']['content']
+        begin
+          # remove everything before the first { and after the last }
+          answer = answer.sub(/.*\{(.*)\}.*/m, '{\1}')
+          answer = JSON.parse(answer)
+        rescue JSON::ParserError
+          answer = { 'commands' => answer.split("\n"), explanation: answer }
+        end
+        answer
+      end
+    end
+  end
+end

data/lib/n2b/version.rb

@@ -1,4 +1,4 @@
 # lib/n2b/version.rb
 module N2B
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/n2b.rb

@@ -1,19 +1,19 @@
 # lib/n2b.rb
-require "n2b/version"
 require 'net/http'
 require 'uri'
 require 'json'
 require 'optparse'
 require 'yaml'
 require 'fileutils'
-
+require 'n2b/version'
+require 'n2b/llm/claude'
+require 'n2b/llm/open_ai'
 module N2B
   class Error < StandardError; end
 
   CONFIG_FILE = File.expand_path('~/.n2b/config.yml')
   HISTORY_FILE = File.expand_path('~/.n2b/history')
-  MODELS = { 'haiku' =>  'claude-3-haiku-20240307', 'sonnet' => 'claude-3-sonnet-20240229', 'sonnet35' => 'claude-3-5-sonnet-20240620' }
-
+  
   class CLI
     def self.run(args)
       new(args).execute
@@ -67,27 +67,36 @@ module N2B
       config = load_config
       api_key = ENV['CLAUDE_API_KEY'] || config['access_key']
       model = config['model'] || 'sonnet35'
+  
       if api_key.nil? || api_key == '' ||  reconfigure
-        print "Enter your Claude API key: #{ api_key.nil? || api_key.empty? ? '' : '(leave blank to keep the current key '+api_key[0..10]+'...)' }"
+        print "choose a language model to use (claude, openai): "
+        llm = $stdin.gets.chomp
+        unless ['claude', 'openai'].include?(llm)
+          puts "Invalid language model. Choose from: claude, openai"
+          exit 1
+        end
+        llm_class = llm == 'openai' ? N2M::Llm::OpenAi : N2M::Llm::Claude
+
+        print "Enter your #{llm} API key: #{ api_key.nil? || api_key.empty? ? '' : '(leave blank to keep the current key '+api_key[0..10]+'...)' }"
         api_key = $stdin.gets.chomp 
         api_key = config['access_key'] if api_key.empty?
-        print "Choose a model (haiku, sonnet, sonnet35 (default)): "
+        print "Choose a model (#{ llm_class::MODELS.keys }, #{ llm_class::MODELS.keys.first } default): "
         model = $stdin.gets.chomp 
-        model = 'sonnet35' if model.empty?
-        config['llm'] ||= 'anthropic'
+        model = llm_class::MODELS.keys.first if model.empty?
+        config['llm'] = llm
         config['access_key'] = api_key
         config['model'] = model
-        unless MODELS.keys.include?(model)
-          puts "Invalid model. Choose from: #{MODELS.keys.join(', ')}"
+        unless llm_class::MODELS.keys.include?(model)
+          puts "Invalid model. Choose from: #{llm_class::MODELS.keys.join(', ')}"
           exit 1
         end
         
         config['privacy'] ||= {} 
-        print "Do you want to send your shell history to Claude? (y/n): "
+        print "Do you want to send your shell history to #{llm}? (y/n): "
         config['privacy']['send_shell_history'] = $stdin.gets.chomp == 'y'
-        print "Do you want to send your past requests and answers to Claude? (y/n): "
+        print "Do you want to send your past requests and answers to #{llm}? (y/n): "
         config['privacy']['send_llm_history'] = $stdin.gets.chomp == 'y'
-        print "Do you want to send your current directory to Claude? (y/n): "
+        print "Do you want to send your current directory to #{llm}? (y/n): "
         config['privacy']['send_current_directory'] = $stdin.gets.chomp == 'y'
         print "Do you want to append the commands to your shell history? (y/n): "
         config['append_to_shell_history'] = $stdin.gets.chomp == 'y'
@@ -115,11 +124,9 @@ module N2B
     end
     
     def call_llm(prompt, config)
-      uri = URI.parse('https://api.anthropic.com/v1/messages')
-      request = Net::HTTP::Post.new(uri)
-      request.content_type = 'application/json'
-      request['X-API-Key'] = config['access_key']
-      request['anthropic-version'] = '2023-06-01'
+      
+      llm = config['llm'] == 'openai' ?   N2M::Llm::OpenAi.new(config) : N2M::Llm::Claude.new(config)
+      
       content = <<-EOF 
               Translate the following natural language command to bash commands: #{prompt}\n\nProvide only the #{get_user_shell} commands for #{ get_user_os }. the commands should be separated by newlines. 
               #{' the user is in directory'+Dir.pwd if config['privacy']['send_current_directory']}. 
@@ -130,34 +137,9 @@ module N2B
               { "commands": [ "echo 'Hello, World!'" ], "explanation": "This command prints 'Hello, World!' to the terminal."}
               EOF
     
-      request.body = JSON.dump({
-        "model" => MODELS[config['model']],
-        "max_tokens" => 1024,
-        "messages" => [
-          {
-            "role" => "user",
-            "content" => content 
-          }
-        ]
-      })
-    
-      response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
-        http.request(request)
-      end
-      # check for errors
-      if response.code != '200'
-        puts "Error: #{response.code} #{response.message}"
-        puts response.body
-        exit 1
-      end
-      answer = JSON.parse(response.body)['content'].first['text'] 
-      begin 
-        # removee everything before the first { and after the last }
-        answer = answer.sub(/.*\{(.*)\}.*/m, '{\1}')
-        answer = JSON.parse(answer)
-      rescue JSON::ParserError
-        answer = { 'commands' => answer.split("\n"), explanation: answer}
-      end
+     
+      answer = llm.make_request(content)
+
       append_to_llm_history_file("#{prompt}\n#{answer}")
       answer
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: n2b
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Stefan Nothegger
@@ -64,6 +64,8 @@ files:
 - README.md
 - bin/n2b
 - lib/n2b.rb
+- lib/n2b/llm/claude.rb
+- lib/n2b/llm/open_ai.rb
 - lib/n2b/version.rb
 homepage: https://github.com/stefan-kp/n2b
 licenses:
@@ -87,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.2
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Convert natural language to bash commands