chatgpt_assistant 0.1.2 → 0.1.3

data/lib/chatgpt_assistant/chatter.rb

@@ -26,38 +26,45 @@ module ChatgptAssistant
 
     private
 
-    attr_reader :openai_api_key, :response, :message
-    attr_accessor :chat_id, :json
+      attr_reader :openai_api_key, :response, :message
+      attr_accessor :chat_id, :json
 
-    def error_log
-      "Algo deu errado, tente novamente mais tarde."
-    end
+      def error_log
+        "Algo deu errado, tente novamente mais tarde." # TODO: use a DefaultMessage object
+      end
 
-    def header
-      {
-        "Content-Type": "application/json",
-        Authorization: "Bearer #{openai_api_key}"
-      }
-    end
+      def header
+        {
+          "Content-Type": "application/json",
+          Authorization: "Bearer #{openai_api_key}"
+        }
+      end
 
-    def connection
-      Faraday.new(url: "https://api.openai.com/") do |faraday|
-        faraday.request :url_encoded
-        faraday.adapter Faraday.default_adapter
+      def connection
+        Faraday.new(url: "https://api.openai.com/") do |faraday|
+          faraday.request :url_encoded
+          faraday.adapter Faraday.default_adapter
+        end
       end
-    end
 
-    def request_params(message)
-      messages = Message.where(chat_id: chat_id).order(id: :asc).last(10)
-      messages = messages.empty? ? [{ role: "user", content: message }] : messages.map { |mess| { role: mess.role, content: mess.content } }
-      {
-        model: "gpt-3.5-turbo",
-        messages: messages
-      }.to_json
-    end
+      def request_params(message)
+        messages = Message.where(chat_id: chat_id).order(id: :asc).last(10)
+        messages = if messages.empty?
+                     [{ role: "user", content: message }]
+                   else
+                     messages.map do |mess|
+                       { role: mess.role,
+                         content: mess.content }
+                     end
+                   end
+        {
+          model: "gpt-3.5-turbo",
+          messages: messages
+        }.to_json
+      end
 
-    def request(message)
-      connection.post("v1/chat/completions", request_params(message), header)
-    end
+      def request(message)
+        connection.post("v1/chat/completions", request_params(message), header)
+      end
   end
 end

data/lib/chatgpt_assistant/config.rb

@@ -47,13 +47,17 @@ module ChatgptAssistant
     def migrate
       db_connection
       ActiveRecord::Base.logger = Logger.new($stdout)
+      VisitorMigration.new.migrate(:up)
+      VisitorActionsMigration.new.migrate(:up)
       UserMigration.new.migrate(:up)
+      UserActionsMigration.new.migrate(:up)
       ChatMigration.new.migrate(:up)
       MessageMigration.new.migrate(:up)
+      ErrorMigration.new.migrate(:up)
     end
 
     private
 
-    attr_reader :database_host, :database_name, :database_username, :database_password
+      attr_reader :database_host, :database_name, :database_username, :database_password
   end
 end

data/lib/chatgpt_assistant/default_messages.rb

@@ -19,130 +19,130 @@ module ChatgptAssistant
 
     private
 
-    def commom_messages_pt
-      {
-        start: "Olá, eu sou o Chatgpt Assistant, um chatbot que usa a API da OpenAI para responder suas perguntas no Telegram e Discord.",
-        stop: "Até mais!",
-        start_helper: "Primeiro, é necessário cadastrar seu usuário no banco de dados.
+      def commom_messages_pt
+        {
+          start: "Olá, eu sou o Chatgpt Assistant, um chatbot que usa a API da OpenAI para responder suas perguntas no Telegram e Discord.",
+          stop: "Até mais!",
+          start_helper: "Primeiro, é necessário cadastrar seu usuário no banco de dados.
                        \nPara isso, mande ume mensagem com seu email e senha de acesso de 4 digitos.
                        \nExemplo: register/user@email.com:1234",
-        start_sec_helper: "Caso você já tenha um usuário cadastrado, basta fazer login.
+          start_sec_helper: "Caso você já tenha um usuário cadastrado, basta fazer login.
                            \nExemplo: login/user@email.com:3214",
-        register: "Para se registrar no sistema, digite register/email:senha (a senha deve ser um numero de 4 digitos ex: 1234).
+          register: "Para se registrar no sistema, digite register/email:senha (a senha deve ser um numero de 4 digitos ex: 1234).
                    \nExemplo de Registro: register/user@email.com:3214",
-        login: "Para fazer login no sistema, digite login/email:senha (a senha deve ser um numero de 4 digitos ex: 1234).
+          login: "Para fazer login no sistema, digite login/email:senha (a senha deve ser um numero de 4 digitos ex: 1234).
                 \nExemplo de Login: login/user@mail.com:2134",
-        chat_list: "Aqui estão os chats que você criou:"
-      }
-    end
+          chat_list: "Aqui estão os chats que você criou:"
+        }
+      end
 
-    def success_messages_pt
-      {
-        user_created: "Usuário criado com sucesso!",
-        chat_created: "Chat criado com sucesso!",
-        chat_selected: "Chat selecionado com sucesso!",
-        user_logged_in: "Login realizado com sucesso!",
-        voice_channel_connected: "O bot entrou no canal de voz com sucesso!"
-      }
-    end
+      def success_messages_pt
+        {
+          user_created: "Usuário criado com sucesso!",
+          chat_created: "Chat criado com sucesso!",
+          chat_selected: "Chat selecionado com sucesso!",
+          user_logged_in: "Login realizado com sucesso!",
+          voice_channel_connected: "O bot entrou no canal de voz com sucesso!"
+        }
+      end
 
-    def error_messages_pt
-      {
-        nil: "Não entendi o que você disse. Tente novamente",
-        email: "O email que você digitou não é válido. Tente novamente",
-        password: "A senha que você digitou não é válida. Tente novamente",
-        wrong_password: "A senha que você digitou não é válida. Tente novamente",
-        user: "O usuário que você digitou não existe. Tente novamente",
-        user_creation: "Erro ao criar usuário. Tente novamente",
-        user_already_exists: "O usuário que você digitou já existe. Tente novamente",
-        chat_creation: "Erro ao criar chat. Tente novamente",
-        no_messages_founded: "Nenhuma mensagem encontrada",
-        no_chat_selected: "Nenhum chat selecionado",
-        chat_not_found: "Chat não encontrado",
-        no_chats_founded: "Nenhum chat encontrado",
-        user_not_logged_in: "Usuário não logado",
-        user_not_found: "Usuário não encontrado",
-        something_went_wrong: "Algo deu errado. Tente novamente mais tarde.",
-        message_history_too_long: "O histórico mensagem é muito longo.",
-        text_length: "O texto de resposta é muito longo. Tente diminuir a quantidade de respostas na mesma mensagem.",
-        user_not_in_voice_channel: "Você não está em um canal de voz.",
-        bot_not_in_voice_channel: "O bot não está em um canal de voz.",
-        invalid_command: "Comando inválido. Tente novamente.",
-        message_creation_error: "Erro ao criar mensagem. Tente novamente."
-      }
-    end
+      def error_messages_pt
+        {
+          nil: "Não entendi o que você disse. Tente novamente",
+          email: "O email que você digitou não é válido. Tente novamente",
+          password: "A senha que você digitou não é válida. Tente novamente",
+          wrong_password: "A senha que você digitou não é válida. Tente novamente",
+          user: "O usuário que você digitou não existe. Tente novamente",
+          user_creation: "Erro ao criar usuário. Tente novamente",
+          user_already_exists: "O usuário que você digitou já existe. Tente novamente",
+          chat_creation: "Erro ao criar chat. Tente novamente",
+          no_messages_founded: "Nenhuma mensagem encontrada",
+          no_chat_selected: "Nenhum chat selecionado",
+          chat_not_found: "Chat não encontrado",
+          no_chats_founded: "Nenhum chat encontrado",
+          user_not_logged_in: "Usuário não logado",
+          user_not_found: "Usuário não encontrado",
+          something_went_wrong: "Algo deu errado. Tente novamente mais tarde.",
+          message_history_too_long: "O histórico mensagem é muito longo.",
+          text_length: "O texto de resposta é muito longo. Tente diminuir a quantidade de respostas na mesma mensagem.",
+          user_not_in_voice_channel: "Você não está em um canal de voz.",
+          bot_not_in_voice_channel: "O bot não está em um canal de voz.",
+          invalid_command: "Comando inválido. Tente novamente.",
+          message_creation_error: "Erro ao criar mensagem. Tente novamente."
+        }
+      end
 
-    def help_messages_pt
-      ["Para começar a conversar comigo, digite /start",
-       "Para parar de conversar comigo, digite /stop",
-       "Para se registrar no sistema, digite register/email:senha (a senha deve ser um numero de 4 digitos ex: 1234)",
-       "Para fazer login no sistema, digite login/email:senha (a senha deve ser um numero de 4 digitos ex: 1234)",
-       "Para criar um novo chat, digite new_chat/nome do chat",
-       "Para selecionar um chat, digite sl_chat/nome do chat",
-       "Para listar os chats que você criou, digite /list",
-       "Para ver esta mensagem novamente, digite /help"]
-    end
+      def help_messages_pt
+        ["Para começar a conversar comigo, digite /start",
+         "Para parar de conversar comigo, digite /stop",
+         "Para se registrar no sistema, digite register/email:senha (a senha deve ser um numero de 4 digitos ex: 1234)",
+         "Para fazer login no sistema, digite login/email:senha (a senha deve ser um numero de 4 digitos ex: 1234)",
+         "Para criar um novo chat, digite new_chat/nome do chat",
+         "Para selecionar um chat, digite sl_chat/nome do chat",
+         "Para listar os chats que você criou, digite /list",
+         "Para ver esta mensagem novamente, digite /help"]
+      end
 
-    def commom_messages_en
-      {
-        start: "Hello, I'm the Chatgpt Assistant, a chatbot that uses the OpenAI API to answer your questions on Telegram and Discord.",
-        stop: "See you later!",
-        start_helper: "First, you need to register your user in the database.
+      def commom_messages_en
+        {
+          start: "Hello, I'm the Chatgpt Assistant, a chatbot that uses the OpenAI API to answer your questions on Telegram and Discord.",
+          stop: "See you later!",
+          start_helper: "First, you need to register your user in the database.
                        \nTo do this, send a message with your email and password of 4 digits access.
                        \nExample: register/user@mail.com:3421",
-        start_sec_helper: "If you already have a registered user, just log in.
+          start_sec_helper: "If you already have a registered user, just log in.
                            \nExample: login/user@mail.com:5423",
-        register: "To register in the system, type register/email:password (the password must be a 4 digit number ex: 1234).
+          register: "To register in the system, type register/email:password (the password must be a 4 digit number ex: 1234).
                    \nExample of Registration: register/user@mail.com:3241",
-        login: "To log in to the system, type login/email:password (the password must be a 4 digit number ex: 1234).
+          login: "To log in to the system, type login/email:password (the password must be a 4 digit number ex: 1234).
                 \nExample of Login: login/user@mail.com:2134",
-        chat_list: "Here are the chats you created:"
-      }
-    end
+          chat_list: "Here are the chats you created:"
+        }
+      end
 
-    def success_messages_en
-      {
-        user_created: "User created successfully!",
-        chat_created: "Chat created successfully!",
-        chat_selected: "Chat selected successfully!",
-        user_logged_in: "Login successfully!"
-      }
-    end
+      def success_messages_en
+        {
+          user_created: "User created successfully!",
+          chat_created: "Chat created successfully!",
+          chat_selected: "Chat selected successfully!",
+          user_logged_in: "Login successfully!"
+        }
+      end
 
-    def error_messages_en
-      {
-        nil: "I didn't understand what you said. Try again",
-        email: "The email you typed is not valid. Try again",
-        password: "The password you typed is not valid. Try again",
-        wrong_password: "The password you typed is not valid. Try again",
-        user: "The user you typed does not exist. Try again",
-        user_creation: "Error creating user. Try again",
-        chat_creation: "Error creating chat. Try again",
-        no_messages_founded: "No messages found",
-        no_chat_selected: "No chat selected",
-        no_chats_founded: "No chats found",
-        chat_not_found: "Chat not found",
-        user_not_logged_in: "User not logged in",
-        user_not_found: "User not found",
-        something_went_wrong: "Something went wrong. Try again later.",
-        message_history_too_long: "The message history is too long.",
-        text_length: "The response text is too long. Try to reduce the number of answers in the same message.",
-        user_not_in_voice_channel: "You are not in a voice channel.",
-        bot_not_in_voice_channel: "The bot is not in a voice channel.",
-        invalid_command: "Invalid command. Try again.",
-        message_creation_error: "Error creating message. Try again."
-      }
-    end
+      def error_messages_en
+        {
+          nil: "I didn't understand what you said. Try again",
+          email: "The email you typed is not valid. Try again",
+          password: "The password you typed is not valid. Try again",
+          wrong_password: "The password you typed is not valid. Try again",
+          user: "The user you typed does not exist. Try again",
+          user_creation: "Error creating user. Try again",
+          chat_creation: "Error creating chat. Try again",
+          no_messages_founded: "No messages found",
+          no_chat_selected: "No chat selected",
+          no_chats_founded: "No chats found",
+          chat_not_found: "Chat not found",
+          user_not_logged_in: "User not logged in",
+          user_not_found: "User not found",
+          something_went_wrong: "Something went wrong. Try again later.",
+          message_history_too_long: "The message history is too long.",
+          text_length: "The response text is too long. Try to reduce the number of answers in the same message.",
+          user_not_in_voice_channel: "You are not in a voice channel.",
+          bot_not_in_voice_channel: "The bot is not in a voice channel.",
+          invalid_command: "Invalid command. Try again.",
+          message_creation_error: "Error creating message. Try again."
+        }
+      end
 
-    def help_messages_en
-      ["To start talking to me, type /start",
-       "To stop talking to me, type /stop",
-       "To register in the system, type register/email:password (the password must be a 4 digit number ex: 1234)",
-       "To log in to the system, type login/email:password (the password must be a 4 digit number ex: 1234)",
-       "To create a new chat, type new_chat/chat name",
-       "To select a chat, type sl_chat/chat name",
-       "To list the chats you created, type /list",
-       "To see this message again, type /help"]
-    end
+      def help_messages_en
+        ["To start talking to me, type /start",
+         "To stop talking to me, type /stop",
+         "To register in the system, type register/email:password (the password must be a 4 digit number ex: 1234)",
+         "To log in to the system, type login/email:password (the password must be a 4 digit number ex: 1234)",
+         "To create a new chat, type new_chat/chat name",
+         "To select a chat, type sl_chat/chat name",
+         "To list the chats you created, type /list",
+         "To see this message again, type /help"]
+      end
   end
 end

data/lib/chatgpt_assistant/migrations.rb

@@ -3,7 +3,36 @@
 require "active_record"
 require "active_model"
 
-# This file contains the migrations for the database tables
+# Visitor model
+class VisitorMigration < ActiveRecord::Migration[5.2]
+  def change
+    return if ActiveRecord::Base.connection.table_exists? :visitors
+
+    create_table :visitors do |t|
+      t.string :telegram_id, limit: 100
+      t.string :discord_id, limit: 100
+      t.integer :platform, null: false, default: 0
+      t.string :name, null: false
+      t.integer :current_user_id, null: false, default: 0
+      t.timestamps
+    end
+  end
+end
+
+# VisitorActions model
+class VisitorActionsMigration < ActiveRecord::Migration[5.2]
+  def change
+    return if ActiveRecord::Base.connection.table_exists? :visitor_actions
+
+    create_table :visitor_actions do |t|
+      t.references :visitor, null: false, foreign_key: true
+      t.text :action, null: false
+      t.text :description, null: false
+      t.integer :role, null: false, default: 0
+      t.timestamps
+    end
+  end
+end
 
 # User model
 class UserMigration < ActiveRecord::Migration[5.2]
@@ -11,12 +40,11 @@ class UserMigration < ActiveRecord::Migration[5.2]
     return if ActiveRecord::Base.connection.table_exists? :users
 
     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 :email, null: false, limit: 100
       t.string :password_hash, null: false, limit: 100
       t.string :password_salt, null: false, limit: 100
-      t.string :name, null: false, limit: 100
-      t.string :telegram_id, limit: 100
-      t.string :discord_id, limit: 100
       t.integer :current_chat_id, null: false, default: 0
       t.integer :role, null: false, default: 0
       t.integer :open_chats, null: false, default: 0
@@ -28,6 +56,21 @@ class UserMigration < ActiveRecord::Migration[5.2]
   end
 end
 
+# UserActions model
+class UserActionsMigration < ActiveRecord::Migration[5.2]
+  def change
+    return if ActiveRecord::Base.connection.table_exists? :user_actions
+
+    create_table :user_actions do |t|
+      t.references :user, null: false, foreign_key: true
+      t.text :action, null: false, default: ""
+      t.text :description, null: false, default: ""
+      t.integer :role, null: false, default: 0
+      t.timestamps
+    end
+  end
+end
+
 # Chat model
 class ChatMigration < ActiveRecord::Migration[5.2]
   def change
@@ -55,3 +98,18 @@ class MessageMigration < ActiveRecord::Migration[5.2]
     end
   end
 end
+
+# Error model
+class ErrorMigration < ActiveRecord::Migration[5.2]
+  def change
+    return if ActiveRecord::Base.connection.table_exists? :errors
+
+    create_table :errors do |t|
+      t.integer :chat_id
+      t.integer :user_id
+      t.text :message, null: false, default: ""
+      t.text :backtrace, null: false, array: true, default: []
+      t.timestamps
+    end
+  end
+end

data/lib/chatgpt_assistant/models.rb

@@ -2,23 +2,55 @@
 
 require "active_record"
 
+# Visitor model
+class Visitor < ActiveRecord::Base
+  has_many :visitor_actions
+  # has_one :tel_user, foreign_key: "telegram_id", class_name: "User"
+  # has_one :dis_user, foreign_key: "discord_id", class_name: "User"
+  validates :telegram_id, uniqueness: true
+  validates :discord_id, uniqueness: true
+  validates :name, presence: true
+  validates :platform, presence: true
+  enum platform: { telegram: 0, discord: 1 }
+
+  def tel_user
+    User.find_by(telegram_id: telegram_id)
+  end
+
+  def dis_user
+    User.find_by(discord_id: discord_id)
+  end
+end
+
+# VisitorActions model
+class VisitorAction < ActiveRecord::Base
+  belongs_to :visitor
+  validates :action, presence: true
+  validates :description, presence: true
+  validates :role, presence: true
+  enum role: { user: 0, assistant: 1, warning: 2 }
+end
+
 # User model
 class User < ActiveRecord::Base
-  before_save :generate_password_salt
+  attr_accessor :password
+
+  belongs_to :tel_visitor, optional: true, foreign_key: "telegram_id", class_name: "Visitor"
+  belongs_to :dis_visitor, optional: true, foreign_key: "discord_id", class_name: "Visitor"
+  before_save :encrypt_password
   validates :email, presence: true, uniqueness: true
-  validates :password_hash, presence: true
-  validates :name, presence: true
   validates :role, presence: true
   validates :open_chats, presence: true
   validates :closed_chats, presence: true
   validates :total_chats, presence: true
   validates :total_messages, presence: true
-
   has_many :chats
 
-  def generate_password_salt
-    self.password_salt = BCrypt::Engine.generate_salt
-    self.password_hash = BCrypt::Engine.hash_secret(password_hash, password_salt)
+  def encrypt_password
+    return if password.nil?
+
+    self.password_salt = BCrypt::Engine.generate_salt.to_s
+    self.password_hash = BCrypt::Engine.hash_secret(password, password_salt)
   end
 
   def current_chat
@@ -34,6 +66,16 @@ class User < ActiveRecord::Base
   end
 end
 
+# UserActions model
+class UserAction < ActiveRecord::Base
+  belongs_to :user
+  validates :user_id, presence: true
+  validates :action, presence: true
+  validates :description, presence: true
+  validates :role, presence: true
+  enum role: { user: 0, assistant: 1, warning: 2 }
+end
+
 # Chat model
 class Chat < ActiveRecord::Base
   validates :user_id, presence: true
@@ -51,3 +93,9 @@ class Message < ActiveRecord::Base
 
   belongs_to :chat
 end
+
+# Error model
+class Error < ActiveRecord::Base
+  validates :message, presence: true
+  validates :backtrace, presence: true
+end

data/lib/chatgpt_assistant/version.rb

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

data/lib/chatgpt_assistant.rb

@@ -31,26 +31,38 @@ module ChatgptAssistant
       return discord_bot if discord_mode?
 
       raise "Invalid mode"
+    rescue StandardError => e
+      save_error(e)
+      retry
     end
 
     private
 
-    attr_reader :mode, :config
+      attr_reader :mode, :config
 
-    def telegram_mode?
-      mode == "telegram"
-    end
+      def save_error(err)
+        puts "Error: #{err.message}"
+        err.backtrace.each { |line| puts line }
+        Error.create(message: err.message, backtrace: err.backtrace) unless err.message == Error.last&.message
+      rescue StandardError
+        puts "Error: #{err.message}"
+        puts "Backtrace: #{err.backtrace}"
+      end
 
-    def telegram_bot
-      TelegramBot.new(config).start
-    end
+      def telegram_mode?
+        mode == "telegram"
+      end
 
-    def discord_mode?
-      mode == "discord"
-    end
+      def telegram_bot
+        TelegramBot.new(config).start
+      end
 
-    def discord_bot
-      DiscordBot.new(config).start
-    end
+      def discord_mode?
+        mode == "discord"
+      end
+
+      def discord_bot
+        DiscordBot.new(config).start
+      end
   end
 end

data/workflows/deploy.yml

@@ -0,0 +1,19 @@
+# github actions ubuntu ssh deploy to server
+name: Deploy to server
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Deploy & Restart server
+        run: |
+          mkdir -p ~/.ssh |
+          echo "${{ secrets.SSH_KEY }}" > ~/.ssh/telegram_server.pem
+          chmod 600 ~/.ssh/telegram_server.pem
+          ssh -i ~/.ssh/telegram_server.pem -o StrictHostKeyChecking=no ${{ secrets.USERNAME }}@${{ secrets.HOST }} 'bash -s' < ./deploy.sh

data/workflows/deploy_and_build.yml

@@ -0,0 +1,19 @@
+# github actions ubuntu ssh deploy to server
+name: Deploy and Build Server
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  deploy_and_build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Deploy, Build & Restart server
+        run: |
+          mkdir -p ~/.ssh |
+          echo "${{ secrets.SSH_KEY }}" > ~/.ssh/telegram_server.pem
+          chmod 600 ~/.ssh/telegram_server.pem
+          ssh -i ~/.ssh/telegram_server.pem -o StrictHostKeyChecking=no ${{ secrets.USERNAME }}@${{ secrets.HOST }} 'bash -s' < ./deploy_and_build.sh