xiaogpt 2.61__py3-none-any.whl → 2.63__py3-none-any.whl

xiaogpt/cli.py

@@ -83,8 +83,12 @@ def main():
         default=None,
         help="try to mute xiaoai answer",
     )
-    parser.add_argument("--volc-access-key", help="Volcengine access key")
-    parser.add_argument("--volc-secret-key", help="Volcengine secret key")
+    parser.add_argument(
+        "--volc_access_key", dest="volc_access_key", help="Volcengine access key"
+    )
+    parser.add_argument(
+        "--volc_secret_key", dest="volc_secret_key", help="Volcengine secret key"
+    )
     parser.add_argument(
         "--verbose",
         dest="verbose",
@@ -140,6 +144,13 @@ def main():
         const="gemini",
         help="if use gemini",
     )
+    bot_group.add_argument(
+        "--use_doubao",
+        dest="bot",
+        action="store_const",
+        const="doubao",
+        help="if use doubao",
+    )
     parser.add_argument(
         "--bing_cookie_path",
         dest="bing_cookie_path",
@@ -156,6 +167,7 @@ def main():
             "gemini",
             "langchain",
             "qwen",
+            "doubao",
         ],
     )
     parser.add_argument(

xiaogpt/config.py

@@ -153,6 +153,8 @@ class Config:
                     key, value = "bot", "gemini"
                 elif key == "use_qwen":
                     key, value = "bot", "qwen"
+                elif key == "use_doubao":
+                    key, value = "bot", "doubao"
                 elif key == "use_langchain":
                     key, value = "bot", "langchain"
                 elif key == "enable_edge_tts":

xiaogpt/xiaogpt.py

@@ -411,7 +411,7 @@ class MiGPT:
                 await self.wakeup_xiaoai()
 
     async def speak(self, text_stream: AsyncIterator[str]) -> None:
-        text = await anext(text_stream)
+        text = await text_stream.__anext__()
         # See if the first part contains language code(e.g. en-US|Hello world)
         lang, _, first_chunk = text.rpartition("|")
         if len(lang) > 7:

{xiaogpt-2.61.dist-info → xiaogpt-2.63.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xiaogpt
-Version: 2.61
+Version: 2.63
 Summary: Play ChatGPT or other LLM with xiaomi AI speaker
 Author-Email: yihong0618 <zouzou0208@gmail.com>
 License: MIT
@@ -37,7 +37,7 @@ Requires-Dist: certifi==2024.2.2; extra == "locked"
 Requires-Dist: charset-normalizer==3.3.2; extra == "locked"
 Requires-Dist: click==8.1.7; extra == "locked"
 Requires-Dist: colorama==0.4.6; platform_system == "Windows" and extra == "locked"
-Requires-Dist: dashscope==1.17.0; extra == "locked"
+Requires-Dist: dashscope==1.17.1; extra == "locked"
 Requires-Dist: dataclasses-json==0.6.3; extra == "locked"
 Requires-Dist: distro==1.9.0; extra == "locked"
 Requires-Dist: edge-tts==6.1.10; extra == "locked"
@@ -51,7 +51,7 @@ Requires-Dist: google-api-python-client==2.125.0; extra == "locked"
 Requires-Dist: google-auth==2.26.1; extra == "locked"
 Requires-Dist: google-auth-httplib2==0.2.0; extra == "locked"
 Requires-Dist: google-cloud-texttospeech==2.16.3; extra == "locked"
-Requires-Dist: google-generativeai==0.5.1; extra == "locked"
+Requires-Dist: google-generativeai==0.5.2; extra == "locked"
 Requires-Dist: google-search-results==2.4.2; extra == "locked"
 Requires-Dist: googleapis-common-protos==1.62.0; extra == "locked"
 Requires-Dist: greenlet==3.0.3; (platform_machine == "win32" or platform_machine == "WIN32" or platform_machine == "AMD64" or platform_machine == "amd64" or platform_machine == "x86_64" or platform_machine == "ppc64le" or platform_machine == "aarch64") and extra == "locked"
@@ -79,7 +79,7 @@ Requires-Dist: mutagen==1.47.0; extra == "locked"
 Requires-Dist: mypy-extensions==1.0.0; extra == "locked"
 Requires-Dist: numexpr==2.10.0; extra == "locked"
 Requires-Dist: numpy==1.26.3; extra == "locked"
-Requires-Dist: openai==1.21.2; extra == "locked"
+Requires-Dist: openai==1.23.2; extra == "locked"
 Requires-Dist: orjson==3.10.0; extra == "locked"
 Requires-Dist: packaging==23.2; extra == "locked"
 Requires-Dist: prompt-toolkit==3.0.43; extra == "locked"
@@ -133,6 +133,7 @@ Play ChatGPT and other LLM with Xiaomi AI Speaker
 - New Bing
 - [ChatGLM](http://open.bigmodel.cn/)
 - [Gemini](https://makersuite.google.com/app/apikey)
+- [Doubao](https://console.volcengine.com/iam/keymanage/)
 - [通义千问](https://help.aliyun.com/zh/dashscope/developer-reference/api-details)
 
 ## 获取小米音响DID
@@ -195,6 +196,8 @@ xiaogpt --hardware LX06  --mute_xiaoai --use_gemini --gemini_key ${gemini_key}
 python3 xiaogpt.py --hardware LX06  --mute_xiaoai --use_gemini --gemini_key ${gemini_key} --gemini_api_domain ${gemini_api_domain}
 # 如果你想使用阿里的通义千问
 xiaogpt --hardware LX06  --mute_xiaoai --use_qwen --qen_key ${qwen_key}
+# 如果你想使用豆包
+xiaogpt --hardware LX06  --mute_xiaoai --use_doubao --stream --volc_access_key xxxx --volc_secret_key xxx
 # 如果你想用 edge-tts
 xiaogpt --hardware LX06 --cookie ${cookie} --use_chatgpt_api --tts edge
 # 如果你想使用 LangChain + SerpApi 实现上网检索或其他本地服务（目前仅支持 stream 模式）
@@ -224,6 +227,8 @@ python3 xiaogpt.py --hardware LX06  --mute_xiaoai --use_gemini --gemini_key ${ge
 python3 xiaogpt.py --hardware LX06  --mute_xiaoai --use_gemini --gemini_key ${gemini_key} --gemini_api_domain ${gemini_api_domain}
 # 如果你想使用阿里的通义千问
 python3 xiaogpt.py --hardware LX06  --mute_xiaoai --use_qwen --qen_key ${qwen_key}
+# 如果你想使用豆包
+python3 xiaogpt.py --hardware LX06  --mute_xiaoai --use_doubao --stream --volc_access_key xxxx --volc_secret_key xxx
 # 如果你想使用 LangChain+SerpApi 实现上网检索或其他本地服务（目前仅支持 stream 模式）
 export OPENAI_API_KEY=${your_api_key}
 export SERPAPI_API_KEY=${your_serpapi_key}
@@ -375,7 +380,7 @@ docker build --build-arg PIP_INDEX_URL=https://pypi.tuna.tsinghua.edu.cn/simple
 
 ### 第三方 TTS
 
-我们目前支持是三种第三方 TTS：edge/openai/azure
+我们目前支持是三种第三方 TTS：edge/openai/azure/volc/baidu/google
 
 [edge-tts](https://github.com/rany2/edge-tts) 提供了类似微软tts的能力
 [azure-tts](https://techcommunity.microsoft.com/t5/ai-azure-ai-services-blog/9-more-realistic-ai-voices-for-conversations-now-generally/ba-p/4099471) 提供了微软 azure tts 的能力
@@ -388,17 +393,16 @@ docker build --build-arg PIP_INDEX_URL=https://pypi.tuna.tsinghua.edu.cn/simple
 ```json
 {
   "tts": "edge",
-  "tts_voice": "zh-CN-XiaoxiaoNeural"
 }
 ```
 
-查看更多语言支持, 从中选择一个
+For edge 查看更多语言支持, 从中选择一个
 
 ```shell
 edge-tts --list-voices
 ```
 
-#### 在容器中使用 edge-tts/azure-tts/openai-tts
+#### 在容器中使用 edge-tts/azure-tts/openai-tts/volc/google/baidu
 
 由于 Edge TTS 启动了一个本地的 HTTP 服务，所以需要将容器的端口映射到宿主机上，并且指定本地机器的 hostname:
 

{xiaogpt-2.61.dist-info → xiaogpt-2.63.dist-info}/RECORD

@@ -1,7 +1,7 @@
-xiaogpt-2.61.dist-info/METADATA,sha256=UWMVMRGMTJSpxviAmmPkwSpMGQGOJmQ74GBFTrGNWww,28013
-xiaogpt-2.61.dist-info/WHEEL,sha256=7sv5iXvIiTVJSnAxCz2tGBm9DHsb2vPSzeYeT7pvGUY,90
-xiaogpt-2.61.dist-info/entry_points.txt,sha256=zLFzA72qQ_eWBepdA2YU5vdXFqORH8wXhv2Ox1vnYP8,46
-xiaogpt-2.61.dist-info/licenses/LICENSE,sha256=XdClh516MvlnOf9749JZHCxSB7y6_fyXcWmLDz6IkZY,1063
+xiaogpt-2.63.dist-info/METADATA,sha256=8Vk0OkzUitqd2JdliqJSJUHLWap4C3c3orfgsOiiPF8,28355
+xiaogpt-2.63.dist-info/WHEEL,sha256=7sv5iXvIiTVJSnAxCz2tGBm9DHsb2vPSzeYeT7pvGUY,90
+xiaogpt-2.63.dist-info/entry_points.txt,sha256=zLFzA72qQ_eWBepdA2YU5vdXFqORH8wXhv2Ox1vnYP8,46
+xiaogpt-2.63.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=kOIY1lR0r-tbrnlcv_lj3cXxcwM4UpM8THxQ-JrRfwM,1006
@@ -13,8 +13,8 @@ xiaogpt/bot/glm_bot.py,sha256=QoMJbnu5_rHDz4tzwn7gh3IoAuw7E4hZQLAfziMAvNY,1825
 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=y7Cs1M5IbCjtdbeLU9h_2__fLT-7C8qt3FIDrG2LaBQ,4696
-xiaogpt/config.py,sha256=hCdggjjmBpQ_BX1teOuatjxUO9tRCUbSa3TLSnoiRkA,6444
+xiaogpt/cli.py,sha256=TcdMjk95vven3BmHAPFYSBe1rHKVfbEcc4PF6wHbyDw,4956
+xiaogpt/config.py,sha256=Ua-Rx6riCzPm40gmOZhbrXazHCFHdnfMyTuj0qxvqYU,6535
 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
@@ -24,5 +24,5 @@ xiaogpt/tts/base.py,sha256=fljxdXy60HXqdLXyQlsJZtzJBo5VtTwLkkWTi58tzQc,4656
 xiaogpt/tts/mi.py,sha256=1MzCB27DBohPQ_4Xz4W_FV9p-chJFDavOHB89NviLcM,1095
 xiaogpt/tts/tetos.py,sha256=9DaSrfU8Pf_aa7mI6JXMvE70XYJogIPvbim4Yuhcc3k,1903
 xiaogpt/utils.py,sha256=B7NCH7g19hcwHDXsnBJPTU6UcWnXoEntKWm-pgcet2I,2072
-xiaogpt/xiaogpt.py,sha256=Be5kUkn7H4lKU032dmaHP9LJAQKb65hMvulJMnVc5-g,15821
-xiaogpt-2.61.dist-info/RECORD,,
+xiaogpt/xiaogpt.py,sha256=r1wl94caTA3CfK-tSz3b8D2Qt7J6uPzNlWMLvoeuspw,15826
+xiaogpt-2.63.dist-info/RECORD,,