From 5e6d946f838ea9781c5c2c93ed0df32872e9e9bb Mon Sep 17 00:00:00 2001 From: "Timothy J. Baek" Date: Fri, 5 Jan 2024 12:22:27 -0800 Subject: [PATCH 1/2] chore: disable passlib log --- backend/utils/utils.py | 22 +++++++++++----------- src/lib/apis/ollama/index.ts | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/backend/utils/utils.py b/backend/utils/utils.py index ad77e0c7..be500ce3 100644 --- a/backend/utils/utils.py +++ b/backend/utils/utils.py @@ -8,9 +8,12 @@ from passlib.context import CryptContext from datetime import datetime, timedelta import requests import jwt - +import logging import config +logging.getLogger("passlib").setLevel(logging.ERROR) + + JWT_SECRET_KEY = config.WEBUI_JWT_SECRET_KEY ALGORITHM = "HS256" @@ -23,16 +26,16 @@ pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto") def verify_password(plain_password, hashed_password): - return (pwd_context.verify(plain_password, hashed_password) - if hashed_password else None) + return ( + pwd_context.verify(plain_password, hashed_password) if hashed_password else None + ) def get_password_hash(password): return pwd_context.hash(password) -def create_token(data: dict, - expires_delta: Union[timedelta, None] = None) -> str: +def create_token(data: dict, expires_delta: Union[timedelta, None] = None) -> str: payload = data.copy() if expires_delta: @@ -45,20 +48,17 @@ def create_token(data: dict, def decode_token(token: str) -> Optional[dict]: try: - decoded = jwt.decode(token, - JWT_SECRET_KEY, - options={"verify_signature": False}) + decoded = jwt.decode(token, JWT_SECRET_KEY, options={"verify_signature": False}) return decoded except Exception as e: return None def extract_token_from_auth_header(auth_header: str): - return auth_header[len("Bearer "):] + return auth_header[len("Bearer ") :] -def get_current_user(auth_token: HTTPAuthorizationCredentials = Depends( - HTTPBearer())): +def get_current_user(auth_token: HTTPAuthorizationCredentials = Depends(HTTPBearer())): data = decode_token(auth_token.credentials) if data != None and "email" in data: user = Users.get_user_by_email(data["email"]) diff --git a/src/lib/apis/ollama/index.ts b/src/lib/apis/ollama/index.ts index e0048fc6..10eddc1c 100644 --- a/src/lib/apis/ollama/index.ts +++ b/src/lib/apis/ollama/index.ts @@ -144,7 +144,7 @@ export const generateTitle = async (token: string = '', model: string, prompt: s }, body: JSON.stringify({ model: model, - prompt: `Generate a brief 3-5 word title for this question, excluding the term 'title.' Then, please reply with only the title: ${prompt}`, + prompt: `Create a concise, 3-5 word phrase as a header for the following query, strictly adhering to the 3-5 word limit and avoiding the use of the word 'title': ${prompt}`, stream: false }) }) From 6a996b940f4e909b21c9def4a418c16f01a8fefa Mon Sep 17 00:00:00 2001 From: "Timothy J. Baek" Date: Fri, 5 Jan 2024 12:26:21 -0800 Subject: [PATCH 2/2] doc: non-docker install pip command update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d18b0653..f35d6678 100644 --- a/README.md +++ b/README.md @@ -227,7 +227,7 @@ npm run build # Serving Frontend with the Backend cd ./backend -pip install -r requirements.txt +pip install -r requirements.txt -U sh start.sh ```