xiaogpt 3.4__tar.gz → 3.10__tar.gz

{xiaogpt-3.4 → xiaogpt-3.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xiaogpt
-Version: 3.4
+Version: 3.10
 Summary: Play ChatGPT or other LLM with xiaomi AI speaker
 Author-Email: yihong0618 <zouzou0208@gmail.com>
 License: MIT

{xiaogpt-3.4 → xiaogpt-3.10}/pyproject.toml

@@ -31,7 +31,7 @@ dependencies = [
     "lingua-language-detector>=2.0.2; python_version < \"3.13\"",
 ]
 dynamic = []
-version = "3.4"
+version = "3.10"
 
 [project.license]
 text = "MIT"

{xiaogpt-3.4 → xiaogpt-3.10}/xiaogpt/bot/gemini_bot.py

@@ -32,13 +32,15 @@ safety_settings = [
 class GeminiBot(ChatHistoryMixin, BaseBot):
     name = "Gemini"
 
-    def __init__(self, gemini_key: str, gemini_api_domain: str) -> None:
+    def __init__(
+        self, gemini_key: str, gemini_api_domain: str, gemini_model: str
+    ) -> None:
         import google.generativeai as genai
 
         from google.auth import api_key
 
         credentials = api_key.Credentials(gemini_key)
-        if len(gemini_api_domain) > 0:
+        if gemini_api_domain:
             print("Use custom gemini_api_domain: " + gemini_api_domain)
             credentials._universe_domain = gemini_api_domain
             genai.configure(
@@ -54,7 +56,7 @@ class GeminiBot(ChatHistoryMixin, BaseBot):
 
         self.history = []
         model = genai.GenerativeModel(
-            model_name="gemini-pro",
+            model_name=gemini_model or "gemini-2.0-flash-lite",
             generation_config=generation_config,
             safety_settings=safety_settings,
         )
@@ -63,7 +65,9 @@ class GeminiBot(ChatHistoryMixin, BaseBot):
     @classmethod
     def from_config(cls, config):
         return cls(
-            gemini_key=config.gemini_key, gemini_api_domain=config.gemini_api_domain
+            gemini_key=config.gemini_key,
+            gemini_api_domain=config.gemini_api_domain,
+            gemini_model=config.gemini_model,
         )
 
     async def ask(self, query, **options):

{xiaogpt-3.4 → xiaogpt-3.10}/xiaogpt/cli.py

@@ -111,9 +111,10 @@ def main():
     )
     parser.add_argument(
         "--verbose",
+        "-v",
         dest="verbose",
-        action="store_true",
-        default=None,
+        action="count",
+        default=0,
         help="show info",
     )
     parser.add_argument(

{xiaogpt-3.4 → xiaogpt-3.10}/xiaogpt/config.py

@@ -59,6 +59,7 @@ class Config:
     llama_api_key: str = os.getenv("GROQ_API_KEY", "")  # use groq
     glm_key: str = os.getenv("CHATGLM_KEY", "")
     gemini_key: str = os.getenv("GEMINI_KEY", "")  # keep the old rule
+    gemini_model: str = os.getenv("GEMINI_MODEL", "")  # 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(
@@ -77,7 +78,7 @@ class Config:
     api_base: str | None = None
     deployment_id: str | None = None
     use_command: bool = False
-    verbose: bool = False
+    verbose: int = 0
     start_conversation: str = "开始持续对话"
     end_conversation: str = "结束持续对话"
     stream: bool = False

{xiaogpt-3.4 → xiaogpt-3.10}/xiaogpt/tts/live.py

@@ -27,11 +27,15 @@ class HTTPRequestHandler(BaseHTTPRequestHandler):
         self.end_headers()
         key = self.path.split("/")[-1]
         queue = get_queue(key)
+        chunks: list[bytes] = []
         while True:
             chunk = queue.get()
+            chunks.append(chunk)
             if chunk == b"":
                 break
             self.wfile.write(chunk)
+        for chunk in chunks:
+            queue.put_nowait(chunk)
 
     def log_message(self, format, *args):
         logger.debug(f"{self.address_string()} - {format}", *args)
@@ -76,6 +80,7 @@ class TetosLiveTTS(TTS):
 
         while True:
             if await self.get_if_xiaoai_is_playing():
+                logger.debug("Xiaoai is playing, waiting")
                 await asyncio.sleep(1)
             else:
                 break

{xiaogpt-3.4 → xiaogpt-3.10}/xiaogpt/xiaogpt.py

@@ -57,15 +57,20 @@ class MiGPT:
     async def poll_latest_ask(self):
         async with ClientSession() as session:
             session._cookie_jar = self.cookie_jar
+            log_polling = int(self.config.verbose) > 1
             while True:
-                self.log.debug(
-                    "Listening new message, timestamp: %s", self.last_timestamp
-                )
+                if log_polling:
+                    self.log.debug(
+                        "Listening new message, timestamp: %s", self.last_timestamp
+                    )
                 new_record = await self.get_latest_ask_from_xiaoai(session)
                 start = time.perf_counter()
-                self.log.debug(
-                    "Polling_event, timestamp: %s %s", self.last_timestamp, new_record
-                )
+                if log_polling:
+                    self.log.debug(
+                        "Polling_event, timestamp: %s %s",
+                        self.last_timestamp,
+                        new_record,
+                    )
                 await self.polling_event.wait()
                 if (
                     self.config.mute_xiaoai
@@ -75,7 +80,10 @@ class MiGPT:
                     await self.stop_if_xiaoai_is_playing()
                 if (d := time.perf_counter() - start) < 1:
                     # sleep to avoid too many request
-                    self.log.debug("Sleep %f, timestamp: %s", d, self.last_timestamp)
+                    if log_polling:
+                        self.log.debug(
+                            "Sleep %f, timestamp: %s", d, self.last_timestamp
+                        )
                     # if you want force mute xiaoai, comment this line below.
                     await asyncio.sleep(1 - d)
 
@@ -334,6 +342,7 @@ class MiGPT:
     async def stop_if_xiaoai_is_playing(self):
         is_playing = await self.get_if_xiaoai_is_playing()
         if is_playing:
+            self.log.debug("Muting xiaoai")
             # stop it
             await self.mina_service.player_pause(self.device_id)