pyxllib 0.3.149__tar.gz → 0.3.150__tar.gz

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

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

{pyxllib-0.3.149 → pyxllib-0.3.150}/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.150}/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:
@@ -390,9 +348,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.150}/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.150}/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.150}/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.150}/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}',
         }

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

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

{pyxllib-0.3.149 → pyxllib-0.3.150}/pyxlpr/ai/clientlib.py

@@ -215,15 +215,15 @@ class XlAiClient:
                 self.login_priu(**accounts['priu'], check=check)
 
         # 3 (新)增设了更规范的环境变量名
-        if auto_login and os.environ.get("XL_API_AIP_ID"):
-            self.login_aipocr(os.environ.get("XL_API_AIP_ID"),
-                              os.environ.get("XL_API_AIP_KEY"),
-                              os.environ.get("XL_API_AIP_SKEY"))
-        if auto_login and os.environ.get("XL_API_MATHPIX_ID"):
-            self.login_mathpix(os.environ.get("XL_API_MATHPIX_ID"),
-                               os.environ.get("XL_API_MATHPIX_KEY"))
-        if auto_login and os.environ.get("XL_API_PRIU_TOKEN"):
-            self.login_priu(os.environ.get("XL_API_PRIU_TOKEN"))
+        if auto_login and os.getenv("XL_API_AIP_ID"):
+            self.login_aipocr(os.getenv("XL_API_AIP_ID"),
+                              os.getenv("XL_API_AIP_KEY"),
+                              os.getenv("XL_API_AIP_SKEY"))
+        if auto_login and os.getenv("XL_API_MATHPIX_ID"):
+            self.login_mathpix(os.getenv("XL_API_MATHPIX_ID"),
+                               os.getenv("XL_API_MATHPIX_KEY"))
+        if auto_login and os.getenv("XL_API_PRIU_TOKEN"):
+            self.login_priu(os.getenv("XL_API_PRIU_TOKEN"))
 
     def __A1_登录账号(self):
         pass

{pyxllib-0.3.149 → pyxllib-0.3.150}/pyxlpr/ai/xltorch.py

@@ -642,7 +642,7 @@ class ZcPredictor:
 
         # 1 配置参数
         if isinstance(config_file, str) and config_file[-5:].lower() == '.yaml':
-            deploy_path = os.environ.get('OCRWORK_DEPLOY', '.')  # 支持在环境变量自定义：部署所用的配置、模型所在目录
+            deploy_path = os.getenv('OCRWORK_DEPLOY', '.')  # 支持在环境变量自定义：部署所用的配置、模型所在目录
             config_file = os.path.join(deploy_path, config_file)
             f = open(config_file, "r")
         elif isinstance(config_file, str):

{pyxllib-0.3.149 → pyxllib-0.3.150}/pyxlpr/openai2/_core/chat.py

@@ -157,10 +157,10 @@ class Chat:
         :param kwargs: 主要是供OpenAI初始化时使用的参数
 
         """
-        api_key = api_key or self.default_api_key or os.environ.get("OPENAI_API_KEY")
+        api_key = api_key or self.default_api_key or os.getenv("OPENAI_API_KEY")
 
         api_base = kwargs.pop('api_base', None)
-        base_url = base_url or api_base or self.default_base_url or os.environ.get("OPENAI_BASE_URL")
+        base_url = base_url or api_base or self.default_base_url or os.getenv("OPENAI_BASE_URL")
         MsgMaxCount = kwargs.pop('MsgMaxCount', None)
         msg_max_count = msg_max_count or MsgMaxCount
 

{pyxllib-0.3.149 → pyxllib-0.3.150}/setup.py

@@ -50,7 +50,7 @@ _dir = Path(__file__).parent
 
 setup(
     name='pyxllib',  # pip 安装时用的名字
-    version='0.3.149',  # 当前版本，每次更新上传到pypi都需要修改; 第4位版本号一般是修紧急bug
+    version='0.3.150',  # 当前版本，每次更新上传到pypi都需要修改; 第4位版本号一般是修紧急bug
     author='code4101',
     author_email='877362867@qq.com',
     url='https://github.com/XLPRUtils/pyxllib',