AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-12 06:19:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: make Citations and Attributions display enable default (#5508)

Browse Source 
Co-authored-by: StyleZhang <jasonapring2015@outlook.com>
This commit is contained in:
takatost 2024-06-24 13:03:49 +08:00 committed by GitHub
parent 54b8d98cde
commit 4a031de0d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/constants/model_template.py
View File

@ -22,7 +22,7 @@ default_app_templates = {
'model_config': { 'model_config': {
'model': { 'model': {
"provider": "openai", "provider": "openai",
"name": "gpt-4", "name": "gpt-4o",
"mode": "chat", "mode": "chat",
"completion_params": {} "completion_params": {}
}, },
@ -51,7 +51,7 @@ default_app_templates = {
'model_config': { 'model_config': {
'model': { 'model': {
"provider": "openai", "provider": "openai",
"name": "gpt-4", "name": "gpt-4o",
"mode": "chat", "mode": "chat",
"completion_params": {} "completion_params": {}
} }
@ -77,7 +77,7 @@ default_app_templates = {
'model_config': { 'model_config': {
'model': { 'model': {
"provider": "openai", "provider": "openai",
"name": "gpt-4", "name": "gpt-4o",
"mode": "chat", "mode": "chat",
"completion_params": {} "completion_params": {}
} }

4
api/core/app/apps/advanced_chat/app_generator.py
View File

@ -84,6 +84,10 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator):
workflow=workflow workflow=workflow
) )
if invoke_from == InvokeFrom.DEBUGGER:
# always enable retriever resource in debugger mode
app_config.additional_features.show_retrieve_source = True
# init application generate entity # init application generate entity
application_generate_entity = AdvancedChatAppGenerateEntity( application_generate_entity = AdvancedChatAppGenerateEntity(
task_id=str(uuid.uuid4()), task_id=str(uuid.uuid4()),

5
api/core/app/apps/agent_chat/app_generator.py
View File

@ -82,6 +82,11 @@ class AgentChatAppGenerator(MessageBasedAppGenerator):
config=args.get('model_config') config=args.get('model_config')
) )
# always enable retriever resource in debugger mode
override_model_config_dict["retriever_resource"] = {
"enabled": True
}
# parse files # parse files
files = args['files'] if args.get('files') else [] files = args['files'] if args.get('files') else []
message_file_parser = MessageFileParser(tenant_id=app_model.tenant_id, app_id=app_model.id) message_file_parser = MessageFileParser(tenant_id=app_model.tenant_id, app_id=app_model.id)

3
api/core/app/apps/chat/app_config_manager.py
View File

@ -50,6 +50,9 @@ class ChatAppConfigManager(BaseAppConfigManager):
app_model_config_dict = app_model_config.to_dict() app_model_config_dict = app_model_config.to_dict()
config_dict = app_model_config_dict.copy() config_dict = app_model_config_dict.copy()
else: else:
if not override_config_dict:
raise Exception('override_config_dict is required when config_from is ARGS')
config_dict = override_config_dict config_dict = override_config_dict
app_mode = AppMode.value_of(app_model.mode) app_mode = AppMode.value_of(app_model.mode)

5
api/core/app/apps/chat/app_generator.py
View File

@ -79,6 +79,11 @@ class ChatAppGenerator(MessageBasedAppGenerator):
config=args.get('model_config') config=args.get('model_config')
) )
# always enable retriever resource in debugger mode
override_model_config_dict["retriever_resource"] = {
"enabled": True
}
# parse files # parse files
files = args['files'] if args.get('files') else [] files = args['files'] if args.get('files') else []
message_file_parser = MessageFileParser(tenant_id=app_model.tenant_id, app_id=app_model.id) message_file_parser = MessageFileParser(tenant_id=app_model.tenant_id, app_id=app_model.id)

2
api/models/model.py
View File

@ -265,7 +265,7 @@ class AppModelConfig(db.Model):
@property @property
def retriever_resource_dict(self) -> dict: def retriever_resource_dict(self) -> dict:
return json.loads(self.retriever_resource) if self.retriever_resource \ return json.loads(self.retriever_resource) if self.retriever_resource \
else {"enabled": False} else {"enabled": True}
@property @property
def annotation_reply_dict(self) -> dict: def annotation_reply_dict(self) -> dict:

4
web/app/components/workflow/hooks/use-workflow.ts
View File

@ -485,7 +485,9 @@ export const useWorkflowInit = () => {
nodes: nodesTemplate, nodes: nodesTemplate,
edges: edgesTemplate, edges: edgesTemplate,
}, },
features: {}, features: {
retriever_resource: { enabled: true },
},
}, },
}).then((res) => { }).then((res) => {
workflowStore.getState().setDraftUpdatedAt(res.updated_at) workflowStore.getState().setDraftUpdatedAt(res.updated_at)