open_ai_bot 0.2.11 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 577e5ceaa83702d924c3d5d5bbdd030f77e6dde813e787d4ceabfe1785301007
-  data.tar.gz: e2a6bec851ee1d3b2ed7beb33471dcdf39a04f072ca477c72f7d38358b6f479b
+  metadata.gz: 33e8660fa731258c76bc1f3367fe02f866a02a189d49444d0006b791f49df6e4
+  data.tar.gz: fff2721f65eb41a74c9dc7569bc1be202ed3bd952c787fd371db158662542da8
 SHA512:
-  metadata.gz: daf9a35778b1933e6992de0198d44e2934f3257a02d9836a4faaf8b1146c8dd3a86515f047cc7b2e7f8ae86f377e28e9872028f3ac74104ccfab54c0c31eacd1
-  data.tar.gz: 0ba19cee1b518c306e063b84a1ffd0c42e018fd50ddf3d3c4250a0ce6bae7be09da24c065ff42abff2dba0fb2e2331c7ad449a18ad6a2355b79d605d6b11dea5
+  metadata.gz: 84ee567855c908efb78b5b4dc8133a35a954eb8b0d21ad0889518037eb3eed5fea210cdcb1a0f948f0b4fa323e0b92da0e5c5a6bfcf6af4d5d64bac796f09f7a
+  data.tar.gz: 2eab3c94fc4493ce5f02e62ca909cf9edbe24955ea4b3085dab3971f4449f958f61939f4d54e3beb02755f9f1977e1950bb588e6be8e7898e8f88224d3684561

data/Gemfile.lock

@@ -1,21 +1,18 @@
 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)
+    async (2.6.5)
       console (~> 1.10)
       fiber-annotation
       io-event (~> 1.1)
       timers (~> 4.1)
-    base64 (0.1.1)
-    coderay (1.1.3)
+    base64 (0.2.0)
     concurrent-ruby (1.2.2)
-    console (1.23.2)
+    console (1.23.3)
       fiber-annotation
       fiber-local
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
     down (5.4.1)
       addressable (~> 2.8)
     dry-core (1.0.1)
@@ -37,49 +34,26 @@ GEM
       dry-inflector (~> 1.0)
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    faraday (2.7.11)
+    event_stream_parser (0.3.0)
+    faraday (2.7.12)
       base64
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     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
     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)
     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)
+    io-event (1.3.3)
     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)
+    public_suffix (5.0.4)
+    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)
@@ -88,20 +62,13 @@ GEM
       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)
+    zeitwerk (2.6.12)
 
 PLATFORMS
-  arm64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
   down (~> 5.4)
-  http (~> 5.1)
-  nokogiri (~> 1.15)
-  pry
   ruby-openai (~> 5.1)
   rubydium (>= 0.2.5)
 

data/lib/open_ai/chat_gpt.rb

@@ -72,6 +72,16 @@ module OpenAI
       "NULL"
     end
 
+    def base64(file)
+      return unless config.open_ai["chat_gpt_model"] == "gpt-4-vision-preview"
+      return unless file
+
+      f = download_file(file)
+      res = Base64.encode64(f.read)
+      FileUtils.rm_rf("./#{f.original_filename}")
+      res
+    end
+
     def handle_gpt_command
       return unless bot_mentioned? || bot_replied_to? || private_chat?
       return if self.class.registered_commands.keys.any? { @text.include? _1 }
@@ -86,7 +96,8 @@ module OpenAI
         replies_to: @replies_to&.message_id,
         from: username(@user),
         body: @text_without_bot_mentions,
-        chat_id: @chat.id
+        chat_id: @chat.id,
+        base64_image: base64(@msg.photo&.last)
       )
 
       return unless current_message.valid?
@@ -98,7 +109,8 @@ 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,
+            base64_image: base64(@replies_to.photo&.last)
           )
         else
           nil
@@ -121,7 +133,7 @@ module OpenAI
       )
 
       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

data/lib/open_ai/message.rb

@@ -3,7 +3,7 @@ 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, :tokens, :chat_id, :base64_image
     attr_reader :role, :timestamp
 
     def initialize(**kwargs)
@@ -13,13 +13,24 @@ module OpenAI
     end
 
     def valid?
-      [body, from, id, chat_id].all?(&:present?)
+      [(base64_image || body), from, id, chat_id].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 base64_image
+        {
+          role: role,
+          content: [
+            { type: "text", text: msg },
+            { type: "image_url", image_url: { url: "data:image/jpeg;base64,#{base64_image}" } }
+          ]
+        }
+      else
+        { role:, content: msg }
+      end
     end
 
     # Format for machine-readable logs
@@ -35,7 +46,8 @@ module OpenAI
         "From" => from,
         "To" => replies_to,
         "Body" => body,
-        "Tokens used" => tokens
+        "Tokens used" => tokens,
+        "Image" => (base64_image ? "Some image" : "None")
       }.reject { |_k, v|
         v.blank?
       }.map { |k, v|

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/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.0"
   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.0
 platform: ruby
 authors:
 - bulgakke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-03 00:00:00.000000000 Z
+date: 2023-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down