forked from open-webui/open-webui
		
	Merge branch 'dev' into feature/support_auth_by_api_key
This commit is contained in:
		
						commit
						56369fea3a
					
				
					 35 changed files with 1231 additions and 325 deletions
				
			
		|  | @ -139,6 +139,14 @@ class AuthsTable: | |||
|                 return user | ||||
|             else: | ||||
|                 return None | ||||
| 
 | ||||
|     def authenticate_user_by_trusted_header(self, email: str) -> Optional[UserModel]: | ||||
|         log.info(f"authenticate_user_by_trusted_header: {email}") | ||||
|         try: | ||||
|             auth = Auth.get(Auth.email == email, Auth.active == True) | ||||
|             if auth: | ||||
|                 user = Users.get_user_by_id(auth.id) | ||||
|                 return user | ||||
|         except: | ||||
|             return None | ||||
| 
 | ||||
|  |  | |||
|  | @ -20,6 +20,7 @@ class Chat(Model): | |||
|     title = CharField() | ||||
|     chat = TextField()  # Save Chat JSON as Text | ||||
|     timestamp = DateField() | ||||
|     share_id = CharField(null=True, unique=True) | ||||
| 
 | ||||
|     class Meta: | ||||
|         database = DB | ||||
|  | @ -31,6 +32,7 @@ class ChatModel(BaseModel): | |||
|     title: str | ||||
|     chat: str | ||||
|     timestamp: int  # timestamp in epoch | ||||
|     share_id: Optional[str] = None | ||||
| 
 | ||||
| 
 | ||||
| #################### | ||||
|  | @ -52,6 +54,7 @@ class ChatResponse(BaseModel): | |||
|     title: str | ||||
|     chat: dict | ||||
|     timestamp: int  # timestamp in epoch | ||||
|     share_id: Optional[str] = None  # id of the chat to be shared | ||||
| 
 | ||||
| 
 | ||||
| class ChatTitleIdResponse(BaseModel): | ||||
|  | @ -95,6 +98,71 @@ class ChatTable: | |||
|         except: | ||||
|             return None | ||||
| 
 | ||||
|     def insert_shared_chat_by_chat_id(self, chat_id: str) -> Optional[ChatModel]: | ||||
|         # Get the existing chat to share | ||||
|         chat = Chat.get(Chat.id == chat_id) | ||||
|         # Check if the chat is already shared | ||||
|         if chat.share_id: | ||||
|             return self.get_chat_by_id_and_user_id(chat.share_id, "shared") | ||||
|         # Create a new chat with the same data, but with a new ID | ||||
|         shared_chat = ChatModel( | ||||
|             **{ | ||||
|                 "id": str(uuid.uuid4()), | ||||
|                 "user_id": f"shared-{chat_id}", | ||||
|                 "title": chat.title, | ||||
|                 "chat": chat.chat, | ||||
|                 "timestamp": int(time.time()), | ||||
|             } | ||||
|         ) | ||||
|         shared_result = Chat.create(**shared_chat.model_dump()) | ||||
|         # Update the original chat with the share_id | ||||
|         result = ( | ||||
|             Chat.update(share_id=shared_chat.id).where(Chat.id == chat_id).execute() | ||||
|         ) | ||||
| 
 | ||||
|         return shared_chat if (shared_result and result) else None | ||||
| 
 | ||||
|     def update_shared_chat_by_chat_id(self, chat_id: str) -> Optional[ChatModel]: | ||||
|         try: | ||||
|             print("update_shared_chat_by_id") | ||||
|             chat = Chat.get(Chat.id == chat_id) | ||||
|             print(chat) | ||||
| 
 | ||||
|             query = Chat.update( | ||||
|                 title=chat.title, | ||||
|                 chat=chat.chat, | ||||
|             ).where(Chat.id == chat.share_id) | ||||
| 
 | ||||
|             query.execute() | ||||
| 
 | ||||
|             chat = Chat.get(Chat.id == chat.share_id) | ||||
|             return ChatModel(**model_to_dict(chat)) | ||||
|         except: | ||||
|             return None | ||||
| 
 | ||||
|     def delete_shared_chat_by_chat_id(self, chat_id: str) -> bool: | ||||
|         try: | ||||
|             query = Chat.delete().where(Chat.user_id == f"shared-{chat_id}") | ||||
|             query.execute()  # Remove the rows, return number of rows removed. | ||||
| 
 | ||||
|             return True | ||||
|         except: | ||||
|             return False | ||||
| 
 | ||||
|     def update_chat_share_id_by_id( | ||||
|         self, id: str, share_id: Optional[str] | ||||
|     ) -> Optional[ChatModel]: | ||||
|         try: | ||||
|             query = Chat.update( | ||||
|                 share_id=share_id, | ||||
|             ).where(Chat.id == id) | ||||
|             query.execute() | ||||
| 
 | ||||
|             chat = Chat.get(Chat.id == id) | ||||
|             return ChatModel(**model_to_dict(chat)) | ||||
|         except: | ||||
|             return None | ||||
| 
 | ||||
|     def get_chat_lists_by_user_id( | ||||
|         self, user_id: str, skip: int = 0, limit: int = 50 | ||||
|     ) -> List[ChatModel]: | ||||
|  | @ -131,6 +199,13 @@ class ChatTable: | |||
|             .order_by(Chat.timestamp.desc()) | ||||
|         ] | ||||
| 
 | ||||
|     def get_chat_by_id(self, id: str) -> Optional[ChatModel]: | ||||
|         try: | ||||
|             chat = Chat.get(Chat.id == id) | ||||
|             return ChatModel(**model_to_dict(chat)) | ||||
|         except: | ||||
|             return None | ||||
| 
 | ||||
|     def get_chat_by_id_and_user_id(self, id: str, user_id: str) -> Optional[ChatModel]: | ||||
|         try: | ||||
|             chat = Chat.get(Chat.id == id, Chat.user_id == user_id) | ||||
|  | @ -149,12 +224,15 @@ class ChatTable: | |||
|             query = Chat.delete().where((Chat.id == id) & (Chat.user_id == user_id)) | ||||
|             query.execute()  # Remove the rows, return number of rows removed. | ||||
| 
 | ||||
|             return True | ||||
|             return True and self.delete_shared_chat_by_chat_id(id) | ||||
|         except: | ||||
|             return False | ||||
| 
 | ||||
|     def delete_chats_by_user_id(self, user_id: str) -> bool: | ||||
|         try: | ||||
| 
 | ||||
|             self.delete_shared_chats_by_user_id(user_id) | ||||
| 
 | ||||
|             query = Chat.delete().where(Chat.user_id == user_id) | ||||
|             query.execute()  # Remove the rows, return number of rows removed. | ||||
| 
 | ||||
|  | @ -162,5 +240,19 @@ class ChatTable: | |||
|         except: | ||||
|             return False | ||||
| 
 | ||||
|     def delete_shared_chats_by_user_id(self, user_id: str) -> bool: | ||||
|         try: | ||||
|             shared_chat_ids = [ | ||||
|                 f"shared-{chat.id}" | ||||
|                 for chat in Chat.select().where(Chat.user_id == user_id) | ||||
|             ] | ||||
| 
 | ||||
|             query = Chat.delete().where(Chat.user_id << shared_chat_ids) | ||||
|             query.execute()  # Remove the rows, return number of rows removed. | ||||
| 
 | ||||
|             return True | ||||
|         except: | ||||
|             return False | ||||
| 
 | ||||
| 
 | ||||
| Chats = ChatTable(DB) | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Timothy Jaeryang Baek
						Timothy Jaeryang Baek