opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-04-26 18:27:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Separate object attributes before session

Browse Source
This commit is contained in:
Yansong Zhang 2025-10-11 09:54:20 +08:00
parent 572619017a
commit ce728bcff4
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
api/controllers/console/explore/trial.py
View File

@ -87,10 +87,15 @@ class TrialChatApi(TrialAppResource):
try: try:
if not isinstance(current_user, Account): if not isinstance(current_user, Account):
raise ValueError("current_user must be an Account instance") raise ValueError("current_user must be an Account instance")
# Get IDs before they might be detached from session
app_id = app_model.id
user_id = current_user.id
response = AppGenerateService.generate( response = AppGenerateService.generate(
app_model=app_model, user=current_user, args=args, invoke_from=InvokeFrom.EXPLORE, streaming=True app_model=app_model, user=current_user, args=args, invoke_from=InvokeFrom.EXPLORE, streaming=True
) )
RecommendedAppService.add_trial_app_record(app_model.id, current_user.id) RecommendedAppService.add_trial_app_record(app_id, user_id)
return helper.compact_generate_response(response) return helper.compact_generate_response(response)
except services.errors.conversation.ConversationNotExistsError: except services.errors.conversation.ConversationNotExistsError:
raise NotFound("Conversation Not Exists.") raise NotFound("Conversation Not Exists.")
@ -163,8 +168,13 @@ class TrialChatAudioApi(TrialAppResource):
try: try:
if not isinstance(current_user, Account): if not isinstance(current_user, Account):
raise ValueError("current_user must be an Account instance") raise ValueError("current_user must be an Account instance")
# Get IDs before they might be detached from session
app_id = app_model.id
user_id = current_user.id
response = AudioService.transcript_asr(app_model=app_model, file=file, end_user=None) response = AudioService.transcript_asr(app_model=app_model, file=file, end_user=None)
RecommendedAppService.add_trial_app_record(app_model.id, current_user.id) RecommendedAppService.add_trial_app_record(app_id, user_id)
return response return response
except services.errors.app_model_config.AppModelConfigBrokenError: except services.errors.app_model_config.AppModelConfigBrokenError:
logger.exception("App model config broken.") logger.exception("App model config broken.")
@ -209,8 +219,13 @@ class TrialChatTextApi(TrialAppResource):
voice = args.get("voice", None) voice = args.get("voice", None)
if not isinstance(current_user, Account): if not isinstance(current_user, Account):
raise ValueError("current_user must be an Account instance") raise ValueError("current_user must be an Account instance")
# Get IDs before they might be detached from session
app_id = app_model.id
user_id = current_user.id
response = AudioService.transcript_tts(app_model=app_model, text=text, voice=voice, message_id=message_id) response = AudioService.transcript_tts(app_model=app_model, text=text, voice=voice, message_id=message_id)
RecommendedAppService.add_trial_app_record(app_model.id, current_user.id) RecommendedAppService.add_trial_app_record(app_id, user_id)
return response return response
except services.errors.app_model_config.AppModelConfigBrokenError: except services.errors.app_model_config.AppModelConfigBrokenError:
logger.exception("App model config broken.") logger.exception("App model config broken.")
@ -259,11 +274,16 @@ class TrialCompletionApi(TrialAppResource):
try: try:
if not isinstance(current_user, Account): if not isinstance(current_user, Account):
raise ValueError("current_user must be an Account instance") raise ValueError("current_user must be an Account instance")
# Get IDs before they might be detached from session
app_id = app_model.id
user_id = current_user.id
response = AppGenerateService.generate( response = AppGenerateService.generate(
app_model=app_model, user=current_user, args=args, invoke_from=InvokeFrom.EXPLORE, streaming=streaming app_model=app_model, user=current_user, args=args, invoke_from=InvokeFrom.EXPLORE, streaming=streaming
) )
RecommendedAppService.add_trial_app_record(app_model.id, current_user.id) RecommendedAppService.add_trial_app_record(app_id, user_id)
return helper.compact_generate_response(response) return helper.compact_generate_response(response)
except services.errors.conversation.ConversationNotExistsError: except services.errors.conversation.ConversationNotExistsError:
raise NotFound("Conversation Not Exists.") raise NotFound("Conversation Not Exists.")

21
api/services/recommended_app_service.py
View File

@ -60,14 +60,13 @@ class RecommendedAppService:
:param app_id: app id :param app_id: app id
:return: :return:
""" """
with db.session as session: account_trial_app_record = db.session.query(AccountTrialAppRecord).where(
account_trial_app_record = session.query(AccountTrialAppRecord).where( AccountTrialAppRecord.app_id == app_id,
AccountTrialAppRecord.app_id == app_id, AccountTrialAppRecord.account_id == account_id
AccountTrialAppRecord.account_id == account_id ).first()
).first() if account_trial_app_record:
if account_trial_app_record: account_trial_app_record.count += 1
account_trial_app_record.count += 1 db.session.commit()
session.commit() else:
else: db.session.add(AccountTrialAppRecord(app_id=app_id, count=1, account_id=account_id))
session.add(AccountTrialAppRecord(app_id=app_id, count=1, account_id=account_id)) db.session.commit()
session.commit()