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

xiaogpt/bot/__init__.py

@@ -2,11 +2,12 @@ from __future__ import annotations
 
 from xiaogpt.bot.base_bot import BaseBot
 from xiaogpt.bot.chatgptapi_bot import ChatGPTBot
-from xiaogpt.bot.newbing_bot import NewBingBot
-from xiaogpt.bot.glm_bot import GLMBot
+from xiaogpt.bot.doubao_bot import DoubaoBot
 from xiaogpt.bot.gemini_bot import GeminiBot
-from xiaogpt.bot.qwen_bot import QwenBot
+from xiaogpt.bot.glm_bot import GLMBot
 from xiaogpt.bot.langchain_bot import LangChainBot
+from xiaogpt.bot.newbing_bot import NewBingBot
+from xiaogpt.bot.qwen_bot import QwenBot
 from xiaogpt.config import Config
 
 BOTS: dict[str, type[BaseBot]] = {
@@ -16,6 +17,7 @@ BOTS: dict[str, type[BaseBot]] = {
     "gemini": GeminiBot,
     "qwen": QwenBot,
     "langchain": LangChainBot,
+    "doubao": DoubaoBot,
 }
 
 
@@ -34,4 +36,5 @@ __all__ = [
     "QwenBot",
     "get_bot",
     "LangChainBot",
+    "DoubaoBot",
 ]

xiaogpt/bot/doubao_bot.py

@@ -0,0 +1,76 @@
+"""ChatGLM bot"""
+
+from __future__ import annotations
+
+import json
+from typing import Any, AsyncIterator
+
+import httpx
+from rich import print
+
+from xiaogpt.bot.base_bot import BaseBot, ChatHistoryMixin
+from xiaogpt.config import Config
+from xiaogpt.utils import split_sentences
+
+
+class DoubaoBot(ChatHistoryMixin, BaseBot):
+    API_URL = "https://maas-api.ml-platform-cn-beijing.volces.com"
+    name = "豆包"
+    default_options = {"model": "skylark-chat"}
+
+    def __init__(self, access_key: str, secret_key: str) -> None:
+        from tetos.volc import VolcSignAuth
+
+        self.auth = VolcSignAuth(access_key, secret_key, "ml_maas", "cn-beijing")
+        self.history = []
+
+    @classmethod
+    def from_config(cls, config: Config):
+        return cls(access_key=config.volc_access_key, secret_key=config.volc_secret_key)
+
+    def _get_data(self, query: str, **options: Any):
+        options = {**self.default_options, **options}
+        model = options.pop("model")
+        ms = self.get_messages()
+        ms.append({"role": "user", "content": query})
+        return {"model": {"name": model}, "parameters": options, "messages": ms}
+
+    async def ask(self, query, **options):
+        data = self._get_data(query, **options)
+        async with httpx.AsyncClient(base_url=self.API_URL, auth=self.auth) as client:
+            resp = await client.post("/api/v1/chat", json=data)
+            resp.raise_for_status()
+            try:
+                message = resp.json()["choice"]["message"]["content"]
+            except Exception as e:
+                print(str(e))
+                return
+            self.add_message(query, message)
+            print(message)
+            return message
+
+    async def ask_stream(self, query: str, **options: Any):
+        data = self._get_data(query, **options)
+        data["stream"] = True
+
+        async def sse_gen(line_iter: AsyncIterator[str]) -> AsyncIterator[str]:
+            message = ""
+            async for chunk in line_iter:
+                if not chunk.startswith("data:"):
+                    continue
+                message = chunk[5:].strip()
+                if message == "[DONE]":
+                    break
+                data = json.loads(message)
+                text = data["choice"]["message"]["content"]
+                print(text, end="", flush=True)
+                message += text
+                yield text
+            print()
+            self.add_message(query, message)
+
+        async with httpx.AsyncClient(base_url=self.API_URL, auth=self.auth) as client:
+            async with client.stream("POST", "/api/v1/chat", json=data) as resp:
+                resp.raise_for_status()
+                async for sentence in split_sentences(sse_gen(resp.aiter_lines())):
+                    yield sentence

xiaogpt/bot/gemini_bot.py

@@ -12,7 +12,7 @@ generation_config = {
     "temperature": 0.7,
     "top_p": 1,
     "top_k": 1,
-    "max_output_tokens": 2048,
+    "max_output_tokens": 4096,
 }
 
 safety_settings = [
@@ -32,10 +32,26 @@ safety_settings = [
 class GeminiBot(ChatHistoryMixin, BaseBot):
     name = "Gemini"
 
-    def __init__(self, gemini_key: str) -> None:
+    def __init__(self, gemini_key: str, gemini_api_domain: str) -> None:
         import google.generativeai as genai
 
-        genai.configure(api_key=gemini_key)
+        from google.auth import api_key
+
+        credentials = api_key.Credentials(gemini_key)
+        if len(gemini_api_domain) > 0:
+            print("Use custom gemini_api_domain: " + gemini_api_domain)
+            credentials._universe_domain = gemini_api_domain
+            genai.configure(
+                transport="rest",
+                credentials=credentials,
+                client_options={
+                    "api_endpoint": "https://" + gemini_api_domain,
+                    "universe_domain": gemini_api_domain,
+                },
+            )
+        else:
+            genai.configure(api_key=gemini_key)
+
         self.history = []
         model = genai.GenerativeModel(
             model_name="gemini-pro",
@@ -46,11 +62,13 @@ class GeminiBot(ChatHistoryMixin, BaseBot):
 
     @classmethod
     def from_config(cls, config):
-        return cls(gemini_key=config.gemini_key)
+        return cls(
+            gemini_key=config.gemini_key, gemini_api_domain=config.gemini_api_domain
+        )
 
     async def ask(self, query, **options):
-        self.convo.send_message(query)
-        message = self.convo.last.text.strip()
+        response = self.convo.send_message(query)
+        message = response.text.strip()
         print(message)
         if len(self.convo.history) > 10:
             self.convo.history = self.convo.history[2:]

xiaogpt/cli.py

@@ -37,6 +37,11 @@ def main():
         dest="gemini_key",
         help="gemini api key",
     )
+    parser.add_argument(
+        "--gemini_api_domain",
+        dest="gemini_api_domain",
+        help="custom gemini api domain",
+    )
     parser.add_argument(
         "--qwen_key",
         dest="qwen_key",
@@ -78,6 +83,8 @@ 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(
         "--verbose",
         dest="verbose",
@@ -86,27 +93,9 @@ def main():
         help="show info",
     )
     parser.add_argument(
-        "--azure_tts_speech_key",
-        dest="azure_tts_speech_key",
-        help="if use azure tts",
-    )
-    parser.add_argument(
-        "--azure_tts_service_region",
-        dest="azure_tts_service_region",
-        help="if use azure tts",
-    )
-    tts_group = parser.add_mutually_exclusive_group()
-    tts_group.add_argument(
-        "--enable_edge_tts",
-        dest="tts",
-        action="store_const",
-        const="edge",
-        help="if use edge tts",
-    )
-    tts_group.add_argument(
         "--tts",
-        help="tts type",
-        choices=["mi", "edge", "openai", "azure"],
+        help="TTS provider",
+        choices=["mi", "edge", "openai", "azure", "google", "baidu", "volc"],
     )
     bot_group = parser.add_mutually_exclusive_group()
     bot_group.add_argument(
@@ -190,9 +179,15 @@ def main():
     options = parser.parse_args()
     config = Config.from_options(options)
 
-    miboy = MiGPT(config)
+    async def main(config: Config) -> None:
+        miboy = MiGPT(config)
+        try:
+            await miboy.run_forever()
+        finally:
+            await miboy.close()
+
     loop = asyncio.get_event_loop()
-    loop.run_until_complete(miboy.run_forever())
+    loop.run_until_complete(main(config))
 
 
 if __name__ == "__main__":

xiaogpt/config.py

@@ -33,15 +33,6 @@ HARDWARE_COMMAND_DICT = {
     # add more here
 }
 
-EDGE_TTS_DICT = {
-    "用英语": "en-US-AriaNeural",
-    "用日语": "ja-JP-NanamiNeural",
-    "用法语": "fr-BE-CharlineNeural",
-    "用韩语": "ko-KR-SunHiNeural",
-    "用德语": "de-AT-JonasNeural",
-    # add more here
-}
-
 DEFAULT_COMMAND = ("5-1", "5-5")
 
 KEY_WORD = ("帮我", "请")
@@ -65,6 +56,11 @@ class Config:
     gemini_key: str = os.getenv("GEMINI_KEY", "")  # keep the old rule
     qwen_key: str = os.getenv("DASHSCOPE_API_KEY", "")  # keep the old rule
     serpapi_api_key: str = os.getenv("SERPAPI_API_KEY", "")
+    gemini_api_domain: str = os.getenv(
+        "GEMINI_API_DOMAIN", ""
+    )  # 自行部署的 Google Gemini 代理
+    volc_access_key: str = os.getenv("VOLC_ACCESS_KEY", "")
+    volc_secret_key: str = os.getenv("VOLC_SECRET_KEY", "")
     proxy: str | None = None
     mi_did: str = os.getenv("MI_DID", "")
     keyword: Iterable[str] = KEY_WORD
@@ -80,23 +76,11 @@ class Config:
     start_conversation: str = "开始持续对话"
     end_conversation: str = "结束持续对话"
     stream: bool = False
-    tts: Literal["mi", "edge", "azure", "openai"] = "mi"
-    tts_voice: str | None = None
+    tts: Literal["mi", "edge", "azure", "openai", "baidu", "google", "volc"] = "mi"
+    tts_options: dict[str, Any] = field(default_factory=dict)
     gpt_options: dict[str, Any] = field(default_factory=dict)
     bing_cookie_path: str = ""
     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:
@@ -121,8 +105,6 @@ class Config:
                 raise Exception(
                     "Using GPT api needs openai API key, please google how to"
                 )
-        if self.tts == "azure" and not self.azure_tts_speech_key:
-            raise Exception("Using Azure TTS needs azure speech key")
 
     @property
     def tts_command(self) -> str:
@@ -140,6 +122,13 @@ class Config:
         for key, value in vars(options).items():
             if value is not None and key in cls.__dataclass_fields__:
                 config[key] = value
+        if config.get("tts") == "volc":
+            config.setdefault("tts_options", {}).setdefault(
+                "access_key", config.get("volc_access_key")
+            )
+            config.setdefault("tts_options", {}).setdefault(
+                "secret_key", config.get("volc_secret_key")
+            )
         return cls(**config)
 
     @classmethod

xiaogpt/tts/__init__.py

@@ -1,7 +1,5 @@
-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
+from xiaogpt.tts.base import TTS
+from xiaogpt.tts.mi import MiTTS
+from xiaogpt.tts.tetos import TetosTTS
 
-__all__ = ["TTS", "EdgeTTS", "MiTTS", "AzureTTS", "VolcTTS"]
+__all__ = ["TTS", "TetosTTS", "MiTTS"]

xiaogpt/tts/base.py

@@ -56,7 +56,7 @@ class TTS(abc.ABC):
         return is_playing
 
     @abc.abstractmethod
-    async def synthesize(self, query: str, text_stream: AsyncIterator[str]) -> None:
+    async def synthesize(self, lang: str, text_stream: AsyncIterator[str]) -> None:
         """Synthesize speech from a stream of text."""
         raise NotImplementedError
 
@@ -87,20 +87,20 @@ class AudioFileTTS(TTS):
         self._start_http_server()
 
     @abc.abstractmethod
-    async def make_audio_file(self, query: str, text: str) -> tuple[Path, float]:
+    async def make_audio_file(self, lang: str, text: str) -> tuple[Path, float]:
         """Synthesize speech from text and save it to a file.
         Return the file path and the duration of the audio in seconds.
         The file path must be relative to the self.dirname.
         """
         raise NotImplementedError
 
-    async def synthesize(self, query: str, text_stream: AsyncIterator[str]) -> None:
+    async def synthesize(self, lang: str, text_stream: AsyncIterator[str]) -> None:
         queue: asyncio.Queue[tuple[str, float]] = asyncio.Queue()
         finished = asyncio.Event()
 
         async def worker():
             async for text in text_stream:
-                path, duration = await self.make_audio_file(query, text)
+                path, duration = await self.make_audio_file(lang, text)
                 url = f"http://{self.hostname}:{self.port}/{path.name}"
                 await queue.put((url, duration))
             finished.set()

xiaogpt/tts/mi.py

@@ -27,7 +27,7 @@ class MiTTS(TTS):
                 f"{self.config.tts_command} {text}",
             )
 
-    async def synthesize(self, query: str, text_stream: AsyncIterator[str]) -> None:
+    async def synthesize(self, lang: str, text_stream: AsyncIterator[str]) -> None:
         async for text in text_stream:
             await self.say(text)
             await self.wait_for_duration(calculate_tts_elapse(text))

xiaogpt/tts/tetos.py

@@ -0,0 +1,56 @@
+from __future__ import annotations
+
+import tempfile
+from pathlib import Path
+
+from miservice import MiNAService
+from tetos.base import Speaker
+
+from xiaogpt.config import Config
+from xiaogpt.tts.base import AudioFileTTS
+
+
+class TetosTTS(AudioFileTTS):
+    def __init__(
+        self, mina_service: MiNAService, device_id: str, config: Config
+    ) -> None:
+        super().__init__(mina_service, device_id, config)
+        self.speaker = self._get_speaker()
+
+    def _get_speaker(self) -> Speaker:
+        from tetos.azure import AzureSpeaker
+        from tetos.baidu import BaiduSpeaker
+        from tetos.edge import EdgeSpeaker
+        from tetos.google import GoogleSpeaker
+        from tetos.openai import OpenAISpeaker
+        from tetos.volc import VolcSpeaker
+
+        options = self.config.tts_options
+        allowed_speakers: list[str] = []
+        for speaker in (
+            OpenAISpeaker,
+            EdgeSpeaker,
+            AzureSpeaker,
+            VolcSpeaker,
+            GoogleSpeaker,
+            BaiduSpeaker,
+        ):
+            if (name := speaker.__name__[:-7].lower()) == self.config.tts:
+                try:
+                    return speaker(**options)
+                except TypeError as e:
+                    raise ValueError(
+                        f"{e}. Please add them via `tts_options` config"
+                    ) from e
+            else:
+                allowed_speakers.append(name)
+        raise ValueError(
+            f"Unsupported TTS: {self.config.tts}, allowed: {','.join(allowed_speakers)}"
+        )
+
+    async def make_audio_file(self, lang: str, text: str) -> tuple[Path, float]:
+        output_file = tempfile.NamedTemporaryFile(
+            suffix=".mp3", mode="wb", delete=False, dir=self.dirname.name
+        )
+        duration = await self.speaker.synthesize(text, output_file.name, lang=lang)
+        return Path(output_file.name), duration

xiaogpt/xiaogpt.py

@@ -23,8 +23,7 @@ from xiaogpt.config import (
     WAKEUP_KEYWORD,
     Config,
 )
-from xiaogpt.tts import TTS, EdgeTTS, MiTTS, AzureTTS, VolcTTS
-from xiaogpt.tts.openai import OpenAITTS
+from xiaogpt.tts import TTS, MiTTS, TetosTTS
 from xiaogpt.utils import (
     parse_cookie_string,
 )
@@ -53,6 +52,9 @@ class MiGPT:
         self.log.debug(config)
         self.mi_session = ClientSession()
 
+    async def close(self):
+        await self.mi_session.close()
+
     async def poll_latest_ask(self):
         async with ClientSession() as session:
             session._cookie_jar = self.cookie_jar
@@ -78,16 +80,16 @@ class MiGPT:
                     # if you want force mute xiaoai, comment this line below.
                     await asyncio.sleep(1 - d)
 
-    async def init_all_data(self, session):
-        await self.login_miboy(session)
+    async def init_all_data(self):
+        await self.login_miboy()
         await self._init_data_hardware()
         self.mi_session.cookie_jar.update_cookies(self.get_cookie())
         self.cookie_jar = self.mi_session.cookie_jar
         self.tts  # init tts
 
-    async def login_miboy(self, session):
+    async def login_miboy(self):
         account = MiAccount(
-            session,
+            self.mi_session,
             self.config.account,
             self.config.password,
             str(self.mi_token_home),
@@ -179,7 +181,7 @@ class MiGPT:
         return (
             self.in_conversation
             and not query.startswith(WAKEUP_KEYWORD)
-            or query.startswith(tuple(self.config.keyword))
+            or query.lower().startswith(tuple(w.lower() for w in self.config.keyword))
         )
 
     def need_change_prompt(self, record):
@@ -225,7 +227,7 @@ class MiGPT:
         return None
 
     async def _retry(self):
-        await self.init_all_data(self.mi_session)
+        await self.init_all_data()
 
     def _get_last_query(self, data: dict) -> dict | None:
         if d := data.get("data"):
@@ -258,16 +260,10 @@ class MiGPT:
 
     @functools.cached_property
     def tts(self) -> TTS:
-        if self.config.tts == "edge":
-            return EdgeTTS(self.mina_service, self.device_id, self.config)
-        elif self.config.tts == "azure":
-            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:
+        if self.config.tts == "mi":
             return MiTTS(self.mina_service, self.device_id, self.config)
+        else:
+            return TetosTTS(self.mina_service, self.device_id, self.config)
 
     async def wait_for_tts_finish(self):
         while True:
@@ -347,7 +343,7 @@ class MiGPT:
         )
 
     async def run_forever(self):
-        await self.init_all_data(self.mi_session)
+        await self.init_all_data()
         task = asyncio.create_task(self.poll_latest_ask())
         assert task is not None  # to keep the reference to task, do not remove this
         print(
@@ -389,6 +385,7 @@ class MiGPT:
             print("问题：" + query + "？")
             if not self.chatbot.has_history():
                 query = f"{query}，{self.config.prompt}"
+            query += "，并用本段话的language code作为开头，用|分隔，如：en-US|你好……"
             if self.config.mute_xiaoai:
                 await self.stop_if_xiaoai_is_playing()
             else:
@@ -404,7 +401,7 @@ class MiGPT:
                 print("小爱没回")
             print(f"以下是 {self.chatbot.name} 的回答: ", end="")
             try:
-                await self.tts.synthesize(query, self.ask_gpt(query))
+                await self.speak(self.ask_gpt(query))
             except Exception as e:
                 print(f"{self.chatbot.name} 回答出错 {str(e)}")
             else:
@@ -412,3 +409,18 @@ class MiGPT:
             if self.in_conversation:
                 print(f"继续对话, 或用`{self.config.end_conversation}`结束对话")
                 await self.wakeup_xiaoai()
+
+    async def speak(self, text_stream: AsyncIterator[str]) -> None:
+        text = await anext(text_stream)
+        # 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
+
+        async def gen():  # reconstruct the generator
+            yield first_chunk
+            async for text in text_stream:
+                yield text
+
+        await self.tts.synthesize(lang or "zh-CN", gen())

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xiaogpt
-Version: 2.50
+Version: 2.61
 Summary: Play ChatGPT or other LLM with xiaomi AI speaker
 Author-Email: yihong0618 <zouzou0208@gmail.com>
 License: MIT
@@ -15,7 +15,6 @@ Requires-Dist: aiohttp
 Requires-Dist: rich
 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
 Requires-Dist: beautifulsoup4>=4.12.0
@@ -23,13 +22,11 @@ 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: 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: tetos>=0.1.1
+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"
-Requires-Dist: anyio==3.7.1; extra == "locked"
+Requires-Dist: anyio==4.3.0; 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"
@@ -38,23 +35,23 @@ 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: click==8.1.7; extra == "locked"
 Requires-Dist: colorama==0.4.6; platform_system == "Windows" and extra == "locked"
-Requires-Dist: dashscope==1.10.0; extra == "locked"
+Requires-Dist: dashscope==1.17.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-ai-generativelanguage==0.6.2; 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-cloud-texttospeech==2.16.3; extra == "locked"
+Requires-Dist: google-generativeai==0.5.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"
@@ -82,40 +79,35 @@ 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: openai==1.21.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"
 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: tetos==0.1.1; 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"
@@ -144,12 +136,12 @@ Play ChatGPT and other LLM with Xiaomi AI Speaker
 - [通义千问](https://help.aliyun.com/zh/dashscope/developer-reference/api-details)
 
 ## 获取小米音响DID
-系统和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   | 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报错时，请更换一下无线网络，有很大概率解决问题。
@@ -199,6 +191,8 @@ xiaogpt --hardware LX06  --mute_xiaoai --use_chatgpt_api
 xiaogpt --hardware LX06  --mute_xiaoai --stream
 # 如果你想使用 google 的 gemini
 xiaogpt --hardware LX06  --mute_xiaoai --use_gemini --gemini_key ${gemini_key}
+# 如果你想使用自己的 google gemini 服务
+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}
 # 如果你想用 edge-tts
@@ -226,6 +220,8 @@ python3 xiaogpt.py --hardware LX06  --mute_xiaoai --stream
 python3 xiaogpt.py --hardware LX06  --mute_xiaoai --use_glm --glm_key ${glm_key}
 # 如果你想使用 google 的 gemini
 python3 xiaogpt.py --hardware LX06  --mute_xiaoai --use_gemini --gemini_key ${gemini_key}
+# 如果你想使用自己的 google gemini 服务
+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}
 # 如果你想使用 LangChain+SerpApi 实现上网检索或其他本地服务（目前仅支持 stream 模式）
@@ -271,44 +267,39 @@ ChatGLM [文档](http://open.bigmodel.cn/doc/api#chatglm_130b)
 
 ## 配置项说明
 
-| 参数                     | 说明                                                                                        | 默认值                                                                                                    | 可选值                                                                                                                     |
-| ------------------------ | ------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------- |
-| hardware                 | 设备型号                                                                                    |                                                                                                           |                                                                                                                            |
-| account                  | 小爱账户                                                                                    |                                                                                                           |                                                                                                                            |
-| password                 | 小爱账户密码                                                                                |                                                                                                           |                                                                                                                            |
-| openai_key               | openai的apikey                                                                              |                                                                                                           |                                                                                                                            |
-| serpapi_api_key          | serpapi的key 参考 [SerpAPI](https://serpapi.com/)                                           |                                                                                                           |                                                                                                                            |
-| glm_key                  | chatglm 的 apikey                                                                           |                                                                                                           |                                                                                                                            |
-| gemini_key               | gemini 的 apikey [参考](https://makersuite.google.com/app/apikey)                           |                                                                                                           |                                                                                                                            |
-| qwen_key                 | qwen 的 apikey [参考](https://help.aliyun.com/zh/dashscope/developer-reference/api-details) |                                                                                                           |                                                                                                                            |
-| cookie                   | 小爱账户cookie （如果用上面密码登录可以不填）                                               |                                                                                                           |                                                                                                                            |
-| mi_did                   | 设备did                                                                                     |                                                                                                           |                                                                                                                            |
-| use_command              | 使用 MI command 与小爱交互                                                                  | `false`                                                                                                   |                                                                                                                            |
-| mute_xiaoai              | 快速停掉小爱自己的回答                                                                      | `true`                                                                                                    |                                                                                                                            |
-| verbose                  | 是否打印详细日志                                                                            | `false`                                                                                                   |                                                                                                                            |
-| bot                      | 使用的 bot 类型，目前支持 chatgptapi,newbing, qwen, gemini                                           | `chatgptapi`                                                                                              |                                                                                                                            |
-| tts                      | 使用的 TTS 类型                                                                             | `mi`                                                                                                      | `edge`、 `openai`、`azure`、`volc`                                                                                                 |
-| tts_voice                | TTS 的嗓音                                                                                  | `zh-CN-XiaoxiaoNeural`(edge), `alloy`(openai), `zh-CN-XiaoxiaoMultilingualNeural`(azure)                  |                                                                                                                            |
-| prompt                   | 自定义prompt                                                                                | `请用100字以内回答`                                                                                       |                                                                                                                            |
-| keyword                  | 自定义请求词列表                                                                            | `["请"]`                                                                                                  |                                                                                                                            |
-| change_prompt_keyword    | 更改提示词触发列表                                                                          | `["更改提示词"]`                                                                                          |                                                                                                                            |
-| start_conversation       | 开始持续对话关键词                                                                          | `开始持续对话`                                                                                            |                                                                                                                            |
-| end_conversation         | 结束持续对话关键词                                                                          | `结束持续对话`                                                                                            |                                                                                                                            |
-| stream                   | 使用流式响应，获得更快的响应                                                                | `false`                                                                                                   |                                                                                                                            |
-| proxy                    | 支持 HTTP 代理，传入 http proxy URL                                                         | ""                                                                                                        |                                                                                                                            |
-| gpt_options              | OpenAI API 的参数字典                                                                       | `{}`                                                                                                      |                                                                                                                            |
-| bing_cookie_path         | NewBing使用的cookie路径，参考[这里]获取                                                     | 也可通过环境变量 `COOKIE_FILE` 设置                                                                       |                                                                                                                            |
-| bing_cookies             | NewBing使用的cookie字典，参考[这里]获取                                                     |                                                                                                           |                                                                                                                            |
-| deployment_id            | Azure OpenAI 服务的 deployment ID                                                           | 参考这个[如何找到deployment_id](https://github.com/yihong0618/xiaogpt/issues/347#issuecomment-1784410784) |                                                                                                                            |
-| 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`                               |  |
-
-
+| 参数                  | 说明                                                                                        | 默认值                                                                                                    | 可选值                                                |
+| --------------------- | ------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | ----------------------------------------------------- |
+| hardware              | 设备型号                                                                                    |                                                                                                           |                                                       |
+| account               | 小爱账户                                                                                    |                                                                                                           |                                                       |
+| password              | 小爱账户密码                                                                                |                                                                                                           |                                                       |
+| openai_key            | openai的apikey                                                                              |                                                                                                           |                                                       |
+| serpapi_api_key       | serpapi的key 参考 [SerpAPI](https://serpapi.com/)                                           |                                                                                                           |                                                       |
+| glm_key               | chatglm 的 apikey                                                                           |                                                                                                           |                                                       |
+| gemini_key            | gemini 的 apikey [参考](https://makersuite.google.com/app/apikey)                           |                                                                                                           |                                                       |
+| gemini_api_domain            | gemini 的自定义域名 [参考](https://github.com/antergone/palm-netlify-proxy)                                                      |                                                                                                           |
+| qwen_key              | qwen 的 apikey [参考](https://help.aliyun.com/zh/dashscope/developer-reference/api-details) |                                                                                                           |                                                       |
+| cookie                | 小爱账户cookie （如果用上面密码登录可以不填）                                               |                                                                                                           |                                                       |
+| mi_did                | 设备did                                                                                     |                                                                                                           |                                                       |
+| use_command           | 使用 MI command 与小爱交互                                                                  | `false`                                                                                                   |                                                       |
+| mute_xiaoai           | 快速停掉小爱自己的回答                                                                      | `true`                                                                                                    |                                                       |
+| verbose               | 是否打印详细日志                                                                            | `false`                                                                                                   |                                                       |
+| bot                   | 使用的 bot 类型，目前支持 chatgptapi,newbing, qwen, gemini                                  | `chatgptapi`                                                                                              |                                                       |
+| tts                   | 使用的 TTS 类型                                                                             | `mi`                                                                                                      | `edge`、 `openai`、`azure`、`volc`、`baidu`、`google` |
+| tts_options           | TTS 参数字典，参考 [tetos](https://github.com/frostming/tetos) 获取可用参数                 |                                                                                                           |                                                       |
+| prompt                | 自定义prompt                                                                                | `请用100字以内回答`                                                                                       |                                                       |
+| keyword               | 自定义请求词列表                                                                            | `["请"]`                                                                                                  |                                                       |
+| change_prompt_keyword | 更改提示词触发列表                                                                          | `["更改提示词"]`                                                                                          |                                                       |
+| start_conversation    | 开始持续对话关键词                                                                          | `开始持续对话`                                                                                            |                                                       |
+| end_conversation      | 结束持续对话关键词                                                                          | `结束持续对话`                                                                                            |                                                       |
+| stream                | 使用流式响应，获得更快的响应                                                                | `false`                                                                                                   |                                                       |
+| proxy                 | 支持 HTTP 代理，传入 http proxy URL                                                         | ""                                                                                                        |                                                       |
+| gpt_options           | OpenAI API 的参数字典                                                                       | `{}`                                                                                                      |                                                       |
+| bing_cookie_path      | NewBing使用的cookie路径，参考[这里]获取                                                     | 也可通过环境变量 `COOKIE_FILE` 设置                                                                       |                                                       |
+| bing_cookies          | NewBing使用的cookie字典，参考[这里]获取                                                     |                                                                                                           |                                                       |
+| deployment_id         | Azure OpenAI 服务的 deployment ID                                                           | 参考这个[如何找到deployment_id](https://github.com/yihong0618/xiaogpt/issues/347#issuecomment-1784410784) |                                                       |
+| api_base              | 如果需要替换默认的api,或者使用Azure OpenAI 服务                                             | 例如：`https://abc-def.openai.azure.com/`                                                                 | 
+| volc_access_key       | 火山引擎的 access key 请在[这里](https://console.volcengine.com/iam/keymanage/)获取         |                                                                                                           |                                                       |
+| volc_secret_key       | 火山引擎的 secret key 请在[这里](https://console.volcengine.com/iam/keymanage/)获取         |                                                                                                           |                                                       |
 [这里]: https://github.com/acheong08/EdgeGPT#getting-authentication-required
 
 ## 注意
@@ -425,6 +416,7 @@ docker run -v <your-config-dir>:/config -p 9527:9527 -e XIAOGPT_HOSTNAME=<your i
 
 - [xiaomi](https://www.mi.com/)
 - [PDM](https://pdm.fming.dev/latest/)
+- [Tetos](https://github.com/frostming/tetos) TTS 云服务支持
 - @[Yonsm](https://github.com/Yonsm) 的 [MiService](https://github.com/Yonsm/MiService)
 - @[pjq](https://github.com/pjq) 给了这个项目非常多的帮助
 - @[frostming](https://github.com/frostming) 重构了一些代码，支持了`持续会话功能`

xiaogpt-2.61.dist-info/RECORD

@@ -0,0 +1,28 @@
+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/__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
+xiaogpt/bot/base_bot.py,sha256=oKn6LLFHXol4hKrSrjnxknrOqrcGICtT_GPPYRNxpkw,1467
+xiaogpt/bot/chatgptapi_bot.py,sha256=JYlq1D-YZxRwAPpd5dTFSBU7h1KNdWA7FTwgyvMxr7c,3656
+xiaogpt/bot/doubao_bot.py,sha256=UufQmYcPbwTLTYDZUQwRy4Hg24vgPEa3hdeZWMWw9YM,2773
+xiaogpt/bot/gemini_bot.py,sha256=vX-fTWyPwdB4N0HDQ9uIRCB4KvV-YgBqXjkrqgg4WHs,2516
+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/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
+xiaogpt/langchain/examples/email/mail_summary_tools.py,sha256=6cWvBJUaA7iaywcHdbUoww8WiCtaNw3TmwyxyF4DY7E,1561
+xiaogpt/tts/__init__.py,sha256=xasHDrmgECirf1MSyrfURSaMBqtdZBi3cQNeDvPo_cQ,145
+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/tts/azure.py

@@ -1,98 +0,0 @@
-from __future__ import annotations
-
-import logging
-import tempfile
-from pathlib import Path
-from typing import Optional
-
-import azure.cognitiveservices.speech as speechsdk
-
-from xiaogpt.tts.base import AudioFileTTS
-from xiaogpt.utils import calculate_tts_elapse
-
-logger = logging.getLogger(__name__)
-
-
-class AzureTTS(AudioFileTTS):
-    voice_name = "zh-CN-XiaoxiaoMultilingualNeural"
-
-    async def make_audio_file(self, query: str, text: str) -> tuple[Path, float]:
-        output_file = tempfile.NamedTemporaryFile(
-            suffix=".mp3", mode="wb", delete=False, dir=self.dirname.name
-        )
-
-        speech_synthesizer = self._build_speech_synthesizer(output_file.name)
-        result: Optional[speechsdk.SpeechSynthesisResult] = (
-            speech_synthesizer.speak_text_async(text).get()
-        )
-        if result is None:
-            raise RuntimeError(
-                f"Failed to get tts from azure with voice={self.voice_name}"
-            )
-        # Check result
-        if result.reason == speechsdk.ResultReason.SynthesizingAudioCompleted:
-            logger.debug("Speech synthesized for text [{}]".format(text))
-
-            return Path(output_file.name), calculate_tts_elapse(text)
-        elif result.reason == speechsdk.ResultReason.Canceled:
-            cancellation_details = result.cancellation_details
-            logger.warning(f"Speech synthesis canceled: {cancellation_details.reason}")
-            if cancellation_details.reason == speechsdk.CancellationReason.Error:
-                errmsg = f"Error details: {cancellation_details.error_details}"
-                logger.error(errmsg)
-                raise RuntimeError(errmsg)
-        raise RuntimeError(f"Failed to get tts from azure with voice={self.voice_name}")
-
-    def _build_speech_synthesizer(self, filename: str):
-        speech_key = self.config.azure_tts_speech_key
-        service_region = self.config.azure_tts_service_region
-        if not speech_key:
-            raise Exception("Azure tts need speech key")
-        speech_config = speechsdk.SpeechConfig(
-            subscription=speech_key, region=service_region
-        )
-        speech_config.set_speech_synthesis_output_format(
-            speechsdk.SpeechSynthesisOutputFormat.Audio16Khz32KBitRateMonoMp3
-        )
-        if self.config.proxy:
-            host, port, username, password = self._parse_proxy(self.config.proxy)
-
-            if username and password:
-                speech_config.set_proxy(
-                    hostname=host, port=port, username=username, password=password
-                )
-            else:
-                speech_config.set_proxy(hostname=host, port=port)
-
-        speech_config.speech_synthesis_voice_name = (
-            self.config.tts_voice or self.voice_name
-        )
-        speech_synthesizer = speechsdk.SpeechSynthesizer(
-            speech_config=speech_config,
-            audio_config=speechsdk.audio.AudioOutputConfig(filename=filename),  # type: ignore
-        )
-        return speech_synthesizer
-
-    def _parse_proxy(self, proxy_str: str):
-        proxy_str = proxy_str
-        proxy_str_splited = proxy_str.split("://")
-        proxy_type = proxy_str_splited[0]
-        proxy_addr = proxy_str_splited[1]
-
-        if proxy_type == "http":
-            if "@" in proxy_addr:
-                proxy_addr_splited = proxy_addr.split("@")
-                proxy_auth = proxy_addr_splited[0]
-                proxy_addr_netloc = proxy_addr_splited[1]
-                proxy_auth_splited = proxy_auth.split(":")
-                username = proxy_auth_splited[0]
-                password = proxy_auth_splited[1]
-            else:
-                proxy_addr_netloc = proxy_addr
-                username, password = None, None
-
-            proxy_addr_netloc_splited = proxy_addr_netloc.split(":")
-            host = proxy_addr_netloc_splited[0]
-            port = int(proxy_addr_netloc_splited[1])
-            return host, port, username, password
-        raise NotImplementedError

xiaogpt/tts/edge.py

@@ -1,32 +0,0 @@
-import tempfile
-from pathlib import Path
-
-import edge_tts
-
-from xiaogpt.config import EDGE_TTS_DICT
-from xiaogpt.tts.base import AudioFileTTS
-from xiaogpt.utils import find_key_by_partial_string
-
-
-class EdgeTTS(AudioFileTTS):
-    default_voice = "zh-CN-XiaoxiaoNeural"
-
-    async def make_audio_file(self, query: str, text: str) -> tuple[Path, float]:
-        voice = (
-            find_key_by_partial_string(EDGE_TTS_DICT, query)
-            or self.config.tts_voice
-            or self.default_voice
-        )
-        communicate = edge_tts.Communicate(text, voice, proxy=self.config.proxy)
-        duration = 0
-        with tempfile.NamedTemporaryFile(
-            suffix=".mp3", mode="wb", delete=False, dir=self.dirname.name
-        ) as f:
-            async for chunk in communicate.stream():
-                if chunk["type"] == "audio":
-                    f.write(chunk["data"])
-                elif chunk["type"] == "WordBoundary":
-                    duration = (chunk["offset"] + chunk["duration"]) / 1e7
-            if duration == 0:
-                raise RuntimeError(f"Failed to get tts from edge with voice={voice}")
-        return (Path(f.name), duration)

xiaogpt/tts/openai.py

@@ -1,46 +0,0 @@
-from __future__ import annotations
-
-import tempfile
-from pathlib import Path
-from typing import TYPE_CHECKING
-
-import httpx
-
-from xiaogpt.tts.base import AudioFileTTS
-from xiaogpt.utils import calculate_tts_elapse
-
-if TYPE_CHECKING:
-    import openai
-
-
-class OpenAITTS(AudioFileTTS):
-    default_voice = "alloy"
-
-    async def make_audio_file(self, query: str, text: str) -> tuple[Path, float]:
-        output_file = tempfile.NamedTemporaryFile(
-            suffix=".mp3", mode="wb", delete=False, dir=self.dirname.name
-        )
-        httpx_kwargs = {}
-        if self.config.proxy:
-            httpx_kwargs["proxies"] = self.config.proxy
-        async with httpx.AsyncClient(trust_env=True, **httpx_kwargs) as sess:
-            client = self._make_openai_client(sess)
-
-            resp = await client.audio.speech.create(
-                model="tts-1",
-                input=text,
-                voice=self.config.tts_voice or self.default_voice,
-            )
-            resp.stream_to_file(output_file.name)
-        return Path(output_file.name), calculate_tts_elapse(text)
-
-    def _make_openai_client(self, sess: httpx.AsyncClient) -> openai.AsyncOpenAI:
-        import openai
-
-        api_base = self.config.api_base
-        if api_base and api_base.rstrip("/").endswith("openai.azure.com"):
-            raise NotImplementedError("TTS is not supported for Azure OpenAI")
-        else:
-            return openai.AsyncOpenAI(
-                api_key=self.config.openai_key, http_client=sess, base_url=api_base
-            )

xiaogpt/tts/volc.py

@@ -1,130 +0,0 @@
-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.50.dist-info/RECORD

@@ -1,30 +0,0 @@
-xiaogpt-2.50.dist-info/METADATA,sha256=vRIqumlE_-ZX5cRlvJMOAOA2ap3DJe81s98p6ctH9SY,30311
-xiaogpt-2.50.dist-info/WHEEL,sha256=7sv5iXvIiTVJSnAxCz2tGBm9DHsb2vPSzeYeT7pvGUY,90
-xiaogpt-2.50.dist-info/entry_points.txt,sha256=zLFzA72qQ_eWBepdA2YU5vdXFqORH8wXhv2Ox1vnYP8,46
-xiaogpt-2.50.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=7K9v6j6xDkuvIrJwjby0Ec_1ywd4Si0Ww9S_R8M3LeU,919
-xiaogpt/bot/base_bot.py,sha256=oKn6LLFHXol4hKrSrjnxknrOqrcGICtT_GPPYRNxpkw,1467
-xiaogpt/bot/chatgptapi_bot.py,sha256=JYlq1D-YZxRwAPpd5dTFSBU7h1KNdWA7FTwgyvMxr7c,3656
-xiaogpt/bot/gemini_bot.py,sha256=udKrWYP7U83AWpNBggwRp9bvgR2DTHqLMX9E_DLFv-I,1840
-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=GnRj-AawthaZ5oE2jUzp_ML64afsSBnGXFvbnaqgJHE,4738
-xiaogpt/config.py,sha256=4ZAhefT9ROKpYw6i_QK4C1dcm2o2rjoROO5WqxJk3ww,6726
-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
-xiaogpt/langchain/examples/email/mail_summary_tools.py,sha256=6cWvBJUaA7iaywcHdbUoww8WiCtaNw3TmwyxyF4DY7E,1561
-xiaogpt/tts/__init__.py,sha256=N-mg521hRDByAPXts1Dl8EQVLEYQI7D2iWDIQ7ILLNE,279
-xiaogpt/tts/azure.py,sha256=JuE1wirQQAsYnnHmlc3sziuVXQUU0yGeGt5cHgiY388,3979
-xiaogpt/tts/base.py,sha256=a7J5cpcDNefr7deXJQWwDKw9XPFm6EQQL9O-GLe23hM,4660
-xiaogpt/tts/edge.py,sha256=yMFGxRTi086XS1d_mbMzQ365bvG4KgAz8ZptaoDAfGU,1172
-xiaogpt/tts/mi.py,sha256=9HkgGWByAs7k8sTpRdVlgJnnmjc44RNAccJa6tGDlXk,1096
-xiaogpt/tts/openai.py,sha256=_Qk12zYY-UuXLKvQVe3PqIvCmoRW9OcVCqQRoGCXvNc,1533
-xiaogpt/tts/volc.py,sha256=fLN7Z5HXx9TCkhGKWyTXasUcXn_fSlTNjVccvQunLUM,3984
-xiaogpt/utils.py,sha256=B7NCH7g19hcwHDXsnBJPTU6UcWnXoEntKWm-pgcet2I,2072
-xiaogpt/xiaogpt.py,sha256=dF_G26axLD9htLbFfHLMTLf2gaIdvAHkU88-s4RSmOs,15513
-xiaogpt-2.50.dist-info/RECORD,,