xiaogpt 3.0__tar.gz → 3.2__tar.gz

{xiaogpt-3.0 → xiaogpt-3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xiaogpt
-Version: 3.0
+Version: 3.2
 Summary: Play ChatGPT or other LLM with xiaomi AI speaker
 Author-Email: yihong0618 <zouzou0208@gmail.com>
 License: MIT
@@ -26,6 +26,7 @@ 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"
+Provides-Extra: locked
 Requires-Dist: aiohappyeyeballs==2.4.0; extra == "locked"
 Requires-Dist: aiohttp==3.10.5; extra == "locked"
 Requires-Dist: aiosignal==1.3.1; extra == "locked"
@@ -118,7 +119,6 @@ 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.1.5.20230904; extra == "locked"
-Provides-Extra: locked
 Description-Content-Type: text/markdown
 
 # xiaogpt

{xiaogpt-3.0 → xiaogpt-3.2}/pyproject.toml

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

{xiaogpt-3.0 → xiaogpt-3.2}/xiaogpt/bot/glm_bot.py

@@ -11,13 +11,11 @@ from xiaogpt.bot.base_bot import BaseBot, ChatHistoryMixin
 
 class GLMBot(ChatHistoryMixin, BaseBot):
     name = "Chat GLM"
-    default_options = {"model": "chatglm_turbo"}
+    default_options = {"model": "glm-4"}  # Change glm model here
 
     def __init__(self, glm_key: str) -> None:
         from zhipuai import ZhipuAI
 
-        self.model = "glm-4"  # Change glm model here
-
         self.history = []
         self.client = ZhipuAI(api_key=glm_key)
 
@@ -28,7 +26,6 @@ class GLMBot(ChatHistoryMixin, BaseBot):
     def ask(self, query, **options):
         ms = self.get_messages()
         kwargs = {**self.default_options, **options}
-        kwargs["model"] = self.model
         ms.append({"role": "user", "content": f"{query}"})
         kwargs["messages"] = ms
         try:
@@ -45,7 +42,6 @@ class GLMBot(ChatHistoryMixin, BaseBot):
     async def ask_stream(self, query: str, **options: Any):
         ms = self.get_messages()
         kwargs = {**self.default_options, **options}
-        kwargs["model"] = self.model
         ms.append({"role": "user", "content": f"{query}"})
         kwargs["messages"] = ms
         kwargs["stream"] = True

{xiaogpt-3.0 → xiaogpt-3.2}/xiaogpt/bot/qwen_bot.py

@@ -15,7 +15,6 @@ class QwenBot(ChatHistoryMixin, BaseBot):
 
     def __init__(self, qwen_key: str) -> None:
         import dashscope
-        from dashscope.api_entities.dashscope_response import Role
 
         self.history = []
         dashscope.api_key = qwen_key

{xiaogpt-3.0 → xiaogpt-3.2}/xiaogpt/config.py

@@ -129,12 +129,10 @@ class Config:
                 "secret_key", config.get("volc_secret_key")
             )
         elif config.get("tts") == "fish":
-            print("fish")
             config.setdefault("tts_options", {}).setdefault(
                 "api_key", config.get("fish_api_key")
             )
             if voice := config.get("fish_voice_key"):
-                print("fish voice")
                 config.setdefault("tts_options", {}).setdefault("voice", voice)
 
         return cls(**config)

{xiaogpt-3.0 → xiaogpt-3.2}/xiaogpt/xiaogpt.py

@@ -274,6 +274,7 @@ class MiGPT:
         message = message.strip().replace(" ", "--")
         message = message.replace("\n", "，")
         message = message.replace('"', "，")
+        message = message.replace('*', "")
         return message
 
     async def ask_gpt(self, query: str) -> AsyncIterator[str]: