xiaogpt 2.22__py3-none-any.whl → 2.23__py3-none-any.whl

xiaogpt/bot/bard_bot.py

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

xiaogpt/bot/gemini_bot.py

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

xiaogpt/bot/glm_bot.py

@@ -1,4 +1,5 @@
 """ChatGLM bot"""
+
 from __future__ import annotations
 
 from typing import Any
@@ -13,34 +14,50 @@ class GLMBot(ChatHistoryMixin, BaseBot):
     default_options = {"model": "chatglm_turbo"}
 
     def __init__(self, glm_key: str) -> None:
-        import zhipuai
+        from zhipuai import ZhipuAI
+
+        self.model = "glm-4"  # Change glm model here
 
         self.history = []
-        zhipuai.api_key = glm_key
+        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):
-        import zhipuai
-
         ms = self.get_messages()
         kwargs = {**self.default_options, **options}
-        kwargs["prompt"] = ms
+        kwargs["model"] = self.model
         ms.append({"role": "user", "content": f"{query}"})
+        kwargs["messages"] = ms
         try:
-            r = zhipuai.model_api.sse_invoke(**kwargs)
+            r = self.client.chat.completions.create(**kwargs)
         except Exception as e:
             print(str(e))
             return
-        message = ""
-        for i in r.events():
-            message += str(i.data)
+        message = r.choices[0].message.content
 
         self.add_message(query, message)
         print(message)
         return message
 
-    def ask_stream(self, query: str, **options: Any):
-        raise Exception("GLM do not support stream")
+    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/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/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.dist-info → xiaogpt-2.23.dist-info}/METADATA

@@ -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.dist-info → xiaogpt-2.23.dist-info}/RECORD

@@ -1,20 +1,20 @@
-xiaogpt-2.22.dist-info/METADATA,sha256=2GoAmKF32qJATg47S6_5FQk-TOCAZeaYhJc1Rbgh-2w,18880
-xiaogpt-2.22.dist-info/WHEEL,sha256=N2J68yzZqJh3mI_Wg92rwhw0rtJDFpZj9bwQIMJgaVg,90
-xiaogpt-2.22.dist-info/entry_points.txt,sha256=zLFzA72qQ_eWBepdA2YU5vdXFqORH8wXhv2Ox1vnYP8,46
-xiaogpt-2.22.dist-info/licenses/LICENSE,sha256=XdClh516MvlnOf9749JZHCxSB7y6_fyXcWmLDz6IkZY,1063
+xiaogpt-2.23.dist-info/METADATA,sha256=pV5ExJ_7YpAmcJg6iK5dukVjN4haD59AYx4NIOdMhzY,18887
+xiaogpt-2.23.dist-info/WHEEL,sha256=N2J68yzZqJh3mI_Wg92rwhw0rtJDFpZj9bwQIMJgaVg,90
+xiaogpt-2.23.dist-info/entry_points.txt,sha256=zLFzA72qQ_eWBepdA2YU5vdXFqORH8wXhv2Ox1vnYP8,46
+xiaogpt-2.23.dist-info/licenses/LICENSE,sha256=XdClh516MvlnOf9749JZHCxSB7y6_fyXcWmLDz6IkZY,1063
 xiaogpt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xiaogpt/__main__.py,sha256=MSmt_5Xg84uHqzTN38JwgseJK8rsJn_11A8WD99VtEo,61
 xiaogpt/bot/__init__.py,sha256=O3Wq7WRwTVdKJdKZxkBtCPdRJ8uXrQE0dqHa1ekOnfQ,1073
-xiaogpt/bot/bard_bot.py,sha256=TkkyCpTcR_EmVgaeazRoWWVpFJeRv3Rw4ktRxCBTHwc,839
+xiaogpt/bot/bard_bot.py,sha256=qC8m87mWvtbiwipKl_OMYCqRbh79gkyZEytgz5DysC0,840
 xiaogpt/bot/base_bot.py,sha256=oKn6LLFHXol4hKrSrjnxknrOqrcGICtT_GPPYRNxpkw,1467
 xiaogpt/bot/chatgptapi_bot.py,sha256=Z4FX7F6j2n6NoUCqH6LliAAew94zaQXzp1blsE5yKoc,3656
-xiaogpt/bot/gemini_bot.py,sha256=Yy06vmPrdTa2rjj9wNmpgyQ16Etn02Kqp8B9RCiW3xM,1839
-xiaogpt/bot/glm_bot.py,sha256=8av1TJFn9vLHtNQvQHZDX8KcKyFC9kzosSlnHLkLRCw,1163
+xiaogpt/bot/gemini_bot.py,sha256=udKrWYP7U83AWpNBggwRp9bvgR2DTHqLMX9E_DLFv-I,1840
+xiaogpt/bot/glm_bot.py,sha256=QoMJbnu5_rHDz4tzwn7gh3IoAuw7E4hZQLAfziMAvNY,1825
 xiaogpt/bot/gpt3_bot.py,sha256=enX45_wrGjAtOh-anf8KnjCJluWSARZbjTGD_WZgoms,2781
 xiaogpt/bot/langchain_bot.py,sha256=4Uz5iOYzA2ongCklS-9zBse2fw-7kEE_9wITH7wdVCc,1944
 xiaogpt/bot/newbing_bot.py,sha256=afUmw6tyMXbgGZvfQQWaA5h0-e0V0isFolW-WGhd0Vs,2289
-xiaogpt/bot/qwen_bot.py,sha256=bgjOAdPc457StbJHENDcI43R1m0UYqgU0V--qSuDhYA,3609
-xiaogpt/cli.py,sha256=Guu2-fFnd9K_SRt5xRLVBUBY-ctIpjfTaAQO9bZjR0g,5067
+xiaogpt/bot/qwen_bot.py,sha256=n0WIeixAisd2_Vvky18FQFGcDIF3Cc2q2qp4ExCNBho,3521
+xiaogpt/cli.py,sha256=aLmpwjYw6tKPNy-WPZIE2XD5oLHsjSksova_PpH85II,5057
 xiaogpt/config.py,sha256=uo82JTKhujet0ro2SN3cOw2GXE-AamyzL7EmeFiGS5o,6287
 xiaogpt/langchain/callbacks.py,sha256=yR9AXQt9OHVYBWC47Q1I_BUT4Xg9iM44vnW2vv0BLpE,2616
 xiaogpt/langchain/chain.py,sha256=z0cqRlL0ElWnf31ByxZBN7AKOT-svXQDt5_NDft_nYc,1495
@@ -27,4 +27,4 @@ xiaogpt/tts/mi.py,sha256=9HkgGWByAs7k8sTpRdVlgJnnmjc44RNAccJa6tGDlXk,1096
 xiaogpt/tts/openai.py,sha256=_Qk12zYY-UuXLKvQVe3PqIvCmoRW9OcVCqQRoGCXvNc,1533
 xiaogpt/utils.py,sha256=B7NCH7g19hcwHDXsnBJPTU6UcWnXoEntKWm-pgcet2I,2072
 xiaogpt/xiaogpt.py,sha256=_viWq5w4-rGCTsuDetPPih-4qkPZem9FtXK-tPyChlA,15473
-xiaogpt-2.22.dist-info/RECORD,,
+xiaogpt-2.23.dist-info/RECORD,,