slack-smart-bot 1.14.1 → 1.15.0

data/lib/slack/smart-bot/ai/open_ai/connect.rb

@@ -1,60 +1,182 @@
 class SlackSmartBot
   module AI
     module OpenAI
-      def self.connect(ai_open_ai, general_config, personal_settings, reconnect: false)
+      def self.connect(ai_open_ai, general_config, personal_settings, reconnect: false, service: :chat_gpt)
         require "openai"
+        require "nice_http"
         user = Thread.current[:user]
+        team_id_user = Thread.current[:team_id_user]
+
         ai_open_ai = {} if ai_open_ai.nil?
+        ai_open_ai_user = {}
 
         # ._ai to avoid to call .ai method from amazing_print
-        ai_open_ai[user.name] ||= { client: nil, gpt_model: general_config._ai.open_ai.gpt_model, whisper_model: general_config._ai.open_ai.whisper_model, image_size: general_config._ai.open_ai.image_size }
-        if personal_settings.key?(user.name) and personal_settings[user.name].key?("ai.open_ai.gpt_model") and
-           personal_settings[user.name]["ai.open_ai.gpt_model"] != ""
-          ai_open_ai[user.name][:gpt_model] = personal_settings[user.name]["ai.open_ai.gpt_model"]
-        elsif general_config.key?(:ai) and general_config[:ai].key?(:open_ai) and general_config[:ai][:open_ai].key?(:gpt_model) and
-              general_config[:ai][:open_ai][:gpt_model] != ""
-          ai_open_ai[user.name][:gpt_model] = general_config[:ai][:open_ai][:gpt_model]
-        end
-        if personal_settings.key?(user.name) and personal_settings[user.name].key?("ai.open_ai.whisper_model") and
-           personal_settings[user.name]["ai.open_ai.whisper_model"] != ""
-          ai_open_ai[user.name][:whisper_model] = personal_settings[user.name]["ai.open_ai.whisper_model"]
-        elsif general_config.key?(:ai) and general_config[:ai].key?(:open_ai) and general_config[:ai][:open_ai].key?(:whisper_model) and
-              general_config[:ai][:open_ai][:whisper_model] != ""
-          ai_open_ai[user.name][:whisper_model] = general_config[:ai][:open_ai][:whisper_model]
-        end
-        if personal_settings.key?(user.name) and personal_settings[user.name].key?("ai.open_ai.image_size") and
-           personal_settings[user.name]["ai.open_ai.image_size"] != ""
-          ai_open_ai[user.name][:image_size] = personal_settings[user.name]["ai.open_ai.image_size"]
-        elsif general_config.key?(:ai) and general_config[:ai].key?(:open_ai) and general_config[:ai][:open_ai].key?(:image_size) and
-              general_config[:ai][:open_ai][:image_size] != ""
-          ai_open_ai[user.name][:image_size] = general_config[:ai][:open_ai][:image_size]
-        end
-        if ai_open_ai.key?(user.name) and ai_open_ai[user.name] != nil and ai_open_ai[user.name].key?(:client) and
-           ai_open_ai[user.name][:client] != nil and !reconnect
-          # do nothing
-        elsif personal_settings.key?(user.name) and personal_settings[user.name].key?("ai.open_ai.access_token") and
-              personal_settings[user.name]["ai.open_ai.access_token"].to_s != ""
-          ai_open_ai[user.name].client = ::OpenAI::Client.new(access_token: personal_settings[user.name]["ai.open_ai.access_token"].to_s)
-        elsif general_config.key?(:ai) and general_config[:ai].key?(:open_ai) and general_config[:ai][:open_ai].key?(:access_token) and
-              general_config[:ai][:open_ai][:access_token] != ""
-          ai_open_ai[user.name].client = ::OpenAI::Client.new(access_token: general_config[:ai][:open_ai][:access_token])
+        ai_open_ai_user = {
+          host: general_config._ai.open_ai.host,
+          access_token: general_config._ai.open_ai.access_token,
+          models: {
+            client: nil,
+            host: general_config._ai.open_ai.models.host,
+            access_token: general_config._ai.open_ai.models.access_token,
+            url: general_config._ai.open_ai.models.url,
+            api_type: general_config._ai.open_ai.models.api_type,
+            api_version: general_config._ai.open_ai.models.api_version,
+          },
+          chat_gpt: {
+            client: nil,
+            host: general_config._ai.open_ai.chat_gpt.host,
+            access_token: general_config._ai.open_ai.chat_gpt.access_token,
+            model: general_config._ai.open_ai.chat_gpt.model,
+            smartbot_model: general_config._ai.open_ai.chat_gpt.smartbot_model,
+            api_type: general_config._ai.open_ai.chat_gpt.api_type,
+            api_version: general_config._ai.open_ai.chat_gpt.api_version,
+            fixed_user: general_config._ai.open_ai.chat_gpt.fixed_user, #for testing purposes
+          },
+          dall_e: {
+            client: nil,
+            host: general_config._ai.open_ai.dall_e.host,
+            access_token: general_config._ai.open_ai.dall_e.access_token,
+            image_size: general_config._ai.open_ai.dall_e.image_size,
+            model: general_config._ai.open_ai.dall_e.model,
+          },
+          whisper: {
+            client: nil,
+            host: general_config._ai.open_ai.whisper.host,
+            access_token: general_config._ai.open_ai.whisper.access_token,
+            model: general_config._ai.open_ai.whisper.model,
+          },
+        }
+        if personal_settings.key?(team_id_user) and personal_settings[team_id_user].key?("ai.open_ai.host") and
+           personal_settings[team_id_user]["ai.open_ai.host"] != ""
+          ai_open_ai_user[:host] = personal_settings[team_id_user]["ai.open_ai.host"]
+          ai_open_ai_user[:chat_gpt][:host] = ai_open_ai_user[:host]
+          ai_open_ai_user[:dall_e][:host] = ai_open_ai_user[:host]
+          ai_open_ai_user[:whisper][:host] = ai_open_ai_user[:host]
+          ai_open_ai_user[:models][:host] = ai_open_ai_user[:host]
+        end
+
+        if personal_settings.key?(team_id_user) and personal_settings[team_id_user].key?("ai.open_ai.access_token") and
+           personal_settings[team_id_user]["ai.open_ai.access_token"] != ""
+          ai_open_ai_user[:access_token] = personal_settings[team_id_user]["ai.open_ai.access_token"]
+          ai_open_ai_user[:chat_gpt][:access_token] = ai_open_ai_user[:access_token]
+          ai_open_ai_user[:dall_e][:access_token] = ai_open_ai_user[:access_token]
+          ai_open_ai_user[:whisper][:access_token] = ai_open_ai_user[:access_token]
+          ai_open_ai_user[:models][:access_token] = ai_open_ai_user[:access_token]
+        end
+
+        if personal_settings.key?(team_id_user) and personal_settings[team_id_user].key?("ai.open_ai.chat_gpt.model") and
+           personal_settings[team_id_user]["ai.open_ai.chat_gpt.model"] != ""
+          ai_open_ai_user[:chat_gpt][:model] = personal_settings[team_id_user]["ai.open_ai.chat_gpt.model"]
+        end
+        if personal_settings.key?(team_id_user) and personal_settings[team_id_user].key?("ai.open_ai.chat_gpt.smartbot_model") and
+           personal_settings[team_id_user]["ai.open_ai.chat_gpt.smartbot_model"] != ""
+          ai_open_ai_user[:chat_gpt][:smartbot_model] = personal_settings[team_id_user]["ai.open_ai.chat_gpt.smartbot_model"]
+        end
+
+        if personal_settings.key?(team_id_user) and personal_settings[team_id_user].key?("ai.open_ai.whisper.model") and
+           personal_settings[team_id_user]["ai.open_ai.whisper.model"] != ""
+          ai_open_ai_user[:whisper][:model] = personal_settings[team_id_user]["ai.open_ai.whisper.model"]
+        end
+        if personal_settings.key?(team_id_user) and personal_settings[team_id_user].key?("ai.open_ai.dall_e.image_size") and
+           personal_settings[team_id_user]["ai.open_ai.dall_e.image_size"] != ""
+          ai_open_ai_user[:dall_e][:image_size] = personal_settings[team_id_user]["ai.open_ai.dall_e.image_size"]
+        end
+
+        if personal_settings.key?(team_id_user) and personal_settings[team_id_user].key?("ai.open_ai.chat_gpt.host") and
+           personal_settings[team_id_user]["ai.open_ai.chat_gpt.host"] != ""
+          ai_open_ai_user[:chat_gpt][:host] = personal_settings[team_id_user]["ai.open_ai.chat_gpt.host"]
+        end
+        if personal_settings.key?(team_id_user) and personal_settings[team_id_user].key?("ai.open_ai.dall_e.host") and
+           personal_settings[team_id_user]["ai.open_ai.dall_e.host"] != ""
+          ai_open_ai_user[:dall_e][:host] = personal_settings[team_id_user]["ai.open_ai.dall_e.host"]
+        end
+        if personal_settings.key?(team_id_user) and personal_settings[team_id_user].key?("ai.open_ai.whisper.host") and
+           personal_settings[team_id_user]["ai.open_ai.whisper.host"] != ""
+          ai_open_ai_user[:whisper][:host] = personal_settings[team_id_user]["ai.open_ai.whisper.host"]
+        end
+
+        if personal_settings.key?(team_id_user) and personal_settings[team_id_user].key?("ai.open_ai.chat_gpt.access_token") and
+           personal_settings[team_id_user]["ai.open_ai.chat_gpt.access_token"] != ""
+          ai_open_ai_user[:chat_gpt][:access_token] = personal_settings[team_id_user]["ai.open_ai.chat_gpt.access_token"]
+        end
+        if personal_settings.key?(team_id_user) and personal_settings[team_id_user].key?("ai.open_ai.dall_e.access_token") and
+           personal_settings[team_id_user]["ai.open_ai.dall_e.access_token"] != ""
+          ai_open_ai_user[:dall_e][:access_token] = personal_settings[team_id_user]["ai.open_ai.dall_e.access_token"]
+        end
+        if personal_settings.key?(team_id_user) and personal_settings[team_id_user].key?("ai.open_ai.whisper.access_token") and
+           personal_settings[team_id_user]["ai.open_ai.whisper.access_token"] != ""
+          ai_open_ai_user[:whisper][:access_token] = personal_settings[team_id_user]["ai.open_ai.whisper.access_token"]
+        end
+
+        if personal_settings.key?(team_id_user) and personal_settings[team_id_user].key?("ai.open_ai.chat_gpt.api_type") and
+           personal_settings[team_id_user]["ai.open_ai.chat_gpt.api_type"] != ""
+          ai_open_ai_user[:chat_gpt][:api_type] = personal_settings[team_id_user]["ai.open_ai.chat_gpt.api_type"]
+        end
+        if personal_settings.key?(team_id_user) and personal_settings[team_id_user].key?("ai.open_ai.chat_gpt.api_version") and
+           personal_settings[team_id_user]["ai.open_ai.chat_gpt.api_version"] != ""
+          ai_open_ai_user[:chat_gpt][:api_version] = personal_settings[team_id_user]["ai.open_ai.chat_gpt.api_version"]
+        end
+        if personal_settings.key?(team_id_user) and personal_settings[team_id_user].key?("ai.open_ai.models.host") and
+            personal_settings[team_id_user]["ai.open_ai.models.host"] != ""
+          ai_open_ai_user[:models][:host] = personal_settings[team_id_user]["ai.open_ai.models.host"]
+        end
+        if personal_settings.key?(team_id_user) and personal_settings[team_id_user].key?("ai.open_ai.models.access_token") and
+            personal_settings[team_id_user]["ai.open_ai.models.access_token"] != ""
+          ai_open_ai_user[:models][:access_token] = personal_settings[team_id_user]["ai.open_ai.models.access_token"]
+        end
+        if personal_settings.key?(team_id_user) and personal_settings[team_id_user].key?("ai.open_ai.models.url") and
+            personal_settings[team_id_user]["ai.open_ai.models.url"] != ""
+          ai_open_ai_user[:models][:url] = personal_settings[team_id_user]["ai.open_ai.models.url"]
+        end
+
+        host = ai_open_ai_user[service].host
+        access_token = ai_open_ai_user[service].access_token
+
+        ai_open_ai[team_id_user] ||= ai_open_ai_user.deep_copy
+
+        if ai_open_ai.key?(team_id_user) and ai_open_ai[team_id_user] != nil and ai_open_ai[team_id_user][service].key?(:client) and
+           ai_open_ai[team_id_user][service][:client] != nil and !reconnect
+          # do nothing, we already have a client and we don't want to reconnect
+        elsif access_token.to_s != ""
+          ai_open_ai[team_id_user][service] = ai_open_ai_user[service].deep_copy
+          if host == ""
+            ai_open_ai[team_id_user][service][:client] = ::OpenAI::Client.new(uri_base: "https://api.openai.com/", access_token: access_token, request_timeout: 300)
+          else
+            if ai_open_ai_user[service].key?(:url) and ai_open_ai_user[service][:url] != ""
+              ai_open_ai[team_id_user][service][:client] = NiceHttp.new(host: host, headers: { 'Authorization': "Bearer #{ai_open_ai_user[service][:access_token]}" }, ssl: true, timeout: (30))
+            elsif ai_open_ai_user[service].key?(:api_type) and ai_open_ai_user[service][:api_type] == :openai_azure
+              if general_config._ai.open_ai.key?(:testing) and general_config._ai.open_ai.testing #and !general_config.simulate #todo: check
+                log = "#{general_config.path}/logs/chat_gpt_azure_#{team_id_user}.log"
+              else
+                log = :no
+              end
+              ai_open_ai[team_id_user][service][:client] = NiceHttp.new(host: host, headers: { 'api-key': access_token }, ssl: true, timeout: (30), log: log)
+            else
+              ai_open_ai[team_id_user][service][:client] = ::OpenAI::Client.new(uri_base: host, access_token: access_token, request_timeout: 300)
+            end
+          end
         else
-          ai_open_ai[user.name] = nil
+          ai_open_ai[team_id_user] = nil
           message = ["You need to set the OpenAI access token in the config file or in the personal settings."]
           message << "You can get it from https://platform.openai.com/account/api-keys"
-          message << "Then in case you are a master admin, you can set it in the SmartBot config file:"
-          message << "    `ai: { open_ai: { access_token: 'ACCESS_TOKEN'} }`"
           message << "If you want to use your personal access token, you can set it on a DM with SmartBot in the personal settings:"
-          message << "    `set personal settings ai.open_ai.access_token ACCESS_TOKEN`"
-          message << "By default we will be using the gpt_model #{general_config._ai.open_ai.gpt_model}. You can change it in the config file or in personal settings:"
-          message << "    `set personal settings ai.open_ai.gpt_model gpt-4`"
-          message << "By default we will be using the whisper_model #{general_config._ai.open_ai.whisper_model}. You can change it in the config file or in personal settings:"
-          message << "    `set personal settings ai.open_ai.whisper_model whisper-1`"
-          message << "You can also change the image size in the config file or in personal settings:"
-          message << "    `set personal settings ai.open_ai.image_size 512x512`"
+          message << "    `set personal settings ai.open_ai.#{service}.access_token ACCESS_TOKEN`"
+          if service == :chat_gpt
+            message << "By default we will be using the chatgpt model #{general_config._ai.open_ai.chat_gpt.model}. You can change it in the config file or in personal settings:"
+            message << "    `set personal settings ai.open_ai.chat_gpt.model gpt-4-0314`"
+            message << "For specifying the model for ChatGPT on REPLs: `set personal settings ai.open_ai.chat_gpt.smartbot_model gpt-4-0314`"
+          elsif service == :whisper
+            message << "By default we will be using the whisper model #{general_config._ai.open_ai.whisper.model}. You can change it in the config file or in personal settings:"
+            message << "    `set personal settings ai.open_ai.whisper.model whisper-1`"
+          elsif service == :dall_e
+            message << "You can also change the image size in the config file or in personal settings:"
+            message << "    `set personal settings ai.open_ai.dall_e.image_size 512x512`"
+          end
+          message << "In case you are a master admin, you can set it in the SmartBot config file:"
+          message << "    `ai: { open_ai: { #{service}: { access_token: 'ACCESS_TOKEN'} } }`"
           return ai_open_ai, message.join("\n")
         end
-        return ai_open_ai, ''
+        return ai_open_ai, ""
       end
     end
   end

data/lib/slack/smart-bot/ai/open_ai/models.rb

@@ -1,20 +1,72 @@
 class SlackSmartBot
   module AI
     module OpenAI
-      def self.models(open_ai_client, model='')
+      def self.models(open_ai_client, models_config, model='', return_response: false)
         require "openai"
+        require 'amazing_print'
         user = Thread.current[:user]
-        if model.empty?
-          response = open_ai_client.models.list
-          result = response.body.json().data.id.sort.join("\n")
+        if model.empty? or model == 'chatgpt'
+          if open_ai_client.is_a?(NiceHttp) and models_config.url != ""
+            resp = open_ai_client.get(models_config.url)
+            models = resp.body.json(:model_name)
+            models.select!{|i| i.include?('gpt-')} if model == 'chatgpt'
+          elsif open_ai_client.is_a?(NiceHttp) #azure
+            resp = open_ai_client.get("/openai/deployments?api-version=#{models_config.api_version}")
+            models = resp.body.json(:id)
+            models.select!{|i| i.include?('gpt-')} if model == 'chatgpt'
+          else
+            response = open_ai_client.models.list
+            models = []
+            response.data.each do |model|
+              models << model["id"]
+            end
+            models.select!{|i| i.include?('gpt-')} if model == 'chatgpt'
+          end
+          if return_response
+            return models.uniq.sort
+          else
+            return models.uniq.sort.join("\n")
+          end
         else
-          response = open_ai_client.models.retrieve(id: model)
-          result = response.body
+          response_obj = {}
+          if open_ai_client.is_a?(NiceHttp) and models_config.url != ""
+            resp = open_ai_client.get(models_config.url)
+            result = {}
+            resp.data.json.data.each do |m|
+              if m[:model_name].to_s == model
+                result = m
+                break
+              end
+            end
+            if result.empty?
+              response = {message: "Model not found"}
+              response_obj = response
+            else
+              response = {message: ''}
+              result[:model_info].each do |k,v|
+                response.message += "#{k}: #{v}\n"
+              end
+              response_obj = result[:model_info]
+            end
+          elsif open_ai_client.is_a?(NiceHttp) #azure
+            resp = open_ai_client.get("/openai/deployments/#{model}?api-version=#{models_config.api_version}")
+            response = resp.body.json()
+            response_obj = response
+          else
+            response = open_ai_client.models.retrieve(id: model)
+            response_obj = response
+          end
+          result = response.ai
         end
-        if !response.body.json(:message).empty? and response.body.json(:content).empty?
-          result = response.body.json(:message)
+        response = response.to_json
+        if !response.json(:message).empty? and response.json(:content).empty?
+          result = response.json(:message)
+        end
+        if return_response
+          return response_obj
+        else
+          return result
         end
-        return result
       end
     end
   end

data/lib/slack/smart-bot/ai/open_ai/send_gpt_chat.rb

@@ -1,21 +1,77 @@
 class SlackSmartBot
   module AI
     module OpenAI
-      def self.send_gpt_chat(open_ai_client, model, message)
+      def self.send_gpt_chat(open_ai_client, model, message, chat_gpt_config)
         require "openai"
+        require 'nice_http'
         user = Thread.current[:user]
-        response = open_ai_client.chat(
-          parameters: {
-            model: model, # Required.
-            messages: [{ role: "user", content: message }], # Required.
-            temperature: 0.7,
-          },
-        )
-        if !response.body.json(:message).empty? and response.body.json(:content).empty?
-          result = response.body.json(:message)
+        if user.key?(:sso_user_name)
+          user_name = user.sso_user_name
+        else
+          user_name = user.name
+        end
+        parameters = {
+          model: model, # Required.
+          messages: [{ role: "user", content: message }], # Required.
+          temperature: 0.7,
+          user: user_name
+        }
+        parameters.user = chat_gpt_config.fixed_user if chat_gpt_config.fixed_user.to_s != ""
+        if open_ai_client.is_a?(NiceHttp)
+          begin
+            response = {}
+            tries = 0
+            while (!response.key?(:data) or response.data.nil? or response.data.empty? ) and tries < 10
+              begin
+                request = {
+                  path: "/openai/deployments/#{model}/chat/completions?api-version=#{chat_gpt_config.api_version}",
+                  data: parameters
+                }
+                response = open_ai_client.post(request)
+              rescue Exception => exception
+                response = {message: exception.message}.to_json
+              end
+              tries += 1
+              sleep 1 if !response.key?(:data) or response.data.nil? or response.data.empty? #wait a second before trying again
+            end
+            response.data = { message: ""}.to_json if !response.key?(:data) or response.data.nil? or response.data.empty?
+            response = response.data
+          rescue Exception => exception
+            response = {message: exception.message}.to_json
+          end
+        else
+          begin
+            response = open_ai_client.chat(parameters: parameters)
+            response = response.to_json
+          rescue Exception => e
+            response = e.response
+            if !response.nil? and response.status == 403 and response.body.error.message.to_s.include?("You must pass a valid 'user'")
+              response.body.error.message += "\nThe user on Slack is: #{user.name}\nYou have to go to your Profile Slack Account on a browser. Then go to Settings.\nNow go to Username and click on expand, change the name to your SSO name and click on Save"
+            end
+            if response.nil?
+              response = {message: e.message}
+            else
+              response = response.to_json
+            end
+          end
+        end
+        if response.nil?
+          result = "No response from the AI. Please contact the SmartBot administrator."
+          return false, result
+        elsif response.is_a?(Hash) and response.key?(:message) and !response.key?(:content)
+          result = response[:message]
+          return false, result
+        elsif !response.json(:message).empty? and response.json(:content).empty?
+          result = response.json(:message)
+          return false, result
+        elsif !response.json(:error).empty? and !response.json(:code).empty?
+          result = response.json(:code)
+          return false, result
+        elsif !response.json(:error).empty?
+          result = response.json(:error).to_s
           return false, result
         else
-          result = response.body.json(:content)
+          result = response.json(:content)
           return true, result
         end
       end

data/lib/slack/smart-bot/ai/open_ai/send_image_edit.rb

@@ -11,10 +11,11 @@ class SlackSmartBot
         else
           response = open_api_client.images.edit(parameters: { image: image, prompt: message, size: size })
         end
-        if !response.body.json(:message).empty?
-          return false, "*OpenAI*: #{response.body.json(:message)}"
+        response = response.to_json
+        if !response.json(:message).empty?
+          return false, "*OpenAI*: #{response.json(:message)}"
         else
-          urls = [response.body.json(:url)].flatten
+          urls = [response.json(:url)].flatten
           return true, urls
         end
       end

data/lib/slack/smart-bot/ai/open_ai/send_image_generation.rb

@@ -4,12 +4,12 @@ class SlackSmartBot
       def self.send_image_generation(open_ai_client, message, image_size)
         require "openai"
         user = Thread.current[:user]
-        #todo: personal settings size #Jal
         response = open_ai_client.images.generate(parameters: { prompt: message, size: image_size })
-        if !response.body.json(:message).empty?
-          return false, "*OpenAI*: #{response.body.json(:message)}"
+        response = response.to_json
+        if !response.json(:message).empty?
+          return false, "*OpenAI*: #{response.json(:message)}"
         else
-          urls = [response.body.json(:url)].flatten
+          urls = response.json(:url)
           return true, urls
         end
       end

data/lib/slack/smart-bot/ai/open_ai/send_image_variation.rb

@@ -10,10 +10,11 @@ class SlackSmartBot
         else
           response = open_ai_client.images.variations(parameters: { image: image, n: variations, size: size })
         end
-        if !response.body.json(:message).empty?
-          return false, "*OpenAI*: #{response.body.json(:message)}"
+        response = response.to_json
+        if !response.json(:message).empty?
+          return false, "*OpenAI*: #{response.json(:message)}"
         else
-          urls = [response.body.json(:url)].flatten
+          urls = [response.json(:url)].flatten
           return true, urls
         end
       end

data/lib/slack/smart-bot/ai/open_ai/whisper_transcribe.rb

@@ -10,10 +10,11 @@ class SlackSmartBot
             file: File.open(file, "rb"),
           },
         )
-        if !response.body.json(:message).empty?
-          return false, response.body.json(:message)
+        response = response.to_json
+        if !response.json(:message).empty?
+          return false, response.json(:message)
         else
-          return true, response.body.json(:text)
+          return true, response.json(:text)
         end
       end
     end

data/lib/slack/smart-bot/comm/ask.rb

@@ -8,18 +8,30 @@ class SlackSmartBot
         dest = Thread.current[:dest]
       end
       if to.nil?
-        to = Thread.current[:user].name
+        to = Thread.current[:team_id_user]
       end
       if context.nil?
         context = Thread.current[:command]
       end
-      message = "#{to}: #{question}"
+      #remove the team_id from the user to
+      if to.is_a?(String)
+        if to.match?(/^[A-Z0-9]{7,11}_/)
+          to_name = to.split('_')[1..-1].join('_')
+        else
+          to_name = to
+          to = "#{config.team_id}_#{to}"
+        end
+      else
+        to_name = to.name
+        to = "#{to.team_id}_#{to.name}"
+      end
+      message = "#{to_name}: #{question}"
       if dest.nil?
         if config[:simulate]
           open("#{config.path}/buffer_complete.log", "a") { |f|
-            f.puts "|#{@channel_id}|#{config[:nick_id]}|#{config[:nick]}|#{message}~~~"
+            f.puts "|#{@channel_id}|#{Thread.current[:thread_ts]}|#{config[:nick_id]}|#{config[:nick]}|#{message}~~~"
           }
-        else  
+        else
           if Thread.current[:on_thread]
             client.message(channel: @channel_id, text: message, as_user: true, thread_ts: Thread.current[:thread_ts])
           else
@@ -29,15 +41,15 @@ class SlackSmartBot
         if config[:testing] and config.on_master_bot and !@buffered
           @buffered = true
           open("#{config.path}/buffer.log", "a") { |f|
-            f.puts "|#{@channel_id}|#{config[:nick_id]}|#{config[:nick]}|#{message}"
+            f.puts "|#{@channel_id}|#{Thread.current[:thread_ts]}|#{config[:nick_id]}|#{config[:nick]}|#{message}"
           }
         end
       elsif dest[0] == "C" or dest[0] == "G" # channel
         if config[:simulate]
           open("#{config.path}/buffer_complete.log", "a") { |f|
-            f.puts "|#{dest}|#{config[:nick_id]}|#{config[:nick]}|#{message}~~~"
+            f.puts "|#{dest}|#{Thread.current[:thread_ts]}|#{config[:nick_id]}|#{config[:nick]}|#{message}~~~"
           }
-        else  
+        else
           if Thread.current[:on_thread]
             client.message(channel: dest, text: message, as_user: true, thread_ts: Thread.current[:thread_ts])
           else
@@ -47,7 +59,7 @@ class SlackSmartBot
         if config[:testing] and config.on_master_bot and !@buffered
           @buffered = true
           open("#{config.path}/buffer.log", "a") { |f|
-            f.puts "|#{dest}|#{config[:nick_id]}|#{config[:nick]}|#{message}"
+            f.puts "|#{dest}|#{Thread.current[:thread_ts]}|#{config[:nick_id]}|#{config[:nick]}|#{message}"
           }
         end
       elsif dest[0] == "D" #private message

data/lib/slack/smart-bot/comm/dont_understand.rb

@@ -10,8 +10,8 @@ class SlackSmartBot
     if typem==:on_extended
       get_bots_created()
     end
-    text = get_help(rules_file, dest, user.name, typem==:on_extended, true)
-    
+    text = get_help(rules_file, dest, user, typem==:on_extended, true)
+
     ff = text.scan(/^\s*`\s*([^`]+)\s*`\s*$/i).flatten
     ff.delete("!THE_COMMAND")
     ff.delete("@NAME_OF_BOT THE_COMMAND")

data/lib/slack/smart-bot/comm/event_hello.rb

@@ -1,5 +1,10 @@
 class SlackSmartBot
   def event_hello()
+
+    if config.on_master_bot
+      File.open("#{config.path}/status/version.txt", 'w') {|f| f.write(VERSION) }
+    end
+
     @first_time_bot_started ||= true
     unless config.simulate
       m = "Successfully connected, welcome '#{client.self.name}' to the '#{client.team.name}' team at https://#{client.team.domain}.slack.com."
@@ -9,6 +14,30 @@ class SlackSmartBot
       @logger.info m
       config.nick = client.self.name
       config.nick_id = client.self.id
+      if config.granular_token.empty?
+        config.nick_granular = ""
+        config.nick_id_granular = ""
+      else
+        conn_granular = NiceHttp.new(host: "https://slack.com", log: :no)
+        conn_granular.headers = { authorization: "Bearer #{config.granular_token}" }
+        resp = conn_granular.get("/api/auth.test")
+        if resp.code.to_s == '200' and resp.body.json(:ok) == true
+          config.nick_granular = resp.body.json(:user)
+          config.nick_id_granular = resp.body.json(:user_id)
+        else
+          config.nick_granular = ""
+          config.nick_id_granular = ""
+        end
+        conn_granular.close
+      end
+      if client.team.key?(:enterprise_id)
+        config.team_id = client.team.enterprise_id
+        config.team_name = client.team.enterprise_name
+      else
+        config.team_id = client.team.id
+        config.team_name = client.team.name
+      end
+      config.team_domain = client.team.domain
     end
     @salutations = [config[:nick], "<@#{config[:nick_id]}>", "@#{config[:nick]}", "bot", "smart", "smartbot", "smart-bot", "smart bot"]
 
@@ -33,4 +62,4 @@ class SlackSmartBot
     end
     @first_time_bot_started = false
   end
-end
+end

data/lib/slack/smart-bot/comm/get_channel_members.rb

@@ -13,7 +13,8 @@ class SlackSmartBot
             end
         rescue Exception => stack
             @logger.warn stack
+            return []
         end
 
     end
-end
+end

data/lib/slack/smart-bot/comm/get_presence.rb

@@ -15,6 +15,7 @@ class SlackSmartBot
       end
     rescue Exception => stack
       @logger.warn stack
+      return {presence: "unknown"}
     end
   end
 end

data/lib/slack/smart-bot/comm/get_smartbot_team_info.rb

@@ -0,0 +1,10 @@
+class SlackSmartBot
+  def get_smartbot_team_info(token=nil)
+    token = config.token if token.nil?
+    client_web = Slack::Web::Client.new(token: token)
+    client_web.auth_test
+    resp = client_web.team_info
+    client_web = nil
+    return resp
+  end
+end