gomyck-tools 1.1.6__tar.gz → 1.1.8__tar.gz

{gomyck-tools-1.1.6 → gomyck-tools-1.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.1.6
+Version: 1.1.8
 Summary: A ctools for python development by hao474798383
 Home-page: https://blog.gomyck.com
 Author: gomyck
@@ -16,7 +16,6 @@ Requires-Dist: chardet>=5.2.0
 Requires-Dist: psycopg2-binary>=2.9.9
 Requires-Dist: croniter>=3.0.3
 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: requests==2.32.3
@@ -25,5 +24,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 → gomyck-tools-1.1.8}/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):

{gomyck-tools-1.1.6 → gomyck-tools-1.1.8}/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):

{gomyck-tools-1.1.6 → gomyck-tools-1.1.8}/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):
 """
 
 """

{gomyck-tools-1.1.6 → gomyck-tools-1.1.8}/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)

{gomyck-tools-1.1.6 → gomyck-tools-1.1.8}/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

{gomyck-tools-1.1.6 → gomyck-tools-1.1.8}/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

{gomyck-tools-1.1.6 → gomyck-tools-1.1.8}/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)

{gomyck-tools-1.1.6 → gomyck-tools-1.1.8}/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):

{gomyck-tools-1.1.6 → gomyck-tools-1.1.8}/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):

{gomyck-tools-1.1.6 → gomyck-tools-1.1.8}/ctools/sys_info.py

@@ -4,8 +4,6 @@ import os
 import platform
 import socket
 import uuid
-
-import psutil
 from bottle import request
 
 from ctools import cjson, sm_tools, work_path
@@ -69,7 +67,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()
 
 
@@ -96,6 +94,7 @@ def get_remote_ipv4():
 
 
 def get_proc_pid_by(cmdline):
+  import psutil
   """
   根据命令行信息获取进程pid
   :param cmdline:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.1.6
+Version: 1.1.8
 Summary: A ctools for python development by hao474798383
 Home-page: https://blog.gomyck.com
 Author: gomyck
@@ -16,7 +16,6 @@ Requires-Dist: chardet>=5.2.0
 Requires-Dist: psycopg2-binary>=2.9.9
 Requires-Dist: croniter>=3.0.3
 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: requests==2.32.3
@@ -25,5 +24,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 → gomyck-tools-1.1.8}/gomyck_tools.egg-info/requires.txt

@@ -4,7 +4,6 @@ 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
@@ -13,3 +12,4 @@ 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.6 → gomyck-tools-1.1.8}/setup.py

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