PyPI - xiaogpt - Versions diffs - 2.92__tar.gz → 3.0__tar.gz - Mend

xiaogpt 2.92tar.gz → 3.0tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (29) hide show

{xiaogpt-2.92 → xiaogpt-3.0}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xiaogpt
-Version: 2.92
+Version: 3.0
 Summary: Play ChatGPT or other LLM with xiaomi AI speaker
 Author-Email: yihong0618 <zouzou0208@gmail.com>
 License: MIT
@@ -26,7 +26,8 @@ Requires-Dist: groq>=0.5.0
 Requires-Dist: pyyaml>=6.0.1
 Requires-Dist: langchain-community>=0.0.38
 Requires-Dist: lingua-language-detector>=2.0.2; python_version < "3.13"
-Requires-Dist: aiohttp==3.9.5; extra == "locked"
+Requires-Dist: aiohappyeyeballs==2.4.0; extra == "locked"
+Requires-Dist: aiohttp==3.10.5; extra == "locked"
 Requires-Dist: aiosignal==1.3.1; extra == "locked"
 Requires-Dist: annotated-types==0.6.0; extra == "locked"
 Requires-Dist: anyio==4.3.0; extra == "locked"
@@ -39,72 +40,69 @@ 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.20.3; extra == "locked"
+Requires-Dist: dashscope==1.20.10; 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"
-Requires-Dist: et-xmlfile==1.1.0; python_version ~= "3.8" and python_full_version != "3.9.7" and extra == "locked"
 Requires-Dist: exceptiongroup==1.2.0; python_version < "3.11" and extra == "locked"
 Requires-Dist: frozenlist==1.4.1; extra == "locked"
-Requires-Dist: google-ai-generativelanguage==0.6.6; extra == "locked"
+Requires-Dist: google-ai-generativelanguage==0.6.9; extra == "locked"
 Requires-Dist: google-api-core==2.15.0; extra == "locked"
 Requires-Dist: google-api-core[grpc]==2.15.0; extra == "locked"
 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.7.2; extra == "locked"
+Requires-Dist: google-generativeai==0.8.1; 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"
-Requires-Dist: groq==0.9.0; extra == "locked"
+Requires-Dist: groq==0.11.0; extra == "locked"
 Requires-Dist: grpcio==1.60.0; extra == "locked"
 Requires-Dist: grpcio-status==1.60.0; extra == "locked"
 Requires-Dist: h11==0.14.0; extra == "locked"
 Requires-Dist: httpcore==1.0.5; extra == "locked"
 Requires-Dist: httplib2==0.22.0; extra == "locked"
-Requires-Dist: httpx==0.27.0; extra == "locked"
-Requires-Dist: httpx[socks]==0.27.0; extra == "locked"
+Requires-Dist: httpx==0.27.2; extra == "locked"
+Requires-Dist: httpx[socks]==0.27.2; extra == "locked"
 Requires-Dist: idna==3.7; extra == "locked"
+Requires-Dist: jiter==0.5.0; extra == "locked"
 Requires-Dist: jsonpatch==1.33; extra == "locked"
 Requires-Dist: jsonpointer==2.4; extra == "locked"
-Requires-Dist: langchain==0.2.10; extra == "locked"
-Requires-Dist: langchain-community==0.2.9; extra == "locked"
-Requires-Dist: langchain-core==0.2.22; extra == "locked"
-Requires-Dist: langchain-text-splitters==0.2.0; extra == "locked"
-Requires-Dist: langsmith==0.1.84; extra == "locked"
+Requires-Dist: langchain==0.3.0; extra == "locked"
+Requires-Dist: langchain-community==0.3.0; extra == "locked"
+Requires-Dist: langchain-core==0.3.0; extra == "locked"
+Requires-Dist: langchain-text-splitters==0.3.0; extra == "locked"
+Requires-Dist: langsmith==0.1.120; extra == "locked"
 Requires-Dist: lingua-language-detector==2.0.2; python_version < "3.13" and extra == "locked"
 Requires-Dist: markdown-it-py==3.0.0; extra == "locked"
 Requires-Dist: marshmallow==3.20.1; extra == "locked"
 Requires-Dist: mdurl==0.1.2; extra == "locked"
-Requires-Dist: miservice-fork==2.7.0; extra == "locked"
+Requires-Dist: miservice-fork==2.7.1; extra == "locked"
 Requires-Dist: multidict==6.0.5; extra == "locked"
 Requires-Dist: mutagen==1.47.0; extra == "locked"
 Requires-Dist: mypy-extensions==1.0.0; extra == "locked"
 Requires-Dist: numexpr==2.10.1; extra == "locked"
 Requires-Dist: numpy==1.26.3; extra == "locked"
-Requires-Dist: openai==1.36.1; extra == "locked"
-Requires-Dist: openpyxl==3.1.5; python_version ~= "3.8" and python_full_version != "3.9.7" and extra == "locked"
+Requires-Dist: openai==1.45.0; extra == "locked"
 Requires-Dist: orjson==3.10.0; extra == "locked"
 Requires-Dist: ormsgpack==1.5.0; extra == "locked"
 Requires-Dist: packaging==23.2; extra == "locked"
-Requires-Dist: pandas==2.2.2; python_version ~= "3.8" and python_full_version != "3.9.7" and extra == "locked"
 Requires-Dist: proto-plus==1.23.0; extra == "locked"
 Requires-Dist: protobuf==4.25.1; extra == "locked"
 Requires-Dist: pyasn1==0.5.1; extra == "locked"
 Requires-Dist: pyasn1-modules==0.3.0; extra == "locked"
 Requires-Dist: pydantic==2.8.2; extra == "locked"
 Requires-Dist: pydantic-core==2.20.1; extra == "locked"
+Requires-Dist: pydantic-settings==2.5.2; extra == "locked"
 Requires-Dist: pygments==2.17.2; extra == "locked"
 Requires-Dist: pyjwt==2.8.0; extra == "locked"
 Requires-Dist: pyparsing==3.1.2; python_version > "3.0" and extra == "locked"
-Requires-Dist: python-dateutil==2.9.0.post0; python_version ~= "3.8" and python_full_version != "3.9.7" and extra == "locked"
-Requires-Dist: pytz==2024.1; python_version ~= "3.8" and python_full_version != "3.9.7" and extra == "locked"
-Requires-Dist: pyyaml==6.0.1; extra == "locked"
+Requires-Dist: python-dotenv==1.0.1; extra == "locked"
+Requires-Dist: pyyaml==6.0.2; extra == "locked"
 Requires-Dist: requests==2.31.0; extra == "locked"
-Requires-Dist: rich==13.7.1; extra == "locked"
+Requires-Dist: rich==13.8.1; extra == "locked"
 Requires-Dist: rsa==4.9; extra == "locked"
-Requires-Dist: six==1.16.0; python_version ~= "3.8" and python_full_version != "3.9.7" and extra == "locked"
 Requires-Dist: sniffio==1.3.0; extra == "locked"
 Requires-Dist: socksio==1.0.0; extra == "locked"
 Requires-Dist: soupsieve==2.5; extra == "locked"
@@ -114,13 +112,12 @@ Requires-Dist: tetos==0.3.1; extra == "locked"
 Requires-Dist: tqdm==4.66.1; extra == "locked"
 Requires-Dist: typing-extensions==4.12.2; extra == "locked"
 Requires-Dist: typing-inspect==0.9.0; extra == "locked"
-Requires-Dist: tzdata==2024.1; python_version ~= "3.8" and python_full_version != "3.9.7" and extra == "locked"
 Requires-Dist: uritemplate==4.1.1; extra == "locked"
 Requires-Dist: urllib3==2.1.0; extra == "locked"
 Requires-Dist: websocket-client==1.8.0; extra == "locked"
 Requires-Dist: websockets==12.0; extra == "locked"
 Requires-Dist: yarl==1.9.4; extra == "locked"
-Requires-Dist: zhipuai==2.1.2; extra == "locked"
+Requires-Dist: zhipuai==2.1.5.20230904; extra == "locked"
 Provides-Extra: locked
 Description-Content-Type: text/markdown
@@ -187,6 +184,7 @@ Play ChatGPT and other LLM with Xiaomi AI Speaker
 - `--use_moonshot_api` and other models please refer below
 - 可以跟小爱说 `开始持续对话` 自动进入持续对话状态，`结束持续对话` 结束持续对话状态。
 - 可以使用 `--tts edge` 来获取更好的 tts 能力
+- 可以使用 `--tts fish --fish_api_key <your-fish-key> --fish_voice_key <fish-voice>` 来获取 [fish-audio](https://fish.audio/) 能力(如何获取 fish voice 见下)
 - 可以使用 `--tts openai` 来获取 openai tts 能力
 - 可以使用 `--tts azure --azure_tts_speech_key <your-speech-key>` 来获取 Azure TTS 能力
 - 可以使用 `--use_langchain` 替代 `--use_chatgpt_api` 来调用 LangChain（默认 chatgpt）服务，实现上网检索、数学运算..
@@ -216,11 +214,7 @@ xiaogpt --hardware LX06  --mute_xiaoai --use_moonshot_api --moonshot_api_key ${m
 xiaogpt --hardware LX06  --mute_xiaoai --use_llama --llama_api_key ${llama_api_key}
 # 如果你想使用 01
 xiaogpt --hardware LX06  --mute_xiaoai --use_yi_api --ti_api_key ${yi_api_key}
-# 如果你想使用豆包
+# 如果你想使用 LangChain+SerpApi 实现上网检索或其他本地服务（目前仅支持 stream 模式）
 export OPENAI_API_KEY=${your_api_key}
 export SERPAPI_API_KEY=${your_serpapi_key}
 xiaogpt --hardware Lx06 --use_langchain --mute_xiaoai --stream --openai_key ${your_api_key} --serpapi_api_key ${your_serpapi_key}
@@ -407,6 +401,7 @@ docker build --build-arg PIP_INDEX_URL=https://pypi.tuna.tsinghua.edu.cn/simple
 [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 的能力
 [openai-tts](https://platform.openai.com/docs/guides/text-to-speech) 提供了类似 openai tts 的能力
+[fish-tts](https://fish.audio/) 提供了 fish tts 的能力
 #### Usage
@@ -422,7 +417,24 @@ For edge 查看更多语言支持, 从中选择一个
 edge-tts --list-voices
 ```
-#### 在容器中使用 edge-tts/azure-tts/openai-tts/volc/google/baidu
+#### 如果你想使用 [fish-tts](https://fish.audio/)
+1. 注册 https://fish.audio/zh-CN/go-api/ 拿到 api key
+2. 选择你想要的声音自建声音或者使用热门声音  https://fish.audio/zh-CN/text-to-speech/?modelId=e80ea225770f42f79d50aa98be3cedfc 其中 `e80ea225770f42f79d50aa98be3cedfc` 就声音的 key id
+3. python3 xiaogpt.py --hardware LX06 --account xxxx --password xxxxx --use_chatgpt_api --mute_xiaoai --stream --tts fish --fish_api_key xxxxx --fish_voice_key xxxxx
+4. 或者在 xiao_config.yaml 中配置
+```yaml
+tts: fish
+# TTS 参数字典，参考 https://github.com/frostming/tetos 获取可用参数
+tts_options: {
+    "api_key": "xxxxx",
+    "voice": "xxxxxx"
+}
+```
+#### 在容器中使用 edge-tts/azure-tts/openai-tts/volc/google/baidu/fish
 由于 Edge TTS 启动了一个本地的 HTTP 服务，所以需要将容器的端口映射到宿主机上，并且指定本地机器的 hostname:

{xiaogpt-2.92 → xiaogpt-3.0}/README.md RENAMED Viewed

@@ -61,6 +61,7 @@ Play ChatGPT and other LLM with Xiaomi AI Speaker
 - `--use_moonshot_api` and other models please refer below
 - 可以跟小爱说 `开始持续对话` 自动进入持续对话状态，`结束持续对话` 结束持续对话状态。
 - 可以使用 `--tts edge` 来获取更好的 tts 能力
+- 可以使用 `--tts fish --fish_api_key <your-fish-key> --fish_voice_key <fish-voice>` 来获取 [fish-audio](https://fish.audio/) 能力(如何获取 fish voice 见下)
 - 可以使用 `--tts openai` 来获取 openai tts 能力
 - 可以使用 `--tts azure --azure_tts_speech_key <your-speech-key>` 来获取 Azure TTS 能力
 - 可以使用 `--use_langchain` 替代 `--use_chatgpt_api` 来调用 LangChain（默认 chatgpt）服务，实现上网检索、数学运算..
@@ -90,11 +91,7 @@ xiaogpt --hardware LX06  --mute_xiaoai --use_moonshot_api --moonshot_api_key ${m
 xiaogpt --hardware LX06  --mute_xiaoai --use_llama --llama_api_key ${llama_api_key}
 # 如果你想使用 01
 xiaogpt --hardware LX06  --mute_xiaoai --use_yi_api --ti_api_key ${yi_api_key}
-# 如果你想使用豆包
+# 如果你想使用 LangChain+SerpApi 实现上网检索或其他本地服务（目前仅支持 stream 模式）
 export OPENAI_API_KEY=${your_api_key}
 export SERPAPI_API_KEY=${your_serpapi_key}
 xiaogpt --hardware Lx06 --use_langchain --mute_xiaoai --stream --openai_key ${your_api_key} --serpapi_api_key ${your_serpapi_key}
@@ -281,6 +278,7 @@ docker build --build-arg PIP_INDEX_URL=https://pypi.tuna.tsinghua.edu.cn/simple
 [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 的能力
 [openai-tts](https://platform.openai.com/docs/guides/text-to-speech) 提供了类似 openai tts 的能力
+[fish-tts](https://fish.audio/) 提供了 fish tts 的能力
 #### Usage
@@ -296,7 +294,24 @@ For edge 查看更多语言支持, 从中选择一个
 edge-tts --list-voices
 ```
-#### 在容器中使用 edge-tts/azure-tts/openai-tts/volc/google/baidu
+#### 如果你想使用 [fish-tts](https://fish.audio/)
+1. 注册 https://fish.audio/zh-CN/go-api/ 拿到 api key
+2. 选择你想要的声音自建声音或者使用热门声音  https://fish.audio/zh-CN/text-to-speech/?modelId=e80ea225770f42f79d50aa98be3cedfc 其中 `e80ea225770f42f79d50aa98be3cedfc` 就声音的 key id
+3. python3 xiaogpt.py --hardware LX06 --account xxxx --password xxxxx --use_chatgpt_api --mute_xiaoai --stream --tts fish --fish_api_key xxxxx --fish_voice_key xxxxx
+4. 或者在 xiao_config.yaml 中配置
+```yaml
+tts: fish
+# TTS 参数字典，参考 https://github.com/frostming/tetos 获取可用参数
+tts_options: {
+    "api_key": "xxxxx",
+    "voice": "xxxxxx"
+}
+```
+#### 在容器中使用 edge-tts/azure-tts/openai-tts/volc/google/baidu/fish
 由于 Edge TTS 启动了一个本地的 HTTP 服务，所以需要将容器的端口映射到宿主机上，并且指定本地机器的 hostname:

{xiaogpt-2.92 → xiaogpt-3.0}/pyproject.toml RENAMED Viewed

@@ -31,7 +31,7 @@ dependencies = [
     "lingua-language-detector>=2.0.2; python_version < \"3.13\"",
 ]
 dynamic = []
-version = "2.92"
+version = "3.0"
 [project.license]
 text = "MIT"
@@ -44,7 +44,8 @@ xiaogpt = "xiaogpt.cli:main"
 [project.optional-dependencies]
 locked = [
-    "aiohttp==3.9.5",
+    "aiohappyeyeballs==2.4.0",
+    "aiohttp==3.10.5",
     "aiosignal==1.3.1",
     "annotated-types==0.6.0",
     "anyio==4.3.0",
@@ -57,72 +58,69 @@ locked = [
     "charset-normalizer==3.3.2",
     "click==8.1.7",
     "colorama==0.4.6 ; platform_system == \"Windows\"",
-    "dashscope==1.20.3",
+    "dashscope==1.20.10",
     "dataclasses-json==0.6.3",
     "distro==1.9.0",
     "edge-tts==6.1.10",
-    "et-xmlfile==1.1.0 ; python_version ~= \"3.8\" and python_full_version != \"3.9.7\"",
     "exceptiongroup==1.2.0 ; python_version < \"3.11\"",
     "frozenlist==1.4.1",
-    "google-ai-generativelanguage==0.6.6",
+    "google-ai-generativelanguage==0.6.9",
     "google-api-core==2.15.0",
     "google-api-core[grpc]==2.15.0",
     "google-api-python-client==2.125.0",
     "google-auth==2.26.1",
     "google-auth-httplib2==0.2.0",
     "google-cloud-texttospeech==2.16.3",
-    "google-generativeai==0.7.2",
+    "google-generativeai==0.8.1",
     "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\"",
-    "groq==0.9.0",
+    "groq==0.11.0",
     "grpcio==1.60.0",
     "grpcio-status==1.60.0",
     "h11==0.14.0",
     "httpcore==1.0.5",
     "httplib2==0.22.0",
-    "httpx==0.27.0",
-    "httpx[socks]==0.27.0",
+    "httpx==0.27.2",
+    "httpx[socks]==0.27.2",
     "idna==3.7",
+    "jiter==0.5.0",
     "jsonpatch==1.33",
     "jsonpointer==2.4",
-    "langchain==0.2.10",
-    "langchain-community==0.2.9",
-    "langchain-core==0.2.22",
-    "langchain-text-splitters==0.2.0",
-    "langsmith==0.1.84",
+    "langchain==0.3.0",
+    "langchain-community==0.3.0",
+    "langchain-core==0.3.0",
+    "langchain-text-splitters==0.3.0",
+    "langsmith==0.1.120",
     "lingua-language-detector==2.0.2 ; python_version < \"3.13\"",
     "markdown-it-py==3.0.0",
     "marshmallow==3.20.1",
     "mdurl==0.1.2",
-    "miservice-fork==2.7.0",
+    "miservice-fork==2.7.1",
     "multidict==6.0.5",
     "mutagen==1.47.0",
     "mypy-extensions==1.0.0",
     "numexpr==2.10.1",
     "numpy==1.26.3",
-    "openai==1.36.1",
-    "openpyxl==3.1.5 ; python_version ~= \"3.8\" and python_full_version != \"3.9.7\"",
+    "openai==1.45.0",
     "orjson==3.10.0",
     "ormsgpack==1.5.0",
     "packaging==23.2",
-    "pandas==2.2.2 ; python_version ~= \"3.8\" and python_full_version != \"3.9.7\"",
     "proto-plus==1.23.0",
     "protobuf==4.25.1",
     "pyasn1==0.5.1",
     "pyasn1-modules==0.3.0",
     "pydantic==2.8.2",
     "pydantic-core==2.20.1",
+    "pydantic-settings==2.5.2",
     "pygments==2.17.2",
     "pyjwt==2.8.0",
     "pyparsing==3.1.2 ; python_version > \"3.0\"",
-    "python-dateutil==2.9.0.post0 ; python_version ~= \"3.8\" and python_full_version != \"3.9.7\"",
-    "pytz==2024.1 ; python_version ~= \"3.8\" and python_full_version != \"3.9.7\"",
-    "pyyaml==6.0.1",
+    "python-dotenv==1.0.1",
+    "pyyaml==6.0.2",
     "requests==2.31.0",
-    "rich==13.7.1",
+    "rich==13.8.1",
     "rsa==4.9",
-    "six==1.16.0 ; python_version ~= \"3.8\" and python_full_version != \"3.9.7\"",
     "sniffio==1.3.0",
     "socksio==1.0.0",
     "soupsieve==2.5",
@@ -132,13 +130,12 @@ locked = [
     "tqdm==4.66.1",
     "typing-extensions==4.12.2",
     "typing-inspect==0.9.0",
-    "tzdata==2024.1 ; python_version ~= \"3.8\" and python_full_version != \"3.9.7\"",
     "uritemplate==4.1.1",
     "urllib3==2.1.0",
     "websocket-client==1.8.0",
     "websockets==12.0",
     "yarl==1.9.4",
-    "zhipuai==2.1.2",
+    "zhipuai==2.1.5.20230904",
 ]
 [tool.pdm]

{xiaogpt-2.92 → xiaogpt-3.0}/xiaogpt/cli.py RENAMED Viewed

@@ -104,6 +104,11 @@ def main():
     parser.add_argument(
         "--volc_secret_key", dest="volc_secret_key", help="Volcengine secret key"
     )
+    # for fish tts
+    parser.add_argument("--fish_api_key", dest="fish_api_key", help="fish api key")
+    parser.add_argument(
+        "--fish_voice_key", dest="fish_voice_key", help="fish voice key"
+    )
     parser.add_argument(
         "--verbose",
         dest="verbose",
@@ -114,7 +119,7 @@ def main():
     parser.add_argument(
         "--tts",
         help="TTS provider",
-        choices=["mi", "edge", "openai", "azure", "google", "baidu", "volc"],
+        choices=["mi", "edge", "openai", "azure", "google", "baidu", "volc", "fish"],
     )
     bot_group = parser.add_mutually_exclusive_group()
     bot_group.add_argument(

{xiaogpt-2.92 → xiaogpt-3.0}/xiaogpt/config.py RENAMED Viewed

@@ -82,7 +82,7 @@ class Config:
     end_conversation: str = "结束持续对话"
     stream: bool = False
     tts: Literal[
-        "mi", "edge", "azure", "openai", "baidu", "google", "volc", "minimax"
+        "mi", "edge", "azure", "openai", "baidu", "google", "volc", "minimax", "fish"
     ] = "mi"
     tts_options: dict[str, Any] = field(default_factory=dict)
     gpt_options: dict[str, Any] = field(default_factory=dict)
@@ -128,6 +128,15 @@ class Config:
             config.setdefault("tts_options", {}).setdefault(
                 "secret_key", config.get("volc_secret_key")
             )
+        elif config.get("tts") == "fish":
+            print("fish")
+            config.setdefault("tts_options", {}).setdefault(
+                "api_key", config.get("fish_api_key")
+            )
+            if voice := config.get("fish_voice_key"):
+                print("fish voice")
+                config.setdefault("tts_options", {}).setdefault("voice", voice)
         return cls(**config)
     @classmethod