Merge branch 'refs/heads/dev' into feat/sqlalchemy-instead-of-peewee

# Conflicts: # backend/apps/webui/models/functions.py # backend/apps/webui/routers/chats.py
open-webui · tjbck · Jul 6, 2024 · Jun 18, 2024 · Jun 21, 2024 · Jun 24, 2024
commit df47c496d3d723ea873a3b881e715feb462f398b
diff --git a/backend/apps/webui/models/functions.py b/backend/apps/webui/models/functions.py
@@ -33,6 33,7 @@ class Function(Base):
  meta = Column(JSONField)
  valves = Column(JSONField)
  is_active = Column(Boolean)
  is_global = Column(Boolean)
  updated_at = Column(BigInteger)
  created_at = Column(BigInteger)
 

diff --git a/backend/apps/webui/routers/chats.py b/backend/apps/webui/routers/chats.py
@@ -1,8 1,7 @@
 from fastapi import Depends, Request, HTTPException, status
 from datetime import datetime, timedelta
 from typing import List, Union, Optional
-
-from utils.utils import get_current_user, get_admin_user
 from utils.utils import get_verified_user, get_admin_user
 from fastapi import APIRouter
 from pydantic import BaseModel
 import json
@@ -123,7 122,7 @@ async def get_user_chats(user=Depends(get_verified_user)):
 
 
 @router.get("/all/archived", response_model=List[ChatResponse])
-async def get_user_archived_chats(user=Depends(get_current_user)):
 async def get_user_archived_chats(user=Depends(get_verified_user)):
  return [
  ChatResponse(**{**chat.model_dump(), "chat": json.loads(chat.chat)})
  for chat in Chats.get_archived_chats_by_user_id(user.id)
@@ -454,9 453,7 @@ async def add_chat_tag_by_id(
 
 @router.delete("/{id}/tags", response_model=Optional[bool])
 async def delete_chat_tag_by_id(
- id: str,
- form_data: ChatIdTagForm,
- user=Depends(get_current_user),
  id: str, form_data: ChatIdTagForm, user=Depends(get_verified_user)
 ):
  result = Tags.delete_tag_by_tag_name_and_chat_id_and_user_id(
  form_data.tag_name, id, user.id