open_ai_bot 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e31ed7bc34cf94ba2d339a1efa6b57a0d9fd972aec39961a98253cb5b9dcc4df
-  data.tar.gz: 2f92b54b9788efacd9bf50b66004c777a8eeb3bd934ffc65a2ea93a4a12c39e6
+  metadata.gz: 70a3fabb10c860e1d7c45e83c74b38f7b393d4a1d31c86a73ccc4f827af6dcd8
+  data.tar.gz: 91436b52ead57fb638b4de1d74f573041fd541bae1352315632ae4414853fb28
 SHA512:
-  metadata.gz: 38ff4646a9493b2771d62cce25d8a2ff0ab589bc2d300041fec4536e6e75065e33c79fe452994dd5d9a628be6646e4ed97bb97a7c28503811b3a3db1b8fefa9f
-  data.tar.gz: 872adfdeb95db9ccbdd8073ee736136a40d4517b1b4eddee9ddf5885638dfe286c705554dd708c654dd1e9b83c62682626fd63cf3d2e878fea536a4d79c08d67
+  metadata.gz: '0908d995df133104dd4a591e7a9cff2c561f39753fc0570ac15eb3d9808ab644f7c04afef5682580c020bfca9d2e05e70573a4258427e9737bb18c2ef120ba60'
+  data.tar.gz: 6b54406776b00460dea2f1451313558b60bdb8fddb5dd843ec6ed64e6052a42affeae69bfe166be25ad7d641dd9d71980b25adaf0bb620462ce4b0e73d63d806

data/Gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "down", "~> 5.4"
 gem "rubydium", ">= 0.2.5"
-gem "ruby-openai", "~> 5.1"
+gem "ruby-openai", "~> 8.1"

data/Gemfile.lock

@@ -35,26 +35,29 @@ GEM
       dry-inflector (~> 1.0)
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    event_stream_parser (0.3.0)
-    faraday (2.9.1)
-      faraday-net_http (>= 2.0, < 3.2)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (3.1.0)
-      net-http
+    event_stream_parser (1.0.0)
+    faraday (2.13.1)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-multipart (1.1.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (3.4.1)
+      net-http (>= 0.5.0)
     fiber-annotation (0.2.0)
     fiber-local (1.1.0)
       fiber-storage
     fiber-storage (0.1.1)
     ice_nine (0.11.2)
     io-event (1.6.0)
-    json (2.7.2)
+    json (2.12.2)
+    logger (1.7.0)
     multipart-post (2.4.1)
-    net-http (0.4.1)
+    net-http (0.6.0)
       uri
     public_suffix (5.0.5)
-    ruby-openai (5.2.0)
-      event_stream_parser (>= 0.3.0, < 1.0.0)
+    ruby-openai (8.1.0)
+      event_stream_parser (>= 0.3.0, < 2.0.0)
       faraday (>= 1)
       faraday-multipart (>= 1)
     rubydium (0.4.1)
@@ -65,7 +68,7 @@ GEM
       faraday (~> 2.0)
       faraday-multipart (~> 1.0)
       zeitwerk (~> 2.6)
-    uri (0.13.0)
+    uri (1.0.3)
     zeitwerk (2.6.15)
 
 PLATFORMS
@@ -74,7 +77,7 @@ PLATFORMS
 
 DEPENDENCIES
   down (~> 5.4)
-  ruby-openai (~> 5.1)
+  ruby-openai (~> 8.1)
   rubydium (>= 0.2.5)
 
 BUNDLED WITH

data/lib/open_ai/chat_gpt.rb

@@ -145,9 +145,11 @@ 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!
+      cached_prompt_tokens = response.dig("usage", "prompt_tokens_details", "cached_tokens")
 
-      result = current_thread.model.request_cost(completion_tokens:, prompt_tokens:, vision_tokens:, current_thread:)
+      current_thread.model.request_cost(
+        completion_tokens:, prompt_tokens:, cached_prompt_tokens:, current_thread:
+      )
     end
 
     def send_chat_gpt_response(text, tokens_info)

data/lib/open_ai/chat_thread.rb

@@ -5,6 +5,7 @@ module OpenAI
     def initialize(defaults = [], model)
       @history ||= defaults
       @model = model.is_a?(Model) ? model : Model.new(model)
+      puts "Using #{@model}"
       puts @history
     end
 
@@ -24,10 +25,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

@@ -1,24 +1,59 @@
 module OpenAI
   class Model
-    # All prices are per 1K tokens
+    # All prices are in USD per 1M tokens
     MODEL_INFO = {
+      "gpt-4.1": {
+        max_context: 1_047_576,
+        input_price: 2.00,
+        cached_input_price: 0.50,
+        output_price: 8.00,
+        vision: true
+      },
+      "gpt-4.1-mini": {
+        max_context: 1_047_576,
+        input_price: 0.40,
+        cached_input_price: 0.10,
+        output_price: 1.60,
+        vision: true
+      },
+      "gpt-4.1-nano": {
+        max_context: 1_047_576,
+        input_price: 0.10,
+        cached_input_price: 0.025,
+        output_price: 0.40,
+        vision: true
+      },
       "gpt-4o": {
         max_context: 128_000,
-        prompt_price: 0.005,
-        completion_price: 0.015,
-        vision_price: 0.005
+        input_price: 5.00,
+        cached_input_price: 2.50,
+        output_price: 20.00,
+        vision: true
       },
-      "gpt-3.5-turbo": {
-        max_context: 16385,
-        prompt_price: 0.0005,
-        completion_price: 0.0015,
-        vision_price: 0
+      "gpt-4o-mini": {
+        max_context: 128_000,
+        input_price: 0.60,
+        cached_input_price: 0.30,
+        output_price: 2.40,
+        vision: true
+      },
+      "o3": {
+        max_context: 200_000,
+        input_price: 2.00,
+        cached_input_price: 0.50,
+        output_price: 8.00,
+        vision: true
+      },
+      "o4-mini": {
+        max_context: 200_000,
+        input_price: 1.10,
+        cached_input_price: 0.275,
+        output_price: 4.40,
+        vision: true
       }
     }
 
-    attr_accessor :max_context, :prompt_price, :completion_price, :vision_price
-
-    [:max_context, :prompt_price, :completion_price, :vision_price].each do |attr|
+    [:max_context, :input_price, :cached_input_price, :output_price].each do |attr|
       define_method(attr) do
         MODEL_INFO[@model][attr]
       end
@@ -37,21 +72,21 @@ 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:)
-      prompt_cost     = prompt_tokens * prompt_price / 1000
-      completion_cost = completion_tokens * completion_price / 1000
-      vision_cost     = vision_tokens * vision_price / 1000
+    def request_cost(prompt_tokens:, cached_prompt_tokens:, completion_tokens:, current_thread:)
+      prompt_cost     = prompt_tokens * input_price / 1_000_000
+      cached_prompt_cost = cached_prompt_tokens * cached_input_price / 1_000_000
+      completion_cost = completion_tokens * output_price / 1_000_000
 
-      total = prompt_cost + completion_cost + vision_cost
+      total = prompt_cost + cached_prompt_cost + completion_cost
       thread_total = current_thread.total_cost
 
       info = "\n\n" + {
-        prompt: "#{prompt_tokens} tokens (#{prompt_cost.round(5)}$)",
+        cached_prompt: "#{cached_prompt_tokens} tokens (#{cached_prompt_cost.round(5)}$)",
+        uncached_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
@@ -62,4 +97,4 @@ module OpenAI
       { info:, total: }
     end
   end
-end
+end

data/lib/open_ai_bot.rb

@@ -27,6 +27,14 @@ class OpenAIBot < Rubydium::Bot
   on_command "/help", description: "Sends useful help info" do
     reply(self.class.help_message)
   end
+  on_command "/d" do
+    return unless @user.username == config.owner_username
+    return unless @target&.id.in? [config.bot_id, @user.id]
+
+    current_thread.delete(@replies_to.message_id)
+    safe_delete(@replies_to)
+    safe_delete(@msg)
+  end
 
   def allowed_chat?
     return true if @user.username == config.owner_username

data/main.rb

@@ -24,7 +24,7 @@ bot = bots[bot_name]
 bot.config = YAML.load_file("#{__dir__}/config.yaml")
 bot.configure do |config|
   config.open_ai_client = OpenAI::Client.new(
-    access_token: config.open_ai_token
+    access_token: config.open_ai['token']
     # organization_id: config.open_ai_organization_id
   )
 end

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.2"
+  spec.version       = "0.3.4"
   spec.authors       = ["bulgakke"]
   spec.email         = ["vvp835@yandex.ru"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_ai_bot
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - bulgakke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-08 00:00:00.000000000 Z
+date: 2025-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down