gomyck-tools 1.4.1__py3-none-any.whl → 1.4.3__py3-none-any.whl

ctools/office/cword.py

@@ -12,13 +12,14 @@
 
 from docx import Document
 
+
 def merge_word_files(input_files: [], output_file: str):
-    merged_doc = Document()
-    for file in input_files:
-        doc = Document(file)
-        for element in doc.element.body:
-            merged_doc.element.body.append(element)
-    merged_doc.save(output_file)
+  merged_doc = Document()
+  for file in input_files:
+    doc = Document(file)
+    for element in doc.element.body:
+      merged_doc.element.body.append(element)
+  merged_doc.save(output_file)
 
 
 def read_word_file(input_file: str):
@@ -27,4 +28,3 @@ def read_word_file(input_file: str):
   for paragraph in doc.paragraphs:
     text.append(paragraph.text)
   return "\n".join(text)
-

ctools/office/word_fill.py

@@ -469,6 +469,7 @@ def check_format(input_path: str):
     res = False
   return res
 
+
 def excel_optimize(input_path: str):
   """
   优化excel内容清除无法使用的隐患
@@ -492,7 +493,6 @@ def excel_optimize(input_path: str):
   except Exception as e:
     print("优化模板内容清除无法使用的隐患异常: %s" % e)
 
-
 # 示例用法：从第1行到第5行、从第1列到第3列的区域复制到Word文档中
 # 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文件名
@@ -557,6 +557,3 @@ def excel_optimize(input_path: str):
 # print(check_format(input_path))
 
 # from docxtpl import DocxTemplate, RichText
-
-
-

ctools/patch.py

@@ -0,0 +1,88 @@
+import os
+
+from sqlalchemy.sql import text
+
+from ctools import path_info
+from ctools.database import database
+
+"""
+from ctools import patch
+def xx():
+  print('hello world')
+def xx1():
+  print('hello world1')
+def xx2():
+  print('hello world2')
+patch_funcs = {
+  'V1.0.2': xx,
+  'V1.0.3': xx1,
+  'V1.1.4': xx2
+}
+patch.sync_version("kwc", "V1.1.5", patch_funcs)
+"""
+
+class Patch:
+
+  def __init__(self, oldVersion, newVersion, patch_func: dict) -> None:
+    super().__init__()
+    if oldVersion:
+      self.oldV = version_to_int(oldVersion)
+    else:
+      self.oldV = 0
+    self.currentV = version_to_int(newVersion)
+    self.snapshot = '-snapshot' in newVersion or (oldVersion is not None and '-snapshot' in oldVersion)
+    self.patch_func = patch_func
+
+  def apply_patch(self):
+    patch_methods = [method for method in self.patch_func.keys() if method and (method.startswith('V') or method.startswith('v'))]
+    patch_methods.sort(key=lambda x: version_to_int(x))
+    max_method_name = patch_methods[-1]
+    exec_max_method = False
+    for method_name in patch_methods:
+      slVersion = version_to_int(method_name)
+      if self.currentV > slVersion >= self.oldV:
+        if max_method_name == method_name: exec_max_method = True
+        method = self.patch_func[method_name]
+        print('start exec patch {}'.format(method_name))
+        method()
+        print('patch {} update success'.format(method_name))
+    if self.snapshot and not exec_max_method:
+      print('start exec snapshot patch {}'.format(max_method_name))
+      method = self.patch_func[max_method_name]
+      method()
+      print('snapshot patch {} update success'.format(max_method_name))
+
+def version_to_int(version):
+  return int(version.replace('V', '').replace('v', '').replace('.', '').replace('-snapshot', ''))
+
+def run_sqls(sqls):
+  with database.get_session() as s:
+    for sql in sqls.split(";"):
+      try:
+        s.execute(text(sql.strip()))
+        s.commit()
+      except Exception as e:
+        print('结构升级错误, 请检查!!! {}'.format(e.__cause__))
+
+def sync_version(app_name, new_version, patch_func: dict):
+  destFilePath = os.path.join(path_info.get_user_work_path(".ck/{}".format(app_name), mkdir=True), "version")
+  if not os.path.exists(destFilePath):
+    patch = Patch(oldVersion=None, newVersion=new_version, patch_func=patch_func)
+    patch.apply_patch()
+    with open(destFilePath, 'w') as nv:
+      nv.write(new_version)
+      print('初始化安装, 版本信息为: {}'.format(new_version))
+      nv.flush()
+  else:
+    with open(destFilePath, 'r') as oldVersion:
+      oldV = oldVersion.readline()
+      print('本地版本信息为: {}, 程序版本信息为: {}'.format(oldV, new_version))
+      oldVersion.close()
+    if oldV >= new_version and '-snapshot' not in oldV: return
+    print('开始升级本地程序..')
+    patch = Patch(oldVersion=oldV, newVersion=new_version, patch_func=patch_func)
+    patch.apply_patch()
+    with open(destFilePath, 'w') as newVersion:
+      newVersion.write(new_version)
+      print('程序升级成功, 更新版本信息为: {}'.format(new_version))
+      newVersion.flush()

ctools/path_info.py

@@ -1,6 +1,9 @@
 import inspect
 import os
 import sys
+import importlib
+from types import ModuleType
+from pathlib import Path
 
 
 def get_current_path(subPath: str = '') -> str:
@@ -67,3 +70,29 @@ def get_install_path(subPath: str = '') -> str:
   :return: 安装包安装的路径
   """
   return os.path.join(os.getcwd(), subPath)
+
+def get_package_path(package: str | ModuleType) -> Path:
+  """
+  获取包所在目录
+  :param package: 包名字符串或已导入模块
+  :return: 包目录的 Path 对象
+  """
+  if isinstance(package, str):
+    module = importlib.import_module(package)
+  elif isinstance(package, ModuleType):
+    module = package
+  else:
+    raise TypeError("package 必须是字符串或模块对象")
+
+  return Path(module.__file__).resolve().parent
+
+
+def get_resource_path(package: str | ModuleType, *subpaths: str) -> Path:
+  """
+  获取包内资源文件路径（自动拼接子路径）
+  :param package: 包名或模块
+  :param subpaths: 可变参数，表示路径中的子目录或文件名
+  :return: 资源的绝对路径
+  """
+  base = get_package_path(package)
+  return base.joinpath(*subpaths)

ctools/pkg/__init__.py

@@ -0,0 +1,4 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+__author__ = 'haoyang'
+__date__ = '2025/7/15 11:02'

ctools/pkg/dynamic_imp.py

@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+__author__ = 'haoyang'
+__date__ = '2025/7/15 11:03'
+
+import importlib
+import pkgutil
+
+
+def load_modules_from_package(package, exclude=None, recursive=True):
+  """
+  递归加载指定包下所有模块（不包括包本身）
+
+  :param package: 要加载模块的包对象（如 mypkg.plugins）
+  :param exclude: 排除的模块完整路径列表（如 ['mypkg.plugins.demo.mod2']）
+  :param recursive: 是否递归子包
+  :return: 模块列表（不含子包本身，只包含模块）
+  """
+  if exclude is None: exclude = []
+  modules = []
+  for finder, modname, ispkg in pkgutil.iter_modules(package.__path__):
+    full_modname = f"{package.__name__}.{modname}"
+    if ispkg and recursive:
+      try:
+        subpkg = importlib.import_module(full_modname)
+        modules.extend(load_modules_from_package(subpkg, exclude, recursive))
+      except Exception as e:
+        print(f"递归子包 {full_modname} 失败：{e}")
+      continue
+    if full_modname in exclude:
+      continue
+    try:
+      module = importlib.import_module(full_modname)
+      modules.append(module)
+    except Exception as e:
+      print(f"!!!!!!加载模块 {full_modname} 失败：{e}!!!!!!")
+      continue
+  return modules

ctools/pools/process_pool.py

@@ -2,6 +2,7 @@
 # -*- coding: UTF-8 -*-
 __author__ = 'haoyang'
 __date__ = '2024/9/20 12:00'
+
 import os
 import time
 from concurrent.futures import ProcessPoolExecutor
@@ -10,12 +11,14 @@ from ctools import call
 
 _process_pool: ProcessPoolExecutor = None
 
+
 @call.init
 def init():
   global _process_pool
-  max_workers = min(32, os.cpu_count()) # 最多 32 个
+  max_workers = min(32, os.cpu_count())  # 最多 32 个
   _process_pool = ProcessPoolExecutor(max_workers=max_workers)
 
+
 def cb(f, callback):
   exc = f.exception()
   if exc:
@@ -24,6 +27,7 @@ def cb(f, callback):
   else:
     if callback: callback(f.result())
 
+
 def submit(func, *args, callback=None, **kwargs):
   if _process_pool is None: raise Exception('process pool is not init')
   future = _process_pool.submit(func, *args, **kwargs)
@@ -31,6 +35,7 @@ def submit(func, *args, callback=None, **kwargs):
   time.sleep(0.01)
   return future
 
+
 def shutdown(wait=True):
   if _process_pool is None: raise Exception('process pool is not init')
   _process_pool.shutdown(wait=wait)

ctools/pools/thread_pool.py

@@ -9,11 +9,13 @@ thread_local = threading.local()
 
 _threadPool: ThreadPoolExecutor = None
 
+
 @call.init
 def init():
   global _threadPool
-  max_work_num = min(32, (os.cpu_count() or 1) + 4) # 最多 32 个
-  _threadPool = ThreadPoolExecutor(max_workers= max_work_num, thread_name_prefix='ck-')
+  max_work_num = min(32, (os.cpu_count() or 1) + 4)  # 最多 32 个
+  _threadPool = ThreadPoolExecutor(max_workers=max_work_num, thread_name_prefix='ck-')
+
 
 def cb(f, callback):
   exc = f.exception()
@@ -23,6 +25,7 @@ def cb(f, callback):
   else:
     if callback: callback(f.result())
 
+
 def submit(func, *args, callback=None, **kwargs):
   if _threadPool is None: raise Exception('thread pool is not init')
   future = _threadPool.submit(func, *args, **kwargs)
@@ -30,6 +33,7 @@ def submit(func, *args, callback=None, **kwargs):
   time.sleep(0.01)
   return future
 
+
 def shutdown(wait=True):
   if _threadPool is None: raise Exception('thread pool is not init')
   _threadPool.shutdown(wait=wait)

ctools/similar.py

@@ -1,5 +1,6 @@
 from fuzzywuzzy import fuzz, process
 
+
 def best_match(query: str, choices: list[str], score_cutoff: int = 70):
   """
   获取最接近 query 的匹配项
@@ -7,6 +8,7 @@ def best_match(query: str, choices: list[str], score_cutoff: int = 70):
   """
   return process.extractOne(query, choices, scorer=fuzz.ratio, score_cutoff=score_cutoff)
 
+
 def all_matches(query: str, choices: list[str], limit: int = 5):
   """
   获取多个相似匹配项
@@ -14,6 +16,7 @@ def all_matches(query: str, choices: list[str], limit: int = 5):
   """
   return process.extract(query, choices, scorer=fuzz.ratio, limit=limit)
 
+
 def is_similar(s1: str, s2: str, threshold: int = 85):
   """
   判断两个字符串是否相似

ctools/stream/ckafka.py

@@ -41,6 +41,8 @@ consumer.receive_msg('jqxx', callBack=consumer_callback)
 
 while True: time.sleep(1)
 """
+
+
 class KafkaInstance:
   def __init__(self, producer: KafkaProducer, consumer: KafkaConsumer):
     self.start_consumer = False
@@ -52,7 +54,7 @@ class KafkaInstance:
   # FutureRecordMetadata 可以添加回调, 来监听是否发送成功
   # r.add_callback(lambda x: print(x))
   # r.get() 可以同步获取结果
-  def send_msg(self, topic, msg, key: str=None, partition:int=None) -> FutureRecordMetadata:
+  def send_msg(self, topic, msg, key: str = None, partition: int = None) -> FutureRecordMetadata:
     if self.producer is None: raise RuntimeError("Producer is not initialized")
     if self.quited: return
     return self.producer.send(topic=topic, value=msg, key=None if key is None else key.encode('utf-8'), partition=partition)
@@ -85,10 +87,14 @@ class KafkaInstance:
 
   def shutdown(self):
     self.quited = True
-    try: self.consumer.close()
-    except Exception: pass
-    try: self.producer.close()
-    except Exception: pass
+    try:
+      self.consumer.close()
+    except Exception:
+      pass
+    try:
+      self.producer.close()
+    except Exception:
+      pass
 
 
 class CKafka:

ctools/stream/credis.py

@@ -6,53 +6,64 @@ __date__ = '2025/2/14 11:09'
 import redis
 from redis import Redis
 
-from ctools.pools import thread_pool
 from ctools import cdate, cid
+from ctools.pools import thread_pool
 
+# 最后一次连接的redis
+_ck_redis: Redis = None
+
+def get_redis(): return _ck_redis
 
 def init_pool(host: str = 'localhost', port: int = 6379, db: int = 0, password: str = None,
               username: str = None, decode_responses: bool = True, max_connections: int = 75,
               health_check_interval: int = 30, retry_count: int = 3) -> Redis:
-    for attempt in range(retry_count):
-        try:
-            r: Redis = redis.StrictRedis(
-                host=host, port=port, db=db,
-                username=username, password=password,
-                retry_on_timeout=True,
-                max_connections=max_connections,
-                decode_responses=decode_responses,
-                health_check_interval=health_check_interval,
-                socket_connect_timeout=5,
-                socket_timeout=5
-            )
-            if r.ping():
-                print('CRedis connect {} {} success!'.format(host, port))
-                return r
-        except redis.ConnectionError as e:
-            if attempt == retry_count - 1:
-                raise Exception(f"Failed to connect to Redis after {retry_count} attempts: {str(e)}")
-            print(f"Connection attempt {attempt + 1} failed, retrying...")
+  for attempt in range(retry_count):
+    try:
+      r: Redis = redis.StrictRedis(
+        host=host, port=port, db=db,
+        username=username, password=password,
+        retry_on_timeout=True,
+        max_connections=max_connections,
+        decode_responses=decode_responses,
+        health_check_interval=health_check_interval,
+        socket_connect_timeout=5,
+        socket_timeout=5
+      )
+      if r.ping():
+        print('CRedis connect {} {} success!'.format(host, port))
+        global _ck_redis
+        _ck_redis = r
+        return _ck_redis
+    except redis.ConnectionError as e:
+      if attempt == retry_count - 1:
+        raise Exception(f"Failed to connect to Redis after {retry_count} attempts: {str(e)}")
+      print(f"Connection attempt {attempt + 1} failed, retrying...")
+
 
 def add_lock(r: Redis, key: str, timeout: int = 30):
   if r.exists(key):
     expire_time = r.get(key)
-    if cdate.time_diff_in_seconds(expire_time, cdate.get_date_time()) > 0:
-      return True
+    if expire_time and cdate.time_diff_in_seconds(expire_time, cdate.get_date_time()) > 0:
+      return False
     else:
       r.delete(key)
   return r.set(key, cdate.opt_time(seconds=timeout), nx=True, ex=timeout) is not None
 
+
 def remove_lock(r: Redis, key: str):
   r.delete(key)
 
+
 def subscribe(r: Redis, channel_name, callback):
   def thread_func():
     pubsub = r.pubsub()
     pubsub.subscribe(channel_name)
     for message in pubsub.listen():
       callback(message)
+
   thread_pool.submit(thread_func)
 
+
 def _process_pending_messages(r: Redis, stream_name: str, group_name: str, consumer_name: str, callback):
   """
   处理未确认的消息
@@ -84,7 +95,8 @@ def _process_pending_messages(r: Redis, stream_name: str, group_name: str, consu
   else:
     print("No pending messages found.")
 
-def stream_subscribe(r: Redis, stream_name, group_name, callback, from_id: str='$', noack: bool = False):
+
+def stream_subscribe(r: Redis, stream_name, group_name, callback, from_id: str = '$', noack: bool = False):
   def thread_func():
     try:
       # $表示从最后面消费, 0表示从开始消费
@@ -107,7 +119,9 @@ def stream_subscribe(r: Redis, stream_name, group_name, callback, from_id: str='
           if res: r.xack(stream_name, group_name, message_id)
         except Exception as e:
           print('stream_subscribe error: ', e)
+
   thread_pool.submit(thread_func)
 
+
 def stream_publish(r: Redis, stream_name, message):
   r.xadd(stream_name, message)

ctools/stream/mqtt_utils.py

@@ -5,17 +5,17 @@ from typing import Dict
 from paho.mqtt import client as mqtt
 from paho.mqtt.enums import CallbackAPIVersion
 
+from ctools import cid, cdate
 from ctools import sys_log, cjson, sys_info
 from ctools.cipher import sm_util
 from ctools.dict_wrapper import DictWrapper as DictToObj
 from ctools.pools import thread_pool
-from ctools import cid, cdate
 
 
 class MQTTEvent(Enum):
-
   pass
 
+
 '''
 MQTT服务使用示例:
 

ctools/sys_info.py

@@ -7,13 +7,16 @@ from ctools.cipher import sm_util
 
 MACHINE_KEY = b'EnrGffoorbFyTYoS0902YyT1Fhehj4InpbezIDUuPOg='
 
+
 class MachineInfo:
   machine_code = None
 
+
 def get_user():
   import getpass
   return getpass.getuser()
 
+
 def get_machine_code():
   if MachineInfo.machine_code: return MachineInfo.machine_code
   destPath = os.path.join(path_info.get_user_work_path(), "AppData/Local/machine")
@@ -74,6 +77,7 @@ def get_hash_machine_code(origin_code):
   machine_code = hashlib.md5(code.encode()).hexdigest()
   return machine_code.upper()
 
+
 def get_public_ip():
   import requests
   try:
@@ -83,6 +87,7 @@ def get_public_ip():
   except Exception as e:
     return f"Failed to get public IP: {e}"
 
+
 def get_local_ipv4():
   import psutil
   import socket
@@ -102,6 +107,7 @@ def get_local_ipv4():
     s.close()
   return ip
 
+
 def get_remote_ipv4():
   from bottle import request
   try:
@@ -109,6 +115,7 @@ def get_remote_ipv4():
   except:
     return '127.0.0.1'
 
+
 def get_proc_pid_by(cmdline):
   import psutil
   """
@@ -127,6 +134,7 @@ def get_proc_pid_by(cmdline):
       pass
   return pid_list
 
+
 def get_os_architecture():
   if '64' in platform.machine():
     return '64'

ctools/sys_log.py

@@ -48,6 +48,7 @@ def _console_log(log_level: int = logging.INFO) -> logging:
 import io
 import logging
 
+
 class StreamToLogger(io.StringIO):
   def __init__(self, logger: logging.Logger, level: int = logging.INFO):
     super().__init__()
@@ -80,14 +81,16 @@ class StreamToLogger(io.StringIO):
   def fileno(self):
     return sys.__stdout__.fileno()
 
+
 @call.init
 def _init_log() -> None:
   global flog, clog
-  flog = _file_log(sys_log_path='{}/ck-py-log/'.format(path_info.get_user_work_path()), mixin=True, log_level=logging.DEBUG)
+  flog = _file_log(path_info.get_user_work_path(".ck/ck-py-log", mkdir=True), mixin=True, log_level=logging.DEBUG)
   clog = _console_log()
   sys.stdout = StreamToLogger(flog, level=logging.INFO)
   sys.stderr = StreamToLogger(flog, level=logging.ERROR)
 
+
 def setLevel(log_level=logging.INFO):
   flog.setLevel(log_level)
   clog.setLevel(log_level)

ctools/util/cftp.py

@@ -7,6 +7,7 @@ import io
 import time
 from ftplib import FTP, error_perm, error_temp
 
+
 class CFTP:
   """
   with open('xx/xx.md', 'rb') as file:
@@ -15,16 +16,17 @@ class CFTP:
     ftp_password = 'x'
     CFTP(ftp_host, ftp_username, ftp_password).upload_file_to_ftp('xx.md', file)
   """
+
   def __init__(self, host, username, password, timeout=30, max_retries=3, retry_delay=5):
     self.host = host
     self.username = username
     self.password = password
-    self.ftp:FTP = None
+    self.ftp: FTP = None
     self.timeout = timeout
     self.max_retries = max_retries
     self.retry_delay = retry_delay
 
-  def upload_file_to_ftp(self, file_name, file:io.BytesIO, ftp_directory='/'):
+  def upload_file_to_ftp(self, file_name, file: io.BytesIO, ftp_directory='/'):
     if not file_name: raise Exception('文件名不能为空')
     if not file: raise Exception('文件不能为空')
     for attempt in range(self.max_retries):