forked from open-webui/open-webui
		
	chore: 🚨 lint and format
This commit is contained in:
		
							parent
							
								
									037793161e
								
							
						
					
					
						commit
						07cc7f15d5
					
				
					 25 changed files with 190 additions and 180 deletions
				
			
		|  | @ -4,7 +4,6 @@ import time | |||
| import uuid | ||||
| from peewee import * | ||||
| 
 | ||||
| 
 | ||||
| from apps.web.models.users import UserModel, Users | ||||
| from utils.utils import ( | ||||
|     verify_password, | ||||
|  | @ -76,20 +75,26 @@ class SignupForm(BaseModel): | |||
| 
 | ||||
| 
 | ||||
| class AuthsTable: | ||||
| 
 | ||||
|     def __init__(self, db): | ||||
|         self.db = db | ||||
|         self.db.create_tables([Auth]) | ||||
| 
 | ||||
|     def insert_new_auth( | ||||
|         self, email: str, password: str, name: str, role: str = "pending" | ||||
|     ) -> Optional[UserModel]: | ||||
|     def insert_new_auth(self, | ||||
|                         email: str, | ||||
|                         password: str, | ||||
|                         name: str, | ||||
|                         role: str = "pending") -> Optional[UserModel]: | ||||
|         print("insert_new_auth") | ||||
| 
 | ||||
|         id = str(uuid.uuid4()) | ||||
| 
 | ||||
|         auth = AuthModel( | ||||
|             **{"id": id, "email": email, "password": password, "active": True} | ||||
|         ) | ||||
|         auth = AuthModel(**{ | ||||
|             "id": id, | ||||
|             "email": email, | ||||
|             "password": password, | ||||
|             "active": True | ||||
|         }) | ||||
|         result = Auth.create(**auth.model_dump()) | ||||
| 
 | ||||
|         user = Users.insert_new_user(id, name, email, role) | ||||
|  | @ -99,7 +104,8 @@ class AuthsTable: | |||
|         else: | ||||
|             return None | ||||
| 
 | ||||
|     def authenticate_user(self, email: str, password: str) -> Optional[UserModel]: | ||||
|     def authenticate_user(self, email: str, | ||||
|                           password: str) -> Optional[UserModel]: | ||||
|         print("authenticate_user", email) | ||||
|         try: | ||||
|             auth = Auth.get(Auth.email == email, Auth.active == True) | ||||
|  | @ -131,7 +137,8 @@ class AuthsTable: | |||
|             if result: | ||||
|                 # Delete Auth | ||||
|                 query = Auth.delete().where(Auth.id == id) | ||||
|                 query.execute()  # Remove the rows, return number of rows removed. | ||||
|                 query.execute( | ||||
|                 )  # Remove the rows, return number of rows removed. | ||||
| 
 | ||||
|                 return True | ||||
|             else: | ||||
|  |  | |||
|  | @ -3,14 +3,12 @@ from typing import List, Union, Optional | |||
| from peewee import * | ||||
| from playhouse.shortcuts import model_to_dict | ||||
| 
 | ||||
| 
 | ||||
| import json | ||||
| import uuid | ||||
| import time | ||||
| 
 | ||||
| from apps.web.internal.db import DB | ||||
| 
 | ||||
| 
 | ||||
| #################### | ||||
| # Chat DB Schema | ||||
| #################### | ||||
|  | @ -62,23 +60,23 @@ class ChatTitleIdResponse(BaseModel): | |||
| 
 | ||||
| 
 | ||||
| class ChatTable: | ||||
| 
 | ||||
|     def __init__(self, db): | ||||
|         self.db = db | ||||
|         db.create_tables([Chat]) | ||||
| 
 | ||||
|     def insert_new_chat(self, user_id: str, form_data: ChatForm) -> Optional[ChatModel]: | ||||
|     def insert_new_chat(self, user_id: str, | ||||
|                         form_data: ChatForm) -> Optional[ChatModel]: | ||||
|         id = str(uuid.uuid4()) | ||||
|         chat = ChatModel( | ||||
|             **{ | ||||
|                 "id": id, | ||||
|                 "user_id": user_id, | ||||
|                 "title": form_data.chat["title"] | ||||
|                 if "title" in form_data.chat | ||||
|                 else "New Chat", | ||||
|                 "title": form_data.chat["title"] if "title" in | ||||
|                 form_data.chat else "New Chat", | ||||
|                 "chat": json.dumps(form_data.chat), | ||||
|                 "timestamp": int(time.time()), | ||||
|             } | ||||
|         ) | ||||
|             }) | ||||
| 
 | ||||
|         result = Chat.create(**chat.model_dump()) | ||||
|         return chat if result else None | ||||
|  | @ -111,27 +109,25 @@ class ChatTable: | |||
|         except: | ||||
|             return None | ||||
| 
 | ||||
|     def get_chat_lists_by_user_id( | ||||
|         self, user_id: str, skip: int = 0, limit: int = 50 | ||||
|     ) -> List[ChatModel]: | ||||
|     def get_chat_lists_by_user_id(self, | ||||
|                                   user_id: str, | ||||
|                                   skip: int = 0, | ||||
|                                   limit: int = 50) -> List[ChatModel]: | ||||
|         return [ | ||||
|             ChatModel(**model_to_dict(chat)) | ||||
|             for chat in Chat.select() | ||||
|             .where(Chat.user_id == user_id) | ||||
|             .order_by(Chat.timestamp.desc()) | ||||
|             ChatModel(**model_to_dict(chat)) for chat in Chat.select().where( | ||||
|                 Chat.user_id == user_id).order_by(Chat.timestamp.desc()) | ||||
|             # .limit(limit) | ||||
|             # .offset(skip) | ||||
|         ] | ||||
| 
 | ||||
|     def get_all_chats_by_user_id(self, user_id: str) -> List[ChatModel]: | ||||
|         return [ | ||||
|             ChatModel(**model_to_dict(chat)) | ||||
|             for chat in Chat.select() | ||||
|             .where(Chat.user_id == user_id) | ||||
|             .order_by(Chat.timestamp.desc()) | ||||
|             ChatModel(**model_to_dict(chat)) for chat in Chat.select().where( | ||||
|                 Chat.user_id == user_id).order_by(Chat.timestamp.desc()) | ||||
|         ] | ||||
| 
 | ||||
|     def get_chat_by_id_and_user_id(self, id: str, user_id: str) -> Optional[ChatModel]: | ||||
|     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) | ||||
|             return ChatModel(**model_to_dict(chat)) | ||||
|  | @ -146,7 +142,8 @@ class ChatTable: | |||
| 
 | ||||
|     def delete_chat_by_id_and_user_id(self, id: str, user_id: str) -> bool: | ||||
|         try: | ||||
|             query = Chat.delete().where((Chat.id == id) & (Chat.user_id == user_id)) | ||||
|             query = Chat.delete().where((Chat.id == id) | ||||
|                                         & (Chat.user_id == user_id)) | ||||
|             query.execute()  # Remove the rows, return number of rows removed. | ||||
| 
 | ||||
|             return True | ||||
|  |  | |||
|  | @ -58,13 +58,14 @@ class ModelfileResponse(BaseModel): | |||
| 
 | ||||
| 
 | ||||
| class ModelfilesTable: | ||||
| 
 | ||||
|     def __init__(self, db): | ||||
|         self.db = db | ||||
|         self.db.create_tables([Modelfile]) | ||||
| 
 | ||||
|     def insert_new_modelfile( | ||||
|         self, user_id: str, form_data: ModelfileForm | ||||
|     ) -> Optional[ModelfileModel]: | ||||
|             self, user_id: str, | ||||
|             form_data: ModelfileForm) -> Optional[ModelfileModel]: | ||||
|         if "tagName" in form_data.modelfile: | ||||
|             modelfile = ModelfileModel( | ||||
|                 **{ | ||||
|  | @ -72,8 +73,7 @@ class ModelfilesTable: | |||
|                     "tag_name": form_data.modelfile["tagName"], | ||||
|                     "modelfile": json.dumps(form_data.modelfile), | ||||
|                     "timestamp": int(time.time()), | ||||
|                 } | ||||
|             ) | ||||
|                 }) | ||||
| 
 | ||||
|             try: | ||||
|                 result = Modelfile.create(**modelfile.model_dump()) | ||||
|  | @ -87,28 +87,29 @@ class ModelfilesTable: | |||
|         else: | ||||
|             return None | ||||
| 
 | ||||
|     def get_modelfile_by_tag_name(self, tag_name: str) -> Optional[ModelfileModel]: | ||||
|     def get_modelfile_by_tag_name(self, | ||||
|                                   tag_name: str) -> Optional[ModelfileModel]: | ||||
|         try: | ||||
|             modelfile = Modelfile.get(Modelfile.tag_name == tag_name) | ||||
|             return ModelfileModel(**model_to_dict(modelfile)) | ||||
|         except: | ||||
|             return None | ||||
| 
 | ||||
|     def get_modelfiles(self, skip: int = 0, limit: int = 50) -> List[ModelfileResponse]: | ||||
|     def get_modelfiles(self, | ||||
|                        skip: int = 0, | ||||
|                        limit: int = 50) -> List[ModelfileResponse]: | ||||
|         return [ | ||||
|             ModelfileResponse( | ||||
|                 **{ | ||||
|                     **model_to_dict(modelfile), | ||||
|                     "modelfile": json.loads(modelfile.modelfile), | ||||
|                 } | ||||
|             ) | ||||
|             for modelfile in Modelfile.select() | ||||
|                     "modelfile": | ||||
|                     json.loads(modelfile.modelfile), | ||||
|                 }) for modelfile in Modelfile.select() | ||||
|             # .limit(limit).offset(skip) | ||||
|         ] | ||||
| 
 | ||||
|     def update_modelfile_by_tag_name( | ||||
|         self, tag_name: str, modelfile: dict | ||||
|     ) -> Optional[ModelfileModel]: | ||||
|             self, tag_name: str, modelfile: dict) -> Optional[ModelfileModel]: | ||||
|         try: | ||||
|             query = Modelfile.update( | ||||
|                 modelfile=json.dumps(modelfile), | ||||
|  |  | |||
|  | @ -47,13 +47,13 @@ class PromptForm(BaseModel): | |||
| 
 | ||||
| 
 | ||||
| class PromptsTable: | ||||
| 
 | ||||
|     def __init__(self, db): | ||||
|         self.db = db | ||||
|         self.db.create_tables([Prompt]) | ||||
| 
 | ||||
|     def insert_new_prompt( | ||||
|         self, user_id: str, form_data: PromptForm | ||||
|     ) -> Optional[PromptModel]: | ||||
|     def insert_new_prompt(self, user_id: str, | ||||
|                           form_data: PromptForm) -> Optional[PromptModel]: | ||||
|         prompt = PromptModel( | ||||
|             **{ | ||||
|                 "user_id": user_id, | ||||
|  | @ -61,8 +61,7 @@ class PromptsTable: | |||
|                 "title": form_data.title, | ||||
|                 "content": form_data.content, | ||||
|                 "timestamp": int(time.time()), | ||||
|             } | ||||
|         ) | ||||
|             }) | ||||
| 
 | ||||
|         try: | ||||
|             result = Prompt.create(**prompt.model_dump()) | ||||
|  | @ -82,14 +81,13 @@ class PromptsTable: | |||
| 
 | ||||
|     def get_prompts(self) -> List[PromptModel]: | ||||
|         return [ | ||||
|             PromptModel(**model_to_dict(prompt)) | ||||
|             for prompt in Prompt.select() | ||||
|             PromptModel(**model_to_dict(prompt)) for prompt in Prompt.select() | ||||
|             # .limit(limit).offset(skip) | ||||
|         ] | ||||
| 
 | ||||
|     def update_prompt_by_command( | ||||
|         self, command: str, form_data: PromptForm | ||||
|     ) -> Optional[PromptModel]: | ||||
|             self, command: str, | ||||
|             form_data: PromptForm) -> Optional[PromptModel]: | ||||
|         try: | ||||
|             query = Prompt.update( | ||||
|                 title=form_data.title, | ||||
|  |  | |||
|  | @ -8,7 +8,6 @@ from utils.misc import get_gravatar_url | |||
| from apps.web.internal.db import DB | ||||
| from apps.web.models.chats import Chats | ||||
| 
 | ||||
| 
 | ||||
| #################### | ||||
| # User DB Schema | ||||
| #################### | ||||
|  | @ -46,13 +45,16 @@ class UserRoleUpdateForm(BaseModel): | |||
| 
 | ||||
| 
 | ||||
| class UsersTable: | ||||
| 
 | ||||
|     def __init__(self, db): | ||||
|         self.db = db | ||||
|         self.db.create_tables([User]) | ||||
| 
 | ||||
|     def insert_new_user( | ||||
|         self, id: str, name: str, email: str, role: str = "pending" | ||||
|     ) -> Optional[UserModel]: | ||||
|     def insert_new_user(self, | ||||
|                         id: str, | ||||
|                         name: str, | ||||
|                         email: str, | ||||
|                         role: str = "pending") -> Optional[UserModel]: | ||||
|         user = UserModel( | ||||
|             **{ | ||||
|                 "id": id, | ||||
|  | @ -61,8 +63,7 @@ class UsersTable: | |||
|                 "role": role, | ||||
|                 "profile_image_url": get_gravatar_url(email), | ||||
|                 "timestamp": int(time.time()), | ||||
|             } | ||||
|         ) | ||||
|             }) | ||||
|         result = User.create(**user.model_dump()) | ||||
|         if result: | ||||
|             return user | ||||
|  | @ -92,7 +93,8 @@ class UsersTable: | |||
|     def get_num_users(self) -> Optional[int]: | ||||
|         return User.select().count() | ||||
| 
 | ||||
|     def update_user_role_by_id(self, id: str, role: str) -> Optional[UserModel]: | ||||
|     def update_user_role_by_id(self, id: str, | ||||
|                                role: str) -> Optional[UserModel]: | ||||
|         try: | ||||
|             query = User.update(role=role).where(User.id == id) | ||||
|             query.execute() | ||||
|  | @ -110,7 +112,8 @@ class UsersTable: | |||
|             if result: | ||||
|                 # Delete User | ||||
|                 query = User.delete().where(User.id == id) | ||||
|                 query.execute()  # Remove the rows, return number of rows removed. | ||||
|                 query.execute( | ||||
|                 )  # Remove the rows, return number of rows removed. | ||||
| 
 | ||||
|                 return True | ||||
|             else: | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 ThatOneCalculator
						ThatOneCalculator