Move contrib and fixtures to llmstack/

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

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(

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'])
 

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')
+]

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 = [