Merge pull request #2 from A-Baji/dev

model customizer fucntionality

Author: A-Baji

.github/workflows/package.yml

@@ -7,18 +7,38 @@ on:
   pull_request:
 
 jobs:
+  test-package:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        py_ver:
+          - '3.8'
+          - '3.9'
+          - '3.10'
+          - '3.11'
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+      with:
+        python-version: ${{matrix.py_ver}}
+    - name: Install Package
+      run: pip install .
+    - name: Test Package
+      run: echo -e "none\nnone" | discordai -V
   release:
+    if: |
+      github.event_name == 'push' &&
+      startsWith(github.ref, 'refs/tags') &&
+      github.repository_owner == 'A-Baji'
+    needs: test-package
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - id: version
         name: Get build metadata
         run: echo "::set-output name=discordai_version::$(cat discordai/version.py | grep -oP '\d+\.\d+\.\d+')"
       - name: Create release
-        if: |
-          github.event_name == 'push' &&
-          startsWith(github.ref, 'refs/tags') &&
-          github.repository_owner == 'A-Baji'
         uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
@@ -29,14 +49,14 @@ jobs:
           draft: false
           prerelease: false
   package:
-    needs: release
+    needs: test-package
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os:
           - windows-latest
-          - macos-latest
+          # - macos-latest
           - ubuntu-latest
     steps:
     - uses: actions/checkout@v3
@@ -49,18 +69,20 @@ jobs:
     - name: Windows CLI Package
       if: ${{matrix.os == 'windows-latest'}}
       run: |
-        pyinstaller discordai/command_line.py --console --onefile --name=discordai --add-binary='discordai/bot/cogs;discordai/bot/cogs' --hidden-import=openai
+        pyinstaller discordai/command_line.py --console --onefile --name=discordai --add-binary='discordai/bot/cogs;discordai/bot/cogs' --hidden-import=openai --collect-data=discordai_modelizer
         Compress-Archive -Path dist\*discordai* -DestinationPath discordai-windows.zip
     - name: Mac CLI Package
       if: ${{matrix.os == 'macos-latest'}}
       run: |
-        pyinstaller discordai/command_line.py --console --onefile --name=discordai --add-data='discordai/bot/cogs:discordai/bot/cogs' --hidden-import=openai --hidden-import=configparser
+        pyinstaller discordai/command_line.py --console --onefile --name=discordai --add-data='discordai/bot/cogs:discordai/bot/cogs' --hidden-import=openai --hidden-import=configparser --collect-data=discordai_modelizer --collect-data=aiohttp --collect-data=certifi
         zip -j discordai-macos.zip dist/*discordai*
+        chmod +x dist/*discordai*
     - name: Linux CLI Package
       if: ${{matrix.os == 'ubuntu-latest'}}
       run: |
-        pyinstaller discordai/command_line.py --console --onefile --name=discordai --add-binary='discordai/bot/cogs:discordai/bot/cogs' --hidden-import=openai
+        pyinstaller discordai/command_line.py --console --onefile --name=discordai --add-binary='discordai/bot/cogs:discordai/bot/cogs' --hidden-import=openai --collect-data=discordai_modelizer
         zip -j discordai-linux.zip dist/*discordai*
+        chmod +x dist/*discordai*
     # Upload
     - name: Upload Windows Package to Artifacts
       if: |

README.md

@@ -1,8 +1,36 @@
 # DiscordAI
 
-DiscordAI is CLI package that you can use to run your discord bot. It comes with two slash commands that use openAI's API to create prompt completions. There are also two hidden commands that are used to synchronize your bot's commands with discord: `@bot_name sync|unsyc guild|global`.
+DiscordAI is CLI package that you can use to run your discord bot. It can also be used to create customized openAI models based on a discord channel and user. The bot comes with two slash commands that use openAI's API to create prompt completions. There are also two hidden commands that are used to synchronize your bot's commands with discord: `@bot_name sync|unsyc guild|global`.
 
-## Planned Features
+## Installation
+### Executable
+Download the CLI executable for your OS from the [latest release](https://github.com/A-Baji/discordAI/releases/latest). Unfortunately, the Mac version of the executable is not available due to stability issues.
+### Pip
+`pip install -U git+https://github.com/A-Baji/discordAI.git`
+#### Or
+1. Download/clone the source locally
+2. Run `pip install -U <path to source>/.`
+3. The source may now be deleted
 
-- A CLI command that generates a customized openai model based on a given discord user's messages from a given discord channel.
-- A CLI command that generates a new slash command for your bot to create prompt completions using a given customized model.
+## Commands
+### `discordai start`
+Start your bot
+### `discordai openai create`
+Download the specified chat logs, parse them into a usable dataset, then create a customized model using openai.
+### `discordai openai list_jobs`
+List all of your openai customization jobs.
+### `discordai openai list_models`
+List all of your openai customized models.
+### `discordai openai follow`
+Output the event stream of a specified customization job process.
+### `discordai openai status`
+Get the status of a specified customization job.
+### `discordai openai cancel`
+Cancel a specified customization job.
+### `discordai openai delete`
+Delete a specified customized model.
+
+## Disclaimer
+This application allows users to download the chat history of any channel for which they have permission to invite a bot, and then use those logs to create an openai model based on a user's chat messages. It is important to note that this application should only be used with the consent of all members of the channel. Using this application for malicious purposes, such as impersonation, or without the consent of all members is strictly prohibited.
+
+By using this application, you agree to use it responsibly. The developers of this application are not responsible for any improper use of the application or any consequences resulting from such use. We strongly discourage using this application for any unethical purposes.

discordai/command_line.py

@@ -2,9 +2,12 @@
 from discordai import __version__ as version
 from discordai import config as configuration
 from discordai import bot
+from discordai_modelizer import customize
+from discordai_modelizer import openai as openai_wrapper
 
 
 def discordai():
+    config = configuration.get()
     parser = argparse.ArgumentParser(
         prog="discordai", description="discordAI CLI"
     )
@@ -15,10 +18,218 @@ def discordai():
 
     start = command.add_parser("start", description="Start your discord bot")
 
-    args = parser.parse_args()
-    config = configuration.get()
-    if args.command == "start":
-        bot.start_bot(config)
+    openai = command.add_parser("openai", description="OpenAI model customizer and API wrapper")
+    openai_subcommand = openai.add_subparsers(dest="subcommand")
+
+    openai_create = openai_subcommand.add_parser(
+        "create", description="Create a new custom openAI model"
+    )
+    openai_create_required_named = openai_create.add_argument_group(
+        "required named arguments"
+    )
+    openai_create_required_named.add_argument(
+        "-c", "--channel",
+        type=str,
+        dest='channel',
+        help="The ID of the discord channel you want to use",
+    )
+    openai_create_required_named.add_argument(
+        "-u", "--user",
+        type=str,
+        dest='user',
+        help="The name#ID of the discord user you want to use",
+    )
+
+    openai_create_optional_named = openai_create.add_argument_group("optional named arguments")
+    openai_create_optional_named.add_argument(
+        "-o", "--openai_key",
+        type=str,
+        default=config["openai_key"],
+        required=False,
+        dest='openai_key',
+        help="Your openAI API key: DEFAULT=config.openai_key",
+    )
+    openai_create_optional_named.add_argument(
+        "-b", "--base_model",
+        choices=["davinci", "curie", "babbage", "ada", "none"],
+        default="none",
+        required=False,
+        dest='base_model',
+        help="The base model to use for customization. If none, then skips training step: DEFAULT=none",
+    )
+    openai_create_optional_named.add_argument(
+        "-t", "--thought_time",
+        type=int,
+        default=10,
+        required=False,
+        dest='thought_time',
+        help="The max amount of time in seconds to consider two individual messages to be part of the same \"thought\": DEFAULT=10",
+    )
+    openai_create_optional_named.add_argument(
+        "-m", "--max_entries",
+        type=int,
+        default=1000,
+        required=False,
+        dest='max_entries',
+        help="The max amount of entries that may exist in the dataset: DEFAULT=1000",
+    )
+    openai_create_optional_named.add_argument(
+        "-r", "--reduce_mode",
+        choices=["first", "last", "middle", "even"],
+        default="even",
+        required=False,
+        dest='reduce_mode',
+        help="The method to reduce the entry count of the dataset: DEFAULT=even",
+    )
+    openai_create_optional_named.add_argument(
+        "--dirty",
+        action='store_false',
+        required=False,
+        dest='dirty',
+        help="A flag that can be set to skip the clean up step for outputted files: DEFAULT=False",
+    )
+    openai_create_optional_named.add_argument(
+        "--redownload",
+        action='store_true',
+        required=False,
+        dest='redownload',
+        help="A flag that can be set to redownload the discord chat logs: DEFAULT=False",
+    )
+
+    openai_list_jobs = openai_subcommand.add_parser(
+        "list_jobs", description="Get a list of your openAI jobs"
+    )
+    openai_list_jobs.add_argument(
+        "-o", "--openai_key",
+        type=str,
+        default=config["openai_key"],
+        required=False,
+        dest='openai_key',
+        help="Your openAI API key: DEFAULT=config.openai_key",
+    )
+    openai_list_jobs.add_argument(
+        "--simple",
+        action='store_true',
+        required=False,
+        dest='simple',
+        help="Simplify the output to just the model name, job id, and status",
+    )
+
+    openai_list_models = openai_subcommand.add_parser(
+        "list_models", description="Get a list of your openAI models"
+    )
+    openai_list_models.add_argument(
+        "-o", "--openai_key",
+        type=str,
+        default=config["openai_key"],
+        required=False,
+        dest='openai_key',
+        help="Your openAI API key: DEFAULT=config.openai_key",
+    )
+    openai_list_models.add_argument(
+        "--simple",
+        action='store_true',
+        required=False,
+        dest='simple',
+        help="Simplify the output to just the model name, job id, and status",
+    )
+
+    openai_follow = openai_subcommand.add_parser(
+        "follow", description="Follow a custom openAI model job"
+    )
+    openai_follow.add_argument(
+        "-o", "--openai_key",
+        type=str,
+        default=config["openai_key"],
+        required=False,
+        dest='openai_key',
+        help="Your openAI API key: DEFAULT=config.openai_key",
+    )
+    openai_follow.add_argument(
+        "-j", "--job_id",
+        type=str,
+        dest='job_id',
+        help="Target job id",
+    )
+
+    openai_status = openai_subcommand.add_parser(
+        "status", description="Get the status of a custom openAI model job"
+    )
+    openai_status.add_argument(
+        "-o", "--openai_key",
+        type=str,
+        default=config["openai_key"],
+        required=False,
+        dest='openai_key',
+        help="Your openAI API key: DEFAULT=config.openai_key",
+    )
+    openai_status.add_argument(
+        "-j", "--job_id",
+        type=str,
+        dest='job_id',
+        help="Target job id",
+    )
+
+    openai_cancel = openai_subcommand.add_parser(
+        "cancel", description="Cancel a custom openAI model job"
+    )
+    openai_cancel.add_argument(
+        "-o", "--openai_key",
+        type=str,
+        default=config["openai_key"],
+        required=False,
+        dest='openai_key',
+        help="Your openAI API key: DEFAULT=config.openai_key",
+    )
+    openai_cancel.add_argument(
+        "-j", "--job_id",
+        type=str,
+        dest='job_id',
+        help="Target job id",
+    )
+
+    openai_delete = openai_subcommand.add_parser(
+        "delete", description="Delete a custom openAI model"
+    )
+    openai_delete.add_argument(
+        "-o", "--openai_key",
+        type=str,
+        default=config["openai_key"],
+        required=False,
+        dest='openai_key',
+        help="Your openAI API key: DEFAULT=config.openai_key",
+    )
+    openai_delete.add_argument(
+        "-m", "--model_id",
+        type=str,
+        dest='model_id',
+        help="Target model id",
+    )
+
+    try:
+        args = parser.parse_args()
+        if args.command == "start":
+            bot.start_bot(config)
+        elif args.command == "openai":
+            if args.subcommand == "create":
+                customize.create_model(config["token"], args.openai_key, args.channel, args.user,
+                                       thought_time=args.thought_time, max_entry_count=args.max_entries,
+                                       reduce_mode=args.reduce_mode, base_model=args.base_model, clean=args.dirty,
+                                       redownload=args.redownload)
+            if args.subcommand == "list_jobs":
+                openai_wrapper.list_jobs(args.openai_key, args.simple)
+            if args.subcommand == "list_models":
+                openai_wrapper.list_models(args.openai_key, args.simple)
+            if args.subcommand == "follow":
+                openai_wrapper.follow_job(args.openai_key, args.job_id)
+            if args.subcommand == "status":
+                openai_wrapper.get_status(args.openai_key, args.job_id)
+            if args.subcommand == "cancel":
+                openai_wrapper.cancel_job(args.openai_key, args.job_id)
+            if args.subcommand == "delete":
+                openai_wrapper.delete_model(args.openai_key, args.model_id)
+    except KeyboardInterrupt:
+        print("Program interrupted by user. Exiting...")
 
 
 if __name__ == "__main__":

discordai/version.py

@@ -1 +1 @@
-__version__ = "0.1.0"
+__version__ = "0.2.0"

requirements.txt

@@ -1,3 +1,4 @@
 discord.py
 openai
-appdirs
+appdirs
+discordai_modelizer @ git+https://github.com/A-Baji/discordAI-modelizer.git#egg=discord-modelizer