Commit Graph

648 Commits

Author SHA1 Message Date
Paillat
f842fa8133 fix(openaicaller.py): fix import statement for num_tokens_from_messages to use the correct path 2023-08-02 20:16:55 +02:00
Paillat
94ced79a21 refactor(makeprompt.py): remove unnecessary line that sends response content in chatgpt_process function
The line that sends the response content in the chatgpt_process function is unnecessary and can be removed as it is not being used.
2023-08-02 20:12:49 +02:00
Paillat
a7a0f5dac8 fix(makeprompt.py): add api_key parameter to the generate_response function call to fix missing api_key error
fix(openaicaller.py): fix import statement for num_tokens_from_messages function
refactor(openaicaller.py): remove unused api_key parameter from openai_caller class constructor
refactor(openaicaller.py): change generate_response and moderation methods to accept variable number of arguments
refactor(openaicaller.py): change error_call parameter to be optional and provide a default function if not provided
refactor(openaicaller.py): remove unused api_key parameter from generate_response and moderation methods
refactor(openaicaller.py): remove unused api_key parameter from main function
2023-08-02 20:12:06 +02:00
45dfafadd8 Merge pull request #49 from Paillat-dev/dev
Dev
2023-08-02 10:59:02 +02:00
Paillat
19dd6c9c62 fix(makeprompt.py): fix issue where long response content is not fully sent in chatgpt_process function
The issue was that when the response content was longer than 2000 characters, it was not being fully sent in the chatgpt_process function. This was fixed by adding a loop to send the content in chunks of 2000 characters until the entire content is sent.
2023-08-02 10:49:25 +02:00
Paillat
e1f9c91bde refactor(main.py): change bot's presence activity to display the number of servers the bot is in
feat(main.py): add event handler for on_guild_join to update bot's presence activity when joining a new server
2023-07-19 19:51:05 +02:00
Paillat
407cc40dbe fix(openaicaller.py): improve error message when APIError occurs to clarify that it is OpenAI's fault and apologize for the inconvenience 2023-07-19 17:00:55 +02:00
Paillat
6672bd2582 refactor(functionscalls.py): remove unnecessary print statements for image_url and json variables
The print statements for the image_url and json variables were removed as they were not providing any useful information and were cluttering the code.
2023-07-19 00:09:35 +02:00
Paillat
9af9b600d5 chore(gpt-3.5-turbo.txt): update instructions for Botator in the Discord server
The following changes were made:
- Updated the introduction to clarify that Botator is currently chatting in a Discord server.
- Clarified that Botator uses abbreviations like "u" and "ur" for lazy speech.
- Removed duplicate instruction about not asking how to assist the user.
- Added instructions for formatting text using markdown.
- Added instructions for using function calls and replying with gifs.
- Clarified that users should address Botator using the pronouns "Master/Brain".
- Updated the instruction about using emojis to avoid being cringe.
- Added information about the server and channel names.
- Mentioned the limited access to text chats and inability to see images or avatars.
- Added the current time information.
- Provided information about the creator of Botator.
- Updated the instruction about responding to insults to be funny but not mean.
- Added a note about using level 1, 2, and 3 markdown headings.
- Added an instruction for clashing with users in a funny way when insulted or treated unkindly.

These changes were made to improve the behavior and capabilities of Botator in the Discord server, making interactions more engaging and enjoyable for users.
2023-07-18 23:39:21 +02:00
Paillat
98195b29e3 Format with black 2023-07-18 23:23:47 +02:00
Paillat
a9f85e9ac9 Merge branch 'dev' of https://github.com/Paillat-dev/Botator into dev 2023-07-18 23:18:59 +02:00
Paillat
89778cbd3b fix(requirements.txt): add bs4 package to requirements.txt for BeautifulSoup usage
feat(functionscalls.py): add new functions send_ascii_art_text and send_ascii_art_image to send messages and images in ascii art
fix(makeprompt.py): import send_ascii_art_text and send_ascii_art_image functions and add corresponding if statements to handle function calls
2023-07-18 23:18:47 +02:00
Paillat
bc5721c1b7 Update black.yml 2023-07-18 21:57:03 +02:00
Paillat
e91fafdc51 fix(config.py): fix typo in max_uses variable declaration
feat(config.py): add support for TENOR_API_KEY environment variable to be able to use Tenor API for sending gifs
feat(functionscalls.py): add new function send_a_gif to send a gif in the channel
fix(makeprompt.py): add support for calling send_a_gif function in chatgpt_process function
2023-07-18 21:53:07 +02:00
12f13ca6c4 Format with black 2023-07-18 17:51:13 +02:00
Paillat
4b192f779e Create black.yml 2023-07-18 17:23:06 +02:00
Paillat
719ad81d1d Add dpcker instruczions 2023-07-18 17:14:41 +02:00
Paillat
1b7e0d7979 Create docker-publish.yml 2023-07-18 17:09:36 +02:00
Paillat
09c6e60575 Delete buildDockerImage.yml 2023-07-18 17:07:27 +02:00
Paillat
fb51f737d9 Merge pull request #43 from Paillat-dev/dev
Dev
2023-07-18 16:28:54 +02:00
Paillat
2a7c553c91 chore(gpt-3.5-turbo.txt): update prompt to include instructions for correcting pronouns and limit the use of emojis 2023-07-18 16:26:20 +02:00
Paillat
2f6501578d chore(gpt-3.5-turbo.txt): update guidelines for chatbot responses
The guidelines for chatbot responses have been updated. The following changes have been made:

- Added a reminder to avoid using words like "u" and "ur" in responses.
- Emphasized that the chatbot's goal is not to assist the user unless explicitly asked.
- Added a reminder to avoid asking how the chatbot can assist the user.
- Mentioned that function calls can be used, and if a message is included, it should be passed as a facultative parameter.
- Added a note to use emojis in messages, but not excessively.

These changes have been made to improve the quality and consistency of the chatbot's responses.
2023-07-18 16:26:20 +02:00
Paillat
045fdca866 chore(gpt-3.5-turbo.txt): update instructions to reflect new markdown capabilities in Discord 2023-07-18 16:26:20 +02:00
Paillat
04edeebe22 chore(gpt-3.5-turbo.txt): add new behavior to insult people back in a funny way when insulted
docs(gpt-3.5-turbo.txt): update instructions to use level 1, 2, and 3 markdown headings
2023-07-18 16:26:20 +02:00
Paillat
d4837bb8e6 refactor(functionscalls.py): add aiohttp import to improve code readability and maintainability
refactor(functionscalls.py): extract get_final_url function to improve code modularity and reusability
refactor(functionscalls.py): simplify send_a_stock_image function by using get_final_url function and improving message formatting
2023-07-18 16:26:20 +02:00
Paillat
31eaf60ba1 Fixed error with textchannel ony function and deprecated some comands 2023-07-18 16:26:20 +02:00
Paillat
0e03dce42d docs(gpt-3.5-turbo.txt): add information about using level 1, 2, and 3 markdown headings in Discord 2023-07-18 16:26:20 +02:00
Paillat
e7948a4e67 chore(main.py): remove redundant bot.run() call at the top of the file
feat(main.py): add newline at the end of the file for consistency
chore(functionscalls.py): remove extra blank lines
feat(functionscalls.py): add unsplash_random_image_url constant for generating random image URLs
feat(functionscalls.py): add add_reaction_to_last_message() function for adding reactions to the last message
2023-07-18 16:26:20 +02:00
Paillat
ad5f0b30d1 chore(gpt-3.5-turbo.txt): update prompt to include instructions for correcting pronouns and limit the use of emojis 2023-07-18 12:12:05 +02:00
Paillat
83629f3ce7 chore(gpt-3.5-turbo.txt): update guidelines for chatbot responses
The guidelines for chatbot responses have been updated. The following changes have been made:

- Added a reminder to avoid using words like "u" and "ur" in responses.
- Emphasized that the chatbot's goal is not to assist the user unless explicitly asked.
- Added a reminder to avoid asking how the chatbot can assist the user.
- Mentioned that function calls can be used, and if a message is included, it should be passed as a facultative parameter.
- Added a note to use emojis in messages, but not excessively.

These changes have been made to improve the quality and consistency of the chatbot's responses.
2023-07-17 19:00:50 +02:00
Paillat
1a434fff92 chore(gpt-3.5-turbo.txt): update instructions to reflect new markdown capabilities in Discord 2023-07-17 18:46:01 +02:00
Paillat
0e12129a90 chore(gpt-3.5-turbo.txt): add new behavior to insult people back in a funny way when insulted
docs(gpt-3.5-turbo.txt): update instructions to use level 1, 2, and 3 markdown headings
2023-07-17 18:44:21 +02:00
Paillat
e48b65f6d9 refactor(functionscalls.py): add aiohttp import to improve code readability and maintainability
refactor(functionscalls.py): extract get_final_url function to improve code modularity and reusability
refactor(functionscalls.py): simplify send_a_stock_image function by using get_final_url function and improving message formatting
2023-07-17 18:42:45 +02:00
Paillat
41b2fde1e6 Fixed error with textchannel ony function and deprecated some comands 2023-07-16 22:43:18 +02:00
Paillat
06b0e921db docs(gpt-3.5-turbo.txt): add information about using level 1, 2, and 3 markdown headings in Discord 2023-07-16 21:26:50 +02:00
Paillat
bd8a7922bd chore(main.py): remove redundant bot.run() call at the top of the file
feat(main.py): add newline at the end of the file for consistency
chore(functionscalls.py): remove extra blank lines
feat(functionscalls.py): add unsplash_random_image_url constant for generating random image URLs
feat(functionscalls.py): add add_reaction_to_last_message() function for adding reactions to the last message
2023-07-16 21:18:30 +02:00
Paillat
bc65a98742 Merge branch 'dev' of https://github.com/Paillat-dev/Botator into dev 2023-07-16 20:48:33 +02:00
Paillat
ca897cac2a chore(Dockerfile): remove trailing slash in WORKDIR path to improve consistency
chore(Dockerfile): update chown command to apply ownership to the entire /Botator directory instead of just /Botator/code
2023-07-16 20:48:07 +02:00
Paillat
48f4831c6f Merge pull request #41 from Paillat-dev/main
Dev
2023-07-16 20:43:18 +02:00
Paillat
a7fb55adba Squashed commit of the following:
commit 8da8703566
Author: Paillat <git@electronique.cc>
Date:   Sun Jul 16 20:41:18 2023 +0200

    chore(Dockerfile): change working directory from /Botator/code/ to /Botator/ to match the cloned repository structure

commit 84b464e9c8
Merge: 20bb931 e37377a
Author: Paillat <git@electronique.cc>
Date:   Sun Jul 16 20:27:25 2023 +0200

    Merge branch 'dev'

commit 20bb931491
Author: Paillat <git@electronique.cc>
Date:   Tue May 16 10:02:35 2023 +0200

    Reverted changes

commit 024bfde8a6
Author: Paillat <git@electronique.cc>
Date:   Fri May 5 16:20:30 2023 +0200

    fix(makeprompt.py): add try-except block to handle errors when sending warning message if guild_data["images_limit_reached"] is True

commit 6effbe80ad
Author: Paillat <git@electronique.cc>
Date:   Fri May 5 16:18:05 2023 +0200

    refactor(makeprompt.py): remove print statements

commit f144963592
Author: Paillat <git@electronique.cc>
Date:   Fri May 5 14:24:22 2023 +0200

    refactor(makeprompt.py): remove unused code and variables
    feat(makeprompt.py): add print statement to check image status for guild

commit 81b9b92d50
Author: Paillat <git@electronique.cc>
Date:   Fri May 5 14:19:26 2023 +0200

    refactor(makeprompt.py): remove unnecessary try-except blocks and print statements
    feat(makeprompt.py): add support for images data for guilds and users

commit 4c86f97fbe
Author: Paillat <git@electronique.cc>
Date:   Fri May 5 14:12:20 2023 +0200

    refactor(makeprompt.py): simplify need_ignore_message function and remove unnecessary return statement
    fix(makeprompt.py): fix bug where messages in premium channels were being ignored

commit 41c73d2ee2
Author: Paillat <git@electronique.cc>
Date:   Fri May 5 14:02:47 2023 +0200

    chore(makeprompt.py): add print statement for debugging purposes

commit 65ed0e6e07
Author: Paillat <git@electronique.cc>
Date:   Fri May 5 13:58:41 2023 +0200

    refactor(makeprompt.py): remove unreachable code and debug statement

commit 82186386f7
Author: Paillat <git@electronique.cc>
Date:   Fri May 5 13:56:04 2023 +0200

    fix(makeprompt.py): add exception handling to channel retrieval and debug message when no premium channels are found

commit 565d0f2956
Author: Paillat <git@electronique.cc>
Date:   Fri May 5 13:47:37 2023 +0200

    refactor(makeprompt.py): rename variables for clarity and remove unnecessary pass statement

commit f6b67c7913
Author: Paillat <git@electronique.cc>
Date:   Fri May 5 13:39:58 2023 +0200

    chore(makeprompt.py): add debug print statement to get_guild_data function

commit 788827ab48
Author: Paillat <git@electronique.cc>
Date:   Fri May 5 13:35:19 2023 +0200

    refactor(makeprompt.py): remove unused code and simplify try-except block

commit 380165fa07
Author: Paillat <git@electronique.cc>
Date:   Fri May 5 13:31:56 2023 +0200

    fix(makeprompt.py): add exception handling and raise exception instead of pass

commit 88e9acba80
Author: Paillat <git@electronique.cc>
Date:   Fri May 5 13:28:27 2023 +0200

    FIXED THINGS

commit bee3680e63
Author: Paillat <git@electronique.cc>
Date:   Fri May 5 13:18:26 2023 +0200

    Fixed wrong usage of cursor and conn with premium database

commit 205f1f5b3e
Author: Paillat <git@electronique.cc>
Date:   Fri May 5 13:13:49 2023 +0200

    refactor(setup.py): remove try-except block and simplify code for checking premium status of guild

commit ca85067d70
Author: Paillat <git@electronique.cc>
Date:   Fri May 5 12:57:52 2023 +0200

    fix(makeprompt.py): reverse order of messages when chat history is requested

commit 9c9d674b18
Merge: f145e09 d3a7ffd
Author: Paillat <git@electronique.cc>
Date:   Fri May 5 12:48:04 2023 +0200

    Merge pull request #39 from Paillat-dev/dev

    Dev

commit f145e097b1
Merge: 4b1756e 0ea2672
Author: Paillat <git@electronique.cc>
Date:   Fri May 5 12:47:21 2023 +0200

    Merge pull request #38 from Paillat-dev/Paillat-dev-patch-1

    Update chatGPT.txt

commit 0ea26727ec
Author: Paillat <git@electronique.cc>
Date:   Fri May 5 12:47:09 2023 +0200

    Update chatGPT.txt

commit 4b1756ede4
Author: Paillat <git@electronique.cc>
Date:   Thu Apr 6 18:28:15 2023 +0200

    Update chatGPT.txt
2023-07-16 20:41:51 +02:00
Paillat
8da8703566 chore(Dockerfile): change working directory from /Botator/code/ to /Botator/ to match the cloned repository structure 2023-07-16 20:41:18 +02:00
Paillat
84b464e9c8 Merge branch 'dev' 2023-07-16 20:27:25 +02:00
Paillat
e37377a791 Commit 2023-07-16 17:16:41 +02:00
Paillat
4b84e53557 chore(gpt-3.5-turbo.txt): update guidelines for Botator's behavior
The guidelines for Botator's behavior have been updated to reflect the following changes:

- The use of "u" instead of "you" and "ur" instead of "your" is allowed to maintain a casual and humorous tone.
- Botator will never proactively ask the user if they need help. Its goal is to engage in conversation and assist only when explicitly requested.
- Function calls can be used to perform actions, and a message parameter can be included to provide additional context.
- Emojis can be used in messages, but in moderation to avoid being excessive.
- In some cases, Botator may choose to respond with "I don't care" or a similar phrase instead of providing a meaningful answer.

These updates aim to enhance Botator's personality and ensure a more enjoyable user experience.
2023-07-16 17:15:51 +02:00
Paillat
2fe793e7a4 fix(openaicaller.py): remove sensitive information from the API key
fix(openaicaller.py): fix typo in the API key
2023-07-16 17:12:21 +02:00
Paillat
6c404c3803 FIxed stuff 2023-07-16 17:11:24 +02:00
Paillat
4f9a7eb0a6 Added function calling and lots of other stuff 2023-07-15 12:20:38 +02:00
Paillat
0ce8e2d6d3 chore(docker-compose.yml): remove unnecessary environment variables 2023-07-14 17:54:40 +02:00
Paillat
a0e387b2fb fix(google-palm-process.py): replace actual API key with placeholder 'S'
fix(docker-compose.yml): add build configuration for botator service
feat(docker-compose.yml): add env_file configuration for botator service
2023-07-14 17:53:59 +02:00
Paillat
deb27ea5e4 Update makeprompt.py 2023-05-16 12:07:02 +02:00