Merge pull request #33 from A-Baji/dev

prep for 2.0.0 release

Author: A-Baji

CHANGELOG.md

@@ -2,37 +2,37 @@
 
 Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.
 
-## [2.0.0] - TBD
+## [2.0.0] - 06-15-2023
 
 ### Added
-- A changelog
-- An openAI image generation command
-- The gpt3.5 model to the openai command and made it the default
-- A chatGPT command with chat history functionality
-- Custom emoji support for custom models.
 
-### Fixed
-- Upgrading the packaged executable version now properly applies any new features to existing, non-custom cogs
+- a changelog
+- an openAI image generation command
+- the gpt3.5 model to the openai command and made it the default
+- a chatGPT command with chat history functionality
+- custom emoji support for custom models.
 
-### Changed
+### Fixed
 
-- Made prompt bolding for custom model completions a discord command parameter
+- upgrading the packaged executable version now properly applies any new features to existing, non-custom cogs
+- bug where two stars would appear for blank prompts for custom model completions
 
-### Fixed
+### Changed
 
-- Bug where two stars would appear for blank prompts for custom model completions
+- made prompt bolding for custom model completions a discord command parameter
+- updated modelizer to version [2.0.0](https://github.com/A-Baji/discordAI-modelizer/releases/tag/2.0.0)
 
 ## [1.3.2] - 02-22-2023
 
 ### Changed
 
-- Update modelizer to version [1.2.2](https://github.com/A-Baji/discordAI-modelizer/compare/1.2.1...1.2.2)
+- updated modelizer to version [1.2.2](https://github.com/A-Baji/discordAI-modelizer/releases/tag/1.2.2)
 
 ## [1.3.1] - 02-19-2023
 
 ### Changed
 
-- Update modelizer to version [1.2.1](https://github.com/A-Baji/discordAI-modelizer/compare/1.2.0...1.2.1)
+- updated modelizer to version [1.2.1](https://github.com/A-Baji/discordAI-modelizer/releases/tag/1.2.1)
 
 ## [1.3.0] - 02-17-2023
 
@@ -45,40 +45,41 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
 
 ### Changed
 
-- Update modelizer to version [1.2.0](https://github.com/A-Baji/discordAI-modelizer/compare/1.1.0...1.2.0)
+- updated modelizer to version [1.2.0](https://github.com/A-Baji/discordAI-modelizer/releases/tag/1.2.0)
 
 ## [1.2.1] - 02-12-2023
 
 ### Added
 
-- Option to provide a different openai key to the customai command
+- option to provide a different openai key to the customai command
 
 ## [1.2.0] - 02-11-2023
 
 ### Changed
 
-- Update modelizer to version [1.1.0](https://github.com/A-Baji/discordAI-modelizer/compare/1.0.1...1.1.0)
+- updated modelizer to version [1.1.0](https://github.com/A-Baji/discordAI-modelizer/releases/tag/1.1.0)
 
 ## [1.1.1] - 02-11-2023
 
 ### Added
 
-- Pin modelizer to version [1.1.0](https://github.com/A-Baji/discordAI-modelizer/compare/1.0.0...1.0.1)
+- pinned modelizer to version [1.1.0](https://github.com/A-Baji/discordAI-modelizer/releases/tag/1.0.1)
 
 ### Changed
 
-- Switched from using `os.path` to `pathlib`
+- switched from using `os.path` to `pathlib`
 
 ## [1.1.0] - 01-29-2023
 
 ### Changed
 
-- Modified readme
+- modified readme
 
+[2.0.0]: https://github.com/A-Baji/discordAI/compare/1.3.2...2.0.0
 [1.3.2]: https://github.com/A-Baji/discordAI/compare/1.3.1...1.3.2
 [1.3.1]: https://github.com/A-Baji/discordAI/compare/1.3.0...1.3.1
 [1.3.0]: https://github.com/A-Baji/discordAI/compare/1.2.1...1.3.0
 [1.2.1]: https://github.com/A-Baji/discordAI/compare/1.2.0...1.2.1
 [1.2.0]: https://github.com/A-Baji/discordAI/compare/1.1.1...1.2.0
 [1.1.1]: https://github.com/A-Baji/discordAI/compare/1.1.0...1.1.1
-[1.1.0]: https://github.com/A-Baji/discordAI/releases/tag/1.1.0
+[1.1.0]: https://github.com/A-Baji/discordAI/compare/1.0.0...1.1.0

discordai/bot/__init__.py

@@ -29,7 +29,6 @@
 def start_bot(config, sync=False):
     bot.config = config
     bot.chat_messages = {}
-    bot.chat_init = {}
     bot.emoji_map = {}
 
     @bot.event

discordai/bot/cogs/chatgpt.py

@@ -49,12 +49,12 @@ def __init__(self, bot):
         description="Generate an chatGPT completion",
     )
     @app_commands.describe(
-        prompt="The prompt to pass to chatGPT: Default=\"\"",
+        prompt="The prompt to pass to chatGPT",
         role=" system | user | asssistant: Default=user",
         temp="What sampling temperature to use. Higher values means more risks: Min=0 Max=1 Default=1",
         presence_penalty="Number between -2.0 and 2.0. Positive values will encourage new topics: Min=-2 Max=2 Default=0",
         frequency_penalty="Number between -2.0 and 2.0. Positive values will encourage new words: Min=-2 Max=2 Default=0")
-    async def chatgpt(self, context: Context, prompt: str = "", role: Roles = Roles.user, temp: float = 1.0,
+    async def chatgpt(self, context: Context, prompt: str, role: Roles = Roles.user, temp: float = 1.0,
                      presence_penalty: float = 0.0, frequency_penalty: float = 0.0):
         openai.api_key = self.bot.config["openai_key"]
         model = "gpt-3.5-turbo"
@@ -63,7 +63,7 @@ async def chatgpt(self, context: Context, prompt: str = "", role: Roles = Roles.
         freqPen = min(max(frequency_penalty, -2), 2)
 
         if context.guild.id not in self.bot.chat_messages:
-            self.bot.chat_messages[context.guild.id] = [{"role": "system", "content": self.bot.chat_init[context.guild.id]}] if context.guild.id in self.bot.chat_init and self.bot.chat_init[context.guild.id] else []
+            self.bot.chat_messages[context.guild.id] = []
         self.bot.chat_messages[context.guild.id].append({"role": role.value, "content": prompt})
         messages = self.bot.chat_messages[context.guild.id]
 
@@ -88,7 +88,7 @@ async def chatgpt(self, context: Context, prompt: str = "", role: Roles = Roles.
                     presence_penalty=freqPen,
                     max_tokens=325 if 325 <= 4096-token_cost else token_cost
                 )
-                await context.send(f"{prompt}\n{response['choices'][0]['message']['content']}{warning.value}"[:2000])
+                await context.send(f"{prompt}\n\n{response['choices'][0]['message']['content']}{warning.value}"[:2000])
                 self.bot.chat_messages[context.guild.id].append(response['choices'][0]['message'])
         except Exception as error:
             print(f"Failed to generate valid response for prompt: {prompt}\nError: {error}")
@@ -97,32 +97,27 @@ async def chatgpt(self, context: Context, prompt: str = "", role: Roles = Roles.
             )
 
     @commands.hybrid_command(
-        name="resetchat",
+        name="chatreset",
         description="Resets the chat history for chatGPT completions",
     )
-    async def resetchat(self, context):
-        self.bot.chat_messages[context.guild.id] = [{"role": "system", "content": self.bot.chat_init[context.guild.id]}] if context.guild.id in self.bot.chat_init and self.bot.chat_init[context.guild.id] else []
+    async def chatreset(self, context):
+        self.bot.chat_messages[context.guild.id] = []
         await context.send("Chat history has been reset")
 
     @commands.hybrid_command(
-        name="setchatinit",
-        description="Set the initialization message, a guide for the AI on how to respond to future chat messages",
+        name="chatinit",
+        description="Initialize chatGPT with an instructional message",
     )
-    @app_commands.describe(message="The init message for chatGPT completions. Omit to reset")
-    async def setchatinit(self, context, message: str = ""):
-        self.bot.chat_init[context.guild.id] = message
-        if message:
-            if context.guild.id in self.bot.chat_messages:
-                if self.bot.chat_messages[context.guild.id] and self.bot.chat_messages[context.guild.id][0]["role"] == "system":
-                    self.bot.chat_messages[context.guild.id][0] = {"role": "system", "content": self.bot.chat_init[context.guild.id]}
-                else:
-                    self.bot.chat_messages[context.guild.id] = [{"role": "system", "content": self.bot.chat_init[context.guild.id]}] + self.bot.chat_messages[context.guild.id]
-            await context.send("Chat init message has been set")
+    @app_commands.describe(message="The initialization message")
+    async def chatinit(self, context, message: str):
+        if context.guild.id in self.bot.chat_messages:
+            if self.bot.chat_messages[context.guild.id] and self.bot.chat_messages[context.guild.id][0]["role"] == "system":
+                self.bot.chat_messages[context.guild.id][0] = {"role": "system", "content": message}
+            else:
+                self.bot.chat_messages[context.guild.id] = [{"role": "system", "content": message}] + self.bot.chat_messages[context.guild.id]
         else:
-            if context.guild.id in self.bot.chat_messages:
-                if self.bot.chat_messages[context.guild.id] and self.bot.chat_messages[context.guild.id][0]["role"] == "system":
-                    self.bot.chat_messages[context.guild.id].pop(0)
-            await context.send("Chat init message has been reset")
+            self.bot.chat_messages[context.guild.id] = [{"role": "system", "content": message}]
+        await context.send(f"ChatGPT has been initialized with \"{message}\"")
 
 async def setup(bot):
     await bot.add_cog(ChatGPT(bot))

discordai/bot/cogs/openai.py

@@ -29,12 +29,12 @@ def __init__(self, bot):
         description="Generate an openAI completion",
     )
     @app_commands.describe(
-        prompt="The prompt to pass to openAI: Default=\"\"",
+        prompt="The prompt to pass to openAI",
         model=" chatgpt | davinci | curie | babbage | ada:  Default=chatgpt",
         temp="What sampling temperature to use. Higher values means more risks: Min=0 Max=1 Default=1",
         presence_penalty="Number between -2.0 and 2.0. Positive values will encourage new topics: Min=-2 Max=2 Default=0",
         frequency_penalty="Number between -2.0 and 2.0. Positive values will encourage new words: Min=-2 Max=2 Default=0")
-    async def openai(self, context: Context, prompt: str = "", model: Models = Models.chatgpt, temp: float = 1.0,
+    async def openai(self, context: Context, prompt: str, model: Models = Models.chatgpt, temp: float = 1.0,
                      presence_penalty: float = 0.0, frequency_penalty: float = 0.0):
         openai.api_key = self.bot.config["openai_key"]
         temp = min(max(temp, 0), 1)
@@ -61,7 +61,7 @@ async def openai(self, context: Context, prompt: str = "", model: Models = Model
                     frequency_penalty=presPen,
                     presence_penalty=freqPen,
                     max_tokens=325,
-                    echo=True if prompt else False
+                    echo=True
                 )
                 await context.send(response["choices"][0]["text"][:2000])
         except Exception as error:

requirements.txt

@@ -2,4 +2,4 @@ discord.py
 openai
 tiktoken
 appdirs
-discordai_modelizer @ git+https://github.com/A-Baji/discordAI-modelizer.git@1.2.2
+discordai_modelizer @ git+https://github.com/A-Baji/discordAI-modelizer.git@2.0.0