Skip to content

Commit a17aee7

Browse files
revert
1 parent 4761094 commit a17aee7

9 files changed

Lines changed: 82 additions & 74 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ def execute(self, message_list: List[BaseMessage],
183183
mcp_output_enable=True,
184184
**kwargs):
185185
chat_model = get_model_instance_by_model_workspace_id(model_id, workspace_id,
186-
**(model_params_setting or {})) if model_id is not None else None
186+
**model_params_setting) if model_id is not None else None
187187
if stream:
188188
return self.execute_stream(message_list, chat_id, problem_text, post_response_handler, chat_model,
189189
paragraph_list,

apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,23 +71,21 @@ def execute(self, variable_list, **kwargs) -> NodeResult:
7171
result_list = []
7272
is_chat = False
7373
for variable in variable_list:
74-
if not variable.get('fields'):
74+
if 'fields' not in variable:
7575
continue
76-
7776
if 'global' == variable['fields'][0]:
7877
result = self.handle(variable, self.global_evaluation)
7978
result_list.append(result)
80-
elif 'chat' == variable['fields'][0]:
79+
if 'chat' == variable['fields'][0]:
8180
result = self.handle(variable, self.chat_evaluation)
8281
result_list.append(result)
8382
is_chat = True
84-
elif 'loop' == variable['fields'][0]:
83+
if 'loop' == variable['fields'][0]:
8584
result = self.handle(variable, self.loop_evaluation)
8685
result_list.append(result)
87-
elif 'output' == variable['fields'][0]:
86+
if 'output' == variable['fields'][0]:
8887
result = self.handle(variable, self.out_evaluation)
8988
result_list.append(result)
90-
9189
if is_chat:
9290
from application.flow.loop_workflow_manage import LoopWorkflowManage
9391
if isinstance(self.workflow_manage, LoopWorkflowManage):

apps/chat/serializers/chat_embed_serializers.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ def get_embed(self, with_valid=True, params=None):
3232
if with_valid:
3333
self.is_valid(raise_exception=True)
3434
index_path = os.path.join(PROJECT_DIR, 'apps', "chat", 'template', 'embed.js')
35-
with open(index_path, "r", encoding='utf-8') as file:
36-
content = file.read()
35+
file = open(index_path, "r", encoding='utf-8')
36+
content = file.read()
37+
file.close()
3738
application_access_token = QuerySet(ApplicationAccessToken).filter(
3839
access_token=self.data.get('token')).first()
3940
is_draggable = 'false'

apps/chat/serializers/chat_record.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ def vote(self, instance: Dict, with_valid=True):
7575
chat_record_details_model.vote_status = VoteChoices.STAR
7676
chat_record_details_model.vote_reason = vote_reason
7777
chat_record_details_model.vote_other_content = vote_other_content
78-
elif vote_status == VoteChoices.TRAMPLE:
78+
79+
if vote_status == VoteChoices.TRAMPLE:
7980
# 点踩
8081
chat_record_details_model.vote_status = VoteChoices.TRAMPLE
8182
chat_record_details_model.vote_reason = vote_reason

apps/common/handle/impl/common_handle.py

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -86,45 +86,46 @@ def handle_images(deps, archive: ZipFile) -> []:
8686

8787

8888
def xlsx_embed_cells_images(buffer) -> {}:
89-
with ZipFile(buffer) as archive:
90-
# 解析cellImage.xml文件
91-
deps = get_dependents(archive, get_rels_path("xl/cellimages.xml"))
92-
image_rel = handle_images(deps=deps, archive=archive)
93-
# 工作表及其中图片ID
94-
sheet_list = {}
95-
for item in archive.namelist():
96-
if not item.startswith('xl/worksheets/sheet'):
97-
continue
98-
key = item.split('/')[-1].split('.')[0].split('sheet')[-1]
99-
sheet_list[key] = parse_element_sheet_xml(fromstring(archive.read(item)))
100-
cell_images_xml = parse_element(fromstring(archive.read("xl/cellimages.xml")))
101-
cell_images_rel = {}
102-
for image in image_rel:
103-
cell_images_rel[image.embed] = image
104-
for cnv, embed in cell_images_xml.items():
105-
cell_images_xml[cnv] = cell_images_rel.get(embed)
106-
result = {}
107-
for key, img in cell_images_xml.items():
108-
all_cells = [
109-
cell
110-
for _sheet_id, sheet in sheet_list.items()
111-
if sheet is not None
112-
for cell in sheet or []
113-
]
89+
archive = ZipFile(buffer)
90+
# 解析cellImage.xml文件
91+
deps = get_dependents(archive, get_rels_path("xl/cellimages.xml"))
92+
image_rel = handle_images(deps=deps, archive=archive)
93+
# 工作表及其中图片ID
94+
sheet_list = {}
95+
for item in archive.namelist():
96+
if not item.startswith('xl/worksheets/sheet'):
97+
continue
98+
key = item.split('/')[-1].split('.')[0].split('sheet')[-1]
99+
sheet_list[key] = parse_element_sheet_xml(fromstring(archive.read(item)))
100+
cell_images_xml = parse_element(fromstring(archive.read("xl/cellimages.xml")))
101+
cell_images_rel = {}
102+
for image in image_rel:
103+
cell_images_rel[image.embed] = image
104+
for cnv, embed in cell_images_xml.items():
105+
cell_images_xml[cnv] = cell_images_rel.get(embed)
106+
result = {}
107+
for key, img in cell_images_xml.items():
108+
all_cells = [
109+
cell
110+
for _sheet_id, sheet in sheet_list.items()
111+
if sheet is not None
112+
for cell in sheet or []
113+
]
114114

115-
image_excel_id_list = [
116-
cell for cell in all_cells
117-
if isinstance(cell, str) and key in cell
118-
]
119-
# print(key, img)
120-
if img is None:
121-
continue
122-
if len(image_excel_id_list) > 0:
123-
image_excel_id = image_excel_id_list[-1]
124-
with archive.open(img.target) as f:
125-
img_byte = io.BytesIO()
126-
im = PILImage.open(f).convert('RGB')
127-
im.save(img_byte, format='JPEG')
128-
image = File(id=uuid.uuid7(), file_name=img.path, meta={'debug': False, 'content': img_byte.getvalue()})
129-
result['=' + image_excel_id] = image
115+
image_excel_id_list = [
116+
cell for cell in all_cells
117+
if isinstance(cell, str) and key in cell
118+
]
119+
# print(key, img)
120+
if img is None:
121+
continue
122+
if len(image_excel_id_list) > 0:
123+
image_excel_id = image_excel_id_list[-1]
124+
f = archive.open(img.target)
125+
img_byte = io.BytesIO()
126+
im = PILImage.open(f).convert('RGB')
127+
im.save(img_byte, format='JPEG')
128+
image = File(id=uuid.uuid7(), file_name=img.path, meta={'debug': False, 'content': img_byte.getvalue()})
129+
result['=' + image_excel_id] = image
130+
archive.close()
130131
return result

apps/knowledge/serializers/common.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,12 @@ def get_embedding_model_id_by_knowledge_id_list(knowledge_id_list: List):
164164

165165
def zip_dir(zip_path, output=None):
166166
output = output or os.path.basename(zip_path) + '.zip'
167-
with zipfile.ZipFile(output, 'w', zipfile.ZIP_DEFLATED) as zip:
168-
for root, dirs, files in os.walk(zip_path):
169-
relative_root = '' if root == zip_path else root.replace(zip_path, '') + os.sep
170-
for filename in files:
171-
zip.write(os.path.join(root, filename), relative_root + filename)
167+
zip = zipfile.ZipFile(output, 'w', zipfile.ZIP_DEFLATED)
168+
for root, dirs, files in os.walk(zip_path):
169+
relative_root = '' if root == zip_path else root.replace(zip_path, '') + os.sep
170+
for filename in files:
171+
zip.write(os.path.join(root, filename), relative_root + filename)
172+
zip.close()
172173

173174

174175
def is_valid_uuid(s):

apps/knowledge/serializers/document.py

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -228,17 +228,19 @@ def export(self, with_valid=True):
228228
self.is_valid(raise_exception=True)
229229
language = get_language()
230230
if self.data.get('type') == 'csv':
231-
with open(
231+
file = open(
232232
os.path.join(PROJECT_DIR, "apps", "knowledge", 'template',
233233
f'csv_template_{to_locale(language)}.csv'),
234-
"rb") as file:
235-
content = file.read()
234+
"rb")
235+
content = file.read()
236+
file.close()
236237
return HttpResponse(content, status=200, headers={'Content-Type': 'text/csv',
237238
'Content-Disposition': 'attachment; filename="csv_template.csv"'})
238239
elif self.data.get('type') == 'excel':
239-
with open(os.path.join(PROJECT_DIR, "apps", "knowledge", 'template',
240-
f'excel_template_{to_locale(language)}.xlsx'), "rb") as file:
241-
content = file.read()
240+
file = open(os.path.join(PROJECT_DIR, "apps", "knowledge", 'template',
241+
f'excel_template_{to_locale(language)}.xlsx'), "rb")
242+
content = file.read()
243+
file.close()
242244
return HttpResponse(content, status=200, headers={'Content-Type': 'application/vnd.ms-excel',
243245
'Content-Disposition': 'attachment; filename="excel_template.xlsx"'})
244246
else:
@@ -249,18 +251,20 @@ def table_export(self, with_valid=True):
249251
self.is_valid(raise_exception=True)
250252
language = get_language()
251253
if self.data.get('type') == 'csv':
252-
with open(
254+
file = open(
253255
os.path.join(PROJECT_DIR, "apps", "knowledge", 'template',
254256
f'table_template_{to_locale(language)}.csv'),
255-
"rb") as file:
256-
content = file.read()
257+
"rb")
258+
content = file.read()
259+
file.close()
257260
return HttpResponse(content, status=200, headers={'Content-Type': 'text/csv',
258261
'Content-Disposition': 'attachment; filename="csv_template.csv"'})
259262
elif self.data.get('type') == 'excel':
260-
with open(os.path.join(PROJECT_DIR, "apps", "knowledge", 'template',
261-
f'table_template_{to_locale(language)}.xlsx'),
262-
"rb") as file:
263-
content = file.read()
263+
file = open(os.path.join(PROJECT_DIR, "apps", "knowledge", 'template',
264+
f'table_template_{to_locale(language)}.xlsx'),
265+
"rb")
266+
content = file.read()
267+
file.close()
264268
return HttpResponse(content, status=200, headers={'Content-Type': 'application/vnd.ms-excel',
265269
'Content-Disposition': 'attachment; filename="excel_template.xlsx"'})
266270
else:

apps/maxkb/urls/web.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@ def pro():
8080

8181

8282
def get_index_html(index_path):
83-
with open(index_path, "r", encoding='utf-8') as file:
84-
content = file.read()
83+
file = open(index_path, "r", encoding='utf-8')
84+
content = file.read()
85+
file.close()
8586
return content
8687

8788

apps/users/serializers/user.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,10 +1071,11 @@ def send(self):
10711071
]), range(6))))
10721072
# 获取邮件模板
10731073
language = get_language()
1074-
with open(
1075-
os.path.join(PROJECT_DIR, "apps", "common", 'template', f'email_template_{to_locale(language)}.html'),
1076-
"r", encoding='utf-8') as file:
1077-
content = file.read()
1074+
file = open(
1075+
os.path.join(PROJECT_DIR, "apps", "common", 'template', f'email_template_{to_locale(language)}.html'), "r",
1076+
encoding='utf-8')
1077+
content = file.read()
1078+
file.close()
10781079
code_cache_key = email + ":" + state
10791080
code_cache_key_lock = code_cache_key + "_lock"
10801081
# 设置缓存

0 commit comments

Comments
 (0)