chatgpt_cli 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18ebf57184dbc956922778541ca01af6fd63574a1f520073e7ff8a4dda6001c5
-  data.tar.gz: 6441aed15113f4509e50f8e59b98d4d4b0ec226a06a59252d3dc70aee49e1c6f
+  metadata.gz: 2db01f06350e322e2ce5723bce754dd6dfc210242b602b35bd0a7fa53a1f0a37
+  data.tar.gz: eaced5ad27bde6185d29ed8d86ea17fe028b34805496894fe5307be6b0070c95
 SHA512:
-  metadata.gz: d2951e7aabc888939c3d171525c45624b6b3d21831bd471f6fe7b0395a9ec722ba8a45b0754bfcee0a88f3bf76cfbbeca4cfa3a4074ab0c84723d09859f9a8c9
-  data.tar.gz: '087481736b6fbd3b19bea7fd8c567130f014d5bc6ad119731878f053e8af35b3fe11ea4e5d35faec8296398434d897c2c210fc3e974358972b6b6135947561e4'
+  metadata.gz: d18e1243cac286daafd2df3d5c920e1a79e30902cf7148f607307caa37beb6f941a67a6874487199e3ef956c18ba5537b62e39c47f2d4315dcedbceb0d866974
+  data.tar.gz: b26a1d944aa91fa74812d40fcf2236030b5b0076c0d29354731bac5e354ea36260c461db6a6601e8f403877a1a4c11c6c7dd880df3d715b6135015797305e81e

data/README.md

@@ -21,8 +21,14 @@ Or install it yourself as:
     $ gem install chatgpt_cli
 
 ## Usage
+```
+export CHATGPT_OPENAI_KEY=XXX
+export CHATGPT_OPENAI_ORGANIZATION=XXX
+```
 
-TODO: Write usage instructions here
+```
+在终端执行 gptcli(需要自行架梯子)
+```
 
 ## Development
 

data/chatgpt_cli.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = "CLI of ChatGPT"
   spec.homepage      = "https://github.com/sanm1992/chatgpt_cli"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 

data/lib/chatgpt_cli/chatgpt.rb

@@ -9,8 +9,6 @@ module ChatgptCli
     CHATGPT_OPENAI_MODEL = 'gpt-3.5-turbo'
     CHATGPT_OPENAI_ROLE = 'user'
 
-    attr_accessor :openai_key, :openai_organization
-
     def fetch_dependences
       self.openai_key = ENV.fetch('CHATGPT_OPENAI_KEY', nil)
       self.openai_organization = ENV.fetch('CHATGPT_OPENAI_ORGANIZATION', nil)
@@ -25,8 +23,14 @@ module ChatgptCli
       params = { model: CHATGPT_OPENAI_MODEL, messages: [{ role: CHATGPT_OPENAI_ROLE, content: content }] }
       headers = { 'Authorization': "Bearer #{self.openai_key}", 'content-type': 'application/json', 'OpenAI-Organization': self.openai_organization }
       res = Net::HTTP.post(URI(CHATGPT_OPENAI_URL), params.to_json, headers)
-      res = JSON.parse res.body
-      res['choices']&.first&.[]('message')&.[]('content')
+      body = JSON.parse res.body
+      messages = body.dig('error', 'message') || body&.[]('choices')&.first&.dig('message', 'content')
+
+      [res.code.to_i.eql?(200), messages]
     end
+
+    private
+
+    attr_accessor :openai_key, :openai_organization
   end
 end

data/lib/chatgpt_cli/cli.rb

@@ -23,6 +23,8 @@ module ChatgptCli
 
       welcome
 
+      Signal.trap('INT') { quit! }
+
       loop do
         get_instruction
 
@@ -36,6 +38,10 @@ module ChatgptCli
       exit(1)
     end
 
+    def error(message = nil)
+      out(message.to_s.red)
+    end
+
     private
 
     attr_accessor :line_index, :instruction, :search_content, :collback
@@ -49,8 +55,7 @@ module ChatgptCli
     end
 
     def start_tag
-      line_index ||= 0
-      "chatgpt:#{line_index += 1}> "
+      "chatgpt:#{self.line_index += 1}> "
     end
 
     def get_instruction
@@ -81,9 +86,11 @@ module ChatgptCli
         return true
       end
 
-      out "正在为你查找 #{search_content.join('')} 的答案"
       begin
+        out 'ChatGPT >>>>>>>'.magenta
+
         collback&.call(search_content.join(''))
+
         puts "\n"
       rescue => ex
         out ex.message
@@ -106,7 +113,7 @@ module ChatgptCli
     def out(str)
       print start_tag
 
-      str.each_char do |c|
+      str.to_s.each_char do |c|
         print c
         $stdout.flush
         sleep 0.05
@@ -114,5 +121,15 @@ module ChatgptCli
 
       puts "\n"
     end
+
+    # def loading
+    #   chars = %w[| / - \\]
+    #   i = 0
+    #   while i>=0 do
+    #     print "#{chars[i % 4]} loading.. "
+    #     i += 1
+    #     sleep(0.1)
+    #   end
+    # end
   end
 end

data/lib/chatgpt_cli/show_tool.rb

@@ -22,7 +22,7 @@ module ChatgptCli
     private
 
     def show_by_default(content)
-      content.each_char do |c|
+      content&.each_char do |c|
         print c
         $stdout.flush
         sleep 0.05

data/lib/chatgpt_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ChatgptCli
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/chatgpt_cli.rb

@@ -9,10 +9,9 @@ require_relative 'chatgpt_cli/show_tool'
 
 module ChatgptCli
   class Error < StandardError; end
-  # Your code goes here...
+
   class << self
     def exec
-      chatgpt_ai = ChatgptCli::Chatgpt.new
       cli = ChatgptCli::CLI.new
       cli.exec do |content|
         show_tool = ChatgptCli::ShowTool.new('default')
@@ -23,7 +22,8 @@ module ChatgptCli
         ai_ready, error = chatgpt_ai.fetch_dependences
         cli.quit!(error) unless ai_ready
 
-        show_tool.show chatgpt_ai.completion(content)
+        success, messages = chatgpt_ai.completion(content)
+        success ? show_tool.show(messages) : cli.error(messages)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chatgpt_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - sanm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-16 00:00:00.000000000 Z
+date: 2023-03-17 00:00:00.000000000 Z
 dependencies: []
 description: CLI of ChatGPT
 email:
@@ -51,7 +51,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="