Skip to content

Commit 7d938f9

Browse files
authored
fix: 设置模型参数默认值,允许用户不设置模型参数 (#1750)
1 parent 70fcb9c commit 7d938f9

File tree

2 files changed

+23
-11
lines changed

2 files changed

+23
-11
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Generated by Django 4.2.15 on 2024-10-15 14:49
2+
3+
from django.db import migrations, models
4+
5+
sql = """
6+
UPDATE "public"."model"
7+
SET "model_params_form" = '[{"attrs": {"max": 1, "min": 0.1, "step": 0.01, "precision": 2, "show-input": true, "show-input-controls": false}, "field": "temperature", "label": {"attrs": {"tooltip": "较高的数值会使输出更加随机,而较低的数值会使其更加集中和确定"}, "label": "温度", "input_type": "TooltipLabel", "props_info": {}}, "required": true, "input_type": "Slider", "props_info": {}, "trigger_type": "OPTION_LIST", "default_value": 0.5, "relation_show_field_dict": {}, "relation_trigger_field_dict": {}}, {"attrs": {"max": 100000, "min": 1, "step": 1, "precision": 0, "show-input": true, "show-input-controls": false}, "field": "max_tokens", "label": {"attrs": {"tooltip": "指定模型可生成的最大token个数"}, "label": "输出最大Tokens", "input_type": "TooltipLabel", "props_info": {}}, "required": true, "input_type": "Slider", "props_info": {}, "trigger_type": "OPTION_LIST", "default_value": 4096, "relation_show_field_dict": {}, "relation_trigger_field_dict": {}}]'
8+
WHERE jsonb_array_length(model_params_form)=0
9+
"""
10+
11+
12+
class Migration(migrations.Migration):
13+
dependencies = [
14+
('setting', '0008_modelparam'),
15+
]
16+
17+
operations = [
18+
migrations.RunSQL(sql)
19+
]

apps/setting/serializers/provider_serializers.py

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ class Query(serializers.Serializer):
7979

8080
create_user = serializers.CharField(required=False, error_messages=ErrMessage.char("创建者"))
8181

82-
8382
def list(self, with_valid):
8483
if with_valid:
8584
self.is_valid(raise_exception=True)
@@ -92,7 +91,8 @@ def list(self, with_valid):
9291
model_query_set = QuerySet(Model).filter(Q(user_id=create_user))
9392
# 当前用户能查看其他人的模型,只能查看公开的
9493
else:
95-
model_query_set = QuerySet(Model).filter((Q(user_id=self.data.get('create_user')) & Q(permission_type='PUBLIC')))
94+
model_query_set = QuerySet(Model).filter(
95+
(Q(user_id=self.data.get('create_user')) & Q(permission_type='PUBLIC')))
9696
else:
9797
model_query_set = QuerySet(Model).filter((Q(user_id=user_id) | Q(permission_type='PUBLIC')))
9898
query_params = {}
@@ -107,11 +107,11 @@ def list(self, with_valid):
107107
if self.data.get('permission_type') is not None:
108108
query_params['permission_type'] = self.data.get('permission_type')
109109

110-
111110
return [
112111
{'id': str(model.id), 'provider': model.provider, 'name': model.name, 'model_type': model.model_type,
113112
'model_name': model.model_name, 'status': model.status, 'meta': model.meta,
114-
'permission_type': model.permission_type, 'user_id': model.user_id, 'username': model.user.username} for model in
113+
'permission_type': model.permission_type, 'user_id': model.user_id, 'username': model.user.username}
114+
for model in
115115
model_query_set.filter(**query_params).order_by("-create_time")]
116116

117117
class Edit(serializers.Serializer):
@@ -243,14 +243,7 @@ def get_model_params(self, with_valid=True):
243243
self.is_valid(raise_exception=True)
244244
model_id = self.data.get('id')
245245
model = QuerySet(Model).filter(id=model_id).first()
246-
credential = get_model_credential(model.provider, model.model_type, model.model_name)
247246
# 已经保存过的模型参数表单
248-
if model.model_params_form is not None and len(model.model_params_form) > 0:
249-
return model.model_params_form
250-
# 没有保存过的LLM类型的
251-
if credential.get_model_params_setting_form(model.model_name) is not None:
252-
return credential.get_model_params_setting_form(model.model_name).to_form_list()
253-
# 其他的
254247
return model.model_params_form
255248

256249
class ModelParamsForm(serializers.Serializer):

0 commit comments

Comments
 (0)