pyxllib 0.3.175__tar.gz → 0.3.190__tar.gz

{pyxllib-0.3.175/pyxllib.egg-info → pyxllib-0.3.190}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxllib
-Version: 0.3.175
+Version: 0.3.190
 Summary: 厦门理工模式识别团队通用python代码工具库
 Home-page: https://github.com/XLPRUtils/pyxllib
 Author: code4101
@@ -38,33 +38,33 @@ Requires-Dist: Jinja2
 Requires-Dist: pandas>=0.23.4
 Requires-Dist: pillow
 Provides-Extra: xlcv
-Requires-Dist: opsdroid-get-image-size; extra == "xlcv"
 Requires-Dist: opencv-python; extra == "xlcv"
 Requires-Dist: pillow; extra == "xlcv"
+Requires-Dist: opsdroid-get-image-size; extra == "xlcv"
 Provides-Extra: xlai
-Requires-Dist: visdom; extra == "xlai"
-Requires-Dist: pynvml; extra == "xlai"
-Requires-Dist: opencv-python; extra == "xlai"
 Requires-Dist: pillow; extra == "xlai"
 Requires-Dist: opsdroid-get-image-size; extra == "xlai"
+Requires-Dist: visdom; extra == "xlai"
+Requires-Dist: opencv-python; extra == "xlai"
+Requires-Dist: pynvml; extra == "xlai"
 Provides-Extra: xlall
-Requires-Dist: flask-cors; extra == "xlall"
-Requires-Dist: arts; extra == "xlall"
 Requires-Dist: ujson; extra == "xlall"
-Requires-Dist: flask; extra == "xlall"
-Requires-Dist: html2text; extra == "xlall"
-Requires-Dist: uvicorn; extra == "xlall"
-Requires-Dist: flask-restful; extra == "xlall"
-Requires-Dist: flask-jwt-extended; extra == "xlall"
-Requires-Dist: openai2; extra == "xlall"
-Requires-Dist: xlrd; extra == "xlall"
 Requires-Dist: fastapi; extra == "xlall"
-Requires-Dist: opencv-python; extra == "xlall"
-Requires-Dist: sentencepiece; extra == "xlall"
 Requires-Dist: pillow; extra == "xlall"
-Requires-Dist: flask-wtf; extra == "xlall"
 Requires-Dist: opsdroid-get-image-size; extra == "xlall"
+Requires-Dist: html2text; extra == "xlall"
+Requires-Dist: opencv-python; extra == "xlall"
+Requires-Dist: flask-wtf; extra == "xlall"
+Requires-Dist: openai2; extra == "xlall"
+Requires-Dist: xlrd; extra == "xlall"
+Requires-Dist: flask-cors; extra == "xlall"
 Requires-Dist: zhconv; extra == "xlall"
+Requires-Dist: flask-restful; extra == "xlall"
+Requires-Dist: arts; extra == "xlall"
+Requires-Dist: uvicorn; extra == "xlall"
+Requires-Dist: flask; extra == "xlall"
+Requires-Dist: flask-jwt-extended; extra == "xlall"
+Requires-Dist: sentencepiece; extra == "xlall"
 
 # 1 install
 
@@ -78,9 +78,3 @@ more details: https://www.yuque.com/xlpr/pyxllib/install
 
 document: https://www.yuque.com/xlpr/pyxllib.
 Work hard to improve, welcome more assistant partners.
-
-# 3 Acknowledge
-
-This project uses PyCharm to develop.
-Thanks to [JetBrains'](https://www.jetbrains.com/?from=pyxllib) support
-of [free license for open sourse project development](https://pycharm.iswbm.com/c01/c01_05.html).

pyxllib-0.3.190/README.md

@@ -0,0 +1,12 @@
+# 1 install
+
+```
+pip install pyxllib
+```
+
+more details: https://www.yuque.com/xlpr/pyxllib/install
+
+# 2 document
+
+document: https://www.yuque.com/xlpr/pyxllib.
+Work hard to improve, welcome more assistant partners.

{pyxllib-0.3.175 → pyxllib-0.3.190}/pyxllib/autogui/wxautolib.py

@@ -8,12 +8,13 @@ import sys
 
 from loguru import logger
 
-try:  # 尝试加载VIP版
-    from wxautox import WeChat
-    from wxautox.elements import WxParam  # WxParam.DEFALUT_SAVEPATH 可以用来配置数据自动保存位置
-except ModuleNotFoundError:  # 否则用贫民版
-    from wxauto import WeChat
-    from wxauto.elements import WxParam
+if sys.platform == 'win32':
+    try:  # 尝试加载VIP版
+        from wxautox import WeChat
+        from wxautox.elements import WxParam  # WxParam.DEFALUT_SAVEPATH 可以用来配置数据自动保存位置
+    except ModuleNotFoundError:  # 否则用贫民版
+        from wxauto import WeChat
+        from wxauto.elements import WxParam
 
 from pyxllib.prog.filelock import get_autoui_lock
 

{pyxllib-0.3.175 → pyxllib-0.3.190}/pyxllib/data/pglib.py

@@ -55,6 +55,9 @@ class Connection(psycopg.Connection, SqlBase):
         psycopg.Connection.__init__(self, *args, **kwargs)
         SqlBase.__init__(self, *args, **kwargs)
 
+    def __del__(self):
+        self.close()
+
     def __1_库(self):
         pass
 
@@ -899,7 +902,7 @@ class XlprDb(Connection):
         chart.options['grid'] = [{'top': 55 + len(all_database_usaged) * 4, 'containLabel': True}]
         chart.options['tooltip'].opts.update({'axisPointer': {'type': 'cross'}, 'trigger': 'item'})
 
-        #chart.add_series(f'total {pretty_val(ls[0][2] / 1024 / 1024 / 1024):g}',
+        # chart.add_series(f'total {pretty_val(ls[0][2] / 1024 / 1024 / 1024):g}',
         #                 to_list([x[2] / 1024 / 1024 / 1024 for x in ls]), areaStyle={})
         for database, usaged in all_database_usaged.most_common():
             usaged = usaged / ((ls[-1][0] - ls[0][0]).total_seconds() / 3600 + 1e-9)

{pyxllib-0.3.175 → pyxllib-0.3.190}/pyxllib/ext/drissionlib.py

@@ -16,6 +16,7 @@ import DrissionPage
 from DrissionPage import ChromiumPage, Chromium
 from DrissionPage._pages.chromium_base import ChromiumBase
 from DrissionPage._pages.chromium_tab import ChromiumTab
+import DrissionPage.errors
 
 from pyxllib.prog.pupil import inject_members
 from pyxllib.text.pupil import strfind
@@ -224,7 +225,18 @@ def close_duplicate_tabs(browser=None):
     # 1 初始化
     if browser is None:
         browser = Chromium()
-    all_tabs = browser.get_tabs()
+
+    # 250115周三21:12 这步不稳定，会报错，不知道为啥。导致dp最后经常没有清理tabs
+    # 250204周二09:21，好像是浏览器重启更新到最新版本就行了~ 这里也要加个try
+    try:
+        all_tabs = browser.get_tabs()
+    except TimeoutError:
+        logger.warning(
+            'browser.get_tabs()运行报错，请清查浏览器是否已更新但没有重启。本次将browser.quit()退出整个浏览器。')
+        # 你不让我关tabs是吧，那我就把整个浏览器关了
+        browser.quit()
+        return
+
     seen_domains = set()
 
     # 2 第一次遍历：保留首个出现的域名，其余重复则关闭
@@ -244,3 +256,22 @@ def close_duplicate_tabs(browser=None):
         for t in remaining_tabs:
             if t.url.startswith('chrome://newtab'):
                 t.close()
+
+
+def dp_check_quit():
+    """ 检查当前页面是否只剩空标签页，则浏览器可以自动退出 """
+    browser = Chromium()
+    try:
+        tabs = browser.get_tabs()
+    except TimeoutError:
+        logger.warning('browser.get_tabs()运行报错，浏览器可能已更新但没有重启。将退出浏览器。')
+        browser.quit()
+        return
+
+    # 检查是否只剩下空标签页
+    if len(tabs) == 1 and tabs[0].url.startswith('chrome://newtab'):
+        # 如果只剩下一个空标签页，则退出浏览器
+        browser.quit()
+    elif len(tabs) == 0:
+        # 如果没有标签页，也退出浏览器
+        browser.quit()