open_ai_bot 0.2.11 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 577e5ceaa83702d924c3d5d5bbdd030f77e6dde813e787d4ceabfe1785301007
-  data.tar.gz: e2a6bec851ee1d3b2ed7beb33471dcdf39a04f072ca477c72f7d38358b6f479b
+  metadata.gz: 21fff768a394b10773c77b9fafea42d01500cca136aea8c418753da1ad61024d
+  data.tar.gz: 7b2da8e1e8e0038a5420877ed0644888c0948976876dc065f65bb0f1ba9f94f1
 SHA512:
-  metadata.gz: daf9a35778b1933e6992de0198d44e2934f3257a02d9836a4faaf8b1146c8dd3a86515f047cc7b2e7f8ae86f377e28e9872028f3ac74104ccfab54c0c31eacd1
-  data.tar.gz: 0ba19cee1b518c306e063b84a1ffd0c42e018fd50ddf3d3c4250a0ce6bae7be09da24c065ff42abff2dba0fb2e2331c7ad449a18ad6a2355b79d605d6b11dea5
+  metadata.gz: 82fff5e67a384cbcd0cb6d8a99bb1a3c9a42016ced7dbe9bd2d93d694183ab299f5b9b308662660c3997aa3d6407e420151e28e019ed9d63c1a8716b50bb3b6e
+  data.tar.gz: e525381d25b1e2d81e3bbd73c6c6990753948d0287c476f531fca32f16e3980b0f8380869945e9254e639925a6247ac799a140442899496d74687554631370e2

data/.rubocop.yml

@@ -1,7 +1,7 @@
 require: rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 3.2.2
+  TargetRubyVersion: 3.3.2
   NewCops: enable
   Exclude:
    - test.rb

data/.ruby-version

@@ -0,0 +1 @@
+3.3.2

data/Gemfile.lock

@@ -1,22 +1,19 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    async (2.6.4)
-      console (~> 1.10)
+    async (2.12.0)
+      console (~> 1.25, >= 1.25.2)
       fiber-annotation
-      io-event (~> 1.1)
-      timers (~> 4.1)
-    base64 (0.1.1)
-    coderay (1.1.3)
-    concurrent-ruby (1.2.2)
-    console (1.23.2)
+      io-event (~> 1.6)
+    bigdecimal (3.1.8)
+    concurrent-ruby (1.3.2)
+    console (1.25.2)
       fiber-annotation
-      fiber-local
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    down (5.4.1)
+      fiber-local (~> 1.1)
+      json
+    down (5.4.2)
       addressable (~> 2.8)
     dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
@@ -31,55 +28,36 @@ GEM
       dry-types (>= 1.7, < 2)
       ice_nine (~> 0.11)
       zeitwerk (~> 2.6)
-    dry-types (1.7.1)
+    dry-types (1.7.2)
+      bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
       dry-inflector (~> 1.0)
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    faraday (2.7.11)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
+    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.0.2)
-    ffi (1.15.5)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
-      rake
+    faraday-net_http (3.1.0)
+      net-http
     fiber-annotation (0.2.0)
-    fiber-local (1.0.0)
-    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)
+    fiber-local (1.1.0)
+      fiber-storage
+    fiber-storage (0.1.1)
     ice_nine (0.11.2)
-    io-event (1.3.2)
-    llhttp-ffi (0.4.0)
-      ffi-compiler (~> 1.0)
-      rake (~> 13.0)
-    method_source (1.0.0)
-    multipart-post (2.3.0)
-    nokogiri (1.15.4-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
-      racc (~> 1.4)
-    pry (0.14.2)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    public_suffix (5.0.3)
-    racc (1.7.1)
-    rake (13.0.6)
-    ruby-openai (5.1.0)
+    io-event (1.6.0)
+    json (2.7.2)
+    multipart-post (2.4.1)
+    net-http (0.4.1)
+      uri
+    public_suffix (5.0.5)
+    ruby-openai (5.2.0)
+      event_stream_parser (>= 0.3.0, < 1.0.0)
       faraday (>= 1)
       faraday-multipart (>= 1)
-    ruby2_keywords (0.0.5)
-    rubydium (0.2.5)
+    rubydium (0.4.1)
       async (~> 2.3)
       telegram-bot-ruby (~> 1.0.0)
     telegram-bot-ruby (1.0.0)
@@ -87,23 +65,17 @@ GEM
       faraday (~> 2.0)
       faraday-multipart (~> 1.0)
       zeitwerk (~> 2.6)
-    timers (4.3.5)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    zeitwerk (2.6.11)
+    uri (0.13.0)
+    zeitwerk (2.6.15)
 
 PLATFORMS
-  arm64-darwin-22
+  ruby
   x86_64-linux
 
 DEPENDENCIES
   down (~> 5.4)
-  http (~> 5.1)
-  nokogiri (~> 1.15)
-  pry
   ruby-openai (~> 5.1)
   rubydium (>= 0.2.5)
 
 BUNDLED WITH
-   2.4.19
+   2.5.9

data/README.md

@@ -16,8 +16,8 @@ sudo apt install autoconf patch build-essential rustc libssl-dev libyaml-dev lib
 git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.13.1
 echo '. "$HOME/.asdf/asdf.sh"' >> ~/.bashrc
 asdf plugin add ruby https://github.com/asdf-vm/asdf-ruby.git
-asdf install ruby 3.2.2
-echo 'ruby 3.2.2' >> ~/.tool-versions
+asdf install ruby 3.3.2
+echo 'ruby 3.3.2' >> ~/.tool-versions
 ```
 
 2. `ffmpeg`

data/lib/open_ai/chat_gpt.rb

@@ -86,7 +86,9 @@ module OpenAI
         replies_to: @replies_to&.message_id,
         from: username(@user),
         body: @text_without_bot_mentions,
-        chat_id: @chat.id
+        chat_id: @chat.id,
+        chat_thread: current_thread,
+        image: Image.from_tg_photo(download_file(@msg.photo&.last), model: current_thread.model)
       )
 
       return unless current_message.valid?
@@ -98,7 +100,9 @@ module OpenAI
             replies_to: @replies_to.reply_to_message&.message_id,
             from: username(@target),
             body: @replies_to.text.to_s.gsub(/@#{config.bot_username}\b/, ""),
-            chat_id: @chat.id
+            chat_id: @chat.id,
+            chat_thread: current_thread,
+            image: Image.from_tg_photo(download_file(@replies_to.photo&.last), model: current_thread.model)
           )
         else
           nil
@@ -115,20 +119,21 @@ module OpenAI
 
       response = open_ai.chat(
         parameters: {
-          model: current_thread.model || config.open_ai["chat_gpt_model"],
+          model: current_thread.model.to_s,
           messages: current_thread.as_json
         }
       )
 
       if response["error"]
-        error_text = "```#{response["error"]["message"]}```"
+        error_text = "```\n#{response["error"]["message"]}```"
         error_text += "\n\nHint: send /restart command to reset the context." if error_text.match? "tokens"
         send_chat_gpt_error(error_text.strip)
       else
         text = response.dig("choices", 0, "message", "content")
-        tokens = response.dig("usage", "total_tokens")
 
-        send_chat_gpt_response(text, tokens)
+        tokens_info = get_tokens_info!(response)
+
+        send_chat_gpt_response(text, tokens_info)
       end
     end
 
@@ -136,15 +141,28 @@ module OpenAI
       reply(text, parse_mode: "Markdown")
     end
 
-    def send_chat_gpt_response(text, tokens)
-      id = reply(text).dig("result", "message_id")
+    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:)
+    end
+
+    def send_chat_gpt_response(text, tokens_info)
+      tokens_text = tokens_info[:info]
+
+      id = reply(text + tokens_text).dig("result", "message_id")
+
       bot_message = BotMessage.new(
         id: id,
         replies_to: @message_id,
         body: text,
         chat_id: @chat.id,
-        tokens: tokens
+        chat_thread: current_thread,
+        cost: tokens_info[:total]
       )
+
       current_thread.add(bot_message)
     end
   end

data/lib/open_ai/chat_thread.rb

@@ -3,8 +3,9 @@
 module OpenAI
   class ChatThread
     def initialize(defaults = [], model = nil)
+      model ||= OpenAIBot.config.open_ai["chat_gpt_model"].to_sym
       @history ||= defaults
-      @model = model
+      @model = model.is_a?(Model) ? model : Model.new(model)
       puts @history
     end
 
@@ -20,6 +21,14 @@ module OpenAI
       true
     end
 
+    def total_cost
+      @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/image.rb

@@ -0,0 +1,38 @@
+module OpenAI
+  class Image
+    BASE_TOKENS = 85
+    TILE_TOKENS = 170
+    TILE_SIZE = 512
+
+    def self.from_tg_photo(file, model:)
+      return unless file
+      return unless model.has_vision?
+
+      base64 = Base64.encode64(file.read)
+      size = `identify -format "%w %h" ./#{file.original_filename}`
+      width, height = size.split(" ")
+      FileUtils.rm_rf("./#{file.original_filename}")
+
+      new(width, height, base64)
+    end
+
+    attr_accessor :width, :height, :base64
+
+    def initialize(width, height, base64)
+      @width = width
+      @height = height
+      @base64 = base64
+    end
+
+    def tokens
+      @tokens ||= begin
+        tiles = tiles(width) * tiles(height)
+        (tiles * TILE_TOKENS) + BASE_TOKENS
+      end
+    end
+
+    def tiles(pixels)
+      (pixels.to_f / TILE_SIZE).ceil
+    end
+  end
+end

data/lib/open_ai/message.rb

@@ -3,23 +3,45 @@ module OpenAI
   # (ChatGPT isn't brilliant at parsing JSON sructures without starting to reply in JSON, so most of it is useless)
 
   class Message
-    attr_accessor :body, :from, :id, :replies_to, :tokens, :chat_id
+    attr_accessor :body, :from, :id, :replies_to, :chat_id, :image, :chat_thread, :cost
     attr_reader :role, :timestamp
 
     def initialize(**kwargs)
       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?
-      [body, from, id, chat_id].all?(&:present?)
+      [(image || body), from, id, chat_id, chat_thread].all?(&:present?)
     end
 
     # Format for OpenAI API
     def as_json
-      content = [from, body].compact.join("\n")
-      { role:, content: content }
+      msg = [from, body].compact.join("\n")
+
+      if image
+        {
+          role: role,
+          content: [
+            { type: "text", text: msg },
+            { type: "image_url", image_url: { url: "data:image/jpeg;base64,#{image.base64}" } }
+          ]
+        }
+      else
+        { role:, content: msg }
+      end
     end
 
     # Format for machine-readable logs
@@ -35,7 +57,8 @@ module OpenAI
         "From" => from,
         "To" => replies_to,
         "Body" => body,
-        "Tokens used" => tokens
+        # "Tokens used" => tokens,
+        "Image" => (image ? "Some image" : "None")
       }.reject { |_k, v|
         v.blank?
       }.map { |k, v|
@@ -57,7 +80,7 @@ module OpenAI
     end
 
     def valid?
-      body.present?
+      [body, chat_thread].all?(&:present?)
     end
   end
 
@@ -68,7 +91,7 @@ module OpenAI
     end
 
     def valid?
-      [body, id, chat_id, tokens].all?(&:present?)
+      [body, id, chat_id, chat_thread].all?(&:present?)
     end
   end
 end

data/lib/open_ai/model.rb

@@ -0,0 +1,63 @@
+module OpenAI
+  class Model
+    # All prices are per 1K tokens
+    MODEL_INFO = {
+      "gpt-4o": {
+        max_context: 128_000,
+        prompt_price: 0.005,
+        completion_price: 0.015,
+        vision_price: 0.005
+      },
+      "gpt-3.5-turbo": {
+        max_context: 16385,
+        prompt_price: 0.0005,
+        completion_price: 0.0015,
+        vision_price: 0
+      }
+    }
+
+    attr_accessor :max_context, :prompt_price, :completion_price, :vision_price
+
+    [:max_context, :prompt_price, :completion_price, :vision_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]
+
+      @model = model
+    end
+
+    def to_s
+      @model
+    end
+
+    def has_vision?
+      MODEL_INFO[@model][:vision_price].positive?
+    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
+
+      total = prompt_cost + completion_cost + vision_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
+      }.map { |k, v|
+        "#{k}: #{v}"
+      }.join("\n")
+
+      { info:, total: }
+    end
+  end
+end

data/lib/open_ai/utils.rb

@@ -15,6 +15,8 @@ module OpenAI
     end
 
     def download_file(voice, dir=nil)
+      return unless voice
+
       file_path = @api.get_file(file_id: voice.file_id)["result"]["file_path"]
 
       url = "https://api.telegram.org/file/bot#{config.token}/#{file_path}"

data/lib/open_ai/whisper.rb

@@ -40,7 +40,7 @@ module OpenAI
       reply(text)
     end
 
-    def send_whisper_error
+    def send_whisper_error(text)
       reply_code(text)
     end
 

data/lib/open_ai_bot.rb

@@ -6,11 +6,12 @@ require_relative "open_ai/message"
 require_relative "open_ai/dalle"
 require_relative "open_ai/utils"
 require_relative "open_ai/whisper"
+require_relative "open_ai/model"
+require_relative "open_ai/image"
 
 require_relative "ext/blank"
 require_relative "ext/in"
 
-
 class OpenAIBot < Rubydium::Bot
   include OpenAI::ChatGPT
   include OpenAI::Dalle

data/main.rb

@@ -5,6 +5,7 @@ require "openai"
 require "yaml"
 require "down"
 require "rubydium"
+require "base64"
 
 require_relative "lib/open_ai_bot"
 require_relative "lib/clean_bot"

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.2.11"
+  spec.version       = "0.3.1"
   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.2.11
+  version: 0.3.1
 platform: ruby
 authors:
 - bulgakke
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-03 00:00:00.000000000 Z
+date: 2024-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -80,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.1'
-description: 
+description:
 email:
 - vvp835@yandex.ru
 executables: []
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -100,7 +101,9 @@ files:
 - lib/open_ai/chat_gpt.rb
 - lib/open_ai/chat_thread.rb
 - lib/open_ai/dalle.rb
+- lib/open_ai/image.rb
 - lib/open_ai/message.rb
+- lib/open_ai/model.rb
 - lib/open_ai/utils.rb
 - lib/open_ai/whisper.rb
 - lib/open_ai_bot.rb
@@ -113,7 +116,7 @@ metadata:
   homepage_uri: https://github.com/bulgakke/open_ai_bot
   source_code_uri: https://github.com/bulgakke/open_ai_bot
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -128,8 +131,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: Telegram bot for using ChatGPT, DALL-E and Whisper
 test_files: []