xiaogpt 2.22__tar.gz → 2.23__tar.gz

{xiaogpt-2.22 → xiaogpt-2.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xiaogpt
-Version: 2.22
+Version: 2.23
 Summary: Play ChatGPT or other LLM with xiaomi AI speaker
 Author-Email: yihong0618 <zouzou0208@gmail.com>
 License: MIT
@@ -13,7 +13,7 @@ Requires-Dist: miservice_fork
 Requires-Dist: openai>=1
 Requires-Dist: aiohttp
 Requires-Dist: rich
-Requires-Dist: zhipuai
+Requires-Dist: zhipuai==2.0.1
 Requires-Dist: bardapi
 Requires-Dist: edge-tts>=6.1.3
 Requires-Dist: EdgeGPT==0.1.26

{xiaogpt-2.22 → xiaogpt-2.23}/pyproject.toml

@@ -16,7 +16,7 @@ dependencies = [
     "openai>=1",
     "aiohttp",
     "rich",
-    "zhipuai",
+    "zhipuai==2.0.1",
     "bardapi",
     "edge-tts>=6.1.3",
     "EdgeGPT==0.1.26",
@@ -28,7 +28,7 @@ dependencies = [
     "dashscope==1.10.0",
 ]
 dynamic = []
-version = "2.22"
+version = "2.23"
 
 [project.license]
 text = "MIT"

{xiaogpt-2.22 → xiaogpt-2.23}/xiaogpt/bot/bard_bot.py

@@ -1,4 +1,5 @@
 """ChatGLM bot"""
+
 from __future__ import annotations
 
 from typing import Any

{xiaogpt-2.22 → xiaogpt-2.23}/xiaogpt/bot/gemini_bot.py

@@ -1,4 +1,5 @@
 """Google Gemini bot"""
+
 from __future__ import annotations
 
 from typing import Any

xiaogpt-2.23/xiaogpt/bot/glm_bot.py

@@ -0,0 +1,63 @@
+"""ChatGLM bot"""
+
+from __future__ import annotations
+
+from typing import Any
+
+from rich import print
+
+from xiaogpt.bot.base_bot import BaseBot, ChatHistoryMixin
+
+
+class GLMBot(ChatHistoryMixin, BaseBot):
+    name = "Chat GLM"
+    default_options = {"model": "chatglm_turbo"}
+
+    def __init__(self, glm_key: str) -> None:
+        from zhipuai import ZhipuAI
+
+        self.model = "glm-4"  # Change glm model here
+
+        self.history = []
+        self.client = ZhipuAI(api_key=glm_key)
+
+    @classmethod
+    def from_config(cls, config):
+        return cls(glm_key=config.glm_key)
+
+    def ask(self, query, **options):
+        ms = self.get_messages()
+        kwargs = {**self.default_options, **options}
+        kwargs["model"] = self.model
+        ms.append({"role": "user", "content": f"{query}"})
+        kwargs["messages"] = ms
+        try:
+            r = self.client.chat.completions.create(**kwargs)
+        except Exception as e:
+            print(str(e))
+            return
+        message = r.choices[0].message.content
+
+        self.add_message(query, message)
+        print(message)
+        return message
+
+    async def ask_stream(self, query: str, **options: Any):
+        ms = self.get_messages()
+        kwargs = {**self.default_options, **options}
+        kwargs["model"] = self.model
+        ms.append({"role": "user", "content": f"{query}"})
+        kwargs["messages"] = ms
+        kwargs["stream"] = True
+        try:
+            r = self.client.chat.completions.create(**kwargs)
+        except Exception as e:
+            print(str(e))
+            return
+        full_content = ""
+        for chunk in r:
+            content = chunk.choices[0].delta.content
+            full_content += content
+            print(content, end="")
+            yield content
+        self.add_message(query, full_content)

{xiaogpt-2.22 → xiaogpt-2.23}/xiaogpt/bot/qwen_bot.py

@@ -1,4 +1,5 @@
-"""ChatGLM bot"""
+"""Qwen bot"""
+
 from __future__ import annotations
 
 from http import HTTPStatus
@@ -16,9 +17,7 @@ class QwenBot(ChatHistoryMixin, BaseBot):
         import dashscope
         from dashscope.api_entities.dashscope_response import Role
 
-        self.history = [
-            {"role": Role.SYSTEM, "content": "You are a helpful assistant."}
-        ]
+        self.history = []
         dashscope.api_key = qwen_key
 
     @classmethod

{xiaogpt-2.22 → xiaogpt-2.23}/xiaogpt/cli.py

@@ -195,8 +195,8 @@ def main():
     )
 
     options = parser.parse_args()
-    if options.bot in ["glm", "bard"] and options.stream:
-        raise Exception("For now ChatGLM do not support stream")
+    if options.bot in ["bard"] and options.stream:
+        raise Exception("For now Bard do not support stream")
     config = Config.from_options(options)
 
     miboy = MiGPT(config)

xiaogpt-2.22/xiaogpt/bot/glm_bot.py

@@ -1,46 +0,0 @@
-"""ChatGLM bot"""
-from __future__ import annotations
-
-from typing import Any
-
-from rich import print
-
-from xiaogpt.bot.base_bot import BaseBot, ChatHistoryMixin
-
-
-class GLMBot(ChatHistoryMixin, BaseBot):
-    name = "Chat GLM"
-    default_options = {"model": "chatglm_turbo"}
-
-    def __init__(self, glm_key: str) -> None:
-        import zhipuai
-
-        self.history = []
-        zhipuai.api_key = glm_key
-
-    @classmethod
-    def from_config(cls, config):
-        return cls(glm_key=config.glm_key)
-
-    def ask(self, query, **options):
-        import zhipuai
-
-        ms = self.get_messages()
-        kwargs = {**self.default_options, **options}
-        kwargs["prompt"] = ms
-        ms.append({"role": "user", "content": f"{query}"})
-        try:
-            r = zhipuai.model_api.sse_invoke(**kwargs)
-        except Exception as e:
-            print(str(e))
-            return
-        message = ""
-        for i in r.events():
-            message += str(i.data)
-
-        self.add_message(query, message)
-        print(message)
-        return message
-
-    def ask_stream(self, query: str, **options: Any):
-        raise Exception("GLM do not support stream")