diff --git a/ai/utils/basic_func.py b/ai/utils/basic_func.py index be3981e..246f5e0 100644 --- a/ai/utils/basic_func.py +++ b/ai/utils/basic_func.py @@ -5,6 +5,7 @@ from ai.models import * from io import StringIO from django_redis import get_redis_connection from ai.models import CinemaHall +from django.db.models import Q # 清除redis锁 @@ -178,7 +179,7 @@ def get_runtime_val(key: str): # 获取当前开启的模型 def get_current_model(): - return AiModel.objects.filter(current_used=True).first() + return AiModel.objects.filter(Q(current_used=True) & Q(delete_flag=False)).first() # 通不过不同key获取数据 diff --git a/ai/utils/show_prompt.py b/ai/utils/show_prompt.py index 496b555..2d7979e 100644 --- a/ai/utils/show_prompt.py +++ b/ai/utils/show_prompt.py @@ -242,7 +242,10 @@ class ShowAI: ], stream=False, reasoning_effort="high", - extra_body={"thinking": {"type": "enabled"}} + extra_body={"thinking": {"type": "enabled"}}, + response_format={ + 'type': 'json_object' + } ) res_json = response.model_dump_json() res_obj = json.loads(res_json)