feat(refacto): changed a bit of things to make better dx (#984)

QuivrHQ · Aug 19, 2023 · d0370ab · d0370ab
1 parent cbc8ac4
commit d0370ab
Show file tree

Hide file tree

Showing 148 changed files with 56 additions and 228 deletions.
diff --git a/.github/workflows/aws-preview.yml b/.github/workflows/aws-preview.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ "main" ]
     paths:
-      - 'backend/core/**'
+      - 'backend/**'
 
 env:
   AWS_REGION: eu-west-3
@@ -56,7 +56,7 @@ jobs:
         ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
         IMAGE_TAG: ${{ github.sha }}
       with:
-        context: ./backend/core/
+        context: ./backend/
         push: true
         tags: ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}, ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:latest, ghcr.io/stangirard/quivr:latest
         cache-from: type=gha

diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml
@@ -55,7 +55,7 @@ jobs:
         ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
         IMAGE_TAG: ${{ github.sha }}
       with:
-        context: ./backend/core/
+        context: ./backend/
         push: true
         tags: ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}, ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ github.ref_name}},  ghcr.io/stangirard/quivr:${{ github.ref_name}}
         cache-from: type=gha

diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml
@@ -4,11 +4,11 @@ on:
   push:
     branches: [main]
     paths:
-      - 'backend/core/**'
+      - 'backend/**'
   pull_request:
     branches: [main]
     paths:
-      - 'backend/core/**'
+      - 'backend/**'
   workflow_dispatch:
     inputs:
       logLevel:
@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./backend/core
+        working-directory: ./backend
     environment: preview
     strategy:
       matrix:

diff --git a/README.md b/README.md
@@ -95,21 +95,21 @@ Additionally, you'll need a [Supabase](https://supabase.com/) account for:
 - **Step 2 - Bis**: Copy the `.XXXXX_env` files
 
   ```bash
-  cp .backend_env.example backend/core/.env
+  cp .backend_env.example backend/.env
   cp .frontend_env.example frontend/.env
   ```
 
-- **Step 3**: Update the `backend/core/.env` and `frontend/.env` file
+- **Step 3**: Update the `backend/.env` and `frontend/.env` file
 
   > _Your `supabase_service_key` can be found in your Supabase dashboard under Project Settings -> API. Use the `anon` `public` key found in the `Project API keys` section._
 
   > _Your `JWT_SECRET_KEY`can be found in your supabase settings under Project Settings -> API -> JWT Settings -> JWT Secret_
 
   > _The `NEXT_PUBLIC_BACKEND_URL` is set to localhost:5050 for the docker. Update it if you are running the backend on a different machine._
 
-  > _To activate vertexAI with PaLM from GCP follow the instructions [here](https://python.langchain.com/en/latest/modules/models/llms/integrations/google_vertex_ai_palm.html) and update `backend/core/.env`- It is an advanced feature, please be expert in GCP before trying to use it_
+  > _To activate vertexAI with PaLM from GCP follow the instructions [here](https://python.langchain.com/en/latest/modules/models/llms/integrations/google_vertex_ai_palm.html) and update `backend/.env`- It is an advanced feature, please be expert in GCP before trying to use it_
 
-  - [ ] Change variables in `backend/core/.env`
+  - [ ] Change variables in `backend/.env`
   - [ ] Change variables in `frontend/.env`
 
 - **Step 4**: Use the `migration.sh` script to run the migration scripts

diff --git a/backend/core/Dockerfile → backend/Dockerfile b/backend/core/Dockerfile → backend/Dockerfile
diff --git a/backend/core/auth/__init__.py → backend/auth/__init__.py b/backend/core/auth/__init__.py → backend/auth/__init__.py
diff --git a/backend/core/auth/api_key_handler.py → backend/auth/api_key_handler.py b/backend/core/auth/api_key_handler.py → backend/auth/api_key_handler.py
diff --git a/backend/core/auth/auth_bearer.py → backend/auth/auth_bearer.py b/backend/core/auth/auth_bearer.py → backend/auth/auth_bearer.py
diff --git a/backend/core/auth/jwt_token_handler.py → backend/auth/jwt_token_handler.py b/backend/core/auth/jwt_token_handler.py → backend/auth/jwt_token_handler.py
diff --git a/backend/core/chat_service.py → backend/chat_service.py b/backend/core/chat_service.py → backend/chat_service.py
diff --git a/backend/core/crawl/__init__.py → backend/crawl/__init__.py b/backend/core/crawl/__init__.py → backend/crawl/__init__.py
diff --git a/backend/core/crawl/crawler.py → backend/crawl/crawler.py b/backend/core/crawl/crawler.py → backend/crawl/crawler.py
diff --git a/backend/core/crawl_service.py → backend/crawl_service.py b/backend/core/crawl_service.py → backend/crawl_service.py
diff --git a/backend/core/llm/__init__.py → backend/llm/__init__.py b/backend/core/llm/__init__.py → backend/llm/__init__.py
diff --git a/backend/core/llm/base.py → backend/llm/base.py b/backend/core/llm/base.py → backend/llm/base.py
diff --git a/backend/core/llm/models/FunctionCall.py → backend/llm/models/FunctionCall.py b/backend/core/llm/models/FunctionCall.py → backend/llm/models/FunctionCall.py
diff --git a/backend/core/llm/models/OpenAiAnswer.py → backend/llm/models/OpenAiAnswer.py b/backend/core/llm/models/OpenAiAnswer.py → backend/llm/models/OpenAiAnswer.py
diff --git a/backend/core/llm/openai.py → backend/llm/openai.py b/backend/core/llm/openai.py → backend/llm/openai.py
diff --git a/backend/core/llm/prompts/CONDENSE_PROMPT.py → backend/llm/prompts/CONDENSE_PROMPT.py b/backend/core/llm/prompts/CONDENSE_PROMPT.py → backend/llm/prompts/CONDENSE_PROMPT.py
diff --git a/backend/core/llm/prompts/LANGUAGE_PROMPT.py → backend/llm/prompts/LANGUAGE_PROMPT.py b/backend/core/llm/prompts/LANGUAGE_PROMPT.py → backend/llm/prompts/LANGUAGE_PROMPT.py
diff --git a/backend/core/llm/qa_base.py → backend/llm/qa_base.py b/backend/core/llm/qa_base.py → backend/llm/qa_base.py
diff --git a/backend/core/llm/qa_headless.py → backend/llm/qa_headless.py b/backend/core/llm/qa_headless.py → backend/llm/qa_headless.py
diff --git a/backend/core/logger.py → backend/logger.py b/backend/core/logger.py → backend/logger.py
diff --git a/backend/core/main.py → backend/main.py b/backend/core/main.py → backend/main.py
diff --git a/backend/core/middlewares/cors.py → backend/middlewares/cors.py b/backend/core/middlewares/cors.py → backend/middlewares/cors.py
diff --git a/backend/core/models/__init__.py → backend/models/__init__.py b/backend/core/models/__init__.py → backend/models/__init__.py
diff --git a/backend/core/models/brain_entity.py → backend/models/brain_entity.py b/backend/core/models/brain_entity.py → backend/models/brain_entity.py
diff --git a/backend/core/models/brains.py → backend/models/brains.py b/backend/core/models/brains.py → backend/models/brains.py
diff --git a/...models/brains_subscription_invitations.py → ...models/brains_subscription_invitations.py b/...models/brains_subscription_invitations.py → ...models/brains_subscription_invitations.py
diff --git a/backend/core/models/chat.py → backend/models/chat.py b/backend/core/models/chat.py → backend/models/chat.py
diff --git a/backend/core/models/chats.py → backend/models/chats.py b/backend/core/models/chats.py → backend/models/chats.py
diff --git a/backend/core/models/databases/repository.py → backend/models/databases/repository.py b/backend/core/models/databases/repository.py → backend/models/databases/repository.py
diff --git a/...ore/models/databases/supabase/__init__.py → ...end/models/databases/supabase/__init__.py b/...ore/models/databases/supabase/__init__.py → ...end/models/databases/supabase/__init__.py
diff --git a/...els/databases/supabase/api_key_handler.py → ...els/databases/supabase/api_key_handler.py b/...els/databases/supabase/api_key_handler.py → ...els/databases/supabase/api_key_handler.py
diff --git a/.../core/models/databases/supabase/brains.py → backend/models/databases/supabase/brains.py b/.../core/models/databases/supabase/brains.py → backend/models/databases/supabase/brains.py
diff --git a/...pabase/brains_subscription_invitations.py → ...pabase/brains_subscription_invitations.py b/...pabase/brains_subscription_invitations.py → ...pabase/brains_subscription_invitations.py
diff --git a/...d/core/models/databases/supabase/chats.py → backend/models/databases/supabase/chats.py b/...d/core/models/databases/supabase/chats.py → backend/models/databases/supabase/chats.py
diff --git a/...d/core/models/databases/supabase/files.py → backend/models/databases/supabase/files.py b/...d/core/models/databases/supabase/files.py → backend/models/databases/supabase/files.py
diff --git a/...core/models/databases/supabase/prompts.py → backend/models/databases/supabase/prompts.py b/...core/models/databases/supabase/prompts.py → backend/models/databases/supabase/prompts.py
diff --git a/...ore/models/databases/supabase/supabase.py → ...end/models/databases/supabase/supabase.py b/...ore/models/databases/supabase/supabase.py → ...end/models/databases/supabase/supabase.py
diff --git a/...d/core/models/databases/supabase/users.py → backend/models/databases/supabase/users.py b/...d/core/models/databases/supabase/users.py → backend/models/databases/supabase/users.py
diff --git a/...core/models/databases/supabase/vectors.py → backend/models/databases/supabase/vectors.py b/...core/models/databases/supabase/vectors.py → backend/models/databases/supabase/vectors.py
diff --git a/backend/core/models/files.py → backend/models/files.py b/backend/core/models/files.py → backend/models/files.py
diff --git a/backend/core/models/prompt.py → backend/models/prompt.py b/backend/core/models/prompt.py → backend/models/prompt.py
diff --git a/backend/core/models/settings.py → backend/models/settings.py b/backend/core/models/settings.py → backend/models/settings.py
diff --git a/backend/core/models/sqlalchemy_repository.py → backend/models/sqlalchemy_repository.py b/backend/core/models/sqlalchemy_repository.py → backend/models/sqlalchemy_repository.py
diff --git a/backend/core/models/user_identity.py → backend/models/user_identity.py b/backend/core/models/user_identity.py → backend/models/user_identity.py
diff --git a/backend/core/models/users.py → backend/models/users.py b/backend/core/models/users.py → backend/models/users.py
diff --git a/backend/pandoc-3.1.6.1-1-arm64.deb b/backend/pandoc-3.1.6.1-1-arm64.deb
diff --git a/backend/core/parsers/__init__.py → backend/parsers/__init__.py b/backend/core/parsers/__init__.py → backend/parsers/__init__.py
diff --git a/backend/core/parsers/audio.py → backend/parsers/audio.py b/backend/core/parsers/audio.py → backend/parsers/audio.py
diff --git a/backend/core/parsers/common.py → backend/parsers/common.py b/backend/core/parsers/common.py → backend/parsers/common.py
diff --git a/backend/core/parsers/csv.py → backend/parsers/csv.py b/backend/core/parsers/csv.py → backend/parsers/csv.py
diff --git a/backend/core/parsers/docx.py → backend/parsers/docx.py b/backend/core/parsers/docx.py → backend/parsers/docx.py
diff --git a/backend/core/parsers/epub.py → backend/parsers/epub.py b/backend/core/parsers/epub.py → backend/parsers/epub.py
diff --git a/backend/core/parsers/github.py → backend/parsers/github.py b/backend/core/parsers/github.py → backend/parsers/github.py
diff --git a/backend/core/parsers/html.py → backend/parsers/html.py b/backend/core/parsers/html.py → backend/parsers/html.py
diff --git a/backend/core/parsers/markdown.py → backend/parsers/markdown.py b/backend/core/parsers/markdown.py → backend/parsers/markdown.py
diff --git a/backend/core/parsers/notebook.py → backend/parsers/notebook.py b/backend/core/parsers/notebook.py → backend/parsers/notebook.py
diff --git a/backend/core/parsers/odt.py → backend/parsers/odt.py b/backend/core/parsers/odt.py → backend/parsers/odt.py
diff --git a/backend/core/parsers/pdf.py → backend/parsers/pdf.py b/backend/core/parsers/pdf.py → backend/parsers/pdf.py
diff --git a/backend/core/parsers/powerpoint.py → backend/parsers/powerpoint.py b/backend/core/parsers/powerpoint.py → backend/parsers/powerpoint.py
diff --git a/backend/core/parsers/txt.py → backend/parsers/txt.py b/backend/core/parsers/txt.py → backend/parsers/txt.py
diff --git a/backend/private/Dockerfile b/backend/private/Dockerfile
diff --git a/backend/private/logger.py b/backend/private/logger.py
diff --git a/backend/private/main.py b/backend/private/main.py
diff --git a/backend/private/models/messages.py b/backend/private/models/messages.py
diff --git a/backend/private/requirements.txt b/backend/private/requirements.txt
diff --git a/backend/private/routes/completions_routes.py b/backend/private/routes/completions_routes.py
diff --git a/backend/private/routes/embeddings_routes.py b/backend/private/routes/embeddings_routes.py
diff --git a/backend/core/pyrightconfig.json → backend/pyrightconfig.json b/backend/core/pyrightconfig.json → backend/pyrightconfig.json
diff --git a/backend/core/repository/__init__.py → backend/repository/__init__.py b/backend/core/repository/__init__.py → backend/repository/__init__.py
diff --git a/...end/core/repository/brain/create_brain.py → backend/repository/brain/create_brain.py b/...end/core/repository/brain/create_brain.py → backend/repository/brain/create_brain.py
diff --git a/...ore/repository/brain/create_brain_user.py → ...end/repository/brain/create_brain_user.py b/...ore/repository/brain/create_brain_user.py → ...end/repository/brain/create_brain_user.py
diff --git a/.../core/repository/brain/get_brain_by_id.py → backend/repository/brain/get_brain_by_id.py b/.../core/repository/brain/get_brain_by_id.py → backend/repository/brain/get_brain_by_id.py
diff --git a/...ore/repository/brain/get_brain_details.py → ...end/repository/brain/get_brain_details.py b/...ore/repository/brain/get_brain_details.py → ...end/repository/brain/get_brain_details.py
diff --git a/...re/repository/brain/get_brain_for_user.py → ...nd/repository/brain/get_brain_for_user.py b/...re/repository/brain/get_brain_for_user.py → ...nd/repository/brain/get_brain_for_user.py
diff --git a/...e/repository/brain/get_brain_prompt_id.py → ...d/repository/brain/get_brain_prompt_id.py b/...e/repository/brain/get_brain_prompt_id.py → ...d/repository/brain/get_brain_prompt_id.py
diff --git a/...epository/brain/get_default_user_brain.py → ...epository/brain/get_default_user_brain.py b/...epository/brain/get_default_user_brain.py → ...epository/brain/get_default_user_brain.py
diff --git a/...n/get_default_user_brain_or_create_new.py → ...n/get_default_user_brain_or_create_new.py b/...n/get_default_user_brain_or_create_new.py → ...n/get_default_user_brain_or_create_new.py
diff --git a/.../core/repository/brain/get_user_brains.py → backend/repository/brain/get_user_brains.py b/.../core/repository/brain/get_user_brains.py → backend/repository/brain/get_user_brains.py
diff --git a/...ry/brain/set_as_default_brain_for_user.py → ...ry/brain/set_as_default_brain_for_user.py b/...ry/brain/set_as_default_brain_for_user.py → ...ry/brain/set_as_default_brain_for_user.py
diff --git a/...end/core/repository/brain/update_brain.py → backend/repository/brain/update_brain.py b/...end/core/repository/brain/update_brain.py → backend/repository/brain/update_brain.py
diff --git a/...re/repository/brain/update_user_rights.py → ...nd/repository/brain/update_user_rights.py b/...re/repository/brain/update_user_rights.py → ...nd/repository/brain/update_user_rights.py
diff --git a/...repository/brain_subscription/__init__.py → ...repository/brain_subscription/__init__.py b/...repository/brain_subscription/__init__.py → ...repository/brain_subscription/__init__.py
diff --git a/...itory/brain_subscription/get_brain_url.py → ...itory/brain_subscription/get_brain_url.py b/...itory/brain_subscription/get_brain_url.py → ...itory/brain_subscription/get_brain_url.py
diff --git a/...n_subscription/resend_invitation_email.py → ...n_subscription/resend_invitation_email.py b/...n_subscription/resend_invitation_email.py → ...n_subscription/resend_invitation_email.py
diff --git a/...iption/subscription_invitation_service.py → ...iption/subscription_invitation_service.py b/...iption/subscription_invitation_service.py → ...iption/subscription_invitation_service.py
diff --git a/backend/core/repository/chat/__init__.py → backend/repository/chat/__init__.py b/backend/core/repository/chat/__init__.py → backend/repository/chat/__init__.py
diff --git a/backend/core/repository/chat/create_chat.py → backend/repository/chat/create_chat.py b/backend/core/repository/chat/create_chat.py → backend/repository/chat/create_chat.py
diff --git a/...re/repository/chat/format_chat_history.py → ...nd/repository/chat/format_chat_history.py b/...re/repository/chat/format_chat_history.py → ...nd/repository/chat/format_chat_history.py
diff --git a/...nd/core/repository/chat/get_chat_by_id.py → backend/repository/chat/get_chat_by_id.py b/...nd/core/repository/chat/get_chat_by_id.py → backend/repository/chat/get_chat_by_id.py
diff --git a/.../core/repository/chat/get_chat_history.py → backend/repository/chat/get_chat_history.py b/.../core/repository/chat/get_chat_history.py → backend/repository/chat/get_chat_history.py
diff --git a/...nd/core/repository/chat/get_user_chats.py → backend/repository/chat/get_user_chats.py b/...nd/core/repository/chat/get_user_chats.py → backend/repository/chat/get_user_chats.py
diff --git a/backend/core/repository/chat/update_chat.py → backend/repository/chat/update_chat.py b/backend/core/repository/chat/update_chat.py → backend/repository/chat/update_chat.py
diff --git a/...re/repository/chat/update_chat_history.py → ...nd/repository/chat/update_chat_history.py b/...re/repository/chat/update_chat_history.py → ...nd/repository/chat/update_chat_history.py
diff --git a/...e/repository/chat/update_message_by_id.py → ...d/repository/chat/update_message_by_id.py b/...e/repository/chat/update_message_by_id.py → ...d/repository/chat/update_message_by_id.py
diff --git a/...d/core/repository/prompt/create_prompt.py → backend/repository/prompt/create_prompt.py b/...d/core/repository/prompt/create_prompt.py → backend/repository/prompt/create_prompt.py
diff --git a/.../repository/prompt/delete_prompt_py_id.py → .../repository/prompt/delete_prompt_py_id.py b/.../repository/prompt/delete_prompt_py_id.py → .../repository/prompt/delete_prompt_py_id.py
diff --git a/...ore/repository/prompt/get_prompt_by_id.py → ...end/repository/prompt/get_prompt_by_id.py b/...ore/repository/prompt/get_prompt_by_id.py → ...end/repository/prompt/get_prompt_by_id.py
diff --git a/...e/repository/prompt/get_public_prompts.py → ...d/repository/prompt/get_public_prompts.py b/...e/repository/prompt/get_public_prompts.py → ...d/repository/prompt/get_public_prompts.py
diff --git a/.../repository/prompt/update_prompt_by_id.py → .../repository/prompt/update_prompt_by_id.py b/.../repository/prompt/update_prompt_by_id.py → .../repository/prompt/update_prompt_by_id.py
diff --git a/...ository/user/get_user_email_by_user_id.py → ...ository/user/get_user_email_by_user_id.py b/...ository/user/get_user_email_by_user_id.py → ...ository/user/get_user_email_by_user_id.py
diff --git a/...ository/user/get_user_id_by_user_email.py → ...ository/user/get_user_id_by_user_email.py b/...ository/user/get_user_id_by_user_email.py → ...ository/user/get_user_id_by_user_email.py
diff --git a/...ory/user_identity/create_user_identity.py → ...ory/user_identity/create_user_identity.py b/...ory/user_identity/create_user_identity.py → ...ory/user_identity/create_user_identity.py
diff --git a/...sitory/user_identity/get_user_identity.py → ...sitory/user_identity/get_user_identity.py b/...sitory/user_identity/get_user_identity.py → ...sitory/user_identity/get_user_identity.py
diff --git a/...ory/user_identity/update_user_identity.py → ...ory/user_identity/update_user_identity.py b/...ory/user_identity/update_user_identity.py → ...ory/user_identity/update_user_identity.py
diff --git a/backend/core/requirements.txt → backend/requirements.txt b/backend/core/requirements.txt → backend/requirements.txt
diff --git a/backend/core/routes/__init__.py → backend/routes/__init__.py b/backend/core/routes/__init__.py → backend/routes/__init__.py
diff --git a/backend/core/routes/api_key_routes.py → backend/routes/api_key_routes.py b/backend/core/routes/api_key_routes.py → backend/routes/api_key_routes.py
diff --git a/...nd/core/routes/authorizations/__init__.py → backend/routes/authorizations/__init__.py b/...nd/core/routes/authorizations/__init__.py → backend/routes/authorizations/__init__.py
diff --git a/...tes/authorizations/brain_authorization.py → ...tes/authorizations/brain_authorization.py b/...tes/authorizations/brain_authorization.py → ...tes/authorizations/brain_authorization.py
diff --git a/backend/core/routes/authorizations/types.py → backend/routes/authorizations/types.py b/backend/core/routes/authorizations/types.py → backend/routes/authorizations/types.py
diff --git a/backend/core/routes/brain_routes.py → backend/routes/brain_routes.py b/backend/core/routes/brain_routes.py → backend/routes/brain_routes.py
diff --git a/backend/core/routes/chat_routes.py → backend/routes/chat_routes.py b/backend/core/routes/chat_routes.py → backend/routes/chat_routes.py
diff --git a/backend/core/routes/crawl_routes.py → backend/routes/crawl_routes.py b/backend/core/routes/crawl_routes.py → backend/routes/crawl_routes.py
diff --git a/backend/core/routes/explore_routes.py → backend/routes/explore_routes.py b/backend/core/routes/explore_routes.py → backend/routes/explore_routes.py
diff --git a/backend/core/routes/headers/__init_.py → backend/routes/headers/__init_.py b/backend/core/routes/headers/__init_.py → backend/routes/headers/__init_.py
diff --git a/.../core/routes/headers/get_origin_header.py → backend/routes/headers/get_origin_header.py b/.../core/routes/headers/get_origin_header.py → backend/routes/headers/get_origin_header.py
diff --git a/backend/core/routes/misc_routes.py → backend/routes/misc_routes.py b/backend/core/routes/misc_routes.py → backend/routes/misc_routes.py
diff --git a/backend/core/routes/prompt_routes.py → backend/routes/prompt_routes.py b/backend/core/routes/prompt_routes.py → backend/routes/prompt_routes.py
diff --git a/backend/core/routes/subscription_routes.py → backend/routes/subscription_routes.py b/backend/core/routes/subscription_routes.py → backend/routes/subscription_routes.py
diff --git a/backend/core/routes/upload_routes.py → backend/routes/upload_routes.py b/backend/core/routes/upload_routes.py → backend/routes/upload_routes.py
diff --git a/backend/core/routes/user_routes.py → backend/routes/user_routes.py b/backend/core/routes/user_routes.py → backend/routes/user_routes.py
diff --git a/...supabase/functions/add-new-email/index.ts → ...supabase/functions/add-new-email/index.ts b/...supabase/functions/add-new-email/index.ts → ...supabase/functions/add-new-email/index.ts
@@ -1,5 +1,5 @@
 /* Instructions:
-1. in .backend/core/supabase folder, create .env file with BEEHIIV_PUBLICATION_ID and BEEHIIV_API_KEY variables
+1. in .backend/supabase folder, create .env file with BEEHIIV_PUBLICATION_ID and BEEHIIV_API_KEY variables
 2. cd into .backend
 --- for the rest of these steps you will need your supabase project id which can be found in your console url: https://supabase.com/dashboard/project/<projectId> ---
 3. run `supabase secrets set --env-file ./supabase/.env` to set the environment variables

diff --git a/backend/core/tests/conftest.py → backend/tests/conftest.py b/backend/core/tests/conftest.py → backend/tests/conftest.py
diff --git a/backend/core/tests/test_api_key.py → backend/tests/test_api_key.py b/backend/core/tests/test_api_key.py → backend/tests/test_api_key.py
diff --git a/backend/core/tests/test_brains.py → backend/tests/test_brains.py b/backend/core/tests/test_brains.py → backend/tests/test_brains.py
diff --git a/backend/core/tests/test_chats.py → backend/tests/test_chats.py b/backend/core/tests/test_chats.py → backend/tests/test_chats.py
diff --git a/backend/core/tests/test_explore.py → backend/tests/test_explore.py b/backend/core/tests/test_explore.py → backend/tests/test_explore.py
diff --git a/backend/core/tests/test_files/test.csv → backend/tests/test_files/test.csv b/backend/core/tests/test_files/test.csv → backend/tests/test_files/test.csv
diff --git a/backend/core/tests/test_files/test.pdf → backend/tests/test_files/test.pdf b/backend/core/tests/test_files/test.pdf → backend/tests/test_files/test.pdf
diff --git a/backend/core/tests/test_files/test.txt → backend/tests/test_files/test.txt b/backend/core/tests/test_files/test.txt → backend/tests/test_files/test.txt
diff --git a/backend/core/tests/test_upload.py → backend/tests/test_upload.py b/backend/core/tests/test_upload.py → backend/tests/test_upload.py
diff --git a/backend/core/tests/test_user.py → backend/tests/test_user.py b/backend/core/tests/test_user.py → backend/tests/test_user.py
diff --git a/backend/core/upload_service.py → backend/upload_service.py b/backend/core/upload_service.py → backend/upload_service.py
diff --git a/backend/core/utils/__init__.py → backend/utils/__init__.py b/backend/core/utils/__init__.py → backend/utils/__init__.py
diff --git a/backend/core/utils/file.py → backend/utils/file.py b/backend/core/utils/file.py → backend/utils/file.py
diff --git a/backend/core/utils/processors.py → backend/utils/processors.py b/backend/core/utils/processors.py → backend/utils/processors.py
diff --git a/backend/core/utils/vectors.py → backend/utils/vectors.py b/backend/core/utils/vectors.py → backend/utils/vectors.py
diff --git a/backend/core/vectorstore/__init__.py → backend/vectorstore/__init__.py b/backend/core/vectorstore/__init__.py → backend/vectorstore/__init__.py
diff --git a/backend/core/vectorstore/supabase.py → backend/vectorstore/supabase.py b/backend/core/vectorstore/supabase.py → backend/vectorstore/supabase.py
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -27,15 +27,15 @@ services:
 
   backend-core:
     env_file:
-      - ./backend/core/.env
+      - ./backend/.env
     build:
-      context: backend/core
+      context: backend
       dockerfile: Dockerfile
     container_name: backend-core
     command: uvicorn main:app --host 0.0.0.0 --port 5050
     restart: always
     volumes:
-      - ./backend/core/:/code/
+      - ./backend/:/code/
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.backend-core.rule=PathPrefix(`/`)"
@@ -44,15 +44,15 @@ services:
 
   backend-chat:
     env_file:
-      - ./backend/core/.env
+      - ./backend/.env
     build:
-      context: backend/core
+      context: backend
       dockerfile: Dockerfile
     container_name: backend-chat
     command: uvicorn chat_service:app --host 0.0.0.0 --port 5050
     restart: always
     volumes:
-      - ./backend/core/:/code/
+      - ./backend/:/code/
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.backend-chat.rule=PathPrefix(`/chat`)"
@@ -61,15 +61,15 @@ services:
 
   backend-crawl:
     env_file:
-      - ./backend/core/.env
+      - ./backend/.env
     build:
-      context: backend/core
+      context: backend
       dockerfile: Dockerfile
     container_name: backend-crawl
     command: uvicorn crawl_service:app --host 0.0.0.0 --port 5050
     restart: always
     volumes:
-      - ./backend/core/:/code/
+      - ./backend/:/code/
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.backend-crawl.rule=PathPrefix(`/crawl`)"
@@ -78,15 +78,15 @@ services:
 
   backend-upload:
     env_file:
-      - ./backend/core/.env
+      - ./backend/.env
     build:
-      context: backend/core
+      context: backend
       dockerfile: Dockerfile
     container_name: backend-upload
     command: uvicorn upload_service:app --host 0.0.0.0 --port 5050
     restart: always
     volumes:
-      - ./backend/core/:/code/
+      - ./backend/:/code/
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.backend-upload.rule=PathPrefix(`/upload`)"

diff --git a/docker-compose.private-dev.yml b/docker-compose.private-dev.yml