feat: 创建模型同时配置高级参数

liuruibin · liuruibin · commit 0ab3f7fdd942 · 2024-12-11T12:50:53.000+08:00
diff --git a/apps/setting/models_provider/impl/openai_model_provider/credential/tti.py b/apps/setting/models_provider/impl/openai_model_provider/credential/tti.py
@@ -10,14 +10,32 @@
 from common.forms import BaseForm, TooltipLabel
 from setting.models_provider.base_model_provider import BaseModelCredential, ValidCode
 
+
 class OpenAITTIModelParams(BaseForm):
-    size = forms.TextInputField(
+    size = forms.SingleSelect(
         TooltipLabel('图片尺寸', '指定生成图片的尺寸, 如: 1024x1024'),
-        required=True, default_value='1024x1024')
+        required=True,
+        default_value='1024x1024',
+        option_list=[
+            {'value': '1024x1024', 'label': '1024x1024'},
+            {'value': '1024x1792', 'label': '1024x1792'},
+            {'value': '1792x1024', 'label': '1792x1024'},
+        ],
+        text_field='label',
+        value_field='value'
+    )
 
-    quality = forms.TextInputField(
+    quality = forms.SingleSelect(
         TooltipLabel('图片质量', ''),
-        required=True, default_value='standard')
+        required=True,
+        default_value='standard',
+        option_list=[
+            {'value': 'standard', 'label': 'standard'},
+            {'value': 'hd', 'label': 'hd'},
+        ],
+        text_field='label',
+        value_field='value'
+    )
 
     n = forms.SliderField(
         TooltipLabel('图片数量', '指定生成图片的数量'),
diff --git a/apps/setting/models_provider/impl/openai_model_provider/model/tti.py b/apps/setting/models_provider/impl/openai_model_provider/model/tti.py
@@ -32,7 +32,7 @@ def __init__(self, **kwargs):
 
     @staticmethod
     def new_instance(model_type, model_name, model_credential: Dict[str, object], **model_kwargs):
-        optional_params = {'params': {}}
+        optional_params = {'params': {'size': '1024x1024', 'quality': 'standard', 'n': 1}}
         for key, value in model_kwargs.items():
             if key not in ['model_id', 'use_local', 'streaming']:
                 optional_params['params'][key] = value
@@ -53,7 +53,7 @@ def generate_image(self, prompt: str, negative_prompt: str = None):
 
         chat = OpenAI(api_key=self.api_key, base_url=self.api_base)
         res = chat.images.generate(model=self.model, prompt=prompt, **self.params)
-
+        print(self.params)
         file_urls = []
         for content in res.data:
             url = content.url
diff --git a/apps/setting/models_provider/impl/qwen_model_provider/credential/tti.py b/apps/setting/models_provider/impl/qwen_model_provider/credential/tti.py
@@ -19,19 +19,44 @@
 
 
 class QwenModelParams(BaseForm):
-    size = forms.TextInputField(
+    size = forms.SingleSelect(
         TooltipLabel('图片尺寸', '指定生成图片的尺寸, 如: 1024x1024'),
-        required=True, default_value='1024x1024')
+        required=True,
+        default_value='1024*1024',
+        option_list=[
+            {'value': '1024*1024', 'label': '1024*1024'},
+            {'value': '720*1280', 'label': '720*1280'},
+            {'value': '768*1152', 'label': '768*1152'},
+            {'value': '1280*720', 'label': '1280*720'},
+        ],
+        text_field='label',
+        value_field='value')
     n = forms.SliderField(
         TooltipLabel('图片数量', '指定生成图片的数量'),
         required=True, default_value=1,
         _min=1,
         _max=4,
         _step=1,
         precision=0)
-    style = forms.TextInputField(
+    style = forms.SingleSelect(
         TooltipLabel('风格', '指定生成图片的风格'),
-        required=True, default_value='<auto>')
+        required=True,
+        default_value='<auto>',
+        option_list=[
+            {'value': '<auto>', 'label': '默认值，由模型随机输出图像风格'},
+            {'value': '<photography>', 'label': '摄影'},
+            {'value': '<portrait>', 'label': '人像写真'},
+            {'value': '<3d cartoon>', 'label': '3D卡通'},
+            {'value': '<anime>', 'label': '动画'},
+            {'value': '<oil painting>', 'label': '油画'},
+            {'value': '<watercolor>', 'label': '水彩'},
+            {'value': '<sketch>', 'label': '素描'},
+            {'value': '<chinese painting>', 'label': '中国画'},
+            {'value': '<flat illustration>', 'label': '扁平插画'},
+        ],
+        text_field='label',
+        value_field='value'
+    )
 
 
 class QwenTextToImageModelCredential(BaseForm, BaseModelCredential):
diff --git a/apps/setting/models_provider/impl/qwen_model_provider/model/tti.py b/apps/setting/models_provider/impl/qwen_model_provider/model/tti.py
@@ -28,7 +28,7 @@ def __init__(self, **kwargs):
 
     @staticmethod
     def new_instance(model_type, model_name, model_credential: Dict[str, object], **model_kwargs):
-        optional_params = {'params': {}}
+        optional_params = {'params': {'size': '1024*1024', 'style': '<auto>', 'n': 1}}
         for key, value in model_kwargs.items():
             if key not in ['model_id', 'use_local', 'streaming']:
                 optional_params['params'][key] = value
@@ -50,6 +50,8 @@ def generate_image(self, prompt: str, negative_prompt: str = None):
                                   prompt=prompt,
                                   negative_prompt=negative_prompt,
                                   **self.params)
+        print(self.params)
+        print(rsp)
         file_urls = []
         if rsp.status_code == HTTPStatus.OK:
             for result in rsp.output.results:
diff --git a/apps/setting/models_provider/impl/zhipu_model_provider/credential/tti.py b/apps/setting/models_provider/impl/zhipu_model_provider/credential/tti.py
@@ -8,10 +8,22 @@
 
 
 class ZhiPuTTIModelParams(BaseForm):
-    size = forms.TextInputField(
+    size = forms.SingleSelect(
         TooltipLabel('图片尺寸',
                      '图片尺寸，仅 cogview-3-plus 支持该参数。可选范围：[1024x1024,768x1344,864x1152,1344x768,1152x864,1440x720,720x1440]，默认是1024x1024。'),
-        required=True, default_value='1024x1024')
+        required=True,
+        default_value='1024x1024',
+        option_list=[
+            {'value': '1024x1024', 'label': '1024x1024'},
+            {'value': '768x1344', 'label': '768x1344'},
+            {'value': '864x1152', 'label': '864x1152'},
+            {'value': '1344x768', 'label': '1344x768'},
+            {'value': '1152x864', 'label': '1152x864'},
+            {'value': '1440x720', 'label': '1440x720'},
+            {'value': '720x1440', 'label': '720x1440'},
+        ],
+        text_field='label',
+        value_field='value')
 
 
 class ZhiPuTextToImageModelCredential(BaseForm, BaseModelCredential):
diff --git a/apps/setting/models_provider/impl/zhipu_model_provider/model/tti.py b/apps/setting/models_provider/impl/zhipu_model_provider/model/tti.py
@@ -30,7 +30,7 @@ def __init__(self, **kwargs):
 
     @staticmethod
     def new_instance(model_type, model_name, model_credential: Dict[str, object], **model_kwargs):
-        optional_params = {'params': {}}
+        optional_params = {'params': {'size': '1024x1024'}}
         for key, value in model_kwargs.items():
             if key not in ['model_id', 'use_local', 'streaming']:
                 optional_params['params'][key] = value
@@ -60,9 +60,10 @@ def generate_image(self, prompt: str, negative_prompt: str = None):
             prompt=prompt,  # 填写需要生成图片的文本
             **self.params # 填写额外参数
         )
+        print(self.params)
         file_urls = []
         for content in response.data:
-            url = content['url']
+            url = content.url
             print(url)
             file_name = url.split('/')[-1]
             file = bytes_to_uploaded_file(requests.get(url).content, file_name)
diff --git a/apps/setting/serializers/provider_serializers.py b/apps/setting/serializers/provider_serializers.py
@@ -30,8 +30,10 @@
 
 def get_default_model_params_setting(provider, model_type, model_name):
     credential = get_model_credential(provider, model_type, model_name)
-    model_params_setting = credential.get_model_params_setting_form(model_name).to_form_list()
-    return model_params_setting
+    setting_form = credential.get_model_params_setting_form(model_name)
+    if setting_form is not None:
+        return setting_form.to_form_list()
+    return []
 
 
 class ModelPullManage:
@@ -178,6 +180,8 @@ class Create(serializers.Serializer):
 
         model_name = serializers.CharField(required=True, error_messages=ErrMessage.char("基础模型"))
 
+        model_params_form = serializers.ListField(required=False, default=list, error_messages=ErrMessage.char("参数配置"))
+
         credential = serializers.DictField(required=True, error_messages=ErrMessage.dict("认证信息"))
 
         def is_valid(self, *, raise_exception=False):
@@ -207,11 +211,12 @@ def insert(self, user_id, with_valid=False):
             model_type = self.data.get('model_type')
             model_name = self.data.get('model_name')
             permission_type = self.data.get('permission_type')
+            model_params_form = self.data.get('model_params_form')
             model_credential_str = json.dumps(credential)
             model = Model(id=uuid.uuid1(), status=status, user_id=user_id, name=name,
                           credential=rsa_long_encrypt(model_credential_str),
                           provider=provider, model_type=model_type, model_name=model_name,
-                          model_params_form=get_default_model_params_setting(provider, model_type, model_name),
+                          model_params_form=model_params_form,
                           permission_type=permission_type)
             model.save()
             if status == Status.DOWNLOAD:
diff --git a/apps/setting/urls.py b/apps/setting/urls.py
@@ -14,6 +14,8 @@
     path('provider/model_type_list', views.Provide.ModelTypeList.as_view(), name="provider/model_type_list"),
     path('provider/model_list', views.Provide.ModelList.as_view(),
          name="provider/model_name_list"),
+    path('provider/model_params_form', views.Provide.ModelParamsForm.as_view(),
+         name="provider/model_params_form"),
     path('provider/model_form', views.Provide.ModelForm.as_view(),
          name="provider/model_form"),
     path('model', views.Model.as_view(), name='model'),
diff --git a/apps/setting/views/model.py b/apps/setting/views/model.py
@@ -16,7 +16,7 @@
 from common.response import result
 from common.util.common import query_params_to_single_dict
 from setting.models_provider.constants.model_provider_constants import ModelProvideConstants
-from setting.serializers.provider_serializers import ProviderSerializer, ModelSerializer
+from setting.serializers.provider_serializers import ProviderSerializer, ModelSerializer, get_default_model_params_setting
 from setting.swagger_api.provide_api import ProvideApi, ModelCreateApi, ModelQueryApi, ModelEditApi
 
 
@@ -207,6 +207,24 @@ def get(self, request: Request):
                 ModelProvideConstants[provider].value.get_model_list(
                     model_type))
 
+    class ModelParamsForm(APIView):
+        authentication_classes = [TokenAuth]
+
+        @action(methods=['GET'], detail=False)
+        @swagger_auto_schema(operation_summary="获取模型默认参数",
+                             operation_id="获取模型创建表单",
+                             manual_parameters=ProvideApi.ModelList.get_request_params_api(),
+                             responses=result.get_api_array_response(ProvideApi.ModelList.get_response_body_api())
+            , tags=["模型"]
+                             )
+        @has_permissions(PermissionConstants.MODEL_READ)
+        def get(self, request: Request):
+            provider = request.query_params.get('provider')
+            model_type = request.query_params.get('model_type')
+            model_name = request.query_params.get('model_name')
+
+            return result.success(get_default_model_params_setting(provider, model_type, model_name))
+
     class ModelForm(APIView):
         authentication_classes = [TokenAuth]
 
diff --git a/ui/src/api/model.ts b/ui/src/api/model.ts
@@ -98,6 +98,15 @@ const listBaseModel: (
   return get(`${prefix_provider}/model_list`, { provider, model_type }, loading)
 }
 
+const listBaseModelParamsForm: (
+  provider: string,
+  model_type: string,
+  model_name: string,
+  loading?: Ref<boolean>
+) => Promise<Result<Array<BaseModel>>> = (provider, model_type, model_name, loading) => {
+  return get(`${prefix_provider}/model_params_form`, { provider, model_type, model_name}, loading)
+}
+
 /**
  * 创建模型
  * @param request 请求对象
@@ -187,6 +196,7 @@ export default {
   getModelCreateForm,
   listModelType,
   listBaseModel,
+  listBaseModelParamsForm,
   createModel,
   updateModel,
   deleteModel,
diff --git a/ui/src/views/template/component/CreateModelDialog.vue b/ui/src/views/template/component/CreateModelDialog.vue
diff --git a/ui/src/workflow/common/data.ts b/ui/src/workflow/common/data.ts
