Skip to content

Commit a73e0b1

Browse files
committed
refactor: replace logging with maxkb_logger for consistent logging across modules
1 parent 6724f6e commit a73e0b1

File tree

21 files changed

+60
-49
lines changed

21 files changed

+60
-49
lines changed

apps/application/chat_pipeline/step/chat_step/impl/base_chat_step.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
from application.chat_pipeline.step.chat_step.i_chat_step import IChatStep, PostResponseHandler
2727
from application.flow.tools import Reasoning
2828
from application.models import ApplicationChatUserStats, ChatUserType
29+
from common.utils.logger import maxkb_logger
2930
from models_provider.tools import get_model_instance_by_model_workspace_id
3031

3132

@@ -135,7 +136,7 @@ def event_content(response,
135136
'node_type': 'ai-chat-node'})
136137
add_access_num(client_id, client_type, manage.context.get('application_id'))
137138
except Exception as e:
138-
logging.getLogger("max_kb_error").error(f'{str(e)}:{traceback.format_exc()}')
139+
maxkb_logger.error(f'{str(e)}:{traceback.format_exc()}')
139140
all_text = 'Exception:' + str(e)
140141
write_context(step, manage, 0, 0, all_text)
141142
post_response_handler.handler(chat_id, chat_record_id, paragraph_list, problem_text,

apps/common/event/listener_manage.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from common.db.search import native_search, get_dynamics_model, native_update
2222
from common.utils.common import get_file_content
2323
from common.utils.lock import try_lock, un_lock
24-
from common.utils.logger import maxkb_logger, maxkb_error_logger
24+
from common.utils.logger import maxkb_logger
2525
from common.utils.page_utils import page_desc
2626
from knowledge.models import Paragraph, Status, Document, ProblemParagraphMapping, TaskType, State,SourceType, SearchMode
2727
from maxkb.conf import (PROJECT_DIR)
@@ -86,7 +86,7 @@ def embedding_by_paragraph_list(paragraph_id_list, embedding_model: Embeddings):
8686
ListenerManagement.embedding_by_paragraph_data_list(data_list, paragraph_id_list=paragraph_id_list,
8787
embedding_model=embedding_model)
8888
except Exception as e:
89-
maxkb_error_logger.error(_('Query vector data: {paragraph_id_list} error {error} {traceback}').format(
89+
maxkb_logger.error(_('Query vector data: {paragraph_id_list} error {error} {traceback}').format(
9090
paragraph_id_list=paragraph_id_list, error=str(e), traceback=traceback.format_exc()))
9191

9292
@staticmethod
@@ -103,7 +103,7 @@ def is_save_function():
103103
# 批量向量化
104104
VectorStore.get_embedding_vector().batch_save(data_list, embedding_model, is_save_function)
105105
except Exception as e:
106-
maxkb_error_logger.error(_('Vectorized paragraph: {paragraph_id_list} error {error} {traceback}').format(
106+
maxkb_logger.error(_('Vectorized paragraph: {paragraph_id_list} error {error} {traceback}').format(
107107
paragraph_id_list=paragraph_id_list, error=str(e), traceback=traceback.format_exc()))
108108
status = Status.error
109109
finally:
@@ -143,7 +143,7 @@ def is_the_task_interrupted():
143143
ListenerManagement.update_status(QuerySet(Paragraph).filter(id=paragraph_id), TaskType.EMBEDDING,
144144
State.SUCCESS)
145145
except Exception as e:
146-
maxkb_error_logger.error(_('Vectorized paragraph: {paragraph_id} error {error} {traceback}').format(
146+
maxkb_logger.error(_('Vectorized paragraph: {paragraph_id} error {error} {traceback}').format(
147147
paragraph_id=paragraph_id, error=str(e), traceback=traceback.format_exc()))
148148
ListenerManagement.update_status(QuerySet(Paragraph).filter(id=paragraph_id), TaskType.EMBEDDING,
149149
State.FAILURE)
@@ -284,7 +284,7 @@ def is_the_task_interrupted():
284284
document_id)),
285285
is_the_task_interrupted)
286286
except Exception as e:
287-
maxkb_error_logger.error(_('Vectorized document: {document_id} error {error} {traceback}').format(
287+
maxkb_logger.error(_('Vectorized document: {document_id} error {error} {traceback}').format(
288288
document_id=document_id, error=str(e), traceback=traceback.format_exc()))
289289
finally:
290290
ListenerManagement.post_update_document_status(document_id, TaskType.EMBEDDING)
@@ -308,7 +308,7 @@ def embedding_by_knowledge(knowledge_id, embedding_model: Embeddings):
308308
for document in document_list:
309309
ListenerManagement.embedding_by_document(document.id, embedding_model=embedding_model)
310310
except Exception as e:
311-
maxkb_error_logger.error(_('Vectorized knowledge: {knowledge_id} error {error} {traceback}').format(
311+
maxkb_logger.error(_('Vectorized knowledge: {knowledge_id} error {error} {traceback}').format(
312312
knowledge_id=knowledge_id, error=str(e), traceback=traceback.format_exc()))
313313
finally:
314314
maxkb_logger.info(_('End--->Embedding knowledge: {knowledge_id}').format(knowledge_id=knowledge_id))

apps/common/exception/handle_exception.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
from django.utils.translation import gettext_lazy as _
1919

20+
from common.utils.logger import maxkb_logger
21+
2022

2123
def to_result(key, args, parent_key=None):
2224
"""
@@ -96,6 +98,6 @@ def handle_exception(exc, context):
9698
if issubclass(exception_class, APIException):
9799
return result.error(exc.detail)
98100
if response is None:
99-
logging.getLogger("max_kb_error").error(f'{str(exc)}:{traceback.format_exc()}')
101+
maxkb_logger.error(f'{str(exc)}:{traceback.format_exc()}')
100102
return result.error(str(exc))
101103
return response

apps/common/handle/handle_exception.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
from django.utils.translation import gettext_lazy as _
1818

1919
from common.result import result
20+
from common.utils.logger import maxkb_logger
2021

2122

2223
def to_result(key, args, parent_key=None):
@@ -89,6 +90,6 @@ def handle_exception(exc, context):
8990
if issubclass(exception_class, APIException):
9091
return result.error(exc.detail)
9192
if response is None:
92-
logging.getLogger("max_kb_error").error(f'{str(exc)}:{traceback.format_exc()}')
93+
maxkb_logger.error(f'{str(exc)}:{traceback.format_exc()}')
9394
return result.error(str(exc))
9495
return response

apps/common/handle/impl/common_handle.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
from openpyxl.xml.constants import SHEET_DRAWING_NS, REL_NS, SHEET_MAIN_NS
2222

2323
from common.handle.base_parse_qa_handle import get_title_row_index_dict, get_row_value
24+
from common.utils.logger import maxkb_logger
2425
from knowledge.models import File
2526

2627

@@ -75,7 +76,7 @@ def handle_images(deps, archive: ZipFile) -> []:
7576
image_io = archive.read(dep.target)
7677
image = openpyxl_Image(BytesIO(image_io))
7778
except Exception as e:
78-
logging.getLogger("max_kb_error").error(f"Error reading image {dep.target}: {e}")
79+
maxkb_logger.error(f"Error reading image {dep.target}: {e}")
7980
continue
8081
image.embed = dep.id # 文件rId
8182
image.target = dep.target # 文件地址

apps/common/handle/impl/table/csv_parse_table_handle.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from charset_normalizer import detect
55

66
from common.handle.base_parse_table_handle import BaseParseTableHandle
7-
from common.utils.logger import maxkb_logger, maxkb_error_logger
7+
from common.utils.logger import maxkb_logger
88

99

1010
class CsvParseTableHandle(BaseParseTableHandle):
@@ -39,5 +39,5 @@ def get_content(self, file, save_image):
3939
try:
4040
return buffer.decode(detect(buffer)['encoding'])
4141
except BaseException as e:
42-
maxkb_error_logger.error(f'csv split handle error: {e}')
42+
maxkb_logger.error(f'csv split handle error: {e}')
4343
return f'error: {e}'

apps/common/handle/impl/table/xls_parse_table_handle.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import xlrd
55

66
from common.handle.base_parse_table_handle import BaseParseTableHandle
7-
from common.utils.logger import maxkb_error_logger
7+
from common.utils.logger import maxkb_logger
88

99

1010
class XlsParseTableHandle(BaseParseTableHandle):
@@ -55,7 +55,7 @@ def handle(self, file, get_buffer, save_image):
5555
result.append({'name': sheet.name, 'paragraphs': paragraphs})
5656

5757
except BaseException as e:
58-
maxkb_error_logger.error(f'excel split handle error: {e}')
58+
maxkb_logger.error(f'excel split handle error: {e}')
5959
return [{'name': file.name, 'paragraphs': []}]
6060
return result
6161

apps/common/handle/impl/table/xlsx_parse_table_handle.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from common.handle.base_parse_table_handle import BaseParseTableHandle
88
from common.handle.impl.common_handle import xlsx_embed_cells_images
9-
from common.utils.logger import maxkb_error_logger
9+
from common.utils.logger import maxkb_logger
1010

1111

1212
class XlsxParseTableHandle(BaseParseTableHandle):
@@ -73,7 +73,7 @@ def handle(self, file, get_buffer, save_image):
7373
result.append({'name': sheetname, 'paragraphs': paragraphs})
7474

7575
except BaseException as e:
76-
maxkb_error_logger.error(f'excel split handle error: {e}')
76+
maxkb_logger.error(f'excel split handle error: {e}')
7777
return [{'name': file.name, 'paragraphs': []}]
7878
return result
7979

@@ -86,7 +86,7 @@ def get_content(self, file, save_image):
8686
if len(image_dict) > 0:
8787
save_image(image_dict.values())
8888
except Exception as e:
89-
maxkb_error_logger.error(f'Exception: {e}')
89+
maxkb_logger.error(f'Exception: {e}')
9090
image_dict = {}
9191
md_tables = ''
9292
# 如果未指定 sheet_name,则使用第一个工作表

apps/common/handle/impl/text/doc_split_handle.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
from docx.text.paragraph import Paragraph
2222

2323
from common.handle.base_split_handle import BaseSplitHandle
24+
from common.utils.logger import maxkb_logger
2425
from common.utils.split_model import SplitModel
2526
from knowledge.models import File
2627

@@ -79,7 +80,7 @@ def get_paragraph_element_txt(paragraph_element, doc: Document, images_list, get
7980
return paragraph_element.text
8081
return ""
8182
except Exception as e:
82-
logging.getLogger("max_kb_error").error(f'Error getting paragraph element text: {e}')
83+
maxkb_logger.error(f'Error getting paragraph element text: {e}')
8384
return ""
8485

8586

apps/common/handle/impl/text/pdf_split_handle.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from langchain_community.document_loaders import PyPDFLoader
2020

2121
from common.handle.base_split_handle import BaseSplitHandle
22-
from common.utils.logger import maxkb_error_logger, maxkb_logger
22+
from common.utils.logger import maxkb_logger
2323
from common.utils.split_model import SplitModel
2424

2525
default_pattern_list = [re.compile('(?<=^)# .*|(?<=\\n)# .*'),
@@ -72,7 +72,7 @@ def handle(self, file, pattern_list: List, with_filter: bool, limit: int, get_bu
7272
else:
7373
split_model = SplitModel(default_pattern_list, with_filter=with_filter, limit=limit)
7474
except BaseException as e:
75-
maxkb_error_logger.error(f"File: {file.name}, error: {e}")
75+
maxkb_logger.error(f"File: {file.name}, error: {e}")
7676
return {'name': file.name,
7777
'content': []}
7878
finally:
@@ -109,7 +109,7 @@ def handle_pdf_content(file, pdf_document):
109109
raise e
110110
except BaseException as e:
111111
# 当页出错继续进行下一页,防止一个页面出错导致整个文件解析失败
112-
maxkb_error_logger.error(f"File: {file.name}, Page: {page_num + 1}, error: {e}")
112+
maxkb_logger.error(f"File: {file.name}, Page: {page_num + 1}, error: {e}")
113113
continue
114114
finally:
115115
os.remove(page_num_pdf)
@@ -278,7 +278,7 @@ def handle_links(doc, pattern_list, with_filter, limit):
278278
pre_toc[i]['content'] = re.sub(r'(?<!。)\n+', '', pre_toc[i]['content'])
279279
pre_toc[i]['content'] = re.sub(r'(?<!.)\n+', '', pre_toc[i]['content'])
280280
except BaseException as e:
281-
maxkb_error_logger.error(_('This document has no preface and is treated as ordinary text: {e}').format(e=e))
281+
maxkb_logger.error(_('This document has no preface and is treated as ordinary text: {e}').format(e=e))
282282
if pattern_list is not None and len(pattern_list) > 0:
283283
split_model = SplitModel(pattern_list, with_filter, limit)
284284
else:

0 commit comments

Comments
 (0)