pyxllib 0.3.149__tar.gz → 0.3.151__tar.gz

pyxllib-0.3.151/MANIFEST.in

@@ -0,0 +1,4 @@
+include README.md
+include requirements.txt
+recursive-include pyxllib *.html *.js
+recursive-include pyxlpr *.py *.txt

{pyxllib-0.3.149/pyxllib.egg-info → pyxllib-0.3.151}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxllib
-Version: 0.3.149
+Version: 0.3.151
 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: pillow; 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: pillow; extra == "xlai"
-Requires-Dist: opencv-python; extra == "xlai"
 Requires-Dist: visdom; extra == "xlai"
-Requires-Dist: opsdroid-get-image-size; extra == "xlai"
 Requires-Dist: pynvml; extra == "xlai"
+Requires-Dist: opsdroid-get-image-size; extra == "xlai"
+Requires-Dist: opencv-python; extra == "xlai"
 Provides-Extra: xlall
+Requires-Dist: flask-jwt-extended; extra == "xlall"
+Requires-Dist: openai2; extra == "xlall"
+Requires-Dist: arts; extra == "xlall"
+Requires-Dist: ujson; extra == "xlall"
 Requires-Dist: pillow; extra == "xlall"
-Requires-Dist: opencv-python; extra == "xlall"
-Requires-Dist: flask-cors; extra == "xlall"
+Requires-Dist: flask-wtf; extra == "xlall"
+Requires-Dist: xlrd; extra == "xlall"
 Requires-Dist: zhconv; extra == "xlall"
-Requires-Dist: sentencepiece; extra == "xlall"
-Requires-Dist: ujson; extra == "xlall"
 Requires-Dist: html2text; extra == "xlall"
-Requires-Dist: openai2; extra == "xlall"
-Requires-Dist: opsdroid-get-image-size; extra == "xlall"
-Requires-Dist: uvicorn; extra == "xlall"
 Requires-Dist: flask; extra == "xlall"
+Requires-Dist: uvicorn; extra == "xlall"
+Requires-Dist: flask-cors; extra == "xlall"
+Requires-Dist: opsdroid-get-image-size; extra == "xlall"
 Requires-Dist: fastapi; extra == "xlall"
-Requires-Dist: xlrd; extra == "xlall"
-Requires-Dist: arts; extra == "xlall"
+Requires-Dist: sentencepiece; extra == "xlall"
+Requires-Dist: opencv-python; extra == "xlall"
 Requires-Dist: flask-restful; extra == "xlall"
-Requires-Dist: flask-jwt-extended; extra == "xlall"
-Requires-Dist: flask-wtf; extra == "xlall"
 
 # 1 install
 

{pyxllib-0.3.149 → pyxllib-0.3.151}/pyxllib/autogui/activewin.py

@@ -6,6 +6,7 @@
 
 import platform
 import sys
+import time
 
 import cv2
 import psutil
@@ -90,8 +91,14 @@ class ActiveWindowCapture(OriginalMSS):
     @xlcache(property=True)
     def window(self):
         """ 当前激活窗口 """
-        win = uiautomation.GetForegroundControl()
-        return win
+        # 可以小等一会等到有效窗口
+        for i in range(4):
+            win = uiautomation.GetForegroundControl()
+            if win:
+                return
+            else:
+                time.sleep(0.5)
+        return
 
     @xlcache(property=True)
     def process(self):

{pyxllib-0.3.149 → pyxllib-0.3.151}/pyxllib/autogui/wechat.py

@@ -474,7 +474,7 @@ def wechat_lock_send(user, text=None, files=None, *, timeout=-1):
     with WeChatSingletonLock(timeout) as we:
         we.set_chat_with(user)
         if text:
-            we.send_text(user, text)
+            we.send_text(text)
         if files:
             we.send_files(files)
 

{pyxllib-0.3.149 → pyxllib-0.3.151}/pyxllib/ext/wpsapi.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # @Author : 陈坤泽
 # @Date   : 2024/07/31
-
+import os
 import time
 import json
 from pathlib import Path
@@ -13,50 +13,8 @@ import tempfile
 
 import requests
 
-from DrissionPage import ChromiumPage
-from DrissionPage._pages.chromium_tab import ChromiumTab
-
-
-def format_exception(e, mode=3):
-    if mode == 1:
-        # 仅获取异常类型的名称
-        text = ''.join(traceback.format_exception_only(type(e), e)).strip()
-    elif mode == 2:
-        # 获取异常类型的名称和附加的错误信息
-        text = f"{type(e).__name__}: {e}"
-    elif mode == 3:
-        text = ''.join(traceback.format_exception(type(e), e, e.__traceback__))
-    else:
-        raise ValueError
-    return text
-
-
-def get_dp_tab(dp_page=None):
-    """ 智能获取一个标签页tab
-
-    :param dp_page:
-        默认None, 返回默认的page，一般就是当前页面
-        True, 新建一个page
-        str, 新建一个对应url的page
-        func(tab), 通过规则筛选tab，返回符合条件的第1个tab，否则新建一个tab
-    """
-
-    if isinstance(dp_page, ChromiumPage):
-        return dp_page.latest_tab
-    elif isinstance(dp_page, ChromiumTab):
-        return dp_page
-    elif callable(dp_page):
-        page0 = ChromiumPage()
-        for tab in page0.get_tabs():
-            if dp_page(tab):
-                return tab
-        return page0.new_tab()
-    elif dp_page is True:
-        return ChromiumPage().new_tab()
-    elif isinstance(dp_page, str):
-        return ChromiumPage().new_tab(dp_page)
-    else:
-        return ChromiumPage().latest_tab
+from pyxllib.prog.pupil import format_exception
+from pyxllib.ext.drissionlib import get_dp_tab
 
 
 class WpsApi:
@@ -66,7 +24,7 @@ class WpsApi:
     以及对高并发稳定性的考虑等
     """
 
-    def __init__(self, token, *, name=None, base_url=None, logger=None,
+    def __init__(self, token=None, *, name=None, base_url=None, logger=None,
                  folder_id=None):
         """
         :param str token: 登录的token
@@ -77,7 +35,7 @@ class WpsApi:
         """
         # 这里登录获得的是自己账号的token
         # Get the token from https://solution.wps.cn/weboffice-go-sdk/api/script/token
-        self.token = token
+        self.token = token or os.getenv('WPS_API_TOKEN')
         self.name = name or self.token[-6:]
         self.base_url = base_url or 'https://solution.wps.cn/weboffice-go-sdk/api'
         self.default_template = 'https://kdocs.cn/l/cjVHm9Zy9jU1'  # 空白表格，默认的一个表格模板文件，用于创建新文件、测试等
@@ -250,6 +208,8 @@ class WpsApi:
         :param return_mode: 返回格式
             None，提取到的结果
             json: 返回json格式
+
+        注意这个接口使用的都是wpsapi 1.0版本
         """
         reply = self.post('script/evaluate', {
             'file_id': str(file_id),
@@ -265,11 +225,73 @@ class WpsApi:
         return reply['return']
 
 
+class WpsOnlineWorkbook:
+    def __init__(self, file_id=None, token=None):
+        """
+        初始化WpsOnlineWorkbook实例。
+
+        :param file_id: 可选参数，指定要操作的文件ID。如果未提供，将创建一个新文件。
+        :param token: 可选参数，用于与WPS API交互的令牌。如果未提供，将从环境变量中获取。
+        """
+        self.wpsapi = WpsApi(token=token)
+        self.file_id = file_id or self.create()
+
+    def create(self, src_file_id=None):
+        """
+        创建一个新的在线工作簿，并返回文件ID。
+
+        :return: 新创建的文件ID
+        """
+        new_file_id = self.wpsapi.save_as_file(src_file_id)  # 使用默认模板创建新文件
+        self.file_id = new_file_id
+        return new_file_id
+
+    def save_as_file(self, dst_folder_id=None):
+        """
+        将当前工作簿另存为新文件。
+
+        :param dst_folder_id: 可选参数，指定保存文件的目标文件夹ID
+        :return: 新文件的ID
+        """
+        new_file_id = self.wpsapi.save_as_file(self.file_id, dst_folder_id)
+        return new_file_id
+
+    def delete(self):
+        """
+        删除当前工作簿。
+        """
+        self.wpsapi.delete_file(self.file_id)
+
+    def download(self, target_file_path):
+        """
+        下载当前工作簿到本地。
+
+        :param target_file_path: 本地保存文件的路径
+        """
+        self.wpsapi.download(self.file_id, target_file_path)
+
+    def run_airscript(self, code, return_mode=None):
+        """
+        在当前工作簿上运行AirScript代码。
+
+        :param code: 要执行的AirScript代码
+        :param return_mode: 返回格式，None表示提取结果，'json'表示返回json格式
+        :return: 执行结果
+        """
+        from pyxllib.text.jscode import assemble_dependencies_from_jstools, remove_js_comments
+
+        # 这里的版本默认支持扩展的js工具
+        code = assemble_dependencies_from_jstools(code)
+        code = remove_js_comments(code)
+        print(code)
+        return self.wpsapi.run_airscript(self.file_id, code, return_mode)
+
+
 class WpsGroupApi(WpsApi):
     """ 团队版的api
     """
 
-    def __init__(self, token, *, group_id=None, group_folder_id=None, **kwargs):
+    def __init__(self, token=None, *, group_id=None, group_folder_id=None, **kwargs):
         super().__init__(token, **kwargs)
         self.group_id = group_id
         self.group_folder_id = group_folder_id  # 团队版的默认存储目录
@@ -390,9 +412,48 @@ class WpsWeb:
                         break
 
 
-class WpsScriptApi:
+class WpsOnlineScriptApi:
     """ wps的"脚本令牌"调用模式 """
 
+    def __init__(self, token=None):
+        self.headers = {
+            'Content-Type': "application/json",
+            'AirScript-Token': token or os.getenv('WPS_SCRIPT_TOKEN', ''),
+        }
+        self.default_file_id = None
+
+    def post_request(self, url, payload):
+        """
+        发送 POST 请求到指定的 URL 并返回响应结果
+        """
+        try:
+            response = requests.post(url, json=payload, headers=self.headers)
+            response.raise_for_status()  # 如果请求失败会抛出异常
+            return response.json()
+        except requests.exceptions.RequestException as e:
+            print(f"请求失败: {e}")
+            return None
+
+    def run_script(self, script_id, file_id=None, args=None):
+        """
+        执行 WPS 脚本并返回执行结果
+
+        :param file_id: 文件 ID
+        :param script_id: 脚本 ID
+        :param args: 脚本参数 (可选)
+
+        todo 官方除了同步接口，还有异步接口。https://airsheet.wps.cn/docs/apitoken/api.html
+        """
+        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"
+        payload = {
+            "Context": {
+                "argv": args if args else {}
+            }
+        }
+        res = self.post_request(url, payload)
+        return res['data']['result']
+
 
 if __name__ == '__main__':
     pass

{pyxllib-0.3.149 → pyxllib-0.3.151}/pyxllib/ext/yuquelib.py

@@ -23,7 +23,7 @@ class Yuque:
     def __init__(self, token=None, user_id=None):
         self.base_url = "https://www.yuque.com/api/v2"
         self.headers = {
-            "X-Auth-Token": token or os.environ.get('YUQUE_TOKEN'),
+            "X-Auth-Token": token or os.getenv('YUQUE_TOKEN'),
             "Content-Type": "application/json"
         }
         self._user_id = user_id

{pyxllib-0.3.149 → pyxllib-0.3.151}/pyxllib/file/specialist/dirlib.py

@@ -38,7 +38,7 @@ class Dir(PathBase):
 
     # 零、常用的目录类
     TEMP = pathlib.Path(tempfile.gettempdir())
-    if os.environ.get('Desktop', None):  # 如果修改了win10默认的桌面路径，需要在环境变量添加一个正确的Desktop路径值
+    if os.getenv('Desktop', None):  # 如果修改了win10默认的桌面路径，需要在环境变量添加一个正确的Desktop路径值
         DESKTOP = os.environ['Desktop']
     else:
         DESKTOP = os.path.join(str(pathlib.Path.home()), 'Desktop')  # 这个不一定准，桌面是有可能被移到D盘等的

{pyxllib-0.3.149 → pyxllib-0.3.151}/pyxllib/file/specialist/filelib.py

@@ -806,7 +806,7 @@ class XlPath(type(pathlib.Path())):
 
     @classmethod
     def desktop(cls):
-        if os.environ.get('Desktop', None):  # 如果修改了win10默认的桌面路径，需要在环境变量添加一个正确的Desktop路径值
+        if os.getenv('Desktop', None):  # 如果修改了win10默认的桌面路径，需要在环境变量添加一个正确的Desktop路径值
             desktop = os.environ['Desktop']
         else:
             desktop = os.path.join(pathlib.Path.home(), 'Desktop')  # 这个不一定准，桌面是有可能被移到D盘等的

{pyxllib-0.3.149 → pyxllib-0.3.151}/pyxllib/file/xlsyncfile.py

@@ -31,7 +31,7 @@ class SyncFileClient:
         """
         :param host: 可以只写主机名
         """
-        token = token or os.environ.get("XL_COMMON_SERVER_TOKEN")
+        token = token or os.getenv("XL_COMMON_SERVER_TOKEN")
         self.headers = {
             'Authorization': f'Bearer {token}',
         }