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
72e81fce
Commit
72e81fce
authored
Mar 01, 2024
by
takatost
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lint fix
parent
3d6e77ad
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
41 additions
and
36 deletions
+41
-36
entities.py
api/core/agent/entities.py
+1
-1
base_app_config_manager.py
api/core/app/app_config/base_app_config_manager.py
+4
-3
converter.py
...pp/app_config/easy_ui_based_app/model_config/converter.py
+0
-1
manager.py
.../app/app_config/easy_ui_based_app/model_config/manager.py
+1
-1
manager.py
...p/app_config/easy_ui_based_app/prompt_template/manager.py
+5
-2
manager.py
...ore/app/app_config/easy_ui_based_app/variables/manager.py
+2
-3
manager.py
...core/app/app_config/features/opening_statement/manager.py
+1
-2
app_config_manager.py
api/core/app/apps/advanced_chat/app_config_manager.py
+4
-3
app_config_manager.py
api/core/app/apps/agent_chat/app_config_manager.py
+6
-5
base_app_runner.py
api/core/app/apps/base_app_runner.py
+5
-4
app_config_manager.py
api/core/app/apps/chat/app_config_manager.py
+5
-4
app_runner.py
api/core/app/apps/chat/app_runner.py
+2
-2
app_config_manager.py
api/core/app/apps/completion/app_config_manager.py
+2
-2
app_runner.py
api/core/app/apps/completion/app_runner.py
+2
-2
app_config_manager.py
api/core/app/apps/workflow/app_config_manager.py
+1
-1
No files found.
api/core/agent/entities.py
View file @
72e81fce
from
enum
import
Enum
from
typing
import
Literal
,
Any
,
Union
,
Optional
from
typing
import
Any
,
Literal
,
Optional
,
Union
from
pydantic
import
BaseModel
...
...
api/core/app/app_config/base_app_config_manager.py
View file @
72e81fce
from
typing
import
Union
,
Optional
from
typing
import
Optional
,
Union
from
core.app.app_config.entities
import
AppAdditionalFeatures
,
EasyUIBasedAppModelConfigFrom
from
core.app.app_config.features.file_upload.manager
import
FileUploadConfigManager
...
...
@@ -6,8 +6,9 @@ from core.app.app_config.features.more_like_this.manager import MoreLikeThisConf
from
core.app.app_config.features.opening_statement.manager
import
OpeningStatementConfigManager
from
core.app.app_config.features.retrieval_resource.manager
import
RetrievalResourceConfigManager
from
core.app.app_config.features.speech_to_text.manager
import
SpeechToTextConfigManager
from
core.app.app_config.features.suggested_questions_after_answer.manager
import
\
SuggestedQuestionsAfterAnswerConfigManager
from
core.app.app_config.features.suggested_questions_after_answer.manager
import
(
SuggestedQuestionsAfterAnswerConfigManager
,
)
from
core.app.app_config.features.text_to_speech.manager
import
TextToSpeechConfigManager
from
models.model
import
AppModelConfig
...
...
api/core/app/app_config/easy_ui_based_app/model_config/converter.py
View file @
72e81fce
...
...
@@ -2,7 +2,6 @@ from typing import cast
from
core.app.app_config.entities
import
EasyUIBasedAppConfig
from
core.app.entities.app_invoke_entities
import
EasyUIBasedModelConfigEntity
from
core.entities.model_entities
import
ModelStatus
from
core.errors.error
import
ModelCurrentlyNotSupportError
,
ProviderTokenNotInitError
,
QuotaExceededError
from
core.model_runtime.entities.model_entities
import
ModelType
...
...
api/core/app/app_config/easy_ui_based_app/model_config/manager.py
View file @
72e81fce
from
core.app.app_config.entities
import
ModelConfigEntity
from
core.model_runtime.entities.model_entities
import
Model
Type
,
ModelPropertyKey
from
core.model_runtime.entities.model_entities
import
Model
PropertyKey
,
ModelType
from
core.model_runtime.model_providers
import
model_provider_factory
from
core.provider_manager
import
ProviderManager
...
...
api/core/app/app_config/easy_ui_based_app/prompt_template/manager.py
View file @
72e81fce
from
core.app.app_config.entities
import
PromptTemplateEntity
,
\
AdvancedChatPromptTemplateEntity
,
AdvancedCompletionPromptTemplateEntity
from
core.app.app_config.entities
import
(
AdvancedChatPromptTemplateEntity
,
AdvancedCompletionPromptTemplateEntity
,
PromptTemplateEntity
,
)
from
core.model_runtime.entities.message_entities
import
PromptMessageRole
from
core.prompt.simple_prompt_transform
import
ModelMode
from
models.model
import
AppMode
...
...
api/core/app/app_config/easy_ui_based_app/variables/manager.py
View file @
72e81fce
import
re
from
typing
import
Tuple
from
core.app.app_config.entities
import
VariableEntity
,
ExternalData
VariableEntity
from
core.app.app_config.entities
import
ExternalDataVariableEntity
,
VariableEntity
from
core.external_data_tool.factory
import
ExternalDataToolFactory
class
BasicVariablesConfigManager
:
@
classmethod
def
convert
(
cls
,
config
:
dict
)
->
T
uple
[
list
[
VariableEntity
],
list
[
ExternalDataVariableEntity
]]:
def
convert
(
cls
,
config
:
dict
)
->
t
uple
[
list
[
VariableEntity
],
list
[
ExternalDataVariableEntity
]]:
"""
Convert model config to model config
...
...
api/core/app/app_config/features/opening_statement/manager.py
View file @
72e81fce
from
typing
import
Tuple
class
OpeningStatementConfigManager
:
@
classmethod
def
convert
(
cls
,
config
:
dict
)
->
T
uple
[
str
,
list
]:
def
convert
(
cls
,
config
:
dict
)
->
t
uple
[
str
,
list
]:
"""
Convert model config to model config
...
...
api/core/app/apps/advanced_chat/app_config_manager.py
View file @
72e81fce
...
...
@@ -5,11 +5,12 @@ from core.app.app_config.features.file_upload.manager import FileUploadConfigMan
from
core.app.app_config.features.opening_statement.manager
import
OpeningStatementConfigManager
from
core.app.app_config.features.retrieval_resource.manager
import
RetrievalResourceConfigManager
from
core.app.app_config.features.speech_to_text.manager
import
SpeechToTextConfigManager
from
core.app.app_config.features.suggested_questions_after_answer.manager
import
\
SuggestedQuestionsAfterAnswerConfigManager
from
core.app.app_config.features.suggested_questions_after_answer.manager
import
(
SuggestedQuestionsAfterAnswerConfigManager
,
)
from
core.app.app_config.features.text_to_speech.manager
import
TextToSpeechConfigManager
from
core.app.app_config.workflow_ui_based_app.variables.manager
import
WorkflowVariablesConfigManager
from
models.model
import
App
Mode
,
App
from
models.model
import
App
,
AppMode
from
models.workflow
import
Workflow
...
...
api/core/app/apps/agent_chat/app_config_manager.py
View file @
72e81fce
...
...
@@ -3,22 +3,23 @@ from typing import Optional
from
core.agent.entities
import
AgentEntity
from
core.app.app_config.base_app_config_manager
import
BaseAppConfigManager
from
core.app.app_config.common.sensitive_word_avoidance.manager
import
SensitiveWordAvoidanceConfigManager
from
core.app.app_config.easy_ui_based_app.agent.manager
import
AgentConfigManager
from
core.app.app_config.easy_ui_based_app.dataset.manager
import
DatasetConfigManager
from
core.app.app_config.easy_ui_based_app.model_config.manager
import
ModelConfigManager
from
core.app.app_config.easy_ui_based_app.prompt_template.manager
import
PromptTemplateConfigManager
from
core.app.app_config.easy_ui_based_app.variables.manager
import
BasicVariablesConfigManager
from
core.app.app_config.common.sensitive_word_avoidance.manager
import
SensitiveWordAvoidanceConfigManager
from
core.app.app_config.entities
import
EasyUIBasedAppConfig
,
EasyUIBasedAppModelConfigFrom
,
DatasetEntity
from
core.app.app_config.entities
import
EasyUIBasedAppConfig
,
EasyUIBasedAppModelConfigFrom
from
core.app.app_config.features.file_upload.manager
import
FileUploadConfigManager
from
core.app.app_config.features.opening_statement.manager
import
OpeningStatementConfigManager
from
core.app.app_config.features.retrieval_resource.manager
import
RetrievalResourceConfigManager
from
core.app.app_config.features.speech_to_text.manager
import
SpeechToTextConfigManager
from
core.app.app_config.features.suggested_questions_after_answer.manager
import
\
SuggestedQuestionsAfterAnswerConfigManager
from
core.app.app_config.features.suggested_questions_after_answer.manager
import
(
SuggestedQuestionsAfterAnswerConfigManager
,
)
from
core.app.app_config.features.text_to_speech.manager
import
TextToSpeechConfigManager
from
core.entities.agent_entities
import
PlanningStrategy
from
models.model
import
App
Mode
,
App
,
AppModelConfig
from
models.model
import
App
,
AppMode
,
AppModelConfig
OLD_TOOLS
=
[
"dataset"
,
"google_search"
,
"web_reader"
,
"wikipedia"
,
"current_datetime"
]
...
...
api/core/app/apps/base_app_runner.py
View file @
72e81fce
...
...
@@ -2,14 +2,15 @@ import time
from
collections.abc
import
Generator
from
typing
import
Optional
,
Union
,
cast
from
core.app.app_config.entities
import
PromptTemplateEntity
,
ExternalDataVariabl
eEntity
from
core.app.app_config.entities
import
ExternalDataVariableEntity
,
PromptTemplat
eEntity
from
core.app.app_queue_manager
import
AppQueueManager
,
PublishFrom
from
core.app.features.annotation_reply.annotation_reply
import
AnnotationReplyFeature
from
core.app.features.hosting_moderation.hosting_moderation
import
HostingModerationFeature
from
core.app.entities.app_invoke_entities
import
(
EasyUIBasedAppGenerateEntity
,
InvokeFrom
,
EasyUIBasedModelConfigEntity
,
EasyUIBasedModelConfigEntity
,
InvokeFrom
,
)
from
core.app.features.annotation_reply.annotation_reply
import
AnnotationReplyFeature
from
core.app.features.hosting_moderation.hosting_moderation
import
HostingModerationFeature
from
core.external_data_tool.external_data_fetch
import
ExternalDataFetch
from
core.file.file_obj
import
FileObj
from
core.memory.token_buffer_memory
import
TokenBufferMemory
...
...
api/core/app/apps/chat/app_config_manager.py
View file @
72e81fce
from
typing
import
Optional
from
core.app.app_config.base_app_config_manager
import
BaseAppConfigManager
from
core.app.app_config.common.sensitive_word_avoidance.manager
import
SensitiveWordAvoidanceConfigManager
from
core.app.app_config.easy_ui_based_app.dataset.manager
import
DatasetConfigManager
from
core.app.app_config.easy_ui_based_app.model_config.manager
import
ModelConfigManager
from
core.app.app_config.easy_ui_based_app.prompt_template.manager
import
PromptTemplateConfigManager
from
core.app.app_config.easy_ui_based_app.variables.manager
import
BasicVariablesConfigManager
from
core.app.app_config.common.sensitive_word_avoidance.manager
import
SensitiveWordAvoidanceConfigManager
from
core.app.app_config.entities
import
EasyUIBasedAppConfig
,
EasyUIBasedAppModelConfigFrom
from
core.app.app_config.features.file_upload.manager
import
FileUploadConfigManager
from
core.app.app_config.features.opening_statement.manager
import
OpeningStatementConfigManager
from
core.app.app_config.features.retrieval_resource.manager
import
RetrievalResourceConfigManager
from
core.app.app_config.features.speech_to_text.manager
import
SpeechToTextConfigManager
from
core.app.app_config.features.suggested_questions_after_answer.manager
import
\
SuggestedQuestionsAfterAnswerConfigManager
from
core.app.app_config.features.suggested_questions_after_answer.manager
import
(
SuggestedQuestionsAfterAnswerConfigManager
,
)
from
core.app.app_config.features.text_to_speech.manager
import
TextToSpeechConfigManager
from
models.model
import
App
Mode
,
App
,
AppModelConfig
from
models.model
import
App
,
AppMode
,
AppModelConfig
class
ChatAppConfig
(
EasyUIBasedAppConfig
):
...
...
api/core/app/apps/chat/app_runner.py
View file @
72e81fce
...
...
@@ -2,12 +2,12 @@ import logging
from
typing
import
cast
from
core.app.app_queue_manager
import
AppQueueManager
,
PublishFrom
from
core.app.apps.chat.app_config_manager
import
ChatAppConfig
from
core.app.apps.base_app_runner
import
AppRunner
from
core.
callback_handler.index_tool_callback_handler
import
DatasetIndexToolCallbackHandler
from
core.
app.apps.chat.app_config_manager
import
ChatAppConfig
from
core.app.entities.app_invoke_entities
import
(
EasyUIBasedAppGenerateEntity
,
)
from
core.callback_handler.index_tool_callback_handler
import
DatasetIndexToolCallbackHandler
from
core.memory.token_buffer_memory
import
TokenBufferMemory
from
core.model_manager
import
ModelInstance
from
core.moderation.base
import
ModerationException
...
...
api/core/app/apps/completion/app_config_manager.py
View file @
72e81fce
from
typing
import
Optional
from
core.app.app_config.base_app_config_manager
import
BaseAppConfigManager
from
core.app.app_config.common.sensitive_word_avoidance.manager
import
SensitiveWordAvoidanceConfigManager
from
core.app.app_config.easy_ui_based_app.dataset.manager
import
DatasetConfigManager
from
core.app.app_config.easy_ui_based_app.model_config.manager
import
ModelConfigManager
from
core.app.app_config.easy_ui_based_app.prompt_template.manager
import
PromptTemplateConfigManager
from
core.app.app_config.easy_ui_based_app.variables.manager
import
BasicVariablesConfigManager
from
core.app.app_config.common.sensitive_word_avoidance.manager
import
SensitiveWordAvoidanceConfigManager
from
core.app.app_config.entities
import
EasyUIBasedAppConfig
,
EasyUIBasedAppModelConfigFrom
from
core.app.app_config.features.file_upload.manager
import
FileUploadConfigManager
from
core.app.app_config.features.more_like_this.manager
import
MoreLikeThisConfigManager
from
core.app.app_config.features.text_to_speech.manager
import
TextToSpeechConfigManager
from
models.model
import
App
Mode
,
App
,
AppModelConfig
from
models.model
import
App
,
AppMode
,
AppModelConfig
class
CompletionAppConfig
(
EasyUIBasedAppConfig
):
...
...
api/core/app/apps/completion/app_runner.py
View file @
72e81fce
...
...
@@ -2,12 +2,12 @@ import logging
from
typing
import
cast
from
core.app.app_queue_manager
import
AppQueueManager
from
core.app.apps.completion.app_config_manager
import
CompletionAppConfig
from
core.app.apps.base_app_runner
import
AppRunner
from
core.
callback_handler.index_tool_callback_handler
import
DatasetIndexToolCallbackHandler
from
core.
app.apps.completion.app_config_manager
import
CompletionAppConfig
from
core.app.entities.app_invoke_entities
import
(
EasyUIBasedAppGenerateEntity
,
)
from
core.callback_handler.index_tool_callback_handler
import
DatasetIndexToolCallbackHandler
from
core.model_manager
import
ModelInstance
from
core.moderation.base
import
ModerationException
from
core.rag.retrieval.dataset_retrieval
import
DatasetRetrieval
...
...
api/core/app/apps/workflow/app_config_manager.py
View file @
72e81fce
...
...
@@ -4,7 +4,7 @@ from core.app.app_config.entities import WorkflowUIBasedAppConfig
from
core.app.app_config.features.file_upload.manager
import
FileUploadConfigManager
from
core.app.app_config.features.text_to_speech.manager
import
TextToSpeechConfigManager
from
core.app.app_config.workflow_ui_based_app.variables.manager
import
WorkflowVariablesConfigManager
from
models.model
import
App
Mode
,
App
from
models.model
import
App
,
AppMode
from
models.workflow
import
Workflow
...
...
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