papago 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5de9551002d06b2bba9bf63fdfaf8e0e516d002cdf95acebf238b180051d4b65
-  data.tar.gz: e4a7fd4c044c558d85878268bc216cb3bfd5391690e99e4baabd00c7a9056535
+  metadata.gz: 1974f1980eecef75f2f0f095f4740294839c1eddbd6cae7a3fd59ae550116d83
+  data.tar.gz: 0074c89724c97de92e666ed9c81288f6b7fa9630c7bab48ffb530306d8bdd02c
 SHA512:
-  metadata.gz: 42c4d22951d2f39f36cc5de9f485479f288e322d61f11a2640a98616b6bf5fc368fbc6f5aa08e0905fadd4bb5aaed31be0ed9d08eb62faf279a0b00fc533a35f
-  data.tar.gz: 27e8ddb7ddfc5538fe6eb0237aefec35e7a5da5baa2f4a14fcf573912df2d92ba532d431eb19e946dadc4bc125de7499eb546ab06e331c13f0ee4b4851463ff7
+  metadata.gz: 15dbb550862faa7611d8586bf9bfb672fa24a5373de18d30005da07fb4d7f053bcfd5bb4ee753a2b5b8b91426548a94aba5114991f5a33cc2fec98f5ea028ed8
+  data.tar.gz: 272cc413c83aa0b1c4978d552274228ea88563a8e82aea6e8eda4056d75e079932cde5e05f8cb0b63b8e1702ab3b184924672c830c1260e6b0af517436a6e9f9

data/bin/papago

@@ -1,27 +1,35 @@
 #!/usr/bin/env ruby
-
-require 'papago'
-require 'treely'
-require 'lolcat/lol'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/string/filters'
 require 'mercenary'
-
-Papago.configure do |config|
-  config.api_key = ENV['PAPAGO_API_KEY']
-end
+require 'papago'
 
 Mercenary.program(:papago) do |program|
   program.version Papago::VERSION
-  program.syntax 'papago netease'
+  program.syntax 'papago <text> [options]'
+
+  program.option 'switch', '-s', '--switch', 'Select a service'
+  program.option 'input', '-i', '--input PATH', String, 'Set file path'
+  program.option 'dest', '--dest IDENT', String, 'Set target language'
 
   program.action do |args, options|
-    if args.present?
-      contents = Papago.translate(args.join(%{ })).contents
-      contents.then { |_| Treely.tree(_) }
-              .then { |_| StringIO.new(_.to_s.remove(' []')) }
-              .then { |_| Lol.cat(_, { freq: 0.25, spread: 8.0, os: rand(256) }) }
-      puts %{}
+    if options['switch']
+      Papago::Actions::Switch
+        .process(config: Papago.config)
+    else
+      text = args.join(' ').strip
+      path = options['input']
+
+      if path and File.file?(path)
+        text = File.read(path)
+          .gsub(/\n/, ' ')
+          .strip
+      end
+
+      if text.empty?
+        puts 'No content'
+      else
+        Papago::Actions::Run
+          .process(text: text, dest: options['dest'])
+      end
     end
   end
 end

data/lib/papago/actions/run.rb

@@ -0,0 +1,42 @@
+module Papago
+  module Actions
+    class Run
+      attr_reader :printer
+      attr_reader :service
+
+      def initialize
+        @printer = Papago::Printer.new
+        @service = create_service(Papago.service_name || 'youdao')
+      end
+
+      private
+
+      def create_service(name)
+        if name.to_sym == :openai
+          Papago::OpenAIService.new(config: Papago.config)
+        else
+          DolphinKit.create_service(name)
+        end
+      end
+
+      def self.process(text:, dest:)
+        instance = self.new
+        printer = instance.printer
+        service = instance.service
+
+        case service.name
+        when :baidu, :qcloud
+          printer.println(
+            service.name,
+            service.call(text: text, target: dest)
+          )
+        else
+          printer.println(
+            service.name,
+            service.call(text: text)
+          )
+        end
+      end
+    end
+  end
+end

data/lib/papago/actions/switch.rb

@@ -0,0 +1,22 @@
+module Papago
+  module Actions
+    class Switch
+      CHOICES = %w{baidu openai qcloud youdao}
+
+      def self.process(config:)
+        prompt = TTY::Prompt.new
+        choice = prompt.select('Choose a service?', CHOICES)
+
+        config.set('translator.service_name', value: choice)
+        config.write(force: true)
+
+        if choice == 'openai' and (config.fetch('openai.endpoint').nil? or prompt.yes?('Update endpoint?'))
+          if endpoint = prompt.ask('OpenAI endpoint:')
+            config.set('openai.endpoint', value: endpoint)
+            config.write(force: true)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/papago/printer.rb

@@ -0,0 +1,68 @@
+module Papago
+  class Printer
+    def println(name, data)
+      puts send(:"result_#{name}", data)
+    end
+
+    private
+
+    def result_baidu(data)
+      result = data['trans_result']&.first
+      return data if result.nil?
+
+      tree_format({
+        name: result['src'],
+        contents: [
+          {
+            name: result['dst']
+          }
+        ]
+      })
+    end
+
+    def result_openai(data)
+      result = data['choices']&.first['text']
+      return data if result.nil?
+
+      tree_format({
+        name: result&.strip
+      })
+    end
+
+    def result_qcloud(data)
+      result = data['TargetText']
+      return data if result.nil?
+
+      tree_format({
+        name: result
+      })
+    end
+
+    def result_youdao(data)
+      return data unless data['errorCode'].zero?
+
+      explains = data.fetch('web', []).map { |explain|
+        {
+          name: "#{explain.fetch('key')}: #{explain.fetch('value').join(' ')}"
+        }
+      }
+
+      result = {
+        name: "#{data['query']} [#{data.dig('basic', 'phonetic')}]".gsub(' []', ''),
+        contents: [
+          {
+            name: data.fetch('translation').join(' '),
+            contents: (data.dig('basic', 'explains') || []).map { |explain| { name: explain } }
+          }
+        ] + explains
+      }
+
+      tree_format(result)
+    end
+
+    def tree_format(data)
+      result = StringIO.new(Treely.tree([data]).to_s)
+      Lol.cat(result, freq: 0.25, spread: 8.0, os: rand(128))
+    end
+  end
+end

data/lib/papago/services/openai_service.rb

@@ -0,0 +1,41 @@
+require 'securerandom'
+
+module Papago
+  class OpenAIService
+    attr_reader :name
+
+    def initialize(api_key: nil, config:)
+      @endpoint = config.fetch('openai.endpoint')
+      @token = api_key || ENV['OPENAI_FANYI_API_KEY']
+
+      @config = config
+      @name = :openai
+    end
+
+    def call(text:, user: nil)
+      user ||= generate_user_id
+      require 'http' unless defined?(HTTP)
+
+      response = HTTP
+        .auth("Token #{@token}")
+        .post(@endpoint, json: { prompt: text, user: user })
+
+      JSON.parse(response.body)
+    end
+
+    private
+
+    def generate_user_id
+      @user_id ||= @config.fetch('user_id')
+
+      if @user_id.nil?
+        @user_id = SecureRandom.hex
+
+        @config.set('user_id', value: @user_id)
+        @config.write(force: true)
+      end
+
+      @user_id
+    end
+  end
+end

data/lib/papago/version.rb

@@ -1,3 +1,3 @@
 module Papago
-  VERSION = '1.0.7'
+  VERSION = '1.1.0'
 end

data/lib/papago.rb

@@ -1,18 +1,55 @@
 require 'json'
-require 'open-uri'
+require 'lolcat'
+require 'treely'
+require 'stringio'
+require 'fileutils'
+require 'tty-config'
+require 'tty-prompt'
+require 'dolphin_kit'
 
 require 'papago/version'
-require 'papago/translator'
-require 'papago/configuration'
+require 'papago/services/openai_service'
+require 'papago/actions/switch'
+require 'papago/actions/run'
+require 'papago/printer'
 
 module Papago
-  module_function
+  class Application
+    attr_reader :config
 
-  def translate(text)
-    Translator.new(text)
+    def initialize
+      @config = TTY::Config.new
+      @config_dir = File.dirname(config_file)
+
+      unless File.exist?(@config_dir)
+        FileUtils.mkdir(@config_dir)
+      end
+
+      @config.append_path @config_dir
+
+      if File.exist?(config_file)
+        @config.read
+      else
+        @config.write
+      end
+    end
+
+    private
+
+    def config_file
+      @config_file ||= "#{Dir.home}/.papago/config.yml"
+    end
+  end
+
+  def self.service_name
+    config.fetch('translator.service_name')
+  end
+
+  def self.application
+    @application ||= Application.new
   end
 
-  def [](name)
-    configuration.send(name)
+  def self.config
+    @config ||= application.config
   end
 end

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: papago
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
-- matark
+- razeos at tossdev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-24 00:00:00.000000000 Z
+date: 2023-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: mercenary
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
-  type: :development
+        version: 0.4.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: tty-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: mercenary
+  name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.23.1
+- !ruby/object:Gem::Dependency
+  name: dolphin_kit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: lolcat
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '99.9'
+        version: '100.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '99.9'
+        version: '100.0'
 - !ruby/object:Gem::Dependency
   name: treely
   requirement: !ruby/object:Gem::Requirement
@@ -80,8 +94,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 description: 
-email: matark@naver.com
+email: 
 executables:
 - papago
 extensions: []
@@ -89,10 +117,12 @@ extra_rdoc_files: []
 files:
 - bin/papago
 - lib/papago.rb
-- lib/papago/configuration.rb
-- lib/papago/translator.rb
+- lib/papago/actions/run.rb
+- lib/papago/actions/switch.rb
+- lib/papago/printer.rb
+- lib/papago/services/openai_service.rb
 - lib/papago/version.rb
-homepage: https://opensource.matark.de/papago
+homepage: https://papago.vercel.app
 licenses:
 - MIT
 metadata: {}
@@ -111,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A simple command-line translator

data/lib/papago/configuration.rb

@@ -1,22 +0,0 @@
-module Papago
-  class Configuration
-    attr_accessor :key
-    attr_accessor :keyfrom
-
-    def api_key=(api_key)
-      @keyfrom, @key = api_key&.gsub(/[\w]+/).to_a
-    end
-  end
-
-  def self.configuration
-    @configuration ||= Configuration.new
-  end
-
-  def self.configuration=(config)
-    @configuration = config
-  end
-
-  def self.configure
-    yield configuration
-  end
-end

data/lib/papago/translator.rb

@@ -1,35 +0,0 @@
-module Papago
-  class Translator
-    def initialize(text)
-      @request = URI('https://fanyi.youdao.com/openapi.do')
-      @request.query = URI.encode_www_form({
-        :keyfrom => Papago[:keyfrom],
-        :key     => Papago[:key],
-        :type    => 'data',
-        :doctype => 'json',
-        :version => '1.1',
-        :q       => text
-      })
-
-      build_context!
-    end
-
-    def contents
-      [
-        {
-          name: "#{@context.fetch(:query)} [#{@context.dig(:basic, :phonetic)}]",
-          contents: [
-            {
-              name: @context.fetch(:translation).join(%{ }),
-              contents: (@context.dig(:basic, :explains) || []).map { |explain| { name: explain } }
-            }
-          ] + @context.fetch(:web, []).map { |explain| { name: "#{explain.fetch(:key)}: #{explain.fetch(:value).join(%{ })}" } }
-        }
-      ]
-    end
-
-    def build_context!
-      @context = JSON.parse(@request.read, symbolize_names: true)
-    end
-  end
-end