hz/ebiz-dify-ai
1
0
Fork 0
mirror of http://112.124.100.131/huang.ze/ebiz-dify-ai.git synced 2025-12-09 10:56:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(api/core): apply ruff reformatting (#7624)

Browse Source
This commit is contained in:
Bowen Liang
2024-09-10 17:00:20 +08:00
committed by GitHub
parent 178730266d
commit 2cf1187b32
724 changed files with 21180 additions and 21123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
api/core/prompt/utils/prompt_message_util.py
View File

@@ -25,26 +25,29 @@ class PromptMessageUtil:
tool_calls = []
for prompt_message in prompt_messages:
if prompt_message.role == PromptMessageRole.USER:
role = 'user'
role = "user"
elif prompt_message.role == PromptMessageRole.ASSISTANT:
role = 'assistant'
role = "assistant"
if isinstance(prompt_message, AssistantPromptMessage):
tool_calls = [{
'id': tool_call.id,
'type': 'function',
'function': {
'name': tool_call.function.name,
'arguments': tool_call.function.arguments,
tool_calls = [
{
"id": tool_call.id,
"type": "function",
"function": {
"name": tool_call.function.name,
"arguments": tool_call.function.arguments,
},
}
} for tool_call in prompt_message.tool_calls]
for tool_call in prompt_message.tool_calls
]
elif prompt_message.role == PromptMessageRole.SYSTEM:
role = 'system'
role = "system"
elif prompt_message.role == PromptMessageRole.TOOL:
role = 'tool'
role = "tool"
else:
continue
text = ''
text = ""
files = []
if isinstance(prompt_message.content, list):
for content in prompt_message.content:
@@ -53,27 +56,25 @@ class PromptMessageUtil:
text += content.data
else:
content = cast(ImagePromptMessageContent, content)
files.append({
"type": 'image',
"data": content.data[:10] + '...[TRUNCATED]...' + content.data[-10:],
"detail": content.detail.value
})
files.append(
{
"type": "image",
"data": content.data[:10] + "...[TRUNCATED]..." + content.data[-10:],
"detail": content.detail.value,
}
)
else:
text = prompt_message.content
prompt = {
"role": role,
"text": text,
"files": files
}
prompt = {"role": role, "text": text, "files": files}
if tool_calls:
prompt['tool_calls'] = tool_calls
prompt["tool_calls"] = tool_calls
prompts.append(prompt)
else:
prompt_message = prompt_messages[0]
text = ''
text = ""
files = []
if isinstance(prompt_message.content, list):
for content in prompt_message.content:
@@ -82,21 +83,23 @@ class PromptMessageUtil:
text += content.data
else:
content = cast(ImagePromptMessageContent, content)
files.append({
"type": 'image',
"data": content.data[:10] + '...[TRUNCATED]...' + content.data[-10:],
"detail": content.detail.value
})
files.append(
{
"type": "image",
"data": content.data[:10] + "...[TRUNCATED]..." + content.data[-10:],
"detail": content.detail.value,
}
)
else:
text = prompt_message.content
params = {
"role": 'user',
"role": "user",
"text": text,
}
if files:
params['files'] = files
params["files"] = files
prompts.append(params)

4
api/core/prompt/utils/prompt_template_parser.py
View File

@@ -38,8 +38,8 @@ class PromptTemplateParser:
return value
prompt = re.sub(self.regex, replacer, self.template)
return re.sub(r'<\|.*?\|>', '', prompt)
return re.sub(r"<\|.*?\|>", "", prompt)
@classmethod
def remove_template_variables(cls, text: str, with_variable_tmpl: bool = False):
return re.sub(WITH_VARIABLE_TMPL_REGEX if with_variable_tmpl else REGEX, r'{\1}', text)
return re.sub(WITH_VARIABLE_TMPL_REGEX if with_variable_tmpl else REGEX, r"{\1}", text)