chatgpt_assistant 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ad36556b3d51b5b4681703b1aabfc5a8554712cb715bb0e16074063854b0ecb
-  data.tar.gz: ddc1c3d749bc05c98d2145c44d8a0ba6ea1a4fa3d330958d776337192a4b91ed
+  metadata.gz: 8c2a41c81a5e742715d9b0710ff7c5866ba40d718931c3a6f0caa470613b23cd
+  data.tar.gz: 73d6d84ccabd93c017b776083689f799f78e7b81355f02ca33a552fba601cf89
 SHA512:
-  metadata.gz: ca7990fa5a3aa4f8702c1d96e107e5680e1688058487e2a32e95bc3077fae888d0a077adf43a5971370cdc7dfb83ea570d7230469960ae6679243a14c317fe7c
-  data.tar.gz: 429d229564dab5f94e19a8e49b8be6dbac2a11fb260fa6d3f999f58e2086ff5e040e6031d14d3831ff9e4f261210093d8517ae769960a009684fbba74479eb6c
+  metadata.gz: e55c21e292cc6bb2ee86bf86dca5ed881a02e834e30b5bf982f028dd0e34cf23c6c1978274873a04c50a845f157034cc1132050104d13899dce97d3c62e808cd
+  data.tar.gz: ca83c1370beed7b168375ed3f8ecfd168950d0fde50c72a12784e2c28a58660c5838de0c969528bd8a47ddca11b1bc6a121c825f370a20165a09dda5fec0d59e

data/.env_prod_sample

@@ -0,0 +1,18 @@
+ENV_TYPE=production
+LANGUAGE=en # or pt currently
+MODE=aws # or ibm
+DISCORD_PREFIX=gpt!
+
+POSTGRES_DB=telegram_chatgpt_development # 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/.env_sample

@@ -1,7 +1,7 @@
 ENV_TYPE=development
 LANGUAGE=en # or pt currently
 MODE=aws # or ibm
-DISCORD_PREFIX=gpt!
+DISCORD_PREFIX=dgpt!
 
 POSTGRES_DB=telegram_chatgpt_development # or your database
 POSTGRES_USER=postgres # or your user

data/.workflow_secrets_sample

@@ -0,0 +1,6 @@
+DOCKER_USERNAME=YOUR_DOCKER_USERNAME
+DOCKER_PASSWORD=YOUR_DOCKER_PASSWORD
+HOST=YOUR_SSH_HOST
+USERNAME=YOUR_USERNAME
+PORT=YOUR_SSH_PORT
+SSH_KEY=YOUR_SSH_RSA_KEY

data/Gemfile

@@ -6,14 +6,16 @@ gem "bcrypt"
 
 gem "rake", "~> 13.0"
 
-gem "rspec", "~> 3.0"
+gem "rspec", "~> 3.0", group: :test
+
+gem "simplecov", "~> 0.21", group: :test
+
+gem "vcr", "~> 6.0", group: :test
 
 gem "rubocop", "~> 1.21"
 
 gem "rubocop-rspec", "~> 2.4"
 
-gem "simplecov", "~> 0.21"
-
 gem "telegram-bot-ruby", "~> 0.16"
 
 gem "discordrb", "~> 3.4"

data/Gemfile.lock

@@ -145,6 +145,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
     mini_mime (1.1.2)
+    mini_portile2 (2.8.1)
     minitest (5.18.0)
     multi_json (1.15.0)
     multipart-post (2.3.0)
@@ -158,6 +159,9 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     netrc (0.11.0)
+    nokogiri (1.14.2)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
     nokogiri (1.14.2-x86_64-linux)
       racc (~> 1.4)
     opus-ruby (1.0.1)
@@ -255,6 +259,7 @@ GEM
       unf_ext
     unf_ext (0.0.8.2)
     unicode-display_width (2.4.2)
+    vcr (6.1.0)
     virtus (2.0.0)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -294,6 +299,7 @@ DEPENDENCIES
   simplecov (~> 0.21)
   streamio-ffmpeg
   telegram-bot-ruby (~> 0.16)
+  vcr (~> 6.0)
 
 BUNDLED WITH
    2.2.32

data/README.md

@@ -1,12 +1,27 @@
 # ChatGPT Assistant
 
+[![Gem Version](https://badge.fury.io/rb/chatgpt_assistant.svg)](https://badge.fury.io/rb/chatgpt_assistant)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![Ruby Version](https://img.shields.io/badge/Ruby-2.6.0%2B-blue.svg)](https://www.ruby-lang.org/en/)
+
 This Ruby gem provides an easy way to initialize a client for Telegram and Discord bots using the ChatGPT API, audio transcription, IBM Cloud Text to Speech, and AWS Polly, creating an assistant that can answer questions in text and voice and have a conversation with the user.
 
+#### Languages supported currently: en, pt - contributions are welcome!
+You can contribute by adding your language to the DefaultMessages class in lib/chatgpt_assistant/default_messages.rb. You can also add your language to the list of languages in the README.md file.
+Pull request from language/YOUR_LANGUAGE to main, remember to name your pull request as "Add YOUR_LANGUAGE support".
+
+Other contributions are welcome too!
+Remember to give a star to this repo if you like it!
 ## Requirements
 
 - Ruby > 2.6.0
 - Docker
 - Docker Compose
+- PostgreSQL
+- Telegram Bot API Token
+- Discord Bot API Token
+- IBM Cloud Text to Speech API Key or AWS Polly API Key
+- OpenAI API Key
 
 ## Installation
 
@@ -16,13 +31,9 @@ To install the gem, run:
 gem install chatgpt_assistant
 ```
 
-Then, edit the .env_sample file to include the necessary credentials and rename it to .env. Run bundle install to install the necessary dependencies.
-
-Remember to edit docker-compose.prod.yml when deploying to production.
-
 Alternatively, you can clone/fork this repo to use it as you wish.
 
-### Installation as a gem example
+## Installation as a gem example
 
 ```bash
 gem install chatgpt_assistant
@@ -43,31 +54,92 @@ bundle install
 
 Make sure to run bundle before using the Lucy Dockerunner rake tasks.
 
+Then, edit the .env_sample file to include the necessary credentials and rename it to .env. Run bundle install to install the necessary dependencies.
+
+Remember to edit docker-compose.prod.yml when deploying to production.
+
+## Migrate your database
+```bash
+rake compose:up && sudo docker compose run --rm telegram exe/chatgpt_bot migrate
+```
+
 ## Usage
 
 You can start the Docker Compose services required for the gem using the rake tasks provided by the Lucy Dockerunner gem. These tasks include compose:up, compose:down, compose:status, compose:shell, compose:restart, and others listed previously.
 
 For example, to start the services, run:
 
-```ruby
+```bash
 rake compose:up
 ```
 
 
 To stop the services, run:
 
-```ruby
+```bash
 rake compose:down
 ```
 
 After starting the Docker Compose services, you can use the features of the gem to create a chat assistant that responds to questions in both text and voice using the services mentioned above.
 
-## More commands at https://github.com/JesusGautamah/lucy_dockerunner
+#### More compose rake tasks at https://github.com/JesusGautamah/lucy_dockerunner
+
+## Discord Bot Commands
+
+The discord commands prefix can be changed in the .env file.
+The default prefix is dgpt!
+
+- dgpt!start - shows the welcome message
+- dgpt!help - shows the help message
+- dgpt!login email:password - logs in the user
+- dgpt!register email:password - registers a new user
+- dgpt!list - lists the user created chatbots
+- dgpt!sl_chat CHAT TITLE - starts a chat with the chatbot with the given title
+- dgpt!new_chat CHAT TITLE - creates a new chatbot with the given title
+- dgpt!ask TEXT - sends a text to the chatbot
+- dgpt!connect - connects the chat bot to the current channel
+- dgpt!disconnect - disconnects the chat bot from the current channel
+- dgpt!speak TEXT - sends a text to the chatbot and gets the response in voice
+
+## Telegram Bot Commands
+
+- /start - shows the welcome message
+- /help - shows the help message
+- login/email:password - logs in the user
+- register/email:password - registers a new user
+- list - lists the user created chatbots
+- sl_chat/CHAT TITLE - starts a chat with the chatbot with the given title
+- new_chat/CHAT TITLE - creates a new chatbot with the given title
+- TEXT - sends a text to the chatbot
+- VOICE_MESSAGE or AUDIO FILE - sends a voice message to the chatbot and returns the response in voice
+
+## Recommended Actions runner
+
+You can run Github Actions workflows locally using [act](https://github.com/nektos/act)
+
+We recommend Act installation to run Github Actions workflows locally
+as we use it to deploy the bot in a server via ssh.
 
 ## Contributing
 
+A good way to contribute is add your language to DefaultMessages class in lib/chatgpt_assistant/default_messages.rb. You can also add your language to the list of languages in the README.md file.
+
 Bug reports and pull requests are welcome on GitHub at https://github.com/JesusGautamah/chatgpt_assistant. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/JesusGautamah/chatgpt_assistant/blob/master/CODE_OF_CONDUCT.md).
 
+
+## [![Repography logo](https://images.repography.com/logo.svg)](https://repography.com) / Recent activity [![Time period](https://images.repography.com/33522702/JesusGautamah/chatgpt_assistant/recent-activity/y6ZDduNWHwPzbnUFsmdGrJ99Q1vyEKGOBWFOBvzGjnM/1rZM2QrF0__3eUfUXFe6jDraYjHvypniTqDWhCequ-U_badge.svg)](https://repography.com)
+[![Timeline graph](https://images.repography.com/33522702/JesusGautamah/chatgpt_assistant/recent-activity/y6ZDduNWHwPzbnUFsmdGrJ99Q1vyEKGOBWFOBvzGjnM/1rZM2QrF0__3eUfUXFe6jDraYjHvypniTqDWhCequ-U_timeline.svg)](https://github.com/JesusGautamah/chatgpt_assistant/commits)
+[![Issue status graph](https://images.repography.com/33522702/JesusGautamah/chatgpt_assistant/recent-activity/y6ZDduNWHwPzbnUFsmdGrJ99Q1vyEKGOBWFOBvzGjnM/1rZM2QrF0__3eUfUXFe6jDraYjHvypniTqDWhCequ-U_issues.svg)](https://github.com/JesusGautamah/chatgpt_assistant/issues)
+
+[![Pull request status graph](https://images.repography.com/33522702/JesusGautamah/chatgpt_assistant/recent-activity/y6ZDduNWHwPzbnUFsmdGrJ99Q1vyEKGOBWFOBvzGjnM/1rZM2QrF0__3eUfUXFe6jDraYjHvypniTqDWhCequ-U_prs.svg)](https://github.com/JesusGautamah/chatgpt_assistant/pulls)
+[![Trending topics](https://images.repography.com/33522702/JesusGautamah/chatgpt_assistant/recent-activity/y6ZDduNWHwPzbnUFsmdGrJ99Q1vyEKGOBWFOBvzGjnM/1rZM2QrF0__3eUfUXFe6jDraYjHvypniTqDWhCequ-U_words.svg)](https://github.com/JesusGautamah/chatgpt_assistant/commits)
+
+[![Top contributors](https://images.repography.com/33522702/JesusGautamah/chatgpt_assistant/recent-activity/y6ZDduNWHwPzbnUFsmdGrJ99Q1vyEKGOBWFOBvzGjnM/1rZM2QrF0__3eUfUXFe6jDraYjHvypniTqDWhCequ-U_users.svg)](https://github.com/JesusGautamah/chatgpt_assistant/graphs/contributors)
+[![Activity map](https://images.repography.com/33522702/JesusGautamah/chatgpt_assistant/recent-activity/y6ZDduNWHwPzbnUFsmdGrJ99Q1vyEKGOBWFOBvzGjnM/1rZM2QrF0__3eUfUXFe6jDraYjHvypniTqDWhCequ-U_map.svg)](https://github.com/JesusGautamah/chatgpt_assistant/commits)
+
+## Contributors
+  - [Jesus Gautamah](https://github.com/JesusGautamah) 
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/docker-compose.prod.yml

@@ -16,7 +16,7 @@ services:
     environment:
       POSTGRES_HOST: db
     env_file:
-      - .env
+      - .env_prod
     depends_on:
       - db
   discord:
@@ -27,7 +27,7 @@ services:
     environment:
       POSTGRES_HOST: db
     env_file:
-      - .env
+      - .env_prod
     depends_on:
       - db
 volumes:

data/exe/chatgpt_assistant

@@ -30,6 +30,10 @@ end
   `cp #{gem_dir}/#{file} #{path}`
 end
 
+%w[deploy_and_build.sh deploy.sh].each do |file|
+  `cp #{gem_dir}/bin/#{file} #{path}`
+end
+
 %w[/.bundle/ /.yardoc /_yardoc/ /coverage/ /doc/ /pkg/ /spec/reports/ /tmp/ /db_data /db_data/*
    .rspec_status .env /logs/telegram_chatgpt.log /voice/audio* /voice/ibm* /voice/polly* /voice/aws*].each do |file_to_ignore|
   `echo "#{file_to_ignore}" >> #{path}/.gitignore`
@@ -37,7 +41,13 @@ end
 
 `cd #{path} && git init`
 
+`mkdir -p #{path}/.github/workflows`
+`cp #{gem_dir}/.github/workflows/*.yml #{path}/.github/workflows`
+
 puts "Done! Now you can run 'cd #{path} && bundle install'"
 puts "Build the docker image with 'rake compose:build'"
 puts "Run the bot with 'rake compose:up'"
 puts "For more information, see the README.md file"
+puts "We recommend Act installation to run Github Actions workflows locally"
+puts "as we use it to deploy the bot in a server via ssh"
+puts "https://github.com/nektos/act"

data/lib/bots/application_bot.rb

@@ -6,7 +6,6 @@ module ChatgptAssistant
     def initialize(config)
       @config = config
       default_msg = DefaultMessages.new(@config.language)
-      @logger = ChatterLogger.new
       @openai_api_key = @config.openai_api_key
       @telegram_token = @config.telegram_token
       @discord_token = @config.discord_token
@@ -32,8 +31,8 @@ module ChatgptAssistant
       @audio_synthesis ||= AudioSynthesis.new(config)
     end
 
-    def message_create(message, chat_id, role)
-      Message.create(content: message, chat_id: chat_id, role: role)
+    def transcribed_text
+      audio_recognition.transcribe_audio(audio_url)
     end
 
     def find_useremail(email)
@@ -112,7 +111,7 @@ module ChatgptAssistant
     end
 
     attr_reader :openai_api_key, :telegram_token, :database, :default_msg,
-                :logger, :mode, :config, :discord_token, :discord_client_id,
+                :mode, :config, :discord_token, :discord_client_id,
                 :discord_prefix, :commom_messages, :error_messages, :success_messages,
                 :help_messages
   end

data/lib/bots/discord_bot.rb

@@ -4,7 +4,6 @@ module ChatgptAssistant
   # This class is responsible to handle the discord bot
   class DiscordBot < ApplicationBot
     def start
-      start_logs
       start_event
       login_event
       register_event
@@ -33,23 +32,15 @@ module ChatgptAssistant
       )
     end
 
-    def start_logs
-      logger.log("Starting Discord bot")
-      logger.log("Discord Prefix: #{discord_prefix}")
-    end
-
     def start_event
       bot.command :start do |event|
         @evnt = event
         @user = event.user
         start_action
       end
-      logger.log("Start Event Configured")
     end
 
     def start_action
-      logger.log("USER: #{user.username} - #{user.id}\n MESSAGE: #{event.message.content}")
-      evnt.respond commom_messages[:start]
       evnt.respond commom_messages[:start_helper].gsub("register/", "gpt!register ")
       evnt.respond commom_messages[:start_sec_helper].gsub("login/", "gpt!login ")
     end
@@ -60,7 +51,6 @@ module ChatgptAssistant
         @evnt = event
         message.nil? ? event.respond(commom_messages[:login]) : login_action
       end
-      logger.log("Login Event Configured")
     end
 
     def login_action
@@ -68,13 +58,10 @@ module ChatgptAssistant
       user_password = message.split(":")[1]
       case auth_userdiscord(user_email, user_password, evnt.user.id)
       when "user not found"
-        logger.log("User not found: #{user_email}")
         evnt.respond error_messages[:user_not_found]
       when "wrong password"
-        logger.log("Wrong password: #{user_email}")
         evnt.respond error_messages[:wrong_password]
       when find_useremail(user_email)
-        logger.log("User logged in: #{user_email}")
         evnt.respond success_messages[:user_logged_in]
       end
     end
@@ -83,9 +70,8 @@ module ChatgptAssistant
       bot.command :register do |event|
         @message = event.message.content.split(" ")[1]
         @evnt = event
-        message.nil? ? event.respond(commom_messages[:register]): register_action
+        message.nil? ? event.respond(commom_messages[:register]) : register_action
       end
-      logger.log("Register Event Configured")
     end
 
     def register_action
@@ -95,7 +81,6 @@ module ChatgptAssistant
     end
 
     def create_user_action(mail, pass)
-      logger.log("Creating user #{mail}")
       id = evnt.user.id
       name = evnt.user.username
       discord_user_create(id, mail, pass, name) ? evnt.respond(success_messages[:user_created]) : evnt.respond(error_messages[:user_not_created])
@@ -104,19 +89,15 @@ module ChatgptAssistant
     def list_event
       bot.command :list do |event|
         @evnt = event
-        @user = User.find_by(discord_id: event.user.id)
+        @user = find_userdiscord(event.user.id)
         event.respond error_messages[:user_not_logged_in] if user.nil?
-
-        @chats = Chat.where(user_id: user.id) if user
-        event.respond error_messages[:chat_not_found] if chats.empty? && user
-
-        list_action if user && !chats.empty?
+        event.respond error_messages[:chat_not_found] if user.chats.empty? && user
+        list_action if user && !user.chats.empty?
       end
-      logger.log("List Event Configured")
     end
 
     def list_action
-      chats_title = chats.map(&:title)
+      chats_title = user.chats.map(&:title)
       evnt.respond commom_messages[:chat_list]
       evnt.respond chats_title.join("\n")
     end
@@ -124,14 +105,13 @@ module ChatgptAssistant
     def hist_event
       bot.command :hist do |event|
         @evnt = event
-        @user = User.find_by(discord_id: event.user.id)
+        @user = find_userdiscord(event.user.id)
         event.respond error_messages[:user_not_logged_in] if user.nil?
-        title = event.message.content.split(" ")[1 .. -1].join(" ")
-        @chat = Chat.find_by(user_id: user.id, title: title) if user
+        title = event.message.content.split(" ")[1..].join(" ")
+        @chat = user.chat_by_title(title)
         event.respond error_messages[:chat_not_found] if chat.nil? && user
         hist_action if user && chat
       end
-      logger.log("Hist Event Configured")
     end
 
     def hist_action
@@ -144,34 +124,32 @@ module ChatgptAssistant
 
     def help_event
       bot.command :help do |event|
-        @evnt  = event
+        @evnt = event
         help_action
       end
-      logger.log("Help Event Configured")
     end
 
     def help_action
-      message = help_messages.join("\n").gsub(" /", " gpt!")
-                               .gsub("register/", "gpt!register ")
-                               .gsub("login/", "gpt!login ")
-                               .gsub("new_chat/", "gpt!new_chat/")
-                               .gsub("sl_chat/", "gpt!sl_chat/")
+      message = help_messages.join("\n").gsub(" /", discord_prefix)
+                             .gsub("register/", "#{discord_prefix}register ")
+                             .gsub("login/", "#{discord_prefix}login ")
+                             .gsub("new_chat/", "#{discord_prefix}new_chat/")
+                             .gsub("sl_chat/", "#{discord_prefix}sl_chat/")
       evnt.respond message
     end
 
     def new_chat_event
       bot.command :new_chat do |event|
         @evnt = event
-        @user = User.find_by(discord_id: event.user.id)
+        @user = find_userdiscord(event.user.id)
         event.respond error_messages[:user_not_logged_in] if user.nil?
         create_chat_action if user
       end
-      logger.log("New Chat Event Configured")
     end
 
     def create_chat_action
-      chat_title = event.message.content.split(" ")[1..].join(" ")
-      chat = Chat.new(user_id: user.id, title: chat_title, status: 0)
+      chat_title = evnt.message.content.split(" ")[1..].join(" ")
+      @chat = Chat.new(user_id: user.id, title: chat_title, status: 0)
       chat.save ? respond_with_success : evnt.respond(error_messages[:chat_creation])
     end
 
@@ -184,17 +162,15 @@ module ChatgptAssistant
       bot.command :sl_chat do |event|
         @evnt = event
         chat_to_select = event.message.content.split(" ")[1..].join(" ")
-        
-        @user = User.find_by(discord_id: event.user.id)
+        @user = find_userdiscord(event.user.id)
         event.respond error_messages[:user_not_logged_in] if user.nil?
 
         sl_chat_action(chat_to_select) if user
       end
-      logger.log("SL Chat Event Configured")
     end
 
     def sl_chat_action(chat_to_select)
-      @chat = Chat.find_by(title: chat_to_select, user_id: user.id)
+      @chat = user.chat_by_title(chat_to_select)
       evnt.respond error_messages[:chat_not_found] if chat.nil?
       user.update(current_chat_id: chat.id) if chat
       evnt.respond success_messages[:chat_selected] if chat
@@ -204,11 +180,10 @@ module ChatgptAssistant
       bot.command :ask do |event|
         @evnt = event
         @message = event.message.content.split(" ")[1..].join(" ")
-        @user = User.find_by(discord_id: event.user.id)
+        @user = find_userdiscord(event.user.id)
         event.respond error_messages[:user_not_logged_in] if user.nil?
         ask_action if user
       end
-      logger.log("Ask Event Configured")
     end
 
     def ask_action
@@ -226,16 +201,23 @@ module ChatgptAssistant
     def voice_connect_event
       bot.command :connect do |event|
         @evnt = event
-        @user = User.find_by(discord_id: event.user.id)
+        @user = find_userdiscord(event.user.id)
         @chat = Chat.where(id: user.current_chat_id).last
-        event.respond error_messages[:user_not_logged_in] if user.nil?
-        event.respond error_messages[:chat_not_found] if user && chat.nil?
-        event.respond error_messages[:user_not_in_voice_channel] if event.user.voice_channel.nil? && user
-        event.respond error_messages[:bot_already_connected] if event.voice && user
+        voice_connect_checker_action
+        voice_connection_checker_action
         bot.voice_connect(event.user.voice_channel) if bot_disconnected?
-        "Connected to voice channel" if bot_connected?
+        bot_connected? ? "Connected to voice channel" : "Error connecting to voice channel"
       end
-      logger.log("Voice Connect Event Configured")
+    end
+
+    def voice_connect_checker_action
+      evnt.respond error_messages[:user_not_logged_in] if user.nil?
+      evnt.respond error_messages[:chat_not_found] if user && chat.nil?
+    end
+
+    def voice_connection_checker_action
+      evnt.respond error_messages[:user_not_in_voice_channel] if evnt.user.voice_channel.nil? && user
+      evnt.respond error_messages[:bot_already_connected] if evnt.voice && user
     end
 
     def bot_disconnected?
@@ -249,19 +231,20 @@ module ChatgptAssistant
     def disconnect_event
       bot.command :disconnect do |event|
         @evnt = event
-        @user = User.find_by(discord_id: event.user.id)
-        event.respond error_messages[:user_not_logged_in] if user.nil?
-        event.respond error_messages[:user_not_in_voice_channel] if event.user.voice_channel.nil? && user
-        event.respond error_messages[:user_not_connected] if !event.voice && user
+        @user = find_userdiscord(event.user.id)
+        disconnect_checker_action
         disconnect_action if user && event.user.voice_channel && event.voice
       end
-      logger.log("Disconnect Event Configured")
+    end
+
+    def disconnect_checker_action
+      evnt.respond error_messages[:user_not_logged_in] if user.nil?
+      evnt.respond error_messages[:user_not_in_voice_channel] if evnt.user.voice_channel.nil? && user
+      evnt.respond error_messages[:user_not_connected] if !evnt.voice && user
     end
 
     def disconnect_action
-      logger.log("Disconnecting from voice channel: #{evnt.user.voice_channel.name}")
-      bot.voice_destroy(event.user.voice_channel)
-      logger.log("Disconnected from voice channel: #{evnt.user.voice_channel.name}")
+      bot.voice_destroy(evnt.user.voice_channel)
       "Disconnected from voice channel"
     end
 
@@ -269,16 +252,24 @@ module ChatgptAssistant
       bot.command :speak do |event|
         @evnt = event
         @message = event.message.content.split(" ")[1..].join(" ")
-        @user = User.find_by(discord_id: event.user.id)
-        @chat = Chat.where(id: user.current_chat_id).last
-        event.respond error_messages[:user_not_logged_in] if user.nil?
-        event.respond error_messages[:user_not_in_voice_channel] if event.user.voice_channel.nil? && user
-        event.respond error_messages[:bot_not_in_voice_channel] if !event.voice && user
-        event.respond error_messages[:chat_not_found] if user && event.user.voice_channel && event.voice && chat.nil?
+        @user = find_userdiscord(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?
       end
     end
 
+    def speak_connect_checker_action
+      evnt.respond error_messages[:user_not_logged_in] if user.nil?
+      evnt.respond error_messages[:chat_not_found] if user && evnt.user.voice_channel && evnt.voice && chat.nil?
+    end
+
+    def speak_connection_checker_action
+      evnt.respond error_messages[:user_not_in_voice_channel] if evnt.user.voice_channel.nil? && user
+      evnt.respond error_messages[:bot_not_in_voice_channel] if !evnt.voice && user
+    end
+
     def ask_to_speak_action
       Message.create(chat_id: chat.id, content: message, role: "user")
       response = chatter.chat(message, chat.id)
@@ -294,7 +285,6 @@ module ChatgptAssistant
     end
 
     def bot_init
-      logger.log("Discord bot started")
       at_exit { bot.stop }
       bot.run
     rescue StandardError

data/lib/bots/telegram_bot.rb

@@ -4,59 +4,72 @@ module ChatgptAssistant
   # This class is responsible for the telegram bot features
   class TelegramBot < ApplicationBot
     def start
-      start_log
       bot.listen do |message|
         @msg = message
-        next unless text_or_audio?
-
-        message_received_log
-        message_text_cases if msg.text.present?
-        message_audio_process if msg.audio.present? || msg.voice.present?
+        event_callback
       end
+    rescue StandardError
+      retry
     end
 
     private
 
     attr_accessor :msg
 
-    def message_text_cases
-      logger.log("MESSAGE TEXT: TRUE")
+    def event_callback
+      return unless text_or_audio?
+
+      text_events if msg.text.present?
+      audio_event if msg.audio.present? || msg.voice.present?
+    end
+
+    def text_events
       case msg.text
       when "/start"
-        run_start
+        start_event
       when "/help"
-        run_help
+        help_event
       when "/list"
-        list_chats
+        list_event
       when "/stop"
-        run_stop
+        stop_event
       when "/hist"
-        run_hist
+        hist_event
       when nil
-        run_nil_error
+        nil_event
       else
-        operations
+        action_events
       end
     end
 
-    def message_audio_process
-      logger.log("MESSAGE AUDIO: TRUE")
-      return bot.api.send_message(chat_id: msg.chat.id, text: error_messages[:no_chat_selected]) if user.current_chat_id.nil? || user.current_chat_id.zero?
-      chat = Chat.find(user.current_chat_id)
-      message_create(transcribed_text, chat.id, "user")
-      text = chatter.chat(transcribed_text, chat.id)
-      voice = audio_synthesis.synthesize_text(text)
-      bot.api.send_message(chat_id: msg.chat.id, text: text)
+    def audio_event
+      return bot.api.send_message(chat_id: msg.chat.id, text: error_messages[:no_chat_selected]) if user.current_chat.nil?
+
+      chat = user.current_chat
+      user_audio = transcribed_file
+      message = Message.new(content: user_audio["text"], chat_id: chat.id, role: "user")
+      if message.save
+        ai_text = chatter.chat(user_audio["text"], chat.id)
+        ai_voice = audio_synthesis.synthesize_text(ai_text)
+        send_audio_message(ai_voice, ai_text)
+        delete_all_voice_files
+      else
+        bot.api.send_message(chat_id: msg.chat.id, text: error_messages[:message_creation_error])
+      end
+    end
+
+    def send_audio_message(voice, text)
       bot.api.send_voice(chat_id: msg.chat.id, voice: Faraday::UploadIO.new(voice, "audio/mp3"))
-      delete_all_voice_files
+      bot.api.send_message(chat_id: msg.chat.id, text: text)
     end
 
-    def operations
+    def action_events
       return chatter_call unless actions?
       return new_chat if msg.text.include?("new_chat/")
       return select_chat if msg.text.include?("sl_chat/")
       return login if msg.text.include?("login/")
       return register if msg.text.include?("register/")
+
       invalid_command_error_message
     end
 
@@ -68,7 +81,7 @@ module ChatgptAssistant
         user_not_found_error_message
       when "wrong password"
         wrong_password_error_message
-      when find_usertelegram(email)
+      when find_useremail(email)
         user_logged_in_message
       end
     end
@@ -95,11 +108,11 @@ module ChatgptAssistant
       "https://api.telegram.org/file/bot#{telegram_token}/#{audio_info["result"]["file_path"]}"
     end
 
-    def transcribed_text
+    def transcribed_file
       audio_recognition.transcribe_audio(audio_url)
     end
 
-    def run_start
+    def start_event
       bot.api.send_message(chat_id: msg.chat.id, text: commom_messages[:start])
       help_message = help_messages.join("\n").to_s
       bot.api.send_message(chat_id: msg.chat.id, text: help_message)
@@ -107,38 +120,30 @@ module ChatgptAssistant
       bot.api.send_message(chat_id: msg.chat.id, text: commom_messages[:start_sec_helper])
     end
 
-    def run_hist
+    def hist_event
       return not_logged_in_message unless user
+      return bot.api.send_message(chat_id: msg.chat.id, text: error_messages[:no_chat_selected]) unless user.current_chat
 
-      chat = Chat.find(user.current_chat_id)
-      if chat
-        if chat.messages.count.zero?
-          return bot.api.send_message(chat_id: msg.chat.id,
-                                               text: error_messages[:no_messages_founded])
-        end
-
-        response = chat.messages.last(4).map do |mess|
-          "#{mess.role}: #{mess.content}\n at: #{mess.created_at}\n\n"
-        end.join
-        logger.log("HIST RESPONSE: #{response}")
-        bot.api.send_message(chat_id: msg.chat.id, text: response)
-      else
-        bot.api.send_message(chat_id: msg.chat.id, text: error_messages[:no_chat_selected])
+      if user.current_chat.messages.count.zero?
+        return bot.api.send_message(chat_id: msg.chat.id,
+                                    text: error_messages[:no_messages_founded])
       end
+
+      response = chat.messages.last(4).map do |mess|
+        "#{mess.role}: #{mess.content}\n at: #{mess.created_at}\n\n"
+      end.join
+      bot.api.send_message(chat_id: msg.chat.id, text: response)
     end
 
     def select_chat
-      if user.nil?
-        not_logged_in_message
-      else
-        chat = Chat.find_by(user: user, title: msg.text.split("/").last)
-        if chat
-          user.update(current_chat_id: chat.id)
-          bot.api.send_message(chat_id: msg.chat.id, text: success_messages[:chat_selected])
-        else
-          chat_not_found_message
-        end
-      end
+      return not_logged_in_message unless user
+
+      title = msg.text.split("/").last
+      chat = user.chat_by_title(title)
+      return chat_not_found_message unless chat
+
+      user.update(current_chat_id: chat.id)
+      bot.api.send_message(chat_id: msg.chat.id, text: success_messages[:chat_selected])
     end
 
     def new_chat
@@ -152,18 +157,23 @@ module ChatgptAssistant
       chat.save ? chat_created_message(chat) : chat_creation_failed_message
     end
 
-    def list_chats
-      chats = Chat.where(user_id: User.find_by(telegram_id: msg.chat.id).id)
-      return bot.api.send_message(chat_id: msg.chat.id, text: error_messages[:no_chats_founded]) if chats.count.zero?
-      bot.api.send_message(chat_id: msg.chat.id,
-                                    text: commom_messages[:chats_list])
+    def list_event
+      return unless valid_for_list_action?
+
+      bot.api.send_message(chat_id: msg.chat.id, text: commom_messages[:chat_list])
       chats_str = ""
-      chats.each do |chat|
+      user.chats.each do |chat|
         chats_str += "Chat #{chat.id} - #{chat.title}\n"
       end
       bot.api.send_message(chat_id: msg.chat.id, text: chats_str)
     end
 
+    def valid_for_list_action?
+      bot.api.send_message(chat_id: msg.chat.id, text: error_messages[:not_logged_in]) if user.nil?
+      bot.api.send_message(chat_id: msg.chat.id, text: error_messages[:no_chats_founded]) if user.chats.count.zero?
+      !user.nil? && user.chats.count.positive?
+    end
+
     def chatter_call
       user ? chat_if_exists : not_logged_in_message
     end
@@ -178,18 +188,18 @@ module ChatgptAssistant
       bot.api.send_message(chat_id: msg.chat.id, text: chatter.chat(msg.text, chat_id))
     end
 
-    def run_help
+    def help_event
       help_messages.each do |message|
         bot.api.send_message(chat_id: msg.chat.id, text: message)
       end
     end
 
-    def run_stop
+    def stop_event
       bot.api.send_message(chat_id: msg.chat.id, text: commom_messages[:stop])
       bot.api.leave_chat(chat_id: msg.chat.id)
     end
 
-    def run_nil_error
+    def nil_event
       bot.api.send_message(chat_id: msg.chat.id, text: error_messages[:nil])
     end
 
@@ -233,31 +243,19 @@ module ChatgptAssistant
 
     def no_chat_selected
       bot.api.send_message(chat_id: msg.chat.id,
-                                    text: error_messages[:no_chat_selected])
+                           text: error_messages[:no_chat_selected])
     end
 
     def chat_not_found_message
       bot.api.send_message(chat_id: msg.chat.id, text: error_messages[:chat_not_found])
     end
 
-    def start_log
-      logger.log("STARTING BOT AT #{Time.now}")
-      logger.log("ENVIRONMENT: #{@config.env_type}")
-    end
-
     def error_log(err)
       if err.message.to_s.include?("Bad Request: message is too long")
         bot.api.send_message(chat_id: msg.chat.id, text: error_messages[:message_history_too_long])
       else
         bot.api.send_message(chat_id: msg.chat.id, text: error_messages[:something_went_wrong])
-        bot.api.send_message(chat_id: msg.chat.id, text: "ERROR: #{err.message}\n #{err.backtrace}")
       end
-      logger.log("ERROR: #{err.message}\n #{err.backtrace}")
-    end
-
-    def message_received_log
-      logger.log("MESSAGE RECEIVED AT: #{Time.now}")
-      logger.log("MESSAGE FROM USER: #{msg.from.first_name} #{msg.from.last_name} - #{msg.from.username}")
     end
 
     def user

data/lib/chatgpt_assistant/audio_recognition.rb

@@ -4,25 +4,24 @@ module ChatgptAssistant
   # This is the AudioRecognition class
   class AudioRecognition
     def initialize(openai_api_key)
+      time = Time.now.to_i
+      @dl_file_name = "voice/audio-#{time}.oga"
+      @file_name = "voice/audio-#{time}.mp3"
       @conn = Faraday.new(url: "https://api.openai.com/") do |faraday|
         faraday.request :multipart
         faraday.request :url_encoded
         faraday.adapter Faraday.default_adapter
       end
-      @logger = ChatterLogger.new
       @openai_api_key = openai_api_key
     end
 
     def download_audio(audio_url)
-      logger.log("DOWNLOADING AUDIO FROM TELEGRAM")
-      @time = Time.now.to_i
       audio_conn = Faraday.new(url: audio_url)
-      File.open("voice/audio-#{time}.oga", "wb") do |file|
+      File.open(dl_file_name, "wb") do |file|
         file.write(audio_conn.get.body)
       end
-
-      FFMPEG::Movie.new("voice/audio-#{time}.oga").transcode("voice/audio-#{time}.mp3")
-      File.delete("voice/audio-#{time}.oga")
+      FFMPEG::Movie.new(dl_file_name).transcode(file_name)
+      File.delete(dl_file_name)
     end
 
     def header
@@ -34,21 +33,27 @@ module ChatgptAssistant
 
     def payload
       {
-        "file": Faraday::UploadIO.new("voice/audio-#{time}.mp3", "audio/mp3"),
+        "file": Faraday::UploadIO.new(file_name, "audio/mp3"),
         "model": "whisper-1"
       }
     end
 
+    def transcribed_file_json
+      {
+        file_name: file_name,
+        text: JSON.parse(response.body)["text"]
+      }.to_json
+    end
+
     def transcribe_audio(audio_url)
       @audio_url = audio_url
       download_audio(audio_url)
-      response = conn.post("v1/audio/transcriptions", payload, header)
-      logger.log("RESPONSE FROM OPENAI API AUDIO TRANSCRIPTION")
-      JSON.parse(response.body)["text"]
+      @response = conn.post("v1/audio/transcriptions", payload, header)
+      transcribed_file_json
     end
 
     private
 
-    attr_reader :conn, :openai_api_key, :logger, :audio_url, :time, :ibm_api_key, :ibm_url
+    attr_reader :conn, :openai_api_key, :audio_url, :time, :ibm_api_key, :ibm_url, :response, :dl_file_name, :file_name
   end
 end

data/lib/chatgpt_assistant/audio_synthesis.rb

@@ -9,7 +9,6 @@ module ChatgptAssistant
       @openai_api_key = config.openai_api_key
       @language = config.language
       @conn = faraday_instance
-      @logger = ChatterLogger.new
       classify_mode
     end
 
@@ -24,7 +23,7 @@ module ChatgptAssistant
     private
 
     attr_reader :openai_api_key, :ibm_api_key, :ibm_url, :aws_access_key_id, :aws_secret_access_key, :aws_region,
-                :config, :logger, :language, :voice
+                :config, :language, :voice
 
     def faraday_instance
       Faraday.new(url: "https://api.openai.com/") do |faraday|
@@ -49,7 +48,6 @@ module ChatgptAssistant
 
     def synthesize_text_aws(text)
       time = Time.now.to_i
-      logger.log("SYNTHESIZING TEXT WITH AWS POLLY")
       @time = Time.now.to_i
       polly_client = Aws::Polly::Client.new(
         access_key_id: aws_access_key_id,
@@ -66,14 +64,11 @@ module ChatgptAssistant
       File.open("voice/aws-#{time}.mp3", "wb") do |file|
         file.write(response.audio_stream.read)
       end
-
-      logger.log("SYNTHESIZED TEXT WITH AWS POLLY")
       "voice/aws-#{time}.mp3"
     end
 
     def synthesize_text_ibm(text)
       time = Time.now.to_i
-      logger.log("SYNTHESIZING TEXT WITH IBM WATSON")
       authenticator = IBMWatson::Authenticators::IamAuthenticator.new(
         apikey: ibm_api_key
       )

data/lib/chatgpt_assistant/chatter.rb

@@ -2,45 +2,34 @@
 
 require "faraday"
 require_relative "models"
-require_relative "chatter_logger"
 
 module ChatgptAssistant
   # This is the Chat Ai class
   class Chatter
     def initialize(openai_api_key)
       @openai_api_key = openai_api_key
-      @logger = ChatterLogger.new
     end
 
     def chat(message, chat_id)
       @chat_id = chat_id
       @message = message
-      init_log
       @response = request(message)
       @json = JSON.parse(response.body)
-      logger.log("RESPONSE FROM OPENAI API: OK")
 
       return error_log if response.status != 200
 
       text = json["choices"][0]["message"]["content"]
 
       Message.create(content: text, role: "assistant", chat_id: chat_id)
-      logger.log("MESSAGE SAVED IN DATABASE")
       text
     end
 
     private
 
-    attr_reader :openai_api_key, :response, :message, :logger
+    attr_reader :openai_api_key, :response, :message
     attr_accessor :chat_id, :json
 
-    def init_log
-      logger.log("REQUESTING OPENAI API COMPLETION")
-    end
-
     def error_log
-      logger.log("RESPONSE FROM OPENAI API ERROR")
-      logger.log("RESPONSE STATUS: #{response.status}")
       "Algo deu errado, tente novamente mais tarde."
     end
 
@@ -60,17 +49,7 @@ module ChatgptAssistant
 
     def request_params(message)
       messages = Message.where(chat_id: chat_id).order(id: :asc).last(10)
-      if messages.empty?
-        ids = ["unknown"]
-        messages = [{ role: "user", content: message }]
-      else
-        ids = messages.map(&:id)
-        messages = messages.map { |mess| { role: mess.role, content: mess.content } }
-      end
-      logger.log("MESSAGES LOADED IN CONTEXT: #{messages.count}")
-      messages.each_with_index do |mess, index|
-        logger.log("MESSAGE ROLE: #{mess[:role]}, ID: #{ids[index]}")
-      end
+      messages = messages.empty? ? [{ role: "user", content: message }] : messages.map { |mess| { role: mess.role, content: mess.content } }
       {
         model: "gpt-3.5-turbo",
         messages: messages

data/lib/chatgpt_assistant/default_messages.rb

@@ -51,6 +51,7 @@ module ChatgptAssistant
         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",
@@ -66,7 +67,8 @@ module ChatgptAssistant
         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."
+        invalid_command: "Comando inválido. Tente novamente.",
+        message_creation_error: "Erro ao criar mensagem. Tente novamente."
       }
     end
 
@@ -112,6 +114,7 @@ module ChatgptAssistant
         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",
@@ -126,7 +129,8 @@ module ChatgptAssistant
         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."
+        invalid_command: "Invalid command. Try again.",
+        message_creation_error: "Error creating message. Try again."
       }
     end
 

data/lib/chatgpt_assistant/models.rb

@@ -21,9 +21,17 @@ class User < ActiveRecord::Base
     self.password_hash = BCrypt::Engine.hash_secret(password_hash, password_salt)
   end
 
+  def current_chat
+    chats.find(current_chat_id)
+  end
+
   def last_chat
     chats.last
   end
+
+  def chat_by_title(title)
+    chats.find_by(title: title)
+  end
 end
 
 # Chat model

data/lib/chatgpt_assistant/version.rb

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

data/lib/chatgpt_assistant.rb

@@ -3,7 +3,6 @@
 require_relative "chatgpt_assistant/audio_recognition"
 require_relative "chatgpt_assistant/default_messages"
 require_relative "chatgpt_assistant/audio_synthesis"
-require_relative "chatgpt_assistant/chatter_logger"
 require_relative "chatgpt_assistant/chatter"
 require_relative "chatgpt_assistant/version"
 require_relative "chatgpt_assistant/config"

metadata

@@ -1,18 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: chatgpt_assistant
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - JesusGautamah
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-02 00:00:00.000000000 Z
+date: 2023-04-04 00:00:00.000000000 Z
 dependencies: []
 description: |-
   This gem has the intention to facilitate the creation of chatbots with GPT-3.5-turbo,
-    Telegram bot, Discord bot, Audio Transcription and IBM Cloud Text to Speech in docker containers.
+    Telegram bot, Discord bot, Audio Transcription and IBM Cloud Text to Speech or AWS Polly in docker containers.
+    Documentation: https://github.com/JesusGautamah/chatgpt_assistant
 email:
 - lima.jesuscc@gmail.com
 executables:
@@ -21,9 +22,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".env_prod_sample"
 - ".env_sample"
 - ".rspec"
 - ".rubocop.yml"
+- ".workflow_secrets_sample"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -47,7 +50,6 @@ files:
 - lib/chatgpt_assistant/audio_recognition.rb
 - lib/chatgpt_assistant/audio_synthesis.rb
 - lib/chatgpt_assistant/chatter.rb
-- lib/chatgpt_assistant/chatter_logger.rb
 - lib/chatgpt_assistant/config.rb
 - lib/chatgpt_assistant/default_messages.rb
 - lib/chatgpt_assistant/migrations.rb
@@ -63,7 +65,7 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/JesusGautamah/chatgpt_assistant
   source_code_uri: https://github.com/JesusGautamah/chatgpt_assistant.git
-  changelog_uri: https://github.com/JesusGautamah/chatgpt_assistant/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/JesusGautamah/chatgpt_assistant/releases
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -83,5 +85,5 @@ rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Easy way chatbot with GPT-3.5-turbo, Telegram bot, Discord bot, Audio Transcription
-  and IBM Cloud Text to Speech.
+  and IBM Cloud Text to Speech or AWS Polly in docker containers.
 test_files: []

data/lib/chatgpt_assistant/chatter_logger.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module ChatgptAssistant
-  # This class is responsible for logging the messages
-  class ChatterLogger
-    def initialize
-      @file_name = "logs/telegram_chatgpt.log"
-      @log_file = File.open("logs/telegram_chatgpt.log", "a")
-    end
-
-    attr_reader :log_file
-
-    def log(message)
-      log_file.puts(message)
-      system "echo '#{message}'"
-    end
-  end
-end