feat: 支持添加图片生成模型(WIP)

Author: liuruibin

apps/setting/models_provider/impl/openai_model_provider/credential/tti.py

@@ -10,10 +10,20 @@
 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(
         TooltipLabel('图片质量', ''),

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

apps/setting/models_provider/impl/qwen_model_provider/credential/tti.py

@@ -19,9 +19,18 @@
 
 
 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,

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,7 @@ def generate_image(self, prompt: str, negative_prompt: str = None):
                                   prompt=prompt,
                                   negative_prompt=negative_prompt,
                                   **self.params)
+        print(rsp)
         file_urls = []
         if rsp.status_code == HTTPStatus.OK:
             for result in rsp.output.results:

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):

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
@@ -62,7 +62,7 @@ def generate_image(self, prompt: str, negative_prompt: str = None):
         )
         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)