xiaogpt 2.24__py3-none-any.whl → 2.26__py3-none-any.whl

xiaogpt/bot/qwen_bot.py

@@ -60,6 +60,9 @@ class QwenBot(ChatHistoryMixin, BaseBot):
                     response.message,
                 )
             )
+            # we need to pop the wrong history
+            print(f"Will pop the wrong question {query}")
+            self.history.pop()
             return "没有返回"
 
     async def ask_stream(self, query: str, **options: Any):

xiaogpt/xiaogpt.py

@@ -51,6 +51,7 @@ class MiGPT:
         self.log.setLevel(logging.DEBUG if config.verbose else logging.INFO)
         self.log.addHandler(RichHandler())
         self.log.debug(config)
+        self.mi_session = ClientSession()
 
     async def poll_latest_ask(self):
         async with ClientSession() as session:
@@ -78,8 +79,8 @@ class MiGPT:
     async def init_all_data(self, session):
         await self.login_miboy(session)
         await self._init_data_hardware()
-        session.cookie_jar.update_cookies(self.get_cookie())
-        self.cookie_jar = session.cookie_jar
+        self.mi_session.cookie_jar.update_cookies(self.get_cookie())
+        self.cookie_jar = self.mi_session.cookie_jar
         self.tts  # init tts
 
     async def login_miboy(self, session):
@@ -215,14 +216,17 @@ class MiGPT:
                 data = await r.json()
             except Exception:
                 self.log.warning("get latest ask from xiaoai error, retry")
-                if i == 2:
+                if i == 1:
                     # tricky way to fix #282 #272 # if it is the third time we re init all data
                     print("Maybe outof date trying to re init it")
-                    await self.init_all_data(self.session)
+                    await self._retry()
             else:
                 return self._get_last_query(data)
         return None
 
+    async def _retry(self):
+        await self.init_all_data(self.mi_session)
+
     def _get_last_query(self, data: dict) -> dict | None:
         if d := data.get("data"):
             records = json.loads(d).get("records")
@@ -339,71 +343,69 @@ class MiGPT:
         )
 
     async def run_forever(self):
-        async with ClientSession() as session:
-            self.session = session
-            await self.init_all_data(session)
-            task = asyncio.create_task(self.poll_latest_ask())
-            assert task is not None  # to keep the reference to task, do not remove this
-            print(
-                f"Running xiaogpt now, 用[green]{'/'.join(self.config.keyword)}[/]开头来提问"
-            )
-            print(f"或用[green]{self.config.start_conversation}[/]开始持续对话")
-            while True:
-                self.polling_event.set()
-                new_record = await self.last_record.get()
-                self.polling_event.clear()  # stop polling when processing the question
-                query = new_record.get("query", "").strip()
-
-                if query == self.config.start_conversation:
-                    if not self.in_conversation:
-                        print("开始对话")
-                        self.in_conversation = True
-                        await self.wakeup_xiaoai()
-                    await self.stop_if_xiaoai_is_playing()
-                    continue
-                elif query == self.config.end_conversation:
-                    if self.in_conversation:
-                        print("结束对话")
-                        self.in_conversation = False
-                    await self.stop_if_xiaoai_is_playing()
-                    continue
+        await self.init_all_data(self.mi_session)
+        task = asyncio.create_task(self.poll_latest_ask())
+        assert task is not None  # to keep the reference to task, do not remove this
+        print(
+            f"Running xiaogpt now, 用[green]{'/'.join(self.config.keyword)}[/]开头来提问"
+        )
+        print(f"或用[green]{self.config.start_conversation}[/]开始持续对话")
+        while True:
+            self.polling_event.set()
+            new_record = await self.last_record.get()
+            self.polling_event.clear()  # stop polling when processing the question
+            query = new_record.get("query", "").strip()
+
+            if query == self.config.start_conversation:
+                if not self.in_conversation:
+                    print("开始对话")
+                    self.in_conversation = True
+                    await self.wakeup_xiaoai()
+                await self.stop_if_xiaoai_is_playing()
+                continue
+            elif query == self.config.end_conversation:
+                if self.in_conversation:
+                    print("结束对话")
+                    self.in_conversation = False
+                await self.stop_if_xiaoai_is_playing()
+                continue
 
-                # we can change prompt
-                if self.need_change_prompt(new_record):
-                    print(new_record)
-                    self._change_prompt(new_record.get("query", ""))
+            # we can change prompt
+            if self.need_change_prompt(new_record):
+                print(new_record)
+                self._change_prompt(new_record.get("query", ""))
 
-                if not self.need_ask_gpt(new_record):
-                    self.log.debug("No new xiao ai record")
-                    continue
+            if not self.need_ask_gpt(new_record):
+                self.log.debug("No new xiao ai record")
+                continue
 
-                # drop 帮我回答
-                query = re.sub(rf"^({'|'.join(self.config.keyword)})", "", query)
+            # drop 帮我回答
+            query = re.sub(rf"^({'|'.join(self.config.keyword)})", "", query)
 
-                print("-" * 20)
-                print("问题：" + query + "？")
-                if not self.chatbot.has_history():
-                    query = f"{query}，{self.config.prompt}"
-                if self.config.mute_xiaoai:
-                    await self.stop_if_xiaoai_is_playing()
-                else:
-                    # waiting for xiaoai speaker done
-                    await asyncio.sleep(8)
-                await self.do_tts(f"正在问{self.chatbot.name}请耐心等待")
-                try:
-                    print(
-                        "以下是小爱的回答: ",
-                        new_record.get("answers", [])[0].get("tts", {}).get("text"),
-                    )
-                except IndexError:
-                    print("小爱没回")
-                print(f"以下是 {self.chatbot.name} 的回答: ", end="")
-                try:
-                    await self.tts.synthesize(query, self.ask_gpt(query))
-                except Exception as e:
-                    print(f"{self.chatbot.name} 回答出错 {str(e)}")
-                else:
-                    print("回答完毕")
-                if self.in_conversation:
-                    print(f"继续对话, 或用`{self.config.end_conversation}`结束对话")
-                    await self.wakeup_xiaoai()
+            print("-" * 20)
+            print("问题：" + query + "？")
+            if not self.chatbot.has_history():
+                query = f"{query}，{self.config.prompt}"
+            if self.config.mute_xiaoai:
+                await self.stop_if_xiaoai_is_playing()
+            else:
+                # waiting for xiaoai speaker done
+                await asyncio.sleep(8)
+            await self.do_tts(f"正在问{self.chatbot.name}请耐心等待")
+            try:
+                print(
+                    "以下是小爱的回答: ",
+                    new_record.get("answers", [])[0].get("tts", {}).get("text"),
+                )
+            except IndexError:
+                print("小爱没回")
+            print(f"以下是 {self.chatbot.name} 的回答: ", end="")
+            try:
+                await self.tts.synthesize(query, self.ask_gpt(query))
+            except Exception as e:
+                print(f"{self.chatbot.name} 回答出错 {str(e)}")
+            else:
+                print("回答完毕")
+            if self.in_conversation:
+                print(f"继续对话, 或用`{self.config.end_conversation}`结束对话")
+                await self.wakeup_xiaoai()

{xiaogpt-2.24.dist-info → xiaogpt-2.26.dist-info}/METADATA

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

{xiaogpt-2.24.dist-info → xiaogpt-2.26.dist-info}/RECORD

@@ -1,7 +1,7 @@
-xiaogpt-2.24.dist-info/METADATA,sha256=GA-UMnOxQYoWlWtYCVywOTtekubGkGWLO1xs-byJZkI,18887
-xiaogpt-2.24.dist-info/WHEEL,sha256=N2J68yzZqJh3mI_Wg92rwhw0rtJDFpZj9bwQIMJgaVg,90
-xiaogpt-2.24.dist-info/entry_points.txt,sha256=zLFzA72qQ_eWBepdA2YU5vdXFqORH8wXhv2Ox1vnYP8,46
-xiaogpt-2.24.dist-info/licenses/LICENSE,sha256=XdClh516MvlnOf9749JZHCxSB7y6_fyXcWmLDz6IkZY,1063
+xiaogpt-2.26.dist-info/METADATA,sha256=Stcpqotc2KK6q0ALFxKMvWkflyPcTi5xho3d9tCjlzE,18887
+xiaogpt-2.26.dist-info/WHEEL,sha256=N2J68yzZqJh3mI_Wg92rwhw0rtJDFpZj9bwQIMJgaVg,90
+xiaogpt-2.26.dist-info/entry_points.txt,sha256=zLFzA72qQ_eWBepdA2YU5vdXFqORH8wXhv2Ox1vnYP8,46
+xiaogpt-2.26.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
@@ -13,7 +13,7 @@ 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=afUmw6tyMXbgGZvfQQWaA5h0-e0V0isFolW-WGhd0Vs,2289
-xiaogpt/bot/qwen_bot.py,sha256=n0WIeixAisd2_Vvky18FQFGcDIF3Cc2q2qp4ExCNBho,3521
+xiaogpt/bot/qwen_bot.py,sha256=325lMa4Z38rRh47HDa3J4XjvSs4SWOqMVhrMWzkGNo4,3657
 xiaogpt/cli.py,sha256=aLmpwjYw6tKPNy-WPZIE2XD5oLHsjSksova_PpH85II,5057
 xiaogpt/config.py,sha256=uo82JTKhujet0ro2SN3cOw2GXE-AamyzL7EmeFiGS5o,6287
 xiaogpt/langchain/callbacks.py,sha256=yR9AXQt9OHVYBWC47Q1I_BUT4Xg9iM44vnW2vv0BLpE,2616
@@ -26,5 +26,5 @@ xiaogpt/tts/edge.py,sha256=yMFGxRTi086XS1d_mbMzQ365bvG4KgAz8ZptaoDAfGU,1172
 xiaogpt/tts/mi.py,sha256=9HkgGWByAs7k8sTpRdVlgJnnmjc44RNAccJa6tGDlXk,1096
 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.24.dist-info/RECORD,,
+xiaogpt/xiaogpt.py,sha256=QfXkDux6984znX1EdLgBcPcS8xxti9YEMZkcWgt2jjI,15273
+xiaogpt-2.26.dist-info/RECORD,,