xiaogpt 1.50__tar.gz → 1.51__tar.gz

{xiaogpt-1.50 → xiaogpt-1.51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xiaogpt
-Version: 1.50
+Version: 1.51
 Summary: Play ChatGPT with xiaomi AI speaker
 Author-Email: yihong0618 <zouzou0208@gmail.com>
 License: MIT
@@ -13,6 +13,7 @@ Requires-Dist: miservice_fork
 Requires-Dist: openai
 Requires-Dist: aiohttp
 Requires-Dist: rich
+Requires-Dist: zhipuai
 Requires-Dist: edge-tts>=6.1.3
 Requires-Dist: EdgeGPT==0.1.26
 Description-Content-Type: text/markdown
@@ -36,6 +37,7 @@ Play ChatGPT with Xiaomi AI Speaker
 - GPT3
 - ChatGPT
 - New Bing 
+- [ChatGLM](http://open.bigmodel.cn/)
 
 ## Windows 获取小米音响DID
 
@@ -110,6 +112,9 @@ python3 xiaogpt.py --hardware LX06  --mute_xiaoai --stream
 # 如果你想使用 gpt3 ai
 export OPENAI_API_KEY=${your_api_key}
 python3 xiaogpt.py --hardware LX06  --mute_xiaoai --use_gpt3
+
+# 如果你想使用 ChatGLM api
+python3 xiaogpt.py --hardware LX06  --mute_xiaoai --use_glm --glm_key ${glm_key}
 ```
 
 ## config.json
@@ -141,6 +146,7 @@ python3 xiaogpt.py
 ```
 
 具体参数作用请参考 [Open AI API 文档](https://platform.openai.com/docs/api-reference/chat/create)。
+ChatGLM [文档](http://open.bigmodel.cn/doc/api#chatglm_130b)
 ## 配置项说明
 
 | 参数                  | 说明                                              | 默认值                              |
@@ -149,6 +155,7 @@ python3 xiaogpt.py
 | account               | 小爱账户                                          |                                     |
 | password              | 小爱账户密码                                      |                                     |
 | openai_key            | openai的apikey                                    |                                     |
+| glm_key               | chatglm 的 apikey                                    |                                     |
 | cookie                | 小爱账户cookie （如果用上面密码登录可以不填）     |                                     |
 | mi_did                | 设备did                                           |                                     |
 | use_command           | 使用 MI command 与小爱交互                        | `false`                             |

{xiaogpt-1.50 → xiaogpt-1.51}/README.md

@@ -17,6 +17,7 @@ Play ChatGPT with Xiaomi AI Speaker
 - GPT3
 - ChatGPT
 - New Bing 
+- [ChatGLM](http://open.bigmodel.cn/)
 
 ## Windows 获取小米音响DID
 
@@ -91,6 +92,9 @@ python3 xiaogpt.py --hardware LX06  --mute_xiaoai --stream
 # 如果你想使用 gpt3 ai
 export OPENAI_API_KEY=${your_api_key}
 python3 xiaogpt.py --hardware LX06  --mute_xiaoai --use_gpt3
+
+# 如果你想使用 ChatGLM api
+python3 xiaogpt.py --hardware LX06  --mute_xiaoai --use_glm --glm_key ${glm_key}
 ```
 
 ## config.json
@@ -122,6 +126,7 @@ python3 xiaogpt.py
 ```
 
 具体参数作用请参考 [Open AI API 文档](https://platform.openai.com/docs/api-reference/chat/create)。
+ChatGLM [文档](http://open.bigmodel.cn/doc/api#chatglm_130b)
 ## 配置项说明
 
 | 参数                  | 说明                                              | 默认值                              |
@@ -130,6 +135,7 @@ python3 xiaogpt.py
 | account               | 小爱账户                                          |                                     |
 | password              | 小爱账户密码                                      |                                     |
 | openai_key            | openai的apikey                                    |                                     |
+| glm_key               | chatglm 的 apikey                                    |                                     |
 | cookie                | 小爱账户cookie （如果用上面密码登录可以不填）     |                                     |
 | mi_did                | 设备did                                           |                                     |
 | use_command           | 使用 MI command 与小爱交互                        | `false`                             |

{xiaogpt-1.50 → xiaogpt-1.51}/pyproject.toml

@@ -16,11 +16,12 @@ dependencies = [
     "openai",
     "aiohttp",
     "rich",
+    "zhipuai",
     "edge-tts>=6.1.3",
     "EdgeGPT==0.1.26",
 ]
 dynamic = []
-version = "1.50"
+version = "1.51"
 
 [project.license]
 text = "MIT"

{xiaogpt-1.50 → xiaogpt-1.51}/xiaogpt/bot/__init__.py

@@ -4,12 +4,14 @@ from xiaogpt.bot.base_bot import BaseBot
 from xiaogpt.bot.chatgptapi_bot import ChatGPTBot
 from xiaogpt.bot.gpt3_bot import GPT3Bot
 from xiaogpt.bot.newbing_bot import NewBingBot
+from xiaogpt.bot.glm_bot import GLMBot
 from xiaogpt.config import Config
 
 BOTS: dict[str, type[BaseBot]] = {
     "gpt3": GPT3Bot,
     "newbing": NewBingBot,
     "chatgptapi": ChatGPTBot,
+    "glm": GLMBot,
 }
 
 
@@ -20,4 +22,4 @@ def get_bot(config: Config) -> BaseBot:
         raise ValueError(f"Unsupported bot {config.bot}, must be one of {list(BOTS)}")
 
 
-__all__ = ["GPT3Bot", "ChatGPTBot", "NewBingBot", "get_bot"]
+__all__ = ["GPT3Bot", "ChatGPTBot", "NewBingBot", "GLMBot", "get_bot"]

xiaogpt-1.51/xiaogpt/bot/glm_bot.py

@@ -0,0 +1,46 @@
+"""ChatGLM bot"""
+from __future__ import annotations
+from typing import Any, AsyncGenerator
+
+import zhipuai
+from rich import print
+
+from xiaogpt.bot.base_bot import BaseBot
+
+
+class GLMBot(BaseBot):
+    default_options = {"model": "chatglm_130b"}
+
+    def __init__(
+        self,
+        glm_key: str,
+    ) -> None:
+        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):
+        ms = []
+        for h in self.history:
+            ms.append({"role": "user", "content": h[0]})
+            ms.append({"role": "assistant", "content": h[1]})
+        kwargs = {**self.default_options, **options}
+        kwargs["prompt"] = ms
+        ms.append({"role": "user", "content": f"{query}"})
+        r = zhipuai.model_api.sse_invoke(**kwargs)
+        message = ""
+        for i in r.events():
+            message += str(i.data)
+
+        self.history.append([f"{query}", message])
+        # only keep 5 history
+        first_history = self.history.pop(0)
+        self.history = [first_history] + self.history[-5:]
+        print(message)
+        return message
+
+    def ask_stream(self, query: str, **options: Any):
+        pass

{xiaogpt-1.50 → xiaogpt-1.51}/xiaogpt/bot/gpt3_bot.py

@@ -47,8 +47,9 @@ class GPT3Bot(BaseBot):
 
         async def text_gen():
             async for event in completion:
-                print(event["text"], end="")
-                yield event["text"]
+                text = event["choices"][0]["text"]
+                print(text, end="")
+                yield text
 
         try:
             async for sentence in split_sentences(text_gen()):

{xiaogpt-1.50 → xiaogpt-1.51}/xiaogpt/cli.py

@@ -27,6 +27,11 @@ def main():
         dest="openai_key",
         help="openai api key",
     )
+    parser.add_argument(
+        "--glm_key",
+        dest="glm_key",
+        help="chatglm api key",
+    )
     parser.add_argument(
         "--proxy",
         dest="proxy",
@@ -94,13 +99,23 @@ def main():
         const="newbing",
         help="if use newbing",
     )
+    group.add_argument(
+        "--use_glm",
+        dest="bot",
+        action="store_const",
+        const="glm",
+        help="if use chatglm",
+    )
     parser.add_argument(
         "--bing_cookie_path",
         dest="bing_cookie_path",
         help="new bing cookies path if use new bing",
     )
     group.add_argument(
-        "--bot", dest="bot", help="bot type", choices=["gpt3", "chatgptapi", "newbing"]
+        "--bot",
+        dest="bot",
+        help="bot type",
+        choices=["gpt3", "chatgptapi", "newbing", "glm"],
     )
     parser.add_argument(
         "--config",
@@ -129,6 +144,8 @@ def main():
     )
 
     options = parser.parse_args()
+    if options.bot == "glm" and options.stream:
+        raise Exception("For now ChatGLM do not support stream")
     config = Config.from_options(options)
 
     miboy = MiGPT(config)

{xiaogpt-1.50 → xiaogpt-1.51}/xiaogpt/config.py

@@ -60,6 +60,7 @@ class Config:
     account: str = os.getenv("MI_USER", "")
     password: str = os.getenv("MI_PASS", "")
     openai_key: str = os.getenv("OPENAI_API_KEY", "")
+    glm_key: str = os.getenv("CHATGLM_KEY", "")
     proxy: str | None = None
     mi_did: str = os.getenv("MI_DID", "")
     keyword: Iterable[str] = KEY_WORD

{xiaogpt-1.50 → xiaogpt-1.51}/xiaogpt/xiaogpt.py

@@ -356,7 +356,10 @@ class MiGPT:
         if not self.config.stream:
             async with ClientSession(trust_env=True) as session:
                 openai.aiosession.set(session)
-                answer = await self.chatbot.ask(query, **self.config.gpt_options)
+                if self.config.bot == "glm":
+                    answer = self._chatbot.ask(query, **self.config.gpt_options)
+                else:
+                    answer = await self.chatbot.ask(query, **self.config.gpt_options)
                 message = self._normalize(answer) if answer else ""
                 yield message
                 return