Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dify
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ai-tech
dify
Commits
297b33aa
Commit
297b33aa
authored
Feb 21, 2024
by
takatost
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lint
parent
0d858cc0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
9 deletions
+19
-9
advanced_prompt_transform.py
api/core/prompt/advanced_prompt_transform.py
+13
-4
simple_prompt_transform.py
api/core/prompt/simple_prompt_transform.py
+4
-4
workflow_converter.py
api/services/workflow/workflow_converter.py
+2
-1
No files found.
api/core/prompt/advanced_prompt_transform.py
View file @
297b33aa
from
typing
import
Optional
from
core.entities.application_entities
import
PromptTemplateEntity
,
ModelConfigEntity
,
\
AdvancedCompletionPromptTemplateEntity
from
core.entities.application_entities
import
(
AdvancedCompletionPromptTemplateEntity
,
ModelConfigEntity
,
PromptTemplateEntity
,
)
from
core.file.file_obj
import
FileObj
from
core.memory.token_buffer_memory
import
TokenBufferMemory
from
core.model_runtime.entities.message_entities
import
PromptMessage
,
PromptMessageRole
,
UserPromptMessage
,
\
SystemPromptMessage
,
AssistantPromptMessage
,
TextPromptMessageContent
from
core.model_runtime.entities.message_entities
import
(
AssistantPromptMessage
,
PromptMessage
,
PromptMessageRole
,
SystemPromptMessage
,
TextPromptMessageContent
,
UserPromptMessage
,
)
from
core.prompt.prompt_template
import
PromptTemplateParser
from
core.prompt.prompt_transform
import
PromptTransform
from
core.prompt.simple_prompt_transform
import
ModelMode
...
...
api/core/prompt/simple_prompt_transform.py
View file @
297b33aa
import
enum
import
json
import
os
from
typing
import
Optional
,
Tuple
from
typing
import
Optional
from
core.entities.application_entities
import
(
ModelConfigEntity
,
...
...
@@ -85,7 +85,7 @@ class SimplePromptTransform(PromptTransform):
query
:
Optional
[
str
]
=
None
,
context
:
Optional
[
str
]
=
None
,
histories
:
Optional
[
str
]
=
None
,
)
->
T
uple
[
str
,
dict
]:
)
->
t
uple
[
str
,
dict
]:
# get prompt template
prompt_template_config
=
self
.
get_prompt_template
(
app_mode
=
app_mode
,
...
...
@@ -160,7 +160,7 @@ class SimplePromptTransform(PromptTransform):
files
:
list
[
FileObj
],
memory
:
Optional
[
TokenBufferMemory
],
model_config
:
ModelConfigEntity
)
\
->
T
uple
[
list
[
PromptMessage
],
Optional
[
list
[
str
]]]:
->
t
uple
[
list
[
PromptMessage
],
Optional
[
list
[
str
]]]:
prompt_messages
=
[]
# get prompt
...
...
@@ -193,7 +193,7 @@ class SimplePromptTransform(PromptTransform):
files
:
list
[
FileObj
],
memory
:
Optional
[
TokenBufferMemory
],
model_config
:
ModelConfigEntity
)
\
->
T
uple
[
list
[
PromptMessage
],
Optional
[
list
[
str
]]]:
->
t
uple
[
list
[
PromptMessage
],
Optional
[
list
[
str
]]]:
# get prompt
prompt
,
prompt_rules
=
self
.
get_prompt_str_and_rules
(
app_mode
=
AppMode
.
CHAT
,
...
...
api/services/workflow/workflow_converter.py
View file @
297b33aa
...
...
@@ -4,11 +4,12 @@ from typing import Optional
from
core.application_manager
import
ApplicationManager
from
core.entities.application_entities
import
(
DatasetEntity
,
DatasetRetrieveConfigEntity
,
ExternalDataVariableEntity
,
FileUploadEntity
,
ModelConfigEntity
,
PromptTemplateEntity
,
VariableEntity
,
DatasetRetrieveConfigEntity
,
VariableEntity
,
)
from
core.model_runtime.entities.llm_entities
import
LLMMode
from
core.model_runtime.utils
import
helper
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment