Merge pull request #28 from A-Baji/dev

dockerization and new api features

Author: A-Baji

.gitignore

@@ -1,4 +1,10 @@
 config.json
+discordai/bot/cogs/*.py
+!discordai/bot/cogs/__init__.py
+!discordai/bot/cogs/customai.py
+!discordai/bot/cogs/imageai.py
+!discordai/bot/cogs/openai.py
+!discordai/bot/cogs/sync.py
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

CHANGELOG.md

@@ -0,0 +1,79 @@
+# Changelog
+
+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
+
+### Added
+- An openAI image generation command
+- The gpt3.5 model to the openai command and made it the default
+- A changelog
+
+### Changed
+
+- Made prompt bolding for custom model completions a discord command parameter
+
+### Fixed
+
+- Bug where two stars would appear for blank prompts for custom model completions
+
+## [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)
+
+## [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)
+
+## [1.3.0] - 02-17-2023
+
+### Added
+
+- CLI option to bolden the prompt for custom model completions
+- CLI option to set the thought time
+- CLI option to set the min and max thought length
+- CLI option to only output the events for the job status
+
+### Changed
+
+- Update modelizer to version [1.2.0](https://github.com/A-Baji/discordAI-modelizer/compare/1.1.0...1.2.0)
+
+## [1.2.1] - 02-12-2023
+
+### Added
+
+- 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)
+
+## [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)
+
+### Changed
+
+- Switched from using `os.path` to `pathlib`
+
+## [1.1.0] - 01-29-2023
+
+### Changed
+
+- Modified readme
+
+[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

Dockerfile

@@ -0,0 +1,8 @@
+FROM python:3.11-alpine
+WORKDIR /main
+RUN apk update
+RUN apk add git
+COPY ./requirements.txt ./setup.py ./README.md /main/
+COPY ./discordai /main/discordai
+RUN pip3 install --upgrade pip
+RUN pip3 install --no-cache-dir . && rm -R /main/*

discordai/bot/cogs/imageai.py

@@ -0,0 +1,50 @@
+""""
+Copyright © Krypton 2019-2022 - https://github.com/kkrypt0nn (https://krypton.ninja)
+Description:
+🐍 A simple template to start to code your own and personalized discord bot in Python programming language.
+
+Version: 5.4.1
+"""
+
+from discord import app_commands
+from discord.ext import commands
+from discord.ext.commands import Context
+from enum import Enum
+
+import openai
+
+class Sizes(Enum):
+    small = "256"
+    medium = "512"
+    large = "1024"
+
+class ImageAI(commands.Cog, name="imageai"):
+    def __init__(self, bot):
+        self.bot = bot
+
+    @commands.hybrid_command(
+        name="imageai",
+        description="Generate an openAI image completion",
+    )
+    @app_commands.describe(
+        prompt="The prompt to pass to openAI",
+        size="small: 256px | medium: 512px | large: 1024 px:  Default=small")
+    async def openai(self, context: Context, prompt: str , size: Sizes = Sizes.small):
+        dimension = "256x256" if size.value == "256" else "512x512" if size.value == "512" else "1024x1024"
+        await context.defer()
+        try:
+            openai.api_key = self.bot.config["openai_key"]
+            response = openai.Image.create(
+                prompt=prompt,
+                size=dimension
+            )
+            await context.send(response['data'][0]['url'])
+        except Exception as error:
+            print(f"Failed to generate image for prompt: {prompt}\nError: {error}")
+            await context.send(
+                f"Failed to generate image for prompt: {prompt}\nError: {error}"
+            )
+
+
+async def setup(bot):
+    await bot.add_cog(ImageAI(bot))

discordai/bot/cogs/openai.py

@@ -9,9 +9,16 @@
 from discord import app_commands
 from discord.ext import commands
 from discord.ext.commands import Context
+from enum import Enum
 
 import openai
 
+class Models(Enum):
+    chatgpt = "gpt-3.5-turbo"
+    davinci = "text-davinci-003"
+    curie = "text-curie-001"
+    babbage = "text-babbage-001"
+    ada = "text-ada-001"
 
 class OpenAI(commands.Cog, name="openai"):
     def __init__(self, bot):
@@ -23,38 +30,40 @@ def __init__(self, bot):
     )
     @app_commands.describe(
         prompt="The prompt to pass to openAI: Default=\"\"",
-        model="davinci | curie | babbage | ada:  Default=davinci",
+        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: str = "text-davinci-003", 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):
         temp = min(max(temp, 0), 1)
         presPen = min(max(presence_penalty, -2), 2)
         freqPen = min(max(frequency_penalty, -2), 2)
 
-        if model.lower() == 'davinci':
-            model = 'text-davinci-003'
-        elif model.lower() == 'curie':
-            model = 'text-curie-001'
-        elif model.lower() == 'babbage':
-            model = 'text-babbage-001'
-        elif model.lower() == 'ada':
-            model = 'text-ada-001'
-
         await context.defer()
         try:
             openai.api_key = self.bot.config["openai_key"]
-            response = openai.Completion.create(
-                engine=model,
-                prompt=prompt,
+            if model.value == 'gpt-3.5-turbo':
+                response = openai.ChatCompletion.create(
+                model=model.value,
+                messages=[{"role": "user", "content": prompt}],
                 temperature=temp,
                 frequency_penalty=presPen,
                 presence_penalty=freqPen,
-                max_tokens=325,
-                echo=True if prompt else False
-            )
-            await context.send(response["choices"][0]["text"][:2000])
+                max_tokens=325
+                )
+                await context.send(f"{prompt}{response['choices'][0]['message']['content']}"[:2000])
+            else:
+                response = openai.Completion.create(
+                    engine=model.value,
+                    prompt=prompt,
+                    temperature=temp,
+                    frequency_penalty=presPen,
+                    presence_penalty=freqPen,
+                    max_tokens=325,
+                    echo=True if prompt else False
+                )
+                await context.send(response["choices"][0]["text"][:2000])
         except Exception as error:
             print(f"Failed to generate valid response for prompt: {prompt}\nError: {error}")
             await context.send(

discordai/command_line.py

@@ -111,11 +111,11 @@ def discordai():
         help="Set the stop option to use for completions to True",
     )
     new_cmd_optional_named.add_argument(
-        "--bolden",
+        "--bold_default",
         action='store_true',
         required=False,
-        dest='bolden',
-        help="Boldens the original prompt in the completion output",
+        dest='bold_default',
+        help="Set the bolden option for prompts to True",
     )
 
     delete_cmd = bot_cmds_commands_subcommand.add_parser(
@@ -382,7 +382,7 @@ def discordai():
             if args.subsubcommand == "new":
                 template.gen_new_command(args.model_id, args.command_name, args.temp_default, args.pres_default,
                                          args.freq_default, args.max_tokens_default, args.stop_default, args.openai_key,
-                                         args.bolden)
+                                         args.bold_default)
             elif args.subsubcommand == "delete":
                 template.delete_command(args.command_name)
     elif args.command == "model":

discordai/config.py

@@ -13,8 +13,8 @@ def get():
     except FileNotFoundError as err:
         print("No config found. Please follow the steps to create one:")
         config = dict(
-            token=input("\nEnter your discord bot token: "),
-            openai_key=input("\nEnter your openAI key: ")
+            token=os.getenv("DISCORD_TOKEN") or input("\nEnter your discord bot token: "),
+            openai_key=os.getenv("OPENAI_KEY") or input("\nEnter your openAI key: ")
         )
         os.makedirs(config_dir, exist_ok=True)
         with open(pathlib.Path(config_dir, "config.json"), "w") as f:

discordai/template.py

@@ -26,10 +26,11 @@ def __init__(self, bot):
         presence_penalty="Number between -2.0 and 2.0. Positive values will encourage new topics: Min=-2 Max=2 Default={pres_default}",
         frequency_penalty="Number between -2.0 and 2.0. Positive values will encourage new words: Min=-2 Max=2 Default={freq_default}",
         max_tokens="The max number of tokens to generate. Each token costs credits: Default={max_tokens_default}",
-        stop="Whether to stop after the first sentence: Default={stop_default}")
+        stop="Whether to stop after the first sentence: Default={stop_default}",
+        bold="Whether to bolden the original prompt: Default={bold_default}")
     async def customai(self, context: Context, prompt: str = "", temp: float = {temp_default},
                        presence_penalty: float = {pres_default}, frequency_penalty: float = {freq_default}, max_tokens: int = {max_tokens_default},
-                       stop: bool = {stop_default}):
+                       stop: bool = {stop_default}, bold: bool = {bold_default}):
         temp = min(max(temp, 0), 1)
         presPen = min(max(presence_penalty, -2), 2)
         freqPen = min(max(frequency_penalty, -2), 2)
@@ -47,7 +48,7 @@ async def customai(self, context: Context, prompt: str = "", temp: float = {temp
                 echo=False,
                 stop='.' if stop else None,
             )
-            await context.send(f"{{'**' if {bold} else ''}}{{prompt}}{{'**' if {bold} else ''}}{{response[\'choices\'][0][\'text\'][:2000]}}")
+            await context.send(f"{{'**' if bold and prompt else ''}}{{prompt}}{{'**' if bold and prompt else ''}}{{response[\'choices\'][0][\'text\'][:2000]}}")
         except Exception as error:
             print({error})
             await context.send(
@@ -63,7 +64,7 @@ async def setup(bot):
 
 
 def gen_new_command(model_id: str, command_name: str, temp_default: float, pres_default: float, freq_default: float,
-                    max_tokens_default: int, stop_default: bool, openai_key: str, bold_prompt: bool):
+                    max_tokens_default: int, stop_default: bool, openai_key: str, bold_default: bool):
     if getattr(sys, 'frozen', False):
         # The code is being run as a frozen executable
         data_dir = pathlib.Path(appdirs.user_data_dir(appname="discordai"))
@@ -84,7 +85,7 @@ def gen_new_command(model_id: str, command_name: str, temp_default: float, pres_
                 command_name=command_name, temp_default=float(temp_default),
                 pres_default=float(pres_default),
                 freq_default=float(freq_default),
-                max_tokens_default=max_tokens_default, stop_default=stop_default, openai_key=openai_key, bold = bold_prompt,
+                max_tokens_default=max_tokens_default, stop_default=stop_default, openai_key=openai_key, bold_default = bold_default,
                 error="f\"Failed to generate valid response for prompt: {prompt}\\nError: {error}\""))
         print(f"Successfully created new slash command: /{command_name} using model {model_id}")
 

discordai/version.py

@@ -1 +1 @@
-__version__ = "1.3.2"
+__version__ = "2.0.0"

docker-compose.yaml

@@ -0,0 +1,18 @@
+# VERSION=$(cat discordai/version.py | grep -oP '\d+\.\d+\.\d+') docker compose up --build
+version: '2.4'
+services:
+  app:
+    build: .
+    image: discord-ai/discordai:${VERSION}
+    working_dir: /main
+    environment:
+      - DISCORD_TOKEN
+      - OPENAI_KEY
+    env_file: ./.env
+    volumes:
+      - ./discordai:/usr/local/lib/python3.11/site-packages/discordai
+    command:
+      - sh
+      - -c
+      - |
+        tail -f /dev/null