chatgpt_assistant 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c2a41c81a5e742715d9b0710ff7c5866ba40d718931c3a6f0caa470613b23cd
-  data.tar.gz: 73d6d84ccabd93c017b776083689f799f78e7b81355f02ca33a552fba601cf89
+  metadata.gz: 23b30dcd5724b3978f30a1ac8ebabce7c47b2013302282248a9a10e67904d631
+  data.tar.gz: a4cb01e4548897b34152a63ca600eb1b9fa72c3a2131dbb950b95cb998328cc2
 SHA512:
-  metadata.gz: e55c21e292cc6bb2ee86bf86dca5ed881a02e834e30b5bf982f028dd0e34cf23c6c1978274873a04c50a845f157034cc1132050104d13899dce97d3c62e808cd
-  data.tar.gz: ca83c1370beed7b168375ed3f8ecfd168950d0fde50c72a12784e2c28a58660c5838de0c969528bd8a47ddca11b1bc6a121c825f370a20165a09dda5fec0d59e
+  metadata.gz: 0f7d4daf964b6566c3a703b971090924b20d3d818b886533deae985eeac719860c40dfefef63983069f57cb991b4e02611e0f86f98fb7fdff9d288287f222513
+  data.tar.gz: 228a9a7799d596c5da4e53e0a9f8a505587f15f99af4928fef1824a88449a7e0febc64289406c29f2c67a038440fb19e054ccb2a389eec6831be041031af5bf6

data/.env_prod_sample

@@ -3,7 +3,7 @@ LANGUAGE=en # or pt currently
 MODE=aws # or ibm
 DISCORD_PREFIX=gpt!
 
-POSTGRES_DB=telegram_chatgpt_development # or your database
+POSTGRES_DB=chatgpt_assistant_production # or your database
 POSTGRES_USER=postgres # or your user
 POSTGRES_PASSWORD=postgres # or your password
 

data/.env_sample

@@ -3,7 +3,7 @@ LANGUAGE=en # or pt currently
 MODE=aws # or ibm
 DISCORD_PREFIX=dgpt!
 
-POSTGRES_DB=telegram_chatgpt_development # or your database
+POSTGRES_DB=chatgpt_assistant_development # or your database
 POSTGRES_USER=postgres # or your user
 POSTGRES_PASSWORD=postgres # or your password
 

data/.rubocop.yml

@@ -1,5 +1,6 @@
 AllCops:
   TargetRubyVersion: 2.6
+  NewCops: enable
 
 Style/StringLiterals:
   Enabled: true
@@ -12,15 +13,26 @@ Style/StringLiteralsInInterpolation:
 Layout/LineLength:
   Max: 160
 
-# remove code length limit
+Metrics/ModuleLength:
+  Max: 120
+
 Metrics/MethodLength:
   Max: 200
 
-# Metrics/BlockLength:
-#   Enabled: false
+Metrics/BlockLength:
+  Max: 200
 
 Metrics/ClassLength:
-  Enabled: false
+  Max: 300
 
 Metrics/AbcSize:
-  Max: 40
+  Max: 35
+
+Layout/AccessModifierIndentation:
+  EnforcedStyle: indent
+  
+Layout/IndentationWidth:
+  Width: 2
+
+Layout/IndentationConsistency:
+  EnforcedStyle: indented_internal_methods

data/Dockerfile

@@ -1,15 +1,12 @@
-FROM ruby:3.2.0
+FROM ruby:3.2.2
 RUN apt-get update -qq && apt-get install -y nodejs postgresql-client ffmpeg
 WORKDIR /chatgpt_assistant
 COPY Gemfile /chatgpt_assistant/Gemfile
 COPY Gemfile.lock /chatgpt_assistant/Gemfile.lock
 RUN bundle install
 
-# Opus Installation for voice messages
-
 RUN apt-get install -y wget
 RUN wget https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz
 RUN tar -xvf opus-1.3.1.tar.gz
 RUN cd opus-1.3.1 && ./configure && make && make install
-RUN rm -rf opus-1.3.1.tar.gz opus-1.3.1
-
+RUN rm -rf opus-1.3.1.tar.gz opus-1.3.1

data/Gemfile

@@ -12,7 +12,7 @@ gem "simplecov", "~> 0.21", group: :test
 
 gem "vcr", "~> 6.0", group: :test
 
-gem "rubocop", "~> 1.21"
+gem "rubocop", "~> 1.49"
 
 gem "rubocop-rspec", "~> 2.4"
 

data/Gemfile.lock

@@ -167,7 +167,7 @@ GEM
     opus-ruby (1.0.1)
       ffi
     parallel (1.22.1)
-    parser (3.2.1.0)
+    parser (3.2.2.0)
       ast (~> 2.4.1)
     pg (1.4.6)
     public_suffix (5.0.1)
@@ -207,24 +207,24 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.45.1)
+    rubocop (1.49.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.26.0)
+    rubocop-ast (1.28.0)
       parser (>= 3.2.1.0)
     rubocop-capybara (2.17.1)
       rubocop (~> 1.41)
     rubocop-rspec (2.19.0)
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     rufus-scheduler (3.8.2)
       fugit (~> 1.1, >= 1.1.6)
@@ -292,7 +292,7 @@ DEPENDENCIES
   rake (~> 13.0)
   redis
   rspec (~> 3.0)
-  rubocop (~> 1.21)
+  rubocop (~> 1.49)
   rubocop-rspec (~> 2.4)
   sidekiq
   sidekiq-scheduler

data/SECURITY.md

@@ -0,0 +1,15 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 0.1.4   | :white_check_mark: |
+| 0.1.3   | :x:                |
+| 0.1.2   | :x:                |
+| 0.1.1   | :x:                |
+| 0.1.0   | :x:                |
+
+## Reporting a Vulnerability
+
+You can open an security vulnerability issue

data/exe/chatgpt_assistant

@@ -31,7 +31,7 @@ end
 end
 
 %w[deploy_and_build.sh deploy.sh].each do |file|
-  `cp #{gem_dir}/bin/#{file} #{path}`
+  `cp #{gem_dir}/#{file} #{path}`
 end
 
 %w[/.bundle/ /.yardoc /_yardoc/ /coverage/ /doc/ /pkg/ /spec/reports/ /tmp/ /db_data /db_data/*
@@ -42,7 +42,7 @@ end
 `cd #{path} && git init`
 
 `mkdir -p #{path}/.github/workflows`
-`cp #{gem_dir}/.github/workflows/*.yml #{path}/.github/workflows`
+`cp #{gem_dir}/workflows/*.yml #{path}/.github/workflows`
 
 puts "Done! Now you can run 'cd #{path} && bundle install'"
 puts "Build the docker image with 'rake compose:build'"

data/exe/chatgpt_bot

@@ -5,7 +5,7 @@ require_relative "../lib/chatgpt_assistant"
 
 puts "Starting Chatgpt Assistant"
 puts "Bot Type: #{ARGV[0]}"
-puts "Mode: #{ENV["MODE"]}"
+puts "Mode: #{ENV.fetch("MODE", nil)}"
 case ARGV[0]
 when "telegram"
   ChatgptAssistant::Main.new("telegram").start

data/lib/bots/application_bot.rb

@@ -1,8 +1,25 @@
 # frozen_string_literal: true
 
+require_relative "helpers/messenger_helper"
+require_relative "helpers/authentication_helper"
+require_relative "helpers/visit_helper"
+require_relative "helpers/audio_helper"
+require_relative "helpers/logger_action_helper"
+require_relative "helpers/search_helper"
+require_relative "helpers/validation_helper"
+require_relative "helpers/file_helper"
 module ChatgptAssistant
   # This class is responsible to contain the shared variables between the bot classes
   class ApplicationBot
+    include MessengerHelper
+    include AuthenticationHelper
+    include VisitHelper
+    include AudioHelper
+    include LoggerActionHelper
+    include SearchHelper
+    include ValidationHelper
+    include FileHelper
+
     def initialize(config)
       @config = config
       default_msg = DefaultMessages.new(@config.language)
@@ -19,100 +36,14 @@ module ChatgptAssistant
       @help_messages = default_msg.help_messages
     end
 
-    def chatter
-      @chatter ||= Chatter.new(openai_api_key)
-    end
-
-    def audio_recognition
-      @audio_recognition ||= AudioRecognition.new(openai_api_key)
-    end
-
-    def audio_synthesis
-      @audio_synthesis ||= AudioSynthesis.new(config)
-    end
-
-    def transcribed_text
-      audio_recognition.transcribe_audio(audio_url)
-    end
-
-    def find_useremail(email)
-      User.find_by(email: email)
-    end
-
-    def find_userdiscord(discord_id)
-      User.find_by(discord_id: discord_id)
-    end
-
-    def find_usertelegram(telegram_id)
-      User.find_by(telegram_id: telegram_id)
-    end
-
-    def valid_password?(user, password)
-      return false if password.nil?
-
-      salt = user.password_salt
-      password_hash = user.password_hash
-
-      BCrypt::Engine.hash_secret(password, salt) == password_hash
-    end
-
-    def auth_userdiscord(email, password, discord_id)
-      user = find_useremail(email)
-      return "user not found" unless user
-      return "wrong password" if password.nil?
-
-      valid_password?(user, password) ? user_disc_access(discord_id, user.email) : "wrong password"
-    end
-
-    def user_disc_access(discord_id, user_email)
-      last_access = find_userdiscord(discord_id)
-      new_access = find_useremail(user_email)
-      last_acess.update(discord_id: nil) if last_access && (last_access != new_access)
-      new_access.update(discord_id: discord_id)
-      new_access
-    end
-
-    def discord_user_create(discord_id, email, password, name)
-      user = User.new(discord_id: discord_id, email: email, password_hash: password, name: name)
-      last_access = find_userdiscord(discord_id)
-      last_access&.update(discord_id: nil)
-      user.save
-    end
-
-    def auth_usertelegram(email, password, telegram_id)
-      user = find_useremail(email)
-      return "user not found" unless user
-      return "wrong password" if password.nil?
-
-      valid_password?(user, password) ? user_tele_access(telegram_id, user.email) : "wrong password"
-    end
-
-    def user_tele_access(telegram_id, user_email)
-      last_access = find_usertelegram(telegram_id)
-      new_access = find_useremail(user_email)
-      last_acess.update(telegram_id: nil) if last_access && (last_access != new_access)
-      new_access.update(telegram_id: telegram_id)
-      new_access
-    end
-
-    def telegram_user_create(telegram_id, email, password, name)
-      user = User.new(telegram_id: telegram_id, email: email, password_hash: password, name: name)
-      last_access = find_usertelegram(telegram_id)
-      last_access&.update(telegram_id: nil)
-      user.save
-    end
-
-    def delete_all_voice_files
-      Dir.glob("voice/*").each do |file|
-        next if [".keep", "voice/.keep"].include?(file)
-
-        File.delete(file)
-      end
-    end
-
     attr_reader :openai_api_key, :telegram_token, :database, :default_msg,
                 :mode, :config, :discord_token, :discord_client_id,
                 :discord_prefix, :commom_messages, :error_messages, :success_messages,
                 :help_messages
+    attr_accessor :msg, :evnt, :bot, :audio_url, :visitor, :user, :chat, :chat_id
+
+    def chatter
+      @chatter ||= Chatter.new(openai_api_key)
+    end
   end
 end