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
80011ce0
Commit
80011ce0
authored
Feb 28, 2024
by
takatost
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lint
parent
2f8c7c46
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
17 additions
and
31 deletions
+17
-31
model_config.py
api/controllers/console/app/model_config.py
+1
-1
agent.py
api/core/apps/config_validators/agent.py
+1
-2
dataset.py
api/core/apps/config_validators/dataset.py
+1
-2
external_data_tools.py
api/core/apps/config_validators/external_data_tools.py
+1
-2
file_upload.py
api/core/apps/config_validators/file_upload.py
+1
-2
model.py
api/core/apps/config_validators/model.py
+2
-3
moderation.py
api/core/apps/config_validators/moderation.py
+1
-2
more_like_this.py
api/core/apps/config_validators/more_like_this.py
+1
-2
opening_statement.py
api/core/apps/config_validators/opening_statement.py
+1
-2
prompt.py
api/core/apps/config_validators/prompt.py
+1
-2
retriever_resource.py
api/core/apps/config_validators/retriever_resource.py
+1
-2
speech_to_text.py
api/core/apps/config_validators/speech_to_text.py
+1
-2
suggested_questions.py
api/core/apps/config_validators/suggested_questions.py
+1
-2
text_to_speech.py
api/core/apps/config_validators/text_to_speech.py
+1
-2
user_input_form.py
api/core/apps/config_validators/user_input_form.py
+1
-2
completion_service.py
api/services/completion_service.py
+1
-1
No files found.
api/controllers/console/app/model_config.py
View file @
80011ce0
...
...
@@ -10,7 +10,7 @@ from controllers.console.wraps import account_initialization_required
from
events.app_event
import
app_model_config_was_updated
from
extensions.ext_database
import
db
from
libs.login
import
login_required
from
models.model
import
AppMode
lConfig
,
AppMode
from
models.model
import
AppMode
,
AppModelConfig
from
services.app_model_config_service
import
AppModelConfigService
...
...
api/core/apps/config_validators/agent.py
View file @
80011ce0
import
uuid
from
typing
import
Tuple
from
core.agent.agent_executor
import
PlanningStrategy
from
core.apps.config_validators.dataset
import
DatasetValidator
...
...
@@ -9,7 +8,7 @@ OLD_TOOLS = ["dataset", "google_search", "web_reader", "wikipedia", "current_dat
class
AgentValidator
:
@
classmethod
def
validate_and_set_defaults
(
cls
,
tenant_id
:
str
,
config
:
dict
)
->
T
uple
[
dict
,
list
[
str
]]:
def
validate_and_set_defaults
(
cls
,
tenant_id
:
str
,
config
:
dict
)
->
t
uple
[
dict
,
list
[
str
]]:
"""
Validate and set defaults for agent feature
...
...
api/core/apps/config_validators/dataset.py
View file @
80011ce0
import
uuid
from
typing
import
Tuple
from
core.agent.agent_executor
import
PlanningStrategy
from
models.model
import
AppMode
...
...
@@ -8,7 +7,7 @@ from services.dataset_service import DatasetService
class
DatasetValidator
:
@
classmethod
def
validate_and_set_defaults
(
cls
,
tenant_id
:
str
,
app_mode
:
AppMode
,
config
:
dict
)
->
T
uple
[
dict
,
list
[
str
]]:
def
validate_and_set_defaults
(
cls
,
tenant_id
:
str
,
app_mode
:
AppMode
,
config
:
dict
)
->
t
uple
[
dict
,
list
[
str
]]:
"""
Validate and set defaults for dataset feature
...
...
api/core/apps/config_validators/external_data_tools.py
View file @
80011ce0
from
typing
import
Tuple
from
core.external_data_tool.factory
import
ExternalDataToolFactory
class
ExternalDataToolsValidator
:
@
classmethod
def
validate_and_set_defaults
(
cls
,
tenant_id
:
str
,
config
:
dict
)
->
T
uple
[
dict
,
list
[
str
]]:
def
validate_and_set_defaults
(
cls
,
tenant_id
:
str
,
config
:
dict
)
->
t
uple
[
dict
,
list
[
str
]]:
"""
Validate and set defaults for external data fetch feature
...
...
api/core/apps/config_validators/file_upload.py
View file @
80011ce0
from
typing
import
Tuple
class
FileUploadValidator
:
@
classmethod
def
validate_and_set_defaults
(
cls
,
config
:
dict
)
->
T
uple
[
dict
,
list
[
str
]]:
def
validate_and_set_defaults
(
cls
,
config
:
dict
)
->
t
uple
[
dict
,
list
[
str
]]:
"""
Validate and set defaults for file upload feature
...
...
api/core/apps/config_validators/model.py
View file @
80011ce0
from
typing
import
Tuple
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
class
ModelValidator
:
@
classmethod
def
validate_and_set_defaults
(
cls
,
tenant_id
:
str
,
config
:
dict
)
->
T
uple
[
dict
,
list
[
str
]]:
def
validate_and_set_defaults
(
cls
,
tenant_id
:
str
,
config
:
dict
)
->
t
uple
[
dict
,
list
[
str
]]:
"""
Validate and set defaults for model config
...
...
api/core/apps/config_validators/moderation.py
View file @
80011ce0
import
logging
from
typing
import
Tuple
from
core.moderation.factory
import
ModerationFactory
...
...
@@ -8,7 +7,7 @@ logger = logging.getLogger(__name__)
class
ModerationValidator
:
@
classmethod
def
validate_and_set_defaults
(
cls
,
tenant_id
,
config
:
dict
)
->
T
uple
[
dict
,
list
[
str
]]:
def
validate_and_set_defaults
(
cls
,
tenant_id
,
config
:
dict
)
->
t
uple
[
dict
,
list
[
str
]]:
if
not
config
.
get
(
"sensitive_word_avoidance"
):
config
[
"sensitive_word_avoidance"
]
=
{
"enabled"
:
False
...
...
api/core/apps/config_validators/more_like_this.py
View file @
80011ce0
from
typing
import
Tuple
class
MoreLikeThisValidator
:
@
classmethod
def
validate_and_set_defaults
(
cls
,
config
:
dict
)
->
T
uple
[
dict
,
list
[
str
]]:
def
validate_and_set_defaults
(
cls
,
config
:
dict
)
->
t
uple
[
dict
,
list
[
str
]]:
"""
Validate and set defaults for more like this feature
...
...
api/core/apps/config_validators/opening_statement.py
View file @
80011ce0
from
typing
import
Tuple
class
OpeningStatementValidator
:
@
classmethod
def
validate_and_set_defaults
(
cls
,
config
:
dict
)
->
T
uple
[
dict
,
list
[
str
]]:
def
validate_and_set_defaults
(
cls
,
config
:
dict
)
->
t
uple
[
dict
,
list
[
str
]]:
"""
Validate and set defaults for opening statement feature
...
...
api/core/apps/config_validators/prompt.py
View file @
80011ce0
from
typing
import
Tuple
from
core.entities.application_entities
import
PromptTemplateEntity
from
core.prompt.simple_prompt_transform
import
ModelMode
...
...
@@ -7,7 +6,7 @@ from models.model import AppMode
class
PromptValidator
:
@
classmethod
def
validate_and_set_defaults
(
cls
,
app_mode
:
AppMode
,
config
:
dict
)
->
T
uple
[
dict
,
list
[
str
]]:
def
validate_and_set_defaults
(
cls
,
app_mode
:
AppMode
,
config
:
dict
)
->
t
uple
[
dict
,
list
[
str
]]:
"""
Validate pre_prompt and set defaults for prompt feature
depending on the config['model']
...
...
api/core/apps/config_validators/retriever_resource.py
View file @
80011ce0
from
typing
import
Tuple
class
RetrieverResourceValidator
:
@
classmethod
def
validate_and_set_defaults
(
cls
,
config
:
dict
)
->
T
uple
[
dict
,
list
[
str
]]:
def
validate_and_set_defaults
(
cls
,
config
:
dict
)
->
t
uple
[
dict
,
list
[
str
]]:
"""
Validate and set defaults for retriever resource feature
...
...
api/core/apps/config_validators/speech_to_text.py
View file @
80011ce0
from
typing
import
Tuple
class
SpeechToTextValidator
:
@
classmethod
def
validate_and_set_defaults
(
cls
,
config
:
dict
)
->
T
uple
[
dict
,
list
[
str
]]:
def
validate_and_set_defaults
(
cls
,
config
:
dict
)
->
t
uple
[
dict
,
list
[
str
]]:
"""
Validate and set defaults for speech to text feature
...
...
api/core/apps/config_validators/suggested_questions.py
View file @
80011ce0
from
typing
import
Tuple
class
SuggestedQuestionsValidator
:
@
classmethod
def
validate_and_set_defaults
(
cls
,
config
:
dict
)
->
T
uple
[
dict
,
list
[
str
]]:
def
validate_and_set_defaults
(
cls
,
config
:
dict
)
->
t
uple
[
dict
,
list
[
str
]]:
"""
Validate and set defaults for suggested questions feature
...
...
api/core/apps/config_validators/text_to_speech.py
View file @
80011ce0
from
typing
import
Tuple
class
TextToSpeechValidator
:
@
classmethod
def
validate_and_set_defaults
(
cls
,
config
:
dict
)
->
T
uple
[
dict
,
list
[
str
]]:
def
validate_and_set_defaults
(
cls
,
config
:
dict
)
->
t
uple
[
dict
,
list
[
str
]]:
"""
Validate and set defaults for text to speech feature
...
...
api/core/apps/config_validators/user_input_form.py
View file @
80011ce0
import
re
from
typing
import
Tuple
class
UserInputFormValidator
:
@
classmethod
def
validate_and_set_defaults
(
cls
,
config
:
dict
)
->
T
uple
[
dict
,
list
[
str
]]:
def
validate_and_set_defaults
(
cls
,
config
:
dict
)
->
t
uple
[
dict
,
list
[
str
]]:
"""
Validate and set defaults for user input form
...
...
api/services/completion_service.py
View file @
80011ce0
...
...
@@ -9,7 +9,7 @@ from core.apps.config_validators.model import ModelValidator
from
core.entities.application_entities
import
InvokeFrom
from
core.file.message_file_parser
import
MessageFileParser
from
extensions.ext_database
import
db
from
models.model
import
Account
,
App
,
AppMode
lConfig
,
Conversation
,
EndUser
,
Message
,
AppMod
e
from
models.model
import
Account
,
App
,
AppMode
,
AppModelConfig
,
Conversation
,
EndUser
,
Messag
e
from
services.app_model_config_service
import
AppModelConfigService
from
services.errors.app
import
MoreLikeThisDisabledError
from
services.errors.app_model_config
import
AppModelConfigBrokenError
...
...
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