refac
This commit is contained in:
1 parent
41107a34ca
commit
1789303886
5 files changed
+17
-13
No files matched your search
@@ -2080,6 +2080,12 @@ VOICE_MODE_PROMPT_TEMPLATE = PersistentConfig(
|
|||||||
os.environ.get('VOICE_MODE_PROMPT_TEMPLATE', ''),
|
os.environ.get('VOICE_MODE_PROMPT_TEMPLATE', ''),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
ENABLE_VOICE_MODE_PROMPT = PersistentConfig(
|
||||||
|
'ENABLE_VOICE_MODE_PROMPT',
|
||||||
|
'task.voice.prompt.enable',
|
||||||
|
os.environ.get('ENABLE_VOICE_MODE_PROMPT', 'True').lower() == 'true',
|
||||||
|
)
|
||||||
|
|
||||||
DEFAULT_VOICE_MODE_PROMPT_TEMPLATE = """You are a friendly, concise voice assistant.
|
DEFAULT_VOICE_MODE_PROMPT_TEMPLATE = """You are a friendly, concise voice assistant.
|
||||||
|
|
||||||
Everything you say will be spoken aloud.
|
Everything you say will be spoken aloud.
|
||||||
|
|||||||
@@ -479,6 +479,7 @@ from open_webui.config import (
|
|||||||
IMAGE_PROMPT_GENERATION_PROMPT_TEMPLATE,
|
IMAGE_PROMPT_GENERATION_PROMPT_TEMPLATE,
|
||||||
TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE,
|
TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE,
|
||||||
VOICE_MODE_PROMPT_TEMPLATE,
|
VOICE_MODE_PROMPT_TEMPLATE,
|
||||||
|
ENABLE_VOICE_MODE_PROMPT,
|
||||||
QUERY_GENERATION_PROMPT_TEMPLATE,
|
QUERY_GENERATION_PROMPT_TEMPLATE,
|
||||||
AUTOCOMPLETE_GENERATION_PROMPT_TEMPLATE,
|
AUTOCOMPLETE_GENERATION_PROMPT_TEMPLATE,
|
||||||
AUTOCOMPLETE_GENERATION_INPUT_MAX_LENGTH,
|
AUTOCOMPLETE_GENERATION_INPUT_MAX_LENGTH,
|
||||||
@@ -1367,6 +1368,7 @@ app.state.config.QUERY_GENERATION_PROMPT_TEMPLATE = QUERY_GENERATION_PROMPT_TEMP
|
|||||||
app.state.config.AUTOCOMPLETE_GENERATION_PROMPT_TEMPLATE = AUTOCOMPLETE_GENERATION_PROMPT_TEMPLATE
|
app.state.config.AUTOCOMPLETE_GENERATION_PROMPT_TEMPLATE = AUTOCOMPLETE_GENERATION_PROMPT_TEMPLATE
|
||||||
app.state.config.AUTOCOMPLETE_GENERATION_INPUT_MAX_LENGTH = AUTOCOMPLETE_GENERATION_INPUT_MAX_LENGTH
|
app.state.config.AUTOCOMPLETE_GENERATION_INPUT_MAX_LENGTH = AUTOCOMPLETE_GENERATION_INPUT_MAX_LENGTH
|
||||||
app.state.config.VOICE_MODE_PROMPT_TEMPLATE = VOICE_MODE_PROMPT_TEMPLATE
|
app.state.config.VOICE_MODE_PROMPT_TEMPLATE = VOICE_MODE_PROMPT_TEMPLATE
|
||||||
|
app.state.config.ENABLE_VOICE_MODE_PROMPT = ENABLE_VOICE_MODE_PROMPT
|
||||||
|
|
||||||
|
|
||||||
########################################
|
########################################
|
||||||
|
|||||||
@@ -79,6 +79,7 @@ async def get_task_config(request: Request, user=Depends(get_verified_user)):
|
|||||||
'ENABLE_RETRIEVAL_QUERY_GENERATION': request.app.state.config.ENABLE_RETRIEVAL_QUERY_GENERATION,
|
'ENABLE_RETRIEVAL_QUERY_GENERATION': request.app.state.config.ENABLE_RETRIEVAL_QUERY_GENERATION,
|
||||||
'QUERY_GENERATION_PROMPT_TEMPLATE': request.app.state.config.QUERY_GENERATION_PROMPT_TEMPLATE,
|
'QUERY_GENERATION_PROMPT_TEMPLATE': request.app.state.config.QUERY_GENERATION_PROMPT_TEMPLATE,
|
||||||
'TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE': request.app.state.config.TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE,
|
'TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE': request.app.state.config.TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE,
|
||||||
|
'ENABLE_VOICE_MODE_PROMPT': request.app.state.config.ENABLE_VOICE_MODE_PROMPT,
|
||||||
'VOICE_MODE_PROMPT_TEMPLATE': request.app.state.config.VOICE_MODE_PROMPT_TEMPLATE,
|
'VOICE_MODE_PROMPT_TEMPLATE': request.app.state.config.VOICE_MODE_PROMPT_TEMPLATE,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -99,6 +100,7 @@ class TaskConfigForm(BaseModel):
|
|||||||
ENABLE_RETRIEVAL_QUERY_GENERATION: bool
|
ENABLE_RETRIEVAL_QUERY_GENERATION: bool
|
||||||
QUERY_GENERATION_PROMPT_TEMPLATE: str
|
QUERY_GENERATION_PROMPT_TEMPLATE: str
|
||||||
TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE: str
|
TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE: str
|
||||||
|
ENABLE_VOICE_MODE_PROMPT: bool
|
||||||
VOICE_MODE_PROMPT_TEMPLATE: Optional[str]
|
VOICE_MODE_PROMPT_TEMPLATE: Optional[str]
|
||||||
|
|
||||||
|
|
||||||
@@ -127,6 +129,7 @@ async def update_task_config(request: Request, form_data: TaskConfigForm, user=D
|
|||||||
request.app.state.config.QUERY_GENERATION_PROMPT_TEMPLATE = form_data.QUERY_GENERATION_PROMPT_TEMPLATE
|
request.app.state.config.QUERY_GENERATION_PROMPT_TEMPLATE = form_data.QUERY_GENERATION_PROMPT_TEMPLATE
|
||||||
request.app.state.config.TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE = form_data.TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE
|
request.app.state.config.TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE = form_data.TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE
|
||||||
|
|
||||||
|
request.app.state.config.ENABLE_VOICE_MODE_PROMPT = form_data.ENABLE_VOICE_MODE_PROMPT
|
||||||
request.app.state.config.VOICE_MODE_PROMPT_TEMPLATE = form_data.VOICE_MODE_PROMPT_TEMPLATE
|
request.app.state.config.VOICE_MODE_PROMPT_TEMPLATE = form_data.VOICE_MODE_PROMPT_TEMPLATE
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -145,6 +148,7 @@ async def update_task_config(request: Request, form_data: TaskConfigForm, user=D
|
|||||||
'ENABLE_RETRIEVAL_QUERY_GENERATION': request.app.state.config.ENABLE_RETRIEVAL_QUERY_GENERATION,
|
'ENABLE_RETRIEVAL_QUERY_GENERATION': request.app.state.config.ENABLE_RETRIEVAL_QUERY_GENERATION,
|
||||||
'QUERY_GENERATION_PROMPT_TEMPLATE': request.app.state.config.QUERY_GENERATION_PROMPT_TEMPLATE,
|
'QUERY_GENERATION_PROMPT_TEMPLATE': request.app.state.config.QUERY_GENERATION_PROMPT_TEMPLATE,
|
||||||
'TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE': request.app.state.config.TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE,
|
'TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE': request.app.state.config.TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE,
|
||||||
|
'ENABLE_VOICE_MODE_PROMPT': request.app.state.config.ENABLE_VOICE_MODE_PROMPT,
|
||||||
'VOICE_MODE_PROMPT_TEMPLATE': request.app.state.config.VOICE_MODE_PROMPT_TEMPLATE,
|
'VOICE_MODE_PROMPT_TEMPLATE': request.app.state.config.VOICE_MODE_PROMPT_TEMPLATE,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2448,8 +2448,8 @@ async def process_chat_payload(request, form_data, user, metadata, model):
|
|||||||
extra_params['__features__'] = features
|
extra_params['__features__'] = features
|
||||||
if features:
|
if features:
|
||||||
if 'voice' in features and features['voice']:
|
if 'voice' in features and features['voice']:
|
||||||
if request.app.state.config.VOICE_MODE_PROMPT_TEMPLATE != None:
|
if getattr(request.app.state.config, "ENABLE_VOICE_MODE_PROMPT", True):
|
||||||
if request.app.state.config.VOICE_MODE_PROMPT_TEMPLATE != '':
|
if request.app.state.config.VOICE_MODE_PROMPT_TEMPLATE:
|
||||||
template = request.app.state.config.VOICE_MODE_PROMPT_TEMPLATE
|
template = request.app.state.config.VOICE_MODE_PROMPT_TEMPLATE
|
||||||
else:
|
else:
|
||||||
template = DEFAULT_VOICE_MODE_PROMPT_TEMPLATE
|
template = DEFAULT_VOICE_MODE_PROMPT_TEMPLATE
|
||||||
|
|||||||
@@ -31,6 +31,7 @@
|
|||||||
ENABLE_RETRIEVAL_QUERY_GENERATION: true,
|
ENABLE_RETRIEVAL_QUERY_GENERATION: true,
|
||||||
QUERY_GENERATION_PROMPT_TEMPLATE: '',
|
QUERY_GENERATION_PROMPT_TEMPLATE: '',
|
||||||
TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE: '',
|
TOOLS_FUNCTION_CALLING_PROMPT_TEMPLATE: '',
|
||||||
|
ENABLE_VOICE_MODE_PROMPT: true,
|
||||||
VOICE_MODE_PROMPT_TEMPLATE: ''
|
VOICE_MODE_PROMPT_TEMPLATE: ''
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -239,19 +240,10 @@
|
|||||||
{$i18n.t('Voice Mode Custom Prompt')}
|
{$i18n.t('Voice Mode Custom Prompt')}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Switch
|
<Switch bind:state={taskConfig.ENABLE_VOICE_MODE_PROMPT} />
|
||||||
state={taskConfig.VOICE_MODE_PROMPT_TEMPLATE != null}
|
|
||||||
on:change={(e) => {
|
|
||||||
if (e.detail) {
|
|
||||||
taskConfig.VOICE_MODE_PROMPT_TEMPLATE = '';
|
|
||||||
} else {
|
|
||||||
taskConfig.VOICE_MODE_PROMPT_TEMPLATE = null;
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{#if taskConfig.VOICE_MODE_PROMPT_TEMPLATE != null}
|
{#if taskConfig.ENABLE_VOICE_MODE_PROMPT}
|
||||||
<div class="mb-2.5">
|
<div class="mb-2.5">
|
||||||
<div class=" mb-1 text-xs font-medium">{$i18n.t('Voice Mode Prompt')}</div>
|
<div class=" mb-1 text-xs font-medium">{$i18n.t('Voice Mode Prompt')}</div>
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user