xiaogpt 2.60__tar.gz → 2.61__tar.gz

{xiaogpt-2.60 → xiaogpt-2.61}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xiaogpt
-Version: 2.60
+Version: 2.61
 Summary: Play ChatGPT or other LLM with xiaomi AI speaker
 Author-Email: yihong0618 <zouzou0208@gmail.com>
 License: MIT
@@ -22,7 +22,7 @@ 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: tetos>=0.1.0
+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"
@@ -102,7 +102,7 @@ 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.0; 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"
@@ -191,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
@@ -218,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 模式）
@@ -272,6 +276,7 @@ ChatGLM [文档](http://open.bigmodel.cn/doc/api#chatglm_130b)
 | 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                                                                                     |                                                                                                           |                                                       |
@@ -292,9 +297,9 @@ ChatGLM [文档](http://open.bigmodel.cn/doc/api#chatglm_130b)
 | 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/`                                                                 |                                                       |
-
-
+| 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
 
 ## 注意

{xiaogpt-2.60 → xiaogpt-2.61}/README.md

@@ -74,6 +74,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
@@ -101,6 +103,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 模式）
@@ -155,6 +159,7 @@ ChatGLM [文档](http://open.bigmodel.cn/doc/api#chatglm_130b)
 | 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                                                                                     |                                                                                                           |                                                       |
@@ -175,9 +180,9 @@ ChatGLM [文档](http://open.bigmodel.cn/doc/api#chatglm_130b)
 | 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/`                                                                 |                                                       |
-
-
+| 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
 
 ## 注意

{xiaogpt-2.60 → xiaogpt-2.61}/pyproject.toml

@@ -25,10 +25,10 @@ dependencies = [
     "google-generativeai",
     "numexpr>=2.8.6",
     "dashscope>=1.10.0",
-    "tetos>=0.1.0",
+    "tetos>=0.1.1",
 ]
 dynamic = []
-version = "2.60"
+version = "2.61"
 
 [project.license]
 text = "MIT"
@@ -120,7 +120,7 @@ locked = [
     "soupsieve==2.5",
     "sqlalchemy==2.0.25",
     "tenacity==8.2.3",
-    "tetos==0.1.0",
+    "tetos==0.1.1",
     "tqdm==4.66.1",
     "typing-extensions==4.9.0",
     "typing-inspect==0.9.0",

{xiaogpt-2.60 → xiaogpt-2.61}/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-2.61/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-2.60 → xiaogpt-2.61}/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-2.60 → xiaogpt-2.61}/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",

{xiaogpt-2.60 → xiaogpt-2.61}/xiaogpt/config.py

@@ -56,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
@@ -117,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