mdbq 4.0.75__py3-none-any.whl → 4.0.77__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '4.0.75'
+VERSION = '4.0.77'

mdbq/log/mylogger.py

@@ -200,6 +200,17 @@ class MyLogger:
                     if not extra_data and hasattr(record, 'extra'):
                         extra_data = getattr(record, 'extra', None)
                     if extra_data:
+                        # 优先显示func信息
+                        func_name = extra_data.get('func', '')
+                        module_name = extra_data.get('model', '')
+                        line_number = extra_data.get('lines', '')
+                        if func_name:
+                            msg += f" | Function: {func_name}"
+                        if module_name:
+                            msg += f" | Module: {module_name}"
+                        if line_number:
+                            msg += f" | Line: {line_number}"
+                        
                         context_data = extra_data.get('context_data', {})
                         if context_data:
                             msg += f" | Context: {context_data}"
@@ -207,7 +218,7 @@ class MyLogger:
                         if metrics:
                             msg += f" | Metrics: {metrics}"
                         extra = {k: v for k, v in extra_data.items()
-                                 if k not in ('context_data', '性能指标')}
+                                 if k not in ('context_data', '性能指标', 'func', 'model', 'lines')}
                         if extra:
                             msg += f" | Extra: {extra}"
                     return msg
@@ -413,6 +424,23 @@ class MyLogger:
         if extra:
             log_extra.update(extra)
 
+        # 获取当前调用func
+        try:
+            frame = inspect.currentframe()
+            # 跳过logger内部函数，找到真正的调用者
+            caller_frame = frame.f_back
+            skip_functions = ['_sync_log', 'log', 'debug', 'info', 'warning', 'error', 'critical', 'wrapper']
+            while caller_frame and caller_frame.f_code.co_name in skip_functions:
+                caller_frame = caller_frame.f_back
+            if caller_frame:
+                log_extra['func'] = caller_frame.f_code.co_name
+                log_extra['model'] = caller_frame.f_globals.get('__name__', '')
+                log_extra['lines'] = caller_frame.f_lineno
+            del frame
+        except Exception:
+            # 如果获取函数信息失败，不影响正常日志记录
+            pass
+
         # 添加上下文信息
         if hasattr(self._context, 'data') and self._context.data:
             log_extra['context_data'] = self._context.data.copy()

mdbq/selenium/get_driver.py

@@ -2,7 +2,11 @@
 import os
 import platform
 import getpass
-from selenium import webdriver
+from selenium import webdriver as selenium_webdriver
+try:
+    from seleniumwire import webdriver as wire_webdriver
+except ImportError:
+    wire_webdriver = None
 from selenium.webdriver.chrome.service import Service
 import re
 import socket
@@ -24,7 +28,7 @@ class GetDriver:
     Selenium ChromeDriver 管理器，支持多平台、代理、无头模式、下载目录、User-Agent等高级配置。
     支持上下文管理器（with语法），自动资源清理。
     """
-    def __init__(self, url=None, headless=False, proxy=None, user_agent=None, download_dir=None, chrome_path=None, chromedriver_path=None, maximize_window=True):
+    def __init__(self, url=None, headless=False, proxy=None, user_agent=None, download_dir=None, chrome_path=None, chromedriver_path=None, maximize_window=True, is_selenium_wire=False):
         """
         初始化GetDriver
         :param url: 允许的安全站点（用于insecure origin as secure）
@@ -52,6 +56,7 @@ class GetDriver:
             import random
             self.user_agent = user_agents[random.randint(0, len(user_agents) - 1)]
         self.maximize_window = maximize_window
+        self.is_selenium_wire = is_selenium_wire
 
     def check_proxy(self):
         """
@@ -173,7 +178,10 @@ class GetDriver:
         try:
             option.binary_location = chrome_path
             service = Service(chromedriver_path)
-            driver = webdriver.Chrome(service=service, options=option)
+            if self.is_selenium_wire and wire_webdriver:
+                driver = wire_webdriver.Chrome(service=service, options=option)
+            else:
+                driver = selenium_webdriver.Chrome(service=service, options=option)
             if self.maximize_window:
                 driver.maximize_window()
             
@@ -222,7 +230,10 @@ class GetDriver:
         if not self.check_proxy():
             raise GetDriverException(f"代理不可用或格式错误: {self.proxy}")
         
-        option = webdriver.ChromeOptions()  # 浏览器启动选项
+        if self.is_selenium_wire and wire_webdriver:
+            option = wire_webdriver.ChromeOptions()  # 浏览器启动选项
+        else:
+            option = selenium_webdriver.ChromeOptions()  # 浏览器启动选项
         if self.headless:
             option.add_argument("--headless")  # 设置无界面模式
         option.add_argument("--window-size=1920,1080")

{mdbq-4.0.75.dist-info → mdbq-4.0.77.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mdbq
-Version: 4.0.75
+Version: 4.0.77
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-4.0.75.dist-info → mdbq-4.0.77.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=K7y6PvPpqJlMBeV-GYtOcSGoiW4MvAwSjrj5RDnI2TY,18
+mdbq/__version__.py,sha256=MKsKQWqJcKq5Yl-a7LzywayYm1KeeUGRyTEqu3Itasg,18
 mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
-mdbq/log/mylogger.py,sha256=kPe3wsQNaB1slfX-Z7VMqzZoMoqPfc7ylYXZDBeFzzI,24945
+mdbq/log/mylogger.py,sha256=rJozMRqbO277M8DVwQZVDLUj3eBRCn0MBg29QVlrcog,26384
 mdbq/myconf/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/myconf/myconf.py,sha256=rHvQCnQRKhQ49AZBke-Z4v28hyOLmHt4MylIuB0H6yA,33516
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
@@ -22,9 +22,9 @@ mdbq/pbix/refresh_all.py,sha256=OBT9EewSZ0aRS9vL_FflVn74d4l2G00wzHiikCC4TC0,5926
 mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
 mdbq/redis/getredis.py,sha256=vpBuNc22uj9Vr-_Dh25_wpwWM1e-072EAAIBdB_IpL0,23494
 mdbq/selenium/__init__.py,sha256=AKzeEceqZyvqn2dEDoJSzDQnbuENkJSHAlbHAD0u0ZI,10
-mdbq/selenium/get_driver.py,sha256=ma0XgXJtpPW-ftzukShXnjkZBkekKqjtKQfkZ_UGM5k,20375
+mdbq/selenium/get_driver.py,sha256=sJYMfkzNprGoHYkppVqxglRSIQm6mO7wvgYvSzTWHdc,20903
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-4.0.75.dist-info/METADATA,sha256=fmoz5BV-r0BnyiThBzKL7SOA1pWf5l_ylZXIOMTFkUg,364
-mdbq-4.0.75.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mdbq-4.0.75.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.0.75.dist-info/RECORD,,
+mdbq-4.0.77.dist-info/METADATA,sha256=NJeHEofQkdsgkO9rQhyEm4uj_w1MEsnJJJh8U2oTwco,364
+mdbq-4.0.77.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mdbq-4.0.77.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.0.77.dist-info/RECORD,,