Merge pull request #147 from Starry-OvO/develop

Update 3.7.3

aiotieba/__version__.py

@@ -1 +1 @@
-__version__ = "3.7.2"
+__version__ = "3.7.3"

aiotieba/api/get_comments/_classdef.py

@@ -84,6 +84,9 @@ def _frags():
                     self._tiebapluses.append(frag)
                     self._texts.append(frag)
                     yield frag
+                # outdated tiebaplus
+                elif _type == 34:
+                    continue
                 else:
                     from ...logging import get_logger as LOG
 
@@ -1270,6 +1273,9 @@ def _frags():
                     self._tiebapluses.append(frag)
                     self._texts.append(frag)
                     yield frag
+                # outdated tiebaplus
+                elif _type == 34:
+                    continue
                 else:
                     from ...logging import get_logger as LOG
 

aiotieba/api/get_images/__init__.py

@@ -1 +1 @@
-from ._api import null_ret_factory, parse_body, request
+from ._api import null_ret_factory, parse_body, request, request_bytes

aiotieba/api/get_images/_api.py

@@ -35,10 +35,15 @@ def parse_body(body: bytes) -> "np.ndarray":
     return image
 
 
-async def request(http_core: HttpCore, url: yarl.URL) -> "np.ndarray":
+async def request_bytes(http_core: HttpCore, url: yarl.URL) -> bytes:
     request = http_core.pack_web_get_request(url, [])
 
     __log__ = "url={url}"  # noqa: F841
 
-    body = await http_core.net_core.send_request(request, read_bufsize=512 * 1024, headers_checker=headers_checker)
+    body = await http_core.net_core.send_request(request, read_bufsize=256 * 1024, headers_checker=headers_checker)
+    return body
+
+
+async def request(http_core: HttpCore, url: yarl.URL) -> "np.ndarray":
+    body = await request_bytes(http_core, url)
     return parse_body(body)

aiotieba/api/get_posts/_classdef.py

@@ -328,6 +328,9 @@ def _frags():
                     self._tiebapluses.append(frag)
                     self._texts.append(frag)
                     yield frag
+                # outdated tiebaplus
+                elif _type == 34:
+                    continue
                 else:
                     from ...logging import get_logger as LOG
 
@@ -499,6 +502,9 @@ def _frags():
                     self._tiebapluses.append(frag)
                     self._texts.append(frag)
                     yield frag
+                # outdated tiebaplus
+                elif _type == 34:
+                    continue
                 else:
                     from ...logging import get_logger as LOG
 
@@ -1644,6 +1650,9 @@ def _frags():
                     self._tiebapluses.append(frag)
                     self._texts.append(frag)
                     yield frag
+                # outdated tiebaplus
+                elif _type == 34:
+                    continue
                 else:
                     from ...logging import get_logger as LOG
 

aiotieba/api/get_threads/_classdef.py

@@ -218,6 +218,9 @@ def _frags():
                     self._tiebapluses.append(frag)
                     self._texts.append(frag)
                     yield frag
+                # outdated tiebaplus
+                elif _type == 34:
+                    continue
                 else:
                     from ...logging import get_logger as LOG
 
@@ -870,6 +873,9 @@ def _frags():
                     self._tiebapluses.append(frag)
                     self._texts.append(frag)
                     yield frag
+                # outdated tiebaplus
+                elif _type == 34:
+                    continue
                 else:
                     from ...logging import get_logger as LOG
 

aiotieba/client.py

@@ -924,6 +924,20 @@ async def get_ats(self, pn: int = 1) -> get_ats.Ats:
 
         return await get_ats.request(self._http_core, pn)
 
+    @handle_exception(bytes)
+    async def get_image_bytes(self, img_url: str) -> bytes:
+        """
+        从链接获取静态图像的原始字节流
+
+        Args:
+            img_url (str): 图像链接
+
+        Returns:
+            bytes: 未解码的原始字节流
+        """
+
+        return await get_images.request_bytes(self._http_core, yarl.URL(img_url))
+
     @handle_exception(get_images.null_ret_factory)
     async def get_image(self, img_url: str) -> "np.ndarray":
         """

aiotieba/const.py

@@ -1,4 +1,4 @@
-MAIN_VERSION = "12.46.3.0"
+MAIN_VERSION = "12.49.1.0"
 POST_VERSION = "12.35.1.0"
 
 APP_SECURE_SCHEME = "https"

pyproject.toml

@@ -54,10 +54,10 @@ speedup = [
   "pysimdjson<6,>=3.1.1;python_version=='3.9'",
   "pysimdjson<6,>=4.0.3;python_version=='3.10'",
   "pysimdjson<6,>=5.0.1;python_version>='3.11'",
-  "uvloop<0.18,>=0.14.0;python_version=='3.8' and sys_platform!='win32'",
-  "uvloop<0.18,>=0.15.0;python_version=='3.9' and sys_platform!='win32'",
-  "uvloop<0.18,>=0.16.0;python_version=='3.10' and sys_platform!='win32'",
-  "uvloop<0.18,>=0.17.0;python_version>='3.11' and sys_platform!='win32'",
+  "uvloop<0.20,>=0.14.0;python_version=='3.8' and sys_platform!='win32'",
+  "uvloop<0.20,>=0.15.0;python_version=='3.9' and sys_platform!='win32'",
+  "uvloop<0.20,>=0.16.0;python_version=='3.10' and sys_platform!='win32'",
+  "uvloop<0.20,>=0.17.0;python_version>='3.11' and sys_platform!='win32'",
 ]
 
 [tool.setuptools.packages.find]

tests/test_get_comments.py

@@ -89,14 +89,6 @@ async def test_Comments(client: tb.Client):
     assert frag.desc != ''
     assert frag.id == 'image_emoticon3'
 
-    # FragTiebaplus
-    frag = post.contents.tiebapluses[0]
-    assert frag.text != ''
-    assert frag.url != ''
-    frag = post.contents.tiebapluses[1]
-    assert frag.text != ''
-    assert frag.url != ''
-
     ##### Comment #####
     comment = comments[0]