PyPI - xiaogpt - Versions diffs - 2.83__tar.gz → 2.90__tar.gz - Mend

xiaogpt 2.83tar.gz → 2.90tar.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.83 → xiaogpt-2.90}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xiaogpt
-Version: 2.83
+Version: 2.90
 Summary: Play ChatGPT or other LLM with xiaomi AI speaker
 Author-Email: yihong0618 <zouzou0208@gmail.com>
 License: MIT
@@ -25,6 +25,7 @@ Requires-Dist: tetos>=0.2.1
 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: aiosignal==1.3.1; extra == "locked"
 Requires-Dist: annotated-types==0.6.0; extra == "locked"
@@ -38,24 +39,25 @@ 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.19.1; extra == "locked"
+Requires-Dist: dashscope==1.20.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"
+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.4; extra == "locked"
+Requires-Dist: google-ai-generativelanguage==0.6.6; 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.5.4; extra == "locked"
+Requires-Dist: google-generativeai==0.7.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.6.0; extra == "locked"
+Requires-Dist: groq==0.9.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"
@@ -66,49 +68,58 @@ 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.2.0; extra == "locked"
-Requires-Dist: langchain-community==0.2.0; extra == "locked"
-Requires-Dist: langchain-core==0.2.0; extra == "locked"
+Requires-Dist: langchain==0.2.6; extra == "locked"
+Requires-Dist: langchain-community==0.2.6; extra == "locked"
+Requires-Dist: langchain-core==0.2.11; extra == "locked"
 Requires-Dist: langchain-text-splitters==0.2.0; extra == "locked"
-Requires-Dist: langsmith==0.1.45; extra == "locked"
+Requires-Dist: langsmith==0.1.84; 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.5.0; extra == "locked"
+Requires-Dist: miservice-fork==2.7.0; 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: numexpr==2.10.1; extra == "locked"
 Requires-Dist: numpy==1.26.3; extra == "locked"
-Requires-Dist: openai==1.30.1; extra == "locked"
+Requires-Dist: openai==1.35.10; extra == "locked"
+Requires-Dist: openpyxl==3.1.5; python_version ~= "3.8" and python_full_version != "3.9.7" and extra == "locked"
 Requires-Dist: orjson==3.10.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.5.3; extra == "locked"
-Requires-Dist: pydantic-core==2.14.6; extra == "locked"
+Requires-Dist: pydantic==2.8.2; extra == "locked"
+Requires-Dist: pydantic-core==2.20.1; 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: requests==2.31.0; extra == "locked"
 Requires-Dist: rich==13.7.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"
 Requires-Dist: sqlalchemy==2.0.25; extra == "locked"
 Requires-Dist: tenacity==8.2.3; extra == "locked"
-Requires-Dist: tetos==0.2.1; extra == "locked"
+Requires-Dist: tetos==0.3.0; extra == "locked"
 Requires-Dist: tqdm==4.66.1; extra == "locked"
-Requires-Dist: typing-extensions==4.9.0; 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.0.1.20240423.1; extra == "locked"
+Requires-Dist: zhipuai==2.1.2; extra == "locked"
 Provides-Extra: locked
 Description-Content-Type: text/markdown
@@ -420,9 +431,10 @@ docker run -v <your-config-dir>:/config -p 9527:9527 -e XIAOGPT_HOSTNAME=<your i
 注意端口必须映射为与容器内一致，XIAOGPT_HOSTNAME 需要设置为宿主机的 IP 地址，否则小爱无法正常播放语音。
-## 推荐的 fork
+## 推荐的类似项目
 - [XiaoBot](https://github.com/longbai/xiaobot) -> Go语言版本的Fork, 带支持不同平台的UI
+- [MiGPT](https://github.com/idootop/mi-gpt) -> Node.js 版，支持流式响应和长短期记忆
 ## 感谢

{xiaogpt-2.83 → xiaogpt-2.90}/README.md RENAMED Viewed

@@ -306,9 +306,10 @@ docker run -v <your-config-dir>:/config -p 9527:9527 -e XIAOGPT_HOSTNAME=<your i
 注意端口必须映射为与容器内一致，XIAOGPT_HOSTNAME 需要设置为宿主机的 IP 地址，否则小爱无法正常播放语音。
-## 推荐的 fork
+## 推荐的类似项目
 - [XiaoBot](https://github.com/longbai/xiaobot) -> Go语言版本的Fork, 带支持不同平台的UI
+- [MiGPT](https://github.com/idootop/mi-gpt) -> Node.js 版，支持流式响应和长短期记忆
 ## 感谢

{xiaogpt-2.83 → xiaogpt-2.90}/pyproject.toml RENAMED Viewed

@@ -28,9 +28,10 @@ dependencies = [
     "groq>=0.5.0",
     "pyyaml>=6.0.1",
     "langchain-community>=0.0.38",
+    "lingua-language-detector>=2.0.2; python_version < \"3.13\"",
 ]
 dynamic = []
-version = "2.83"
+version = "2.90"
 [project.license]
 text = "MIT"
@@ -56,24 +57,25 @@ locked = [
     "charset-normalizer==3.3.2",
     "click==8.1.7",
     "colorama==0.4.6 ; platform_system == \"Windows\"",
-    "dashscope==1.19.1",
+    "dashscope==1.20.1",
     "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.4",
+    "google-ai-generativelanguage==0.6.6",
     "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.5.4",
+    "google-generativeai==0.7.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.6.0",
+    "groq==0.9.0",
     "grpcio==1.60.0",
     "grpcio-status==1.60.0",
     "h11==0.14.0",
@@ -84,49 +86,58 @@ locked = [
     "idna==3.7",
     "jsonpatch==1.33",
     "jsonpointer==2.4",
-    "langchain==0.2.0",
-    "langchain-community==0.2.0",
-    "langchain-core==0.2.0",
+    "langchain==0.2.6",
+    "langchain-community==0.2.6",
+    "langchain-core==0.2.11",
     "langchain-text-splitters==0.2.0",
-    "langsmith==0.1.45",
+    "langsmith==0.1.84",
+    "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.5.0",
+    "miservice-fork==2.7.0",
     "multidict==6.0.5",
     "mutagen==1.47.0",
     "mypy-extensions==1.0.0",
-    "numexpr==2.10.0",
+    "numexpr==2.10.1",
     "numpy==1.26.3",
-    "openai==1.30.1",
+    "openai==1.35.10",
+    "openpyxl==3.1.5 ; python_version ~= \"3.8\" and python_full_version != \"3.9.7\"",
     "orjson==3.10.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.5.3",
-    "pydantic-core==2.14.6",
+    "pydantic==2.8.2",
+    "pydantic-core==2.20.1",
     "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",
     "requests==2.31.0",
     "rich==13.7.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",
     "sqlalchemy==2.0.25",
     "tenacity==8.2.3",
-    "tetos==0.2.1",
+    "tetos==0.3.0",
     "tqdm==4.66.1",
-    "typing-extensions==4.9.0",
+    "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.0.1.20240423.1",
+    "zhipuai==2.1.2",
 ]
 [tool.pdm]

{xiaogpt-2.83 → xiaogpt-2.90}/xiaogpt/utils.py RENAMED Viewed

@@ -5,11 +5,14 @@ import os
 import re
 import socket
 from http.cookies import SimpleCookie
-from typing import AsyncIterator
+from typing import TYPE_CHECKING, AsyncIterator
 from urllib.parse import urlparse
 from requests.utils import cookiejar_from_dict
+if TYPE_CHECKING:
+    from lingua import LanguageDetector
 ### HELP FUNCTION ###
 def parse_cookie_string(cookie_string):
@@ -69,3 +72,21 @@ def get_hostname() -> str:
     with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s:
         s.connect(("8.8.8.8", 80))
         return s.getsockname()[0]
+def _get_detector() -> LanguageDetector | None:
+    try:
+        from lingua import LanguageDetectorBuilder
+    except ImportError:
+        return None
+    return LanguageDetectorBuilder.from_all_spoken_languages().build()
+_detector = _get_detector()
+def detect_language(text: str) -> str:
+    if _detector is None:
+        return "zh"  # default to Chinese if langdetect module is not available
+    lang = _detector.detect_language_of(text)
+    return lang.iso_code_639_1.name.lower() if lang is not None else "zh"

{xiaogpt-2.83 → xiaogpt-2.90}/xiaogpt/xiaogpt.py RENAMED Viewed

@@ -24,9 +24,7 @@ from xiaogpt.config import (
     Config,
 )
 from xiaogpt.tts import TTS, MiTTS, TetosTTS
-from xiaogpt.utils import (
-    parse_cookie_string,
-)
+from xiaogpt.utils import detect_language, parse_cookie_string
 EOF = object()
@@ -390,11 +388,6 @@ class MiGPT:
                 query = f"{query}，{self.config.prompt}"
             # some model can not detect the language code, so we need to add it
-            if self.config.tts != "mi":  # mi only say Chinese
-                query += (
-                    "，并用本段话的language code作为开头，用|分隔，如：en-US|你好……"
-                )
             if self.config.mute_xiaoai:
                 await self.stop_if_xiaoai_is_playing()
             else:
@@ -420,18 +413,11 @@ class MiGPT:
                 await self.wakeup_xiaoai()
     async def speak(self, text_stream: AsyncIterator[str]) -> None:
-        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:
-            # It is not a legal language code, discard it
-            lang, first_chunk = "", text
-        lang = (
-            matches[0]
-            if (matches := re.findall(r"([a-z]{2}-[A-Z]{2})", lang))
-            else "zh-CN"
-        )
+        first_chunk = await text_stream.__anext__()
+        # Detect the language from the first chunk
+        # Add suffix '-' because tetos expects it to exist when selecting voices
+        # however, the nation code is never used.
+        lang = detect_language(first_chunk) + "-"
         async def gen():  # reconstruct the generator
             yield first_chunk