hyper-bot 0.82.2__tar.gz → 0.82.4__tar.gz

hyper_bot-0.82.4/PKG-INFO

@@ -0,0 +1,17 @@
+Metadata-Version: 2.4
+Name: hyper-bot
+Version: 0.82.4
+Summary: 稳定高效、易于开发的QQ Bot框架
+Author-email: Harcic <harcic@outlook.com>
+Project-URL: repository, https://github.com/HarcicYang/HypeR_Bot
+Requires-Python: >=3.10
+License-File: LICENSE
+Requires-Dist: setuptools
+Requires-Dist: aiohttp~=3.9.5
+Requires-Dist: requests~=2.31.0
+Requires-Dist: httpx~=0.26.0
+Requires-Dist: websockets
+Requires-Dist: Flask~=3.0.0
+Requires-Dist: ucfgr>=0.0.5
+Requires-Dist: PyYAML
+Dynamic: license-file

hyper_bot-0.82.4/pyproject.toml

@@ -0,0 +1,27 @@
+[build-system]
+requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "hyper-bot"
+version = "0.82.4"
+description = "稳定高效、易于开发的QQ Bot框架"
+authors = [
+    { name = "Harcic", email = "harcic@outlook.com" },
+]
+urls = { repository = "https://github.com/HarcicYang/HypeR_Bot" }
+requires-python = ">=3.10"
+dependencies = [
+    "setuptools",
+    "aiohttp~=3.9.5",
+    "requests~=2.31.0",
+    "httpx~=0.26.0",
+    "websockets",
+    "Flask~=3.0.0",
+    "ucfgr>=0.0.5",
+    "PyYAML",
+]
+
+[tool.setuptools.packages.find]
+where = ["src"]
+include = ["hyperot*"]

hyper_bot-0.82.4/src/hyper_bot.egg-info/PKG-INFO

@@ -0,0 +1,17 @@
+Metadata-Version: 2.4
+Name: hyper-bot
+Version: 0.82.4
+Summary: 稳定高效、易于开发的QQ Bot框架
+Author-email: Harcic <harcic@outlook.com>
+Project-URL: repository, https://github.com/HarcicYang/HypeR_Bot
+Requires-Python: >=3.10
+License-File: LICENSE
+Requires-Dist: setuptools
+Requires-Dist: aiohttp~=3.9.5
+Requires-Dist: requests~=2.31.0
+Requires-Dist: httpx~=0.26.0
+Requires-Dist: websockets
+Requires-Dist: Flask~=3.0.0
+Requires-Dist: ucfgr>=0.0.5
+Requires-Dist: PyYAML
+Dynamic: license-file

hyper_bot-0.82.4/src/hyper_bot.egg-info/SOURCES.txt

@@ -0,0 +1,35 @@
+LICENSE
+pyproject.toml
+src/hyper_bot.egg-info/PKG-INFO
+src/hyper_bot.egg-info/SOURCES.txt
+src/hyper_bot.egg-info/dependency_links.txt
+src/hyper_bot.egg-info/requires.txt
+src/hyper_bot.egg-info/top_level.txt
+src/hyperot/__init__.py
+src/hyperot/common.py
+src/hyperot/configurator.py
+src/hyperot/events.py
+src/hyperot/hyperogger.py
+src/hyperot/listener.py
+src/hyperot/network.py
+src/hyperot/segments.py
+src/hyperot/LecAdapters/Milky.py
+src/hyperot/LecAdapters/OneBot.py
+src/hyperot/LecAdapters/MilkyLib/Manager.py
+src/hyperot/LecAdapters/MilkyLib/Res.py
+src/hyperot/LecAdapters/MilkyLib/translator.py
+src/hyperot/LecAdapters/OneBotLib/Manager.py
+src/hyperot/LecAdapters/OneBotLib/Res.py
+src/hyperot/adapters/__init__.py
+src/hyperot/adapters/builtins.py
+src/hyperot/adapters/common.py
+src/hyperot/adapters/listener.py
+src/hyperot/adapters/obuilder.py
+src/hyperot/adapters/res.py
+src/hyperot/utils/ArkSignHelper.py
+src/hyperot/utils/__init__.py
+src/hyperot/utils/apiresponse.py
+src/hyperot/utils/errors.py
+src/hyperot/utils/hypetyping.py
+src/hyperot/utils/screens.py
+src/hyperot/utils/typextensions.py

{hyper_bot-0.82.2 → hyper_bot-0.82.4/src}/hyper_bot.egg-info/requires.txt

@@ -1,7 +1,8 @@
+setuptools
 aiohttp~=3.9.5
 requests~=2.31.0
 httpx~=0.26.0
-websocket-client~=1.8.0
+websockets
 Flask~=3.0.0
-ucfgr
+ucfgr>=0.0.5
 PyYAML

{hyper_bot-0.82.2 → hyper_bot-0.82.4/src}/hyperot/LecAdapters/MilkyLib/translator.py

@@ -1,4 +1,3 @@
-import httpx
 import json
 
 from hyperot.network import WebsocketConnection, httpx_post, httpx_get

{hyper_bot-0.82.2 → hyper_bot-0.82.4/src}/hyperot/LecAdapters/OneBot.py

@@ -2,15 +2,13 @@ import json
 import time
 import asyncio
 import sys
-import subprocess
+from typing import Union, Callable
 
-from .. import network, events, common, segments
-from ..service import FuncCall, IServiceBase, IServiceStartUp
-from ..utils import errors, logic
+from .. import network, events, common, segments, configurator, hyperogger
+from ..utils import errors
 from ..utils.apiresponse import *
 from ..LecAdapters.OneBotLib.Manager import reports, Packet
 from ..events import *
-from ..utils.hypetyping import Any, Union, NoReturn, Callable
 
 config = configurator.BotConfig.get("hyper-bot")
 logger = hyperogger.Logger()
@@ -40,17 +38,17 @@ class Actions:
         self.custom = CustomAction(self.connection)
 
     async def send_msg(
-            self, message: Union[common.Message, str], group_id: int = None, user_id: int = None
+            self, message: Union[common.Message, str], group_id: int = 0, user_id: int = 0
     ) -> common.Ret[MsgSendRsp]:
         if isinstance(message, str):
             message = common.Message(segments.Text(message))
-        if group_id is not None:
+        if group_id:
             packet = Packet(
                 "send_msg",
                 group_id=group_id,
                 message=await message.get()
             )
-        elif user_id is not None:
+        elif user_id:
             packet = Packet(
                 "send_msg",
                 user_id=user_id,
@@ -62,14 +60,10 @@ class Actions:
         logger.info(f"向{(('群 ' + str(group_id)) if group_id else ('用户' + str(user_id))) + ' '}发送：{str(message)}")
         return await common.Ret.fetch(packet.echo, MsgSendRsp)
 
-    async def send_group_msg(
-            self, message: Union[common.Message, str], group_id: int = None
-    ) -> common.Ret[MsgSendRsp]:
+    async def send_group_msg(self, message: Union[common.Message, str], group_id: int) -> common.Ret[MsgSendRsp]:
         return await self.send_msg(message, group_id=group_id)
 
-    async def send_private_msg(
-            self, message: Union[common.Message, str], user_id: int = None
-    ) -> common.Ret[MsgSendRsp]:
+    async def send_private_msg(self, message: Union[common.Message, str], user_id: int) -> common.Ret[MsgSendRsp]:
         return await self.send_msg(message, user_id=user_id)
 
     async def del_msg(self, message_id: int) -> None:
@@ -247,44 +241,24 @@ def reg(func: Callable) -> None:
 connection: Union[network.WebsocketConnection, network.HTTPConnection]
 
 
-class LagrangeOneBotService(IServiceBase):
-
-    def handler(self, func: FuncCall) -> Any:
-        pass
-
-    async def server(self, bot_config: configurator.BotConfig) -> None:
-        if isinstance(config.connection, dict):
-            raise errors.ListenerNotRegisteredError("未注册接收器")
-        proc = subprocess.Popen(
-            args=config.connection.ob_exec,
-            cwd=config.connection.ob_startup_path,
-            stdout=subprocess.PIPE
-        )
-        if bot_config.connection.ob_log_output:
-            for i in proc.stdout:
-                print(i.decode(), end="")
-
-
-async def run() -> NoReturn:
+async def run() -> None:
     global connection, listener_ran
     listener_ran = True
     try:
         if handler is tester:
             raise errors.ListenerNotRegisteredError("No handler registered")
         if isinstance(config.connection, configurator.BotWSC):
-            connection = network.WebsocketConnection(f"ws://{config.connection.host}:{config.connection.port}")
+            connection = network.WebsocketConnection(f"ws://{config.connection.host}:{config.connection.port}/")
         elif isinstance(config.connection, configurator.BotHTTPC):
             connection = network.HTTPConnection(
                 url=f"http://{config.connection.host}:{config.connection.port}",
                 listener_url=f"http://{config.connection.listener_host}:{config.connection.listener_port}"
             )
         retried = 0
-        if config.connection.ob_auto_startup:
-            LagrangeOneBotService(IServiceStartUp.MANUAL).run_in_thread(config)
 
-        while True:
+        while 1:
             try:
-                connection.connect()
+                await connection.connect()
             except (ConnectionRefusedError, TimeoutError):
                 if retried >= config.connection.retries:
                     logger.critical(f"重试次数达到最大值({config.connection.retries})，退出")
@@ -292,7 +266,7 @@ async def run() -> NoReturn:
 
                 logger.warning(f"连接建立失败，3秒后重试({retried}/{config.connection.retries})")
                 retried += 1
-                time.sleep(3)
+                await asyncio.sleep(3)
                 continue
             retried = 0
             logger.info(f"成功在 {connection.url} 建立连接")

{hyper_bot-0.82.2 → hyper_bot-0.82.4/src}/hyperot/LecAdapters/OneBotLib/Manager.py

@@ -1,12 +1,11 @@
-from ... import configurator, hyperogger, network
-from ...utils import logic
+from ... import configurator, hyperogger, network, utils
 from ...utils.hypetyping import OneBotJsonPacket
 
 from typing import Union
 import random
 import json
 
-reports = logic.KeyQueue()
+reports = utils.KeyQueue()
 
 config: configurator.BotConfig
 logger: hyperogger.Logger

{hyper_bot-0.82.2 → hyper_bot-0.82.4/src}/hyperot/__init__.py

@@ -1,37 +1,46 @@
 from . import configurator
 from .utils import screens
 
-from typing import Union, Callable
+from typing import Union, Callable, TYPE_CHECKING, Any
 import asyncio
 import sys
 import os
 import signal
 
-HYPER_BOT_VERSION = "0.82.2"
+HYPER_BOT_VERSION = "0.82.4"
 
 # listener = None
 
 screens.play_startup()
 screens.play_info(HYPER_BOT_VERSION)
 
-ANY_EVENT = Union[
-    "events.GroupMessageEvent",
-    "events.PrivateMessageEvent",
-    "events.GroupFileUploadEvent",
-    "events.GroupAdminEvent",
-    "events.GroupMemberDecreaseEvent",
-    "events.GroupMemberIncreaseEvent",
-    "events.GroupMuteEvent",
-    "events.FriendAddEvent",
-    "events.GroupRecallEvent",
-    "events.FriendRecallEvent",
-    "events.NotifyEvent",
-    "events.GroupEssenceEvent",
-    "events.MessageReactionEvent",
-    "events.GroupAddInviteEvent",
-    "events.HyperListenerStartNotify",
-    "events.HyperListenerStopNotify"
-]
+if TYPE_CHECKING:
+    from . import events, listener, hyperogger
+
+    ANY_EVENT = Union[
+        events.GroupMessageEvent,
+        events.PrivateMessageEvent,
+        events.GroupFileUploadEvent,
+        events.GroupAdminEvent,
+        events.GroupMemberDecreaseEvent,
+        events.GroupMemberIncreaseEvent,
+        events.GroupMuteEvent,
+        events.FriendAddEvent,
+        events.GroupRecallEvent,
+        events.FriendRecallEvent,
+        events.NotifyEvent,
+        events.GroupEssenceEvent,
+        events.MessageReactionEvent,
+        events.GroupAddInviteEvent,
+        events.HyperListenerStartNotify,
+        events.HyperListenerStopNotify
+    ]
+    LISTENER_ACTIONS = listener.Actions
+    LOGGER = hyperogger.Logger
+else:
+    ANY_EVENT = Any
+    LISTENER_ACTIONS = Any
+    LOGGER = Any
 
 
 class Client:
@@ -57,7 +66,7 @@ class Client:
             self.records[event].append(func)
 
     async def distributor(
-            self, message_data: Union["events.Event", "events.HyperNotify"], actions: "Listener.Actions"
+            self, message_data: Union["events.Event", "events.HyperNotify"], actions: LISTENER_ACTIONS
     ) -> None:
         if type(message_data) in list(self.records.keys()):
             tasks = []
@@ -76,7 +85,7 @@ class Client:
             loop = asyncio.get_running_loop()
             _wakeup_task = None
             if sys.platform == "win32":
-                def _win32_handler(signum, frame):
+                def _win32_handler(signum, frame):  # type: ignore
                     stop.set()
 
                 signal.signal(signal.SIGINT, _win32_handler)
@@ -92,7 +101,7 @@ class Client:
                 _wakeup_task = asyncio.create_task(_win32_wakeup())
             else:
                 for i in (signal.SIGINT, signal.SIGTERM):
-                    loop.add_signal_handler(i, stop.set)
+                    loop.add_signal_handler(i, stop.set)  # type: ignore
             task = asyncio.create_task(self.lis.run())
             await stop.wait()
             if _wakeup_task:

{hyper_bot-0.82.2 → hyper_bot-0.82.4/src}/hyperot/adapters/__init__.py

@@ -1,5 +1,5 @@
 import sys
-from ..utils.hypetyping import Any
+from typing import Any
 
 
 def replace(new: Any, old: str):
@@ -11,15 +11,15 @@ def replace(new: Any, old: str):
         sys.modules[old] = new
 
 
-def replace_listener(new: "hyperot.adapters.listener"):
+def replace_listener(new):
     replace(new, "hyperot.adapters.listener")
 
 
-def replace_common(new: "hyperot.adapters.common"):
+def replace_common(new):
     replace(new, "hyperot.adapters.common")
 
 
-def replace_res(new: "hyperot.adapters.res"):
+def replace_res(new):
     replace(new, "hyperot.adapters.res")
 
 

{hyper_bot-0.82.2 → hyper_bot-0.82.4/src}/hyperot/adapters/common.py

@@ -1,6 +1,7 @@
+from .. import utils
 from ..utils import logic
 
-reports = logic.KeyQueue()
+reports = utils.KeyQueue()
 
 
 def init() -> None:

{hyper_bot-0.82.2 → hyper_bot-0.82.4/src}/hyperot/adapters/listener.py

@@ -1,6 +1,6 @@
-from ..utils.hypetyping import Any, NoReturn, TypeVar, Callable
+from typing import Any, NoReturn, TypeVar, Callable
 from ..utils.apiresponse import *
-from ..events import *
+from .. import hyperogger, common, configurator
 
 config = configurator.BotConfig.get("hyper-bot")
 logger = hyperogger.Logger()

{hyper_bot-0.82.2 → hyper_bot-0.82.4/src}/hyperot/common.py

@@ -1,9 +1,9 @@
+from typing import Generic, Type, Self, TypeVar
+
 from . import configurator
 from .utils.typextensions import ObjectedJson
 from . import segments
-from .utils.hypetyping import TypeVar
 
-from typing import Generic, Type, Self
 
 config = configurator.BotConfig.get("hyper-bot")
 T = TypeVar("T")

{hyper_bot-0.82.2 → hyper_bot-0.82.4/src}/hyperot/configurator.py

@@ -1,6 +1,13 @@
 from cfgr.manager import BaseConfig
 
 
+__all__ = [
+    "BotConfig",
+    "BotWSC",
+    "BotHTTPC"
+]
+
+
 class BotWSC(BaseConfig):
     mode: str = "FWS"
     ob_auto_startup: bool = False
@@ -43,10 +50,14 @@ class BotConfig(BaseConfig):
     others: dict
 
     def custom_post(self, **kwargs):
-        if self.protocol == "OneBot":
-            if self.connection["mode"] == "FWS":
-                self.connection = BotWSC(**self.connection)
-            elif self.connection["mode"] == "HTTPC":
-                self.connection = BotHTTPC(**self.connection)
-        elif self.protocol == "Kritor":
-            self.connection = BotWSC(**self.connection)
+        if isinstance(self.connection, dict):
+            if self.protocol == "OneBot":
+                if self.connection["mode"] == "FWS":
+                    self.connection = BotWSC(**self.connection)
+                elif self.connection["mode"] == "HTTPC":
+                    self.connection = BotHTTPC(**self.connection)
+        else:
+            raise TypeError()
+
+        if isinstance(self.connection, dict):
+            raise TypeError()

{hyper_bot-0.82.2 → hyper_bot-0.82.4/src}/hyperot/events.py

@@ -1,11 +1,44 @@
 from . import configurator, hyperogger, common
-from .utils.typextensions import Integer
 from .segments import message_types, At
 from .network import WebsocketConnection, HTTPConnection
 from .hyperogger import levels
 
 from abc import ABC
-from typing import Union
+from typing import Union, Callable, Optional
+
+__all__ = [
+    "init",
+    "EventManager",
+    "em",
+    "GroupSender",
+    "PrivateSender",
+    "GroupAnonymous",
+    "gen_message",
+    "Event",
+    "UnrecognizedEvent",
+    "MessageEvent",
+    "PrivateMessageEvent",
+    "GroupMessageEvent",
+    "NoticeEvent",
+    "GroupFileUploadEvent",
+    "GroupAdminEvent",
+    "GroupMemberDecreaseEvent",
+    "GroupMemberIncreaseEvent",
+    "GroupMuteEvent",
+    "FriendAddEvent",
+    "GroupRecallEvent",
+    "FriendRecallEvent",
+    "NotifyEvent",
+    "GroupEssenceEvent",
+    "MessageReactionEvent",
+    "BotOnLineEvent",
+    "RequestEvent",
+    "FriendAddRequestEvent",
+    "GroupAddInviteEvent",
+    "HyperNotify",
+    "HyperListenerStartNotify",
+    "HyperListenerStopNotify",
+]
 
 config: configurator.BotConfig
 logger: hyperogger.Logger
@@ -27,7 +60,7 @@ class EventManager:
         }
         self.events = []
 
-    def reg(self, type_of: str, str_eql: str) -> callable:
+    def reg(self, type_of: str, str_eql: str) -> Callable:
         def wrapper(cls):
             self.event_lis[type_of][str_eql] = cls
             self.events.append(cls)
@@ -99,12 +132,12 @@ class Event(ABC):
     def __init__(self, data: dict):
         self.data = data.copy()
         self.time = data.get("time")
-        self.self_id = data.get("self_id")
+        self.self_id = data.get("self_id", 0)
         self.post_type = data.get("post_type")
         self.user_id = data.get("user_id")
         self.group_id = data.get("group_id")
 
-        self.is_owner = Integer.convert_from(self.user_id) in config.owner
+        self.is_owner = self.self_id in config.owner
         self.blocked = True if self.user_id in config.black_list or self.group_id in config.black_list else False
         self.is_silent = self.user_id in config.silents or self.group_id in config.silents or 0 in config.silents
 
@@ -129,7 +162,7 @@ class MessageEvent(Event):
 class PrivateMessageEvent(MessageEvent):
     def __init__(self, data: dict):
         super().__init__(data)
-        self.sender = PrivateSender(data.get("sender"))
+        self.sender = PrivateSender(data.get("sender"))  # type: ignore
 
         self.print_log()
 
@@ -141,8 +174,8 @@ class PrivateMessageEvent(MessageEvent):
 class GroupMessageEvent(MessageEvent):
     def __init__(self, data: dict):
         super().__init__(data)
-        self.sender = GroupSender(data.get("sender"))
-        self.anonymous = GroupAnonymous(data.get("anonymous"))
+        self.sender = GroupSender(data.get("sender"))  # type: ignore
+        self.anonymous = GroupAnonymous(data.get("anonymous"))  # type: ignore
         self.is_mentioned = True if At(str(self.self_id)) in self.message else False
 
         self.print_log()
@@ -336,7 +369,7 @@ class HyperNotify:
 
 class HyperListenerStartNotify(HyperNotify):
     def __init__(self, time_now: int, notify_type: str,
-                 connection: Union[WebsocketConnection, HTTPConnection] = None):
+                 connection: Optional[Union[WebsocketConnection, HTTPConnection]] = None):
         super().__init__(time_now, notify_type)
         self.connection = connection
 

{hyper_bot-0.82.2 → hyper_bot-0.82.4/src}/hyperot/hyperogger.py

@@ -6,6 +6,14 @@ import sys
 from .utils.screens import color_txt, rgb, NerdICONs
 from . import configurator
 
+__all__ = [
+    "config",
+    "nf_icons",
+    "Levels",
+    "levels",
+    "Logger",
+]
+
 
 config = configurator.BotConfig.get("hyper-bot")
 nf_icons = NerdICONs(config.log_use_nf)
@@ -53,9 +61,6 @@ class Logger:
         c = cls()
         c.set_level(level)
         cls.running_loggers[key] = c
-        # print(key)
-        # print(c)
-        # print(cls.running_loggers)
         return c
 
     @classmethod

{hyper_bot-0.82.2 → hyper_bot-0.82.4/src}/hyperot/network.py

@@ -1,5 +1,3 @@
-import asyncio
-import websocket
 import httpx
 import queue
 import flask
@@ -7,41 +5,50 @@ import traceback
 import json
 import logging
 import threading
+from websockets.asyncio.client import connect as wsc
+from websockets.asyncio.client import ClientConnection
+from typing import Optional, Dict
 
 
-async def httpx_get(url: str, headers: dict = None) -> httpx.Response:
+async def httpx_get(url: str, headers: Optional[Dict] = None) -> httpx.Response:
     async with httpx.AsyncClient(headers=headers) as client:
         return await client.get(url)
 
-async def httpx_post(url: str, json: dict, headers: dict = None) -> httpx.Response:
+async def httpx_post(url: str, json: Optional[dict] = None, data: Optional[str] = None, headers: Optional[Dict] = None) -> httpx.Response:
     async with httpx.AsyncClient(headers=headers) as client:
-        return await client.post(url, json=json)
+        return await client.post(url, json=json, data=data)
 
 
 class WebsocketConnection:
-    def __init__(self, url: str, auth: str = None):
-        self.ws = websocket.WebSocket()
+    def __init__(self, url: str, auth: str = ""):
+        self.ws: Optional[ClientConnection] = None
         self.url = url
         self.auth = auth
 
-    def connect(self) -> None:
+    async def connect(self) -> None:
         if self.auth:
-            self.ws.connect(self.url, header={"Authorization": "Bearer " + self.auth})
+            self.ws = await wsc(self.url, header={"Authorization": "Bearer " + self.auth})
         else:
-            self.ws.connect(self.url)
+            self.ws = await wsc(self.url)
 
     async def send(self, message: str) -> None:
-        await asyncio.to_thread(lambda: self.ws.send(message))
+        if self.ws is None:
+            raise RuntimeError("没有建立连接")
+        await self.ws.send(message)
 
     async def close(self) -> None:
-        await asyncio.to_thread(lambda: self.ws.close())
+        if self.ws is None:
+            raise RuntimeError("没有建立连接")
+        await self.ws.close()
 
     async def recv(self) -> dict:
-        return json.loads(await asyncio.to_thread(self.ws.recv))
+        if self.ws is None:
+            raise RuntimeError("没有建立连接")
+        return json.loads(await self.ws.recv())
 
 
 class HTTPConnection:
-    def __init__(self, url: str, listener_url: str, listener_endpoint: str = "/", auth: str = None):
+    def __init__(self, url: str, listener_url: str, listener_endpoint: str = "/", auth: str = ""):
         self.url = url
         listener_url = listener_url.replace("http://", "")
         listener_url = listener_url.replace("https://", "")