xiaogpt 2.31__py3-none-any.whl → 2.40__py3-none-any.whl

xiaogpt/bot/__init__.py

@@ -2,21 +2,17 @@ from __future__ import annotations
 
 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.bot.gemini_bot import GeminiBot
 from xiaogpt.bot.qwen_bot import QwenBot
 from xiaogpt.bot.langchain_bot import LangChainBot
 from xiaogpt.config import Config
 
 BOTS: dict[str, type[BaseBot]] = {
-    "gpt3": GPT3Bot,
     "newbing": NewBingBot,
     "chatgptapi": ChatGPTBot,
     "glm": GLMBot,
-    "bard": BardBot,
     "gemini": GeminiBot,
     "qwen": QwenBot,
     "langchain": LangChainBot,
@@ -31,11 +27,9 @@ def get_bot(config: Config) -> BaseBot:
 
 
 __all__ = [
-    "GPT3Bot",
     "ChatGPTBot",
     "NewBingBot",
     "GLMBot",
-    "BardBot",
     "GeminiBot",
     "QwenBot",
     "get_bot",

xiaogpt/cli.py

@@ -42,11 +42,6 @@ def main():
         dest="qwen_key",
         help="Alibaba Qwen api key",
     )
-    parser.add_argument(
-        "--bard_token",
-        dest="bard_token",
-        help="google bard token see https://github.com/dsdanielpark/Bard-API",
-    )
     parser.add_argument(
         "--serpapi_api_key",
         dest="serpapi_api_key",
@@ -114,13 +109,6 @@ def main():
         choices=["mi", "edge", "openai", "azure"],
     )
     bot_group = parser.add_mutually_exclusive_group()
-    bot_group.add_argument(
-        "--use_gpt3",
-        dest="bot",
-        action="store_const",
-        const="gpt3",
-        help="if use openai gpt3 api",
-    )
     bot_group.add_argument(
         "--use_chatgpt_api",
         dest="bot",
@@ -149,13 +137,6 @@ def main():
         const="glm",
         help="if use chatglm",
     )
-    bot_group.add_argument(
-        "--use_bard",
-        dest="bot",
-        action="store_const",
-        const="bard",
-        help="if use bard",
-    )
     bot_group.add_argument(
         "--use_qwen",
         dest="bot",
@@ -180,11 +161,9 @@ def main():
         dest="bot",
         help="bot type",
         choices=[
-            "gpt3",
             "chatgptapi",
             "newbing",
             "glm",
-            "bard",
             "gemini",
             "langchain",
             "qwen",
@@ -209,11 +188,6 @@ def main():
     )
 
     options = parser.parse_args()
-    if options.bot in ["bard"] and options.stream:
-        raise Exception("For now Bard do not support stream")
-    if options.tts in ["edge", "openai", "azure"]:
-        print("Will close stream to better tts")
-        options.stream = False
     config = Config.from_options(options)
 
     miboy = MiGPT(config)

xiaogpt/config.py

@@ -64,7 +64,6 @@ class Config:
     glm_key: str = os.getenv("CHATGLM_KEY", "")
     gemini_key: str = os.getenv("GEMINI_KEY", "")  # keep the old rule
     qwen_key: str = os.getenv("DASHSCOPE_API_KEY", "")  # keep the old rule
-    bard_token: str = os.getenv("BARD_TOKEN", "")
     serpapi_api_key: str = os.getenv("SERPAPI_API_KEY", "")
     proxy: str | None = None
     mi_did: str = os.getenv("MI_DID", "")
@@ -107,16 +106,13 @@ class Config:
                 "Using Azure OpenAI needs deployment_id, read this: "
                 "https://learn.microsoft.com/en-us/azure/cognitive-services/openai/how-to/chatgpt?pivots=programming-language-chat-completions"
             )
-        if self.bot in ["chatgptapi", "gpt3"]:
+        if self.bot in ["chatgptapi"]:
             if not self.openai_key:
                 raise Exception(
                     "Using GPT api needs openai API key, please google how to"
                 )
         if self.tts == "azure" and not self.azure_tts_speech_key:
             raise Exception("Using Azure TTS needs azure speech key")
-        if self.tts in ["azure", "edge", "openai"]:
-            print("Will close stream when use tts: {self.tts} for better experience")
-            self.stream = False
 
     @property
     def tts_command(self) -> str:
@@ -150,8 +146,6 @@ class Config:
                     value = [kw for kw in value if kw]
                 elif key == "use_chatgpt_api":
                     key, value = "bot", "chatgptapi"
-                elif key == "use_gpt3":
-                    key, value = "bot", "gpt3"
                 elif key == "use_newbing":
                     key, value = "bot", "newbing"
                 elif key == "use_glm":
@@ -160,8 +154,6 @@ class Config:
                     key, value = "bot", "gemini"
                 elif key == "use_qwen":
                     key, value = "bot", "qwen"
-                elif key == "use_bard":
-                    key, value = "bot", "bard"
                 elif key == "use_langchain":
                     key, value = "bot", "langchain"
                 elif key == "enable_edge_tts":

xiaogpt/tts/azure.py

@@ -32,6 +32,7 @@ class AzureTTS(AudioFileTTS):
         # Check result
         if result.reason == speechsdk.ResultReason.SynthesizingAudioCompleted:
             logger.debug("Speech synthesized for text [{}]".format(text))
+
             return Path(output_file.name), calculate_tts_elapse(text)
         elif result.reason == speechsdk.ResultReason.Canceled:
             cancellation_details = result.cancellation_details

xiaogpt/tts/base.py

@@ -106,26 +106,21 @@ class AudioFileTTS(TTS):
             finished.set()
 
         task = asyncio.create_task(worker())
-        while not queue.empty() or not finished.is_set():
-            done, other = await asyncio.wait(
-                [
-                    asyncio.ensure_future(queue.get()),
-                    asyncio.ensure_future(finished.wait()),
-                ],
-                return_when=asyncio.FIRST_COMPLETED,
-            )
-            if other:
-                other.pop().cancel()
 
-            result = done.pop().result()
-            if result is True:
-                # finished is set, break the loop
-                break
-            else:
-                url, duration = result
-                logger.debug("Playing URL %s (%s seconds)", url, duration)
-                await self.mina_service.play_by_url(self.device_id, url)
-                await self.wait_for_duration(duration)
+        while True:
+            try:
+                url, duration = queue.get_nowait()
+            except asyncio.QueueEmpty:
+                if finished.is_set():
+                    break
+                else:
+                    await asyncio.sleep(0.1)
+                    continue
+            logger.debug("Playing URL %s (%s seconds)", url, duration)
+            await asyncio.gather(
+                self.mina_service.play_by_url(self.device_id, url),
+                self.wait_for_duration(duration),
+            )
         await task
 
     def _start_http_server(self):

xiaogpt/xiaogpt.py

@@ -181,8 +181,6 @@ class MiGPT:
         )
 
     def need_change_prompt(self, record):
-        if self.config.bot == "gpt3":
-            return False
         query = record.get("query", "")
         return query.startswith(tuple(self.config.change_prompt_keyword))
 

{xiaogpt-2.31.dist-info → xiaogpt-2.40.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xiaogpt
-Version: 2.31
+Version: 2.40
 Summary: Play ChatGPT or other LLM with xiaomi AI speaker
 Author-Email: yihong0618 <zouzou0208@gmail.com>
 License: MIT
@@ -15,7 +15,6 @@ Requires-Dist: aiohttp
 Requires-Dist: rich
 Requires-Dist: zhipuai==2.0.1
 Requires-Dist: httpx==0.24.1
-Requires-Dist: bardapi
 Requires-Dist: edge-tts>=6.1.3
 Requires-Dist: EdgeGPT==0.1.26
 Requires-Dist: langchain>=0.0.343
@@ -43,12 +42,10 @@ Play ChatGPT and other LLM with Xiaomi AI Speaker
 
 ## 支持的 AI 类型
 
-- GPT3
 - ChatGPT
 - New Bing
 - [ChatGLM](http://open.bigmodel.cn/)
 - [Gemini](https://makersuite.google.com/app/apikey)
-- [Bard](https://github.com/dsdanielpark/Bard-API)
 - [通义千问](https://help.aliyun.com/zh/dashscope/developer-reference/api-details)
 
 ## 获取小米音响DID
@@ -102,7 +99,6 @@ export MI_DID=xxxx
 - 使用 `--account ${account} --password ${password}`
 - 如果有能力可以自行替换唤醒词，也可以去掉唤醒词
 - 使用 `--use_chatgpt_api` 的 api 那样可以更流畅的对话，速度特别快，达到了对话的体验, [openai api](https://platform.openai.com/account/api-keys), 命令 `--use_chatgpt_api`
-- 使用 gpt-3 的 api 那样可以更流畅的对话，速度快, 请 google 如何用 [openai api](https://platform.openai.com/account/api-keys) 命令 --use_gpt3
 - 如果你遇到了墙需要用 Cloudflare Workers 替换 api_base 请使用 `--api_base ${url}` 来替换。 **请注意，此处你输入的api应该是'`https://xxxx/v1`'的字样，域名需要用引号包裹**
 - 可以跟小爱说 `开始持续对话` 自动进入持续对话状态，`结束持续对话` 结束持续对话状态。
 - 可以使用 `--tts edge` 来获取更好的 tts 能力
@@ -123,9 +119,6 @@ xiaogpt --hardware LX06 --account ${your_xiaomi_account} --password ${your_passw
 xiaogpt --hardware LX06  --mute_xiaoai --use_chatgpt_api
 # 使用流式响应，获得更快的响应
 xiaogpt --hardware LX06  --mute_xiaoai --stream
-# 如果你想使用 gpt3 ai
-export OPENAI_API_KEY=${your_api_key}
-xiaogpt --hardware LX06  --mute_xiaoai --use_gpt3
 # 如果你想使用 google 的 gemini
 xiaogpt --hardware LX06  --mute_xiaoai --use_gemini --gemini_key ${gemini_key}
 # 如果你想使用阿里的通义千问
@@ -151,13 +144,8 @@ python3 xiaogpt.py --hardware LX06 --account ${your_xiaomi_account} --password $
 python3 xiaogpt.py --hardware LX06  --mute_xiaoai
 # 使用流式响应，获得更快的响应
 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}
 # 如果你想使用 google 的 gemini
 python3 xiaogpt.py --hardware LX06  --mute_xiaoai --use_gemini --gemini_key ${gemini_key}
 # 如果你想使用阿里的通义千问
@@ -202,7 +190,6 @@ 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)
 
 ## 配置项说明
 
@@ -216,13 +203,12 @@ Bard-API [参考](https://github.com/dsdanielpark/Bard-API)
 | glm_key                  | chatglm 的 apikey                                                                           |                                                                                                           |                                                                                                                            |
 | gemini_key               | gemini 的 apikey [参考](https://makersuite.google.com/app/apikey)                           |                                                                                                           |                                                                                                                            |
 | qwen_key                 | qwen 的 apikey [参考](https://help.aliyun.com/zh/dashscope/developer-reference/api-details) |                                                                                                           |                                                                                                                            |
-| bard_token               | bard 的 token 参考 [Bard-API](https://github.com/dsdanielpark/Bard-API)                     |                                                                                                           |                                                                                                                            |
 | cookie                   | 小爱账户cookie （如果用上面密码登录可以不填）                                               |                                                                                                           |                                                                                                                            |
 | mi_did                   | 设备did                                                                                     |                                                                                                           |                                                                                                                            |
 | use_command              | 使用 MI command 与小爱交互                                                                  | `false`                                                                                                   |                                                                                                                            |
 | mute_xiaoai              | 快速停掉小爱自己的回答                                                                      | `true`                                                                                                    |                                                                                                                            |
 | verbose                  | 是否打印详细日志                                                                            | `false`                                                                                                   |                                                                                                                            |
-| bot                      | 使用的 bot 类型，目前支持gpt3,chatgptapi和newbing                                           | `chatgptapi`                                                                                              |                                                                                                                            |
+| bot                      | 使用的 bot 类型，目前支持 chatgptapi,newbing, qwen, gemini                                           | `chatgptapi`                                                                                              |                                                                                                                            |
 | tts                      | 使用的 TTS 类型                                                                             | `mi`                                                                                                      | `edge`、 `openai`、`azure`                                                                                                 |
 | tts_voice                | TTS 的嗓音                                                                                  | `zh-CN-XiaoxiaoNeural`(edge), `alloy`(openai), `zh-CN-XiaoxiaoMultilingualNeural`(azure)                  |                                                                                                                            |
 | prompt                   | 自定义prompt                                                                                | `请用100字以内回答`                                                                                       |                                                                                                                            |

{xiaogpt-2.31.dist-info → xiaogpt-2.40.dist-info}/RECORD

@@ -1,31 +1,29 @@
-xiaogpt-2.31.dist-info/METADATA,sha256=tJUtlb404LVK1jphNdrsQ2vh5c6QVCbZOpnqSj8vTn0,24695
-xiaogpt-2.31.dist-info/WHEEL,sha256=N2J68yzZqJh3mI_Wg92rwhw0rtJDFpZj9bwQIMJgaVg,90
-xiaogpt-2.31.dist-info/entry_points.txt,sha256=zLFzA72qQ_eWBepdA2YU5vdXFqORH8wXhv2Ox1vnYP8,46
-xiaogpt-2.31.dist-info/licenses/LICENSE,sha256=XdClh516MvlnOf9749JZHCxSB7y6_fyXcWmLDz6IkZY,1063
+xiaogpt-2.40.dist-info/METADATA,sha256=g5S1znqm_74UkhNwydLgOqPUxEUOdZg9euKWVprXm7Y,23668
+xiaogpt-2.40.dist-info/WHEEL,sha256=N2J68yzZqJh3mI_Wg92rwhw0rtJDFpZj9bwQIMJgaVg,90
+xiaogpt-2.40.dist-info/entry_points.txt,sha256=zLFzA72qQ_eWBepdA2YU5vdXFqORH8wXhv2Ox1vnYP8,46
+xiaogpt-2.40.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=qC8m87mWvtbiwipKl_OMYCqRbh79gkyZEytgz5DysC0,840
+xiaogpt/bot/__init__.py,sha256=7K9v6j6xDkuvIrJwjby0Ec_1ywd4Si0Ww9S_R8M3LeU,919
 xiaogpt/bot/base_bot.py,sha256=oKn6LLFHXol4hKrSrjnxknrOqrcGICtT_GPPYRNxpkw,1467
 xiaogpt/bot/chatgptapi_bot.py,sha256=JYlq1D-YZxRwAPpd5dTFSBU7h1KNdWA7FTwgyvMxr7c,3656
 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=325lMa4Z38rRh47HDa3J4XjvSs4SWOqMVhrMWzkGNo4,3657
-xiaogpt/cli.py,sha256=prTtwZjwC5RDZeh3eJWzBXTUHkOvFk7hAhuq9Mmeya8,5506
-xiaogpt/config.py,sha256=jKumR4BROqRnshBk79mqUAKuqSkW7gsCCPukYNzCWho,6703
+xiaogpt/cli.py,sha256=GnRj-AawthaZ5oE2jUzp_ML64afsSBnGXFvbnaqgJHE,4738
+xiaogpt/config.py,sha256=bhaOdmAr18qe9mv2CtL64aJxtf_-_g_-dDI0C7pLdpE,6301
 xiaogpt/langchain/callbacks.py,sha256=yR9AXQt9OHVYBWC47Q1I_BUT4Xg9iM44vnW2vv0BLpE,2616
 xiaogpt/langchain/chain.py,sha256=z0cqRlL0ElWnf31ByxZBN7AKOT-svXQDt5_NDft_nYc,1495
 xiaogpt/langchain/examples/email/mail_box.py,sha256=xauqrjE4-G4XPQnokUPE-MZgAaHQ_VrUDLlbfYTdCoo,6372
 xiaogpt/langchain/examples/email/mail_summary_tools.py,sha256=6cWvBJUaA7iaywcHdbUoww8WiCtaNw3TmwyxyF4DY7E,1561
 xiaogpt/tts/__init__.py,sha256=SZ0FVKbKVbuV7xfRtpwUt5cmqyNQaFa7LyGRYsmdDNE,220
-xiaogpt/tts/azure.py,sha256=Kxgc_XIWYo0A-xZrfZ_Qs2T7BzyRVCHhfzPKGKgjiXU,3978
-xiaogpt/tts/base.py,sha256=-fcF5PJ1p0AHSR8GNf0LJbIbZ1m_92WXXX7ZrfzgC3s,4923
+xiaogpt/tts/azure.py,sha256=JuE1wirQQAsYnnHmlc3sziuVXQUU0yGeGt5cHgiY388,3979
+xiaogpt/tts/base.py,sha256=a7J5cpcDNefr7deXJQWwDKw9XPFm6EQQL9O-GLe23hM,4660
 xiaogpt/tts/edge.py,sha256=yMFGxRTi086XS1d_mbMzQ365bvG4KgAz8ZptaoDAfGU,1172
 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=KrgvlHkhXDxlb4gUIXqDIDr6wMuiDhL13stDglYk1dk,15400
-xiaogpt-2.31.dist-info/RECORD,,
+xiaogpt/xiaogpt.py,sha256=YyDTm5DaO_US7cJOg-nPcjdQ_Xug0-tT3yQWg9APpBs,15337
+xiaogpt-2.40.dist-info/RECORD,,

xiaogpt/bot/bard_bot.py

@@ -1,37 +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 BardBot(ChatHistoryMixin, BaseBot):
-    name = "Bard"
-
-    def __init__(
-        self,
-        bard_token: str,
-    ) -> None:
-        from bardapi import BardAsync
-
-        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/bot/gpt3_bot.py

@@ -1,90 +0,0 @@
-from __future__ import annotations
-
-import dataclasses
-from typing import ClassVar
-
-import httpx
-from rich import print
-
-from xiaogpt.bot.base_bot import BaseBot, ChatHistoryMixin
-from xiaogpt.utils import split_sentences
-
-
-@dataclasses.dataclass
-class GPT3Bot(ChatHistoryMixin, BaseBot):
-    name: ClassVar[str] = "GPT3"
-    openai_key: str
-    api_base: str | None = None
-    proxy: str | None = None
-    history: list[tuple[str, str]] = dataclasses.field(default_factory=list, init=False)
-
-    @classmethod
-    def from_config(cls, config):
-        return cls(
-            openai_key=config.openai_key, api_base=config.api_base, proxy=config.proxy
-        )
-
-    async def ask(self, query, **options):
-        import openai
-
-        data = {
-            "prompt": query,
-            "model": "text-davinci-003",
-            "max_tokens": 1024,
-            "temperature": 1,
-            "top_p": 1,
-            **options,
-        }
-        httpx_kwargs = {}
-        if self.config.proxy:
-            httpx_kwargs["proxies"] = self.config.proxy
-        async with httpx.AsyncClient(trust_env=True, **httpx_kwargs) as sess:
-            client = openai.AsyncOpenAI(
-                api_key=self.openai_key, http_client=sess, base_url=self.api_base
-            )
-            try:
-                completion = await client.completions.create(**data)
-            except Exception as e:
-                print(str(e))
-                return ""
-            print(completion.choices[0].text)
-            return completion.choices[0].text
-
-    async def ask_stream(self, query, **options):
-        import openai
-
-        data = {
-            "prompt": query,
-            "model": "text-davinci-003",
-            "max_tokens": 1024,
-            "temperature": 1,
-            "top_p": 1,
-            "stream": True,
-            **options,
-        }
-        httpx_kwargs = {}
-        if self.config.proxy:
-            httpx_kwargs["proxies"] = self.config.proxy
-        async with httpx.AsyncClient(trust_env=True, **httpx_kwargs) as sess:
-            client = openai.AsyncOpenAI(
-                api_key=self.openai_key, http_client=sess, base_url=self.api_base
-            )
-            try:
-                completion = await client.completions.create(**data)
-            except Exception as e:
-                print(str(e))
-                return
-
-            async def text_gen():
-                async for event in completion:
-                    if not event.choices:
-                        continue
-                    text = event.choices[0].text
-                    print(text, end="")
-                    yield text
-
-            try:
-                async for sentence in split_sentences(text_gen()):
-                    yield sentence
-            finally:
-                print()