hyper-bot 0.72__tar.gz → 0.741__tar.gz

{hyper-bot-0.72 → hyper-bot-0.741}/Hyper/Network.py

@@ -41,7 +41,9 @@ class HTTPConnection:
         logging.getLogger("werkzeug").setLevel(logging.ERROR)
         self.reports = queue.Queue()
 
-    def connect(self) -> None:
+        self.listener_started = False
+
+    def __start_listener(self) -> None:
         @self.app.route("/", methods=["POST"])
         def listener():
             self.reports.put(flask.request.json)
@@ -50,6 +52,11 @@ class HTTPConnection:
             # self.app.run(host=self.listener_url, port=self.port)
 
         threading.Thread(target=lambda: self.app.run(host=self.listener_url, port=self.port)).start()
+        self.listener_started = True
+
+    def connect(self) -> None:
+        if not self.listener_started:
+            self.__start_listener()
         httpx.post(self.url)
         traceback.print_exc()
 

{hyper-bot-0.72 → hyper-bot-0.741}/Hyper/Segments.py

@@ -21,7 +21,10 @@ def segment_builder(sg_type: str, summary_tmp: str = None):
 
             if len(kwargs) > 0:
                 for i in kwargs:
-                    arg[i] = kwargs[i]
+                    try:
+                        arg[i] = anns[i](kwargs[i])
+                    except TypeError:
+                        arg[i] = kwargs[i]
             new_arg = arg.copy()
 
             if len(anns) > len(arg):
@@ -30,7 +33,10 @@ def segment_builder(sg_type: str, summary_tmp: str = None):
                         if i not in var.keys():
                             new_arg[i] = None
                             continue
-                        new_arg[i] = anns[i](var[i])
+                        try:
+                            new_arg[i] = anns[i](var[i])
+                        except TypeError:
+                            new_arg[i] = var[i]
 
             for i in new_arg:
                 setattr(self, i, new_arg[i])
@@ -41,7 +47,6 @@ def segment_builder(sg_type: str, summary_tmp: str = None):
             base = {"type": sg_type, "data": {}}
             for i in anns:
                 base["data"][i] = getattr(self, i)
-
             return base
 
         cls.to_json = to_json

hyper-bot-0.741/Hyper/WordSafety.py

@@ -0,0 +1,40 @@
+import logging
+from jieba import lcut, set_dictionary
+
+from Hyper import Logic
+
+logging.getLogger("jieba").setLevel(logging.ERROR)
+try:
+    set_dictionary("./assets/jieba.dict.txt.small")
+except OSError:
+    pass
+
+
+class Result:
+    def __init__(self, message: str, result: bool):
+        self.message = message
+        self.result = result
+
+
+with open("assets/dict.txt", "r", encoding="utf-8") as f:
+    words: list[dict[str, str]] = []
+    word = f.read()
+    word = word.split("\n")
+    for i in word:
+        temp = i.split("	")
+        words.append({"word": temp[0], "type": temp[1]})
+
+    del i
+
+
+@Logic.Cacher().cache
+def check(text: str) -> Result:
+    texts = lcut(text)
+    for j in words:
+        if j["word"] in texts:
+            ret = Result(f"检测到类型为{j['type']}的敏感用词", False)
+            del j
+            return ret
+    del j
+    ret = Result("未检出敏感词", True)
+    return ret

{hyper-bot-0.72 → hyper-bot-0.741}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hyper-bot
-Version: 0.72
+Version: 0.741
 Summary: 稳定高效、易于开发的QQ Bot框架
 Home-page: https://github.com/HarcicYang/HypeR_Bot
 Author: Harcic

{hyper-bot-0.72 → hyper-bot-0.741}/hyper_bot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hyper-bot
-Version: 0.72
+Version: 0.741
 Summary: 稳定高效、易于开发的QQ Bot框架
 Home-page: https://github.com/HarcicYang/HypeR_Bot
 Author: Harcic

{hyper-bot-0.72 → hyper-bot-0.741}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup
 
 setup(
     name="hyper-bot",
-    version="0.72",
+    version="0.741",
     description="稳定高效、易于开发的QQ Bot框架",
     author="Harcic",
     author_email="harcic@outlook.com",

hyper-bot-0.72/Hyper/WordSafety.py

@@ -1,68 +0,0 @@
-import jieba
-import logging
-import asyncio
-
-from Hyper import Logic
-
-logging.getLogger("jieba").setLevel(logging.ERROR)
-
-
-class Result:
-    def __init__(self, message: str, result: bool):
-        self.message = message
-        self.result = result
-
-
-class AsyncChecker:
-    def __init__(self, hot_words: list[dict[str, str]]):
-        self.hot_words = hot_words
-
-    async def check(self, text: list) -> Result:
-        for j in self.hot_words:
-            if j["word"] in text:
-                ret = Result(f"检测到类型为{j['type']}的敏感用词", False)
-                return ret
-
-        ret = Result("未检出敏感词", True)
-        return ret
-
-
-with open("assets/dict.txt", "r", encoding="utf-8") as f:
-    words: list[dict[str, str]] = []
-    word = f.read()
-    word = word.split("\n")
-    inner_words: list[AsyncChecker] = []
-    tmp: list[dict[str, str]] = []
-    for i in word:
-        temp = i.split("	")
-        words.append({"word": temp[0], "type": temp[1]})
-        tmp.append({"word": temp[0], "type": temp[1]})
-        if len(tmp) == 50:
-            inner_words.append(AsyncChecker(tmp))
-            tmp = []
-
-
-@Logic.Cacher().cache
-def check(text: str) -> Result:
-    texts = jieba.lcut(text)
-    for j in words:
-        if j["word"] in texts:
-            ret = Result(f"检测到类型为{j['type']}的敏感用词", False)
-            return ret
-
-    ret = Result("未检出敏感词", True)
-    return ret
-
-
-@Logic.Cacher().cache
-async def check_async(text: str) -> Result:
-    texts = jieba.lcut(text)
-    __tasks: list[asyncio.Task] = []
-    for j in inner_words:
-        __tasks.append(asyncio.create_task(j.check(texts)))
-    await asyncio.gather(*__tasks)
-    for j in __tasks:
-        if not j.result().result:
-            return j.result()
-    ret = Result("未检出敏感词", True)
-    return ret