pyxllib 0.3.200__tar.gz → 3.201.1__tar.gz

pyxllib-3.201.1/PKG-INFO

@@ -0,0 +1,296 @@
+Metadata-Version: 2.4
+Name: pyxllib
+Version: 3.201.1
+Summary: 厦门理工模式识别团队通用python代码工具库
+Project-URL: Source, https://github.com/XLPRUtils/pyxllib
+Project-URL: Documentation, https://www.yuque.com/xlpr/pyxllib
+Author-email: code4101 <877362867@qq.com>
+License-Expression: Apache-2.0
+License-File: LICENSE
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Requires-Python: <3.13,>=3.6
+Provides-Extra: advance
+Requires-Dist: anytree; extra == 'advance'
+Requires-Dist: beautifulsoup4; extra == 'advance'
+Requires-Dist: cached-property; extra == 'advance'
+Requires-Dist: cachetools; extra == 'advance'
+Requires-Dist: charset-normalizer; extra == 'advance'
+Requires-Dist: deprecated; extra == 'advance'
+Requires-Dist: disjoint-set; extra == 'advance'
+Requires-Dist: drissionpage>=4.1.0.17; extra == 'advance'
+Requires-Dist: fastcore>=1.8.1; extra == 'advance'
+Requires-Dist: filetype; extra == 'advance'
+Requires-Dist: fire; extra == 'advance'
+Requires-Dist: humanfriendly; extra == 'advance'
+Requires-Dist: imagehash; extra == 'advance'
+Requires-Dist: jinja2; extra == 'advance'
+Requires-Dist: jmespath; extra == 'advance'
+Requires-Dist: joblib>=1.3.2; extra == 'advance'
+Requires-Dist: jsonpickle; extra == 'advance'
+Requires-Dist: keyboard; extra == 'advance'
+Requires-Dist: klembord; extra == 'advance'
+Requires-Dist: loguru; extra == 'advance'
+Requires-Dist: lxml; extra == 'advance'
+Requires-Dist: more-itertools; extra == 'advance'
+Requires-Dist: mss; extra == 'advance'
+Requires-Dist: numpy; extra == 'advance'
+Requires-Dist: opencv-python; extra == 'advance'
+Requires-Dist: openpyxl==3.1.5; extra == 'advance'
+Requires-Dist: pandas>=0.23.4; extra == 'advance'
+Requires-Dist: pillow; extra == 'advance'
+Requires-Dist: premailer; extra == 'advance'
+Requires-Dist: psutil; extra == 'advance'
+Requires-Dist: psycopg[binary]; extra == 'advance'
+Requires-Dist: pyautogui; extra == 'advance'
+Requires-Dist: pyecharts; extra == 'advance'
+Requires-Dist: pympler; extra == 'advance'
+Requires-Dist: pynput; extra == 'advance'
+Requires-Dist: pyperclip; extra == 'advance'
+Requires-Dist: python-dotenv; extra == 'advance'
+Requires-Dist: python-levenshtein; extra == 'advance'
+Requires-Dist: pywin32; (sys_platform == 'win32') and extra == 'advance'
+Requires-Dist: pyyaml; extra == 'advance'
+Requires-Dist: qiniu; extra == 'advance'
+Requires-Dist: requests; extra == 'advance'
+Requires-Dist: shapely; extra == 'advance'
+Requires-Dist: tqdm; extra == 'advance'
+Requires-Dist: uiautomation; (sys_platform == 'win32') and extra == 'advance'
+Requires-Dist: ujson; extra == 'advance'
+Requires-Dist: wxauto; (sys_platform == 'win32') and extra == 'advance'
+Requires-Dist: xlrd; extra == 'advance'
+Requires-Dist: xlsxwriter; extra == 'advance'
+Requires-Dist: xpath-parser; extra == 'advance'
+Requires-Dist: yattag; extra == 'advance'
+Provides-Extra: algo
+Requires-Dist: anytree; extra == 'algo'
+Requires-Dist: disjoint-set; extra == 'algo'
+Requires-Dist: shapely; extra == 'algo'
+Requires-Dist: xlsxwriter; extra == 'algo'
+Provides-Extra: autogui
+Requires-Dist: keyboard; extra == 'autogui'
+Requires-Dist: klembord; extra == 'autogui'
+Requires-Dist: mss; extra == 'autogui'
+Requires-Dist: psutil; extra == 'autogui'
+Requires-Dist: pyautogui; extra == 'autogui'
+Requires-Dist: pynput; extra == 'autogui'
+Requires-Dist: pyperclip; extra == 'autogui'
+Requires-Dist: pywin32; (sys_platform == 'win32') and extra == 'autogui'
+Requires-Dist: uiautomation; (sys_platform == 'win32') and extra == 'autogui'
+Requires-Dist: wxauto; (sys_platform == 'win32') and extra == 'autogui'
+Provides-Extra: basic
+Requires-Dist: anytree; extra == 'basic'
+Requires-Dist: beautifulsoup4; extra == 'basic'
+Requires-Dist: cached-property; extra == 'basic'
+Requires-Dist: cachetools; extra == 'basic'
+Requires-Dist: charset-normalizer; extra == 'basic'
+Requires-Dist: deprecated; extra == 'basic'
+Requires-Dist: disjoint-set; extra == 'basic'
+Requires-Dist: drissionpage>=4.1.0.17; extra == 'basic'
+Requires-Dist: fastcore>=1.8.1; extra == 'basic'
+Requires-Dist: filetype; extra == 'basic'
+Requires-Dist: fire; extra == 'basic'
+Requires-Dist: humanfriendly; extra == 'basic'
+Requires-Dist: imagehash; extra == 'basic'
+Requires-Dist: jinja2; extra == 'basic'
+Requires-Dist: jmespath; extra == 'basic'
+Requires-Dist: joblib>=1.3.2; extra == 'basic'
+Requires-Dist: loguru; extra == 'basic'
+Requires-Dist: lxml; extra == 'basic'
+Requires-Dist: more-itertools; extra == 'basic'
+Requires-Dist: numpy; extra == 'basic'
+Requires-Dist: opencv-python; extra == 'basic'
+Requires-Dist: pandas>=0.23.4; extra == 'basic'
+Requires-Dist: pillow; extra == 'basic'
+Requires-Dist: psycopg[binary]; extra == 'basic'
+Requires-Dist: pyecharts; extra == 'basic'
+Requires-Dist: pympler; extra == 'basic'
+Requires-Dist: python-dotenv; extra == 'basic'
+Requires-Dist: python-levenshtein; extra == 'basic'
+Requires-Dist: pyyaml; extra == 'basic'
+Requires-Dist: qiniu; extra == 'basic'
+Requires-Dist: requests; extra == 'basic'
+Requires-Dist: shapely; extra == 'basic'
+Requires-Dist: tqdm; extra == 'basic'
+Requires-Dist: ujson; extra == 'basic'
+Requires-Dist: xlsxwriter; extra == 'basic'
+Requires-Dist: xpath-parser; extra == 'basic'
+Provides-Extra: data
+Requires-Dist: jmespath; extra == 'data'
+Requires-Dist: numpy; extra == 'data'
+Requires-Dist: pandas>=0.23.4; extra == 'data'
+Requires-Dist: psycopg[binary]; extra == 'data'
+Requires-Dist: pyecharts; extra == 'data'
+Provides-Extra: ext-algo
+Requires-Dist: pint; extra == 'ext-algo'
+Provides-Extra: ext-file
+Requires-Dist: gitpython; extra == 'ext-file'
+Requires-Dist: moviepy; extra == 'ext-file'
+Requires-Dist: pdf2docx; extra == 'ext-file'
+Requires-Dist: pymupdf>=1.18.17; extra == 'ext-file'
+Requires-Dist: python-docx; extra == 'ext-file'
+Provides-Extra: ext-text
+Requires-Dist: pyahocorasick; extra == 'ext-text'
+Requires-Dist: pyspellchecker; extra == 'ext-text'
+Provides-Extra: file
+Requires-Dist: charset-normalizer; extra == 'file'
+Requires-Dist: filetype; extra == 'file'
+Requires-Dist: pyyaml; extra == 'file'
+Requires-Dist: qiniu; extra == 'file'
+Requires-Dist: ujson; extra == 'file'
+Provides-Extra: flask
+Requires-Dist: flask; extra == 'flask'
+Requires-Dist: flask-cors; extra == 'flask'
+Requires-Dist: flask-jwt-extended; extra == 'flask'
+Requires-Dist: flask-restful; extra == 'flask'
+Requires-Dist: flask-wtf; extra == 'flask'
+Provides-Extra: full
+Requires-Dist: anytree; extra == 'full'
+Requires-Dist: apscheduler; extra == 'full'
+Requires-Dist: arts==2024.9.14; extra == 'full'
+Requires-Dist: baidu-aip; extra == 'full'
+Requires-Dist: beautifulsoup4; extra == 'full'
+Requires-Dist: cached-property; extra == 'full'
+Requires-Dist: cachetools; extra == 'full'
+Requires-Dist: charset-normalizer; extra == 'full'
+Requires-Dist: croniter; extra == 'full'
+Requires-Dist: deprecated; extra == 'full'
+Requires-Dist: disjoint-set; extra == 'full'
+Requires-Dist: drissionpage>=4.1.0.17; extra == 'full'
+Requires-Dist: fabric; extra == 'full'
+Requires-Dist: fastapi; extra == 'full'
+Requires-Dist: fastcore>=1.8.1; extra == 'full'
+Requires-Dist: filetype; extra == 'full'
+Requires-Dist: fire; extra == 'full'
+Requires-Dist: flask; extra == 'full'
+Requires-Dist: flask-cors; extra == 'full'
+Requires-Dist: flask-jwt-extended; extra == 'full'
+Requires-Dist: flask-restful; extra == 'full'
+Requires-Dist: flask-wtf; extra == 'full'
+Requires-Dist: gitpython; extra == 'full'
+Requires-Dist: humanfriendly; extra == 'full'
+Requires-Dist: imagehash; extra == 'full'
+Requires-Dist: jinja2; extra == 'full'
+Requires-Dist: jmespath; extra == 'full'
+Requires-Dist: joblib>=1.3.2; extra == 'full'
+Requires-Dist: jsonpickle; extra == 'full'
+Requires-Dist: keyboard; extra == 'full'
+Requires-Dist: klembord; extra == 'full'
+Requires-Dist: loguru; extra == 'full'
+Requires-Dist: lxml; extra == 'full'
+Requires-Dist: more-itertools; extra == 'full'
+Requires-Dist: moviepy; extra == 'full'
+Requires-Dist: mss; extra == 'full'
+Requires-Dist: numpy; extra == 'full'
+Requires-Dist: opencv-python; extra == 'full'
+Requires-Dist: openpyxl==3.1.5; extra == 'full'
+Requires-Dist: pandas>=0.23.4; extra == 'full'
+Requires-Dist: paramiko; extra == 'full'
+Requires-Dist: pdf2docx; extra == 'full'
+Requires-Dist: pillow; extra == 'full'
+Requires-Dist: pint; extra == 'full'
+Requires-Dist: premailer; extra == 'full'
+Requires-Dist: psutil; extra == 'full'
+Requires-Dist: psycopg[binary]; extra == 'full'
+Requires-Dist: pyahocorasick; extra == 'full'
+Requires-Dist: pyautogui; extra == 'full'
+Requires-Dist: pyecharts; extra == 'full'
+Requires-Dist: pympler; extra == 'full'
+Requires-Dist: pymupdf>=1.18.17; extra == 'full'
+Requires-Dist: pynput; extra == 'full'
+Requires-Dist: pynvml; extra == 'full'
+Requires-Dist: pyperclip; extra == 'full'
+Requires-Dist: pyqt6; (sys_platform == 'win32') and extra == 'full'
+Requires-Dist: pyside6; (sys_platform == 'win32') and extra == 'full'
+Requires-Dist: pyspellchecker; extra == 'full'
+Requires-Dist: python-docx; extra == 'full'
+Requires-Dist: python-dotenv; extra == 'full'
+Requires-Dist: python-levenshtein; extra == 'full'
+Requires-Dist: pywin32; (sys_platform == 'win32') and extra == 'full'
+Requires-Dist: pyyaml; extra == 'full'
+Requires-Dist: qiniu; extra == 'full'
+Requires-Dist: requests; extra == 'full'
+Requires-Dist: scikit-learn; extra == 'full'
+Requires-Dist: scp; extra == 'full'
+Requires-Dist: shapely; extra == 'full'
+Requires-Dist: tiktoken; extra == 'full'
+Requires-Dist: tqdm; extra == 'full'
+Requires-Dist: uiautomation; (sys_platform == 'win32') and extra == 'full'
+Requires-Dist: ujson; extra == 'full'
+Requires-Dist: uvicorn; extra == 'full'
+Requires-Dist: visdom; extra == 'full'
+Requires-Dist: visualdl; extra == 'full'
+Requires-Dist: wxauto; (sys_platform == 'win32') and extra == 'full'
+Requires-Dist: xlrd; extra == 'full'
+Requires-Dist: xlsxwriter; extra == 'full'
+Requires-Dist: xpath-parser; extra == 'full'
+Requires-Dist: yattag; extra == 'full'
+Provides-Extra: net
+Requires-Dist: drissionpage>=4.1.0.17; extra == 'net'
+Requires-Dist: requests; extra == 'net'
+Provides-Extra: prog
+Requires-Dist: cached-property; extra == 'prog'
+Requires-Dist: cachetools; extra == 'prog'
+Requires-Dist: deprecated; extra == 'prog'
+Requires-Dist: fastcore>=1.8.1; extra == 'prog'
+Requires-Dist: fire; extra == 'prog'
+Requires-Dist: humanfriendly; extra == 'prog'
+Requires-Dist: joblib>=1.3.2; extra == 'prog'
+Requires-Dist: loguru; extra == 'prog'
+Requires-Dist: more-itertools; extra == 'prog'
+Requires-Dist: pympler; extra == 'prog'
+Requires-Dist: python-dotenv; extra == 'prog'
+Requires-Dist: tqdm; extra == 'prog'
+Provides-Extra: pyqt
+Requires-Dist: pyqt6; (sys_platform == 'win32') and extra == 'pyqt'
+Requires-Dist: pyside6; (sys_platform == 'win32') and extra == 'pyqt'
+Provides-Extra: text
+Requires-Dist: beautifulsoup4; extra == 'text'
+Requires-Dist: jinja2; extra == 'text'
+Requires-Dist: lxml; extra == 'text'
+Requires-Dist: python-levenshtein; extra == 'text'
+Requires-Dist: xpath-parser; extra == 'text'
+Provides-Extra: unix
+Requires-Dist: fabric; extra == 'unix'
+Requires-Dist: paramiko; extra == 'unix'
+Requires-Dist: scp; extra == 'unix'
+Provides-Extra: xlai
+Requires-Dist: pynvml; extra == 'xlai'
+Requires-Dist: scikit-learn; extra == 'xlai'
+Requires-Dist: visdom; extra == 'xlai'
+Provides-Extra: xlapi
+Requires-Dist: arts==2024.9.14; extra == 'xlapi'
+Requires-Dist: baidu-aip; extra == 'xlapi'
+Provides-Extra: xlcv
+Requires-Dist: imagehash; extra == 'xlcv'
+Requires-Dist: opencv-python; extra == 'xlcv'
+Requires-Dist: pillow; extra == 'xlcv'
+Provides-Extra: xlpr
+Requires-Dist: tiktoken; extra == 'xlpr'
+Requires-Dist: visualdl; extra == 'xlpr'
+Provides-Extra: xlserver
+Requires-Dist: apscheduler; extra == 'xlserver'
+Requires-Dist: croniter; extra == 'xlserver'
+Requires-Dist: fastapi; extra == 'xlserver'
+Requires-Dist: uvicorn; extra == 'xlserver'
+Provides-Extra: xlsx
+Requires-Dist: jsonpickle; extra == 'xlsx'
+Requires-Dist: openpyxl==3.1.5; extra == 'xlsx'
+Requires-Dist: premailer; extra == 'xlsx'
+Requires-Dist: xlrd; extra == 'xlsx'
+Requires-Dist: yattag; extra == 'xlsx'
+Description-Content-Type: text/markdown
+
+
+# 1 安装
+
+```
+pip install pyxllib
+```
+
+更多介绍: https://www.yuque.com/xlpr/pyxllib/install
+
+# 2 文档
+
+文档都在语雀: https://www.yuque.com/xlpr/pyxllib

pyxllib-3.201.1/pyproject.toml

@@ -0,0 +1,162 @@
+[project]
+name = "pyxllib"
+version = "3.201.1"
+description = "厦门理工模式识别团队通用python代码工具库"
+readme = "README.md"
+license = "Apache-2.0"
+authors = [{ name = "code4101", email = "877362867@qq.com" }]
+requires-python = ">=3.6, <3.13" # 3.6可以兼容大部分功能，但并不保证所有功能都可用
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Operating System :: OS Independent",
+    "License :: OSI Approved :: Apache Software License",
+]
+dependencies = []
+
+[project.optional-dependencies]
+basic = [ # 基础依赖，一般情况都是要安装的，但是有些打包exe的特殊情景可能要纯净的pyxllib，则不用预先安装这些依赖
+    "pyxllib[prog,algo,text,file,data,net,xlcv]",
+]
+prog = [ # 工程需要的一些特殊工具
+    "python-dotenv",   # 读取环境变量
+    "loguru",          # 日志工具
+    "humanfriendly",   # 人性化的时间显示等
+    "tqdm",            # 进度条
+    "Deprecated",      # 弃用函数的标记
+    "more-itertools",  # 更多的迭代器工具
+    "joblib>=1.3.2",   # 并行处理工具，实际首次是在pyxllib.file中需要调用
+    "pympler",         # 计算对象的内存占用
+    "fastcore>=1.8.1", # 有些好用的工程功能，比如from fastcore.utils import GetAttr，用于不实际继承的情况拥有类似继承的操作模式
+    "fire",            # 制作命令行工具
+    "cachetools",      # 通用缓存工具，适用范围更广
+    "cached_property", # 类属性特用工具，相对比较简洁些
+]
+algo = [ # 算法库
+    "anytree",      # 树形结构处理
+    "shapely",      # 几何多边形计算
+    "disjoint-set", # 并查集
+    "xlsxwriter",   # pyxllib.algo.stat有个小的数据处理模块，需要用到这个操作表格
+]
+ext_algo = [
+    "pint", # 单位计算工具
+]
+text = [ # 文本处理
+    "python-Levenshtein", # 计算编辑距离
+    # pip install安装包名，从pypi、git/vcs安装时不区分大小写，本地安装时若为linux则区分。一般建议按照官方推荐的大小写名称安装。
+    "Jinja2",         # 模板渲染，pyxllib.text下的jinjalib、jscode有使用，from jinja2 import Template
+    "beautifulsoup4", # html等解析，from bs4 import BeautifulSoup
+    "lxml",           # xml/html解析，bs4、表格均需要使用
+    "xpath-parser",   # xpath解析
+]
+ext_text = [
+    "pyahocorasick",  # ac自动机
+    "pyspellchecker", # 拼写检查
+]
+file = [ # 文件功能需要的一些特殊工具
+    "filetype",           # 文件类型判断
+    "charset-normalizer", # import charset_normalizer，文件编码自动识别
+    "qiniu",              # etag哈希值计算
+    "ujson",              # json读取加速
+    "pyyaml",             # yaml文件处理
+]
+ext_file = [
+    "PyMuPdf>=1.18.17", # pdf处理工具，import fitz
+    "pdf2docx",
+    "python-docx",      # docxlib的依赖，import docx
+    "moviepy",          # 视频处理
+    "gitpython",        # from git import Repo，git项目管理
+]
+data = [
+    "numpy",           # 科学计算
+    "pandas>=0.23.4",  # 数据处理分析
+    "psycopg[binary]", # 对pg数据库的操作
+    "pyecharts",       # 画echart图标
+    "jmespath",        # json查询
+]
+net = [
+    "requests",               # 网络请求
+    "DrissionPage>=4.1.0.17", # 特别好用的爬虫工具
+]
+xlcv = [ # 图像处理相关
+    "pillow",
+    "opencv-python",
+    "ImageHash",     # 图像hash值计算
+]
+xlsx = [ # 表格相关工具
+    "openpyxl==3.1.5", # 表格处理库，不要用3.1.2，有bug
+    "xlrd",            # 比较轻量的读取excel工具
+    "premailer",       # pyxllib.stdlib.tablepyxl的依赖
+    "jsonpickle",      # 表格需要用到这个导出json结构化数据
+    "yattag",          # 表格模块需要用这个转html表格
+]
+autogui = [
+    "psutil",                                # 进程管理
+    "mss",                                   # 获取屏幕窗口
+    "pyperclip",                             # 剪切板复制粘贴，我的qt、utools、docxlib等有使用
+    "klembord",                              # 富文本复制粘贴
+    "keyboard",                              # 键盘操作
+    "pynput",
+    "pyautogui",                             # 包含pygetwindow，这个库主要也就用来比较简单获得当前激活窗口，全部窗口等信息。更综合的能力不如pywinauto
+    "uiautomation; sys_platform == 'win32'", # ui窗口自动化操作
+    "wxauto; sys_platform == 'win32'",       # wxauto官方另有付费vip用户可加设wxautox
+    "pywin32; sys_platform == 'win32'",      # win32com、win32api等很多win32前缀的库
+]
+pyqt = ["PyQt6; sys_platform == 'win32'", "PySide6; sys_platform == 'win32'"]
+advance = [ # 比较全面的，高级的依赖
+    "pyxllib[basic]",
+    "pyxllib[xlsx,autogui]",
+]
+flask = [
+    "flask",              # 传统写后端的工具
+    "flask-cors",         # 跨域问题
+    "flask-jwt-extended", # 身份验证
+    "flask-restful",      # restful风格的api
+    "flask-wtf",          # 表单验证
+]
+xlai = [
+    "pynvml",
+    "visdom",
+    # "fvcore",
+    "scikit-learn", # import sklearn
+]
+xlapi = [ # 各种api接口服务
+    "baidu-aip", # 百度云服务api
+    # "openai",  # openai官方api
+    "arts==2024.9.14", # 这个库包含了作者写的openai2，但被我改版到pyxlpr.openai2
+]
+xlserver = [ # 如果要开后端服务相关
+    "fastapi", # 现在最流行的写后端的库
+    "uvicorn", # 运行fastapi的库
+    # 后端服务需要用到pyxllib.prog.multiprogs，其中有些依赖
+    "croniter",    # 支持cron表达式的定时处理
+    "APScheduler", # 调度能力
+]
+unix = [ # pyxllib.ext.unixlib依赖的包
+    "paramiko",
+    "fabric",   # 对 paramiko 进一步封装的库
+    "scp",      # 文件传输
+]
+xlpr = [
+    "tiktoken", # 计算大模型token数
+    "visualdl", # xlpaddle需要使用的可视化工具
+]
+full = [ # full的依赖很重，如无必要一般用advance就足够了，有其他缺失的运行中有需要再临时补
+    "pyxllib[advance]",
+    "pyxllib[ext_text,ext_algo,ext_file]", # 几个大类其他一些特殊扩展库
+    "pyxllib[flask,xlapi,xlserver]",       # api、后端服务
+    "pyxllib[pyqt,xlai,unix,xlpr]",        # 其他散件
+]
+
+[project.urls]
+Source = "https://github.com/XLPRUtils/pyxllib"
+Documentation = "https://www.yuque.com/xlpr/pyxllib"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build]
+exclude = [".github", ".gitignore", ".gitattributes"]
+
+[tool.uv]
+index-url = "https://pypi.tuna.tsinghua.edu.cn/simple"

{pyxllib-0.3.200 → pyxllib-3.201.1}/pyxllib/__init__.py

@@ -12,10 +12,3 @@
 
 文档：https://www.yuque.com/xlpr/pyxllib/home/edit
 """
-
-import sys
-
-if sys.version_info.major == 3 and sys.version_info.minor >= 8:
-    import importlib.metadata
-
-    version = importlib.metadata.version('pyxllib')

{pyxllib-0.3.200 → pyxllib-3.201.1}/pyxllib/algo/geo.py

@@ -9,10 +9,6 @@
 specialist级别
 """
 
-from pyxllib.prog.pupil import check_install_package
-
-check_install_package('cv2', 'opencv-python')
-
 import copy
 
 import numpy as np

{pyxllib-0.3.200 → pyxllib-3.201.1}/pyxllib/algo/treelib.py

@@ -8,10 +8,6 @@
 树形结构相关的处理
 """
 
-from pyxllib.prog.pupil import check_install_package
-
-check_install_package('anytree')
-
 import re
 
 from anytree import Node

{pyxllib-0.3.200 → pyxllib-3.201.1}/pyxllib/algo/unitlib.py

@@ -6,10 +6,6 @@
 
 """ 单位功能库 """
 
-from pyxllib.prog.pupil import check_install_package
-
-check_install_package('pint')
-
 import pint
 
 import pandas as pd

{pyxllib-0.3.200 → pyxllib-3.201.1}/pyxllib/autogui/autogui.py

@@ -19,13 +19,8 @@ if sys.platform == 'win32':
     import pyautogui
     import win32gui
 
-try:
-    import pyscreeze  # NOQA pyautogui安装的时候会自动安装依赖的pyscreeze
-except ModuleNotFoundError:
-    pass
-
 from pyxllib.prog.newbie import first_nonnone, round_int
-from pyxllib.prog.pupil import xlwait, DictTool, check_install_package
+from pyxllib.prog.pupil import xlwait, DictTool
 from pyxllib.prog.specialist import TicToc
 from pyxllib.algo.geo import ComputeIou, ltrb2xywh, xywh2ltrb, ltrb2polygon
 from pyxllib.algo.shapelylib import ShapelyPolygon
@@ -646,7 +641,6 @@ def type_text(text):
 
     这种需求一般也可以用剪切板实现，但是剪切板不够独立轻量，可能会有意想不到的副作用
     """
-    check_install_package('pynput')
     from pynput.keyboard import Controller
 
     keyboard = Controller()

{pyxllib-0.3.200 → pyxllib-3.201.1}/pyxllib/data/echarts.py

@@ -10,10 +10,6 @@ Apache ECharts: https://echarts.apache.org/zh/index.html
 python版：pyechats的封装
 """
 
-from pyxllib.prog.pupil import check_install_package
-
-check_install_package('pyecharts')
-
 # import types
 
 import pyecharts

{pyxllib-0.3.200 → pyxllib-3.201.1}/pyxllib/data/jsonlib.py

@@ -6,10 +6,6 @@
 
 from collections import Counter
 
-from pyxllib.prog.pupil import check_install_package
-
-check_install_package('jmespath')
-
 import jmespath
 
 

{pyxllib-0.3.200 → pyxllib-3.201.1}/pyxllib/data/pglib.py

@@ -8,25 +8,9 @@
 针对PostgreSQL封装的工具
 """
 
-import os
 import sys
 
-from pyxllib.prog.pupil import check_install_package
-from pyxllib.file.specialist import XlPath, ensure_localdir
-
-# 使用binary安装，好像就不需要自己配置依赖了
-# if sys.platform == 'win32':
-#     # windows系统中pg的默认安装位置
-#     # https://www.yuque.com/xlpr/pyxllib/install_psycopg
-#     pgdll_dir = XlPath('C:/Program Files/PostgreSQL/14/bin')
-#     if not pgdll_dir.is_dir():  # 换一个自定义目录继续检查
-#         pgdll_dir = XlPath.userdir() / '.xlpr/pgdll'
-#     if not pgdll_dir.is_dir():
-#         print('没有PostgreSQL对应的dll文件，自动下载：')
-#         ensure_localdir(pgdll_dir, 'https://xmutpriu.com/download/pgdll_v14.zip')
-#     os.environ['PATH'] += ';' + pgdll_dir.as_posix()
-
-check_install_package('psycopg', 'psycopg[binary]')
+from pyxllib.file.specialist import XlPath
 
 import io
 from collections import Counter

{pyxllib-0.3.200 → pyxllib-3.201.1}/pyxllib/ext/demolib.py

@@ -15,7 +15,12 @@ test：测试代码，注重分析功能稳定性
 perf：性能测试，注重分析代码的运行效率
 """
 
-from pyxllib.xl import *
+import re
+
+from pyxllib.prog.pupil import dprint, dformat
+from pyxllib.prog.specialist import Timer, TicToc
+from pyxllib.file.pupil import getfiles
+from pyxllib.file.specialist import mygetfiles
 
 ____stdlib = """
 标准库相关

{pyxllib-0.3.200 → pyxllib-3.201.1}/pyxllib/ext/robustprocfile.py

@@ -10,10 +10,6 @@
 半定制化的功能组件
 """
 
-from pyxllib.prog.pupil import check_install_package
-
-check_install_package('joblib')
-
 from collections import defaultdict, Counter
 import datetime
 import re

{pyxllib-0.3.200 → pyxllib-3.201.1}/pyxllib/ext/unixlib.py

@@ -3,14 +3,8 @@
 # @Author : 陈坤泽
 # @Email  : 877362867@qq.com
 # @Date   : 2021/06/03 20:41
-import time
-
-from pyxllib.prog.pupil import check_install_package
 
-check_install_package('paramiko')
-check_install_package('scp')
-# 对 paramiko 进一步封装的库
-# check_install_package('fabric')
+import time
 
 import warnings
 from cryptography.utils import CryptographyDeprecationWarning

{pyxllib-0.3.200 → pyxllib-3.201.1}/pyxllib/ext/utools.py

@@ -6,12 +6,6 @@
 
 """ 专门给utools的快捷命令扩展的一系列python工具库
 """
-from pyxllib.prog.pupil import check_install_package
-
-check_install_package('fire')
-check_install_package('humanfriendly')
-check_install_package('pandas')
-check_install_package('pyautogui', 'PyAutoGui')  # 其实pip install不区分大小写，不过官方这里安装是驼峰名
 
 import datetime
 import json

{pyxllib-0.3.200 → pyxllib-3.201.1}/pyxllib/ext/wjxlib.py

@@ -21,19 +21,22 @@ class WjxWeb(DpWebBase):
     """ 问卷星网页的爬虫 """
 
     def __init__(self, url=None):
-        super().__init__(url or 'https://www.wjx.cn')
+        super().__init__('https://www.wjx.cn/login.aspx')
         self.login()
+        self.tab.get(url)
 
     def login(self):
         tab = self.tab
 
         if tab.url.startswith('https://www.wjx.cn/wjx/activitystat/resultlimit.aspx'):
-            tab('tag:a@@text():登录').click()
-
-        if tab.url.lower().startswith('https://www.wjx.cn/login.aspx'):
-            tab('tag:input@@name=UserName').input(os.getenv('WJX_USERNAME'), clear=True)
-            tab('tag:input@@name=Password').input(os.getenv('WJX_PASSWORD'), clear=True)
-            tab('tag:input@@type=submit').click()
+            tab('t:a@@text():登录').click()
+
+        if tab.url.startswith('https://www.wjx.cn/login.aspx'):
+            tab('t:input@@name=UserName').input(os.getenv('WJX_USERNAME'), clear=True)
+            tab('t:input@@name=Password').input(os.getenv('WJX_PASSWORD'), clear=True)
+            tab('t:label@@for=RememberMe').click()
+            time.sleep(2)
+            tab('t:input@@type=submit').click()
 
     def get_page_num(self):
         """