Skip to content

Commit 9383384

Browse files
committed
refactor: file to oss
1 parent fb0d5b0 commit 9383384

File tree

24 files changed

+44
-16
lines changed

24 files changed

+44
-16
lines changed

apps/application/flow/step_node/document_extract_node/impl/base_document_extract_node.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from application.flow.step_node.document_extract_node.i_document_extract_node import IDocumentExtractNode
1010
from knowledge.models import File
1111
from knowledge.serializers.document import split_handles, parse_table_handle_list, FileBufferHandle
12-
from knowledge.serializers.file import FileSerializer
12+
from oss.serializers.file import FileSerializer
1313

1414

1515
def bytes_to_uploaded_file(file_bytes, file_name="file.txt"):

apps/application/flow/step_node/image_generate_step_node/impl/base_image_generate_node.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from application.flow.i_step_node import NodeResult
99
from application.flow.step_node.image_generate_step_node.i_image_generate_node import IImageGenerateNode
1010
from common.utils.common import bytes_to_uploaded_file
11-
from knowledge.serializers.file import FileSerializer
11+
from oss.serializers.file import FileSerializer
1212
from models_provider.tools import get_model_instance_by_model_user_id
1313

1414

apps/application/flow/step_node/image_understand_step_node/impl/base_image_understand_node.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def generate_history_human_message_for_details(self, chat_record):
130130
file_id_list = [image.get('file_id') for image in image_list]
131131
return HumanMessage(content=[
132132
{'type': 'text', 'text': data['question']},
133-
*[{'type': 'image_url', 'image_url': {'url': f'/api/file/{file_id}'}} for file_id in file_id_list]
133+
*[{'type': 'image_url', 'image_url': {'url': f'/oss/file/{file_id}'}} for file_id in file_id_list]
134134

135135
])
136136
return HumanMessage(content=chat_record.problem_text)

apps/application/flow/step_node/text_to_speech_step_node/impl/base_text_to_speech_node.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from application.flow.i_step_node import NodeResult
88
from application.flow.step_node.text_to_speech_step_node.i_text_to_speech_node import ITextToSpeechNode
9-
from knowledge.serializers.file import FileSerializer
9+
from oss.serializers.file import FileSerializer
1010
from models_provider.tools import get_model_instance_by_model_user_id
1111

1212

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def get_content(self, file, save_image):
110110

111111
md_tables += md_table + '\n\n'
112112

113-
md_tables = md_tables.replace('/api/image/', '/api/file/')
113+
md_tables = md_tables.replace('/api/image/', '/oss/file/')
114114
return md_tables
115115
except Exception as e:
116116
max_kb.error(f'excel split handle error: {e}')

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ def get_content(self, file, save_image):
226226
doc = Document(io.BytesIO(buffer))
227227
content = self.to_md(doc, image_list, get_image_id_func())
228228
if len(image_list) > 0:
229-
content = content.replace('/api/image/', '/api/file/')
229+
content = content.replace('/api/image/', '/oss/file/')
230230
save_image(image_list)
231231
return content
232232
except BaseException as e:

apps/knowledge/serializers/common.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ def write_image(zip_path: str, image_list: List[str]):
167167
search = re.search("\(.*\)", image)
168168
if search:
169169
text = search.group()
170-
if text.startswith('(/api/file/'):
171-
r = text.replace('(/api/file/', '').replace(')', '')
170+
if text.startswith('(/oss/file/'):
171+
r = text.replace('(/oss/file/', '').replace(')', '')
172172
r = r.strip().split(" ")[0]
173173
if not is_valid_uuid(r):
174174
break

apps/knowledge/serializers/document.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
TaskType, File, FileSourceType
4747
from knowledge.serializers.common import ProblemParagraphManage, BatchSerializer, \
4848
get_embedding_model_id_by_knowledge_id, MetaSerializer, write_image, zip_dir
49-
from knowledge.serializers.file import FileSerializer
5049
from knowledge.serializers.paragraph import ParagraphSerializers, ParagraphInstanceSerializer, \
5150
delete_problems_and_mappings
5251
from knowledge.task.embedding import embedding_by_document, delete_embedding_by_document_list, \
@@ -56,6 +55,7 @@
5655
from knowledge.task.sync import sync_web_document
5756
from maxkb.const import PROJECT_DIR
5857
from models_provider.models import Model
58+
from oss.serializers.file import FileSerializer
5959

6060
default_split_handle = TextSplitHandle()
6161
split_handles = [

apps/knowledge/urls.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,5 @@
5656
path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/problem/<int:current_page>/<int:page_size>', views.ProblemView.Page.as_view()),
5757
path('workspace/<str:workspace_id>/knowledge/<str:knowledge_id>/document/<int:current_page>/<int:page_size>', views.DocumentView.Page.as_view()),
5858
path('workspace/<str:workspace_id>/knowledge/<int:current_page>/<int:page_size>', views.KnowledgeView.Page.as_view()),
59-
path('file', views.FileView.as_view()),
60-
path('file/<str:file_id>', views.FileView.Operate.as_view()),
6159

6260
]

apps/knowledge/views/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@
22
from .knowledge import *
33
from .paragraph import *
44
from .problem import *
5-
from .file import *

0 commit comments

Comments
 (0)