light_tr 1.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fefec0155db0e698e81b29f9260d2b4fb844b3ec2a148fa1d7f419bbdf6d9b71
-  data.tar.gz: 266422371befd490f89cc0b918eab19be2b103c414710a40e9931300e6a99291
+  metadata.gz: 3b2f82e905041870f9f842318362e0c01cf4be7ca0e754703cc24d5d479eaaf3
+  data.tar.gz: 300eb6fb7519db67951e4432627e855d80c0335d3f22a2cd4b9417d80c4aa47e
 SHA512:
-  metadata.gz: b48c7b2ff2f42bb22c2487026ae5856af6a73671baa898b4eac0bef35ac788de87d33c42aeac9be50de5a23037be2b124135f0ff6aea46f1a93a3e1751d7c29a
-  data.tar.gz: ccb46e927dbaa8aea893017f5ec63d4b25f2e8e30cf8d94c23613986a56d384e03b760aa1ecb4024e057835f3628bbbf6393c0af976cffdf79054084ac175038
+  metadata.gz: f4c558e2eb2fc941538e8d542ab38f52b6f354929821f66877606485b74aa0172c216d7febe5857c7ed94956a3579b5798ece72dfc4705a62fa06fe30f237137
+  data.tar.gz: 9c2b18fcfc3754f7ff51840eee3d7c45b3792867cd65944bc5cd05500af869e67cf880b44079e78dbcd11cedc65416c38ed27c1a89f6fa319def60b77190fcf8

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [pniemczyk]

data/Gemfile.lock

@@ -1,9 +1,11 @@
 PATH
   remote: .
   specs:
-    light_tr (1.0.0)
+    light_tr (2.0.1)
       awesome_print (~> 1.2)
       executable (~> 1.2)
+      faraday (~> 2.0)
+      faraday-mashify (~> 0.1)
       hashie (~> 2.1)
       lockbox (~> 0.6)
 
@@ -15,6 +17,15 @@ GEM
     coderay (1.1.3)
     diff-lcs (1.4.4)
     executable (1.2.1)
+    faraday (2.12.0)
+      faraday-net_http (>= 2.0, < 3.4)
+      json
+      logger
+    faraday-mashify (0.1.1)
+      faraday (~> 2.0)
+      hashie
+    faraday-net_http (3.3.0)
+      net-http
     ffi (1.15.4)
     formatador (0.3.0)
     guard (2.18.0)
@@ -29,13 +40,17 @@ GEM
     guard-rspec (0.7.3)
       guard (>= 0.10.0)
     hashie (2.1.2)
+    json (2.7.2)
     listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lockbox (0.6.6)
+    lockbox (0.6.8)
+    logger (1.6.1)
     lumberjack (1.2.8)
     method_source (1.0.0)
     nenv (0.3.0)
+    net-http (0.4.1)
+      uri
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -80,9 +95,11 @@ GEM
     shellany (0.0.1)
     thor (1.1.0)
     unicode-display_width (2.1.0)
+    uri (0.13.1)
 
 PLATFORMS
   arm64-darwin-20
+  arm64-darwin-21
 
 DEPENDENCIES
   guard-rspec (~> 0)

data/exe/trans

@@ -12,26 +12,34 @@ languages         = (override_language ? ARGV[0].strip[1..2] : LightTr::Config.l
 full_text         = (override_language ? ARGV[1..] : ARGV).join(' ')
 store             = LightTr::Store.new(name: 'translations', file_path: LightTr::Config.config_path)
 translator        = LightTr::Translator.new(LightTr::Config.api_key)
+gpt               = LightTr::ChatGpt.new(LightTr::Config.open_ai_key, LightTr::Config.model)
 text              = full_text.gsub(/[[:space:]]+/, ' ').strip
 interactive       = command == '-i'
 
 unless text.empty?
-  runner = LightTr::Runner.new(store, translator)
-  return puts runner.translate(languages[0], text) if languages.count == 1
-  languages.each { |target| puts "#{target.upcase}: #{runner.translate(target, text)}" }
+  if LightTr::Config.provider == 'google'
+    runner = LightTr::Runner.new(store, translator)
+    return puts runner.translate(languages[0], text) if languages.count == 1
+    languages.each { |target| puts "#{target.upcase}: #{runner.translate(target, text)}" }
+  else
+    puts gpt.translate(text, languages)
+  end
 end
 
 if interactive
   puts 'Interactive mode! (quit by /q or empty line)'
-  puts 'Type any sentence now:'
+  puts "Type any sentence now:\n"
 
   loop do
     text = STDIN.gets.chomp.to_s.gsub(/[[:space:]]+/, ' ').strip
     break if text == '/q' || text.empty?
-
-    runner = LightTr::Runner.new(store, translator)
-    return puts "  " + runner.translate(languages[0], text) if languages.count == 1
-    languages.each { |target| puts "  #{target.upcase}: #{runner.translate(target, text)}" }
+    if LightTr::Config.provider == 'google'
+      runner = LightTr::Runner.new(store, translator)
+      return puts "  " + runner.translate(languages[0], text) if languages.count == 1
+      languages.each { |target| puts "  #{target.upcase}: #{runner.translate(target, text)}" }
+    else
+      puts gpt.translate(text, languages)
+    end
     puts "\n"
   end
 end

data/lib/light_tr/chat_gpt.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'faraday'
+require 'faraday/mashify'
+
+module LightTr
+  class ChatGpt
+    SUPPORTED_LANGUAGES_MAP = { 'af' => 'Afrikaans', 'ga' => 'Irish', 'sq' => 'Albanian', 'it' => 'Italian', 'ar' => 'Arabic', 'ja' => 'Japanese', 'az' => 'Azerbaijani', 'kn' => 'Kannada', 'eu' => 'Basque', 'ko' => 'Korean', 'bn' => 'Bengali', 'la' => 'Latin', 'be' => 'Belarusian', 'lv' => 'Latvian', 'bg' => 'Bulgarian', 'lt' => 'Lithuanian', 'ca' => 'Catalan', 'mk' => 'Macedonian', 'ms' => 'Malay', 'mt' => 'Maltese', 'hr' => 'Croatian', 'no' => 'Norwegian', 'cs' => 'Czech', 'fa' => 'Persian', 'da' => 'Danish', 'pl' => 'Polish', 'nl' => 'Dutch', 'pt' => 'Portuguese', 'en' => 'English', 'ro' => 'Romanian', 'eo' => 'Esperanto', 'ru' => 'Russian', 'et' => 'Estonian', 'sr' => 'Serbian', 'tl' => 'Filipino', 'sk' => 'Slovak', 'fi' => 'Finnish', 'sl' => 'Slovenian', 'fr' => 'French', 'es' => 'Spanish', 'gl' => 'Galician', 'sw' => 'Swahili', 'ka' => 'Georgian', 'sv' => 'Swedish', 'de' => 'German', 'ta' => 'Tamil', 'el' => 'Greek', 'te' => 'Telugu', 'gu' => 'Gujarati', 'th' => 'Thai', 'ht' => 'Haitian Creole', 'tr' => 'Turkish', 'iw' => 'Hebrew', 'uk' => 'Ukrainian', 'hi' => 'Hindi', 'ur' => 'Urdu', 'hu' => 'Hungarian', 'vi' => 'Vietnamese', 'is' => 'Icelandic', 'cy' => 'Welsh', 'id' => 'Indonesian', 'yi' => 'Yiddish', 'zh-CN' => 'Chinese (Simplified)', 'zh-TW' => 'Chinese (Traditional)' }.freeze # rubocop:disable Layout/LineLength
+
+    def initialize(api_key, model = 'gpt-3.5-turbo')
+      @api_key = api_key
+      @model = model
+    end
+
+    def translate(query, languages)
+      completion(query, languages)
+    end
+
+    def models
+      @models ||= client.get('models').body.data.map(&:id).select { |id| id.include?('gpt') }
+    end
+
+    private
+
+    attr_reader :api_key, :model
+
+    def system(languages)
+      langs = languages.map { |lang| SUPPORTED_LANGUAGES_MAP[lang] }
+      intro = if langs.count == 1
+                "You are a translator, everything you receive next should be translated into #{langs[0]}."
+              else
+                "You are a translator, everything you receive next should be translated into #{langs[0]} or #{langs[1]}.\nIf the given text is in #{langs[1]}, translate it into #{langs[0]}.\nIf the text is in #{langs[0]}, translate it into #{langs[1]}." # rubocop:disable Layout/LineLength
+              end
+      intro + "\nTry to translate in a way that sounds natural to a native speaker of that language.\nOnly return the translation of the text; you don’t need to translate the code." # rubocop:disable Layout/LineLength
+    end
+
+    def completion(query, languages)
+      client.post(
+        'chat/completions', {
+        model: model,
+        temperature: 0.7,
+        messages: [
+          { role: 'system', content: system(languages) },
+          { role: 'user', content: query }
+        ] }
+      ).body.choices[0].message.content
+    end
+
+    def client
+      @client ||= Faraday.new(url: 'https://api.openai.com/v1') do |faraday|
+        faraday.request :authorization, 'Bearer', api_key
+        faraday.request :json
+        faraday.response :mashify
+        faraday.response :json
+        faraday.adapter Faraday.default_adapter
+      end
+    end
+  end
+end

data/lib/light_tr/commands.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require 'fileutils'
 require 'lockbox'
+require 'light_tr/chat_gpt'
 
 module LightTr
   class Commands
@@ -36,8 +37,8 @@ module LightTr
       puts "\noptions:"
       puts '  -config      : init configuration'
       puts '  -show_config : show configuration'
-      puts '  -clear_cache : clear translation cache'
-      puts '  -pl          : translate only one language (pl can be changed on any supported language)'
+      puts '  -clear_cache : clear translation cache [only for google provider]'
+      puts '  -pl          : translate only one language (pl can be changed on any supported language) [only for google provider]'
       puts '  -i           : run translator in interactive mode'
     end
 
@@ -48,11 +49,14 @@ module LightTr
     end
 
     def self.show_config
-      api_key  = ::LightTr::Config.api_key
+      api_key = ::LightTr::Config.api_key
       show_key = api_key[..10] + ('*' * (api_key.size - 10))
       puts 'Current configuration:'
       puts "\nlanguages                : #{::LightTr::Config.languages}"
       puts "Goggle Translate API key : #{show_key}\n"
+      puts "OpenAI API key           : #{::LightTr::Config.open_ai_key}"
+      puts "Provider                 : #{::LightTr::Config.provider}"
+      puts "Model                    : #{::LightTr::Config.model}"
     end
 
     def self.supported_languages
@@ -80,21 +84,63 @@ module LightTr
       value.to_s.split(',').map(&:strip).compact
     end
 
+    def self.default_model
+      'gpt-3.5-turbo'
+    end
+
     def self.update_config
       FileUtils.mkdir_p(::LightTr::Config.config_path) unless File.directory?(::LightTr::Config.config_path)
       puts 'Hello my friend lets setup Light Translator now!'
       puts 'We will need only two things, Google Translate API key and your favorite languages'
       puts "When you complete setup in your home directory will be created .light_tr/.config file with encrypted configuration"
+      puts "\n"
+      puts "\nYou can use two providers and set which one will be default: 'google' or 'openai'"
       puts "\nLet's add Google Translate API key first. Instructions on: https://cloud.google.com/translate/docs/quickstarts"
-      print 'Give me the Google Translate API key: '
+      print 'Give me the Google Translate API key: (empty to skip) '
       api_key = STDIN.gets.chomp
 
-      puts "\nlanguages example: pl, en, ru"
+      puts "\n"
+      puts "\nYou can choice multiple languages example: pl, en, ru"
+      puts "\nBut openia provider support only two languages because it's working a little bit differently."
+      puts "\nIt is detecting source language and translate to target language automatically. For example: pl, en"
+      puts "\n`Jak się dziś masz?` -> `How are you today?`"
       print 'Give me languages: '
       languages = prepare_languages(STDIN.gets.chomp).join(', ')
 
+      puts "\n"
+      puts "\nLet's add OpenAI API key now. Instructions on: https://platform.openai.com/api-keys"
+      print 'Give me the OpenAI API key key: (empty to skip) '
+      open_ai_api_key = STDIN.gets.chomp
+      models = open_ai_api_key.empty? ? [default_model] : ::LightTr::ChatGpt.new(open_ai_api_key).models
+      model = unless open_ai_api_key.empty?
+                puts "\n"
+                puts "\nLet's choice model for OpenAI. Default is (gpt-4o-mini)"
+                puts "\nAll available models:"
+                models.each { |m| puts m }
+
+                print 'Give me the model: (default is gpt-3.5-turbo) '
+                STDIN.gets.chomp
+              end
+
+      model = models.include?(model) ? model : default_model
+
+      puts "\n"
+      puts "\n Now let's set default provider. You can choice between 'google' and 'openai' (default is google if present)"
+      print 'Give me the provider: (you can use just letters g, o)'
+      provider = STDIN.gets.chomp
+      if %w[g google].include?(provider.downcase) && !api_key.empty?
+        provider = 'google'
+      elsif %w[o openai].include?(provider.downcase) && !open_ai_api_key.empty?
+        provider = 'openai'
+      else
+        provider = 'google'
+      end
+
       puts "\nYour configuration is:"
-      puts "API key: #{api_key}"
+      puts "Google API key: #{api_key}"
+      puts "OpenAI API key: #{open_ai_api_key}"
+      puts "OpenAI model: #{model.empty? ? default_model : model}"
+      puts "Provider: #{provider}"
       puts "languages: #{languages}\n\n"
 
       return languages_errors_and_update_config(languages) unless languages_valid?(languages)
@@ -109,6 +155,9 @@ module LightTr
       ::LightTr::Config.set({ 'master_key' => master_key })
       ::LightTr::Config.set({ 'api_key' => Lockbox.new(key: master_key).encrypt(api_key.strip) })
       ::LightTr::Config.set({ 'languages' => languages.strip })
+      ::LightTr::Config.set({ 'open_ai_key' => Lockbox.new(key: master_key).encrypt(open_ai_api_key.strip) })
+      ::LightTr::Config.set({ 'provider' => provider.strip })
+      ::LightTr::Config.set({ 'model' => (model.empty? ? default_model : model).strip })
 
       puts "\nHappy translating!"
     end

data/lib/light_tr/config.rb

@@ -11,18 +11,32 @@ module LightTr
       get['languages']
     end
 
+    def self.open_ai_key
+      get['open_ai_key'] || raise('OpenAI API key missing. Try to update configuration via `trans -config`')
+      master_key = get['master_key'] || raise('Config file corrupted. Try to update configuration via `trans -config`')
+      Lockbox.new(key: master_key).decrypt(get['open_ai_key'])
+    end
+
     def self.api_key
       get['api_key'] || raise('Google Translation API key missing. Try to update configuration via `trans -config`')
       master_key = get['master_key'] || raise('Config file corrupted. Try to update configuration via `trans -config`')
       Lockbox.new(key: master_key).decrypt(get['api_key'])
     end
 
+    def self.provider
+      get['provider'] || 'google'
+    end
+
+    def self.model
+      get['model'] || 'gpt-3.5-turbo'
+    end
+
     def self.config_path
       File.join(Dir.home, '.light_tr')
     end
 
     def self.config_exists?
-      File.exists?(config_file)
+      File.exist?(config_file)
     end
 
     def self.config_missing?

data/lib/light_tr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LightTr
-  VERSION = "1.0.0"
+  VERSION = "2.0.1"
 end

data/lib/light_tr.rb

@@ -4,6 +4,7 @@ require_relative "light_tr/version"
 require_relative "light_tr/config"
 require_relative "light_tr/store"
 require_relative "light_tr/translator"
+require_relative "light_tr/chat_gpt"
 require_relative "light_tr/runner"
 require_relative "light_tr/commands"
 

data/light_tr.gemspec

@@ -27,6 +27,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 2.12'
   spec.add_development_dependency 'guard-rspec', '~> 0'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_dependency 'faraday-mashify', '~> 0.1'
+  spec.add_dependency 'faraday', '~> 2.0'
   spec.add_dependency 'hashie', '~> 2.1'
   spec.add_dependency 'executable', '~> 1.2'
   spec.add_dependency 'awesome_print', '~> 1.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: light_tr
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Paweł Niemczyk
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-13 00:00:00.000000000 Z
+date: 2024-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: faraday-mashify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +144,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -128,6 +157,7 @@ files:
 - bin/setup
 - exe/trans
 - lib/light_tr.rb
+- lib/light_tr/chat_gpt.rb
 - lib/light_tr/commands.rb
 - lib/light_tr/config.rb
 - lib/light_tr/runner.rb