AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-18 00:45:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(identity): update model identity key

Browse Source 
- Change "model_identity" to "dify_model_identity" for consistency
- Adjust file validation logic to use updated key in various components and tests
This commit is contained in:
-LAN- 2024-10-01 13:21:25 +08:00
parent 5c64792793
commit 26c8beb804
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/core/app/task_pipeline/workflow_cycle_manage.py
View File

@ -652,7 +652,7 @@ class WorkflowCycleManage:
if not value: if not value:
return None return None
if isinstance(value, dict) and value.get("model_identity") == FILE_MODEL_IDENTITY: if isinstance(value, dict) and value.get("dify_model_identity") == FILE_MODEL_IDENTITY:
return value return value
elif isinstance(value, File): elif isinstance(value, File):
return value.to_dict() return value.to_dict()

4
api/core/tools/tool/workflow_tool.py
View File

@ -190,10 +190,10 @@ class WorkflowTool(Tool):
for key, value in outputs.items(): for key, value in outputs.items():
if isinstance(value, list): if isinstance(value, list):
for item in value: for item in value:
if isinstance(item, dict) and item.get("model_identity") == FILE_MODEL_IDENTITY: if isinstance(item, dict) and item.get("dify_model_identity") == FILE_MODEL_IDENTITY:
file = File.model_validate(item) file = File.model_validate(item)
files.append(file) files.append(file)
elif isinstance(value, dict) and value.get("model_identity") == FILE_MODEL_IDENTITY: elif isinstance(value, dict) and value.get("dify_model_identity") == FILE_MODEL_IDENTITY:
file = File.model_validate(value) file = File.model_validate(value)
files.append(file) files.append(file)

2
api/core/workflow/nodes/answer/answer_stream_processor.py
View File

@ -213,7 +213,7 @@ class AnswerStreamProcessor(StreamProcessor):
return None return None
if isinstance(value, dict): if isinstance(value, dict):
if "model_identity" in value and value["model_identity"] == FILE_MODEL_IDENTITY: if "dify_model_identity" in value and value["dify_model_identity"] == FILE_MODEL_IDENTITY:
return value return value
elif isinstance(value, File): elif isinstance(value, File):
return value.to_dict() return value.to_dict()

8
api/models/model.py
View File

@ -569,10 +569,10 @@ class Conversation(db.Model):
def inputs(self): def inputs(self):
inputs = self._inputs.copy() inputs = self._inputs.copy()
for key, value in inputs.items(): for key, value in inputs.items():
if isinstance(value, dict) and value.get("model_identity") == FILE_MODEL_IDENTITY: if isinstance(value, dict) and value.get("dify_model_identity") == FILE_MODEL_IDENTITY:
inputs[key] = File.model_validate(value) inputs[key] = File.model_validate(value)
elif isinstance(value, list) and all( elif isinstance(value, list) and all(
isinstance(item, dict) and item.get("model_identity") == FILE_MODEL_IDENTITY for item in value isinstance(item, dict) and item.get("dify_model_identity") == FILE_MODEL_IDENTITY for item in value
): ):
inputs[key] = [File.model_validate(item) for item in value] inputs[key] = [File.model_validate(item) for item in value]
return inputs return inputs
@ -765,10 +765,10 @@ class Message(db.Model):
def inputs(self): def inputs(self):
inputs = self._inputs.copy() inputs = self._inputs.copy()
for key, value in inputs.items(): for key, value in inputs.items():
if isinstance(value, dict) and value.get("model_identity") == FILE_MODEL_IDENTITY: if isinstance(value, dict) and value.get("dify_model_identity") == FILE_MODEL_IDENTITY:
inputs[key] = File.model_validate(value) inputs[key] = File.model_validate(value)
elif isinstance(value, list) and all( elif isinstance(value, list) and all(
isinstance(item, dict) and item.get("model_identity") == FILE_MODEL_IDENTITY for item in value isinstance(item, dict) and item.get("dify_model_identity") == FILE_MODEL_IDENTITY for item in value
): ):
inputs[key] = [File.model_validate(item) for item in value] inputs[key] = [File.model_validate(item) for item in value]
return inputs return inputs

2
api/tests/unit_tests/core/test_file.py
View File

@ -13,7 +13,7 @@ def test_file_loads_and_dumps():
) )
file_dict = file.model_dump() file_dict = file.model_dump()
assert file_dict["model_identity"] == FILE_MODEL_IDENTITY assert file_dict["dify_model_identity"] == FILE_MODEL_IDENTITY
assert file_dict["type"] == file.type.value assert file_dict["type"] == file.type.value
assert isinstance(file_dict["type"], str) assert isinstance(file_dict["type"], str)
assert file_dict["transfer_method"] == file.transfer_method.value assert file_dict["transfer_method"] == file.transfer_method.value