open_ai_bot 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21fff768a394b10773c77b9fafea42d01500cca136aea8c418753da1ad61024d
-  data.tar.gz: 7b2da8e1e8e0038a5420877ed0644888c0948976876dc065f65bb0f1ba9f94f1
+  metadata.gz: 2aafb706ad49054fb0e35aab308ea6486ab89ea7e6740f081033b49a972b4dfb
+  data.tar.gz: 2b6b9c143e1465bc2e1f984d8ec611b234644b6f99bf3a033ca160a558871625
 SHA512:
-  metadata.gz: 82fff5e67a384cbcd0cb6d8a99bb1a3c9a42016ced7dbe9bd2d93d694183ab299f5b9b308662660c3997aa3d6407e420151e28e019ed9d63c1a8716b50bb3b6e
-  data.tar.gz: e525381d25b1e2d81e3bbd73c6c6990753948d0287c476f531fca32f16e3980b0f8380869945e9254e639925a6247ac799a140442899496d74687554631370e2
+  metadata.gz: f486692224acc9d6897a426b37e56673779d2631bd2577e9a26ed0ff99715a1e8b14972649cfbbaab02db47233a878bd85f00b1a4cb0fb966a169d3a651a56f9
+  data.tar.gz: 6d0c11a1f76f4edf83ec4a011ded1a88bfc73d48ff7a7567c57525d519ec568fc458f5c262787422ac5f35fad97fe91e2f4d0b5c6564a7d5058ec08b3fd3458b

data/lib/open_ai/chat_gpt.rb

@@ -8,6 +8,7 @@ module OpenAI
       end
 
       def new_thread(chat_id, model = nil)
+        model ||= config.open_ai["chat_gpt_model"].to_sym
         msgs = config.open_ai["whitelist"].include?(chat_id) ? initial_messages : []
         new_thread = ChatThread.new(msgs, model)
         threads[chat_id] = new_thread
@@ -144,9 +145,8 @@ module OpenAI
     def get_tokens_info!(response)
       completion_tokens = response.dig("usage", "completion_tokens")
       prompt_tokens = response.dig("usage", "prompt_tokens")
-      vision_tokens = current_thread.claim_vision_tokens!
 
-      result = current_thread.model.request_cost(completion_tokens:, prompt_tokens:, vision_tokens:, current_thread:)
+      result = current_thread.model.request_cost(completion_tokens:, prompt_tokens:, current_thread:)
     end
 
     def send_chat_gpt_response(text, tokens_info)

data/lib/open_ai/chat_thread.rb

@@ -2,8 +2,7 @@
 
 module OpenAI
   class ChatThread
-    def initialize(defaults = [], model = nil)
-      model ||= OpenAIBot.config.open_ai["chat_gpt_model"].to_sym
+    def initialize(defaults = [], model)
       @history ||= defaults
       @model = model.is_a?(Model) ? model : Model.new(model)
       puts @history
@@ -25,10 +24,6 @@ module OpenAI
       @history.map(&:cost).compact.sum
     end
 
-    def claim_vision_tokens!
-      @history.reject(&:vision_tokens_claimed?).map(&:claim_vision_tokens!).compact.sum
-    end
-
     def add(message)
       return false unless message&.valid?
       return false if @history.any? { message.id == _1.id}

data/lib/open_ai/message.rb

@@ -10,17 +10,6 @@ module OpenAI
       kwargs.each_pair { public_send("#{_1}=", _2) }
       @role = :user
       @timestamp = Time.now.to_i
-      @vision_tokens_claimed = !image
-    end
-
-    def vision_tokens_claimed?
-      @vision_tokens_claimed
-    end
-
-    def claim_vision_tokens!
-      # binding.pry
-      @vision_tokens_claimed = true
-      image&.tokens
     end
 
     def valid?

data/lib/open_ai/model.rb

@@ -6,26 +6,27 @@ module OpenAI
         max_context: 128_000,
         prompt_price: 0.005,
         completion_price: 0.015,
-        vision_price: 0.005
+        vision: true
       },
       "gpt-3.5-turbo": {
         max_context: 16385,
         prompt_price: 0.0005,
-        completion_price: 0.0015,
-        vision_price: 0
+        completion_price: 0.0015
       }
     }
 
-    attr_accessor :max_context, :prompt_price, :completion_price, :vision_price
+    attr_accessor :max_context, :prompt_price, :completion_price
 
-    [:max_context, :prompt_price, :completion_price, :vision_price].each do |attr|
+    [:max_context, :prompt_price, :completion_price].each do |attr|
       define_method(attr) do
         MODEL_INFO[@model][attr]
       end
     end
 
     def initialize(model)
-      raise ArgumentError.new("Unknown model: #{model}") unless MODEL_INFO[model]
+      if MODEL_INFO[model].nil?
+        raise ArgumentError.new("Unknown model: #{model.inspect}.")
+      end
 
       @model = model
     end
@@ -35,21 +36,19 @@ module OpenAI
     end
 
     def has_vision?
-      MODEL_INFO[@model][:vision_price].positive?
+      MODEL_INFO[@model][:vision]
     end
 
-    def request_cost(prompt_tokens:, completion_tokens:, vision_tokens:, current_thread:)
+    def request_cost(prompt_tokens:, completion_tokens:, current_thread:)
       prompt_cost     = prompt_tokens * prompt_price / 1000
       completion_cost = completion_tokens * completion_price / 1000
-      vision_cost     = vision_tokens * vision_price / 1000
 
-      total = prompt_cost + completion_cost + vision_cost
+      total = prompt_cost + completion_cost
       thread_total = current_thread.total_cost
 
       info = "\n\n" + {
         prompt: "#{prompt_tokens} tokens (#{prompt_cost.round(5)}$)",
         completion: "#{completion_tokens} tokens (#{completion_cost.round(5)}$)",
-        vision: "#{vision_tokens} tokens (#{vision_cost.round(5)}$)",
         total: "#{total.round(5)}$",
         total_for_this_conversation: "#{(thread_total + total).round(5)}$",
         max_context: max_context

data/open_ai_bot.gemspec

@@ -8,7 +8,7 @@ require_relative "lib/ext/in"
 
 Gem::Specification.new do |spec|
   spec.name          = "open_ai_bot"
-  spec.version       = "0.3.1"
+  spec.version       = "0.3.3"
   spec.authors       = ["bulgakke"]
   spec.email         = ["vvp835@yandex.ru"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open_ai_bot
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - bulgakke