UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2024-12-28 06:42:47 +00:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

refac

Browse Source
This commit is contained in:
Timothy Jaeryang Baek 2024-12-08 16:01:56 -08:00
parent 8dcee6b6ed
commit 33099bf9e4
27 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/open_webui/apps/audio/main.py
View File

@ -45,7 +45,7 @@ from fastapi import Depends, FastAPI, File, HTTPException, Request, UploadFile,
from fastapi.middleware.cors import CORSMiddleware
from fastapi.responses import FileResponse
from pydantic import BaseModel
from open_webui.utils.utils import get_admin_user, get_verified_user
from open_webui.utils.auth import get_admin_user, get_verified_user
# Constants
MAX_FILE_SIZE_MB = 25

2
backend/open_webui/apps/images/main.py
View File

@ -40,7 +40,7 @@ from open_webui.env import ENV, SRC_LOG_LEVELS, ENABLE_FORWARD_USER_INFO_HEADERS
from fastapi import Depends, FastAPI, HTTPException, Request
from fastapi.middleware.cors import CORSMiddleware
from pydantic import BaseModel
from open_webui.utils.utils import get_admin_user, get_verified_user
from open_webui.utils.auth import get_admin_user, get_verified_user
log = logging.getLogger(__name__)
log.setLevel(SRC_LOG_LEVELS["IMAGES"])

2
backend/open_webui/apps/ollama/main.py
View File

@ -45,7 +45,7 @@ from open_webui.utils.payload import (
apply_model_params_to_body_openai,
apply_model_system_prompt_to_body,
)
from open_webui.utils.utils import get_admin_user, get_verified_user
from open_webui.utils.auth import get_admin_user, get_verified_user
from open_webui.utils.access_control import has_access
log = logging.getLogger(__name__)

2
backend/open_webui/apps/openai/main.py
View File

@ -40,7 +40,7 @@ from open_webui.utils.payload import (
apply_model_system_prompt_to_body,
)
from open_webui.utils.utils import get_admin_user, get_verified_user
from open_webui.utils.auth import get_admin_user, get_verified_user
from open_webui.utils.access_control import has_access

2
backend/open_webui/apps/retrieval/main.py
View File

@ -121,7 +121,7 @@ from open_webui.utils.misc import (
extract_folders_after_data_docs,
sanitize_filename,
)
from open_webui.utils.utils import get_admin_user, get_verified_user
from open_webui.utils.auth import get_admin_user, get_verified_user
from langchain.text_splitter import RecursiveCharacterTextSplitter, TokenTextSplitter
from langchain_core.documents import Document

2
backend/open_webui/apps/socket/main.py
View File

@ -12,7 +12,7 @@ from open_webui.env import (
WEBSOCKET_MANAGER,
WEBSOCKET_REDIS_URL,
)
from open_webui.utils.utils import decode_token
from open_webui.utils.auth import decode_token
from open_webui.apps.socket.utils import RedisDict
from open_webui.env import (

2
backend/open_webui/apps/webui/models/auths.py
View File

@ -7,7 +7,7 @@ from open_webui.apps.webui.models.users import UserModel, Users
from open_webui.env import SRC_LOG_LEVELS
from pydantic import BaseModel
from sqlalchemy import Boolean, Column, String, Text
from open_webui.utils.utils import verify_password
from open_webui.utils.auth import verify_password
log = logging.getLogger(__name__)
log.setLevel(SRC_LOG_LEVELS["MODELS"])

2
backend/open_webui/apps/webui/routers/auths.py
View File

@ -32,7 +32,7 @@ from fastapi import APIRouter, Depends, HTTPException, Request, status
from fastapi.responses import Response
from pydantic import BaseModel
from open_webui.utils.misc import parse_duration, validate_email_format
from open_webui.utils.utils import (
from open_webui.utils.auth import (
create_api_key,
create_token,
get_admin_user,

2
backend/open_webui/apps/webui/routers/chats.py
View File

@ -19,7 +19,7 @@ from fastapi import APIRouter, Depends, HTTPException, Request, status
from pydantic import BaseModel
from open_webui.utils.utils import get_admin_user, get_verified_user
from open_webui.utils.auth import get_admin_user, get_verified_user
from open_webui.utils.access_control import has_permission
log = logging.getLogger(__name__)

2
backend/open_webui/apps/webui/routers/configs.py
View File

@ -3,7 +3,7 @@ from pydantic import BaseModel
from typing import Optional
from open_webui.utils.utils import get_admin_user, get_verified_user
from open_webui.utils.auth import get_admin_user, get_verified_user
from open_webui.config import get_config, save_config
from open_webui.config import BannerModel

2
backend/open_webui/apps/webui/routers/evaluations.py
View File

@ -11,7 +11,7 @@ from open_webui.apps.webui.models.feedbacks import (
)
from open_webui.constants import ERROR_MESSAGES
from open_webui.utils.utils import get_admin_user, get_verified_user
from open_webui.utils.auth import get_admin_user, get_verified_user
router = APIRouter()

2
backend/open_webui/apps/webui/routers/files.py
View File

@ -25,7 +25,7 @@ from fastapi import APIRouter, Depends, File, HTTPException, UploadFile, status
from fastapi.responses import FileResponse, StreamingResponse
from open_webui.utils.utils import get_admin_user, get_verified_user
from open_webui.utils.auth import get_admin_user, get_verified_user
log = logging.getLogger(__name__)
log.setLevel(SRC_LOG_LEVELS["MODELS"])

2
backend/open_webui/apps/webui/routers/folders.py
View File

@ -24,7 +24,7 @@ from fastapi import APIRouter, Depends, File, HTTPException, UploadFile, status
from fastapi.responses import FileResponse, StreamingResponse
from open_webui.utils.utils import get_admin_user, get_verified_user
from open_webui.utils.auth import get_admin_user, get_verified_user
log = logging.getLogger(__name__)
log.setLevel(SRC_LOG_LEVELS["MODELS"])

2
backend/open_webui/apps/webui/routers/functions.py
View File

@ -12,7 +12,7 @@ from open_webui.apps.webui.utils import load_function_module_by_id, replace_impo
from open_webui.config import CACHE_DIR
from open_webui.constants import ERROR_MESSAGES
from fastapi import APIRouter, Depends, HTTPException, Request, status
from open_webui.utils.utils import get_admin_user, get_verified_user
from open_webui.utils.auth import get_admin_user, get_verified_user
router = APIRouter()

2
backend/open_webui/apps/webui/routers/groups.py
View File

@ -12,7 +12,7 @@ from open_webui.apps.webui.models.groups import (
from open_webui.config import CACHE_DIR
from open_webui.constants import ERROR_MESSAGES
from fastapi import APIRouter, Depends, HTTPException, Request, status
from open_webui.utils.utils import get_admin_user, get_verified_user
from open_webui.utils.auth import get_admin_user, get_verified_user
router = APIRouter()

2
backend/open_webui/apps/webui/routers/knowledge.py
View File

@ -16,7 +16,7 @@ from open_webui.apps.retrieval.main import process_file, ProcessFileForm
from open_webui.constants import ERROR_MESSAGES
from open_webui.utils.utils import get_admin_user, get_verified_user
from open_webui.utils.auth import get_admin_user, get_verified_user
from open_webui.utils.access_control import has_access, has_permission

2
backend/open_webui/apps/webui/routers/memories.py
View File

@ -5,7 +5,7 @@ from typing import Optional
from open_webui.apps.webui.models.memories import Memories, MemoryModel
from open_webui.apps.retrieval.vector.connector import VECTOR_DB_CLIENT
from open_webui.utils.utils import get_verified_user
from open_webui.utils.auth import get_verified_user
from open_webui.env import SRC_LOG_LEVELS

2
backend/open_webui/apps/webui/routers/models.py
View File

@ -11,7 +11,7 @@ from open_webui.constants import ERROR_MESSAGES
from fastapi import APIRouter, Depends, HTTPException, Request, status
from open_webui.utils.utils import get_admin_user, get_verified_user
from open_webui.utils.auth import get_admin_user, get_verified_user
from open_webui.utils.access_control import has_access, has_permission

2
backend/open_webui/apps/webui/routers/prompts.py
View File

@ -8,7 +8,7 @@ from open_webui.apps.webui.models.prompts import (
)
from open_webui.constants import ERROR_MESSAGES
from fastapi import APIRouter, Depends, HTTPException, status, Request
from open_webui.utils.utils import get_admin_user, get_verified_user
from open_webui.utils.auth import get_admin_user, get_verified_user
from open_webui.utils.access_control import has_access, has_permission
router = APIRouter()

2
backend/open_webui/apps/webui/routers/tools.py
View File

@ -13,7 +13,7 @@ from open_webui.config import CACHE_DIR
from open_webui.constants import ERROR_MESSAGES
from fastapi import APIRouter, Depends, HTTPException, Request, status
from open_webui.utils.tools import get_tools_specs
from open_webui.utils.utils import get_admin_user, get_verified_user
from open_webui.utils.auth import get_admin_user, get_verified_user
from open_webui.utils.access_control import has_access, has_permission

2
backend/open_webui/apps/webui/routers/users.py
View File

@ -14,7 +14,7 @@ from open_webui.constants import ERROR_MESSAGES
from open_webui.env import SRC_LOG_LEVELS
from fastapi import APIRouter, Depends, HTTPException, Request, status
from pydantic import BaseModel
from open_webui.utils.utils import get_admin_user, get_password_hash, get_verified_user
from open_webui.utils.auth import get_admin_user, get_password_hash, get_verified_user
log = logging.getLogger(__name__)
log.setLevel(SRC_LOG_LEVELS["MODELS"])

2
backend/open_webui/apps/webui/routers/utils.py
View File

@ -9,7 +9,7 @@ from pydantic import BaseModel
from starlette.responses import FileResponse
from open_webui.utils.misc import get_gravatar_url
from open_webui.utils.pdf_generator import PDFGenerator
from open_webui.utils.utils import get_admin_user
from open_webui.utils.auth import get_admin_user
router = APIRouter()

2
backend/open_webui/main.py
View File

@ -139,7 +139,7 @@ from open_webui.utils.task import (
tools_function_calling_generation_template,
)
from open_webui.utils.tools import get_tools
from open_webui.utils.utils import (
from open_webui.utils.auth import (
decode_token,
get_admin_user,
get_current_user,

6
backend/open_webui/test/apps/webui/routers/test_auths.py
View File

@ -26,7 +26,7 @@ class TestAuths(AbstractPostgresTest):
}
def test_update_profile(self):
from open_webui.utils.utils import get_password_hash
from open_webui.utils.auth import get_password_hash
user = self.auths.insert_new_auth(
email="john.doe@openwebui.com",
@ -47,7 +47,7 @@ class TestAuths(AbstractPostgresTest):
assert db_user.profile_image_url == "/user2.png"
def test_update_password(self):
from open_webui.utils.utils import get_password_hash
from open_webui.utils.auth import get_password_hash
user = self.auths.insert_new_auth(
email="john.doe@openwebui.com",
@ -74,7 +74,7 @@ class TestAuths(AbstractPostgresTest):
assert new_auth is not None
def test_signin(self):
from open_webui.utils.utils import get_password_hash
from open_webui.utils.auth import get_password_hash
user = self.auths.insert_new_auth(
email="john.doe@openwebui.com",

2
backend/open_webui/test/util/mock_user.py
View File

@ -13,7 +13,7 @@ def mock_webui_user(**kwargs):
@contextmanager
def mock_user(app: FastAPI, **kwargs):
from open_webui.utils.utils import (
from open_webui.utils.auth import (
get_current_user,
get_verified_user,
get_admin_user,

0
backend/open_webui/utils/utils.py → backend/open_webui/utils/auth.py
View File

2
backend/open_webui/utils/oauth.py
View File

@ -33,7 +33,7 @@ from open_webui.config import (
from open_webui.constants import ERROR_MESSAGES
from open_webui.env import WEBUI_SESSION_COOKIE_SAME_SITE, WEBUI_SESSION_COOKIE_SECURE
from open_webui.utils.misc import parse_duration
from open_webui.utils.utils import get_password_hash, create_token
from open_webui.utils.auth import get_password_hash, create_token
from open_webui.utils.webhook import post_webhook
log = logging.getLogger(__name__)