open_ai_bot 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aafb706ad49054fb0e35aab308ea6486ab89ea7e6740f081033b49a972b4dfb
-  data.tar.gz: 2b6b9c143e1465bc2e1f984d8ec611b234644b6f99bf3a033ca160a558871625
+  metadata.gz: b2e5ee8b986bfaff8105b3ae2415e3e5dc0401ad836f4a7b3a3ae4f402c72f07
+  data.tar.gz: 781bef28b9a896f40e7c07933bc9ba180875fc242b992749cc6c5eff82c2cc85
 SHA512:
-  metadata.gz: f486692224acc9d6897a426b37e56673779d2631bd2577e9a26ed0ff99715a1e8b14972649cfbbaab02db47233a878bd85f00b1a4cb0fb966a169d3a651a56f9
-  data.tar.gz: 6d0c11a1f76f4edf83ec4a011ded1a88bfc73d48ff7a7567c57525d519ec568fc458f5c262787422ac5f35fad97fe91e2f4d0b5c6564a7d5058ec08b3fd3458b
+  metadata.gz: c1f0c896c0d569751ceb554502918ecbd6521db9d734b3725a152686c343137b4b3f28c8062da9655eaa2a80fdb85b7320bc8bfea2573d90f5e0a1c522bb49c5
+  data.tar.gz: 5bf24970ad9796510f9de792978529d4413a6d39bd83277c1ab82da296cbb8cc61a2e534194182f3697350e1e8f76b70a5bab1c0a3c855c51ebe204eb5354e7c

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,8 +145,11 @@ module OpenAI
     def get_tokens_info!(response)
       completion_tokens = response.dig("usage", "completion_tokens")
       prompt_tokens = response.dig("usage", "prompt_tokens")
+      cached_prompt_tokens = response.dig("usage", "prompt_tokens_details", "cached_tokens")
 
-      result = current_thread.model.request_cost(completion_tokens:, prompt_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

@@ -9,7 +9,7 @@ module OpenAI
     end
 
     attr_reader :history
-    attr_reader :model
+    attr_accessor :model
 
     alias_method :messages, :history
 

data/lib/open_ai/model.rb

@@ -1,23 +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,
+        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
+      "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
-
-    [:max_context, :prompt_price, :completion_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
@@ -29,9 +65,14 @@ module OpenAI
       end
 
       @model = model
+      puts "Using #{@model}"
     end
 
     def to_s
+      @model.to_s
+    end
+
+    def to_sym
       @model
     end
 
@@ -39,15 +80,17 @@ module OpenAI
       MODEL_INFO[@model][:vision]
     end
 
-    def request_cost(prompt_tokens:, completion_tokens:, current_thread:)
-      prompt_cost     = prompt_tokens * prompt_price / 1000
-      completion_cost = completion_tokens * completion_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
+      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)}$)",
         total: "#{total.round(5)}$",
         total_for_this_conversation: "#{(thread_total + total).round(5)}$",
@@ -59,4 +102,4 @@ module OpenAI
       { info:, total: }
     end
   end
-end
+end

data/lib/open_ai_bot.rb

@@ -19,6 +19,7 @@ class OpenAIBot < Rubydium::Bot
   include OpenAI::Whisper
 
   on_every_message :handle_gpt_command
+  on_every_message :handle_model_query
   on_every_message :transcribe
 
   on_command "/restart", :init_session, description: "Resets ChatGPT session"
@@ -27,6 +28,47 @@ 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
+
+  on_command "/model" do
+    options = []
+    OpenAI::Model::MODEL_INFO.each do |model, info|
+      options << [
+        Telegram::Bot::Types::InlineKeyboardButton.new(
+          text: "#{model} - #{sprintf('%.2f', info[:output_price])}$",
+          callback_data: "/set #{model}"
+        )
+      ]
+    end
+    markup = Telegram::Bot::Types::InlineKeyboardMarkup.new(inline_keyboard: options)
+    reply("Select a model:", reply_markup: markup)
+  end
+
+  def handle_model_query
+    return unless @update.is_a? Telegram::Bot::Types::CallbackQuery
+    return unless @update.data.start_with? "/set "
+    return unless @user.username == config.owner_username
+
+    model = @update.data.delete_prefix("/set ").to_sym
+    return if OpenAI::Model::MODEL_INFO[model].nil?
+
+    text =
+      if current_thread.model.to_sym == model
+        "Already set to `#{model}`"
+      else
+        current_thread.model = OpenAI::Model.new(model)
+        "Was `#{current_thread.model.to_s}`, now `#{model}`"
+      end
+
+    reply(text, parse_mode: "Markdown")
+  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.3"
+  spec.version       = "0.3.5"
   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.3
+  version: 0.3.5
 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