Merge pull request #395 from ollama-webui/passlib-log

chore: disable passlib log
This commit is contained in:
Timothy Jaeryang Baek 2024-01-05 15:26:29 -05:00 committed by GitHub
commit e593212264
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 13 deletions

View file

@ -227,7 +227,7 @@ npm run build
# Serving Frontend with the Backend # Serving Frontend with the Backend
cd ./backend cd ./backend
pip install -r requirements.txt pip install -r requirements.txt -U
sh start.sh sh start.sh
``` ```

View file

@ -8,9 +8,12 @@ from passlib.context import CryptContext
from datetime import datetime, timedelta from datetime import datetime, timedelta
import requests import requests
import jwt import jwt
import logging
import config import config
logging.getLogger("passlib").setLevel(logging.ERROR)
JWT_SECRET_KEY = config.WEBUI_JWT_SECRET_KEY JWT_SECRET_KEY = config.WEBUI_JWT_SECRET_KEY
ALGORITHM = "HS256" ALGORITHM = "HS256"
@ -23,16 +26,16 @@ pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
def verify_password(plain_password, hashed_password): def verify_password(plain_password, hashed_password):
return (pwd_context.verify(plain_password, hashed_password) return (
if hashed_password else None) pwd_context.verify(plain_password, hashed_password) if hashed_password else None
)
def get_password_hash(password): def get_password_hash(password):
return pwd_context.hash(password) return pwd_context.hash(password)
def create_token(data: dict, def create_token(data: dict, expires_delta: Union[timedelta, None] = None) -> str:
expires_delta: Union[timedelta, None] = None) -> str:
payload = data.copy() payload = data.copy()
if expires_delta: if expires_delta:
@ -45,9 +48,7 @@ def create_token(data: dict,
def decode_token(token: str) -> Optional[dict]: def decode_token(token: str) -> Optional[dict]:
try: try:
decoded = jwt.decode(token, decoded = jwt.decode(token, JWT_SECRET_KEY, options={"verify_signature": False})
JWT_SECRET_KEY,
options={"verify_signature": False})
return decoded return decoded
except Exception as e: except Exception as e:
return None return None
@ -57,8 +58,7 @@ 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( def get_current_user(auth_token: HTTPAuthorizationCredentials = Depends(HTTPBearer())):
HTTPBearer())):
data = decode_token(auth_token.credentials) data = decode_token(auth_token.credentials)
if data != None and "email" in data: if data != None and "email" in data:
user = Users.get_user_by_email(data["email"]) user = Users.get_user_by_email(data["email"])

View file

@ -144,7 +144,7 @@ export const generateTitle = async (token: string = '', model: string, prompt: s
}, },
body: JSON.stringify({ body: JSON.stringify({
model: model, 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 stream: false
}) })
}) })