gomyck-tools 1.1.6__py3-none-any.whl → 1.1.7__py3-none-any.whl

ctools/application.py

@@ -23,10 +23,9 @@ class Server:
   metricsPort = 8011  # 获取指标信息端口
   wsPort = 8012  # websocket服务端口
   startTime = time.time()  # 系统启动时间
-  baseWorkPath = work_path.get_user_work_path('hylink/hylink-rpa')  # 基础的工作目录
+  baseWorkPath = work_path.get_user_work_path('rpa')  # 基础的工作目录
   sysLogPath = os.path.join(baseWorkPath, ".logs")  # 系统日志存储目录
   pythonHome = os.path.join(work_path.get_Users_path(), 'Public/python-3.8.9')  # python根目录
-  hylinkFunctionPath = os.path.join(pythonHome, "Lib", "site-packages", "hylink")
   indicatorsPath = os.path.join(baseWorkPath, "indicators")  # 指标信息存储目录
   screenshotPath = os.path.join(baseWorkPath, "screenshot")  # 截图存储目录
   controlServerAddr = None
@@ -117,10 +116,10 @@ def check_database():
     if db_size < 2000 * 1024: os.remove(db_file)
 
 def validate_sign():
-  sign_app_val = sign.generate_signature(work_path.get_install_path('hylink-rpa-server.exe'))
-  with open(work_path.get_install_path('hylink-rpa-server.sign')) as sign_file:
+  sign_app_val = sign.generate_signature(work_path.get_install_path('rpa-server.exe'))
+  with open(work_path.get_install_path('rpa-server.sign')) as sign_file:
     sign_file_val = sign_file.readline()
-  if 'hylink-rpa-dev-sign' == sign_file_val.strip(): return
+  if 'rpa-dev-sign' == sign_file_val.strip(): return
   if sign_app_val != sign_file_val: raise Exception('程序签名验证失败!!!')
 
 
@@ -349,7 +348,7 @@ def sync_paddleocr_model():
     print('安装paddleocr模型文件结束')
 
 
-def clean_temp_dir(target_file='hylink_rpa_ident'):
+def clean_temp_dir(target_file='rpa_ident'):
   root_folder = work_path.get_user_temp_path()
   print("Start clear cache...")
   for folder_name in os.listdir(root_folder):

ctools/bottle_web_base.py

@@ -22,7 +22,7 @@ class GlobalState:
   ]
   token = {}
 
-def init_app(context_path):
+def init_app(context_path=None):
   app = Bottle()
   app.context_path = context_path
 
@@ -87,7 +87,7 @@ def rule(key):
     return decorated
   return return_func
 
-# annotation or plugins
+# annotation or plugins, has auto install, don't need to call
 def params_resolve(func):
   @wraps(func)
   def decorated(*args, **kwargs):

ctools/bottle_webserver.py

@@ -4,12 +4,11 @@ from wsgiref.simple_server import WSGIServer, WSGIRequestHandler, make_server
 from bottle import ServerAdapter, Bottle, template, static_file
 
 """
-app = init_app('/doc_download')
+app = bottle_web_base.init_app('子模块写 context_path, 主模块就不用写任何东西')
 
 @app.get('/queryList')
-@mvc.parameter_handler()
-@rule('DOC:DOWNLOAD')
-def query_list(params, pageInfo):
+@bottle_web_base.rule('DOC:DOWNLOAD')
+def query_list(params):
 """
 
 """

ctools/database.py

@@ -33,6 +33,9 @@ def _init():
 # 密码里的@  要替换成 %40
 # sqlite connect_args={"check_same_thread": False}  sqlite:///{}.format(db_url)
 def init_db(db_url: str, db_key: str='default', connect_args: dict={}, default_schema: str=None, pool_size: int=5, max_overflow: int=25, echo: bool=False):
+  if db_url.startswith('mysql'):
+    import pymysql
+    pymysql.install_as_MySQLdb()
   if inited_db.get(db_key): raise Exception('db {} already init!!!'.format(db_key))
   global engines, sessionMakers
   engine, sessionMaker = _create_connection(db_url=db_url, connect_args=connect_args, pool_size=pool_size, max_overflow=max_overflow, echo=echo)

ctools/dict_wrapper.py

@@ -5,7 +5,10 @@ __date__ = '2024/10/25 09:42'
 
 class DictWrapper(dict):
   def __getattr__(self, key):
-    return self.get(key)
+    res = self.get(key)
+    if type(res) == dict:
+      return DictWrapper(res)
+    return res
 
   def __setattr__(self, key, value):
     self[key] = value

ctools/douglas_rarefy.py

@@ -10,6 +10,9 @@ from jsonpath_ng import parser
 from ctools import cjson
 from ctools.sys_log import flog as log
 
+"""
+douglas_rarefy.DouglasRarefy(res, level=3).sparse_points()
+"""
 
 class THIN_LEVEL:
   L1 = 0.00001

ctools/html_soup.py

@@ -33,10 +33,3 @@ def table2list(html, include_header=True, recursive_find=True,
     row = [i.text for i in td]
     rows.append(row)
   return rows
-
-
-for e in table2list(open(r'C:\Users\hylink\Desktop\A-DESC.txt', encoding='utf-8'), table_attrs={'class_': '123'}):
-  print(e)
-
-for e in table2list(open(r'C:\Users\hylink\Desktop\DEMO.txt', encoding='utf-8'), recursive_find=False, header_cell_tag='div', table_tag='div', table_class='table', row_tag='div', cell_tag='div'):
-  print(e)

ctools/resource_bundle_tools.py

@@ -30,7 +30,7 @@ def data_layout(manifest: dict):
 
 
 def get_md5_sum(data):
-  return hashlib.md5(data + "hylink-rpa".encode()).hexdigest()
+  return hashlib.md5(data + "gomyck-daning".encode()).hexdigest()
 
 
 def signature(manifest: dict):

ctools/sign.py

@@ -1,7 +1,7 @@
 import hashlib
 import hmac
 
-global_key = 'hylink2014'
+global_key = 'gomyck2014'
 
 
 def generate_signature(file_path, key: str = global_key):

ctools/sys_info.py

@@ -69,7 +69,7 @@ def get_origin_machine_code():
       0
     )
     disk_serial = str(volume_serial.value)
-  combined_info = cpu_serial + disk_serial + '-hylink'
+  combined_info = cpu_serial + disk_serial + '-gomyck'
   return hashlib.md5(combined_info.encode()).hexdigest()
 
 

ctools/word_fill.py

@@ -494,7 +494,7 @@ def excel_optimize(input_path: str):
 
 
 # 示例用法：从第1行到第5行、从第1列到第3列的区域复制到Word文档中
-# excel_file = r'C:\Users\DELL\hylink/hylink-rpa/document\test-2024-04-01_09-05-26.xlsx'       # Excel文件名
+# excel_file = r'C:\Users\DELL\xxx/xxx-rpa/document\test-2024-04-01_09-05-26.xlsx'       # Excel文件名
 # excel_file_1 = r'E:\test\c.xlsx'       # Excel文件名
 # excel_file_2 = r'E:\test\b.xlsx'       # Excel文件名
 # word_file = r'E:\test\test.docx'     # 输出Word文件名

{gomyck_tools-1.1.6.dist-info → gomyck_tools-1.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.1.6
+Version: 1.1.7
 Summary: A ctools for python development by hao474798383
 Home-page: https://blog.gomyck.com
 Author: gomyck
@@ -25,5 +25,6 @@ Requires-Dist: kafka-python ==2.0.2
 Requires-Dist: bs4 ==0.0.2
 Requires-Dist: paho-mqtt ==2.1.0
 Requires-Dist: fuzzywuzzy ==0.18.0
+Requires-Dist: pymysql ==1.1.1
 
 this package is for python development

{gomyck_tools-1.1.6.dist-info → gomyck_tools-1.1.7.dist-info}/RECORD

@@ -1,11 +1,11 @@
 ctools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ctools/aes_tools.py,sha256=ylUgyhlx7bNCTGrbWEZVwCObzYdJTQtwEc4ZMidL2Fo,563
 ctools/api_result.py,sha256=NiM-R9K42G3m16B27sG_mqKrlexZzC5-LKoY8D5tO4s,1239
-ctools/application.py,sha256=WviU7p9GOqducbGW3XGkP7jCNKmraCh6JGSYBC33CQk,16008
+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=I8SrytLXofUCDwjLsk4C259MlLZC05Q4RGNq-Of36d8,4855
-ctools/bottle_webserver.py,sha256=3S5NkqLFerlYWt96owxmpgAQKTnXbQ_5uKHL5CeilIw,2455
+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/browser_element_tools.py,sha256=IFR_tWu5on0LxhuC_4yT6EOjwCsC-juIoU8KQRDqR7E,9952
 ctools/call.py,sha256=BCr8wzt5qd70okv8IZn-9-EpjywleZgvA3u1vfZ_Kt8,1581
@@ -14,15 +14,15 @@ ctools/ckafka.py,sha256=jD9n9sscKrU5spDlPGco681jhqVGRIXqwPiJUas3gpo,5965
 ctools/compile_tools.py,sha256=Nybh3vnkurIKnPnubdYzigjnzFu4GaTMKPvqFdibxmE,510
 ctools/console.py,sha256=EZumuyynwteKUhUxB_XoulHswDxHd75OQB34RiZ-OBM,1807
 ctools/cron_lite.py,sha256=f9g7-64GsCxcAW-HUAvT6S-kooScl8zaJyqwHY-X_rE,8308
-ctools/database.py,sha256=5LPmchtyekLeP1idrexgjPNLrywWc4IMp-ztDff95vQ,5362
+ctools/database.py,sha256=7YzkO2tzV1KUQLHND8g9PkQwTyGd3clhgPiZ5SbC-HA,5447
 ctools/date_utils.py,sha256=-xI2anEzAonOvYwVmM1hCnkuLKodZ8pb33dS3dRxEIc,865
-ctools/dict_wrapper.py,sha256=JsJssnMLIubWDdpr8vVzGP47NnZhB3t81zfyoWKU2mU,240
-ctools/douglas_rarefy.py,sha256=oSdc_uGfiBWqSKLpdg_npYeGxhZqXUTPB3pou6SM2_Y,4823
+ctools/dict_wrapper.py,sha256=A6EOcI-aeYpK3yi6KmCkzShWG0gQcMmQV2lIWPzvn2U,310
+ctools/douglas_rarefy.py,sha256=43WRjGGsQ_o1yPEXypA1Xv_yuo90RVo7qaYGRslx5gQ,4890
 ctools/download_tools.py,sha256=oJbG12Hojd0J17sAlvMU480P3abi4_AB9oZkEBGFPuo,1930
 ctools/enums.py,sha256=QbHa3j7j4-BDdwaga5Y0nYfA2uNSVJDHumYdIZdKVkM,118
 ctools/ex.py,sha256=_UtbmDLrC7uZsoBtTdecuCZAlf2DA7fvojUf5fGZDVo,795
 ctools/excelOpt.py,sha256=q3HLAb1JScTrMCvx_x-4WWnqKhyTEzQ-m5vtqFy8NZU,1138
-ctools/html_soup.py,sha256=LabCo4yWI58fbFBPhunk3THWBf0BbHEWLgwyvSpTGR4,1903
+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
@@ -35,23 +35,23 @@ ctools/pacth.py,sha256=MJ9Du-J9Gv62y4cZKls1jKbl5a5kL2y9bD-gzYUCveQ,2604
 ctools/plan_area_tools.py,sha256=pySri43bVfkHjzlKujML-Nk8B3QLxuYv5KJMha-MLmU,3311
 ctools/process_pool.py,sha256=1TuZySUbQjgYYcuwis54DIwQTimWvTLNahSra7Ia8Ps,951
 ctools/pty_tools.py,sha256=KI3dOyv2JLZmU1VfD1aLMq9r9d5VCu3TdtcezZayBEI,1622
-ctools/resource_bundle_tools.py,sha256=8zW1-aj6jAYFBCoyslz5bL-5916G6Aif1RUy_ObbiVU,3793
+ctools/resource_bundle_tools.py,sha256=wA4fmD_ZEcrpcvUZKa60uDDX-nNQSVz1nBh0A2GVuTI,3796
 ctools/screenshot_tools.py,sha256=KoljfgqW5x9aLwKdIfz0vR6v-fX4XjE92HudkDxC2hE,4539
-ctools/sign.py,sha256=YOrON1SeLRPavPWtE3GonvWFVv1SGFjfjrEVJ3k4x6s,566
+ctools/sign.py,sha256=JOkgpgsMbk7T3c3MOj1U6eiEndUG9XQ-uIX9e615A_Y,566
 ctools/sm_tools.py,sha256=RwhTjuKw_TjaAJAui39wctzFFpbt79MQ3hjF0fhL638,1113
 ctools/strDiff.py,sha256=QUtXOfsRLTFozH_zByqsC39JeuG3eZtrwGVeLyaHYUI,429
 ctools/string_tools.py,sha256=WlLQxQePbYVzvPi0YFGpTbHLQl9eRhHrX-DPkN4zMzg,2162
-ctools/sys_info.py,sha256=kgAPNP4ruso5kJS3kec9HMJLlvHPUj311Uv9SibPY_k,3626
+ctools/sys_info.py,sha256=QJSF-qbT2JlEVE4CVPxPbGdxo4UD7vSLoJpJcFCmmyc,3626
 ctools/sys_log.py,sha256=oqb1S41LosdeZxtogFVgDk8R4sjiHhUeYJLCzHd728E,2805
 ctools/thread_pool.py,sha256=qb68ULHy1K7u3MC7WP49wDhmgUhgWazd9FRuFbClET4,925
 ctools/upload_tools.py,sha256=sqe6K3ZWiyY58pFE5IO5mNaS1znnS7U4c4UqY8noED4,1068
 ctools/win_canvas.py,sha256=PAxI4i1jalfree9d1YG4damjc2EzaHZrgHZCTgk2GiM,2530
 ctools/win_control.py,sha256=35f9x_ijSyc4ZDkcT32e9ZIhr_ffNxadynrQfFuIdYo,3489
 ctools/wordFill.py,sha256=dB1OLt6GLmWdkDV8H20VWbJmY4ggNNI8iHD1ocae2iM,875
-ctools/word_fill.py,sha256=aIkzjAF2soSW6w2dO2CRZlveDcuIdr6v9DtyyyB8uxM,18216
+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.6.dist-info/METADATA,sha256=FtquWWxsN-ePwUGQcR7qMBA4dBwKIbF_rCNFqKgzFNM,940
-gomyck_tools-1.1.6.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-gomyck_tools-1.1.6.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
-gomyck_tools-1.1.6.dist-info/RECORD,,
+gomyck_tools-1.1.7.dist-info/METADATA,sha256=zK86gbG9wduQPYV5Ppdx9JAmEooAK7ts0VA_-lNsRXQ,971
+gomyck_tools-1.1.7.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+gomyck_tools-1.1.7.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
+gomyck_tools-1.1.7.dist-info/RECORD,,