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

fix: AppParameterApi.get() got an unexpected keyword argument 'end_user' (#2607)

Browse Source
This commit is contained in:
takatost 2024-02-28 16:46:50 +08:00 committed by GitHub
parent 0828873b52
commit 90bdc85f8c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/controllers/service_api/wraps.py
View File

@ -49,10 +49,7 @@ def validate_app_token(view: Optional[Callable] = None, *, fetch_user_arg: Optio
kwargs['app_model'] = app_model kwargs['app_model'] = app_model
if not fetch_user_arg: if fetch_user_arg:
# use default-user
user_id = None
else:
if fetch_user_arg.fetch_from == WhereisUserArg.QUERY: if fetch_user_arg.fetch_from == WhereisUserArg.QUERY:
user_id = request.args.get('user') user_id = request.args.get('user')
elif fetch_user_arg.fetch_from == WhereisUserArg.JSON: elif fetch_user_arg.fetch_from == WhereisUserArg.JSON:
@ -66,6 +63,9 @@ def validate_app_token(view: Optional[Callable] = None, *, fetch_user_arg: Optio
if not user_id and fetch_user_arg.required: if not user_id and fetch_user_arg.required:
raise ValueError("Arg user must be provided.") raise ValueError("Arg user must be provided.")
if user_id:
user_id = str(user_id)
kwargs['end_user'] = create_or_update_end_user_for_user_id(app_model, user_id) kwargs['end_user'] = create_or_update_end_user_for_user_id(app_model, user_id)
return view_func(*args, **kwargs) return view_func(*args, **kwargs)

2
api/core/app_runner/generate_task_pipeline.py
View File

@ -175,7 +175,7 @@ class GenerateTaskPipeline:
'id': self._message.id, 'id': self._message.id,
'message_id': self._message.id, 'message_id': self._message.id,
'mode': self._conversation.mode, 'mode': self._conversation.mode,
'answer': event.llm_result.message.content, 'answer': self._task_state.llm_result.message.content,
'metadata': {}, 'metadata': {},
'created_at': int(self._message.created_at.timestamp()) 'created_at': int(self._message.created_at.timestamp())
} }