open_ai_bot 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2e5ee8b986bfaff8105b3ae2415e3e5dc0401ad836f4a7b3a3ae4f402c72f07
-  data.tar.gz: 781bef28b9a896f40e7c07933bc9ba180875fc242b992749cc6c5eff82c2cc85
+  metadata.gz: 0522c533c52a78ca5524ce185ccd858e3534369d854d3049d77c02bc8a7810cc
+  data.tar.gz: c2fd62a33367bba69fbf6b14b26c17521ffbbc4ce1d8ace5b6d96572c25da4f7
 SHA512:
-  metadata.gz: c1f0c896c0d569751ceb554502918ecbd6521db9d734b3725a152686c343137b4b3f28c8062da9655eaa2a80fdb85b7320bc8bfea2573d90f5e0a1c522bb49c5
-  data.tar.gz: 5bf24970ad9796510f9de792978529d4413a6d39bd83277c1ab82da296cbb8cc61a2e534194182f3697350e1e8f76b70a5bab1c0a3c855c51ebe204eb5354e7c
+  metadata.gz: 436d2fe4a71f0b626cc147d4a868af91c46c7f7bca9c1a11440995e0924947032144f876926d2e143522b5cc06e8f8bb748d1ec6b8152b610f1dfb95cc23d17f
+  data.tar.gz: ff27d05381553aecf54eaddfd5b5bb4d1cbe7e3187f4eb4260a742efd7d08517c331f0fec2cb184077f1c11be6a332ac5fd4f053812e8bcc6535b3b509978ab0

data/lib/config_menu.rb

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+module ConfigMenu
+  def self.included(base)
+    base.on_every_message :handle_config_query
+    base.on_command "/config" do
+      $original_config_message_id = @message.id
+      $config_message_id = reply("clicky buttons:", reply_markup: config_menu).dig("result", "message_id")
+    end
+  end
+
+  def model_selection_menu
+    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 #{model}"
+        )
+      ]
+    end
+
+    options << [
+      Telegram::Bot::Types::InlineKeyboardButton.new(
+        text: "<< Go back",
+        callback_data: "/go_back"
+      )
+    ]
+
+    Telegram::Bot::Types::InlineKeyboardMarkup.new(inline_keyboard: options)
+  end
+
+  def config_menu
+    buttons = {
+      "Select model >>" => "/get_model_menu",
+      "Restart" => "/restart",
+      "Toggle price info" => "/toggle_price_info",
+      "Done" => "/config_done"
+    }
+
+    Telegram::Bot::Types::InlineKeyboardMarkup.new(
+      inline_keyboard: buttons.map { |k, v|
+        [Telegram::Bot::Types::InlineKeyboardButton.new(text: k, callback_data: v)]
+      }
+    )
+  end
+
+  def handle_config_query
+    return unless @update.is_a? Telegram::Bot::Types::CallbackQuery
+    return unless @user.username == config.owner_username
+
+    case @update.data
+    when "/get_model_menu"
+      @api.edit_message_text(chat_id: @chat.id, message_id: $config_message_id, reply_markup: model_selection_menu, text: "Select model")
+    when "/restart"
+      init_session
+    when "/toggle_price_info"
+      if config.respond_to?(:show_price_info)
+        config.show_price_info = !config.show_price_info
+      else
+        config.show_price_info = false
+      end
+      send_message("Now #{config.show_price_info ? "" : "NOT "}showing price info")
+    when "/go_back"
+      @api.edit_message_text(chat_id: @chat.id, message_id: $config_message_id, reply_markup: config_menu, text: "Config menu")
+    when "/config_done"
+      safe_delete_by_id($config_message_id, from_bot: true)
+      safe_delete_by_id($original_config_message_id)
+    else
+      handle_model_query
+    end
+  end
+
+  def handle_model_query
+    return unless @update.is_a? Telegram::Bot::Types::CallbackQuery
+    return unless @update.data.start_with? "/set_model "
+    return unless @user.username == config.owner_username
+
+    model = @update.data.delete_prefix("/set_model ").to_sym
+    return if OpenAI::Model::MODEL_INFO[model].nil?
+
+    text =
+      if current_thread.model.to_sym == model
+        "Already set to `#{model}`"
+      else
+        "Was `#{current_thread.model.to_s}`, now `#{model}`"
+      end
+
+    current_thread.model = OpenAI::Model.new(model)
+
+    send_message(text, parse_mode: "Markdown")
+  end
+end

data/lib/open_ai/chat_gpt.rb

@@ -118,6 +118,7 @@ module OpenAI
     def send_request!
       send_chat_action(:typing)
 
+      # todo: rewrite in async
       response = open_ai.chat(
         parameters: {
           model: current_thread.model.to_s,
@@ -154,6 +155,7 @@ module OpenAI
 
     def send_chat_gpt_response(text, tokens_info)
       tokens_text = tokens_info[:info]
+      tokens_text = '' if config.show_price_info == false
 
       id = reply(text + tokens_text).dig("result", "message_id")
 

data/lib/open_ai_bot.rb

@@ -12,14 +12,16 @@ require_relative "open_ai/image"
 require_relative "ext/blank"
 require_relative "ext/in"
 
+require_relative "config_menu"
+
 class OpenAIBot < Rubydium::Bot
   include OpenAI::ChatGPT
   include OpenAI::Dalle
   include OpenAI::Utils
   include OpenAI::Whisper
+  include ConfigMenu
 
   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"
@@ -37,37 +39,11 @@ class OpenAIBot < Rubydium::Bot
     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")
+  on_command "/dbg" do
+    must_be_owner do
+      binding.irb
+    end
   end
 
   def allowed_chat?

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.5"
+  spec.version       = "0.3.7"
   spec.authors       = ["bulgakke"]
   spec.email         = ["vvp835@yandex.ru"]
 
@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
     "http" => ["~> 5.1"],
     "nokogiri" => ["~> 1.15"],
     "rubydium" => [">= 0.2.5"],
-    "ruby-openai" => ["~> 5.1"]
+    "ruby-openai" => ["~> 8.1"]
   }.each do |name, versions|
     spec.add_dependency(name, *versions)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_ai_bot
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors:
 - bulgakke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-06-16 00:00:00.000000000 Z
+date: 2025-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '8.1'
 description:
 email:
 - vvp835@yandex.ru
@@ -95,6 +95,7 @@ files:
 - README.md
 - config.example.yaml
 - lib/clean_bot.rb
+- lib/config_menu.rb
 - lib/ext/blank.rb
 - lib/ext/in.rb
 - lib/my_custom_bot.rb