pyxllib 0.3.114__tar.gz → 0.3.115__tar.gz

{pyxllib-0.3.114/pyxllib.egg-info → pyxllib-0.3.115}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxllib
-Version: 0.3.114
+Version: 0.3.115
 Summary: 厦门理工模式识别团队通用python代码工具库
 Home-page: https://github.com/XLPRUtils/pyxllib
 Author: code4101

{pyxllib-0.3.114 → pyxllib-0.3.115}/pyxllib/data/sqlite.py

@@ -78,6 +78,22 @@ class SqlBuilder:
         self._where.append(f"({' OR '.join(conditions)})")
         return self
 
+    def where_mod(self, column, divisor, remainder):
+        """ 输入的column列的值对divisor取余，筛选出余数为remainder的记录
+        """
+        condition = f"({column} % {divisor} = {remainder})"
+        self._where.append(condition)
+        return self
+
+    def where_mod2(self, desc):
+        """ 使用一种特殊的格式化标记来设置规则
+
+        :param desc: 例如 'id%2=1'
+        """
+        column, divisor_remainder = desc.split('%')
+        divisor, remainder = map(int, divisor_remainder.split('='))
+        return self.where_mod(column, divisor, remainder)
+
     def group_by(self, *columns):
         self._group_by.extend(columns)
         return self
@@ -140,6 +156,16 @@ class SqlBuilder:
         sql.where(f"table_name='{self.table}' AND column_name='{column}'")
         return sql.build_select()
 
+    def build_group_count(self, columns, count_column_name='cnt'):
+        sql = SqlBuilder(self.table)
+        if isinstance(columns, (list, tuple)):
+            columns = ', '.join(columns)
+        sql.select(columns, f"COUNT(*) {count_column_name}")
+        sql.group_by(columns)
+        sql.order_by(f'{count_column_name} DESC')
+        sql._where = self._where.copy()
+        return sql.build_select()
+
 
 class SqlBase:
     """ Sql语法通用的功能 """

{pyxllib-0.3.114 → pyxllib-0.3.115}/pyxllib/ext/drissionlib.py

@@ -16,6 +16,7 @@ from DrissionPage import ChromiumPage
 from DrissionPage._base.base import BasePage, BaseElement
 
 from pyxllib.prog.pupil import inject_members
+from pyxllib.text.pupil import strfind
 
 
 def get_latest_not_dev_tab(page=None):
@@ -24,7 +25,7 @@ def get_latest_not_dev_tab(page=None):
         page = ChromiumPage()
     tabs = page.get_tabs()
     for tab in tabs:
-        if tab.url.startswith('devtools://'):
+        if strfind(tab.url, ['devtools://', 'chrome-extension://']) != -1:
             continue
         return tab
 

{pyxllib-0.3.114 → pyxllib-0.3.115}/pyxllib/text/pupil/common.py

@@ -1093,3 +1093,29 @@ def trial_jsoneditconveter():
     trial_data(json_obj2)
     trial_data(json_obj3)
     trial_data(json_obj4)
+
+
+class UrlQueryBuilder:
+    def __init__(self):
+        self.params = {}
+
+    def add_param(self, key, value):
+        if value is not None:
+            self.params[key] = value
+        return self
+
+    def remove_param(self, key):
+        if key in self.params:
+            del self.params[key]
+        return self
+
+    def update_param(self, key, value):
+        self.add_param(key, value)
+        return self
+
+    def build_query(self):
+        query_string = '&'.join([f'{key}={value}' for key, value in self.params.items()])
+        return ('?' + query_string) if query_string else ''
+
+    def build_url(self, url):
+        return f'{url}{self.build_query()}'

{pyxllib-0.3.114 → pyxllib-0.3.115/pyxllib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxllib
-Version: 0.3.114
+Version: 0.3.115
 Summary: 厦门理工模式识别团队通用python代码工具库
 Home-page: https://github.com/XLPRUtils/pyxllib
 Author: code4101

{pyxllib-0.3.114 → pyxllib-0.3.115}/setup.py

@@ -28,6 +28,7 @@ xlcocotools
 
 # 全量的依赖，自用
 xlall = """
+xlrd
 flask_wtf
 flask_restful
 zhconv
@@ -38,7 +39,7 @@ _dir = Path(__file__).parent
 
 setup(
     name='pyxllib',  # pip 安装时用的名字
-    version='0.3.114',  # 当前版本，每次更新上传到pypi都需要修改; 第4位版本号一般是修紧急bug
+    version='0.3.115',  # 当前版本，每次更新上传到pypi都需要修改; 第4位版本号一般是修紧急bug
     author='code4101',
     author_email='877362867@qq.com',
     url='https://github.com/XLPRUtils/pyxllib',

{pyxllib-0.3.114 → pyxllib-0.3.115}/pyxllib.egg-info/requires.txt

@@ -22,13 +22,13 @@ pandas>=0.23.4
 
 [xlai]
 visdom
-xlcocotools
-opencv-python
-pynvml
 pillow
+opencv-python
 opsdroid-get-image-size
+xlcocotools
+pynvml
 
 [xlcv]
-opencv-python
 opsdroid-get-image-size
 pillow
+opencv-python