PyPI - xiaogpt - Versions diffs - 2.41__tar.gz → 2.50__tar.gz - Mend

xiaogpt 2.41tar.gz → 2.50tar.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 (30) hide show

{xiaogpt-2.41 → xiaogpt-2.50}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xiaogpt
-Version: 2.41
+Version: 2.50
 Summary: Play ChatGPT or other LLM with xiaomi AI speaker
 Author-Email: yihong0618 <zouzou0208@gmail.com>
 License: MIT
@@ -13,8 +13,8 @@ Requires-Dist: miservice_fork
 Requires-Dist: openai>=1
 Requires-Dist: aiohttp
 Requires-Dist: rich
-Requires-Dist: zhipuai==2.0.1
-Requires-Dist: httpx==0.24.1
+Requires-Dist: zhipuai>=2.0.1
+Requires-Dist: httpx[socks]
 Requires-Dist: edge-tts>=6.1.3
 Requires-Dist: EdgeGPT==0.1.26
 Requires-Dist: langchain>=0.0.343
@@ -22,10 +22,105 @@ Requires-Dist: beautifulsoup4>=4.12.0
 Requires-Dist: google-search-results>=2.4.2
 Requires-Dist: google-generativeai
 Requires-Dist: numexpr>=2.8.6
-Requires-Dist: dashscope==1.10.0
-Requires-Dist: httpcore==0.15.0
-Requires-Dist: idna==3.7
+Requires-Dist: dashscope>=1.10.0
 Requires-Dist: azure-cognitiveservices-speech>=1.37.0
+Requires-Dist: multidict>=6.0.5
+Requires-Dist: volcengine>=1.0.136
+Requires-Dist: aiohttp==3.9.4; extra == "locked"
+Requires-Dist: aiosignal==1.3.1; extra == "locked"
+Requires-Dist: annotated-types==0.6.0; extra == "locked"
+Requires-Dist: anyio==3.7.1; extra == "locked"
+Requires-Dist: async-timeout==4.0.3; python_version < "3.11" and extra == "locked"
+Requires-Dist: attrs==23.2.0; extra == "locked"
+Requires-Dist: azure-cognitiveservices-speech==1.37.0; extra == "locked"
+Requires-Dist: beautifulsoup4==4.12.3; extra == "locked"
+Requires-Dist: bingimagecreator==0.5.0; extra == "locked"
+Requires-Dist: cachetools==5.3.2; extra == "locked"
+Requires-Dist: certifi==2024.2.2; extra == "locked"
+Requires-Dist: charset-normalizer==3.3.2; extra == "locked"
+Requires-Dist: colorama==0.4.6; platform_system == "Windows" and extra == "locked"
+Requires-Dist: dashscope==1.10.0; extra == "locked"
+Requires-Dist: dataclasses-json==0.6.3; extra == "locked"
+Requires-Dist: decorator==5.1.1; extra == "locked"
+Requires-Dist: distro==1.9.0; extra == "locked"
+Requires-Dist: edge-tts==6.1.10; extra == "locked"
+Requires-Dist: edgegpt==0.1.26; 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==3.0.0; extra == "locked"
+Requires-Dist: google-ai-generativelanguage==0.6.1; 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-generativeai==0.5.0; 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: 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: idna==3.7; extra == "locked"
+Requires-Dist: jsonpatch==1.33; extra == "locked"
+Requires-Dist: jsonpointer==2.4; extra == "locked"
+Requires-Dist: langchain==0.1.16; extra == "locked"
+Requires-Dist: langchain-community==0.0.32; extra == "locked"
+Requires-Dist: langchain-core==0.1.42; extra == "locked"
+Requires-Dist: langchain-text-splitters==0.0.1; extra == "locked"
+Requires-Dist: langsmith==0.1.45; 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.4.3; 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.0; extra == "locked"
+Requires-Dist: numpy==1.26.3; extra == "locked"
+Requires-Dist: openai==1.17.1; 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"
+Requires-Dist: proto-plus==1.23.0; extra == "locked"
+Requires-Dist: protobuf==4.25.1; extra == "locked"
+Requires-Dist: py==1.11.0; extra == "locked"
+Requires-Dist: pyasn1==0.5.1; extra == "locked"
+Requires-Dist: pyasn1-modules==0.3.0; extra == "locked"
+Requires-Dist: pycryptodome==3.9.9; extra == "locked"
+Requires-Dist: pydantic==2.5.3; extra == "locked"
+Requires-Dist: pydantic-core==2.14.6; 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: pytz==2020.5; extra == "locked"
+Requires-Dist: pyyaml==6.0.1; extra == "locked"
+Requires-Dist: regex==2023.12.25; extra == "locked"
+Requires-Dist: requests==2.31.0; extra == "locked"
+Requires-Dist: retry==0.9.2; extra == "locked"
+Requires-Dist: rich==13.7.1; extra == "locked"
+Requires-Dist: rsa==4.9; extra == "locked"
+Requires-Dist: six==1.16.0; 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"
+Requires-Dist: sqlalchemy==2.0.25; extra == "locked"
+Requires-Dist: tenacity==8.2.3; extra == "locked"
+Requires-Dist: tqdm==4.66.1; extra == "locked"
+Requires-Dist: typing-extensions==4.9.0; extra == "locked"
+Requires-Dist: typing-inspect==0.9.0; extra == "locked"
+Requires-Dist: uritemplate==4.1.1; extra == "locked"
+Requires-Dist: urllib3==2.1.0; extra == "locked"
+Requires-Dist: volcengine==1.0.136; extra == "locked"
+Requires-Dist: wcwidth==0.2.13; extra == "locked"
+Requires-Dist: websockets==12.0; extra == "locked"
+Requires-Dist: yarl==1.9.4; extra == "locked"
+Requires-Dist: zhipuai==2.0.1; extra == "locked"
+Provides-Extra: locked
 Description-Content-Type: text/markdown
 # xiaogpt
@@ -49,32 +144,15 @@ Play ChatGPT and other LLM with Xiaomi AI Speaker
 - [通义千问](https://help.aliyun.com/zh/dashscope/developer-reference/api-details)
 ## 获取小米音响DID
-### Windows(使用 set 设置环境变量）
-```cmd
-pip install miservice_fork
-set MI_USER=xxxx
-set MI_PASS=xxx
-micli list 得到did
-set MI_DID=xxxx
-```
+系统和Shell|Linux *sh|Windows CMD用户|Windows PowerShell用户
+-|-|-|-
+1、安装包|`pip install miservice_fork`|`pip install miservice_fork`|`pip install miservice_fork`
+2、设置变量|`export MI_USER=xxx` <br> `export MI_PASS=xxx`|`set MI_USER=xxx`<br>`set MI_PASS=xxx`|`$env:MI_USER="xxx"` <br> `$env:MI_PASS="xxx"`
+3、取得MI_DID|`micli list` |`micli list` |`micli list`
+4、设置MI_DID|`export MI_DID=xxx`| `set MI_DID=xxx`| `$env:MI_DID="xxx"`
+- 注意不同shell 对环境变量的处理是不同的，尤其是powershell赋值时，可能需要双引号来包括值。
 - 如果获取did报错时，请更换一下无线网络，有很大概率解决问题。
-### Linux(使用 export 设置环境变量）
-```sh
-# 1、安装模块
-pip install miservice_fork
-# 2、设置环境用户参数
-export MI_USER=xxxx
-export MI_PASS=xxx
-# 3、使用micli list 得到did
-micli list
-# 4、根据did设置环境DID参数
-export MI_DID=xxxx
-```
 ## 一点原理
@@ -89,7 +167,7 @@ export MI_DID=xxxx
 ## 使用
-- `pip install -U --force-reinstall xiaogpt`
+- `pip install -U --force-reinstall xiaogpt[locked]`
 - 参考我 fork 的 [MiService](https://github.com/yihong0618/MiService) 项目 README 并在本地 terminal 跑 `micli list` 拿到你音响的 DID 成功 **别忘了设置 export MI_DID=xxx** 这个 MI_DID 用
 - run `xiaogpt --hardware ${your_hardware} --use_chatgpt_api` hardware 你看小爱屁股上有型号，输入进来，如果在屁股上找不到或者型号不对，可以用 `micli mina` 找到型号
 - 跑起来之后就可以问小爱同学问题了，“帮我"开头的问题，会发送一份给 ChatGPT 然后小爱同学用 tts 回答
@@ -209,7 +287,7 @@ ChatGLM [文档](http://open.bigmodel.cn/doc/api#chatglm_130b)
 | mute_xiaoai              | 快速停掉小爱自己的回答                                                                      | `true`                                                                                                    |                                                                                                                            |
 | verbose                  | 是否打印详细日志                                                                            | `false`                                                                                                   |                                                                                                                            |
 | bot                      | 使用的 bot 类型，目前支持 chatgptapi,newbing, qwen, gemini                                           | `chatgptapi`                                                                                              |                                                                                                                            |
-| tts                      | 使用的 TTS 类型                                                                             | `mi`                                                                                                      | `edge`、 `openai`、`azure`                                                                                                 |
+| tts                      | 使用的 TTS 类型                                                                             | `mi`                                                                                                      | `edge`、 `openai`、`azure`、`volc`                                                                                                 |
 | tts_voice                | TTS 的嗓音                                                                                  | `zh-CN-XiaoxiaoNeural`(edge), `alloy`(openai), `zh-CN-XiaoxiaoMultilingualNeural`(azure)                  |                                                                                                                            |
 | prompt                   | 自定义prompt                                                                                | `请用100字以内回答`                                                                                       |                                                                                                                            |
 | keyword                  | 自定义请求词列表                                                                            | `["请"]`                                                                                                  |                                                                                                                            |
@@ -225,6 +303,11 @@ ChatGLM [文档](http://open.bigmodel.cn/doc/api#chatglm_130b)
 | api_base                 | 如果需要替换默认的api,或者使用Azure OpenAI 服务                                             | 例如：`https://abc-def.openai.azure.com/`                                                                 |                                                                                                                            |
 | azure_tts_speech_key     | Azure TTS key                                                                               | null                                                                                                      |                                                                                                                            |
 | azure_tts_service_region | Azure TTS 服务地区                                                                          | `eastasia`                                                                                                | [Regions - Speech service - Azure AI services](https://learn.microsoft.com/en-us/azure/ai-services/speech-service/regions) |
+| volc_accesskey | 火山引擎accesskey [参考](https://console.volcengine.com/iam/keymanage/)                                |                                                                                                 |  |
+| volc_secretkey | 火山引擎secretkey [参考](https://console.volcengine.com/iam/keymanage/)                                |                                                                                                 | |
+| volc_tts_app | 火山引擎  TTS app 服务   [参考]( https://console.volcengine.com/sami/)                          |                                  |  |
+| volc_tts_speaker | 火山引擎 TTS speaker   [参考]( https://www.volcengine.com/docs/6489/93478)                          |   `zh_female_qingxin`                               |  |
 [这里]: https://github.com/acheong08/EdgeGPT#getting-authentication-required

{xiaogpt-2.41 → xiaogpt-2.50}/README.md RENAMED Viewed

@@ -19,32 +19,15 @@ Play ChatGPT and other LLM with Xiaomi AI Speaker
 - [通义千问](https://help.aliyun.com/zh/dashscope/developer-reference/api-details)
 ## 获取小米音响DID
-### Windows(使用 set 设置环境变量）
-```cmd
-pip install miservice_fork
-set MI_USER=xxxx
-set MI_PASS=xxx
-micli list 得到did
-set MI_DID=xxxx
-```
+系统和Shell|Linux *sh|Windows CMD用户|Windows PowerShell用户
+-|-|-|-
+1、安装包|`pip install miservice_fork`|`pip install miservice_fork`|`pip install miservice_fork`
+2、设置变量|`export MI_USER=xxx` <br> `export MI_PASS=xxx`|`set MI_USER=xxx`<br>`set MI_PASS=xxx`|`$env:MI_USER="xxx"` <br> `$env:MI_PASS="xxx"`
+3、取得MI_DID|`micli list` |`micli list` |`micli list`
+4、设置MI_DID|`export MI_DID=xxx`| `set MI_DID=xxx`| `$env:MI_DID="xxx"`
+- 注意不同shell 对环境变量的处理是不同的，尤其是powershell赋值时，可能需要双引号来包括值。
 - 如果获取did报错时，请更换一下无线网络，有很大概率解决问题。
-### Linux(使用 export 设置环境变量）
-```sh
-# 1、安装模块
-pip install miservice_fork
-# 2、设置环境用户参数
-export MI_USER=xxxx
-export MI_PASS=xxx
-# 3、使用micli list 得到did
-micli list
-# 4、根据did设置环境DID参数
-export MI_DID=xxxx
-```
 ## 一点原理
@@ -59,7 +42,7 @@ export MI_DID=xxxx
 ## 使用
-- `pip install -U --force-reinstall xiaogpt`
+- `pip install -U --force-reinstall xiaogpt[locked]`
 - 参考我 fork 的 [MiService](https://github.com/yihong0618/MiService) 项目 README 并在本地 terminal 跑 `micli list` 拿到你音响的 DID 成功 **别忘了设置 export MI_DID=xxx** 这个 MI_DID 用
 - run `xiaogpt --hardware ${your_hardware} --use_chatgpt_api` hardware 你看小爱屁股上有型号，输入进来，如果在屁股上找不到或者型号不对，可以用 `micli mina` 找到型号
 - 跑起来之后就可以问小爱同学问题了，“帮我"开头的问题，会发送一份给 ChatGPT 然后小爱同学用 tts 回答
@@ -179,7 +162,7 @@ ChatGLM [文档](http://open.bigmodel.cn/doc/api#chatglm_130b)
 | mute_xiaoai              | 快速停掉小爱自己的回答                                                                      | `true`                                                                                                    |                                                                                                                            |
 | verbose                  | 是否打印详细日志                                                                            | `false`                                                                                                   |                                                                                                                            |
 | bot                      | 使用的 bot 类型，目前支持 chatgptapi,newbing, qwen, gemini                                           | `chatgptapi`                                                                                              |                                                                                                                            |
-| tts                      | 使用的 TTS 类型                                                                             | `mi`                                                                                                      | `edge`、 `openai`、`azure`                                                                                                 |
+| tts                      | 使用的 TTS 类型                                                                             | `mi`                                                                                                      | `edge`、 `openai`、`azure`、`volc`                                                                                                 |
 | tts_voice                | TTS 的嗓音                                                                                  | `zh-CN-XiaoxiaoNeural`(edge), `alloy`(openai), `zh-CN-XiaoxiaoMultilingualNeural`(azure)                  |                                                                                                                            |
 | prompt                   | 自定义prompt                                                                                | `请用100字以内回答`                                                                                       |                                                                                                                            |
 | keyword                  | 自定义请求词列表                                                                            | `["请"]`                                                                                                  |                                                                                                                            |
@@ -195,6 +178,11 @@ ChatGLM [文档](http://open.bigmodel.cn/doc/api#chatglm_130b)
 | api_base                 | 如果需要替换默认的api,或者使用Azure OpenAI 服务                                             | 例如：`https://abc-def.openai.azure.com/`                                                                 |                                                                                                                            |
 | azure_tts_speech_key     | Azure TTS key                                                                               | null                                                                                                      |                                                                                                                            |
 | azure_tts_service_region | Azure TTS 服务地区                                                                          | `eastasia`                                                                                                | [Regions - Speech service - Azure AI services](https://learn.microsoft.com/en-us/azure/ai-services/speech-service/regions) |
+| volc_accesskey | 火山引擎accesskey [参考](https://console.volcengine.com/iam/keymanage/)                                |                                                                                                 |  |
+| volc_secretkey | 火山引擎secretkey [参考](https://console.volcengine.com/iam/keymanage/)                                |                                                                                                 | |
+| volc_tts_app | 火山引擎  TTS app 服务   [参考]( https://console.volcengine.com/sami/)                          |                                  |  |
+| volc_tts_speaker | 火山引擎 TTS speaker   [参考]( https://www.volcengine.com/docs/6489/93478)                          |   `zh_female_qingxin`                               |  |
 [这里]: https://github.com/acheong08/EdgeGPT#getting-authentication-required

xiaogpt-2.50/pyproject.toml ADDED Viewed

@@ -0,0 +1,165 @@
+[project]
+name = "xiaogpt"
+description = "Play ChatGPT or other LLM with xiaomi AI speaker"
+readme = "README.md"
+authors = [
+    { name = "yihong0618", email = "zouzou0208@gmail.com" },
+]
+classifiers = [
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3",
+]
+requires-python = ">=3.9"
+dependencies = [
+    "miservice_fork",
+    "openai>=1",
+    "aiohttp",
+    "rich",
+    "zhipuai>=2.0.1",
+    "httpx[socks]",
+    "edge-tts>=6.1.3",
+    "EdgeGPT==0.1.26",
+    "langchain>=0.0.343",
+    "beautifulsoup4>=4.12.0",
+    "google-search-results>=2.4.2",
+    "google-generativeai",
+    "numexpr>=2.8.6",
+    "dashscope>=1.10.0",
+    "azure-cognitiveservices-speech>=1.37.0",
+    "multidict>=6.0.5",
+    "volcengine>=1.0.136",
+]
+dynamic = []
+version = "2.50"
+[project.license]
+text = "MIT"
+[project.urls]
+Homepage = "https://github.com/yihong0618/xiaogpt"
+[project.scripts]
+xiaogpt = "xiaogpt.cli:main"
+[project.optional-dependencies]
+locked = [
+    "aiohttp==3.9.4",
+    "aiosignal==1.3.1",
+    "annotated-types==0.6.0",
+    "anyio==3.7.1",
+    "async-timeout==4.0.3 ; python_version < \"3.11\"",
+    "attrs==23.2.0",
+    "azure-cognitiveservices-speech==1.37.0",
+    "beautifulsoup4==4.12.3",
+    "bingimagecreator==0.5.0",
+    "cachetools==5.3.2",
+    "certifi==2024.2.2",
+    "charset-normalizer==3.3.2",
+    "colorama==0.4.6 ; platform_system == \"Windows\"",
+    "dashscope==1.10.0",
+    "dataclasses-json==0.6.3",
+    "decorator==5.1.1",
+    "distro==1.9.0",
+    "edge-tts==6.1.10",
+    "edgegpt==0.1.26",
+    "exceptiongroup==1.2.0 ; python_version < \"3.11\"",
+    "frozenlist==1.4.1",
+    "google==3.0.0",
+    "google-ai-generativelanguage==0.6.1",
+    "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-generativeai==0.5.0",
+    "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\"",
+    "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",
+    "idna==3.7",
+    "jsonpatch==1.33",
+    "jsonpointer==2.4",
+    "langchain==0.1.16",
+    "langchain-community==0.0.32",
+    "langchain-core==0.1.42",
+    "langchain-text-splitters==0.0.1",
+    "langsmith==0.1.45",
+    "markdown-it-py==3.0.0",
+    "marshmallow==3.20.1",
+    "mdurl==0.1.2",
+    "miservice-fork==2.4.3",
+    "multidict==6.0.5",
+    "mutagen==1.47.0",
+    "mypy-extensions==1.0.0",
+    "numexpr==2.10.0",
+    "numpy==1.26.3",
+    "openai==1.17.1",
+    "orjson==3.10.0",
+    "packaging==23.2",
+    "prompt-toolkit==3.0.43",
+    "proto-plus==1.23.0",
+    "protobuf==4.25.1",
+    "py==1.11.0",
+    "pyasn1==0.5.1",
+    "pyasn1-modules==0.3.0",
+    "pycryptodome==3.9.9",
+    "pydantic==2.5.3",
+    "pydantic-core==2.14.6",
+    "pygments==2.17.2",
+    "pyjwt==2.8.0",
+    "pyparsing==3.1.2 ; python_version > \"3.0\"",
+    "pytz==2020.5",
+    "pyyaml==6.0.1",
+    "regex==2023.12.25",
+    "requests==2.31.0",
+    "retry==0.9.2",
+    "rich==13.7.1",
+    "rsa==4.9",
+    "six==1.16.0",
+    "sniffio==1.3.0",
+    "socksio==1.0.0",
+    "soupsieve==2.5",
+    "sqlalchemy==2.0.25",
+    "tenacity==8.2.3",
+    "tqdm==4.66.1",
+    "typing-extensions==4.9.0",
+    "typing-inspect==0.9.0",
+    "uritemplate==4.1.1",
+    "urllib3==2.1.0",
+    "volcengine==1.0.136",
+    "wcwidth==0.2.13",
+    "websockets==12.0",
+    "yarl==1.9.4",
+    "zhipuai==2.0.1",
+]
+[tool.pdm]
+plugins = [
+    "pdm-autoexport",
+]
+autoexport = [
+    { filename = "requirements.txt", without-hashes = true },
+]
+[tool.pdm.version]
+source = "scm"
+[tool.pdm.build]
+includes = [
+    "xiaogpt/",
+]
+locked = true
+[build-system]
+requires = [
+    "pdm-backend>=2.0.0",
+    "pdm-build-locked",
+]
+build-backend = "pdm.backend"

{xiaogpt-2.41 → xiaogpt-2.50}/xiaogpt/config.py RENAMED Viewed

@@ -87,6 +87,16 @@ class Config:
     bing_cookies: dict | None = None
     azure_tts_speech_key: str | None = None
     azure_tts_service_region: str = "eastasia"
+    volc_accesskey: str = os.getenv(
+        "VOLC_ACCESSKEY", ""
+    )  # https://console.volcengine.com/iam/keymanage/
+    volc_secretkey: str = os.getenv("VOLC_SECRETKEY", "")
+    volc_tts_app: str = os.getenv(
+        "VOLC_TTS_APP", ""
+    )  # https://console.volcengine.com/sami
+    volc_tts_speaker: str = os.getenv(
+        "VOLC_TTS_SPEAPER", "zh_female_qingxin"
+    )  # https://www.volcengine.com/docs/6489/93478
     def __post_init__(self) -> None:
         if self.proxy:

{xiaogpt-2.41 → xiaogpt-2.50}/xiaogpt/tts/__init__.py RENAMED Viewed

@@ -1,6 +1,7 @@
 from xiaogpt.tts.base import TTS as TTS
 from xiaogpt.tts.edge import EdgeTTS as EdgeTTS
 from xiaogpt.tts.mi import MiTTS as MiTTS
+from xiaogpt.tts.volc import VolcTTS as VolcTTS
 from xiaogpt.tts.azure import AzureTTS
-__all__ = ["TTS", "EdgeTTS", "MiTTS", "AzureTTS"]
+__all__ = ["TTS", "EdgeTTS", "MiTTS", "AzureTTS", "VolcTTS"]

xiaogpt-2.50/xiaogpt/tts/volc.py ADDED Viewed

@@ -0,0 +1,130 @@
+from __future__ import annotations
+import logging
+import tempfile
+from pathlib import Path
+from typing import Optional
+import json
+import os
+import time
+import base64
+import threading
+import httpx
+from volcengine.ApiInfo import ApiInfo
+from volcengine.Credentials import Credentials
+from volcengine.ServiceInfo import ServiceInfo
+from volcengine.base.Service import Service
+from xiaogpt.tts.base import AudioFileTTS
+from xiaogpt.utils import calculate_tts_elapse
+logger = logging.getLogger(__name__)
+class VolcTTS(AudioFileTTS):
+    def __init__(self, mina_service, device_id, config):
+        super().__init__(mina_service, device_id, config)
+        self.token = get_token(config)
+        self.client = httpx.Client()
+        logger.info("Initializing VolcTTS {self.token}")
+    async def make_audio_file(self, query: str, text: str) -> tuple[Path, float]:
+        tts_payload = json.dumps(
+            {
+                "text": text,
+                "speaker": self.config.volc_tts_speaker,
+                "audio_config": {
+                    "format": "mp3",
+                    "sample_rate": 24000,
+                    "speech_rate": 0,
+                },
+            }
+        )
+        req = {
+            "appkey": self.config.volc_tts_app,
+            "token": self.token,
+            "namespace": "TTS",
+            "payload": tts_payload,
+        }
+        resp = self.client.post("https://sami.bytedance.com/api/v1/invoke", json=req)
+        try:
+            sami_resp = resp.json()
+            logger.info(f"volc sami_resp {resp.status_code}")
+            if resp.status_code != 200:
+                print(sami_resp)
+        except:
+            logger.error(f"Failed to get tts from volcengine with voice=zh {text}")
+        if sami_resp["status_code"] == 20000000 and len(sami_resp["data"]) > 0:
+            audio_data = base64.b64decode(sami_resp["data"])
+            with tempfile.NamedTemporaryFile(
+                suffix=".mp3", mode="wb", delete=False, dir=self.dirname.name
+            ) as f:
+                f.write(audio_data)
+        return Path(f.name), calculate_tts_elapse(text)
+## fetch token and save it to file
+## it's aimed to reduce the request to volcengine
+## it'll throw error if token is requested too frequently (more than 1 times per minute)
+def get_token(config):
+    token_file = Path.home() / ".volc.token"
+    if not Path.exists(token_file):
+        token = request_token_data(config)
+    else:
+        with open(token_file, "r") as f:
+            token = json.load(f)
+            if token["expires_at"] < time.time():
+                token = request_token_data(config)
+    if not Path.exists(token_file):
+        with open(token_file, "w") as f:
+            json.dump(token, f)
+    return token["token"]
+def request_token_data(config):
+    sami_service = SAMIService()
+    sami_service.set_ak(config.volc_accesskey)
+    sami_service.set_sk(config.volc_secretkey)
+    req = {
+        "appkey": config.volc_tts_app,
+        "token_version": "volc-auth-v1",
+        "expiration": 24 * 3600,
+    }
+    token = sami_service.common_json_handler("GetToken", req)
+    logger.info(f"Got token from volcengine {token}")
+    return token
+class SAMIService(Service):
+    def __init__(self):
+        self.service_info = ServiceInfo(
+            "open.volcengineapi.com",
+            {},
+            Credentials("", "", "sami", "cn-north-1"),
+            10,
+            10,
+        )
+        self.api_info = {
+            "GetToken": ApiInfo(
+                "POST", "/", {"Action": "GetToken", "Version": "2021-07-27"}, {}, {}
+            ),
+        }
+        super(SAMIService, self).__init__(self.service_info, self.api_info)
+    def common_json_handler(self, api, body):
+        params = dict()
+        try:
+            body = json.dumps(body)
+            res = self.json(api, params, body)
+            res_json = json.loads(res)
+            return res_json
+        except Exception as e:
+            raise Exception(str(e))

{xiaogpt-2.41 → xiaogpt-2.50}/xiaogpt/xiaogpt.py RENAMED Viewed

@@ -23,7 +23,7 @@ from xiaogpt.config import (
     WAKEUP_KEYWORD,
     Config,
 )
-from xiaogpt.tts import TTS, EdgeTTS, MiTTS, AzureTTS
+from xiaogpt.tts import TTS, EdgeTTS, MiTTS, AzureTTS, VolcTTS
 from xiaogpt.tts.openai import OpenAITTS
 from xiaogpt.utils import (
     parse_cookie_string,
@@ -62,7 +62,9 @@ class MiGPT:
                 )
                 new_record = await self.get_latest_ask_from_xiaoai(session)
                 start = time.perf_counter()
-                self.log.debug("Polling_event, timestamp: %s", self.last_timestamp)
+                self.log.debug(
+                    "Polling_event, timestamp: %s %s", self.last_timestamp, new_record
+                )
                 await self.polling_event.wait()
                 if (
                     self.config.mute_xiaoai
@@ -262,6 +264,8 @@ class MiGPT:
             return AzureTTS(self.mina_service, self.device_id, self.config)
         elif self.config.tts == "openai":
             return OpenAITTS(self.mina_service, self.device_id, self.config)
+        elif self.config.tts == "volc":
+            return VolcTTS(self.mina_service, self.device_id, self.config)
         else:
             return MiTTS(self.mina_service, self.device_id, self.config)
@@ -355,7 +359,6 @@ class MiGPT:
             new_record = await self.last_record.get()
             self.polling_event.clear()  # stop polling when processing the question
             query = new_record.get("query", "").strip()
             if query == self.config.start_conversation:
                 if not self.in_conversation:
                     print("开始对话")

xiaogpt-2.41/pyproject.toml DELETED Viewed

@@ -1,65 +0,0 @@
-[project]
-name = "xiaogpt"
-description = "Play ChatGPT or other LLM with xiaomi AI speaker"
-readme = "README.md"
-authors = [
-    { name = "yihong0618", email = "zouzou0208@gmail.com" },
-]
-classifiers = [
-    "License :: OSI Approved :: MIT License",
-    "Operating System :: OS Independent",
-    "Programming Language :: Python :: 3",
-]
-requires-python = ">=3.9"
-dependencies = [
-    "miservice_fork",
-    "openai>=1",
-    "aiohttp",
-    "rich",
-    "zhipuai==2.0.1",
-    "httpx==0.24.1",
-    "edge-tts>=6.1.3",
-    "EdgeGPT==0.1.26",
-    "langchain>=0.0.343",
-    "beautifulsoup4>=4.12.0",
-    "google-search-results>=2.4.2",
-    "google-generativeai",
-    "numexpr>=2.8.6",
-    "dashscope==1.10.0",
-    "httpcore==0.15.0",
-    "idna==3.7",
-    "azure-cognitiveservices-speech>=1.37.0",
-]
-dynamic = []
-version = "2.41"
-[project.license]
-text = "MIT"
-[project.urls]
-Homepage = "https://github.com/yihong0618/xiaogpt"
-[project.scripts]
-xiaogpt = "xiaogpt.cli:main"
-[tool.pdm]
-plugins = [
-    "pdm-autoexport",
-]
-autoexport = [
-    { filename = "requirements.txt", without-hashes = true },
-]
-[tool.pdm.version]
-source = "scm"
-[tool.pdm.build]
-includes = [
-    "xiaogpt/",
-]
-[build-system]
-requires = [
-    "pdm-backend>=2.0.0",
-]
-build-backend = "pdm.backend"