satori-python-core 0.16.4__tar.gz → 0.16.6__tar.gz

{satori_python_core-0.16.4 → satori_python_core-0.16.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-core
-Version: 0.16.4
+Version: 0.16.6
 Summary: Satori Protocol SDK for python, specify common part
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
@@ -71,10 +71,17 @@ pip install satori-python-server
 
 ### 官方适配器
 
-| 适配器        | 安装                                           |
-|------------|----------------------------------------------|
-| Satori     | `pip install satori-python-adapter-satori`   |
-| OneBot V11 | `pip install satori-python-adapter-onebot11` |
+| 适配器        | 安装                                           | 路径                                                                 |
+|------------|----------------------------------------------|--------------------------------------------------------------------|
+| Satori     | `pip install satori-python-adapter-satori`   | satori.adapters.satori                                             |
+| OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse |
+| Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                            |
+
+### 社区适配器
+
+| 适配器               | 安装                    | 路径           |
+|-------------------|-----------------------|--------------|
+| nekobox(Lagrange) | `pip install nekobox` | nekobox.main |
 
 ## 使用
 

{satori_python_core-0.16.4 → satori_python_core-0.16.6}/README.md

@@ -47,10 +47,17 @@ pip install satori-python-server
 
 ### 官方适配器
 
-| 适配器        | 安装                                           |
-|------------|----------------------------------------------|
-| Satori     | `pip install satori-python-adapter-satori`   |
-| OneBot V11 | `pip install satori-python-adapter-onebot11` |
+| 适配器        | 安装                                           | 路径                                                                 |
+|------------|----------------------------------------------|--------------------------------------------------------------------|
+| Satori     | `pip install satori-python-adapter-satori`   | satori.adapters.satori                                             |
+| OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse |
+| Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                            |
+
+### 社区适配器
+
+| 适配器               | 安装                    | 路径           |
+|-------------------|-----------------------|--------------|
+| nekobox(Lagrange) | `pip install nekobox` | nekobox.main |
 
 ## 使用
 

{satori_python_core-0.16.4 → satori_python_core-0.16.6}/pyproject.toml

@@ -23,7 +23,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.16.4"
+version = "0.16.6"
 
 [project.license]
 text = "MIT"
@@ -48,6 +48,7 @@ dev = [
     "fix-future-annotations>=0.5.0",
     "mina-build<0.6,>=0.5.1",
     "pdm-mina>=0.3.2",
+    "nonechat<0.7.0,>=0.6.0",
 ]
 
 [tool.pdm.build]

{satori_python_core-0.16.4 → satori_python_core-0.16.6}/src/satori/__init__.py

@@ -41,4 +41,4 @@ from .model import Role as Role
 from .model import Upload as Upload
 from .model import User as User
 
-__version__ = "0.16.4"
+__version__ = "0.16.6"

{satori_python_core-0.16.4 → satori_python_core-0.16.6}/src/satori/element.py

@@ -180,6 +180,7 @@ class Resource(Element):
         raw: Optional[Union[bytes, BytesIO]] = None,
         mime: Optional[str] = None,
         name: Optional[str] = None,
+        duration: Optional[float] = None,
         poster: Optional[str] = None,
         extra: Optional[dict[str, Any]] = None,
         cache: Optional[bool] = None,
@@ -198,6 +199,8 @@ class Resource(Element):
             raise ValueError(f"{cls} need at least one of url, path and raw")
         if name is not None:
             data["title"] = name
+        if duration is not None and cls is Audio:
+            data["duration"] = duration
         if poster is not None and cls in (Video, Audio, File):
             data["poster"] = poster
         if cache is not None:
@@ -231,7 +234,7 @@ class Image(Resource):
 class Audio(Resource):
     """<audio> 元素用于表示语音。"""
 
-    duration: Optional[int] = None
+    duration: Optional[float] = None
     poster: Optional[str] = None
 
     __names__ = ("src", "title", "duration", "poster")
@@ -243,7 +246,7 @@ class Video(Resource):
 
     width: Optional[int] = None
     height: Optional[int] = None
-    duration: Optional[int] = None
+    duration: Optional[float] = None
     poster: Optional[str] = None
 
     __names__ = ("src", "title", "width", "height", "duration", "poster")

{satori_python_core-0.16.4 → satori_python_core-0.16.6}/src/satori/parser.py

@@ -358,9 +358,9 @@ def parse(src: str, context: Optional[dict] = None):
     def parse_content(source: str, _start: bool, _end: bool):
         source = unescape(source)
         if _start:
-            source = re.sub(r"^\s*\n\s*", "", source, re.MULTILINE)
+            source = re.sub(r"^\s*\n\s*", "", source, flags=re.MULTILINE)
         if _end:
-            source = re.sub(r"\s*\n\s*$", "", source, re.MULTILINE)
+            source = re.sub(r"\s*\n\s*$", "", source, flags=re.MULTILINE)
         push_text(source)
 
     tag_pat = tag_pat2 if context is not None else tag_pat1