pyxllib 0.3.200__py3-none-any.whl → 3.201.1__py3-none-any.whl

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/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/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/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/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/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/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/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/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/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/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/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/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):
         """

pyxllib/ext/yuquelib.py

@@ -3,23 +3,28 @@
 # @Author : 陈坤泽
 # @Email  : 877362867@qq.com
 # @Date   : 2024/01/01
+
+import os
 import html
 import re
 import time
 from enum import Enum
+import pprint
+import json
 
 import requests
 import urllib.parse
+import pandas as pd
 
 from fastcore.basics import GetAttr
-from pprint import pprint
+from loguru import logger
 
-from pyxllib.xl import *
-from pyxllib.algo.stat import *
 from pyxllib.prog.newbie import SingletonForEveryInitArgs
-from pyxllib.text.pupil import UrlQueryBuilder
+from pyxllib.prog.pupil import run_once
+from pyxllib.text.pupil import UrlQueryBuilder, shorten
 from pyxllib.text.nestenv import NestEnv
 from pyxllib.text.xmllib import BeautifulSoup, XlBs4Tag
+from pyxllib.file.specialist import refinepath, XlPath
 from pyxllib.cv.xlcvlib import xlcv
 
 

pyxllib/file/docxlib.py

@@ -4,10 +4,6 @@
 # @Email  : 877362867@qq.com
 # @Date   : 2021/08/31 09:56
 
-from pyxllib.prog.pupil import check_install_package
-
-check_install_package('win32com', 'pywin32')
-check_install_package('docx', 'python-docx')
 
 import json
 import os

pyxllib/file/movielib.py

@@ -4,10 +4,6 @@
 # @Email  : 877362867@qq.com
 # @Date   : 2022/02/25 17:54
 
-from pyxllib.prog.pupil import check_install_package
-
-check_install_package('moviepy')
-
 import cv2
 from moviepy.editor import VideoFileClip
 from moviepy.editor import cvsecs

pyxllib/file/pdflib.py

@@ -4,9 +4,6 @@
 # @Email  : 877362867@qq.com
 # @Date   : 2020/06/02 16:06
 
-from pyxllib.prog.pupil import check_install_package
-
-check_install_package('fitz', 'PyMuPdf>=1.18.17')
 
 import json
 import os
@@ -91,7 +88,6 @@ class FitzDoc:
 
     def to_docx(self, docx_file=None):
         """ pdf转docx """
-        check_install_package('pdf2docx')
         from pdf2docx import parse
 
         pdf_file = self.src_file

pyxllib/file/specialist/__init__.py

@@ -3,11 +3,7 @@
 # @Author : 陈坤泽
 # @Email  : 877362867@qq.com
 # @Date   : 2021/06/06 17:46
-import re
 
-from pyxllib.prog.pupil import check_install_package
-
-check_install_package('joblib', 'joblib>=1.3.2')
 
 from collections import OrderedDict
 import sqlite3

pyxllib/file/specialist/filelib.py

@@ -4,9 +4,6 @@
 # @Email  : 877362867@qq.com
 # @Date   : 2020/05/30 20:37
 
-from pyxllib.prog.pupil import check_install_package
-
-check_install_package('filetype')
 
 from typing import Callable, Any
 import io
@@ -24,7 +21,6 @@ import math
 from itertools import islice
 import datetime
 
-# import chardet
 import charset_normalizer
 import qiniu
 import requests

pyxllib/file/xlsxlib.py

@@ -7,18 +7,9 @@
 """
 扩展了些自己的openpyxl工具
 """
-import copy
 
+import copy
 import time
-
-from pyxllib.prog.pupil import check_install_package, run_once
-
-check_install_package('openpyxl')
-# check_install_package('premailer')
-# check_install_package('xlrd2')
-check_install_package('yattag')
-check_install_package('jsonpickle')
-
 from collections import Counter, OrderedDict, defaultdict
 import csv
 import datetime
@@ -48,7 +39,7 @@ except ModuleNotFoundError:
 
 from pyxllib.prog.newbie import human_readable_number
 from pyxllib.prog.pupil import (inject_members, dprint, xlmd5, shuffle_dict_keys, Timeout,
-                                safe_div, format_exception, DictTool)
+                                safe_div, format_exception, DictTool, run_once)
 from pyxllib.prog.specialist import browser, TicToc
 from pyxllib.algo.specialist import product
 from pyxllib.text.pupil import calc_chinese_ratio

pyxllib/prog/cachetools.py

@@ -4,13 +4,6 @@
 # @Email  : 877362867@qq.com
 # @Date   : 2024/05/29
 
-from pyxllib.prog.pupil import check_install_package
-
-# cachetools，通用缓存工具，适用范围更广
-check_install_package('cachetools')
-# cached-property，类属性特用工具，相对比较简洁些
-check_install_package('cached_property', 'cached-property')
-
 # 对于普通函数，一般用lru_cache即可
 from functools import lru_cache
 import threading
@@ -37,6 +30,7 @@ def xlcache(maxsize=128, *, ttl=None, lock=None, property=False):
         而是外部再加一层@property，不然IDE会识别不了这是一个property，影响开发
 
     """
+
     def decorator(func):
         if property:
             if ttl is not None:

pyxllib/prog/pupil.py

@@ -386,6 +386,17 @@ class EnchantBase:
         raise NotImplementedError
 
 
+def check_package(package, speccal_install_name=None):
+    """ 250418周五16:36，check_install_package的简化版本，只检查、报错，提示安装依赖，但不自动进行安装
+    """
+    try:
+        __import__(package)
+    except ModuleNotFoundError:
+        cmds = [sys.executable, "-m", "pip", "install"]
+        cmds.append(speccal_install_name if speccal_install_name else package)
+        raise ModuleNotFoundError(f'缺少依赖包：{package}，请自行安装扩展依赖：{cmds}\n')
+
+
 def check_install_package(package, speccal_install_name=None, *, user=False):
     """ https://stackoverflow.com/questions/12332975/installing-python-module-within-code
 

pyxllib/prog/specialist/__init__.py

@@ -90,49 +90,6 @@ def mtqdm(func, iterable, *args, max_workers=1, check_per_seconds=0.01, **kwargs
         executor.shutdown()
 
 
-def distribute_package(root, version=None, repository=None, *,
-                       upload=True,
-                       version_file='setup.py',
-                       delete_dist=True):
-    """ 发布包的工具函数
-
-    :param root: 项目的根目录，例如 'D:/slns/pyxllib'
-        根目录下有对应的 setup.py 等文件
-    :param repository: 比如我配置了 [xlpr]，就可以传入 'xlpr'
-    :param version_file: 保存版本号的文件，注意看正则规则，需要满足特定的范式，才会自动更新版本号
-    :param delete_dist: 上传完是否自动删除dist目录，要检查上传包是否有遗漏时，要关闭
-    """
-    import sys
-    from pyxllib.file.specialist import XlPath
-
-    # 1 切换工作目录
-    os.chdir(str(root))
-
-    # 2 改版本号
-    if version:
-        f = XlPath(root) / version_file
-        s = re.sub(r"(version\s*=\s*)(['\"])(.+?)(\2)", fr'\1\g<2>{version}\4', f.read_text())
-        f.write_text(s)
-
-    # 3 打包
-    subprocess.run(f'{sys.executable} setup.py sdist')
-
-    # 4 上传
-    if upload:
-        # 上传
-        cmd = 'twine upload dist/*'
-        if repository:
-            cmd += f' -r {repository}'
-        subprocess.run(cmd)
-        # 删除打包生成的中间文件
-        if delete_dist:
-            XlPath('dist').delete()
-        XlPath('build').delete()
-
-        # 这个不能删，不然importlib会读取不到模块的版本号
-        # [d.delete() for d in XlPath('.').select_dirs(r'*.egg-info')]
-
-
 def estimate_package_size(package):
     """ 估计一个库占用的存储大小 """
 

pyxllib/prog/xlosenv.py

@@ -4,6 +4,8 @@
 # @Email  : 877362867@qq.com
 # @Date   : 2024/10/30
 
+# from pyxllib.prog.pupil import check_package
+# check_package('envariable')
 
 import os
 import json

pyxllib/text/ahocorasick.py

@@ -4,9 +4,6 @@
 # @Email  : 877362867@qq.com
 # @Date   : 2021/06/06 16:57
 
-from pyxllib.prog.pupil import check_install_package
-
-check_install_package('ahocorasick', 'pyahocorasick')
 
 from collections import Counter
 import re

pyxllib/text/airscript.js

@@ -742,3 +742,13 @@ function extendFormatConditionsToFullColumns(ws) {
         }
     }
 }
+
+function 新建一条条件格式() {
+    const ws = ActiveSheet
+    const rng = ws.UsedRange
+
+    const formatConditions = rng.FormatConditions
+    // B列重复值高亮
+    const newCondition = formatConditions.Add(st.XlFormatConditionType.xlCellValue, st.XlFormatConditionOperator.xlEqual, '=B2')
+
+}

pyxllib/text/jinjalib.py

@@ -4,11 +4,6 @@
 # @Email  : 877362867@qq.com
 # @Date   : 2024/05/26
 
-from pyxllib.prog.pupil import check_install_package
-
-# 一个xpath解析库
-check_install_package('jinja2')
-
 import jinja2
 from jinja2 import Template, Environment
 

pyxllib/text/levenshtein.py

@@ -4,12 +4,12 @@
 # @Email  : 877362867@qq.com
 # @Date   : 2021/06/06 17:01
 
-from pyxllib.prog.pupil import check_install_package
+# from pyxllib.prog.pupil import check_install_package
 
 # 这个需要C++14编译器 https://download.microsoft.com/download/5/f/7/5f7acaeb-8363-451f-9425-68a90f98b238/visualcppbuildtools_full.exe
 # 在需要的时候安装，防止只是想用pyxllib很简单的功能，但是在pip install阶段处理过于麻烦
 # MatchSimString计算编辑距离需要
-check_install_package('Levenshtein', 'python-Levenshtein')
+# check_install_package('Levenshtein', 'python-Levenshtein')
 
 from collections import defaultdict
 from more_itertools import chunked

pyxllib/text/xmllib.py

@@ -8,11 +8,6 @@
 xml等网页结构方面的处理
 """
 
-# from pyxllib.prog.pupil import check_install_package
-
-# 一个xpath解析库
-# check_install_package('xpath_parser', 'xpath-parser')
-
 import collections
 from collections import Counter, defaultdict
 import re
@@ -23,7 +18,6 @@ import pandas as pd
 import bs4
 from bs4 import BeautifulSoup
 from humanfriendly import format_size
-# from xpath_parser import XpathExpression
 
 from pyxllib.prog.newbie import round_int
 from pyxllib.prog.pupil import dprint, run_once, inject_members