forked from open-webui/open-webui
		
	Migrate to python logging module with env var control.
This commit is contained in:
		
							parent
							
								
									d865b9fe59
								
							
						
					
					
						commit
						e6dd0bfbe0
					
				
					 15 changed files with 174 additions and 82 deletions
				
			
		|  | @ -2,6 +2,7 @@ from pydantic import BaseModel | |||
| from typing import List, Union, Optional | ||||
| import time | ||||
| import uuid | ||||
| import logging | ||||
| from peewee import * | ||||
| 
 | ||||
| from apps.web.models.users import UserModel, Users | ||||
|  | @ -9,6 +10,10 @@ from utils.utils import verify_password | |||
| 
 | ||||
| from apps.web.internal.db import DB | ||||
| 
 | ||||
| from config import SRC_LOG_LEVELS | ||||
| log = logging.getLogger(__name__) | ||||
| log.setLevel(SRC_LOG_LEVELS["MODELS"]) | ||||
| 
 | ||||
| #################### | ||||
| # DB MODEL | ||||
| #################### | ||||
|  | @ -86,7 +91,7 @@ class AuthsTable: | |||
|     def insert_new_auth( | ||||
|         self, email: str, password: str, name: str, role: str = "pending" | ||||
|     ) -> Optional[UserModel]: | ||||
|         print("insert_new_auth") | ||||
|         log.info("insert_new_auth") | ||||
| 
 | ||||
|         id = str(uuid.uuid4()) | ||||
| 
 | ||||
|  | @ -103,7 +108,7 @@ class AuthsTable: | |||
|             return None | ||||
| 
 | ||||
|     def authenticate_user(self, email: str, password: str) -> Optional[UserModel]: | ||||
|         print("authenticate_user", email) | ||||
|         log.info(f"authenticate_user: {email}") | ||||
|         try: | ||||
|             auth = Auth.get(Auth.email == email, Auth.active == True) | ||||
|             if auth: | ||||
|  |  | |||
|  | @ -3,6 +3,7 @@ from peewee import * | |||
| from playhouse.shortcuts import model_to_dict | ||||
| from typing import List, Union, Optional | ||||
| import time | ||||
| import logging | ||||
| 
 | ||||
| from utils.utils import decode_token | ||||
| from utils.misc import get_gravatar_url | ||||
|  | @ -11,6 +12,10 @@ from apps.web.internal.db import DB | |||
| 
 | ||||
| import json | ||||
| 
 | ||||
| from config import SRC_LOG_LEVELS | ||||
| log = logging.getLogger(__name__) | ||||
| log.setLevel(SRC_LOG_LEVELS["MODELS"]) | ||||
| 
 | ||||
| #################### | ||||
| # Documents DB Schema | ||||
| #################### | ||||
|  | @ -118,7 +123,7 @@ class DocumentsTable: | |||
|             doc = Document.get(Document.name == form_data.name) | ||||
|             return DocumentModel(**model_to_dict(doc)) | ||||
|         except Exception as e: | ||||
|             print(e) | ||||
|             log.exception(e) | ||||
|             return None | ||||
| 
 | ||||
|     def update_doc_content_by_name( | ||||
|  | @ -138,7 +143,7 @@ class DocumentsTable: | |||
|             doc = Document.get(Document.name == name) | ||||
|             return DocumentModel(**model_to_dict(doc)) | ||||
|         except Exception as e: | ||||
|             print(e) | ||||
|             log.exception(e) | ||||
|             return None | ||||
| 
 | ||||
|     def delete_doc_by_name(self, name: str) -> bool: | ||||
|  |  | |||
|  | @ -6,9 +6,14 @@ from playhouse.shortcuts import model_to_dict | |||
| import json | ||||
| import uuid | ||||
| import time | ||||
| import logging | ||||
| 
 | ||||
| from apps.web.internal.db import DB | ||||
| 
 | ||||
| from config import SRC_LOG_LEVELS | ||||
| log = logging.getLogger(__name__) | ||||
| log.setLevel(SRC_LOG_LEVELS["MODELS"]) | ||||
| 
 | ||||
| #################### | ||||
| # Tag DB Schema | ||||
| #################### | ||||
|  | @ -173,7 +178,7 @@ class TagTable: | |||
|                 (ChatIdTag.tag_name == tag_name) & (ChatIdTag.user_id == user_id) | ||||
|             ) | ||||
|             res = query.execute()  # Remove the rows, return number of rows removed. | ||||
|             print(res) | ||||
|             log.debug(f"res: {res}") | ||||
| 
 | ||||
|             tag_count = self.count_chat_ids_by_tag_name_and_user_id(tag_name, user_id) | ||||
|             if tag_count == 0: | ||||
|  | @ -185,7 +190,7 @@ class TagTable: | |||
| 
 | ||||
|             return True | ||||
|         except Exception as e: | ||||
|             print("delete_tag", e) | ||||
|             log.error(f"delete_tag: {e}") | ||||
|             return False | ||||
| 
 | ||||
|     def delete_tag_by_tag_name_and_chat_id_and_user_id( | ||||
|  | @ -198,7 +203,7 @@ class TagTable: | |||
|                 & (ChatIdTag.user_id == user_id) | ||||
|             ) | ||||
|             res = query.execute()  # Remove the rows, return number of rows removed. | ||||
|             print(res) | ||||
|             log.debug(f"res: {res}") | ||||
| 
 | ||||
|             tag_count = self.count_chat_ids_by_tag_name_and_user_id(tag_name, user_id) | ||||
|             if tag_count == 0: | ||||
|  | @ -210,7 +215,7 @@ class TagTable: | |||
| 
 | ||||
|             return True | ||||
|         except Exception as e: | ||||
|             print("delete_tag", e) | ||||
|             log.error(f"delete_tag: {e}") | ||||
|             return False | ||||
| 
 | ||||
|     def delete_tags_by_chat_id_and_user_id(self, chat_id: str, user_id: str) -> bool: | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Self Denial
						Self Denial