Fix qwen (#32)

* Refactor DashScopeMultiModalChat to extract text and result images from content * Add DeepSeek to list of supported platforms and update version to 0.3.3 --------- Co-authored-by: wangyuxin <[email protected]>
wangyuxinwhy · Feb 21, 2024 · 30c7586 · 30c7586
1 parent c996883
commit 30c7586
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -16,6 +16,7 @@ Generate Package 允许用户通过统一的 api 访问跨平台的生成式模
 * [百度智能云](https://cloud.baidu.com/doc/WENXINWORKSHOP/s/clntwmv7t)
 * [智谱](https://open.bigmodel.cn/dev/api)
 * [月之暗面](https://platform.moonshot.cn/docs)
+* [DeepSeek](https://platform.deepseek.com/usage)
 * ...
 
 ## Features
@@ -203,19 +204,21 @@ for stream_output in model.stream_generate('介绍一下唐朝'):
 ```python
 from generate.chat_completion import ChatModelRegistry
 
-print(list(ChatModelRegistry.keys()))
+print('\n'.join(list(ChatModelRegistry.keys())))
 
 # ----- Output -----
-['azure',
- 'openai',
- 'minimax_pro',
- 'minimax',
- 'zhipu',
- 'zhipu_character',
- 'wenxin',
- 'hunyuan',
- 'baichuan',
- 'bailian',
- 'dashscope',
- 'dashscope_multimodal']
+azure
+openai
+minimax_pro
+minimax
+zhipu
+zhipu_character
+wenxin
+hunyuan
+baichuan
+bailian
+dashscope
+dashscope_multimodal
+moonshot
+deepseek
 ```
diff --git a/generate/chat_completion/models/dashscope.py b/generate/chat_completion/models/dashscope.py
@@ -340,11 +340,21 @@ def _get_stream_request_parameters(
 
     def _parse_reponse(self, response: ResponseValue) -> ChatCompletionOutput:
         choice = response['output']['choices'][0]
+        content_list = choice['message']['content']
+        text = ''
+        result_images = []
+        for content in content_list:
+            for k, v in content.items():
+                if k != 'result_image':
+                    text += v
+                else:
+                    result_images.append(v)
         return ChatCompletionOutput(
             model_info=self.model_info,
-            message=AssistantMessage(content=choice['message']['content'][0]['text']),
+            finish_reason=choice.get('finish_reason'),
+            message=AssistantMessage(content=text),
             cost=None,
-            extra={'usage': response['usage'], 'request_id': response['request_id']},
+            extra={'usage': response['usage'], 'request_id': response['request_id'], 'content': content_list, 'result_images': result_images},
         )
 
     @override

diff --git a/generate/image_generation/__init__.py b/generate/image_generation/__init__.py
@@ -11,13 +11,17 @@
     QianfanImageGeneration,
     QianfanImageGenerationParameters,
     ZhipuImageGeneration,
+    ZhipuImageGenerationParameters,
 )
 from generate.model import ModelParameters
 
 P = TypeVar('P', bound=ModelParameters)
 
 ImageGenerationModels: list[tuple[Type[ImageGenerationModel], Type[ModelParameters]]] = [
     (OpenAIImageGeneration, OpenAIImageGenerationParameters),
+    (BaiduImageGeneration, BaiduImageGenerationParameters),
+    (QianfanImageGeneration, QianfanImageGenerationParameters),
+    (ZhipuImageGeneration, ZhipuImageGenerationParameters),
 ]
 
 ImageGenerationModelRegistry: dict[str, tuple[Type[ImageGenerationModel], Type[ModelParameters]]] = {
@@ -35,4 +39,5 @@
     'QianfanImageGeneration',
     'QianfanImageGenerationParameters',
     'ZhipuImageGeneration',
+    'ZhipuImageGenerationParameters',
 ]
diff --git a/generate/image_generation/models/__init__.py b/generate/image_generation/models/__init__.py
@@ -1,7 +1,7 @@
 from generate.image_generation.models.baidu import BaiduImageGeneration, BaiduImageGenerationParameters
 from generate.image_generation.models.openai import OpenAIImageGeneration, OpenAIImageGenerationParameters
 from generate.image_generation.models.qianfan import QianfanImageGeneration, QianfanImageGenerationParameters
-from generate.image_generation.models.zhipu import ZhipuImageGeneration
+from generate.image_generation.models.zhipu import ZhipuImageGeneration, ZhipuImageGenerationParameters
 
 __all__ = [
     'OpenAIImageGeneration',
@@ -11,4 +11,5 @@
     'QianfanImageGeneration',
     'QianfanImageGenerationParameters',
     'ZhipuImageGeneration',
+    'ZhipuImageGenerationParameters',
 ]
diff --git a/generate/ui.py b/generate/ui.py
@@ -167,6 +167,7 @@ async def main(message: cl.Message) -> None:
                 state._chat_history.append(chunk.message)
     except Exception as e:
         await cl.Message(content=f'Error: {e}').send()
+        raise
     await assistant_message.update()
 
 

diff --git a/generate/version.py b/generate/version.py
@@ -1 +1 @@
-__version__ = '0.3.2.post1'
+__version__ = '0.3.3'
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "generate-core"
-version = "0.3.2.post1"
+version = "0.3.3"
 description = "文本生成，图像生成，语音生成"
 authors = ["wangyuxin <[email protected]>"]
 license = "MIT"