pyxllib 0.3.170__tar.gz → 0.3.190__tar.gz

{pyxllib-0.3.170 → pyxllib-0.3.190}/MANIFEST.in

@@ -1,4 +1,5 @@
 include README.md
 include requirements.txt
 recursive-include pyxllib *.html *.js
-recursive-include pyxlpr *.py *.txt
+recursive-include pyxlpr *.py *.txt
+exclude pyxllib/ext/wpsapi2.py

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxllib
-Version: 0.3.170
+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: opencv-python; extra == "xlcv"
 Requires-Dist: pillow; extra == "xlcv"
 Requires-Dist: opsdroid-get-image-size; extra == "xlcv"
-Requires-Dist: opencv-python; extra == "xlcv"
 Provides-Extra: xlai
 Requires-Dist: pillow; extra == "xlai"
 Requires-Dist: opsdroid-get-image-size; extra == "xlai"
-Requires-Dist: pynvml; extra == "xlai"
 Requires-Dist: visdom; extra == "xlai"
 Requires-Dist: opencv-python; extra == "xlai"
+Requires-Dist: pynvml; extra == "xlai"
 Provides-Extra: xlall
-Requires-Dist: flask; extra == "xlall"
-Requires-Dist: html2text; extra == "xlall"
-Requires-Dist: flask-restful; extra == "xlall"
-Requires-Dist: zhconv; extra == "xlall"
-Requires-Dist: xlrd; extra == "xlall"
-Requires-Dist: sentencepiece; extra == "xlall"
+Requires-Dist: ujson; extra == "xlall"
+Requires-Dist: fastapi; extra == "xlall"
 Requires-Dist: pillow; 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: flask-jwt-extended; extra == "xlall"
-Requires-Dist: flask-cors; extra == "xlall"
-Requires-Dist: fastapi; extra == "xlall"
 Requires-Dist: openai2; extra == "xlall"
-Requires-Dist: ujson; extra == "xlall"
-Requires-Dist: uvicorn; extra == "xlall"
-Requires-Dist: opencv-python; 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.170 → 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
 
@@ -41,6 +42,13 @@ class WeChatSingletonLock:
 def wechat_lock_send(user, text=None, files=None, *, timeout=-1):
     """ 使用全局唯一单例锁，确保同一时间仅有一个微信自动化程序在操作 """
     with WeChatSingletonLock(timeout) as we:
+        # 241223周一12:27，今天可被这个默认2秒坑惨了，往错误群一直发骚扰消息
+        # 22:07，但我复测，感觉不可能找不到啊，为什么会找到禅宗考勤管理群呢，太离谱了
+        status = we.ChatWith(user, timeout=5)
+
+        if status != user:
+            raise ValueError(f'无法找到用户：{user}')
+
         if text:
             we.SendMsg(text, user)
         if files:

{pyxllib-0.3.170 → 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.170 → 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
@@ -213,3 +214,64 @@ class DpWebBase:
     # def __del__(self):
     #     """ 我习惯每次新任务建立新的tab处理，并在结束后自动检查同网页打开的标签是否不唯一则删掉 """
     #     self.close_if_exceeds_min_tabs()
+
+
+def close_duplicate_tabs(browser=None):
+    """ 关闭浏览器重复标签页
+
+    遍历所有标签页（从前往后，dp的get_tabs拿到的tab就是从新到旧的），对每个域名仅保留第一个出现的标签页，其余同域名标签页关闭；
+    如果最后还剩多个标签页，则把'chrome://newtab/'也关掉。
+    """
+    # 1 初始化
+    if browser is None:
+        browser = Chromium()
+
+    # 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 第一次遍历：保留首个出现的域名，其余重复则关闭
+    for t in all_tabs:
+        parsed_url = urlparse(t.url)
+        domain = parsed_url.netloc  # netloc 通常可拿到域名部分
+        # logger.info(f'{t.url}, {domain}')
+
+        if domain in seen_domains:
+            t.close()
+        else:
+            seen_domains.add(domain)
+
+    # 3 第二次遍历：如果剩余标签页 > 1，则关掉chrome://newtab/
+    remaining_tabs = browser.get_tabs()
+    if len(remaining_tabs) > 1:
+        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()

pyxllib-0.3.190/pyxllib/ext/wpsapi.py

@@ -0,0 +1,102 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# @Author : 陈坤泽
+# @Date   : 2024/07/31
+
+import os
+import requests
+
+import pandas as pd
+
+
+class WpsOnlineBook:
+    """ wps的"脚本令牌"调用模式
+
+    官方文档：https://airsheet.wps.cn/docs/apitoken/api.html
+    """
+
+    def __1_基础功能(self):
+        pass
+
+    def __init__(self, file_id=None, script_id=None, *, token=None):
+        self.headers = {
+            'Content-Type': "application/json",
+            'AirScript-Token': token or os.getenv('WPS_SCRIPT_TOKEN', ''),
+        }
+        self.default_file_id = file_id
+        self.default_script_id = script_id
+
+    def post_request(self, url, payload):
+        """
+        发送 POST 请求到指定的 URL 并返回响应结果
+        """
+        try:
+            resp = requests.post(url, json=payload, headers=self.headers)
+            resp.raise_for_status()  # 如果请求失败会抛出异常
+            return resp.json()
+        except requests.exceptions.RequestException as e:
+            print(f"请求失败: {e}")
+            return None
+
+    def run_script(self, script_id=None, file_id=None, context_argv=None, sync=True):
+        """
+        执行 WPS 脚本并返回执行结果
+
+        :param file_id: 文件 ID
+            虽然提供了file_id，但并不支持跨文件调用as脚本
+        :param script_id: 脚本 ID
+        :param context_argv: 脚本参数 (可选)
+            context本来能支持这些参数的：
+                dict argv: 传入的上下文参数对象，比如传入{name: 'xiaomeng', age: 18}， 在 AS 代码中可通过Context.argv.name获取到传入的值
+                str sheet_name: et,ksheet 运行时所在表名
+                str range: et,ksheet 运行时所在区域，例如$B$156
+                str link_from: et,ksheet 点击超链接所在单元格
+                str db_active_view: db 运行时所在 view 名
+                str db_selection: db 运行时所在选区
+            但是，sheet_name, range等，并看不到对运行代码有什么实质影响，不影响active，而且as里也引用不了sheet_name等值
+                所以退化，简化为只要传入content_argv参数就行
+        :param sync:
+            True, 同步运行
+            False, 异步运行
+
+        这个接口跟普通as一样，运行有30秒时限
+        """
+        file_id = file_id or self.default_file_id
+        url = f"https://www.kdocs.cn/api/v3/ide/file/{file_id}/script/{script_id}/{'sync_task' if sync else 'task'}"
+        payload = {
+            "Context": {'argv': context_argv or {}}
+        }
+        res = self.post_request(url, payload)
+        if sync:
+            return res['data']['result']
+        else:
+            return res
+
+    def __2_封装的更高级的接口(self):
+        pass
+
+    def run_script2(self, func_name, *args):
+        """ 我自己常用的jsa框架，jsa那边已经简化了对接模式，所以一般都只用这个高级的接口即可
+
+        配合这个框架范式使用：https://github.com/XLPRUtils/pyxllib/blob/master/pyxllib/text/airscript.js
+        """
+        return self.run_script(self.default_script_id, context_argv={'funcName': func_name, 'args': args})
+
+    def get_sheet_data(self, sheet_name, fields, data_row=0, filter_empty_rows=True, *,
+                       return_mode='pd') -> pd.DataFrame:
+        """ 获取某张sheet表格数据
+
+        :param sheet_name: sheet表名
+        :param list[str] fields: 字段名列表
+        :param int data_row: 数据起始行，详细用法见packTableDataFields
+        :param return_mode: 'pd' or 'json'
+        """
+        data = self.run_script2('packTableDataFields', sheet_name, fields, data_row, filter_empty_rows)
+        if return_mode == 'json':
+            return data
+        elif return_mode == 'pd':
+            return pd.DataFrame(data)
+
+
+if __name__ == '__main__':
+    pass