youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-02 16:38:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/chore-fix' into dev/plugin-deploy

Browse Source
This commit is contained in:
Yeuoly
2024-11-15 15:56:45 +08:00
parent 1e81476e3a 6300e506fb
commit 6da877c6a6
112 changed files with 4206 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/services/dataset_service.py
View File

@ -1458,6 +1458,7 @@ class SegmentService:
pre_segment_data_list = []
segment_data_list = []
keywords_list = []
position = max_position + 1 if max_position else 1
for segment_item in segments:
content = segment_item["content"]
doc_id = str(uuid.uuid4())
@ -1475,7 +1476,7 @@ class SegmentService:
document_id=document.id,
index_node_id=doc_id,
index_node_hash=segment_hash,
position=max_position + 1 if max_position else 1,
position=position,
content=content,
word_count=len(content),
tokens=tokens,
@ -1490,6 +1491,7 @@ class SegmentService:
increment_word_count += segment_document.word_count
db.session.add(segment_document)
segment_data_list.append(segment_document)
position += 1
pre_segment_data_list.append(segment_document)
if "keywords" in segment_item:

12
api/services/tools/api_tools_manage_service.py
View File

@ -109,8 +109,10 @@ class ApiToolManageService:
if schema_type not in [member.value for member in ApiProviderSchemaType]:
raise ValueError(f"invalid schema type {schema}")
provider_name = provider_name.strip()
# check if the provider exists
provider: ApiToolProvider | None = (
provider = (
db.session.query(ApiToolProvider)
.filter(
ApiToolProvider.tenant_id == tenant_id,
@ -249,8 +251,10 @@ class ApiToolManageService:
if schema_type not in [member.value for member in ApiProviderSchemaType]:
raise ValueError(f"invalid schema type {schema}")
provider_name = provider_name.strip()
# check if the provider exists
provider: ApiToolProvider | None = (
provider = (
db.session.query(ApiToolProvider)
.filter(
ApiToolProvider.tenant_id == tenant_id,
@ -322,7 +326,7 @@ class ApiToolManageService:
"""
delete tool provider
"""
provider: ApiToolProvider | None = (
provider = (
db.session.query(ApiToolProvider)
.filter(
ApiToolProvider.tenant_id == tenant_id,
@ -372,7 +376,7 @@ class ApiToolManageService:
if tool_bundle is None:
raise ValueError(f"invalid tool name {tool_name}")
db_provider: ApiToolProvider | None = (
db_provider = (
db.session.query(ApiToolProvider)
.filter(
ApiToolProvider.tenant_id == tenant_id,