gomyck-tools 1.1.9__py3-none-any.whl → 1.2.0__py3-none-any.whl

ctools/bottle_webserver.py

@@ -9,6 +9,7 @@ app = bottle_web_base.init_app('子模块写 context_path, 主模块就不用写
 @app.get('/queryList')
 @bottle_web_base.rule('DOC:DOWNLOAD')
 def query_list(params):
+  print(123)
 """
 
 """
@@ -27,7 +28,7 @@ def get_ws_modules():
 """
 
 """
-http_app = bottle_webserver.init_bottle()
+http_app = bottle_webserver.init_bottle() # 这里可以传 APP 当做主模块
 http_app.mount(app.context_path, app)
 http_app.set_index(r'轨迹点位压缩.html')
 http_app.run()

ctools/bottle_websocket.py

@@ -4,11 +4,12 @@ from geventwebsocket.handler import WebSocketHandler
 from ctools import sys_log
 
 """
-app = init_app('/websocket_demo')
+app = bottle_web_base.init_app('/websocket_demo')
 
 @app.route('/script_debug', apply=[websocket])
-@rule('DOC:DOWNLOAD')
+@bottle_web_base.rule('DOC:DOWNLOAD')
 def script_debug(ws: WebSocket):
+  print(123)
 """
 
 """

ctools/{id_worker_tools.py → snow_id.py}

@@ -16,11 +16,11 @@ SEQUENCE_MASK = -1 ^ (-1 << SEQUENCE_BITS)
 # Twitter元年时间戳
 TWEPOCH = 1288834974657
 
-class IdWorker(object):
+class SnowId(object):
   """
   用于生成IDs
   """
-  def __init__(self, datacenter_id, worker_id, sequence=0):
+  def __init__(self, datacenter_id=0, worker_id=0, sequence=0):
     """
     初始化
     :param datacenter_id: 数据中心（机器区域）ID
@@ -74,7 +74,3 @@ class IdWorker(object):
     while timestamp <= last_timestamp:
       timestamp = self._gen_timestamp()
     return timestamp
-
-# if __name__ == '__main__':
-#   worker = IdWorker(1, 2, 0)
-#   print(worker.get_id())

ctools/string_tools.py

@@ -5,27 +5,19 @@ from typing import Union
 
 import chardet
 
-from ctools.id_worker_tools import IdWorker
+from ctools.snow_id import SnowId
 
-idWorker = IdWorker(1, 2, 0)
+idWorker = SnowId(1, 2, 0)
 
 def get_random_str(size: int = 10):
-  """
-  根据长度获取随机字符串
-  :param size:
-  :return:
-  """
   return "".join(random.sample('abcdefghijklmnopqrstuvwxyz0123456789', size))
 
-
 def get_uuid():
   return str(uuid.uuid1()).replace("-", "")
 
-
 def get_snowflake_id():
   return idWorker.get_id()
 
-
 def decode_bytes(bytes_str: Union[bytes, bytearray]):
   res_str = ""
   if bytes_str:
@@ -80,12 +72,6 @@ def is_bool(v: str):
   else:
     return False
 
-def is_obj(k: str):
-  if k in ['operate', 'pm_browser_sm_options', 'pw_context_sm_service']:
-    return True
-  else:
-    return False
-
 def dict_to_params(obj: dict):
   params = ""
   for k, v in obj.items():

{gomyck_tools-1.1.9.dist-info → gomyck_tools-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.1.9
+Version: 1.2.0
 Summary: A ctools for python development by hao474798383
 Home-page: https://blog.gomyck.com
 Author: gomyck
@@ -10,17 +10,17 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Requires-Dist: jsonpickle ==3.3.0
-Requires-Dist: SQLAlchemy >=2.0.32
+Requires-Dist: jsonpickle ==3.4.2
+Requires-Dist: SQLAlchemy >=2.0.36
 Requires-Dist: chardet >=5.2.0
-Requires-Dist: psycopg2-binary >=2.9.9
-Requires-Dist: croniter >=3.0.3
+Requires-Dist: psycopg2-binary >=2.9.10
+Requires-Dist: croniter >=5.0.1
 Requires-Dist: gmssl >=3.2.2
-Requires-Dist: psutil >=6.0.0
-Requires-Dist: jsonpath-ng >=1.6.1
-Requires-Dist: bottle ==0.13.1
+Requires-Dist: psutil >=6.1.0
+Requires-Dist: jsonpath-ng >=1.7.0
+Requires-Dist: bottle ==0.13.2
 Requires-Dist: requests ==2.32.3
-Requires-Dist: urllib3 ==1.26.18
+Requires-Dist: urllib3 ==1.26.20
 Requires-Dist: kafka-python ==2.0.2
 Requires-Dist: bs4 ==0.0.2
 Requires-Dist: paho-mqtt ==2.1.0

{gomyck_tools-1.1.9.dist-info → gomyck_tools-1.2.0.dist-info}/RECORD

@@ -5,8 +5,8 @@ ctools/application.py,sha256=DcuSt2m8cDuSftx6eKfJ5gA6_F9dDlzkj0K86EG4F7s,15884
 ctools/b64.py,sha256=_BdhX3p3-MaSSlU2wivN5qPxQfacR3VRBr1WC456tU0,194
 ctools/bashPath.py,sha256=BCN_EhYzqvwsxYso81omMNd3SbEociwSOyb9kLvu8V4,337
 ctools/bottle_web_base.py,sha256=7hXCh2gkw2Nct6U_jweW_5qCtGB6iXcgmsnMVr4_pzE,4898
-ctools/bottle_webserver.py,sha256=ewqio5uKmYsvbTroidB7ZQ8XZm5Dmc2jWHpoqb4pIDI,2499
-ctools/bottle_websocket.py,sha256=IRY17SpDFjihLeU8c_aUIMAfUNZzurqfrOyNFojOQHQ,1858
+ctools/bottle_webserver.py,sha256=8w1oj6_P09an6Pdnr5dH9ClBiD-A6k27IBCSvqVfcTs,2550
+ctools/bottle_websocket.py,sha256=wjsjKVE_tlon0hYfnzBT0Sis6yNPe318vKgTfzWYbfQ,1903
 ctools/browser_element_tools.py,sha256=IFR_tWu5on0LxhuC_4yT6EOjwCsC-juIoU8KQRDqR7E,9952
 ctools/call.py,sha256=BCr8wzt5qd70okv8IZn-9-EpjywleZgvA3u1vfZ_Kt8,1581
 ctools/cjson.py,sha256=M2XrXnFXTJyKsXP2JRos2Bse4b6WXjr6TrA6y-EF_Ig,1245
@@ -24,7 +24,6 @@ ctools/ex.py,sha256=_UtbmDLrC7uZsoBtTdecuCZAlf2DA7fvojUf5fGZDVo,795
 ctools/excelOpt.py,sha256=q3HLAb1JScTrMCvx_x-4WWnqKhyTEzQ-m5vtqFy8NZU,1138
 ctools/html_soup.py,sha256=rnr8M3gn3gQGo-wNaNFXDjdzp8AAkv9o4yqfIIfO-zw,1567
 ctools/http_utils.py,sha256=dG26aci1_YxAyKwYqMKFw4wZAryLkDyvnQ3hURjB6Lk,768
-ctools/id_worker_tools.py,sha256=M4ehNKbVIrBhPs-GlVKEZ43WQArNb9s4UoVGgRit4YM,2356
 ctools/images_tools.py,sha256=TapXYCPqC7GesgrALecxxa_ApuT_dxUG5fqQIJF2bNY,670
 ctools/imgDialog.py,sha256=zFeyPmpnEn9Ih7-yuJJrePqW8Myj3jC9UYMTDk-umTs,1385
 ctools/license.py,sha256=0Kh7lXL7LD1PQqyijHajFL0GbmZGNB88PA2WskbQn_s,1066
@@ -39,8 +38,9 @@ ctools/resource_bundle_tools.py,sha256=wA4fmD_ZEcrpcvUZKa60uDDX-nNQSVz1nBh0A2GVu
 ctools/screenshot_tools.py,sha256=KoljfgqW5x9aLwKdIfz0vR6v-fX4XjE92HudkDxC2hE,4539
 ctools/sign.py,sha256=JOkgpgsMbk7T3c3MOj1U6eiEndUG9XQ-uIX9e615A_Y,566
 ctools/sm_tools.py,sha256=RwhTjuKw_TjaAJAui39wctzFFpbt79MQ3hjF0fhL638,1113
+ctools/snow_id.py,sha256=hYinnRN-aOule4_9vfgXB7XnsU-56cIS3PhzAwWBc5E,2270
 ctools/strDiff.py,sha256=QUtXOfsRLTFozH_zByqsC39JeuG3eZtrwGVeLyaHYUI,429
-ctools/string_tools.py,sha256=WlLQxQePbYVzvPi0YFGpTbHLQl9eRhHrX-DPkN4zMzg,2162
+ctools/string_tools.py,sha256=p_O3HiqlHCgzJVXHUeeDYZK2_WrqetD0eYijQFXWkGg,1938
 ctools/sys_info.py,sha256=p5Erxn0Rv5HRSXlqDt7ffIWCBQU66G-sdW6doMAeAks,3627
 ctools/sys_log.py,sha256=oqb1S41LosdeZxtogFVgDk8R4sjiHhUeYJLCzHd728E,2805
 ctools/thread_pool.py,sha256=qb68ULHy1K7u3MC7WP49wDhmgUhgWazd9FRuFbClET4,925
@@ -51,7 +51,7 @@ ctools/wordFill.py,sha256=dB1OLt6GLmWdkDV8H20VWbJmY4ggNNI8iHD1ocae2iM,875
 ctools/word_fill.py,sha256=xeo-P4DOjQUqd-o9XL3g66wQrE2diUPGwFywm8TdVyw,18210
 ctools/word_fill_entity.py,sha256=eX3G0Gy16hfGpavQSEkCIoKDdTnNgRRJrFvKliETZK8,985
 ctools/work_path.py,sha256=i4MTUobqNW2WMrT3mwEC_XYQ0_IhFmKoNpTX2W6A8Tc,1680
-gomyck_tools-1.1.9.dist-info/METADATA,sha256=cE9BYuIsjDx1LKyycj_yH_N9gX_ndKTju07tmJ4z_tc,971
-gomyck_tools-1.1.9.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-gomyck_tools-1.1.9.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
-gomyck_tools-1.1.9.dist-info/RECORD,,
+gomyck_tools-1.2.0.dist-info/METADATA,sha256=fGkZEdcTWWnI6Nj3aEcuhexNSQaLlP9Wbte5bGEOIZc,972
+gomyck_tools-1.2.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+gomyck_tools-1.2.0.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
+gomyck_tools-1.2.0.dist-info/RECORD,,