xiaogpt 1.50__tar.gz → 1.60__tar.gz

xiaogpt-1.50/README.md → xiaogpt-1.60/PKG-INFO

@@ -1,3 +1,24 @@
+Metadata-Version: 2.1
+Name: xiaogpt
+Version: 1.60
+Summary: Play ChatGPT or other LLM with xiaomi AI speaker
+Author-Email: yihong0618 <zouzou0208@gmail.com>
+License: MIT
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Project-URL: Homepage, https://github.com/yihong0618/xiaogpt
+Requires-Python: >=3.7.1
+Requires-Dist: miservice_fork
+Requires-Dist: openai
+Requires-Dist: aiohttp
+Requires-Dist: rich
+Requires-Dist: zhipuai
+Requires-Dist: bardapi
+Requires-Dist: edge-tts>=6.1.3
+Requires-Dist: EdgeGPT==0.1.26
+Description-Content-Type: text/markdown
+
 # xiaogpt
 
 [![PyPI](https://img.shields.io/pypi/v/xiaogpt?style=flat-square)](https://pypi.org/project/xiaogpt)
@@ -17,6 +38,7 @@ Play ChatGPT with Xiaomi AI Speaker
 - GPT3
 - ChatGPT
 - New Bing 
+- [ChatGLM](http://open.bigmodel.cn/)
 
 ## Windows 获取小米音响DID
 
@@ -91,6 +113,11 @@ 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}
+# 如果你想使用 google 的 bard
+python3 xiaogpt.py --hardware LX06  --mute_xiaoai --use_bard --bard_token ${bard_token}
 ```
 
 ## config.json
@@ -122,6 +149,8 @@ python3 xiaogpt.py
 ```
 
 具体参数作用请参考 [Open AI API 文档](https://platform.openai.com/docs/api-reference/chat/create)。
+ChatGLM [文档](http://open.bigmodel.cn/doc/api#chatglm_130b)
+Bard-API [参考](https://github.com/dsdanielpark/Bard-API)
 ## 配置项说明
 
 | 参数                  | 说明                                              | 默认值                              |
@@ -130,6 +159,8 @@ python3 xiaogpt.py
 | account               | 小爱账户                                          |                                     |
 | password              | 小爱账户密码                                      |                                     |
 | openai_key            | openai的apikey                                    |                                     |
+| glm_key               | chatglm 的 apikey                                    |                                     |
+| bard_token            | bard 的 token 参考 [Bard-API](https://github.com/dsdanielpark/Bard-API)                                 |                                     |
 | cookie                | 小爱账户cookie （如果用上面密码登录可以不填）     |                                     |
 | mi_did                | 设备did                                           |                                     |
 | use_command           | 使用 MI command 与小爱交互                        | `false`                             |

xiaogpt-1.50/PKG-INFO → xiaogpt-1.60/README.md

@@ -1,22 +1,3 @@
-Metadata-Version: 2.1
-Name: xiaogpt
-Version: 1.50
-Summary: Play ChatGPT with xiaomi AI speaker
-Author-Email: yihong0618 <zouzou0208@gmail.com>
-License: MIT
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3
-Project-URL: Homepage, https://github.com/yihong0618/xiaogpt
-Requires-Python: >=3.7.1
-Requires-Dist: miservice_fork
-Requires-Dist: openai
-Requires-Dist: aiohttp
-Requires-Dist: rich
-Requires-Dist: edge-tts>=6.1.3
-Requires-Dist: EdgeGPT==0.1.26
-Description-Content-Type: text/markdown
-
 # xiaogpt
 
 [![PyPI](https://img.shields.io/pypi/v/xiaogpt?style=flat-square)](https://pypi.org/project/xiaogpt)
@@ -36,6 +17,7 @@ Play ChatGPT with Xiaomi AI Speaker
 - GPT3
 - ChatGPT
 - New Bing 
+- [ChatGLM](http://open.bigmodel.cn/)
 
 ## Windows 获取小米音响DID
 
@@ -110,6 +92,11 @@ 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}
+# 如果你想使用 google 的 bard
+python3 xiaogpt.py --hardware LX06  --mute_xiaoai --use_bard --bard_token ${bard_token}
 ```
 
 ## config.json
@@ -141,6 +128,8 @@ python3 xiaogpt.py
 ```
 
 具体参数作用请参考 [Open AI API 文档](https://platform.openai.com/docs/api-reference/chat/create)。
+ChatGLM [文档](http://open.bigmodel.cn/doc/api#chatglm_130b)
+Bard-API [参考](https://github.com/dsdanielpark/Bard-API)
 ## 配置项说明
 
 | 参数                  | 说明                                              | 默认值                              |
@@ -149,6 +138,8 @@ python3 xiaogpt.py
 | account               | 小爱账户                                          |                                     |
 | password              | 小爱账户密码                                      |                                     |
 | openai_key            | openai的apikey                                    |                                     |
+| glm_key               | chatglm 的 apikey                                    |                                     |
+| bard_token            | bard 的 token 参考 [Bard-API](https://github.com/dsdanielpark/Bard-API)                                 |                                     |
 | cookie                | 小爱账户cookie （如果用上面密码登录可以不填）     |                                     |
 | mi_did                | 设备did                                           |                                     |
 | use_command           | 使用 MI command 与小爱交互                        | `false`                             |

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

@@ -1,6 +1,6 @@
 [project]
 name = "xiaogpt"
-description = "Play ChatGPT with xiaomi AI speaker"
+description = "Play ChatGPT or other LLM with xiaomi AI speaker"
 readme = "README.md"
 authors = [
     { name = "yihong0618", email = "zouzou0208@gmail.com" },
@@ -16,11 +16,13 @@ dependencies = [
     "openai",
     "aiohttp",
     "rich",
+    "zhipuai",
+    "bardapi",
     "edge-tts>=6.1.3",
     "EdgeGPT==0.1.26",
 ]
 dynamic = []
-version = "1.50"
+version = "1.60"
 
 [project.license]
 text = "MIT"

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

@@ -4,12 +4,16 @@ 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.bot.bard_bot import BardBot
 from xiaogpt.config import Config
 
 BOTS: dict[str, type[BaseBot]] = {
     "gpt3": GPT3Bot,
     "newbing": NewBingBot,
     "chatgptapi": ChatGPTBot,
+    "glm": GLMBot,
+    "bard": BardBot,
 }
 
 
@@ -20,4 +24,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", "BardBot", "get_bot"]

xiaogpt-1.60/xiaogpt/bot/bard_bot.py

@@ -0,0 +1,32 @@
+"""ChatGLM bot"""
+from __future__ import annotations
+from typing import Any
+
+from bardapi import BardAsync
+from rich import print
+
+from xiaogpt.bot.base_bot import BaseBot
+
+
+class BardBot(BaseBot):
+    def __init__(
+        self,
+        bard_token: str,
+    ) -> None:
+        self._bot = BardAsync(token=bard_token)
+        self.history = []
+
+    @classmethod
+    def from_config(cls, config):
+        return cls(bard_token=config.bard_token)
+
+    async def ask(self, query, **options):
+        try:
+            r = await self._bot.get_answer(query)
+        except Exception as e:
+            print(str(e))
+        print(r["content"])
+        return r["content"]
+
+    def ask_stream(self, query: str, **options: Any):
+        raise Exception("Bard do not support stream")

{xiaogpt-1.50 → xiaogpt-1.60}/xiaogpt/bot/chatgptapi_bot.py

@@ -48,7 +48,11 @@ class ChatGPTBot(BaseBot):
             ms.append({"role": "assistant", "content": h[1]})
         ms.append({"role": "user", "content": f"{query}"})
         kwargs = {**self.default_options, **options}
-        completion = await openai.ChatCompletion.acreate(messages=ms, **kwargs)
+        try:
+            completion = await openai.ChatCompletion.acreate(messages=ms, **kwargs)
+        except Exception as e:
+            print(str(e))
+            return ""
         message = (
             completion["choices"][0]
             .get("message")
@@ -72,9 +76,13 @@ class ChatGPTBot(BaseBot):
         kwargs = {"model": "gpt-3.5-turbo", **options}
         if openai.api_type == "azure":
             kwargs["deployment_id"] = self.deployment_id
-        completion = await openai.ChatCompletion.acreate(
-            messages=ms, stream=True, **kwargs
-        )
+        try:
+            completion = await openai.ChatCompletion.acreate(
+                messages=ms, stream=True, **kwargs
+            )
+        except Exception as e:
+            print(str(e))
+            return
 
         async def text_gen():
             async for event in completion:

xiaogpt-1.60/xiaogpt/bot/glm_bot.py

@@ -0,0 +1,50 @@
+"""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}"})
+        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.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):
+        raise Exception("GLM do not support stream")

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

@@ -29,7 +29,11 @@ class GPT3Bot(BaseBot):
             "top_p": 1,
             **options,
         }
-        completion = await openai.Completion.acreate(**data)
+        try:
+            completion = await openai.Completion.acreate(**data)
+        except Exception as e:
+            print(str(e))
+            return ""
         print(completion["choices"][0]["text"])
         return completion["choices"][0]["text"]
 
@@ -43,12 +47,17 @@ class GPT3Bot(BaseBot):
             "stream": True,
             **options,
         }
-        completion = await openai.Completion.acreate(**data)
+        try:
+            completion = await openai.Completion.acreate(**data)
+        except Exception as e:
+            print(str(e))
+            return
 
         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.60}/xiaogpt/bot/newbing_bot.py

@@ -40,13 +40,20 @@ class NewBingBot(BaseBot):
     async def ask(self, query, **options):
         kwargs = {"conversation_style": ConversationStyle.balanced, **options}
         completion = await self._bot.ask(prompt=query, **kwargs)
-        text = self.clean_text(completion["item"]["messages"][1]["text"])
+        try:
+            text = self.clean_text(completion["item"]["messages"][1]["text"])
+        except Exception as e:
+            print(str(e))
+            return
         print(text)
         return text
 
     async def ask_stream(self, query, **options):
         kwargs = {"conversation_style": ConversationStyle.balanced, **options}
-        completion = self._bot.ask_stream(prompt=query, **kwargs)
+        try:
+            completion = self._bot.ask_stream(prompt=query, **kwargs)
+        except Exception as e:
+            return
 
         async def text_gen():
             current = ""

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

@@ -27,6 +27,16 @@ def main():
         dest="openai_key",
         help="openai api key",
     )
+    parser.add_argument(
+        "--glm_key",
+        dest="glm_key",
+        help="chatglm api key",
+    )
+    parser.add_argument(
+        "--bard_token",
+        dest="bard_token",
+        help="google bard token see https://github.com/dsdanielpark/Bard-API",
+    )
     parser.add_argument(
         "--proxy",
         dest="proxy",
@@ -94,13 +104,30 @@ def main():
         const="newbing",
         help="if use newbing",
     )
+    group.add_argument(
+        "--use_glm",
+        dest="bot",
+        action="store_const",
+        const="glm",
+        help="if use chatglm",
+    )
+    group.add_argument(
+        "--use_bard",
+        dest="bot",
+        action="store_const",
+        const="bard",
+        help="if use bard",
+    )
     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", "bard"],
     )
     parser.add_argument(
         "--config",
@@ -129,6 +156,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")
     config = Config.from_options(options)
 
     miboy = MiGPT(config)

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

@@ -60,6 +60,8 @@ 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", "")
+    bard_token: str = os.getenv("BARD_TOKEN", "")
     proxy: str | None = None
     mi_did: str = os.getenv("MI_DID", "")
     keyword: Iterable[str] = KEY_WORD
@@ -138,5 +140,9 @@ class Config:
                         key, value = "bot", "gpt3"
                     elif key == "use_newbing":
                         key, value = "bot", "newbing"
+                    elif key == "use_glm":
+                        key, value = "bot", "glm"
+                    elif key == "use_bard":
+                        key, value = "bot", "bard"
                     result[key] = value
         return result

{xiaogpt-1.50 → xiaogpt-1.60}/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
@@ -418,6 +421,7 @@ class MiGPT:
         )
 
     async def run_forever(self):
+        ask_name = self.config.bot.upper()
         async with ClientSession() as session:
             await self.init_all_data(session)
             task = asyncio.create_task(self.poll_latest_ask())
@@ -467,7 +471,7 @@ class MiGPT:
                 else:
                     # waiting for xiaoai speaker done
                     await asyncio.sleep(8)
-                await self.do_tts("正在问GPT请耐心等待")
+                await self.do_tts(f"正在问{ask_name}请耐心等待")
                 try:
                     print(
                         "以下是小爱的回答: ",
@@ -475,7 +479,7 @@ class MiGPT:
                     )
                 except IndexError:
                     print("小爱没回")
-                print("以下是GPT的回答: ", end="")
+                print(f"以下是 {ask_name} 的回答: ", end="")
                 try:
                     if not self.config.enable_edge_tts:
                         async for message in self.ask_gpt(query):
@@ -489,7 +493,7 @@ class MiGPT:
                         await self.edge_tts(self.ask_gpt(query), tts_lang)
                     print("回答完毕")
                 except Exception as e:
-                    print(f"GPT回答出错 {str(e)}")
+                    print(f"{ask_name} 回答出错 {str(e)}")
                 if self.in_conversation:
                     print(f"继续对话, 或用`{self.config.end_conversation}`结束对话")
                     await self.wakeup_xiaoai()