chatgpt_assistant 0.1.5 → 0.1.7

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

@@ -5,8 +5,6 @@ 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 :name, presence: true
   validates :platform, presence: true
   enum platform: { telegram: 0, discord: 1 }
@@ -26,22 +24,46 @@ class User < ActiveRecord::Base
 
   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 :role, presence: true
-  validates :open_chats, presence: true
-  validates :closed_chats, presence: true
-  validates :total_chats, presence: true
-  validates :total_messages, presence: true
+
+  validates :email, presence: true, uniqueness: true, format: { with: URI::MailTo::EMAIL_REGEXP }, length: { maximum: 100 }, on: :create
+  validates :role, presence: true, on: :create
+  validates :open_chats, presence: true, on: :create
+  validates :closed_chats, presence: true, on: :create
+  validates :total_chats, presence: true, on: :create
+  validates :total_messages, presence: true, on: :create
+  validates :password, presence: true, on: :create
+
+  before_save :encrypt_password, if: :password
+
   has_many :chats
 
   def encrypt_password
     return if password.nil?
 
-    self.password_salt = BCrypt::Engine.generate_salt.to_s
+    self.password_salt = BCrypt::Engine.generate_salt
     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
@@ -53,6 +75,10 @@ class User < ActiveRecord::Base
   def chat_by_title(title)
     chats.find_by(title: title)
   end
+
+  def chat_history
+    current_chat.messages.last(10).map { |m| "#{m.role}: #{m.content}\nat: #{m.created_at}" }
+  end
 end
 
 # Chat model
@@ -69,15 +95,14 @@ class Chat < ActiveRecord::Base
   def init_chat_if_actor_provided
     return if actor.nil?
 
-    messages.create(content: prompt, role: "user")
-    messages.create(content: "Hello, I'm #{actor}. I will follow #{prompt}", role: "assistant")
+    messages.create(content: prompt, role: "system")
   end
 end
 
 # Message model
 class Message < ActiveRecord::Base
   validates :content, presence: true
-  enum role: { user: 0, assistant: 1 }
+  enum role: { user: 0, assistant: 1, system: 2 }
 
   belongs_to :chat
 end

data/lib/chatgpt_assistant/sidekiq.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require_relative "../chatgpt_assistant"
+
+Sidekiq.configure_server do |config|
+  config.redis = { url: ENV.fetch("REDIS_URL", "redis://redis:6379/1") }
+end

data/lib/chatgpt_assistant/sidekiq.yml

@@ -0,0 +1,10 @@
+development:
+  :concurrency: 5
+
+production:
+  :concurrency: 5
+
+:max_retries: 1
+
+:queues:
+  - default

data/lib/chatgpt_assistant/version.rb

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

data/lib/chatgpt_assistant.rb

@@ -7,15 +7,20 @@ require_relative "chatgpt_assistant/chatter"
 require_relative "chatgpt_assistant/version"
 require_relative "chatgpt_assistant/config"
 require_relative "chatgpt_assistant/models"
-require_relative "bots/application_bot"
-require_relative "bots/telegram_bot"
-require_relative "bots/discord_bot"
+require_relative "chatgpt_assistant/error"
+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"
 require "telegram/bot"
 require "ibm_watson"
 require "discordrb"
+require "sidekiq"
+require "sidekiq-scheduler"
 require "faraday"
 require "bcrypt"
 
@@ -32,24 +37,12 @@ module ChatgptAssistant
       return discord_bot if discord_mode?
 
       raise "Invalid mode"
-    rescue StandardError => e
-      save_error(e)
-      retry
     end
 
     private
 
       attr_reader :mode, :config
 
-      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_mode?
         mode == "telegram"
       end