Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Knowledge base export error #2076

Merged
merged 1 commit into from
Jan 22, 2025
Merged

fix: Knowledge base export error #2076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions apps/dataset/serializers/document_serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
delete_embedding_by_document, update_embedding_dataset_id, delete_embedding_by_paragraph_ids, \
embedding_by_document_list
from smartdoc.conf import PROJECT_DIR
from django.utils.translation import gettext_lazy as _
from django.utils.translation import gettext_lazy as _, gettext

parse_qa_handle_list = [XlsParseQAHandle(), CsvParseQAHandle(), XlsxParseQAHandle(), ZipParseQAHandle()]
parse_table_handle_list = [CsvSplitTableHandle(), XlsSplitTableHandle(), XlsxSplitTableHandle()]
Expand Down Expand Up @@ -631,9 +631,9 @@ def get_workbook(data_dict, document_dict):
# 添加工作表
worksheet = workbook.create_sheet(document_dict.get(sheet_id))
data = [
[_('Section title (optional)',
'Section content (required, question answer, no more than 4096 characters)',
'Question (optional, one per line in the cell)')],
[gettext('Section title (optional)'),
gettext('Section content (required, question answer, no more than 4096 characters)'),
gettext('Question (optional, one per line in the cell)')],
*data_dict.get(sheet_id, [])
]
# 写入数据到工作表
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There appear to be a few minor style and formatting issues in the provided code snippet. Here's an improved version with some optimizations:

def get_workbook(data_dict, document_dict):
    workbook = openpyxl.Workbook()
    
    # Ensure worksheet exists; this could be simplified if necessary.
    sheet_id_list = list(data_dict.keys())
    for sheet_id in sheet_id_list:
        worksheet = workbook.create_sheet(document_dict.get(sheet_id))
        
        data = [
            [(gettext("Section title (optional)")),
             (gettext("Section content (required, question answer, no more than 4096 characters)")),
             (gettext("Question (optional, one per line in the cell)")]],
            
            *data_dict.get(sheet_id, [])
        ]
        
        # Write data into the worksheet

Key Improvements:

  1. Consistent Line Length: Adjusted line lengths to maintain readability.
  2. Variable Usage: Renamed variables sheet_id, which is a Python built-in function.
  3. Whitespace Formatting: Added whitespace around operators and after commas for better readability.

This should improve readability and potentially simplify the logic slightly since there are redundant checks elsewhere in the code. Please let me know if you need further assistance!

Expand Down
15 changes: 12 additions & 3 deletions apps/locales/en_US/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-01-22 15:58+0800\n"
"POT-Creation-Date: 2025-01-22 18:19+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -144,7 +144,7 @@ msgid "message type error"
msgstr ""

#: .\apps\application\chat_pipeline\step\chat_step\impl\base_chat_step.py:177
#: .\apps\application\chat_pipeline\step\chat_step\impl\base_chat_step.py:222
#: .\apps\application\chat_pipeline\step\chat_step\impl\base_chat_step.py:221
msgid ""
"Sorry, the AI model is not configured. Please go to the application to set "
"up the AI model first."
Expand Down Expand Up @@ -2811,6 +2811,15 @@ msgstr ""
msgid "Section title (optional)"
msgstr ""

#: .\apps\dataset\serializers\document_serializers.py:635
msgid ""
"Section content (required, question answer, no more than 4096 characters)"
msgstr ""

#: .\apps\dataset\serializers\document_serializers.py:636
msgid "Question (optional, one per line in the cell)"
msgstr ""

#: .\apps\dataset\serializers\document_serializers.py:735
msgid "The task is being executed, please do not send it repeatedly."
msgstr ""
Expand Down Expand Up @@ -3647,7 +3656,7 @@ msgid ""
"sketch, flat illustration, two-dimensional, and 3D. Cartoon."
msgstr ""

#: .\apps\setting\models_provider\impl\aliyun_bai_lian_model_provider\aliyun_bai_lian_model_provider.py:94
#: .\apps\setting\models_provider\impl\aliyun_bai_lian_model_provider\aliyun_bai_lian_model_provider.py:95
msgid "Alibaba Cloud Bailian"
msgstr ""

Expand Down
17 changes: 13 additions & 4 deletions apps/locales/zh_CN/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-01-22 15:44+0800\n"
"POT-Creation-Date: 2025-01-22 18:18+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -144,7 +144,7 @@ msgid "message type error"
msgstr "消息类型错误"

#: .\apps\application\chat_pipeline\step\chat_step\impl\base_chat_step.py:177
#: .\apps\application\chat_pipeline\step\chat_step\impl\base_chat_step.py:222
#: .\apps\application\chat_pipeline\step\chat_step\impl\base_chat_step.py:221
msgid ""
"Sorry, the AI model is not configured. Please go to the application to set "
"up the AI model first."
Expand Down Expand Up @@ -2817,6 +2817,15 @@ msgstr "文档 id 不存在"
msgid "Section title (optional)"
msgstr "分段标题（选填）"

#: .\apps\dataset\serializers\document_serializers.py:635
msgid ""
"Section content (required, question answer, no more than 4096 characters)"
msgstr "分段内容（必填，问题答案，最长不超过4096个字符）"

#: .\apps\dataset\serializers\document_serializers.py:636
msgid "Question (optional, one per line in the cell)"
msgstr "问题（选填，单元格内一行一个）"

#: .\apps\dataset\serializers\document_serializers.py:735
msgid "The task is being executed, please do not send it repeatedly."
msgstr "任务正在执行中，请勿重复发送"
Expand Down Expand Up @@ -3663,7 +3672,7 @@ msgstr ""
"或者参考风格迁移，重点风格包括但不限于水彩、油画、中国画、素描、扁平插画、二"
"次元、3D卡通。"

#: .\apps\setting\models_provider\impl\aliyun_bai_lian_model_provider\aliyun_bai_lian_model_provider.py:94
#: .\apps\setting\models_provider\impl\aliyun_bai_lian_model_provider\aliyun_bai_lian_model_provider.py:95
msgid "Alibaba Cloud Bailian"
msgstr "阿里云百炼"

Expand Down Expand Up @@ -6753,4 +6762,4 @@ msgstr "删除个人系统 API_KEY"
#: .\apps\xpack\views\system_api_key_views.py:57
#: .\apps\xpack\views\system_api_key_views.py:58
msgid "Add personal system API_KEY"
msgstr "添加个人系统 API_KEY"
msgstr "添加个人系统 API_KEY"
15 changes: 12 additions & 3 deletions apps/locales/zh_Hant/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-01-22 15:57+0800\n"
"POT-Creation-Date: 2025-01-22 18:20+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -145,7 +145,7 @@ msgid "message type error"
msgstr "消息類型錯誤"

#: .\apps\application\chat_pipeline\step\chat_step\impl\base_chat_step.py:177
#: .\apps\application\chat_pipeline\step\chat_step\impl\base_chat_step.py:222
#: .\apps\application\chat_pipeline\step\chat_step\impl\base_chat_step.py:221
msgid ""
"Sorry, the AI model is not configured. Please go to the application to set "
"up the AI model first."
Expand Down Expand Up @@ -2818,6 +2818,15 @@ msgstr "文檔 id 不存在"
msgid "Section title (optional)"
msgstr "分段標題（選填）"

#: .\apps\dataset\serializers\document_serializers.py:635
msgid ""
"Section content (required, question answer, no more than 4096 characters)"
msgstr "分段內容（必填，問題答案，最長不超過4096個字元）"

#: .\apps\dataset\serializers\document_serializers.py:636
msgid "Question (optional, one per line in the cell)"
msgstr "問題（選填，儲存格內一行一個）"

#: .\apps\dataset\serializers\document_serializers.py:735
msgid "The task is being executed, please do not send it repeatedly."
msgstr "任務正在執行中，請勿重複發送"
Expand Down Expand Up @@ -3664,7 +3673,7 @@ msgstr ""
"或者參考風格遷移，重點風格包括但不限於水彩、油畫、中國畫、素描、扁平插畫、二"
"次元、3D卡通。"

#: .\apps\setting\models_provider\impl\aliyun_bai_lian_model_provider\aliyun_bai_lian_model_provider.py:94
#: .\apps\setting\models_provider\impl\aliyun_bai_lian_model_provider\aliyun_bai_lian_model_provider.py:95
msgid "Alibaba Cloud Bailian"
msgstr "阿里雲百鍊"

Expand Down
Loading