luogu 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b16f3080badfbe3a83427b1e7e2c13f60fdeebaa758a3009beb6fb88d81995b1
-  data.tar.gz: b270f3adb7cebb3f5391ef88aa1fd331a355465da5a861071a7b060f8c989955
+  metadata.gz: e5932a14c78478ce16a36f5cfd141834e9f677c90ddd7c398e8cdcbb66bd1ea4
+  data.tar.gz: a870afd3b6808cf89f01695a47b57c03ea906bf7b59e6b66bb28246a93215fac
 SHA512:
-  metadata.gz: 850096cb88ea2764db10802b13047443aaa81f9e4343d671a02d386abcebcfab1581a1a90453566eef7bb3eae5a49198d966029d7fc59143b62d1bc4e96f8b58
-  data.tar.gz: f9847779776839a7dff96e75cf7e7d932510c4700d01c8c77e8e91f1d3b4321afa01af3bac943aa7bf2f2580a05c77779818b0a5d9df965ed5280f1197ef9f64
+  metadata.gz: c5e59722ac54f8a247853bd67161297eae0976a6d402819ea4a774460f3ab4d2a5758c5511b9a4758747e5a1df93f760e7ad3f5084c395c5efe496f4d4abf17f
+  data.tar.gz: 5f69526dfc2f0b56f91daac355575703b0f6389ed889584663510598bf0f0fb5b6a53f95ccd7344656f621e0ec36b629c2d7c8009ffe9e07aa89b5a0b678a59d

data/Gemfile.lock

@@ -1,27 +1,40 @@
 PATH
   remote: .
   specs:
-    luogu (0.1.11)
+    luogu (0.1.14)
       dotenv (~> 2.8, >= 2.8.1)
       dry-cli (~> 1.0)
-      ruby-openai (~> 3.7)
+      http (~> 5.1, >= 5.1.1)
       tty-prompt (~> 0.23.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
     dotenv (2.8.1)
     dry-cli (1.0.0)
-    httparty (0.21.0)
-      mini_mime (>= 1.0.0)
-      multi_xml (>= 0.5.2)
-    mini_mime (1.1.2)
-    multi_xml (0.6.0)
+    ffi (1.15.5)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
+      rake
+    http (5.1.1)
+      addressable (~> 2.8)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.2)
+      llhttp-ffi (~> 0.4.0)
+    http-cookie (1.0.5)
+      domain_name (~> 0.5)
+    http-form_data (2.3.0)
+    llhttp-ffi (0.4.0)
+      ffi-compiler (~> 1.0)
+      rake (~> 13.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
+    public_suffix (5.0.1)
     rake (13.0.6)
-    ruby-openai (3.7.0)
-      httparty (>= 0.18.1)
     tty-color (0.6.0)
     tty-cursor (0.7.1)
     tty-prompt (0.23.1)
@@ -32,6 +45,9 @@ GEM
       tty-screen (~> 0.8)
       wisper (~> 2.0)
     tty-screen (0.8.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8.2)
     wisper (2.0.1)
 
 PLATFORMS

data/README.md

@@ -3,6 +3,9 @@
 
 用来开发 prompt 工程的工具
 
+### 更新记录
+- 0.1.14 讲http库替换成HTTP.rb并且加入了重试机制，默认为3次，可通过设置环境变量 OPENAI_REQUEST_RETRIES 来设置次数
+
 ### 安装
 - 安装ruby，要求2.6以上，Mac自带不需要再安装
 - gem install luogu

data/lib/luogu/chatgpt.rb

@@ -44,8 +44,7 @@ module Luogu
       response = client.chat(parameters: params)
       @context.response = response
       @plugin.after_request_proc.call(self, @context) if @plugin.after_request_proc
-
-      response.dig("choices", 0, "message", "content")
+      response.parse.dig("choices", 0, "message", "content")
     end
 
     def chat(user_message)

data/lib/luogu/init.rb

@@ -1,4 +1,4 @@
-require "openai"
+require "http"
 require 'dotenv/load'
 require "tty-prompt"
 require 'json'
@@ -8,6 +8,7 @@ require 'fileutils'
 require 'ostruct'
 require 'benchmark'
 
+require_relative 'openai'
 require_relative 'plugin'
 require_relative 'history_queue'
 require_relative "prompt_parser"
@@ -15,7 +16,7 @@ require_relative "chatgpt"
 require_relative "cli"
 
 def client
-  $client ||= OpenAI::Client.new
+  $client ||= Luogu::OpenAI::Client.new
 end
 
 class String

data/lib/luogu/openai.rb

@@ -0,0 +1,26 @@
+module Luogu::OpenAI
+  class Client
+    def initialize
+      @access_token = ENV.fetch('OPENAI_ACCESS_TOKEN')
+      @client = HTTP.auth("Bearer #{@access_token}").persistent "https://api.openai.com"
+    end
+
+    def chat(parameters: _params, params: nil, retries: 3)
+      params ||= parameters
+      retries_left = ENV.fetch('OPENAI_REQUEST_RETRIES', retries)
+      begin
+        @client.post('/v1/chat/completions', json: params)
+      rescue HTTP::Error => e
+        if retries_left > 0
+          puts "retrying ..."
+          retries_left -= 1
+          sleep(1)
+          retry
+        else
+          puts "Connection error #{e}"
+          return nil
+        end
+      end
+    end
+  end
+end

data/lib/luogu/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Luogu
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

data/lib/luogu.rb

@@ -9,9 +9,5 @@ module Luogu
 
   module_eval do
     Dotenv.load
-    
-    OpenAI.configure do |config|
-      config.access_token = ENV.fetch('OPENAI_ACCESS_TOKEN')
-    end
   end
 end

data/luogu.gemspec

@@ -32,10 +32,10 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
-  spec.add_dependency 'ruby-openai', '~> 3.7'
   spec.add_dependency 'dotenv', '~> 2.8', '>= 2.8.1'
   spec.add_dependency 'tty-prompt', '~> 0.23.1'
   spec.add_dependency 'dry-cli', '~> 1.0'
+  spec.add_dependency 'http', '~> 5.1', '>= 5.1.1'
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: luogu
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - MJ
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-13 00:00:00.000000000 Z
+date: 2023-04-19 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ruby-openai
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +58,26 @@ 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'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.1.1
 description: 使用markdown来快速实现 Prompt工程研发
 email:
 - tywf91@gmail.com
@@ -90,6 +96,7 @@ files:
 - lib/luogu/cli.rb
 - lib/luogu/history_queue.rb
 - lib/luogu/init.rb
+- lib/luogu/openai.rb
 - lib/luogu/plugin.rb
 - lib/luogu/prompt_parser.rb
 - lib/luogu/version.rb