reyfetch 1.0.40__py3-none-any.whl → 1.0.42__py3-none-any.whl

reyfetch/__init__.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-@Time    : 2023-02-19 18:59:26
+@Time    : 2023-02-19
 @Author  : Rey
 @Contact : reyxbo@163.com
 @Explain : Web data fetch method set.

reyfetch/rali.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-@Time    : 2025-07-17 22:32:37
+@Time    : 2025-07-17
 @Author  : Rey
 @Contact : reyxbo@163.com
 @Explain : Ali Web fetch methods.
@@ -12,7 +12,7 @@
 from typing import Any, TypedDict, NotRequired, Literal, overload, NoReturn
 from collections.abc import Hashable, Iterable, Generator
 from json import loads as json_loads
-from reydb import rorm, Database
+from reydb import rorm, DatabaseEngine
 from reykit.rbase import throw
 from reykit.rnet import request as reykit_request
 from reykit.rtime import now
@@ -98,7 +98,7 @@ class FetchRequestAliQwen(FetchRequestAli, FetchRequestWithDatabase):
     def __init__(
         self,
         key: str,
-        db: Database | None = None,
+        db_engine: DatabaseEngine | None = None,
         system: str | None = None,
         rand: float = 0.5,
         history_max_char: int | None = None,
@@ -110,7 +110,7 @@ class FetchRequestAliQwen(FetchRequestAli, FetchRequestWithDatabase):
         Parameters
         ----------
         key : API key.
-        db : `Database` instance, insert request record to table.
+        db_engine: Database engine, insert request record to table.
         system : AI system description.
         rand : AI reply randomness, value range is `[0,1]`.
         history_max_char : History messages record maximum character count.
@@ -124,7 +124,7 @@ class FetchRequestAliQwen(FetchRequestAli, FetchRequestWithDatabase):
         # Build.
         self.key = key
         self.auth = 'Bearer ' + key
-        self.db = db
+        self.db_engine = db_engine
         self.system = system
         self.rand = rand
         self.history_max_char = history_max_char
@@ -135,7 +135,7 @@ class FetchRequestAliQwen(FetchRequestAli, FetchRequestWithDatabase):
         self.db_record = FetchRequestDatabaseRecord(self, 'ali_qwen')
 
         ## Build Database.
-        if self.db is not None:
+        if self.db_engine is not None:
             self.build_db()
 
 
@@ -831,11 +831,11 @@ class FetchRequestAliQwen(FetchRequestAli, FetchRequestWithDatabase):
         """
 
         # Check.
-        if self.db is None:
-            throw(ValueError, self.db)
+        if self.db_engine is None:
+            throw(ValueError, self.db_engine)
 
         # Parameter.
-        database = self.db.database
+        database = self.db_engine.database
 
         ## Table.
         tables = [DatabaseORMTableAliQwen]
@@ -957,7 +957,7 @@ class FetchRequestAliQwen(FetchRequestAli, FetchRequestWithDatabase):
         ]
 
         # Build.
-        self.db.build.build(tables=tables, views_stats=views_stats, skip=True)
+        self.db_engine.build.build(tables=tables, views_stats=views_stats, skip=True)
 
 
     def insert_db(self, record: ChatRecord) -> None:

reyfetch/rall.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-@Time    : 2022-12-08 13:11:09
+@Time    : 2022-12-08
 @Author  : Rey
 @Contact : reyxbo@163.com
 @Explain : All methods.

reyfetch/rbaidu.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-@Time    : 2024-01-11 21:56:56
+@Time    : 2024-01-11
 @Author  : Rey
 @Contact : reyxbo@163.com
 @Explain : Baidu Web fetch methods.
@@ -11,7 +11,7 @@
 
 from typing import TypedDict
 from enum import StrEnum
-from reydb import rorm, Database
+from reydb import rorm, DatabaseEngine
 from reykit.rbase import throw
 from reykit.rnet import request as reykit_request
 from reykit.ros import get_md5
@@ -119,7 +119,7 @@ class FetchRequestBaiduTranslate(FetchRequestBaidu, FetchRequestWithDatabase):
         self,
         appid: str,
         appkey: str,
-        db: Database | None = None,
+        db_engine: DatabaseEngine | None = None,
         max_len: int = 6000
     ) -> None:
         """
@@ -136,14 +136,14 @@ class FetchRequestBaiduTranslate(FetchRequestBaidu, FetchRequestWithDatabase):
         # Build.
         self.appid = appid
         self.appkey = appkey
-        self.db = db
+        self.db_engine = db_engine
         self.max_len = max_len
 
         # Database.
         self.db_record = FetchRequestDatabaseRecord(self, 'baidu_trans')
 
         ## Build Database.
-        if self.db is not None:
+        if self.db_engine is not None:
             self.build_db()
 
 
@@ -328,11 +328,11 @@ class FetchRequestBaiduTranslate(FetchRequestBaidu, FetchRequestWithDatabase):
         """
 
         # Check.
-        if self.db is None:
-            throw(ValueError, self.db)
+        if self.db_engine is None:
+            throw(ValueError, self.db_engine)
 
         # Parameter.
-        database = self.db.database
+        database = self.db_engine.database
 
         ## Table.
         tables = [DatabaseORMTableBaiduTrans]
@@ -422,7 +422,7 @@ class FetchRequestBaiduTranslate(FetchRequestBaidu, FetchRequestWithDatabase):
         ]
 
         # Build.
-        self.db.build.build(tables=tables, views_stats=views_stats, skip=True)
+        self.db_engine.build.build(tables=tables, views_stats=views_stats, skip=True)
 
 
     __call__ = trans

reyfetch/rbase.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-@Time    : 2023-12-29 23:14:18
+@Time    : 2023-12-29
 @Author  : Rey
 @Contact : reyxbo@163.com
 @Explain : Base methods.
@@ -105,7 +105,7 @@ class FetchBrowser(FetchBase):
 
         # Parameter.
         params = params or {}
-        url = join_url(url, params)
+        url = join_url(url, **params)
 
         # Request.
         self.driver.get(url)
@@ -165,7 +165,7 @@ class FetchRequestWithDatabase(FetchRequest):
     Can create database used `self.build_db` method.
     """
 
-    db: Database | None
+    db_engine: Database | None
     build_db: MethodType
 
 
@@ -207,7 +207,7 @@ class FetchRequestDatabaseRecord(FetchRequest):
         """
 
         # Check.
-        if self.api.db is None:
+        if self.api.db_engine is None:
             return
 
         # Parameter.
@@ -224,7 +224,7 @@ class FetchRequestDatabaseRecord(FetchRequest):
         """
 
         # Check.
-        if self.api.db is None:
+        if self.api.db_engine is None:
             return
 
         # Parameter.
@@ -232,7 +232,7 @@ class FetchRequestDatabaseRecord(FetchRequest):
         record = self.data.setdefault(thread_id, {})
 
         # Insert.
-        self.api.db.execute.insert(self.table, record)
+        self.api.db_engine.execute.insert(self.table, record)
 
         # Delete.
         del self.data[thread_id]

reyfetch/rdouban.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-@Time    : 2025-08-25 15:37:50
+@Time    : 2025-08-25
 @Author  : Rey
 @Contact : reyxbo@163.com
 @Explain : Douban Web fetch methods.
@@ -11,7 +11,7 @@
 
 from typing import TypedDict
 from bs4 import BeautifulSoup
-from reydb import rorm, Database
+from reydb import rorm, DatabaseEngine
 from reykit.rbase import throw
 from reykit.rnet import request
 from reykit.rre import search, findall, sub
@@ -111,22 +111,22 @@ class FetchCrawlDouban(FetchCrawl):
     """
 
 
-    def __init__(self, db: Database | None = None) -> None:
+    def __init__(self, db_engine: DatabaseEngine | None = None) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        db : `Database` instance.
+        db_engine : Database engine.
             - `None`: Not use database.
             - `Database`: Automatic record to database.
         """
 
         # Build.
-        self.db = db
+        self.db_engine = db_engine
 
         # Build Database.
-        if self.db is not None:
+        if self.db_engine is not None:
             self.build_db()
 
 
@@ -242,7 +242,7 @@ class FetchCrawlDouban(FetchCrawl):
         table = list(table_dict.values())
 
         # Database.
-        if self.db is not None:
+        if self.db_engine is not None:
             update_fields = (
                 'id',
                 'type',
@@ -255,7 +255,7 @@ class FetchCrawlDouban(FetchCrawl):
                 'episode_now',
                 'year'
             )
-            self.db.execute.insert(
+            self.db_engine.execute.insert(
                 'douban_media',
                 table,
                 update_fields
@@ -424,10 +424,10 @@ class FetchCrawlDouban(FetchCrawl):
             infos['video'] = url.replace('#content', '', 1)
 
         # Database.
-        if self.db is not None:
+        if self.db_engine is not None:
             data = {'id': id_}
             data.update(infos)
-            self.db.execute.insert(
+            self.db_engine.execute.insert(
                 'douban_media',
                 data,
                 'update'
@@ -470,11 +470,11 @@ class FetchCrawlDouban(FetchCrawl):
         """
 
         # Check.
-        if self.db is None:
-            throw(ValueError, self.db)
+        if self.db_engine is None:
+            throw(ValueError, self.db_engine)
 
         # Parameter.
-        database = self.db.database
+        database = self.db_engine.database
 
         ## Table.
         tables = [DatabaseORMTableDoubanMedia]
@@ -556,4 +556,4 @@ class FetchCrawlDouban(FetchCrawl):
         ]
 
         # Build.
-        self.db.build.build(tables=tables, views_stats=views_stats, skip=True)
+        self.db_engine.build.build(tables=tables, views_stats=views_stats, skip=True)

reyfetch/rgeneral.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-@Time    : 2024-01-10 21:57:08
+@Time    : 2024-01-10
 @Author  : Rey
 @Contact : reyxbo@163.com
 @Explain : General methods.

reyfetch/rsina.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-@Time    : 2024-01-22 14:06:05
+@Time    : 2024-01-22
 @Author  : Rey
 @Contact : reyxbo@163.com
 @Explain : Sina Web fetch methods.

reyfetch/rtoutiao.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-@Time    : 2024-01-22 14:06:05
+@Time    : 2024-01-22
 @Author  : Rey
 @Contact : reyxbo@163.com
 @Explain : Toutiao Web fetch methods.

reyfetch/rweibo.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-@Time    : 2024-01-22 14:06:05
+@Time    : 2024-01-22
 @Author  : Rey
 @Contact : reyxbo@163.com
 @Explain : Weibo Web fetch methods.
@@ -67,7 +67,7 @@ def crawl_weibo_hot_search() -> list[dict[Literal['rank', 'time', 'title', 'type
             'hot': info['num'],
             'url': join_url(
                 'https://s.weibo.com/weibo',
-                {'q': '#%s#' % info['word']}
+                q=f'#{info['word']}#'
             )
         }
         for info in table

{reyfetch-1.0.40.dist-info → reyfetch-1.0.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reyfetch
-Version: 1.0.40
+Version: 1.0.42
 Summary: Web data fetch method set.
 Project-URL: homepage, https://github.com/reyxbo/reyfetch/
 Author-email: Rey <reyxbo@163.com>

reyfetch-1.0.42.dist-info/RECORD

@@ -0,0 +1,14 @@
+reyfetch/__init__.py,sha256=RA8i9mePfgDrav97DX2JDj3riBx9Im_jWzfbUFz7sc8,475
+reyfetch/rali.py,sha256=gaeKhAHkVP2pCVKnbH_dx6gEDvTeSOy4QqF0X6kYUMI,33155
+reyfetch/rall.py,sha256=3HckqK8UoRfxSu2yNCEYjX6MByxVqv0qRmthBzQFgHU,341
+reyfetch/rbaidu.py,sha256=Z-qYl_KzdNEipVJYfm_wgCZHWHIBaHp2z3hkNp--Xso,13501
+reyfetch/rbase.py,sha256=iD4_Ty6qjdZREJazvtAqekHU5HAxKKu35K9H3y5Dkt8,4817
+reyfetch/rdouban.py,sha256=mc5tNdGwBGNNVlvuWC0OVtGGaJPBGfUcPouQvpuWNy8,19027
+reyfetch/rgeneral.py,sha256=DuXdyrPGj2lVhzdxzCwbI0WvzMZiB8KLHmflQ4cqHgg,3788
+reyfetch/rsina.py,sha256=V1uv-iXyB3b6oDyR_pQYOaHUKjrplEZe2Mm9rnYmJUw,6880
+reyfetch/rtoutiao.py,sha256=KwzmFQcRU5_tM4juhdMvUhpaGL4cuIo2pE5BwuXjOIk,1662
+reyfetch/rweibo.py,sha256=RiedsF5zGo6QBrjhMdo9NqYPjwbHJ8FJ7zJJ_5ZPrXk,2506
+reyfetch-1.0.42.dist-info/METADATA,sha256=tMxOGTTBSuRt08Vn2bThU0GJ1IOj2gnUn-8_leJIv-s,1610
+reyfetch-1.0.42.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reyfetch-1.0.42.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reyfetch-1.0.42.dist-info/RECORD,,

reyfetch-1.0.40.dist-info/RECORD

@@ -1,14 +0,0 @@
-reyfetch/__init__.py,sha256=gDkQmFLZGToSqb1HVfvGxvc9t3mt8slg7_MVc44llns,484
-reyfetch/rali.py,sha256=J5quMAi85SfFy6CoRh-seyacvUw_16Z_gs_3t-RJY58,33094
-reyfetch/rall.py,sha256=86TMZiNsv-UinZ2L3_m3ugTHekUWnfVlWMedte0MOwQ,350
-reyfetch/rbaidu.py,sha256=Uskx2vhL_06XmLJqRf03_vSISlXO2MJ0VfGjxYCOIHg,13442
-reyfetch/rbase.py,sha256=WandpXTAH_CGYCeNyUsWLm5-qIxf7vKnom80DIGVumQ,4796
-reyfetch/rdouban.py,sha256=_gmhpSbkLcpEcrNz1qokL4o8X5-Ppy3eEdhS8H-vr0Y,18937
-reyfetch/rgeneral.py,sha256=s270rtlVv1owkGF57Tjs8Oc5bJRD_XtWISpKlEJ7mbE,3797
-reyfetch/rsina.py,sha256=WONT6NN67seYjlvXZ39RbibticdDAuauGk6SAvtdEq8,6889
-reyfetch/rtoutiao.py,sha256=zLPnf2_XSC0d2RZgtMVoVyWpA2UDGNXYpRjYi3DGabI,1671
-reyfetch/rweibo.py,sha256=T58q6wOv0p7j6WBH4we5k9x8IgFhQN__wqsqTHYMbmU,2522
-reyfetch-1.0.40.dist-info/METADATA,sha256=JRce82d6RWeQi1t9kBegphbiy-M_-OHG2muL78KQM4Y,1610
-reyfetch-1.0.40.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reyfetch-1.0.40.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reyfetch-1.0.40.dist-info/RECORD,,