Skip to content

Commit 06d5c10

Browse files
liuruibinliuruibin
committed
chore: reformat code
1 parent 906407a commit 06d5c10

File tree

2 files changed

+103
-102
lines changed

2 files changed

+103
-102
lines changed

‎apps/knowledge/serializers/common.py‎

Lines changed: 83 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"""
99
import os
1010
import re
11-
import uuid_utils.compat as uuid
1211
import zipfile
1312
from typing import List
1413

14+
import uuid_utils.compat as uuid
1515
from django.db.models import QuerySet
1616
from django.utils.translation import gettext_lazy as _
1717
from rest_framework import serializers
@@ -27,72 +27,6 @@
2727
from models_provider.tools import get_model
2828

2929

30-
def zip_dir(zip_path, output=None):
31-
output = output or os.path.basename(zip_path) + '.zip'
32-
zip = zipfile.ZipFile(output, 'w', zipfile.ZIP_DEFLATED)
33-
for root, dirs, files in os.walk(zip_path):
34-
relative_root = '' if root == zip_path else root.replace(zip_path, '') + os.sep
35-
for filename in files:
36-
zip.write(os.path.join(root, filename), relative_root + filename)
37-
zip.close()
38-
39-
40-
def is_valid_uuid(s):
41-
try:
42-
uuid.UUID(s)
43-
return True
44-
except ValueError:
45-
return False
46-
47-
48-
def write_image(zip_path: str, image_list: List[str]):
49-
for image in image_list:
50-
search = re.search("\(.*\)", image)
51-
if search:
52-
text = search.group()
53-
if text.startswith('(/api/file/'):
54-
r = text.replace('(/api/file/', '').replace(')', '')
55-
r = r.strip().split(" ")[0]
56-
if not is_valid_uuid(r):
57-
break
58-
file = QuerySet(File).filter(id=r).first()
59-
if file is None:
60-
break
61-
zip_inner_path = os.path.join('api', 'file', r)
62-
file_path = os.path.join(zip_path, zip_inner_path)
63-
if not os.path.exists(os.path.dirname(file_path)):
64-
os.makedirs(os.path.dirname(file_path))
65-
with open(os.path.join(zip_path, file_path), 'wb') as f:
66-
f.write(file.get_bytes())
67-
# else:
68-
# r = text.replace('(/api/image/', '').replace(')', '')
69-
# r = r.strip().split(" ")[0]
70-
# if not is_valid_uuid(r):
71-
# break
72-
# image_model = QuerySet(Image).filter(id=r).first()
73-
# if image_model is None:
74-
# break
75-
# zip_inner_path = os.path.join('api', 'image', r)
76-
# file_path = os.path.join(zip_path, zip_inner_path)
77-
# if not os.path.exists(os.path.dirname(file_path)):
78-
# os.makedirs(os.path.dirname(file_path))
79-
# with open(file_path, 'wb') as f:
80-
# f.write(image_model.image)
81-
82-
83-
def update_document_char_length(document_id: str):
84-
update_execute(get_file_content(
85-
os.path.join(PROJECT_DIR, "apps", "knowledge", 'sql', 'update_document_char_length.sql')),
86-
(document_id, document_id))
87-
88-
89-
def list_paragraph(paragraph_list: List[str]):
90-
if paragraph_list is None or len(paragraph_list) == 0:
91-
return []
92-
return native_search(QuerySet(Paragraph).filter(id__in=paragraph_list), get_file_content(
93-
os.path.join(PROJECT_DIR, "apps", "knowledge", 'sql', 'list_paragraph.sql')))
94-
95-
9630
class MetaSerializer(serializers.Serializer):
9731
class WebMeta(serializers.Serializer):
9832
source_url = serializers.CharField(required=True, label=_('source url'))
@@ -133,17 +67,11 @@ def __init__(self, knowledge_id: str, document_id: str, paragraph_id: str, probl
13367
self.problem_content = problem_content
13468

13569

136-
def or_get(exists_problem_list, content, knowledge_id, document_id, paragraph_id, problem_content_dict):
137-
if content in problem_content_dict:
138-
return problem_content_dict.get(content)[0], document_id, paragraph_id
139-
exists = [row for row in exists_problem_list if row.content == content]
140-
if len(exists) > 0:
141-
problem_content_dict[content] = exists[0], False
142-
return exists[0], document_id, paragraph_id
143-
else:
144-
problem = Problem(id=uuid.uuid7(), content=content, knowledge_id=knowledge_id)
145-
problem_content_dict[content] = problem, True
146-
return problem, document_id, paragraph_id
70+
class GenerateRelatedSerializer(serializers.Serializer):
71+
model_id = serializers.UUIDField(required=True, label=_('Model id'))
72+
prompt = serializers.CharField(required=True, label=_('Prompt word'))
73+
state_list = serializers.ListField(required=False, child=serializers.CharField(required=True),
74+
label=_("state list"))
14775

14876

14977
class ProblemParagraphManage:
@@ -216,8 +144,80 @@ def get_embedding_model_id_by_knowledge_id_list(knowledge_id_list: List):
216144
return str(knowledge_list[0].embedding_model_id)
217145

218146

219-
class GenerateRelatedSerializer(serializers.Serializer):
220-
model_id = serializers.UUIDField(required=True, label=_('Model id'))
221-
prompt = serializers.CharField(required=True, label=_('Prompt word'))
222-
state_list = serializers.ListField(required=False, child=serializers.CharField(required=True),
223-
label=_("state list"))
147+
def zip_dir(zip_path, output=None):
148+
output = output or os.path.basename(zip_path) + '.zip'
149+
zip = zipfile.ZipFile(output, 'w', zipfile.ZIP_DEFLATED)
150+
for root, dirs, files in os.walk(zip_path):
151+
relative_root = '' if root == zip_path else root.replace(zip_path, '') + os.sep
152+
for filename in files:
153+
zip.write(os.path.join(root, filename), relative_root + filename)
154+
zip.close()
155+
156+
157+
def is_valid_uuid(s):
158+
try:
159+
uuid.UUID(s)
160+
return True
161+
except ValueError:
162+
return False
163+
164+
165+
def write_image(zip_path: str, image_list: List[str]):
166+
for image in image_list:
167+
search = re.search("\(.*\)", image)
168+
if search:
169+
text = search.group()
170+
if text.startswith('(/api/file/'):
171+
r = text.replace('(/api/file/', '').replace(')', '')
172+
r = r.strip().split(" ")[0]
173+
if not is_valid_uuid(r):
174+
break
175+
file = QuerySet(File).filter(id=r).first()
176+
if file is None:
177+
break
178+
zip_inner_path = os.path.join('api', 'file', r)
179+
file_path = os.path.join(zip_path, zip_inner_path)
180+
if not os.path.exists(os.path.dirname(file_path)):
181+
os.makedirs(os.path.dirname(file_path))
182+
with open(os.path.join(zip_path, file_path), 'wb') as f:
183+
f.write(file.get_bytes())
184+
# else:
185+
# r = text.replace('(/api/image/', '').replace(')', '')
186+
# r = r.strip().split(" ")[0]
187+
# if not is_valid_uuid(r):
188+
# break
189+
# image_model = QuerySet(Image).filter(id=r).first()
190+
# if image_model is None:
191+
# break
192+
# zip_inner_path = os.path.join('api', 'image', r)
193+
# file_path = os.path.join(zip_path, zip_inner_path)
194+
# if not os.path.exists(os.path.dirname(file_path)):
195+
# os.makedirs(os.path.dirname(file_path))
196+
# with open(file_path, 'wb') as f:
197+
# f.write(image_model.image)
198+
199+
200+
def update_document_char_length(document_id: str):
201+
update_execute(get_file_content(
202+
os.path.join(PROJECT_DIR, "apps", "knowledge", 'sql', 'update_document_char_length.sql')),
203+
(document_id, document_id))
204+
205+
206+
def list_paragraph(paragraph_list: List[str]):
207+
if paragraph_list is None or len(paragraph_list) == 0:
208+
return []
209+
return native_search(QuerySet(Paragraph).filter(id__in=paragraph_list), get_file_content(
210+
os.path.join(PROJECT_DIR, "apps", "knowledge", 'sql', 'list_paragraph.sql')))
211+
212+
213+
def or_get(exists_problem_list, content, knowledge_id, document_id, paragraph_id, problem_content_dict):
214+
if content in problem_content_dict:
215+
return problem_content_dict.get(content)[0], document_id, paragraph_id
216+
exists = [row for row in exists_problem_list if row.content == content]
217+
if len(exists) > 0:
218+
problem_content_dict[content] = exists[0], False
219+
return exists[0], document_id, paragraph_id
220+
else:
221+
problem = Problem(id=uuid.uuid7(), content=content, knowledge_id=knowledge_id)
222+
problem_content_dict[content] = problem, True
223+
return problem, document_id, paragraph_id

‎apps/knowledge/serializers/problem.py‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class ProblemInstanceSerializer(serializers.Serializer):
2626
id = serializers.CharField(required=False, label=_('problem id'))
2727
content = serializers.CharField(required=True, max_length=256, label=_('content'))
2828

29+
2930
class ProblemEditSerializer(serializers.Serializer):
3031
content = serializers.CharField(required=True, max_length=256, label=_('content'))
3132

@@ -56,25 +57,6 @@ class BatchAssociation(serializers.Serializer):
5657
paragraph_list = AssociationParagraph(many=True)
5758

5859

59-
def is_exits(exits_problem_paragraph_mapping_list, new_paragraph_mapping):
60-
filter_list = [exits_problem_paragraph_mapping for exits_problem_paragraph_mapping in
61-
exits_problem_paragraph_mapping_list if
62-
str(exits_problem_paragraph_mapping.paragraph_id) == new_paragraph_mapping.paragraph_id
63-
and str(exits_problem_paragraph_mapping.problem_id) == new_paragraph_mapping.problem_id
64-
and str(exits_problem_paragraph_mapping.knowledge_id) == new_paragraph_mapping.knowledge_id]
65-
return len(filter_list) > 0
66-
67-
68-
def to_problem_paragraph_mapping(problem, document_id: str, paragraph_id: str, knowledge_id: str):
69-
return ProblemParagraphMapping(
70-
id=uuid.uuid7(),
71-
document_id=document_id,
72-
paragraph_id=paragraph_id,
73-
knowledge_id=knowledge_id,
74-
problem_id=str(problem.id)
75-
), problem
76-
77-
7860
class ProblemSerializers(serializers.Serializer):
7961
class BatchOperate(serializers.Serializer):
8062
knowledge_id = serializers.UUIDField(required=True, label=_('knowledge id'))
@@ -241,3 +223,22 @@ def page(self, current_page, page_size):
241223
query_set = self.get_query_set()
242224
return native_page_search(current_page, page_size, query_set, select_string=get_file_content(
243225
os.path.join(PROJECT_DIR, "apps", "knowledge", 'sql', 'list_problem.sql')))
226+
227+
228+
def is_exits(exits_problem_paragraph_mapping_list, new_paragraph_mapping):
229+
filter_list = [exits_problem_paragraph_mapping for exits_problem_paragraph_mapping in
230+
exits_problem_paragraph_mapping_list if
231+
str(exits_problem_paragraph_mapping.paragraph_id) == new_paragraph_mapping.paragraph_id
232+
and str(exits_problem_paragraph_mapping.problem_id) == new_paragraph_mapping.problem_id
233+
and str(exits_problem_paragraph_mapping.knowledge_id) == new_paragraph_mapping.knowledge_id]
234+
return len(filter_list) > 0
235+
236+
237+
def to_problem_paragraph_mapping(problem, document_id: str, paragraph_id: str, knowledge_id: str):
238+
return ProblemParagraphMapping(
239+
id=uuid.uuid7(),
240+
document_id=document_id,
241+
paragraph_id=paragraph_id,
242+
knowledge_id=knowledge_id,
243+
problem_id=str(problem.id)
244+
), problem

0 commit comments

Comments
 (0)