Merge pull request #12 from A-Baji/dev

switch to pathlib

Author: A-Baji

discordai/bot/__init__.py

@@ -8,6 +8,7 @@
 
 import asyncio
 import os
+import pathlib
 import platform
 import shutil
 import sys
@@ -119,18 +120,18 @@ async def load_cogs() -> None:
         """
         if getattr(sys, 'frozen', False):
             # The code is being run as a frozen executable
-            data_dir = appdirs.user_data_dir(appauthor="Adib Baji", appname="discordai")
-            cogs_path = os.path.join(data_dir, "discordai/bot/cogs")
+            data_dir = pathlib.Path(appdirs.user_data_dir(appname="discordai"))
+            cogs_path = data_dir / "discordai" / "bot" / "cogs"
             if not os.path.exists(cogs_path):
-                data_dir = sys._MEIPASS
-                og_cogs_path = os.path.join(data_dir, "discordai/bot/cogs")
-                shutil.copytree(og_cogs_path, os.path.join(data_dir, cogs_path))
+                data_dir = pathlib.Path(sys._MEIPASS)
+                og_cogs_path = data_dir / "discordai" / "bot" / "cogs"
+                shutil.copytree(og_cogs_path, data_dir / cogs_path)
             for file in os.listdir(cogs_path):
                 if file.endswith(".py"):
                     extension = file[:-3]
                     if extension != "__init__":
                         try:
-                            module_path = os.path.join(cogs_path, f'{extension}.py')
+                            module_path = cogs_path / f'{extension}.py'
                             spec = importlib.util.spec_from_file_location(extension, module_path)
                             module = importlib.util.module_from_spec(spec)
                             spec.loader.exec_module(module)
@@ -142,8 +143,8 @@ async def load_cogs() -> None:
                             print(f"Failed to load extension {extension}\n{exception}")
         else:
             # The code is being run normally
-            bot_dir = os.path.dirname(__file__)
-            cogs_path = os.path.join(bot_dir, "cogs")
+            bot_dir = pathlib.Path(os.path.dirname(__file__))
+            cogs_path = bot_dir / "cogs"
             for file in os.listdir(cogs_path):
                 if file.endswith(".py"):
                     extension = file[:-3]

discordai/config.py

@@ -3,12 +3,12 @@
 import json
 import appdirs
 
-config_dir = appdirs.user_data_dir(appauthor="Adib Baji", appname="discordai")
+config_dir =  pathlib.Path(appdirs.user_data_dir(appname="discordai"))
 
 
 def get():
     try:
-        with open(f"{config_dir}/config.json", 'r') as file:
+        with open(config_dir / "config.json", 'r') as file:
             config = json.load(file)
     except FileNotFoundError as err:
         print("No config found. Please follow the steps to create one:")
@@ -20,7 +20,7 @@ def get():
         with open(pathlib.Path(config_dir, "config.json"), "w") as f:
             f.write(json.dumps(config))
 
-        print(f"Your config has been saved to {config_dir}/config.json")
+        print(f"Your config has been saved to {config_dir / 'config.json'}")
     return config
 
 

discordai/template.py

@@ -1,9 +1,7 @@
 import os
 import pathlib
-import pkgutil
 import shutil
 import sys
-import tempfile
 import appdirs
 
 
@@ -61,23 +59,23 @@ async def setup(bot):
     await bot.add_cog({class_name}(bot))
 """
 
-config_dir = appdirs.user_data_dir(appauthor="Adib Baji", appname="discordai")
+config_dir = pathlib.Path(appdirs.user_data_dir(appname="discordai"))
 
 
 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):
     if getattr(sys, 'frozen', False):
         # The code is being run as a frozen executable
-        data_dir = appdirs.user_data_dir(appauthor="Adib Baji", appname="discordai")
-        cogs_path = os.path.join(data_dir, "discordai/bot/cogs")
+        data_dir = pathlib.Path(appdirs.user_data_dir(appname="discordai"))
+        cogs_path = data_dir / "discordai" / "bot" / "cogs"
         if not os.path.exists(cogs_path):
-            data_dir = sys._MEIPASS
-            og_cogs_path = os.path.join(data_dir, "discordai/bot/cogs")
-            shutil.copytree(og_cogs_path, os.path.join(data_dir, cogs_path))
+            data_dir = pathlib.Path(sys._MEIPASS)
+            og_cogs_path = data_dir / "discordai" / "bot" / "cogs"
+            shutil.copytree(og_cogs_path, data_dir / cogs_path)
     else:
         # The code is being run normally
-        template_dir = os.path.dirname(__file__)
-        cogs_path = os.path.join(os.path.join(template_dir, "bot"), "cogs")
+        template_dir = pathlib.Path(os.path.dirname(__file__))
+        cogs_path = template_dir / "bot"/ "cogs"
     with open(pathlib.Path(cogs_path, f"{command_name}.py"), "w") as f:
         os.makedirs(cogs_path, exist_ok=True)
         f.write(
@@ -98,16 +96,16 @@ def delete_command(command_name: str):
         return
     if getattr(sys, 'frozen', False):
         # The code is being run as a frozen executable
-        data_dir = appdirs.user_data_dir(appauthor="Adib Baji", appname="discordai")
-        cogs_path = os.path.join(data_dir, "discordai/bot/cogs")
+        data_dir = pathlib.Path(appdirs.user_data_dir(appname="discordai"))
+        cogs_path = data_dir / "discordai" / "bot" / "cogs"
         if not os.path.exists(cogs_path):
-            data_dir = sys._MEIPASS
-            og_cogs_path = os.path.join(data_dir, "discordai/bot/cogs")
-            shutil.copytree(og_cogs_path, os.path.join(data_dir, cogs_path))
+            data_dir = pathlib.Path(sys._MEIPASS)
+            og_cogs_path = data_dir / "discordai" / "bot" / "cogs"
+            shutil.copytree(og_cogs_path, data_dir / cogs_path)
     else:
         # The code is being run normally
-        template_dir = os.path.dirname(__file__)
-        cogs_path = os.path.join(os.path.join(template_dir, "bot"), "cogs")
+        template_dir = pathlib.Path(os.path.dirname(__file__))
+        cogs_path = template_dir / "bot" / "cogs"
     try:
         os.remove(pathlib.Path(cogs_path, f"{command_name}.py"))
         print(f"Successfully deleted command: /{command_name}")

discordai/version.py

@@ -1 +1 @@
-__version__ = "1.1.0"
+__version__ = "1.1.1"

requirements.txt

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

setup.py

@@ -17,7 +17,6 @@
 setuptools.setup(
     name=package.__name__,
     version=package.__version__,
-    author="Adib Baji",
     author_email="[email protected]",
     description="A discord bot package that utilizes openAI to create custom AI models out of your chat history",
     long_description=pathlib.Path("README.md").read_text(),