xiaogpt 1.80__py3-none-any.whl → 1.81__py3-none-any.whl

xiaogpt/bot/bard_bot.py

@@ -1,14 +1,15 @@
 """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
+from xiaogpt.bot.base_bot import BaseBot, ChatHistoryMixin
 
 
-class BardBot(BaseBot):
+class BardBot(ChatHistoryMixin, BaseBot):
     def __init__(
         self,
         bard_token: str,

xiaogpt/bot/base_bot.py

@@ -9,8 +9,6 @@ T = TypeVar("T", bound="BaseBot")
 
 
 class BaseBot(ABC):
-    history: list
-
     @abstractmethod
     async def ask(self, query: str, **options: Any) -> str:
         pass
@@ -23,3 +21,36 @@ class BaseBot(ABC):
     @abstractmethod
     def from_config(cls: type[T], config: Config) -> T:
         pass
+
+    @abstractmethod
+    def has_history(self) -> bool:
+        pass
+
+    @abstractmethod
+    def change_prompt(self, new_prompt: str) -> None:
+        pass
+
+
+class ChatHistoryMixin:
+    history: list[tuple[str, str]]
+
+    def has_history(self) -> bool:
+        return bool(self.history)
+
+    def change_prompt(self, new_prompt: str) -> None:
+        if self.history:
+            print(self.history)
+            self.history[0][0] = new_prompt
+
+    def get_messages(self) -> list[dict]:
+        ms = []
+        for h in self.history:
+            ms.append({"role": "user", "content": h[0]})
+            ms.append({"role": "assistant", "content": h[1]})
+        return ms
+
+    def add_message(self, query: str, message: str) -> None:
+        self.history.append([f"{query}", message])
+        # only keep 5 history
+        first_history = self.history.pop(0)
+        self.history = [first_history] + self.history[-5:]

xiaogpt/bot/chatgptapi_bot.py

@@ -3,11 +3,11 @@ from __future__ import annotations
 import openai
 from rich import print
 
-from xiaogpt.bot.base_bot import BaseBot
+from xiaogpt.bot.base_bot import BaseBot, ChatHistoryMixin
 from xiaogpt.utils import split_sentences
 
 
-class ChatGPTBot(BaseBot):
+class ChatGPTBot(ChatHistoryMixin, BaseBot):
     default_options = {"model": "gpt-3.5-turbo-0613"}
 
     def __init__(
@@ -42,10 +42,7 @@ class ChatGPTBot(BaseBot):
         )
 
     async def ask(self, query, **options):
-        ms = []
-        for h in self.history:
-            ms.append({"role": "user", "content": h[0]})
-            ms.append({"role": "assistant", "content": h[1]})
+        ms = self.get_messages()
         ms.append({"role": "user", "content": f"{query}"})
         kwargs = {**self.default_options, **options}
         try:
@@ -60,18 +57,12 @@ class ChatGPTBot(BaseBot):
             .encode("utf8")
             .decode()
         )
-        self.history.append([f"{query}", message])
-        # only keep 5 history
-        first_history = self.history.pop(0)
-        self.history = [first_history] + self.history[-5:]
+        self.add_message(query, message)
         print(message)
         return message
 
     async def ask_stream(self, query, **options):
-        ms = []
-        for h in self.history:
-            ms.append({"role": "user", "content": h[0]})
-            ms.append({"role": "assistant", "content": h[1]})
+        ms = self.get_messages()
         ms.append({"role": "user", "content": f"{query}"})
         kwargs = {"model": "gpt-3.5-turbo", **options}
         if openai.api_type == "azure":
@@ -99,6 +90,4 @@ class ChatGPTBot(BaseBot):
                 yield sentence
         finally:
             print()
-            self.history.append([f"{query}", message])
-            first_history = self.history.pop(0)
-            self.history = [first_history] + self.history[-5:]
+            self.add_message(query, message)

xiaogpt/bot/glm_bot.py

@@ -1,21 +1,18 @@
 """ChatGLM bot"""
 from __future__ import annotations
 
-from typing import Any, AsyncGenerator
+from typing import Any
 
 import zhipuai
 from rich import print
 
-from xiaogpt.bot.base_bot import BaseBot
+from xiaogpt.bot.base_bot import BaseBot, ChatHistoryMixin
 
 
-class GLMBot(BaseBot):
+class GLMBot(ChatHistoryMixin, BaseBot):
     default_options = {"model": "chatglm_130b"}
 
-    def __init__(
-        self,
-        glm_key: str,
-    ) -> None:
+    def __init__(self, glm_key: str) -> None:
         self.history = []
         zhipuai.api_key = glm_key
 
@@ -24,10 +21,7 @@ class GLMBot(BaseBot):
         return cls(glm_key=config.glm_key)
 
     def ask(self, query, **options):
-        ms = []
-        for h in self.history:
-            ms.append({"role": "user", "content": h[0]})
-            ms.append({"role": "assistant", "content": h[1]})
+        ms = self.get_messages()
         kwargs = {**self.default_options, **options}
         kwargs["prompt"] = ms
         ms.append({"role": "user", "content": f"{query}"})
@@ -40,10 +34,7 @@ class GLMBot(BaseBot):
         for i in r.events():
             message += str(i.data)
 
-        self.history.append([f"{query}", message])
-        # only keep 5 history
-        first_history = self.history.pop(0)
-        self.history = [first_history] + self.history[-5:]
+        self.add_message(query, message)
         print(message)
         return message
 

xiaogpt/bot/gpt3_bot.py

@@ -1,11 +1,11 @@
 import openai
 from rich import print
 
-from xiaogpt.bot.base_bot import BaseBot
+from xiaogpt.bot.base_bot import BaseBot, ChatHistoryMixin
 from xiaogpt.utils import split_sentences
 
 
-class GPT3Bot(BaseBot):
+class GPT3Bot(ChatHistoryMixin, BaseBot):
     def __init__(self, openai_key, api_base=None, proxy=None):
         openai.api_key = openai_key
         if api_base:

xiaogpt/bot/langchain_bot.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import asyncio
 import os
 
+from langchain.memory import ConversationBufferWindowMemory
 from rich import print
 
 from xiaogpt.bot.base_bot import BaseBot
@@ -26,8 +27,14 @@ class LangChainBot(BaseBot):
             os.environ["OPENAI_API_BASE"] = api_base
         if proxy:
             os.environ["OPENAI_PROXY"] = proxy
-        # Todo，Plan to implement within langchain
-        self.history = []
+        self.memory = ConversationBufferWindowMemory(return_messages=True)
+
+    def has_history(self) -> bool:
+        return len(self.memory.chat_memory.messages) > 0
+
+    def change_prompt(self, new_prompt: str) -> None:
+        self.memory.clear()
+        self.memory.chat_memory.add_user_message(new_prompt)
 
     @classmethod
     def from_config(cls, config):
@@ -39,14 +46,11 @@ class LangChainBot(BaseBot):
         )
 
     async def ask(self, query, **options):
-        # Todo，Currently only supports stream
-        raise Exception(
-            "The bot does not support it. Please use 'ask_stream, add: --stream'"
-        )
+        return await agent_search(query, self.memory)
 
     async def ask_stream(self, query, **options):
         callback = AsyncIteratorCallbackHandler()
-        task = asyncio.create_task(agent_search(query, callback))
+        task = asyncio.create_task(agent_search(query, self.memory, callback))
         try:
             async for message in split_sentences(callback.aiter()):
                 yield message

xiaogpt/bot/newbing_bot.py

@@ -4,13 +4,13 @@ import re
 
 from EdgeGPT import Chatbot, ConversationStyle
 
-from xiaogpt.bot.base_bot import BaseBot
+from xiaogpt.bot.base_bot import BaseBot, ChatHistoryMixin
 from xiaogpt.utils import split_sentences
 
 _reference_link_re = re.compile(r"\[\d+\]: .+?\n+")
 
 
-class NewBingBot(BaseBot):
+class NewBingBot(ChatHistoryMixin, BaseBot):
     def __init__(
         self,
         bing_cookie_path: str = "",
@@ -52,7 +52,7 @@ class NewBingBot(BaseBot):
         kwargs = {"conversation_style": ConversationStyle.balanced, **options}
         try:
             completion = self._bot.ask_stream(prompt=query, **kwargs)
-        except Exception as e:
+        except Exception:
             return
 
         async def text_gen():

xiaogpt/langchain/callbacks.py

@@ -33,7 +33,7 @@ class AsyncIteratorCallbackHandler(AsyncCallbackHandler):
 
     async def on_llm_new_token(self, token: str, **kwargs: Any) -> None:
         if token is not None and token != "":
-            print(token, end="")
+            print(token, end="", flush=True)
             self.queue.put_nowait(token)
 
     async def on_chain_end(

xiaogpt/langchain/chain.py

@@ -1,11 +1,16 @@
+from __future__ import annotations
+
 from langchain.agents import AgentType, Tool, initialize_agent
 from langchain.callbacks.base import BaseCallbackHandler
 from langchain.chains import LLMMathChain
 from langchain.chat_models import ChatOpenAI
+from langchain.schema.memory import BaseMemory
 from langchain.utilities import SerpAPIWrapper
 
 
-async def agent_search(query: str, callback: BaseCallbackHandler) -> None:
+async def agent_search(
+    query: str, memeory: BaseMemory, callback: BaseCallbackHandler | None = None
+) -> str:
     llm = ChatOpenAI(
         streaming=True,
         temperature=0,
@@ -23,8 +28,8 @@ async def agent_search(query: str, callback: BaseCallbackHandler) -> None:
     ]
 
     agent = initialize_agent(
-        tools, llm, agent=AgentType.OPENAI_FUNCTIONS, verbose=False
+        tools, llm, agent=AgentType.OPENAI_FUNCTIONS, verbose=False, memory=memeory
     )
-
+    callbacks = [callback] if callback else None
     # query eg：'杭州亚运会中国队获得了多少枚金牌？' // '计算3的2次方'
-    await agent.arun(query, callbacks=[callback])
+    return await agent.arun(query, callbacks=callbacks)

xiaogpt/xiaogpt.py

@@ -231,9 +231,7 @@ class MiGPT:
         new_prompt = "以下都" + new_prompt
         print(f"Prompt from {self.config.prompt} change to {new_prompt}")
         self.config.prompt = new_prompt
-        if self.chatbot.history:
-            print(self.chatbot.history)
-            self.chatbot.history[0][0] = new_prompt
+        self.chatbot.change_prompt(new_prompt)
 
     async def get_latest_ask_from_xiaoai(self, session: ClientSession) -> dict | None:
         retries = 3
@@ -489,7 +487,7 @@ class MiGPT:
 
                 print("-" * 20)
                 print("问题：" + query + "？")
-                if not self.chatbot.history:
+                if not self.chatbot.has_history():
                     query = f"{query}，{self.config.prompt}"
                 if self.config.mute_xiaoai:
                     await self.stop_if_xiaoai_is_playing()

{xiaogpt-1.80.dist-info → xiaogpt-1.81.dist-info}/METADATA

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

xiaogpt-1.81.dist-info/RECORD

@@ -0,0 +1,23 @@
+xiaogpt-1.81.dist-info/METADATA,sha256=GxxsqfbaekP1hfO5djLz3qVw9HcuhRn7TGN3Vq8eyZg,14306
+xiaogpt-1.81.dist-info/WHEEL,sha256=C8f_gqhOWmHrh81n3Ukx5iURrqMhsHla81fuY1yuwvs,90
+xiaogpt-1.81.dist-info/entry_points.txt,sha256=zLFzA72qQ_eWBepdA2YU5vdXFqORH8wXhv2Ox1vnYP8,46
+xiaogpt-1.81.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=raXM63RFkZFQWLwT0sz8NY0jAkCQip9TmIShpEU4wIA,909
+xiaogpt/bot/bard_bot.py,sha256=_OX8UVyksdxQb5E9xPkX2V0yIC24PUL8xUTONe5sR3c,811
+xiaogpt/bot/base_bot.py,sha256=YmFoNK4-_D-3bXSbt6cfPsm5rZiaoVyaEps5bNih6OE,1452
+xiaogpt/bot/chatgptapi_bot.py,sha256=rDhtQ-YCv27_3MyLU0sMnr4VDrHAu7hI5AdJUoij3yE,2983
+xiaogpt/bot/glm_bot.py,sha256=7VZJGRYU1Xlo6N7gICIsGMV5JkNgAbfBQKvhoO8ren4,1107
+xiaogpt/bot/gpt3_bot.py,sha256=IoMhsfmQ-ITy6V1nRrdm755vyEsS0Bb0bOLIv-F-fr8,1863
+xiaogpt/bot/langchain_bot.py,sha256=Kc4qXWIR1GBucxWmm1Y5YpAB3UzTVZmUpaEZSQIoaYY,1919
+xiaogpt/bot/newbing_bot.py,sha256=8VONq_2VAK66zUnjCacM9jg_4oHlYHTuKLAHob48Q2I,2187
+xiaogpt/cli.py,sha256=L0nmhSj6C931ya4KHIBktltnYTOGgPJNMavyXefTGpY,4478
+xiaogpt/config.py,sha256=B3AiG4WZjMGuwJrR2yMe9TiaVEoLN7N6D7CUYTpcsPc,5863
+xiaogpt/langchain/callbacks.py,sha256=yR9AXQt9OHVYBWC47Q1I_BUT4Xg9iM44vnW2vv0BLpE,2616
+xiaogpt/langchain/chain.py,sha256=rcbXzCV6H_r2r-Mi7mA__X8UZctDMl7nHloy3SAXXvw,1381
+xiaogpt/langchain/examples/email/mail_box.py,sha256=kpAZmfl5clbDBOkvHaaWZ_QY-VLBBvV1dsuegEptClw,6360
+xiaogpt/langchain/examples/email/mail_summary_tools.py,sha256=6cWvBJUaA7iaywcHdbUoww8WiCtaNw3TmwyxyF4DY7E,1561
+xiaogpt/utils.py,sha256=B7NCH7g19hcwHDXsnBJPTU6UcWnXoEntKWm-pgcet2I,2072
+xiaogpt/xiaogpt.py,sha256=Ojq0Pw3SVsVzwgImpWS87XrKqCAHIfddqgmoA5_kMf0,19885
+xiaogpt-1.81.dist-info/RECORD,,

xiaogpt-1.80.dist-info/RECORD

@@ -1,23 +0,0 @@
-xiaogpt-1.80.dist-info/METADATA,sha256=c18I0m_IQ9BrjSkuL_q_gt-TUuBNNAhpxdPclkvneYM,14306
-xiaogpt-1.80.dist-info/WHEEL,sha256=C8f_gqhOWmHrh81n3Ukx5iURrqMhsHla81fuY1yuwvs,90
-xiaogpt-1.80.dist-info/entry_points.txt,sha256=zLFzA72qQ_eWBepdA2YU5vdXFqORH8wXhv2Ox1vnYP8,46
-xiaogpt-1.80.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=raXM63RFkZFQWLwT0sz8NY0jAkCQip9TmIShpEU4wIA,909
-xiaogpt/bot/bard_bot.py,sha256=UKgfLLKwte8XBZFl7H7bAQRZM17qbI8Sa2AUrtzBrwM,774
-xiaogpt/bot/base_bot.py,sha256=kzbUw1eQrgFqkE_eZZrWmcbPdwFrQezJBLm7cJAM8qw,554
-xiaogpt/bot/chatgptapi_bot.py,sha256=cq0CwXD6ynNw7hB-bYubP0Nsz7pT49JYKp0_UjRoIps,3477
-xiaogpt/bot/glm_bot.py,sha256=bCJnwo4J6746kkRNq_OTrUgT-XZvV5KTndCz1ftiHIg,1386
-xiaogpt/bot/gpt3_bot.py,sha256=Ju_c9izW09XbCCSgZTp-3Rjz1zBMeBGj19zH0UwqGFw,1827
-xiaogpt/bot/langchain_bot.py,sha256=jnnXCDPkuZQYt83mhkeHpdJ_zdQBV51G5ABeL1ppf3k,1723
-xiaogpt/bot/newbing_bot.py,sha256=fRRrNnnw6xVFlkp4aQ37XRrOCnZmc2tCyMmW7BFgrOE,2156
-xiaogpt/cli.py,sha256=L0nmhSj6C931ya4KHIBktltnYTOGgPJNMavyXefTGpY,4478
-xiaogpt/config.py,sha256=B3AiG4WZjMGuwJrR2yMe9TiaVEoLN7N6D7CUYTpcsPc,5863
-xiaogpt/langchain/callbacks.py,sha256=gKWXAX2miB-FWu-h60J7kQ6FWTx0lxoj75ILNkPlwjU,2604
-xiaogpt/langchain/chain.py,sha256=50YcgWOtVeNS5X0TfwzDVeKBLz7eLntqL5H57sAiQ7k,1188
-xiaogpt/langchain/examples/email/mail_box.py,sha256=kpAZmfl5clbDBOkvHaaWZ_QY-VLBBvV1dsuegEptClw,6360
-xiaogpt/langchain/examples/email/mail_summary_tools.py,sha256=6cWvBJUaA7iaywcHdbUoww8WiCtaNw3TmwyxyF4DY7E,1561
-xiaogpt/utils.py,sha256=B7NCH7g19hcwHDXsnBJPTU6UcWnXoEntKWm-pgcet2I,2072
-xiaogpt/xiaogpt.py,sha256=jtZy6Qylhgh3_RGeKJnlQVBHCsYZTvEB37YHA6o_nmg,19957
-xiaogpt-1.80.dist-info/RECORD,,