slack-smart-bot 1.15.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c3c10ede28d806c5c386904621b877fdc1077f84f758b5affde34b3160340bf
-  data.tar.gz: 4db939606739e903c5d2916ea4d12409457eb3a62a8a740a0dec42f022f6bb70
+  metadata.gz: e1ec24ff7541e492caee8aff8859fae65963c3b3fa54e644487a9e0724bccf20
+  data.tar.gz: 47b2dccd551039cbc4eb58c6e59d21a30c5b6530b2577f8d49074a5aaf858380
 SHA512:
-  metadata.gz: d204840c2f03710234fcc7f959b85256065cc312784cd5bb0f3e40aced01301a0a695c35e66161091d0b88e11d2e57283e47782752543240fff1ed00cda7ad0d
-  data.tar.gz: f06acd8003f313d2711710778e4a7119434d349107c4930e68800ef61620b367635ec047191061830711ee4c6eefbd5ade67eb06f320cdea2f249338cad22eb5
+  metadata.gz: e61474e52807d80a855e6ee1a75826ebd0749cfac5026c9261db6ca30b4667842a92daaaa5ad1796c2dea0ee648ad2899c508256425d0830661bbf9cb01bdaf0
+  data.tar.gz: c3f7743d1e18d1949b09b4f83d0bcc0ab949020c28acac5961555fc5e1facb1b8baa3e2ddff2be73715460d64fe146c89879f7dcd7057d6c162847eeeec730de

data/lib/slack/smart-bot/commands/general/summarize.rb

@@ -145,21 +145,21 @@ class SlackSmartBot
             else
               max_num_tokens = 8000
             end
-            num_tokens = Tiktoken.encoding_for_model(chatgpt.smartbot_model).encode(prompt_orig + messages.values.flatten.join).length
+            num_tokens = OpenAI.rough_token_count(prompt_orig + messages.values.flatten.join)
             respond ":information_source: ChatGPT model: *#{chatgpt.smartbot_model}*. Max tokens: *#{max_num_tokens}*. Characters: #{messages.values.flatten.join.size}. Messages: #{messages.values.flatten.size}. Threads: #{act_threads.size}. Users: #{act_users.size}. Chatgpt tokens: *#{num_tokens}*"
 
             prompts = []
             i = 0
             messages.each do |year_month, msgs|
               msgs.each do |msg|
-                num_tokens = Tiktoken.encoding_for_model(chatgpt.smartbot_model).encode(prompts[i].to_s + msg).length
+                num_tokens = OpenAI.rough_token_count(prompts[i].to_s + msg)
                 i += 1 if num_tokens > max_num_tokens
                 prompts[i] ||= prompt_orig
                 prompts[i] += "#{msg}\n"
               end
             end
             prompts.each_with_index do |prompt, i|
-              num_tokens = Tiktoken.encoding_for_model(chatgpt.smartbot_model).encode(prompt).length #if model != chatgpt.smartbot_model
+              num_tokens = OpenAI.rough_token_count(prompt)
               respond ":information_source: The total number of chatgpt tokens is more than the max allowed for this chatgpt model. *Part #{i + 1} of #{prompts.size}*.\n" if prompts.size > 1
               success, res = SlackSmartBot::AI::OpenAI.send_gpt_chat(chatgpt.client, chatgpt.smartbot_model, prompt, chatgpt)
               result_messages = []

data/lib/slack-smart-bot.rb

@@ -13,7 +13,6 @@ require "nice_hash"
 require "cgi"
 require "yaml"
 require "nokogiri"
-require 'tiktoken_ruby'
 
 require_relative "slack/smart-bot/config"
 require_relative "slack/smart-bot/comm"

data/whats_new.txt

@@ -1,4 +1,4 @@
-*Version 1.15.0* Released 2024-Apr-04
+*Version 1.15.1* Released 2024-Apr-08
 
 *For General users*
 - OpenAI adds specific hosts and access tokens for services. (<https://github.com/MarioRuiz/slack-smart-bot/issues/107|#107>).

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-smart-bot
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.15.1
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
+date: 2024-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
@@ -214,26 +214,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: tiktoken_ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement