xiaogpt 2.21__py3-none-any.whl → 2.23__py3-none-any.whl

xiaogpt/bot/bard_bot.py

@@ -1,9 +1,9 @@
 """ChatGLM bot"""
+
 from __future__ import annotations
 
 from typing import Any
 
-from bardapi import BardAsync
 from rich import print
 
 from xiaogpt.bot.base_bot import BaseBot, ChatHistoryMixin
@@ -16,6 +16,8 @@ class BardBot(ChatHistoryMixin, BaseBot):
         self,
         bard_token: str,
     ) -> None:
+        from bardapi import BardAsync
+
         self._bot = BardAsync(token=bard_token)
         self.history = []
 

xiaogpt/bot/chatgptapi_bot.py

@@ -1,15 +1,17 @@
 from __future__ import annotations
 
 import dataclasses
-from typing import ClassVar
+from typing import TYPE_CHECKING, ClassVar
 
 import httpx
-import openai
 from rich import print
 
 from xiaogpt.bot.base_bot import BaseBot, ChatHistoryMixin
 from xiaogpt.utils import split_sentences
 
+if TYPE_CHECKING:
+    import openai
+
 
 @dataclasses.dataclass
 class ChatGPTBot(ChatHistoryMixin, BaseBot):
@@ -22,6 +24,8 @@ class ChatGPTBot(ChatHistoryMixin, BaseBot):
     history: list[tuple[str, str]] = dataclasses.field(default_factory=list, init=False)
 
     def _make_openai_client(self, sess: httpx.AsyncClient) -> openai.AsyncOpenAI:
+        import openai
+
         if self.api_base and self.api_base.rstrip("/").endswith("openai.azure.com"):
             return openai.AsyncAzureOpenAI(
                 api_key=self.openai_key,

xiaogpt/bot/gemini_bot.py

@@ -1,11 +1,10 @@
 """Google Gemini bot"""
+
 from __future__ import annotations
 
 from typing import Any
 
 from rich import print
-import google.generativeai as genai
-from google.generativeai.types.generation_types import StopCandidateException
 
 from xiaogpt.bot.base_bot import BaseBot, ChatHistoryMixin
 
@@ -34,6 +33,8 @@ class GeminiBot(ChatHistoryMixin, BaseBot):
     name = "Gemini"
 
     def __init__(self, gemini_key: str) -> None:
+        import google.generativeai as genai
+
         genai.configure(api_key=gemini_key)
         self.history = []
         model = genai.GenerativeModel(

xiaogpt/bot/glm_bot.py

@@ -1,9 +1,9 @@
 """ChatGLM bot"""
+
 from __future__ import annotations
 
 from typing import Any
 
-import zhipuai
 from rich import print
 
 from xiaogpt.bot.base_bot import BaseBot, ChatHistoryMixin
@@ -14,8 +14,12 @@ class GLMBot(ChatHistoryMixin, BaseBot):
     default_options = {"model": "chatglm_turbo"}
 
     def __init__(self, glm_key: str) -> None:
+        from zhipuai import ZhipuAI
+
+        self.model = "glm-4"  # Change glm model here
+
         self.history = []
-        zhipuai.api_key = glm_key
+        self.client = ZhipuAI(api_key=glm_key)
 
     @classmethod
     def from_config(cls, config):
@@ -24,20 +28,36 @@ class GLMBot(ChatHistoryMixin, BaseBot):
     def ask(self, query, **options):
         ms = self.get_messages()
         kwargs = {**self.default_options, **options}
-        kwargs["prompt"] = ms
+        kwargs["model"] = self.model
         ms.append({"role": "user", "content": f"{query}"})
+        kwargs["messages"] = ms
         try:
-            r = zhipuai.model_api.sse_invoke(**kwargs)
+            r = self.client.chat.completions.create(**kwargs)
         except Exception as e:
             print(str(e))
             return
-        message = ""
-        for i in r.events():
-            message += str(i.data)
+        message = r.choices[0].message.content
 
         self.add_message(query, message)
         print(message)
         return message
 
-    def ask_stream(self, query: str, **options: Any):
-        raise Exception("GLM do not support stream")
+    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
+        try:
+            r = self.client.chat.completions.create(**kwargs)
+        except Exception as e:
+            print(str(e))
+            return
+        full_content = ""
+        for chunk in r:
+            content = chunk.choices[0].delta.content
+            full_content += content
+            print(content, end="")
+            yield content
+        self.add_message(query, full_content)

xiaogpt/bot/gpt3_bot.py

@@ -4,7 +4,6 @@ import dataclasses
 from typing import ClassVar
 
 import httpx
-import openai
 from rich import print
 
 from xiaogpt.bot.base_bot import BaseBot, ChatHistoryMixin
@@ -26,6 +25,8 @@ class GPT3Bot(ChatHistoryMixin, BaseBot):
         )
 
     async def ask(self, query, **options):
+        import openai
+
         data = {
             "prompt": query,
             "model": "text-davinci-003",
@@ -50,6 +51,8 @@ class GPT3Bot(ChatHistoryMixin, BaseBot):
             return completion.choices[0].text
 
     async def ask_stream(self, query, **options):
+        import openai
+
         data = {
             "prompt": query,
             "model": "text-davinci-003",

xiaogpt/bot/newbing_bot.py

@@ -2,8 +2,6 @@ from __future__ import annotations
 
 import re
 
-from EdgeGPT import Chatbot, ConversationStyle
-
 from xiaogpt.bot.base_bot import BaseBot, ChatHistoryMixin
 from xiaogpt.utils import split_sentences
 
@@ -19,6 +17,8 @@ class NewBingBot(ChatHistoryMixin, BaseBot):
         bing_cookies: dict | None = None,
         proxy: str | None = None,
     ):
+        from EdgeGPT import Chatbot
+
         self.history = []
         self._bot = Chatbot(
             cookiePath=bing_cookie_path, cookies=bing_cookies, proxy=proxy
@@ -40,6 +40,8 @@ class NewBingBot(ChatHistoryMixin, BaseBot):
         return s.strip()
 
     async def ask(self, query, **options):
+        from EdgeGPT import ConversationStyle
+
         kwargs = {"conversation_style": ConversationStyle.balanced, **options}
         completion = await self._bot.ask(prompt=query, **kwargs)
         try:
@@ -51,6 +53,8 @@ class NewBingBot(ChatHistoryMixin, BaseBot):
         return text
 
     async def ask_stream(self, query, **options):
+        from EdgeGPT import ConversationStyle
+
         kwargs = {"conversation_style": ConversationStyle.balanced, **options}
         try:
             completion = self._bot.ask_stream(prompt=query, **kwargs)

xiaogpt/bot/qwen_bot.py

@@ -1,12 +1,10 @@
-"""ChatGLM bot"""
+"""Qwen bot"""
+
 from __future__ import annotations
 
+from http import HTTPStatus
 from typing import Any
 
-from http import HTTPStatus
-import dashscope
-from dashscope import Generation
-from dashscope.api_entities.dashscope_response import Role
 from rich import print
 
 from xiaogpt.bot.base_bot import BaseBot, ChatHistoryMixin
@@ -16,9 +14,10 @@ class QwenBot(ChatHistoryMixin, BaseBot):
     name = "Qian Wen"
 
     def __init__(self, qwen_key: str) -> None:
-        self.history = [
-            {"role": Role.SYSTEM, "content": "You are a helpful assistant."}
-        ]
+        import dashscope
+        from dashscope.api_entities.dashscope_response import Role
+
+        self.history = []
         dashscope.api_key = qwen_key
 
     @classmethod
@@ -26,6 +25,9 @@ class QwenBot(ChatHistoryMixin, BaseBot):
         return cls(qwen_key=config.qwen_key)
 
     async def ask(self, query, **options):
+        from dashscope import Generation
+        from dashscope.api_entities.dashscope_response import Role
+
         # from https://help.aliyun.com/zh/dashscope/developer-reference/api-details
         self.history.append({"role": Role.USER, "content": query})
 
@@ -61,6 +63,9 @@ class QwenBot(ChatHistoryMixin, BaseBot):
             return "没有返回"
 
     async def ask_stream(self, query: str, **options: Any):
+        from dashscope import Generation
+        from dashscope.api_entities.dashscope_response import Role
+
         self.history.append({"role": Role.USER, "content": query})
         responses = Generation.call(
             Generation.Models.qwen_turbo,

xiaogpt/cli.py

@@ -195,8 +195,8 @@ def main():
     )
 
     options = parser.parse_args()
-    if options.bot in ["glm", "bard"] and options.stream:
-        raise Exception("For now ChatGLM do not support stream")
+    if options.bot in ["bard"] and options.stream:
+        raise Exception("For now Bard do not support stream")
     config = Config.from_options(options)
 
     miboy = MiGPT(config)

xiaogpt/langchain/examples/email/mail_box.py

@@ -1,13 +1,13 @@
-import imaplib
 import email
-from datetime import datetime, timedelta
 import html
-from bs4 import BeautifulSoup
+import imaplib
 import re
-import openai
 import smtplib
+from datetime import datetime, timedelta
 from email.mime.text import MIMEText
 
+from bs4 import BeautifulSoup
+
 
 class Mailbox:
     # Gmail account settings need to be configured
@@ -115,6 +115,8 @@ class Mailbox:
         return ""
 
     def get_summary_by_ai(self, email_content: str, prompt: str) -> str:
+        import openai
+
         print("Asking AI to summarize email content...")
 
         # Request ChatGPT for summary

xiaogpt/tts/openai.py

@@ -2,13 +2,16 @@ from __future__ import annotations
 
 import tempfile
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 import httpx
-import openai
 
 from xiaogpt.tts.base import AudioFileTTS
 from xiaogpt.utils import calculate_tts_elapse
 
+if TYPE_CHECKING:
+    import openai
+
 
 class OpenAITTS(AudioFileTTS):
     default_voice = "alloy"
@@ -32,6 +35,8 @@ class OpenAITTS(AudioFileTTS):
         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")

{xiaogpt-2.21.dist-info → xiaogpt-2.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xiaogpt
-Version: 2.21
+Version: 2.23
 Summary: Play ChatGPT or other LLM with xiaomi AI speaker
 Author-Email: yihong0618 <zouzou0208@gmail.com>
 License: MIT
@@ -13,7 +13,7 @@ Requires-Dist: miservice_fork
 Requires-Dist: openai>=1
 Requires-Dist: aiohttp
 Requires-Dist: rich
-Requires-Dist: zhipuai
+Requires-Dist: zhipuai==2.0.1
 Requires-Dist: bardapi
 Requires-Dist: edge-tts>=6.1.3
 Requires-Dist: EdgeGPT==0.1.26

{xiaogpt-2.21.dist-info → xiaogpt-2.23.dist-info}/RECORD

@@ -1,30 +1,30 @@
-xiaogpt-2.21.dist-info/METADATA,sha256=KtBuDGieZNhrAVs-QtVGNmRStHUjGvXdNddkrU8Vbjw,18880
-xiaogpt-2.21.dist-info/WHEEL,sha256=N2J68yzZqJh3mI_Wg92rwhw0rtJDFpZj9bwQIMJgaVg,90
-xiaogpt-2.21.dist-info/entry_points.txt,sha256=zLFzA72qQ_eWBepdA2YU5vdXFqORH8wXhv2Ox1vnYP8,46
-xiaogpt-2.21.dist-info/licenses/LICENSE,sha256=XdClh516MvlnOf9749JZHCxSB7y6_fyXcWmLDz6IkZY,1063
+xiaogpt-2.23.dist-info/METADATA,sha256=pV5ExJ_7YpAmcJg6iK5dukVjN4haD59AYx4NIOdMhzY,18887
+xiaogpt-2.23.dist-info/WHEEL,sha256=N2J68yzZqJh3mI_Wg92rwhw0rtJDFpZj9bwQIMJgaVg,90
+xiaogpt-2.23.dist-info/entry_points.txt,sha256=zLFzA72qQ_eWBepdA2YU5vdXFqORH8wXhv2Ox1vnYP8,46
+xiaogpt-2.23.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=O3Wq7WRwTVdKJdKZxkBtCPdRJ8uXrQE0dqHa1ekOnfQ,1073
-xiaogpt/bot/bard_bot.py,sha256=KqsNJuZDj_M-gPvcYo5c70cZG3JAelWByvTpEyjD4PI,830
+xiaogpt/bot/bard_bot.py,sha256=qC8m87mWvtbiwipKl_OMYCqRbh79gkyZEytgz5DysC0,840
 xiaogpt/bot/base_bot.py,sha256=oKn6LLFHXol4hKrSrjnxknrOqrcGICtT_GPPYRNxpkw,1467
-xiaogpt/bot/chatgptapi_bot.py,sha256=swIl_slCOfDMnbr761Jb9z4Ohbd-TC8C4WjGM16GgRY,3595
-xiaogpt/bot/gemini_bot.py,sha256=2hSBxx9Afkz6fcf_H3GYVPZaKfkWHnGtx6gwqsYwAW4,1908
-xiaogpt/bot/glm_bot.py,sha256=fMYyPlrmkaTMezAWBvPykOlV3hGWtlF3pbS3inBu9fE,1130
-xiaogpt/bot/gpt3_bot.py,sha256=FRX81eHHJmDtqBHHCQYXWNPuSed2ECE4adHWvmfBoBM,2749
+xiaogpt/bot/chatgptapi_bot.py,sha256=Z4FX7F6j2n6NoUCqH6LliAAew94zaQXzp1blsE5yKoc,3656
+xiaogpt/bot/gemini_bot.py,sha256=udKrWYP7U83AWpNBggwRp9bvgR2DTHqLMX9E_DLFv-I,1840
+xiaogpt/bot/glm_bot.py,sha256=QoMJbnu5_rHDz4tzwn7gh3IoAuw7E4hZQLAfziMAvNY,1825
+xiaogpt/bot/gpt3_bot.py,sha256=enX45_wrGjAtOh-anf8KnjCJluWSARZbjTGD_WZgoms,2781
 xiaogpt/bot/langchain_bot.py,sha256=4Uz5iOYzA2ongCklS-9zBse2fw-7kEE_9wITH7wdVCc,1944
-xiaogpt/bot/newbing_bot.py,sha256=iUxQ0C5O38bEHeO9cF0grDPG2LrNkyxdKQPVuiHxDvw,2206
-xiaogpt/bot/qwen_bot.py,sha256=S9w6SZwCAFrzpj2ZyjH506gWa2cLlcLlHcsfrdZNU7c,3407
-xiaogpt/cli.py,sha256=Guu2-fFnd9K_SRt5xRLVBUBY-ctIpjfTaAQO9bZjR0g,5067
+xiaogpt/bot/newbing_bot.py,sha256=afUmw6tyMXbgGZvfQQWaA5h0-e0V0isFolW-WGhd0Vs,2289
+xiaogpt/bot/qwen_bot.py,sha256=n0WIeixAisd2_Vvky18FQFGcDIF3Cc2q2qp4ExCNBho,3521
+xiaogpt/cli.py,sha256=aLmpwjYw6tKPNy-WPZIE2XD5oLHsjSksova_PpH85II,5057
 xiaogpt/config.py,sha256=uo82JTKhujet0ro2SN3cOw2GXE-AamyzL7EmeFiGS5o,6287
 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=FgE4FcRmXKp6MpyKhNASDYIisZAkV5w4pu1tKPrWUCg,6362
+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=UDMNJTobFrw3Ichhvck6rHU-oREnoj8RUC_E3M9dMU8,130
 xiaogpt/tts/base.py,sha256=6VlTqQ_RJBbTb-perlMsnKg2qwfgKj4ELhzbdF0HD6c,4922
 xiaogpt/tts/edge.py,sha256=yMFGxRTi086XS1d_mbMzQ365bvG4KgAz8ZptaoDAfGU,1172
 xiaogpt/tts/mi.py,sha256=9HkgGWByAs7k8sTpRdVlgJnnmjc44RNAccJa6tGDlXk,1096
-xiaogpt/tts/openai.py,sha256=fsxOZ3xZ5FZyLMjzSK3y6syjKRZCwskunxCj6fj3T-M,1454
+xiaogpt/tts/openai.py,sha256=_Qk12zYY-UuXLKvQVe3PqIvCmoRW9OcVCqQRoGCXvNc,1533
 xiaogpt/utils.py,sha256=B7NCH7g19hcwHDXsnBJPTU6UcWnXoEntKWm-pgcet2I,2072
 xiaogpt/xiaogpt.py,sha256=_viWq5w4-rGCTsuDetPPih-4qkPZem9FtXK-tPyChlA,15473
-xiaogpt-2.21.dist-info/RECORD,,
+xiaogpt-2.23.dist-info/RECORD,,