xiaogpt 2.62__tar.gz → 2.63__tar.gz

{xiaogpt-2.62 → xiaogpt-2.63}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xiaogpt
-Version: 2.62
+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.62 → xiaogpt-2.63}/README.md

@@ -16,6 +16,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
@@ -78,6 +79,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 模式）
@@ -107,6 +110,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}
@@ -258,7 +263,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 的能力
@@ -271,17 +276,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.62 → xiaogpt-2.63}/pyproject.toml

@@ -28,7 +28,7 @@ dependencies = [
     "tetos>=0.1.1",
 ]
 dynamic = []
-version = "2.62"
+version = "2.63"
 
 [project.license]
 text = "MIT"
@@ -55,7 +55,7 @@ locked = [
     "charset-normalizer==3.3.2",
     "click==8.1.7",
     "colorama==0.4.6 ; platform_system == \"Windows\"",
-    "dashscope==1.17.0",
+    "dashscope==1.17.1",
     "dataclasses-json==0.6.3",
     "distro==1.9.0",
     "edge-tts==6.1.10",
@@ -69,7 +69,7 @@ locked = [
     "google-auth==2.26.1",
     "google-auth-httplib2==0.2.0",
     "google-cloud-texttospeech==2.16.3",
-    "google-generativeai==0.5.1",
+    "google-generativeai==0.5.2",
     "google-search-results==2.4.2",
     "googleapis-common-protos==1.62.0",
     "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\"",
@@ -97,7 +97,7 @@ locked = [
     "mypy-extensions==1.0.0",
     "numexpr==2.10.0",
     "numpy==1.26.3",
-    "openai==1.21.2",
+    "openai==1.23.2",
     "orjson==3.10.0",
     "packaging==23.2",
     "prompt-toolkit==3.0.43",

{xiaogpt-2.62 → xiaogpt-2.63}/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-2.62 → xiaogpt-2.63}/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":