chatgpt_assistant 0.1.6 → 0.1.8

data/lib/chatgpt_assistant/bots/telegram_bot.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require_relative "telegram/bot"
+require_relative "telegram/auth"
+require_relative "telegram/actions"
+require_relative "telegram/events"
+require_relative "telegram/chat_actions"
+require_relative "telegram/validations"
+require_relative "telegram/voice_actions"
+require_relative "telegram/permissions"
+require_relative "telegram/events_controller"
+
+module ChatgptAssistant
+  # This class is responsible for the telegram bot features
+  class TelegramBot < ApplicationBot
+    def start
+      bot.listen do |message|
+        @msg = message
+        @visitor = telegram_visited?(@msg.chat.id)
+        next unless telegram_text_or_audio?
+
+        text_events if telegram_message_has_text?
+        audio_event if telegram_message_has_audio?
+      end
+    rescue StandardError => e
+      Error.create(message: e.message, backtrace: e.backtrace)
+      retry
+    end
+
+    private
+
+      attr_accessor :msg, :visitor, :chat, :chat_id
+
+      include Bots::Telegram::Bot
+      include Bots::Telegram::Auth
+      include Bots::Telegram::Actions
+      include Bots::Telegram::Events
+      include Bots::Telegram::ChatActions
+      include Bots::Telegram::Validations
+      include Bots::Telegram::VoiceActions
+      include Bots::Telegram::Permissions
+      include Bots::Telegram::EventsController
+  end
+end

data/lib/chatgpt_assistant/chatter.rb

@@ -17,7 +17,7 @@ module ChatgptAssistant
       @response = request(message)
       @json = JSON.parse(response.body)
 
-      return no_response_error if json["choices"].empty?
+      return no_response_error if json["choices"] && json["choices"].empty?
       return bot_offline_error if response.status != 200
 
       text = json["choices"][0]["message"]["content"]
@@ -57,7 +57,8 @@ module ChatgptAssistant
       end
 
       def request_params(message)
-        messages = Message.where(chat_id: chat_id).order(id: :asc).last(10)
+        messages_from_chat = Message.where(chat_id: chat_id)
+        messages = messages_from_chat.order(id: :asc).last(10)
         messages = if messages.empty?
                      [{ role: "user", content: message }]
                    else
@@ -66,6 +67,13 @@ module ChatgptAssistant
                          content: mess.content }
                      end
                    end
+
+        first_message = messages_from_chat.order(id: :asc).first
+        system_message = first_message if first_message&.role == "system"
+        if system_message && Message.where(chat_id: chat_id).count > 10
+          messages.unshift({ role: system_message.role,
+                             content: system_message.content })
+        end
         {
           model: "gpt-3.5-turbo",
           messages: messages,

data/lib/chatgpt_assistant/config.rb

@@ -2,6 +2,7 @@
 
 require "active_record"
 require "active_model"
+require "action_mailer"
 require_relative "migrations"
 require "fileutils"
 
@@ -26,11 +27,16 @@ module ChatgptAssistant
       @aws_secret_access_key = ENV.fetch("AWS_SECRET_ACCESS_KEY", nil)
       @aws_region = ENV.fetch("AWS_REGION", nil)
       @discord_prefix = ENV.fetch("DISCORD_PREFIX", nil)
+      @azure_speech_url = ENV.fetch("AZURE_SPEECH_URL", nil)
+      @azure_speech_key = ENV.fetch("AZURE_SPEECH_KEY", nil)
     end
 
     attr_reader :openai_api_key, :telegram_token, :discord_token, :ibm_api_key, :ibm_url,
                 :aws_access_key_id, :aws_secret_access_key, :aws_region, :mode, :language,
-                :discord_client_id, :discord_public_key, :env_type, :discord_prefix
+                :discord_client_id, :discord_public_key, :env_type, :discord_prefix,
+                :azure_speech_url, :azure_speech_key,
+                :smtp_address, :smtp_port, :smtp_domain, :smtp_user_name, :smtp_password,
+                :smtp_authentication, :smtp_enable_starttls_auto
 
     def db_connection
       ActiveRecord::Base.establish_connection(

data/lib/chatgpt_assistant/default_messages.rb

@@ -43,7 +43,8 @@ module ChatgptAssistant
           chat_selected: "Chat selecionado com sucesso!",
           user_logged_in: "Login realizado com sucesso!",
           user_logged_out: "Logout realizado com sucesso!",
-          voice_channel_connected: "O bot entrou no canal de voz com sucesso!"
+          voice_channel_connected: "O bot entrou no canal de voz com sucesso!",
+          account_confirmed: "Conta confirmada com sucesso!"
         }
       end
 
@@ -77,7 +78,9 @@ module ChatgptAssistant
           text_length_too_long: "O texto de resposta é muito longo. Tente diminuir a quantidade de respostas na mesma mensagem.",
 
           invalid_command: "Comando inválido. Tente novamente.",
-          something_went_wrong: "Algo deu errado. Tente novamente mais tarde."
+          something_went_wrong: "Algo deu errado. Tente novamente mais tarde.",
+          account_not_verified: "Sua conta não foi verificada. Verifique sua caixa de email.",
+          account_not_confirmed: "Sua conta não foi confirmada. Verifique sua caixa de email."
         }
       end
 
@@ -127,7 +130,8 @@ module ChatgptAssistant
           chat_selected: "Chat selected successfully!",
           user_logged_in: "Login successfully!",
           user_logged_out: "Logout successfully!",
-          voice_channel_connected: "The bot entered the voice channel successfully!"
+          voice_channel_connected: "The bot entered the voice channel successfully!",
+          account_confirmed: "Your account has been verified!"
         }
       end
 
@@ -161,7 +165,9 @@ module ChatgptAssistant
           text_length_too_long: "The response text is too long. Try to reduce the number of responses in the same message.",
 
           invalid_command: "Invalid command. Try again.",
-          something_went_wrong: "Something went wrong. Try again later."
+          something_went_wrong: "Something went wrong. Try again later.",
+          account_not_verified: "Your account is not verified. Please check your email and verify your account.",
+          account_not_confirmed: "Something went wrong. Please check your email and verify your account. Maybe you pass the wrong code."
         }
       end
 

data/lib/chatgpt_assistant/error.rb

@@ -208,6 +208,15 @@ module ChatgptAssistant
     include LoadError
   end
 
+  # Account Not Verified Error
+  class AccountNotVerifiedError < StandardError
+    def initialize(message = load_error_context[:account_not_verified])
+      super(message)
+    end
+
+    include LoadError
+  end
+
   # Something Went Wrong Error
   class SomethingWentWrongError < StandardError
     def initialize(message = load_error_context[:something_went_wrong])

data/lib/chatgpt_assistant/migrations.rb

@@ -27,15 +27,20 @@ class UserMigration < ActiveRecord::Migration[5.2]
     create_table :users do |t|
       t.string :telegram_id, foreign_key: true, class_name: "Visitor"
       t.string :discord_id, foreign_key: true, class_name: "Visitor"
+      t.string :name, limit: 100
       t.string :email, null: false, limit: 100
+      t.string :phone, limit: 100
       t.string :password_hash, null: false, limit: 100
       t.string :password_salt, null: false, limit: 100
+      t.string :token, null: false, limit: 100, default: ""
+      t.string :openai_token, null: false, limit: 100, default: ""
       t.integer :current_chat_id, null: false, default: 0
       t.integer :role, null: false, default: 0
       t.integer :open_chats, null: false, default: 0
       t.integer :closed_chats, null: false, default: 0
       t.integer :total_chats, null: false, default: 0
       t.integer :total_messages, null: false, default: 0
+      t.boolean :active, null: false, default: false
       t.timestamps
     end
   end

data/lib/chatgpt_assistant/models.rb

@@ -44,6 +44,26 @@ class User < ActiveRecord::Base
     self.password_hash = BCrypt::Engine.hash_secret(password, password_salt)
   end
 
+  def encrypt_token
+    confirmation = { email: email, password_hash: password_hash, time: created_at }
+    BCrypt::Engine.hash_secret(JSON.parse(confirmation.to_json), password_salt)
+  end
+
+  def valid_password?(password)
+    BCrypt::Engine.hash_secret(password, password_salt) == password_hash
+  end
+
+  def confirm_account(hash)
+    confirmation = { email: email, password_hash: password_hash, time: created_at }
+    secret = BCrypt::Engine.hash_secret(JSON.parse(confirmation.to_json), password_salt)
+    return false unless secret == hash
+
+    self.token = secret
+    self.active = true
+    save
+    true
+  end
+
   def current_chat
     chats.find(current_chat_id)
   end

data/lib/chatgpt_assistant/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ChatgptAssistant
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end

data/lib/chatgpt_assistant.rb

@@ -8,9 +8,11 @@ require_relative "chatgpt_assistant/version"
 require_relative "chatgpt_assistant/config"
 require_relative "chatgpt_assistant/models"
 require_relative "chatgpt_assistant/error"
-require_relative "bots/application_bot"
-require_relative "bots/telegram_bot"
-require_relative "bots/discord_bot"
+require_relative "chatgpt_assistant/bots/application_bot"
+require_relative "chatgpt_assistant/bots/telegram_bot"
+require_relative "chatgpt_assistant/bots/discord_bot"
+require_relative "chatgpt_assistant/bots/mailers/application_mailer"
+require_relative "chatgpt_assistant/bots/mailers/account_mailer"
 require "awesome_chatgpt_actors"
 require "streamio-ffmpeg"
 require "aws-sdk-polly"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chatgpt_assistant
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - JesusGautamah
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-19 00:00:00.000000000 Z
+date: 2023-07-23 00:00:00.000000000 Z
 dependencies: []
 description: |-
   This gem has the intention to facilitate the creation of chatbots with  Chatgpt,
@@ -22,7 +22,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".env_prod_sample"
 - ".env_sample"
 - ".rspec"
 - ".rubocop.yml"
@@ -40,33 +39,44 @@ files:
 - SECURITY.md
 - deploy.sh
 - deploy_and_build.sh
-- docker-compose.prod.yml
 - docker-compose.yml
 - exe/chatgpt_assistant
 - exe/chatgpt_bot
-- lib/bots/application_bot.rb
-- lib/bots/discord_bot.rb
-- lib/bots/helpers/audio_helper.rb
-- lib/bots/helpers/authentication_helper.rb
-- lib/bots/helpers/discord_helper.rb
-- lib/bots/helpers/discord_voice_helper.rb
-- lib/bots/helpers/file_helper.rb
-- lib/bots/helpers/messenger_helper.rb
-- lib/bots/helpers/search_helper.rb
-- lib/bots/helpers/telegram_helper.rb
-- lib/bots/helpers/telegram_voice_helper.rb
-- lib/bots/helpers/validation_helper.rb
-- lib/bots/helpers/visit_helper.rb
-- lib/bots/jobs/new_chat_job.rb
-- lib/bots/jobs/register_job.rb
-- lib/bots/jobs/voice_connect_job.rb
-- lib/bots/services/new_chat_service.rb
-- lib/bots/services/register_service.rb
-- lib/bots/services/voice_connect_service.rb
-- lib/bots/telegram_bot.rb
 - lib/chatgpt_assistant.rb
 - lib/chatgpt_assistant/audio_recognition.rb
 - lib/chatgpt_assistant/audio_synthesis.rb
+- lib/chatgpt_assistant/bots/application_bot.rb
+- lib/chatgpt_assistant/bots/discord/actions.rb
+- lib/chatgpt_assistant/bots/discord/auth.rb
+- lib/chatgpt_assistant/bots/discord/bot.rb
+- lib/chatgpt_assistant/bots/discord/chat_actions.rb
+- lib/chatgpt_assistant/bots/discord/events.rb
+- lib/chatgpt_assistant/bots/discord/validations.rb
+- lib/chatgpt_assistant/bots/discord/voice_actions.rb
+- lib/chatgpt_assistant/bots/discord/voice_checkers.rb
+- lib/chatgpt_assistant/bots/discord_bot.rb
+- lib/chatgpt_assistant/bots/helpers/audio_helper.rb
+- lib/chatgpt_assistant/bots/helpers/file_helper.rb
+- lib/chatgpt_assistant/bots/helpers/messenger_helper.rb
+- lib/chatgpt_assistant/bots/helpers/search_helper.rb
+- lib/chatgpt_assistant/bots/jobs/new_chat_job.rb
+- lib/chatgpt_assistant/bots/jobs/register_job.rb
+- lib/chatgpt_assistant/bots/jobs/voice_connect_job.rb
+- lib/chatgpt_assistant/bots/mailers/account_mailer.rb
+- lib/chatgpt_assistant/bots/mailers/application_mailer.rb
+- lib/chatgpt_assistant/bots/services/new_chat_service.rb
+- lib/chatgpt_assistant/bots/services/register_service.rb
+- lib/chatgpt_assistant/bots/services/voice_connect_service.rb
+- lib/chatgpt_assistant/bots/telegram/actions.rb
+- lib/chatgpt_assistant/bots/telegram/auth.rb
+- lib/chatgpt_assistant/bots/telegram/bot.rb
+- lib/chatgpt_assistant/bots/telegram/chat_actions.rb
+- lib/chatgpt_assistant/bots/telegram/events.rb
+- lib/chatgpt_assistant/bots/telegram/events_controller.rb
+- lib/chatgpt_assistant/bots/telegram/permissions.rb
+- lib/chatgpt_assistant/bots/telegram/validations.rb
+- lib/chatgpt_assistant/bots/telegram/voice_actions.rb
+- lib/chatgpt_assistant/bots/telegram_bot.rb
 - lib/chatgpt_assistant/chatter.rb
 - lib/chatgpt_assistant/config.rb
 - lib/chatgpt_assistant/default_messages.rb
@@ -107,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Easy way chatbot with Chatgpt, Telegram bot, Discord bot, currently using

data/.env_prod_sample

@@ -1,18 +0,0 @@
-ENV_TYPE=production
-LANGUAGE=en # or pt currently
-MODE=aws # or ibm
-DISCORD_PREFIX=gpt!
-
-POSTGRES_DB=chatgpt_assistant_production # or your database
-POSTGRES_USER=postgres # or your user
-POSTGRES_PASSWORD=postgres # or your password
-
-IBM_API_KEY=Your IBM API Key
-IBM_URL=Your IBM Text to Speech URL
-TELEGRAM_TOKEN=Your Telegram Bot Token
-OPENAI_API_KEY=Your OpenAI API Key
-AWS_ACCESS_KEY=Your AWS Access Key
-AWS_SECRET_ACCESS_KEY=Your AWS Secret Access Key
-AWS_REGION=Your AWS Region
-DISCORD_CLIENT_ID=Your Discord Client ID
-DISCORD_TOKEN=Your Discord Token

data/docker-compose.prod.yml

@@ -1,34 +0,0 @@
-version: "3.3"
-services:
-  db:
-    image: postgres:12.2
-    ports:
-      - "5432:5432"
-    volumes:
-      - ./db_data:/var/lib/postgresql/data
-    env_file:
-      - .env_prod
-  telegram:
-    build: .
-    command: bash -c "exe/chatgpt_bot telegram"
-    volumes:
-      - .:/chatgpt_assistant
-    environment:
-      POSTGRES_HOST: db
-    env_file:
-      - .env_prod
-    depends_on:
-      - db
-  discord:
-    build: .
-    command: bash -c "exe/chatgpt_bot discord"
-    volumes:
-      - .:/chatgpt_assistant
-    environment:
-      POSTGRES_HOST: db
-    env_file:
-      - .env_prod
-    depends_on:
-      - db
-volumes:
-  postgres:

data/lib/bots/discord_bot.rb

@@ -1,182 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "helpers/discord_helper"
-require_relative "helpers/discord_voice_helper"
-
-module ChatgptAssistant
-  # This class is responsible to handle the discord bot
-  class DiscordBot < ApplicationBot
-    def start
-      start_event
-      login_event
-      register_event
-      list_event
-      hist_event
-      help_event
-      new_chat_event
-      sl_chat_event
-      ask_event
-      private_message_event
-      bot_init
-    end
-
-    private
-
-      include DiscordHelper
-      include DiscordVoiceHelper
-
-      attr_reader :message
-      attr_accessor :evnt, :user, :chats, :chat
-
-      def start_event
-        bot.command :start do |event|
-          @evnt = event
-          @user = event.user
-          start_action
-          "Ok"
-        end
-      end
-
-      def login_event
-        bot.command :login do |event|
-          @message = event.message.content.split[1]
-          @evnt = event
-          message.nil? ? event.respond(common_messages[:login]) : login_action
-          "OK"
-        end
-      end
-
-      def register_event
-        bot.command :register do |event|
-          @message = event.message.content.split[1]
-          @evnt = event
-          message.nil? ? event.respond(common_messages[:register]) : register_action
-          "OK"
-        end
-      end
-
-      def list_event
-        bot.command :list do |event|
-          @evnt = event
-          @user = find_user(discord_id: event.user.id)
-          valid_for_list_action? ? list_action : ""
-          "OK"
-        end
-      end
-
-      def hist_event
-        bot.command :hist do |event|
-          @evnt = event
-          @user = find_user(discord_id: event.user.id)
-          @chat = user.current_chat
-          event.respond error_messages[:chat_not_found] if chat.nil? && user
-          hist_action if user && chat
-          "OK"
-        end
-      end
-
-      def help_event
-        bot.command :help do |event|
-          @evnt = event
-          help_action
-          "OK"
-        end
-      end
-
-      def new_chat_event
-        bot.command :new_chat do |event|
-          @evnt = event
-          @user = find_user(discord_id: event.user.id)
-          event.respond error_messages[:user_not_logged_in] if user.nil?
-          create_chat_action if user
-          "OK"
-        end
-      end
-
-      def sl_chat_event
-        bot.command :sl_chat do |event|
-          @evnt = event
-          chat_to_select = event.message.content.split[1..].join(" ")
-          @user = find_user(discord_id: event.user.id)
-          event.respond error_messages[:user_not_logged_in] if user.nil?
-
-          sl_chat_action(chat_to_select) if user
-          "OK"
-        end
-      end
-
-      def ask_event
-        bot.command :ask do |event|
-          @evnt = event
-          @message = event.message.content.split[1..].join(" ")
-          @user = find_user(discord_id: event.user.id)
-          event.respond error_messages[:user_not_logged_in] if user.nil?
-          ask_action if user
-          "OK"
-        end
-      end
-
-      def voice_connect_event
-        bot.command :connect do |event|
-          @evnt = event
-          @user = find_user(discord_id: event.user.id)
-          if user&.current_chat_id.nil?
-            event.respond error_messages[:no_chat_selected]
-          elsif user&.current_chat_id
-            @chat = Chat.where(id: user.current_chat_id).last
-            voice_connect_checker_action
-            voice_connection_checker_action
-            VoiceConnectJob.perform_async(event.user.voice_channel.id)
-          else
-            event.respond error_messages[:user_not_logged_in]
-          end
-          "OK"
-        end
-      end
-
-      def disconnect_event
-        bot.command :disconnect do |event|
-          @evnt = event
-          @user = find_user(discord_id: event.user.id)
-          disconnect_checker_action
-          disconnect_action if user && event.user.voice_channel && event.voice
-          "OK"
-        end
-      end
-
-      def speak_event
-        bot.command :speak do |event|
-          @evnt = event
-          @message = event.message.content.split[1..].join(" ")
-          @user = find_user(discord_id: event.user.id)
-          @chat = user.current_chat
-          speak_connect_checker_action
-          speak_connection_checker_action
-          ask_to_speak_action if user && event.user.voice_channel && event.voice && !chat.nil?
-          "OK"
-        end
-      end
-
-      def private_message_event
-        bot.message do |event|
-          @evnt = event
-          @visitor = discord_visited?(@evnt.user.id)
-          next if discord_next_action?
-
-          @message = event.message.content
-          @user = find_user(discord_id: event.user.id)
-          @chat = user.current_chat if user
-          private_message_action if user && !chat.nil?
-          "OK"
-        end
-      end
-
-      def bot_init
-        at_exit { bot.stop }
-        bot.run
-      rescue StandardError => e
-        Error.create(message: e.message, backtrace: e.backtrace)
-        retry
-      end
-  end
-end

data/lib/bots/helpers/authentication_helper.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-module ChatgptAssistant
-  # Helper for authentication
-  module AuthenticationHelper
-    def valid_password?(password, hash, salt)
-      BCrypt::Engine.hash_secret(password, salt) == hash
-    end
-
-    def telegram_user_auth(email, password, telegram_id)
-      return "wrong password" if password.nil?
-
-      visitor_access = find_visitor(telegram_id: telegram_id)
-      return "something went wrong" unless visitor_access
-
-      new_access = find_user(email: email)
-      return "user not found" unless new_access
-
-      hash = new_access.password_hash
-      salt = new_access.password_salt
-      valid_password?(password, hash, salt) ? telegram_user_access(visitor_access, new_access) : "wrong password"
-    end
-
-    def telegram_user_access(visitor, new_access)
-      other_access = where_user(telegram_id: visitor.telegram_id)
-      other_access&.each { |access| access.update(telegram_id: nil) } if other_access&.class == Array
-      other_access&.update(telegram_id: nil) if other_access&.class == User
-      new_access.update(telegram_id: visitor.telegram_id)
-      new_access.email
-    end
-
-    def discord_user_auth(email, password, discord_id)
-      user = find_user(email: email)
-      return "user not found" unless user
-      return "wrong passwords" if password.nil?
-
-      valid_password?(password, user.password_hash, user.password_salt) ? discord_user_access(discord_id, user.email) : "wrong password"
-    end
-
-    def discord_user_access(discord_id, user_email)
-      other_access = where_user(discord_id: discord_id)
-      other_access&.each { |access| access.update(discord_id: nil) }
-      user = find_user(email: user_email)
-      user.update(discord_id: discord_id)
-      user.email
-    end
-  end
-end