Browse Source

refac: folder rename web -> webui

Timothy J. Baek 11 months ago
parent
commit
1fce466253
35 changed files with 35 additions and 35 deletions
  1. 2 2
      backend/apps/ollama/main.py
  2. 2 2
      backend/apps/openai/main.py
  3. 0 0
      backend/apps/webui/internal/db.py
  4. 0 0
      backend/apps/webui/internal/migrations/001_initial_schema.py
  5. 0 0
      backend/apps/webui/internal/migrations/002_add_local_sharing.py
  6. 0 0
      backend/apps/webui/internal/migrations/003_add_auth_api_key.py
  7. 0 0
      backend/apps/webui/internal/migrations/004_add_archived.py
  8. 0 0
      backend/apps/webui/internal/migrations/005_add_updated_at.py
  9. 0 0
      backend/apps/webui/internal/migrations/006_migrate_timestamps_and_charfields.py
  10. 0 0
      backend/apps/webui/internal/migrations/007_add_user_last_active_at.py
  11. 0 0
      backend/apps/webui/internal/migrations/008_add_memory.py
  12. 0 0
      backend/apps/webui/internal/migrations/009_add_models.py
  13. 0 0
      backend/apps/webui/internal/migrations/010_migrate_modelfiles_to_models.py
  14. 1 1
      backend/apps/webui/internal/migrations/README.md
  15. 1 1
      backend/apps/webui/main.py
  16. 2 2
      backend/apps/webui/models/auths.py
  17. 1 1
      backend/apps/webui/models/chats.py
  18. 1 1
      backend/apps/webui/models/documents.py
  19. 2 2
      backend/apps/webui/models/memories.py
  20. 1 1
      backend/apps/webui/models/models.py
  21. 1 1
      backend/apps/webui/models/prompts.py
  22. 1 1
      backend/apps/webui/models/tags.py
  23. 2 2
      backend/apps/webui/models/users.py
  24. 2 2
      backend/apps/webui/routers/auths.py
  25. 3 3
      backend/apps/webui/routers/chats.py
  26. 1 1
      backend/apps/webui/routers/configs.py
  27. 1 1
      backend/apps/webui/routers/documents.py
  28. 1 1
      backend/apps/webui/routers/memories.py
  29. 1 1
      backend/apps/webui/routers/models.py
  30. 1 1
      backend/apps/webui/routers/prompts.py
  31. 3 3
      backend/apps/webui/routers/users.py
  32. 1 1
      backend/apps/webui/routers/utils.py
  33. 2 2
      backend/main.py
  34. 1 1
      backend/utils/models.py
  35. 1 1
      backend/utils/utils.py

+ 2 - 2
backend/apps/ollama/main.py

@@ -29,8 +29,8 @@ import time
 from urllib.parse import urlparse
 from typing import Optional, List, Union
 
-from apps.web.models.models import Models
-from apps.web.models.users import Users
+from apps.webui.models.models import Models
+from apps.webui.models.users import Users
 from constants import ERROR_MESSAGES
 from utils.utils import (
     decode_token,

+ 2 - 2
backend/apps/openai/main.py

@@ -10,8 +10,8 @@ import logging
 
 from pydantic import BaseModel
 
-from apps.web.models.models import Models
-from apps.web.models.users import Users
+from apps.webui.models.models import Models
+from apps.webui.models.users import Users
 from constants import ERROR_MESSAGES
 from utils.utils import (
     decode_token,

+ 0 - 0
backend/apps/web/internal/db.py → backend/apps/webui/internal/db.py


+ 0 - 0
backend/apps/web/internal/migrations/001_initial_schema.py → backend/apps/webui/internal/migrations/001_initial_schema.py


+ 0 - 0
backend/apps/web/internal/migrations/002_add_local_sharing.py → backend/apps/webui/internal/migrations/002_add_local_sharing.py


+ 0 - 0
backend/apps/web/internal/migrations/003_add_auth_api_key.py → backend/apps/webui/internal/migrations/003_add_auth_api_key.py


+ 0 - 0
backend/apps/web/internal/migrations/004_add_archived.py → backend/apps/webui/internal/migrations/004_add_archived.py


+ 0 - 0
backend/apps/web/internal/migrations/005_add_updated_at.py → backend/apps/webui/internal/migrations/005_add_updated_at.py


+ 0 - 0
backend/apps/web/internal/migrations/006_migrate_timestamps_and_charfields.py → backend/apps/webui/internal/migrations/006_migrate_timestamps_and_charfields.py


+ 0 - 0
backend/apps/web/internal/migrations/007_add_user_last_active_at.py → backend/apps/webui/internal/migrations/007_add_user_last_active_at.py


+ 0 - 0
backend/apps/web/internal/migrations/008_add_memory.py → backend/apps/webui/internal/migrations/008_add_memory.py


+ 0 - 0
backend/apps/web/internal/migrations/009_add_models.py → backend/apps/webui/internal/migrations/009_add_models.py


+ 0 - 0
backend/apps/web/internal/migrations/010_migrate_modelfiles_to_models.py → backend/apps/webui/internal/migrations/010_migrate_modelfiles_to_models.py


+ 1 - 1
backend/apps/web/internal/migrations/README.md → backend/apps/webui/internal/migrations/README.md

@@ -14,7 +14,7 @@ You will need to create a migration file to ensure that existing databases are u
 2. Make your changes to the models.
 3. From the `backend` directory, run the following command:
    ```bash
-   pw_migrate create --auto --auto-source apps.web.models --database sqlite:///${SQLITE_DB} --directory apps/web/internal/migrations ${MIGRATION_NAME}
+   pw_migrate create --auto --auto-source apps.webui.models --database sqlite:///${SQLITE_DB} --directory apps/web/internal/migrations ${MIGRATION_NAME}
    ```
    - `$SQLITE_DB` should be the path to the database file.
    - `$MIGRATION_NAME` should be a descriptive name for the migration.

+ 1 - 1
backend/apps/web/main.py → backend/apps/webui/main.py

@@ -1,7 +1,7 @@
 from fastapi import FastAPI, Depends
 from fastapi.routing import APIRoute
 from fastapi.middleware.cors import CORSMiddleware
-from apps.web.routers import (
+from apps.webui.routers import (
     auths,
     users,
     chats,

+ 2 - 2
backend/apps/web/models/auths.py → backend/apps/webui/models/auths.py

@@ -5,10 +5,10 @@ import uuid
 import logging
 from peewee import *
 
-from apps.web.models.users import UserModel, Users
+from apps.webui.models.users import UserModel, Users
 from utils.utils import verify_password
 
-from apps.web.internal.db import DB
+from apps.webui.internal.db import DB
 
 from config import SRC_LOG_LEVELS
 

+ 1 - 1
backend/apps/web/models/chats.py → backend/apps/webui/models/chats.py

@@ -7,7 +7,7 @@ import json
 import uuid
 import time
 
-from apps.web.internal.db import DB
+from apps.webui.internal.db import DB
 
 ####################
 # Chat DB Schema

+ 1 - 1
backend/apps/web/models/documents.py → backend/apps/webui/models/documents.py

@@ -8,7 +8,7 @@ import logging
 from utils.utils import decode_token
 from utils.misc import get_gravatar_url
 
-from apps.web.internal.db import DB
+from apps.webui.internal.db import DB
 
 import json
 

+ 2 - 2
backend/apps/web/models/memories.py → backend/apps/webui/models/memories.py

@@ -3,8 +3,8 @@ from peewee import *
 from playhouse.shortcuts import model_to_dict
 from typing import List, Union, Optional
 
-from apps.web.internal.db import DB
-from apps.web.models.chats import Chats
+from apps.webui.internal.db import DB
+from apps.webui.models.chats import Chats
 
 import time
 import uuid

+ 1 - 1
backend/apps/web/models/models.py → backend/apps/webui/models/models.py

@@ -8,7 +8,7 @@ from peewee import *
 from playhouse.shortcuts import model_to_dict
 from pydantic import BaseModel, ConfigDict
 
-from apps.web.internal.db import DB, JSONField
+from apps.webui.internal.db import DB, JSONField
 
 from typing import List, Union, Optional
 from config import SRC_LOG_LEVELS

+ 1 - 1
backend/apps/web/models/prompts.py → backend/apps/webui/models/prompts.py

@@ -7,7 +7,7 @@ import time
 from utils.utils import decode_token
 from utils.misc import get_gravatar_url
 
-from apps.web.internal.db import DB
+from apps.webui.internal.db import DB
 
 import json
 

+ 1 - 1
backend/apps/web/models/tags.py → backend/apps/webui/models/tags.py

@@ -8,7 +8,7 @@ import uuid
 import time
 import logging
 
-from apps.web.internal.db import DB
+from apps.webui.internal.db import DB
 
 from config import SRC_LOG_LEVELS
 

+ 2 - 2
backend/apps/web/models/users.py → backend/apps/webui/models/users.py

@@ -5,8 +5,8 @@ from typing import List, Union, Optional
 import time
 from utils.misc import get_gravatar_url
 
-from apps.web.internal.db import DB
-from apps.web.models.chats import Chats
+from apps.webui.internal.db import DB
+from apps.webui.models.chats import Chats
 
 ####################
 # User DB Schema

+ 2 - 2
backend/apps/web/routers/auths.py → backend/apps/webui/routers/auths.py

@@ -10,7 +10,7 @@ import uuid
 import csv
 
 
-from apps.web.models.auths import (
+from apps.webui.models.auths import (
     SigninForm,
     SignupForm,
     AddUserForm,
@@ -21,7 +21,7 @@ from apps.web.models.auths import (
     Auths,
     ApiKey,
 )
-from apps.web.models.users import Users
+from apps.webui.models.users import Users
 
 from utils.utils import (
     get_password_hash,

+ 3 - 3
backend/apps/web/routers/chats.py → backend/apps/webui/routers/chats.py

@@ -7,8 +7,8 @@ from pydantic import BaseModel
 import json
 import logging
 
-from apps.web.models.users import Users
-from apps.web.models.chats import (
+from apps.webui.models.users import Users
+from apps.webui.models.chats import (
     ChatModel,
     ChatResponse,
     ChatTitleForm,
@@ -18,7 +18,7 @@ from apps.web.models.chats import (
 )
 
 
-from apps.web.models.tags import (
+from apps.webui.models.tags import (
     TagModel,
     ChatIdTagModel,
     ChatIdTagForm,

+ 1 - 1
backend/apps/web/routers/configs.py → backend/apps/webui/routers/configs.py

@@ -8,7 +8,7 @@ from pydantic import BaseModel
 import time
 import uuid
 
-from apps.web.models.users import Users
+from apps.webui.models.users import Users
 
 from utils.utils import (
     get_password_hash,

+ 1 - 1
backend/apps/web/routers/documents.py → backend/apps/webui/routers/documents.py

@@ -6,7 +6,7 @@ from fastapi import APIRouter
 from pydantic import BaseModel
 import json
 
-from apps.web.models.documents import (
+from apps.webui.models.documents import (
     Documents,
     DocumentForm,
     DocumentUpdateForm,

+ 1 - 1
backend/apps/web/routers/memories.py → backend/apps/webui/routers/memories.py

@@ -7,7 +7,7 @@ from fastapi import APIRouter
 from pydantic import BaseModel
 import logging
 
-from apps.web.models.memories import Memories, MemoryModel
+from apps.webui.models.memories import Memories, MemoryModel
 
 from utils.utils import get_verified_user
 from constants import ERROR_MESSAGES

+ 1 - 1
backend/apps/web/routers/models.py → backend/apps/webui/routers/models.py

@@ -5,7 +5,7 @@ from typing import List, Union, Optional
 from fastapi import APIRouter
 from pydantic import BaseModel
 import json
-from apps.web.models.models import Models, ModelModel, ModelForm, ModelResponse
+from apps.webui.models.models import Models, ModelModel, ModelForm, ModelResponse
 
 from utils.utils import get_verified_user, get_admin_user
 from constants import ERROR_MESSAGES

+ 1 - 1
backend/apps/web/routers/prompts.py → backend/apps/webui/routers/prompts.py

@@ -6,7 +6,7 @@ from fastapi import APIRouter
 from pydantic import BaseModel
 import json
 
-from apps.web.models.prompts import Prompts, PromptForm, PromptModel
+from apps.webui.models.prompts import Prompts, PromptForm, PromptModel
 
 from utils.utils import get_current_user, get_admin_user
 from constants import ERROR_MESSAGES

+ 3 - 3
backend/apps/web/routers/users.py → backend/apps/webui/routers/users.py

@@ -9,9 +9,9 @@ import time
 import uuid
 import logging
 
-from apps.web.models.users import UserModel, UserUpdateForm, UserRoleUpdateForm, Users
-from apps.web.models.auths import Auths
-from apps.web.models.chats import Chats
+from apps.webui.models.users import UserModel, UserUpdateForm, UserRoleUpdateForm, Users
+from apps.webui.models.auths import Auths
+from apps.webui.models.chats import Chats
 
 from utils.utils import get_verified_user, get_password_hash, get_admin_user
 from constants import ERROR_MESSAGES

+ 1 - 1
backend/apps/web/routers/utils.py → backend/apps/webui/routers/utils.py

@@ -8,7 +8,7 @@ from pydantic import BaseModel
 from fpdf import FPDF
 import markdown
 
-from apps.web.internal.db import DB
+from apps.webui.internal.db import DB
 from utils.utils import get_admin_user
 from utils.misc import calculate_sha256, get_gravatar_url
 

+ 2 - 2
backend/main.py

@@ -25,13 +25,13 @@ from apps.openai.main import app as openai_app, get_all_models as get_openai_mod
 from apps.audio.main import app as audio_app
 from apps.images.main import app as images_app
 from apps.rag.main import app as rag_app
-from apps.web.main import app as webui_app
+from apps.webui.main import app as webui_app
 
 import asyncio
 from pydantic import BaseModel
 from typing import List, Optional
 
-from apps.web.models.models import Models, ModelModel
+from apps.webui.models.models import Models, ModelModel
 from utils.utils import get_admin_user, get_verified_user
 from apps.rag.utils import rag_messages
 

+ 1 - 1
backend/utils/models.py

@@ -1,4 +1,4 @@
-from apps.web.models.models import Models, ModelModel, ModelForm, ModelResponse
+from apps.webui.models.models import Models, ModelModel, ModelForm, ModelResponse
 
 
 def get_model_id_from_custom_model_id(id: str):

+ 1 - 1
backend/utils/utils.py

@@ -1,7 +1,7 @@
 from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
 from fastapi import HTTPException, status, Depends
 
-from apps.web.models.users import Users
+from apps.webui.models.users import Users
 
 from pydantic import BaseModel
 from typing import Union, Optional