gomyck-tools 1.1.9__tar.gz → 1.2.0__tar.gz

{gomyck-tools-1.1.9 → gomyck-tools-1.2.0}/PKG-INFO

@@ -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 → gomyck-tools-1.2.0}/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()

{gomyck-tools-1.1.9 → gomyck-tools-1.2.0}/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)
 """
 
 """

gomyck-tools-1.1.9/ctools/id_worker_tools.py → gomyck-tools-1.2.0/ctools/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())

{gomyck-tools-1.1.9 → gomyck-tools-1.2.0}/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 → gomyck-tools-1.2.0}/gomyck_tools.egg-info/PKG-INFO

@@ -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 → gomyck-tools-1.2.0}/gomyck_tools.egg-info/SOURCES.txt

@@ -26,7 +26,6 @@ ctools/ex.py
 ctools/excelOpt.py
 ctools/html_soup.py
 ctools/http_utils.py
-ctools/id_worker_tools.py
 ctools/images_tools.py
 ctools/imgDialog.py
 ctools/license.py
@@ -41,6 +40,7 @@ ctools/resource_bundle_tools.py
 ctools/screenshot_tools.py
 ctools/sign.py
 ctools/sm_tools.py
+ctools/snow_id.py
 ctools/strDiff.py
 ctools/string_tools.py
 ctools/sys_info.py

gomyck-tools-1.2.0/gomyck_tools.egg-info/requires.txt

@@ -0,0 +1,16 @@
+jsonpickle==3.4.2
+SQLAlchemy>=2.0.36
+chardet>=5.2.0
+psycopg2-binary>=2.9.10
+croniter>=5.0.1
+gmssl>=3.2.2
+psutil>=6.1.0
+jsonpath_ng>=1.7.0
+bottle==0.13.2
+requests==2.32.3
+urllib3==1.26.20
+kafka-python==2.0.2
+bs4==0.0.2
+paho-mqtt==2.1.0
+fuzzywuzzy==0.18.0
+pymysql==1.1.1

{gomyck-tools-1.1.9 → gomyck-tools-1.2.0}/setup.py

@@ -11,7 +11,7 @@ requirements = parse_requirements(os.path.join(os.path.dirname(__file__), 'requi
 
 setup(
   name="gomyck-tools",
-  version="1.1.9",
+  version="1.2.0",
   author="gomyck",
   author_email="hao474798383@163.com",
   description="A ctools for python development by hao474798383",

gomyck-tools-1.1.9/gomyck_tools.egg-info/requires.txt

@@ -1,16 +0,0 @@
-jsonpickle==3.3.0
-SQLAlchemy>=2.0.32
-chardet>=5.2.0
-psycopg2-binary>=2.9.9
-croniter>=3.0.3
-gmssl>=3.2.2
-psutil>=6.0.0
-jsonpath_ng>=1.6.1
-bottle==0.13.1
-requests==2.32.3
-urllib3==1.26.18
-kafka-python==2.0.2
-bs4==0.0.2
-paho-mqtt==2.1.0
-fuzzywuzzy==0.18.0
-pymysql==1.1.1