xiaogpt 2.21__tar.gz → 2.23__tar.gz

{xiaogpt-2.21 → xiaogpt-2.23}/PKG-INFO

@@ -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 → xiaogpt-2.23}/pyproject.toml

@@ -16,7 +16,7 @@ dependencies = [
     "openai>=1",
     "aiohttp",
     "rich",
-    "zhipuai",
+    "zhipuai==2.0.1",
     "bardapi",
     "edge-tts>=6.1.3",
     "EdgeGPT==0.1.26",
@@ -28,7 +28,7 @@ dependencies = [
     "dashscope==1.10.0",
 ]
 dynamic = []
-version = "2.21"
+version = "2.23"
 
 [project.license]
 text = "MIT"

{xiaogpt-2.21 → xiaogpt-2.23}/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-2.21 → xiaogpt-2.23}/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-2.21 → xiaogpt-2.23}/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-2.23/xiaogpt/bot/glm_bot.py

@@ -0,0 +1,63 @@
+"""ChatGLM bot"""
+
+from __future__ import annotations
+
+from typing import Any
+
+from rich import print
+
+from xiaogpt.bot.base_bot import BaseBot, ChatHistoryMixin
+
+
+class GLMBot(ChatHistoryMixin, BaseBot):
+    name = "Chat GLM"
+    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 = []
+        self.client = ZhipuAI(api_key=glm_key)
+
+    @classmethod
+    def from_config(cls, config):
+        return cls(glm_key=config.glm_key)
+
+    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:
+            r = self.client.chat.completions.create(**kwargs)
+        except Exception as e:
+            print(str(e))
+            return
+        message = r.choices[0].message.content
+
+        self.add_message(query, message)
+        print(message)
+        return message
+
+    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-2.21 → xiaogpt-2.23}/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-2.21 → xiaogpt-2.23}/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-2.21 → xiaogpt-2.23}/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-2.21 → xiaogpt-2.23}/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-2.21 → xiaogpt-2.23}/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-2.21 → xiaogpt-2.23}/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/xiaogpt/bot/glm_bot.py

@@ -1,43 +0,0 @@
-"""ChatGLM bot"""
-from __future__ import annotations
-
-from typing import Any
-
-import zhipuai
-from rich import print
-
-from xiaogpt.bot.base_bot import BaseBot, ChatHistoryMixin
-
-
-class GLMBot(ChatHistoryMixin, BaseBot):
-    name = "Chat GLM"
-    default_options = {"model": "chatglm_turbo"}
-
-    def __init__(self, glm_key: str) -> None:
-        self.history = []
-        zhipuai.api_key = glm_key
-
-    @classmethod
-    def from_config(cls, config):
-        return cls(glm_key=config.glm_key)
-
-    def ask(self, query, **options):
-        ms = self.get_messages()
-        kwargs = {**self.default_options, **options}
-        kwargs["prompt"] = ms
-        ms.append({"role": "user", "content": f"{query}"})
-        try:
-            r = zhipuai.model_api.sse_invoke(**kwargs)
-        except Exception as e:
-            print(str(e))
-            return
-        message = ""
-        for i in r.events():
-            message += str(i.data)
-
-        self.add_message(query, message)
-        print(message)
-        return message
-
-    def ask_stream(self, query: str, **options: Any):
-        raise Exception("GLM do not support stream")