xiaogpt 1.42__py3-none-any.whl → 1.44__py3-none-any.whl

xiaogpt/bot/__init__.py

@@ -1,5 +1,23 @@
+from __future__ import annotations
+
+from xiaogpt.bot.base_bot import BaseBot
 from xiaogpt.bot.chatgptapi_bot import ChatGPTBot
 from xiaogpt.bot.gpt3_bot import GPT3Bot
 from xiaogpt.bot.newbing_bot import NewBingBot
+from xiaogpt.config import Config
+
+BOTS: dict[str, type[BaseBot]] = {
+    "gpt3": GPT3Bot,
+    "newbing": NewBingBot,
+    "chatgptapi": ChatGPTBot,
+}
+
+
+def get_bot(config: Config) -> BaseBot:
+    try:
+        return BOTS[config.bot].from_config(config)
+    except KeyError:
+        raise ValueError(f"Unsupported bot {config.bot}, must be one of {list(BOTS)}")
+
 
-__all__ = ["GPT3Bot", "ChatGPTBot", "NewBingBot"]
+__all__ = ["GPT3Bot", "ChatGPTBot", "NewBingBot", "get_bot"]

xiaogpt/bot/base_bot.py

@@ -1,11 +1,25 @@
+from __future__ import annotations
+
 from abc import ABC, abstractmethod
+from typing import Any, AsyncGenerator, TypeVar
+
+from xiaogpt.config import Config
+
+T = TypeVar("T", bound="BaseBot")
 
 
 class BaseBot(ABC):
+    history: list
+
+    @abstractmethod
+    async def ask(self, query: str, **options: Any) -> str:
+        pass
+
     @abstractmethod
-    async def ask(self, query, **options):
+    async def ask_stream(self, query: str, **options: Any) -> AsyncGenerator[str, None]:
         pass
 
+    @classmethod
     @abstractmethod
-    async def ask_stream(self, query, **options):
+    def from_config(cls: type[T], config: Config) -> T:
         pass

xiaogpt/bot/chatgptapi_bot.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import openai
 from rich import print
 
@@ -8,7 +10,13 @@ from xiaogpt.utils import split_sentences
 class ChatGPTBot(BaseBot):
     default_options = {"model": "gpt-3.5-turbo"}
 
-    def __init__(self, openai_key, api_base=None, proxy=None, deployment_id=None):
+    def __init__(
+        self,
+        openai_key: str,
+        api_base: str | None = None,
+        proxy: str | None = None,
+        deployment_id: str | None = None,
+    ) -> None:
         self.history = []
         openai.api_key = openai_key
         if api_base:
@@ -24,6 +32,15 @@ class ChatGPTBot(BaseBot):
         if proxy:
             openai.proxy = proxy
 
+    @classmethod
+    def from_config(cls, config):
+        return cls(
+            openai_key=config.openai_key,
+            api_base=config.api_base,
+            proxy=config.proxy,
+            deployment_id=config.deployment_id,
+        )
+
     async def ask(self, query, **options):
         ms = []
         for h in self.history:

xiaogpt/bot/gpt3_bot.py

@@ -1,10 +1,11 @@
 import openai
 from rich import print
 
+from xiaogpt.bot.base_bot import BaseBot
 from xiaogpt.utils import split_sentences
 
 
-class GPT3Bot:
+class GPT3Bot(BaseBot):
     def __init__(self, openai_key, api_base=None, proxy=None):
         openai.api_key = openai_key
         if api_base:
@@ -13,6 +14,12 @@ class GPT3Bot:
             openai.proxy = proxy
         self.history = []
 
+    @classmethod
+    def from_config(cls, config):
+        return cls(
+            openai_key=config.openai_key, api_base=config.api_base, proxy=config.proxy
+        )
+
     async def ask(self, query, **options):
         data = {
             "prompt": query,

xiaogpt/bot/newbing_bot.py

@@ -4,12 +4,13 @@ import re
 
 from EdgeGPT import Chatbot, ConversationStyle
 
+from xiaogpt.bot.base_bot import BaseBot
 from xiaogpt.utils import split_sentences
 
 _reference_link_re = re.compile(r"\[\d+\]: .+?\n+")
 
 
-class NewBingBot:
+class NewBingBot(BaseBot):
     def __init__(
         self,
         bing_cookie_path: str = "",
@@ -21,6 +22,14 @@ class NewBingBot:
             cookiePath=bing_cookie_path, cookies=bing_cookies, proxy=proxy
         )
 
+    @classmethod
+    def from_config(cls, config):
+        return cls(
+            bing_cookie_path=config.bing_cookie_path,
+            bing_cookies=config.bing_cookies,
+            proxy=config.proxy,
+        )
+
     @staticmethod
     def clean_text(s):
         s = s.replace("**", "")

xiaogpt/utils.py

@@ -1,8 +1,11 @@
 #!/usr/bin/env python3
+from __future__ import annotations
+
 import os
 import re
 import socket
 from http.cookies import SimpleCookie
+from typing import AsyncIterator
 from urllib.parse import urlparse
 
 from requests.utils import cookiejar_from_dict
@@ -12,18 +15,14 @@ from requests.utils import cookiejar_from_dict
 def parse_cookie_string(cookie_string):
     cookie = SimpleCookie()
     cookie.load(cookie_string)
-    cookies_dict = {}
-    cookiejar = None
-    for k, m in cookie.items():
-        cookies_dict[k] = m.value
-        cookiejar = cookiejar_from_dict(cookies_dict, cookiejar=None, overwrite=True)
-    return cookiejar
+    cookies_dict = {k: m.value for k, m in cookie.items()}
+    return cookiejar_from_dict(cookies_dict, cookiejar=None, overwrite=True)
 
 
 _no_elapse_chars = re.compile(r"([「」『』《》“”'\"()（）]|(?<!-)-(?!-))", re.UNICODE)
 
 
-def calculate_tts_elapse(text):
+def calculate_tts_elapse(text: str) -> float:
     # for simplicity, we use a fixed speed
     speed = 4.5  # this value is picked by trial and error
     # Exclude quotes and brackets that do not affect the total elapsed time
@@ -33,7 +32,7 @@ def calculate_tts_elapse(text):
 _ending_punctuations = ("。", "？", "！", "；", ".", "?", "!", ";")
 
 
-async def split_sentences(text_stream):
+async def split_sentences(text_stream: AsyncIterator[str]) -> AsyncIterator[str]:
     cur = ""
     async for text in text_stream:
         cur += text
@@ -45,7 +44,7 @@ async def split_sentences(text_stream):
 
 
 ### for edge-tts utils ###
-def find_key_by_partial_string(dictionary, partial_key):
+def find_key_by_partial_string(dictionary: dict[str, str], partial_key: str) -> str:
     for key, value in dictionary.items():
         if key in partial_key:
             return value
@@ -63,7 +62,7 @@ def validate_proxy(proxy_str: str) -> bool:
     return True
 
 
-def get_hostname():
+def get_hostname() -> str:
     if "XIAOGPT_HOSTNAME" in os.environ:
         return os.environ["XIAOGPT_HOSTNAME"]
 

xiaogpt/xiaogpt.py

@@ -23,7 +23,7 @@ from miservice import MiAccount, MiIOService, MiNAService, miio_command
 from rich import print
 from rich.logging import RichHandler
 
-from xiaogpt.bot import ChatGPTBot, GPT3Bot, NewBingBot
+from xiaogpt.bot import get_bot
 from xiaogpt.config import (
     COOKIE_TEMPLATE,
     EDGE_TTS_DICT,
@@ -183,25 +183,7 @@ class MiGPT:
     @property
     def chatbot(self):
         if self._chatbot is None:
-            if self.config.bot == "gpt3":
-                self._chatbot = GPT3Bot(
-                    self.config.openai_key, self.config.api_base, self.config.proxy
-                )
-            elif self.config.bot == "chatgptapi":
-                self._chatbot = ChatGPTBot(
-                    self.config.openai_key,
-                    self.config.api_base,
-                    self.config.proxy,
-                    self.config.deployment_id,
-                )
-            elif self.config.bot == "newbing":
-                self._chatbot = NewBingBot(
-                    bing_cookie_path=self.config.bing_cookie_path,
-                    bing_cookies=self.config.bing_cookies,
-                    proxy=self.config.proxy,
-                )
-            else:
-                raise Exception(f"Do not support {self.config.bot}")
+            self._chatbot = get_bot(self.config)
         return self._chatbot
 
     async def simulate_xiaoai_question(self):

{xiaogpt-1.42.dist-info → xiaogpt-1.44.dist-info}/METADATA

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

xiaogpt-1.44.dist-info/RECORD

@@ -0,0 +1,16 @@
+xiaogpt-1.44.dist-info/METADATA,sha256=sczs5fZ8JgDLlt2SThUV8CzeyRTTSbCaI7hmkbo71Dk,11696
+xiaogpt-1.44.dist-info/WHEEL,sha256=7dGFtUmOf30dPBLpGD2z643cxg89joO7p3JHBAwDv6E,90
+xiaogpt-1.44.dist-info/entry_points.txt,sha256=zLFzA72qQ_eWBepdA2YU5vdXFqORH8wXhv2Ox1vnYP8,46
+xiaogpt-1.44.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=ggkvJF_CgTJkYGvklIfKQalM5MyshZHShl5vugLZTiY,639
+xiaogpt/bot/base_bot.py,sha256=kzbUw1eQrgFqkE_eZZrWmcbPdwFrQezJBLm7cJAM8qw,554
+xiaogpt/bot/chatgptapi_bot.py,sha256=AzsB8SoEzDRRAhoDCxU3a7gyiiTj_hvY1tfjeNJS-Kk,3275
+xiaogpt/bot/gpt3_bot.py,sha256=D9F_8ZGKp264ro6aTCzV3PGZ3ZSdj__-Idi5_xmkga0,1605
+xiaogpt/bot/newbing_bot.py,sha256=OBTZYWEqd3sfPl_0BrQxXZC79l8-l-2ikYFIhc4plqI,1996
+xiaogpt/cli.py,sha256=YP8OcSN0Xqw7FRhp0VRb6SSBND-czYVi2BhKITHnki8,3415
+xiaogpt/config.py,sha256=WkskKyZJ8BJ0Ou9x8_rlLwx8V_oVIaaNi7oNApZOJbc,5263
+xiaogpt/utils.py,sha256=kJ8nOBkilEoo1i2uUSp9tkUWV4pWrd5_EzEicZXzNjY,2071
+xiaogpt/xiaogpt.py,sha256=OByDLqV2AmDZ-QsJIgCnR2b8A0b2O-d7nqMAF-0z2M8,18548
+xiaogpt-1.44.dist-info/RECORD,,

xiaogpt-1.42.dist-info/RECORD

@@ -1,16 +0,0 @@
-xiaogpt-1.42.dist-info/METADATA,sha256=hD94oa_XXf7OP8WyoWPHPDqClOnLSa879XBS-H3Joqw,11696
-xiaogpt-1.42.dist-info/WHEEL,sha256=7dGFtUmOf30dPBLpGD2z643cxg89joO7p3JHBAwDv6E,90
-xiaogpt-1.42.dist-info/entry_points.txt,sha256=zLFzA72qQ_eWBepdA2YU5vdXFqORH8wXhv2Ox1vnYP8,46
-xiaogpt-1.42.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=bbp6GwmXZvMyo9b9OxvonVTMGrHgruWvjHMb3mHY8s4,189
-xiaogpt/bot/base_bot.py,sha256=t6pg0w0vjzKfYVmdNYjQoIzgu4zFU8cW_TlLOCAHyQw,218
-xiaogpt/bot/chatgptapi_bot.py,sha256=1hgGSfGvS9YuPM0zT2G_SQxlgO6Ksb64PCNDHT0_ENo,2895
-xiaogpt/bot/gpt3_bot.py,sha256=9PNhaxM_efZL2i087eUsh_G8clEB-a6Zp0f97yqjmjM,1386
-xiaogpt/bot/newbing_bot.py,sha256=HX2HBp6pxX6vooPWO34zo_KgvXJMpe80rRQFTqqCHEM,1732
-xiaogpt/cli.py,sha256=YP8OcSN0Xqw7FRhp0VRb6SSBND-czYVi2BhKITHnki8,3415
-xiaogpt/config.py,sha256=WkskKyZJ8BJ0Ou9x8_rlLwx8V_oVIaaNi7oNApZOJbc,5263
-xiaogpt/utils.py,sha256=Vjn4kt9_Bvi08a55H8ajoWiKlISFiQrdKGtFAr0dQ9M,1991
-xiaogpt/xiaogpt.py,sha256=XU163xFv3ve0TNI5YRHrnxxAGaKDEHK7yPXdlLoaoiw,19359
-xiaogpt-1.42.dist-info/RECORD,,