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
2387f34e
Commit
2387f34e
authored
Jul 24, 2023
by
StyleZhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: disable speech-to-text when provider is not openai
parent
1d7a65f6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
8 deletions
+28
-8
parameter.py
api/controllers/console/explore/parameter.py
+7
-2
parameter.py
api/controllers/console/universal_chat/parameter.py
+7
-2
app.py
api/controllers/service_api/app/app.py
+7
-2
app.py
api/controllers/web/app.py
+7
-2
No files found.
api/controllers/console/explore/parameter.py
View file @
2387f34e
...
...
@@ -4,6 +4,10 @@ from flask_restful import marshal_with, fields
from
controllers.console
import
api
from
controllers.console.explore.wraps
import
InstalledAppResource
from
core.llm.llm_builder
import
LLMBuilder
from
models.provider
import
ProviderName
from
models.model
import
InstalledApp
class
AppParameterApi
(
InstalledAppResource
):
"""Resource for app variables."""
...
...
@@ -27,16 +31,17 @@ class AppParameterApi(InstalledAppResource):
}
@
marshal_with
(
parameters_fields
)
def
get
(
self
,
installed_app
):
def
get
(
self
,
installed_app
:
InstalledApp
):
"""Retrieve app parameters."""
app_model
=
installed_app
.
app
app_model_config
=
app_model
.
app_model_config
provider_name
=
LLMBuilder
.
get_default_provider
(
installed_app
.
tenant_id
,
'whisper-1'
)
return
{
'opening_statement'
:
app_model_config
.
opening_statement
,
'suggested_questions'
:
app_model_config
.
suggested_questions_list
,
'suggested_questions_after_answer'
:
app_model_config
.
suggested_questions_after_answer_dict
,
'speech_to_text'
:
app_model_config
.
speech_to_text_dict
,
'speech_to_text'
:
app_model_config
.
speech_to_text_dict
if
provider_name
==
ProviderName
.
OPENAI
.
value
else
{
'enabled'
:
False
}
,
'more_like_this'
:
app_model_config
.
more_like_this_dict
,
'user_input_form'
:
app_model_config
.
user_input_form_list
}
...
...
api/controllers/console/universal_chat/parameter.py
View file @
2387f34e
...
...
@@ -4,6 +4,10 @@ from flask_restful import marshal_with, fields
from
controllers.console
import
api
from
controllers.console.universal_chat.wraps
import
UniversalChatResource
from
core.llm.llm_builder
import
LLMBuilder
from
models.provider
import
ProviderName
from
models.model
import
App
class
UniversalChatParameterApi
(
UniversalChatResource
):
"""Resource for app variables."""
...
...
@@ -15,16 +19,17 @@ class UniversalChatParameterApi(UniversalChatResource):
}
@
marshal_with
(
parameters_fields
)
def
get
(
self
,
universal_app
):
def
get
(
self
,
universal_app
:
App
):
"""Retrieve app parameters."""
app_model
=
universal_app
app_model_config
=
app_model
.
app_model_config
provider_name
=
LLMBuilder
.
get_default_provider
(
universal_app
.
tenant_id
,
'whisper-1'
)
return
{
'opening_statement'
:
app_model_config
.
opening_statement
,
'suggested_questions'
:
app_model_config
.
suggested_questions_list
,
'suggested_questions_after_answer'
:
app_model_config
.
suggested_questions_after_answer_dict
,
'speech_to_text'
:
app_model_config
.
speech_to_text_dict
,
'speech_to_text'
:
app_model_config
.
speech_to_text_dict
if
provider_name
==
ProviderName
.
OPENAI
.
value
else
{
'enabled'
:
False
}
,
}
...
...
api/controllers/service_api/app/app.py
View file @
2387f34e
...
...
@@ -4,6 +4,10 @@ from flask_restful import fields, marshal_with
from
controllers.service_api
import
api
from
controllers.service_api.wraps
import
AppApiResource
from
core.llm.llm_builder
import
LLMBuilder
from
models.provider
import
ProviderName
from
models.model
import
App
class
AppParameterApi
(
AppApiResource
):
"""Resource for app variables."""
...
...
@@ -28,15 +32,16 @@ class AppParameterApi(AppApiResource):
}
@
marshal_with
(
parameters_fields
)
def
get
(
self
,
app_model
,
end_user
):
def
get
(
self
,
app_model
:
App
,
end_user
):
"""Retrieve app parameters."""
app_model_config
=
app_model
.
app_model_config
provider_name
=
LLMBuilder
.
get_default_provider
(
app_model
.
tenant_id
,
'whisper-1'
)
return
{
'opening_statement'
:
app_model_config
.
opening_statement
,
'suggested_questions'
:
app_model_config
.
suggested_questions_list
,
'suggested_questions_after_answer'
:
app_model_config
.
suggested_questions_after_answer_dict
,
'speech_to_text'
:
app_model_config
.
speech_to_text_dict
,
'speech_to_text'
:
app_model_config
.
speech_to_text_dict
if
provider_name
==
ProviderName
.
OPENAI
.
value
else
{
'enabled'
:
False
}
,
'more_like_this'
:
app_model_config
.
more_like_this_dict
,
'user_input_form'
:
app_model_config
.
user_input_form_list
}
...
...
api/controllers/web/app.py
View file @
2387f34e
...
...
@@ -4,6 +4,10 @@ from flask_restful import marshal_with, fields
from
controllers.web
import
api
from
controllers.web.wraps
import
WebApiResource
from
core.llm.llm_builder
import
LLMBuilder
from
models.provider
import
ProviderName
from
models.model
import
App
class
AppParameterApi
(
WebApiResource
):
"""Resource for app variables."""
...
...
@@ -27,15 +31,16 @@ class AppParameterApi(WebApiResource):
}
@
marshal_with
(
parameters_fields
)
def
get
(
self
,
app_model
,
end_user
):
def
get
(
self
,
app_model
:
App
,
end_user
):
"""Retrieve app parameters."""
app_model_config
=
app_model
.
app_model_config
provider_name
=
LLMBuilder
.
get_default_provider
(
app_model
.
tenant_id
,
'whisper-1'
)
return
{
'opening_statement'
:
app_model_config
.
opening_statement
,
'suggested_questions'
:
app_model_config
.
suggested_questions_list
,
'suggested_questions_after_answer'
:
app_model_config
.
suggested_questions_after_answer_dict
,
'speech_to_text'
:
app_model_config
.
speech_to_text_dict
,
'speech_to_text'
:
app_model_config
.
speech_to_text_dict
if
provider_name
==
ProviderName
.
OPENAI
.
value
else
{
'enabled'
:
False
}
,
'more_like_this'
:
app_model_config
.
more_like_this_dict
,
'user_input_form'
:
app_model_config
.
user_input_form_list
}
...
...
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