From 88fc70bebbbaac90c8b4cdb34735719425a64b3d Mon Sep 17 00:00:00 2001 From: Ajay Chintala Date: Mon, 18 Sep 2023 17:52:05 -0700 Subject: [PATCH] Move contrib and fixtures to llmstack/ --- Dockerfile | 4 ++-- base/management/commands/loadfixtures.py | 2 +- .env.local => llmstack/.env.local | 0 llmstack/cli.py | 4 ++-- .../contrib}/apps/templates/character_chatbot.yml | 0 .../contrib}/apps/templates/data_extractor.yml | 0 .../contrib}/apps/templates/file_chatbot.yml | 0 .../contrib}/apps/templates/language_translator.yml | 0 .../contrib}/apps/templates/marketing_content_generator.yml | 0 .../contrib}/apps/templates/voice_answers.yml | 0 {contrib => llmstack/contrib}/apps/templates/voice_chat.yml | 0 .../contrib}/apps/templates/website_chatbot.yml | 0 {fixtures => llmstack/fixtures}/initial_data.json | 0 llmstack/settings.py | 4 ++-- pyproject.toml | 6 ++---- 15 files changed, 9 insertions(+), 11 deletions(-) rename .env.local => llmstack/.env.local (100%) rename {contrib => llmstack/contrib}/apps/templates/character_chatbot.yml (100%) rename {contrib => llmstack/contrib}/apps/templates/data_extractor.yml (100%) rename {contrib => llmstack/contrib}/apps/templates/file_chatbot.yml (100%) rename {contrib => llmstack/contrib}/apps/templates/language_translator.yml (100%) rename {contrib => llmstack/contrib}/apps/templates/marketing_content_generator.yml (100%) rename {contrib => llmstack/contrib}/apps/templates/voice_answers.yml (100%) rename {contrib => llmstack/contrib}/apps/templates/voice_chat.yml (100%) rename {contrib => llmstack/contrib}/apps/templates/website_chatbot.yml (100%) rename {fixtures => llmstack/fixtures}/initial_data.json (100%) diff --git a/Dockerfile b/Dockerfile index 3c281b34f4b..a07bd05c2bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,8 +35,8 @@ COPY --from=builder /code/client/build/static /code/client/build/static COPY --from=builder /code/common /code/common COPY --from=builder /code/datasources /code/datasources COPY --from=builder /code/emails /code/emails -COPY --from=builder /code/contrib/apps /code/contrib/apps -COPY --from=builder /code/fixtures /code/fixtures +COPY --from=builder /code/llmstack/contrib/apps /code/llmstack/contrib/apps +COPY --from=builder /code/llmstack/fixtures /code/llmstack/fixtures COPY --from=builder /code/jobs /code/jobs COPY --from=builder /code/llmstack /code/llmstack COPY --from=builder /code/organizations /code/organizations diff --git a/base/management/commands/loadfixtures.py b/base/management/commands/loadfixtures.py index 76cab45bdfa..24a7496887b 100644 --- a/base/management/commands/loadfixtures.py +++ b/base/management/commands/loadfixtures.py @@ -12,7 +12,7 @@ def handle(self, *args, **options): self.stdout.write(self.style.SUCCESS('Admin user created.')) try: - call_command('loaddata', 'fixtures/initial_data.json') + call_command('loaddata', 'llmstack/fixtures/initial_data.json') self.stdout.write(self.style.SUCCESS('Initial data loaded.')) except Exception as e: self.stdout.write(self.style.ERROR( diff --git a/.env.local b/llmstack/.env.local similarity index 100% rename from .env.local rename to llmstack/.env.local diff --git a/llmstack/cli.py b/llmstack/cli.py index 2bf6e3655ae..a57b16df13b 100644 --- a/llmstack/cli.py +++ b/llmstack/cli.py @@ -19,7 +19,7 @@ def prepare_env(): # Copy .env.local file from installed package to ~/.llmstack/.env.local import shutil - shutil.copyfile(os.path.join(os.path.dirname(os.path.dirname(__file__)), '.env.local'), os.path.join( + shutil.copyfile(os.path.join(os.path.dirname(__file__), '.env.local'), os.path.join( os.path.expanduser('~'), '.llmstack', '.env.local')) # Chdir to .llmstack @@ -54,7 +54,7 @@ def main(): run_django_command(['manage.py', 'migrate', '--noinput']) run_django_command(['manage.py', 'loaddata', os.path.join( - os.path.dirname(os.path.dirname(__file__)), 'fixtures/initial_data.json')]) + os.path.dirname(__file__), 'fixtures/initial_data.json')]) run_django_command(['manage.py', 'createcachetable']) run_django_command(['manage.py', 'clearcache']) diff --git a/contrib/apps/templates/character_chatbot.yml b/llmstack/contrib/apps/templates/character_chatbot.yml similarity index 100% rename from contrib/apps/templates/character_chatbot.yml rename to llmstack/contrib/apps/templates/character_chatbot.yml diff --git a/contrib/apps/templates/data_extractor.yml b/llmstack/contrib/apps/templates/data_extractor.yml similarity index 100% rename from contrib/apps/templates/data_extractor.yml rename to llmstack/contrib/apps/templates/data_extractor.yml diff --git a/contrib/apps/templates/file_chatbot.yml b/llmstack/contrib/apps/templates/file_chatbot.yml similarity index 100% rename from contrib/apps/templates/file_chatbot.yml rename to llmstack/contrib/apps/templates/file_chatbot.yml diff --git a/contrib/apps/templates/language_translator.yml b/llmstack/contrib/apps/templates/language_translator.yml similarity index 100% rename from contrib/apps/templates/language_translator.yml rename to llmstack/contrib/apps/templates/language_translator.yml diff --git a/contrib/apps/templates/marketing_content_generator.yml b/llmstack/contrib/apps/templates/marketing_content_generator.yml similarity index 100% rename from contrib/apps/templates/marketing_content_generator.yml rename to llmstack/contrib/apps/templates/marketing_content_generator.yml diff --git a/contrib/apps/templates/voice_answers.yml b/llmstack/contrib/apps/templates/voice_answers.yml similarity index 100% rename from contrib/apps/templates/voice_answers.yml rename to llmstack/contrib/apps/templates/voice_answers.yml diff --git a/contrib/apps/templates/voice_chat.yml b/llmstack/contrib/apps/templates/voice_chat.yml similarity index 100% rename from contrib/apps/templates/voice_chat.yml rename to llmstack/contrib/apps/templates/voice_chat.yml diff --git a/contrib/apps/templates/website_chatbot.yml b/llmstack/contrib/apps/templates/website_chatbot.yml similarity index 100% rename from contrib/apps/templates/website_chatbot.yml rename to llmstack/contrib/apps/templates/website_chatbot.yml diff --git a/fixtures/initial_data.json b/llmstack/fixtures/initial_data.json similarity index 100% rename from fixtures/initial_data.json rename to llmstack/fixtures/initial_data.json diff --git a/llmstack/settings.py b/llmstack/settings.py index ffdd3c199cc..560d6d3715f 100644 --- a/llmstack/settings.py +++ b/llmstack/settings.py @@ -321,5 +321,5 @@ ] APP_TEMPLATES_DIR = os.getenv('APP_TEMPATES_DIR').split(',') if os.getenv('APP_TEMPATES_DIR') else [ - os.path.join(BASE_DIR, 'contrib', 'apps', 'templates') - ] + os.path.join(BASE_DIR, 'llmstack', 'contrib', 'apps', 'templates') +] diff --git a/pyproject.toml b/pyproject.toml index d39aa27b8c5..112e8ab5779 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,15 +6,13 @@ authors = ["Ajay Chintala"] license = "MIT" readme = "README.md" include = [ - ".env.local", - "contrib/*", - "fixtures/*", "client/build/*", "client/build/static/css/*", "client/build/static/images/*", "client/build/static/js/*", "client/build/static/media/*", - "fixtures/*", + "llmstack/contrib/apps/templates/*", + "llmstack/fixtures/*", "static/*", ] packages = [