Unverified Commit 90bdc85f authored by takatost's avatar takatost Committed by GitHub

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

parent 0828873b
......@@ -49,10 +49,7 @@ def validate_app_token(view: Optional[Callable] = None, *, fetch_user_arg: Optio
kwargs['app_model'] = app_model
if not fetch_user_arg:
# use default-user
user_id = None
else:
if fetch_user_arg:
if fetch_user_arg.fetch_from == WhereisUserArg.QUERY:
user_id = request.args.get('user')
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:
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)
return view_func(*args, **kwargs)
......
......@@ -175,7 +175,7 @@ class GenerateTaskPipeline:
'id': self._message.id,
'message_id': self._message.id,
'mode': self._conversation.mode,
'answer': event.llm_result.message.content,
'answer': self._task_state.llm_result.message.content,
'metadata': {},
'created_at': int(self._message.created_at.timestamp())
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment