gomyck-tools 1.2.7__py3-none-any.whl → 1.2.8__py3-none-any.whl

ctools/aes_tools.py

@@ -1,5 +1,13 @@
 from cryptography.fernet import Fernet
 
+def generate_key():
+  """
+  生成 AES key
+  Returns 32 bytes key
+  -------
+  """
+  key = Fernet.generate_key()
+  return key.decode()
 
 def aes_encrypt(sec_key, plaintext):
   """
@@ -23,3 +31,5 @@ def aes_decrypt(sec_key, ciphertext):
   cipher = Fernet(sec_key)
   decrypted_data = cipher.decrypt(ciphertext)
   return decrypted_data.decode()
+
+

ctools/bottle_web_base.py

@@ -5,7 +5,7 @@ from functools import wraps
 import bottle
 from bottle import response, Bottle, request
 
-from ctools import token
+from ctools import ctoken
 from ctools.dict_wrapper import DictWrapper
 from ctools.api_result import R
 from ctools.sys_log import flog as log
@@ -38,30 +38,30 @@ def init_app(context_path=None):
 
   @app.error(401)
   def unauthorized(error):
-    after_request()
     response.status = 401
     log.error("系统未授权: {} {} {}".format(error.body, request.method, request.fullpath))
-    return R.error(resp=R.Code.cus_code(9999, "系统未授权! {}".format(error.body)))
+    return R.error(resp=R.Code.cus_code(401, "系统未授权! {}".format(error.body)))
 
   @app.error(403)
   def unauthorized(error):
-    after_request()
     response.status = 403
     log.error("访问受限: {} {} {}".format(error.body, request.method, request.fullpath))
-    return R.error(resp=R.Code.cus_code(8888, "访问受限: {}".format(error.body)))
+    return R.error(resp=R.Code.cus_code(403, "访问受限: {}".format(error.body)))
+
+  @app.error(404)
+  def not_found(error):
+    response.status = 404
+    log.error("404 not found : {} {} {}".format(error.body, request.method, request.fullpath))
+    return R.error(resp=R.Code.cus_code(404, "资源未找到: {}".format(error.body)))
 
   @app.error(405)
-  def cors_error(error):
-    if request.method == 'OPTIONS':
-      after_request()
-      response.status = 405
-      return
+  def method_not_allow(error):
+    response.status = 405
     log.error("请求方法错误: {} {} {}".format(error.status_line, request.method, request.fullpath))
-    return R.error(msg='请求方法错误: {}'.format(error.status_line))
+    return R.error(resp=R.Code.cus_code(405, '请求方法错误: {}'.format(error.status_line)))
 
   @app.error(500)
-  def cors_error(error):
-    after_request()
+  def internal_error(error):
     response.status = 500
     log.error("系统发生错误: {} {} {}".format(error.body, request.method, request.fullpath))
     return R.error(msg='系统发生错误: {}'.format(error.exception))
@@ -162,7 +162,7 @@ def common_auth_verify(aes_key):
   auth_token = request.get_header('Authorization')
   if auth_token is None:
     auth_token = request.get_cookie('Authorization')
-  payload = token.get_payload(auth_token, aes_key)
+  payload = ctoken.get_payload(auth_token, aes_key)
   if payload:
     return R.ok(to_json_str=False)
   return R.error(resp=R.Code.cus_code(401, "未授权"), to_json_str=False)

ctools/bottle_webserver.py

@@ -2,12 +2,10 @@ import sys
 from socketserver import ThreadingMixIn
 from wsgiref.simple_server import WSGIServer, WSGIRequestHandler, make_server
 
-from bottle import ServerAdapter, Bottle, template, static_file, abort
+from bottle import ServerAdapter, Bottle, template, static_file, abort, redirect
 
 from ctools import sys_info
 
-
-
 """
 module_names = list(globals().keys())
 def get_modules():
@@ -24,21 +22,25 @@ def get_ws_modules():
 """
 
 """
+from ctools import bottle_web_base, token, bottle_webserver
+from ctools.api_result import R
+
+secret_key = "xxx"
 app = bottle_web_base.init_app('子模块写 context_path, 主模块就不用写任何东西')
 
 # 通用的鉴权方法
 @bottle_web_base.before_intercept(0)
 def token_check():
-  return bottle_web_base.common_auth_verify(aes_key)
+  return bottle_web_base.common_auth_verify(secret_key)
 
 @app.post('/login')
 def login(params):
-  return R.ok(token.gen_token({'username': 'xxx'}, aes_key, 3600))
+  return R.ok(token.gen_token({'username': 'xxx'}, secret_key, 3600))
 
-@app.get('/queryList')
+@app.get('/demo')
 @bottle_web_base.rule('DOC:DOWNLOAD')
-def query_list(params):
-  print(123)
+def demo(params):
+  print(params)
 
 main_app = bottle_webserver.init_bottle() # 这里可以传 APP 当做主模块, 但是 context_path 就不好使了, 上下文必须是 /
 main_app.mount(app.context_path, app)
@@ -46,9 +48,11 @@ main_app.set_index(r'轨迹点位压缩.html')
 main_app.run()
 """
 
+_default_port = 8888
+
 class CBottle:
 
-  def __init__(self, bottle: Bottle, port=8888, quiet=False):
+  def __init__(self, bottle: Bottle, port=_default_port, quiet=False):
     self.port = port
     self.quiet = quiet
     self.bottle = bottle
@@ -58,20 +62,16 @@ class CBottle:
     print('Click the link below to open the service homepage %s' % '\n \t\t http://localhost:%s \n \t\t http://%s:%s' %  (self.port, sys_info.get_local_ipv4(), self.port), file=sys.stderr)
     self.bottle.run(server=http_server, quiet=self.quiet)
 
-  def set_index(self, filename='index.html', root='./', **kwargs):
+  def set_index(self, root='./', filename='index.html', is_tpl=False, redirect_url=None, **kwargs):
     @self.bottle.route(['/', '/index'])
     def index():
       try:
+        if redirect_url: return redirect(redirect_url)
+        if is_tpl: return template(f"{root}/{filename}", **kwargs)
         return static_file(filename=filename, root=root, **kwargs)
       except FileNotFoundError:
         abort(404, "File not found...")
 
-  def set_template(self, root, **kwargs):
-    @self.bottle.route('/template/<filepath:path>')
-    def index(filepath):
-      template_path = f"{root}/{filepath}"
-      return template(template_path, **kwargs)
-
   def set_static(self, root):
     @self.bottle.route('/static/<filepath:path>')
     def static(filepath):
@@ -88,7 +88,7 @@ class CBottle:
   def mount(self, context_path, app, **kwargs):
     self.bottle.mount(context_path, app, **kwargs)
 
-def init_bottle(app:Bottle=None, port=8888, quiet=False) -> CBottle:
+def init_bottle(app:Bottle=None, port=_default_port, quiet=False) -> CBottle:
   bottle = app or Bottle()
   return CBottle(bottle, port, quiet)
 
@@ -100,7 +100,7 @@ class CustomWSGIHandler(WSGIRequestHandler):
 
 class WSGIRefServer(ServerAdapter):
 
-  def __init__(self, host='0.0.0.0', port=8010):
+  def __init__(self, host='0.0.0.0', port=_default_port):
     super().__init__(host, port)
     self.server = None
 

ctools/bottle_websocket.py

@@ -3,15 +3,6 @@ from geventwebsocket.handler import WebSocketHandler
 
 from ctools import sys_log
 
-"""
-app = bottle_web_base.init_app('/websocket_demo')
-
-@app.route('/script_debug', apply=[websocket])
-@bottle_web_base.rule('DOC:DOWNLOAD')
-def script_debug(ws: WebSocket):
-  print(123)
-"""
-
 """
 module_names = list(globals().keys())
 def get_modules():
@@ -28,14 +19,23 @@ def get_ws_modules():
 """
 
 """
+ws_app = bottle_web_base.init_app('/websocket_demo')
+
+@ws_app.route('/script_debug', apply=[websocket])
+@bottle_web_base.rule('DOC:DOWNLOAD')
+def script_debug(ws: WebSocket):
+  print(123)
+
 socket_app = bottle_websocket.init_bottle()
-socket_app.mount(app.context_path, app)
+socket_app.mount(app.context_path, ws_app)
 socket_app.run()
 """
 
+_default_port = 8887
+
 class CBottle:
 
-  def __init__(self, bottle: Bottle, port=8888, quiet=False):
+  def __init__(self, bottle: Bottle, port=_default_port, quiet=False):
     self.port = port
     self.quiet = quiet
     self.bottle = bottle
@@ -47,7 +47,7 @@ class CBottle:
   def mount(self, context_path, app):
     self.bottle.mount(context_path, app)
 
-def init_bottle(port=8889, quiet=False) -> CBottle:
+def init_bottle(port=_default_port, quiet=False) -> CBottle:
   bottle = Bottle()
   return CBottle(bottle, port, quiet)
 
@@ -62,7 +62,7 @@ class CustomWebSocketHandler(WebSocketHandler):
 
 class WebSocketServer(ServerAdapter):
 
-  def __init__(self, host='0.0.0.0', port=8011):
+  def __init__(self, host='0.0.0.0', port=_default_port):
     super().__init__(host, port)
     self.server = None
 

ctools/cftp.py

@@ -0,0 +1,74 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+__author__ = 'haoyang'
+__date__ = '2025/1/24 08:53'
+
+import io
+import time
+from ftplib import FTP, error_perm, error_temp
+
+class CFTP:
+  """
+  with open('xx/xx.md', 'rb') as file:
+    ftp_host = 'x.x.x.x'
+    ftp_username = 'x'
+    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.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='/'):
+    if not file_name: raise Exception('文件名不能为空')
+    if not file: raise Exception('文件不能为空')
+    for attempt in range(self.max_retries):
+      try:
+        if not self.ftp:
+          ftp = FTP(self.host, timeout=self.timeout)
+          ftp.login(self.username, self.password)
+          ftp.set_pasv(True)
+          self.ftp = ftp
+        try:
+          self.ftp.cwd(ftp_directory)
+        except error_perm:
+          print(f"FTP 目录不存在：{ftp_directory}")
+          self.ftp.mkd(ftp_directory)
+          print(f"FTP 目录创建成功：{ftp_directory}, 正在切换到目录：{ftp_directory}")
+          self.ftp.cwd(ftp_directory)
+        print(f"正在上传文件：{file_name}")
+        self.ftp.storbinary(f"STOR {file_name}", file)
+        self.ftp.quit()
+        print(f"文件成功上传到 FTP: {file_name}")
+        return
+      except (error_perm, error_temp) as e:
+        try:
+          self.ftp.quit()
+        except Exception:
+          pass
+        self.ftp = None
+        print(f"FTP 错误：{e}")
+        if attempt < self.max_retries - 1:
+          print(f"正在尝试重连... 第 {attempt + 1} 次重试...")
+          time.sleep(self.retry_delay)
+        else:
+          print("重试次数已用尽，上传失败。")
+          raise
+      except Exception as e:
+        try:
+          self.ftp.quit()
+        except Exception:
+          pass
+        self.ftp = None
+        print(f"连接或上传出现异常：{e}")
+        if attempt < self.max_retries - 1:
+          print(f"正在尝试重连... 第 {attempt + 1} 次重试...")
+          time.sleep(self.retry_delay)
+        else:
+          print("重试次数已用尽，上传失败。")
+          raise

ctools/coord_trans.py

@@ -0,0 +1,127 @@
+# -*- coding: utf-8 -*-
+import math
+
+x_pi = 3.14159265358979324 * 3000.0 / 180.0
+pi = 3.1415926535897932384626  # π
+a = 6378245.0  # 长半轴
+ee = 0.00669342162296594323  # 偏心率平方
+
+def gcj02_to_bd09(lng, lat):
+    """
+    火星坐标系(GCJ-02)转百度坐标系(BD-09)
+    谷歌、高德——>百度
+    :param lng:火星坐标经度
+    :param lat:火星坐标纬度
+    :return:
+    """
+    z = math.sqrt(lng * lng + lat * lat) + 0.00002 * math.sin(lat * x_pi)
+    theta = math.atan2(lat, lng) + 0.000003 * math.cos(lng * x_pi)
+    bd_lng = z * math.cos(theta) + 0.0065
+    bd_lat = z * math.sin(theta) + 0.006
+    return [bd_lng, bd_lat]
+
+
+def bd09_to_gcj02(bd_lon, bd_lat):
+    """
+    百度坐标系(BD-09)转火星坐标系(GCJ-02)
+    百度——>谷歌、高德
+    :param bd_lat:百度坐标纬度
+    :param bd_lon:百度坐标经度
+    :return:转换后的坐标列表形式
+    """
+    x = bd_lon - 0.0065
+    y = bd_lat - 0.006
+    z = math.sqrt(x * x + y * y) - 0.00002 * math.sin(y * x_pi)
+    theta = math.atan2(y, x) - 0.000003 * math.cos(x * x_pi)
+    gg_lng = z * math.cos(theta)
+    gg_lat = z * math.sin(theta)
+    return [gg_lng, gg_lat]
+
+
+def wgs84_to_gcj02(lng, lat):
+    """
+    WGS84转GCJ02(火星坐标系)
+    :param lng:WGS84坐标系的经度
+    :param lat:WGS84坐标系的纬度
+    :return:
+    """
+    if out_of_china(lng, lat):  # 判断是否在国内
+        return [lng, lat]
+    dlat = _transformlat(lng - 105.0, lat - 35.0)
+    dlng = _transformlng(lng - 105.0, lat - 35.0)
+    radlat = lat / 180.0 * pi
+    magic = math.sin(radlat)
+    magic = 1 - ee * magic * magic
+    sqrtmagic = math.sqrt(magic)
+    dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * pi)
+    dlng = (dlng * 180.0) / (a / sqrtmagic * math.cos(radlat) * pi)
+    mglat = lat + dlat
+    mglng = lng + dlng
+    return [mglng, mglat]
+
+
+def gcj02_to_wgs84(lng, lat):
+    """
+    GCJ02(火星坐标系)转GPS84
+    :param lng:火星坐标系的经度
+    :param lat:火星坐标系纬度
+    :return:
+    """
+    if out_of_china(lng, lat):
+        return [lng, lat]
+    dlat = _transformlat(lng - 105.0, lat - 35.0)
+    dlng = _transformlng(lng - 105.0, lat - 35.0)
+    radlat = lat / 180.0 * pi
+    magic = math.sin(radlat)
+    magic = 1 - ee * magic * magic
+    sqrtmagic = math.sqrt(magic)
+    dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * pi)
+    dlng = (dlng * 180.0) / (a / sqrtmagic * math.cos(radlat) * pi)
+    mglat = lat + dlat
+    mglng = lng + dlng
+    return [lng * 2 - mglng, lat * 2 - mglat]
+
+
+def bd09_to_wgs84(bd_lon, bd_lat):
+    lon, lat = bd09_to_gcj02(bd_lon, bd_lat)
+    return gcj02_to_wgs84(lon, lat)
+
+
+def wgs84_to_bd09(lon, lat):
+    lon, lat = wgs84_to_gcj02(lon, lat)
+    return gcj02_to_bd09(lon, lat)
+
+
+def _transformlat(lng, lat):
+    ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + \
+          0.1 * lng * lat + 0.2 * math.sqrt(math.fabs(lng))
+    ret += (20.0 * math.sin(6.0 * lng * pi) + 20.0 *
+            math.sin(2.0 * lng * pi)) * 2.0 / 3.0
+    ret += (20.0 * math.sin(lat * pi) + 40.0 *
+            math.sin(lat / 3.0 * pi)) * 2.0 / 3.0
+    ret += (160.0 * math.sin(lat / 12.0 * pi) + 320 *
+            math.sin(lat * pi / 30.0)) * 2.0 / 3.0
+    return ret
+
+
+def _transformlng(lng, lat):
+    ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + \
+          0.1 * lng * lat + 0.1 * math.sqrt(math.fabs(lng))
+    ret += (20.0 * math.sin(6.0 * lng * pi) + 20.0 *
+            math.sin(2.0 * lng * pi)) * 2.0 / 3.0
+    ret += (20.0 * math.sin(lng * pi) + 40.0 *
+            math.sin(lng / 3.0 * pi)) * 2.0 / 3.0
+    ret += (150.0 * math.sin(lng / 12.0 * pi) + 300.0 *
+            math.sin(lng / 30.0 * pi)) * 2.0 / 3.0
+    return ret
+
+
+def out_of_china(lng, lat):
+    """
+    判断是否在国内，不在国内不做偏移
+    :param lng:
+    :param lat:
+    :return:
+    """
+    return not (lng > 73.66 and lng < 135.05 and lat > 3.86 and lat < 53.55)
+

ctools/credis.py

@@ -0,0 +1,111 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+__author__ = 'haoyang'
+__date__ = '2025/2/14 11:09'
+
+import redis
+from redis import Redis
+
+from ctools import date_utils, thread_pool, string_tools
+
+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...")
+
+def add_lock(r: Redis, key: str, timeout: int = 30):
+  if r.exists(key):
+    expire_time = r.get(key)
+    if date_utils.time_diff_in_seconds(expire_time, date_utils.get_date_time()) > 0:
+      return True
+    else:
+      r.delete(key)
+  return r.set(key, date_utils.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):
+  """
+  处理未确认的消息
+  :param r: Redis 连接
+  :param stream_name: 流名称
+  :param group_name: 消费者组名称
+  :param consumer_name: 消费者名称
+  :param callback: 消息处理回调函数
+  """
+  # 检查未确认的消息
+  pending_messages = r.xpending(stream_name, group_name)
+  if pending_messages['pending'] > 0:
+    print(f"Found {pending_messages['pending']} pending messages.")
+    # 获取未确认的消息列表
+    pending_list = r.xpending_range(stream_name, group_name, min='-', max='+', count=pending_messages['pending'])
+    for message in pending_list:
+      message_id = message['message_id']
+      claimed_messages = r.xclaim(stream_name, group_name, consumer_name, min_idle_time=0, message_ids=[message_id])
+      if claimed_messages:
+        # 处理消息
+        for claimed_message in claimed_messages:
+          message_id, data = claimed_message
+          print(f"Processing pending message: {message_id}, data: {data}")
+          try:
+            if callback(message_id, data):
+              r.xack(stream_name, group_name, message_id)
+          except Exception as e:
+            print(f"Error processing message {message_id}: {e}")
+  else:
+    print("No pending messages found.")
+
+def stream_subscribe(r: Redis, stream_name, group_name, callback, from_id: str='$', noack: bool = False):
+  def thread_func():
+    try:
+      # $表示从最后面消费, 0表示从开始消费
+      r.xgroup_create(name=stream_name, groupname=group_name, id=from_id, mkstream=True)
+      print(f"Consumer group '{group_name}' created successfully.")
+    except Exception as e:
+      if "already exists" in str(e):
+        print(f"Consumer group '{group_name}' already exists.")
+      else:
+        print(f"Error creating consumer group '{group_name}': {e}")
+    consumer_name = 'consumer-{}'.format(string_tools.get_uuid())
+    # 处理未确认的消息
+    _process_pending_messages(r, stream_name, group_name, consumer_name, callback)
+    while True:
+      messages = r.xreadgroup(group_name, consumer_name, {stream_name: '>'}, block=1000, noack=noack)
+      for message in messages:
+        try:
+          message_id, data = message[1][0]
+          res = callback(message_id, data)
+          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/czip.py

@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+__author__ = 'haoyang'
+__date__ = '2025/1/24 08:48'
+
+import io
+import time
+
+import pyzipper
+
+def add_file_to_zip(file_name, file_bytes:[], password=None) -> io.BytesIO:
+  zip_filename = "{}}_{}.zip".format(file_name, time.strftime('%Y-%m-%d_%H-%M-%S-%s', time.localtime(time.time())))
+  zipFile = io.BytesIO()
+  with pyzipper.AESZipFile(zipFile, 'w', compression=pyzipper.ZIP_DEFLATED, encryption=pyzipper.WZ_AES) as zipf:
+    if password: zipf.setpassword(password.encode('utf-8'))
+    for file in file_bytes:
+      zipf.writestr(zip_filename, file)
+  zipFile.seek(0)
+  return zipFile

ctools/database.py

@@ -30,6 +30,13 @@ def _init():
   global Base
   Base = declarative_base()
 
+"""
+The string form of the URL is
+dialect[+driver]://user:password@host/dbname[?key=value..]
+where ``dialect`` is a database name such as ``mysql``, ``oracle``, ``postgresql``, etc.
+and ``driver`` the name of a DBAPI such as ``psycopg2``, ``pyodbc``, ``cx_oracle``, etc.  Alternatively
+"""
+
 # 密码里的@  要替换成 %40
 
 # sqlite connect_args={"check_same_thread": False}  db_url=sqlite:///{}.format(db_url)

ctools/date_utils.py

@@ -1,44 +1,43 @@
 import time
-
+from datetime import datetime, timedelta
 
 def get_date():
-  """
-  获取 %Y-%m-%d格式时间
-  :return:
-  """
   return time.strftime('%Y-%m-%d', time.localtime(time.time()))
 
-
 def get_time():
-  """
-  获取 %H-%M-%S格式时间
-  :return:
-  """
   return time.strftime('%H-%M-%S', time.localtime(time.time()))
 
+def get_date_time(fmt="%Y-%m-%d %H:%M:%S"):
+  return time.strftime(fmt, time.localtime(time.time()))
 
-def get_date_time(offset=0):
-  """
-  获取 %Y-%m-%d %H:%M:%S格式时间
-  :return:
-  """
-  return time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time() + offset))
-
+def str_to_datetime(val: str, fmt="%Y-%m-%d %H:%M:%S"):
+  return time.strptime(val, fmt)
 
-def get_file_time():
-  """
-  获取 %Y-%m-%d %H:%M:%S 文件格式时间
-  :return:
-  """
-  return time.strftime('%Y-%m-%d_%H-%M-%S-%s', time.localtime(time.time()))
+def str_to_timestamp(val: str, fmt="%Y-%m-%d %H:%M:%S"):
+  return time.mktime(time.strptime(val, fmt))
 
-def get_timestamp(offset=0):
-  return int(time.time() + offset)
+def timestamp_to_str(timestamp: int=time.time(), fmt="%Y-%m-%d %H:%M:%S"):
+  return time.strftime(fmt, time.localtime(timestamp))
 
-def str_to_timestamp(val: str):
-  return time.mktime(time.strptime(val, "%Y-%m-%d %H:%M:%S"))
+def get_today_start_end(now: datetime.now()):
+  start = datetime(now.year, now.month, now.day, 0, 0, 0)
+  end = datetime(now.year, now.month, now.day, 23, 59, 59)
+  return start.strftime("%Y-%m-%d %H:%M:%S"), end.strftime("%Y-%m-%d %H:%M:%S")
 
-def str_to_datetime(val: str):
-  return time.strptime(val, "%Y-%m-%d %H:%M:%S")
+def get_week_start_end(now: datetime.now()):
+  start = now - timedelta(days=now.weekday())  # 本周一
+  end = start + timedelta(days=6)  # 本周日
+  return start.strftime("%Y-%m-%d 00:00:00"), end.strftime("%Y-%m-%d 23:59:59")
 
+def time_diff_in_seconds(sub_head: str=get_date_time(), sub_end: str=get_date_time()):
+  start_ts = str_to_timestamp(sub_head)
+  end_ts = str_to_timestamp(sub_end)
+  return int(start_ts - end_ts)
 
+def opt_time(base_time=None, days=0, hours=0, minutes=0, seconds=0, weeks=0, fmt="%Y-%m-%d %H:%M:%S"):
+  if base_time is None:
+    base_time = datetime.now()
+  elif isinstance(base_time, str):
+    base_time = datetime.strptime(base_time, fmt)
+  new_time = base_time + timedelta(days=days, hours=hours, minutes=minutes, seconds=seconds, weeks=weeks)
+  return new_time.strftime(fmt)

ctools/metrics.py

@@ -7,7 +7,7 @@ from ctools import call, cjson, sys_log, work_path
 
 log = sys_log.flog
 
-_metrics_port = 8011
+_metrics_port = 8889
 _persistent_json = {}
 _metrics_initial = {}
 _lock = threading.Lock()

ctools/sm_tools.py

@@ -1,6 +1,6 @@
 import base64
 
-from gmssl import sm2, func
+from gmssl import sm2
 from gmssl.sm4 import CryptSM4, SM4_ENCRYPT, SM4_DECRYPT
 
 sm2_crypt: sm2.CryptSM2 = None

{gomyck_tools-1.2.7.dist-info → gomyck_tools-1.2.8.dist-info}/METADATA

@@ -1,14 +1,14 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.2.7
-Summary: A ctools for python development by hao474798383
+Version: 1.2.8
+Summary: A tools collection for python development by hao474798383
 Home-page: https://blog.gomyck.com
 Author: gomyck
 Author-email: hao474798383@163.com
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: jsonpickle ~=3.4.2
 Requires-Dist: SQLAlchemy ~=2.0.36
@@ -30,5 +30,28 @@ Requires-Dist: pyzipper ==0.3.6
 Requires-Dist: prometheus-client ==0.21.1
 Requires-Dist: paramiko ==3.5.0
 Requires-Dist: pyjwt ==2.10.1
+Requires-Dist: cryptography ==43.0.1
+Requires-Dist: redis ==5.2.1
+
+# Gomyck-Tools
+
+## project
+
+https://github.com/mzxc
+
+## install
+
+This package need python version >= 3.9
+
+```shell
+pip install gomyck-tools
+```
+
+## usage
+
+```python
+from ctools import sys_log
+sys_log.clog.info('hello world')
+```
+
 
-this package is for python development

{gomyck_tools-1.2.7.dist-info → gomyck_tools-1.2.8.dist-info}/RECORD

@@ -1,21 +1,26 @@
 ctools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ctools/aes_tools.py,sha256=ylUgyhlx7bNCTGrbWEZVwCObzYdJTQtwEc4ZMidL2Fo,563
+ctools/aes_tools.py,sha256=L5Jg4QtVTdIxHe9zEpR8oMQx0IrYK68vjEYb_RmkhPA,699
 ctools/api_result.py,sha256=UeQXI_zuZB-uY5qECTpz1fC7EGy82yGQqWMx20tyRTw,1572
 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=VUAw3GBpoamLDXQJZQScbNPWIysVexns7QcMV-kcLSM,5822
-ctools/bottle_webserver.py,sha256=tZc9-By_kZgyfRKUSb7tCbEsa5d7X4V3Gcj80p9tb2Q,3489
-ctools/bottle_websocket.py,sha256=wjsjKVE_tlon0hYfnzBT0Sis6yNPe318vKgTfzWYbfQ,1903
+ctools/bottle_web_base.py,sha256=lP4WIvmr-JjO6kDQ-NGIIe2l96hP-aXAiInYsqiWEAU,5974
+ctools/bottle_webserver.py,sha256=p_obHp_9de-A3HbLF5orrqMmDayett9MeaKja7a0N9M,3601
+ctools/bottle_websocket.py,sha256=zqCE1rGlMeC9oxFOULNd137IWIhdetq83Oq5OoH_zGI,1953
 ctools/browser_element_tools.py,sha256=IFR_tWu5on0LxhuC_4yT6EOjwCsC-juIoU8KQRDqR7E,9952
 ctools/call.py,sha256=BCr8wzt5qd70okv8IZn-9-EpjywleZgvA3u1vfZ_Kt8,1581
+ctools/cftp.py,sha256=SkHPDvKu58jnMnl68u5WxWEiFWsm2C0CGa5_GR_Obcw,2481
 ctools/cjson.py,sha256=g5OldDeD7bmdw_4NNNPfAREGXNplQxY_l9vtTz-UBTs,1331
 ctools/ckafka.py,sha256=EiiGCFkSbq8yRjQKVjc2_V114hKb8fJAVIOks_XbQ3w,5944
 ctools/compile_tools.py,sha256=Nybh3vnkurIKnPnubdYzigjnzFu4GaTMKPvqFdibxmE,510
 ctools/console.py,sha256=EZumuyynwteKUhUxB_XoulHswDxHd75OQB34RiZ-OBM,1807
+ctools/coord_trans.py,sha256=pzIHxC4aLwvOF3eJG47Dda3vIq-Zp42xnu_FwILDflU,3951
+ctools/credis.py,sha256=sW7yDQvxa7B4dWvGwUH7GROq-7ElRMDhFT6g2C8ryfE,4522
 ctools/cron_lite.py,sha256=f9g7-64GsCxcAW-HUAvT6S-kooScl8zaJyqwHY-X_rE,8308
-ctools/database.py,sha256=M28inDYU4X69BFeVGCOwzKFtYHuQFgEm9_aoTXmrTzY,5803
-ctools/date_utils.py,sha256=qkIvn2TGQ97vUw2ppBfHE7IyCUqg0s1FzrB0BJAsaBo,868
+ctools/ctoken.py,sha256=NZSBGF3lJajJFLRIZoeXmpp8h5cKM0dAH2weySgeORc,882
+ctools/czip.py,sha256=g-2s804R06Bnp19ByVsYeRbwx5HQf_KwrStvHimVyns,632
+ctools/database.py,sha256=619rlE6LMZ5x9ijLv8WVmtUwbSL5tCHGwt_K-V_VmQY,6094
+ctools/date_utils.py,sha256=h3rvlw_K2F0QTac2Zat_1us76R0P-Qj6_6NeQPfM3VE,1697
 ctools/dict_wrapper.py,sha256=6lZUyHomdn5QdjQTg7EL1sC_I6tOlh8ofMRQT3XGQjM,398
 ctools/douglas_rarefy.py,sha256=43WRjGGsQ_o1yPEXypA1Xv_yuo90RVo7qaYGRslx5gQ,4890
 ctools/download_tools.py,sha256=oJbG12Hojd0J17sAlvMU480P3abi4_AB9oZkEBGFPuo,1930
@@ -26,7 +31,7 @@ ctools/html_soup.py,sha256=rnr8M3gn3gQGo-wNaNFXDjdzp8AAkv9o4yqfIIfO-zw,1567
 ctools/http_utils.py,sha256=dG26aci1_YxAyKwYqMKFw4wZAryLkDyvnQ3hURjB6Lk,768
 ctools/images_tools.py,sha256=TapXYCPqC7GesgrALecxxa_ApuT_dxUG5fqQIJF2bNY,670
 ctools/imgDialog.py,sha256=zFeyPmpnEn9Ih7-yuJJrePqW8Myj3jC9UYMTDk-umTs,1385
-ctools/metrics.py,sha256=xKy1uWqvg2BnS14dQxvs_qUQtMuVLlUKECSyErFnBtk,5247
+ctools/metrics.py,sha256=Ld2OAeJLgXo66zIIn5eeD1AFIxTWw8JJeny--ge--6c,5247
 ctools/mqtt_utils.py,sha256=ZWSZiiNJLLlkHF95S6LmRmkYt-iIL4K73VdN3b1HaHw,10702
 ctools/obj.py,sha256=GYS1B8NyjtUIh0HlK9r8avC2eGbK2SJac4C1CGnfGhI,479
 ctools/pacth.py,sha256=MJ9Du-J9Gv62y4cZKls1jKbl5a5kL2y9bD-gzYUCveQ,2604
@@ -37,14 +42,13 @@ ctools/resource_bundle_tools.py,sha256=wA4fmD_ZEcrpcvUZKa60uDDX-nNQSVz1nBh0A2GVu
 ctools/rsa.py,sha256=c0q7oStlpSfTxmn900XMDjyOGS1A7tVsUIocr0nL2UI,2259
 ctools/screenshot_tools.py,sha256=KoljfgqW5x9aLwKdIfz0vR6v-fX4XjE92HudkDxC2hE,4539
 ctools/sign.py,sha256=JOkgpgsMbk7T3c3MOj1U6eiEndUG9XQ-uIX9e615A_Y,566
-ctools/sm_tools.py,sha256=CDfgupqs_nrZs-135ZvDu6QIx4aamJVdg7vuLs9_0yw,1678
+ctools/sm_tools.py,sha256=R0m52TQE-CT7pvGTP27UWNCfdzpQ8C-ALz7p0mnOnLU,1672
 ctools/snow_id.py,sha256=hYinnRN-aOule4_9vfgXB7XnsU-56cIS3PhzAwWBc5E,2270
 ctools/str_diff.py,sha256=QUtXOfsRLTFozH_zByqsC39JeuG3eZtrwGVeLyaHYUI,429
 ctools/string_tools.py,sha256=itK59W4Ed4rQzuyHuioNgDRUcBlfb4ZoZnwmS9cJxiI,1887
 ctools/sys_info.py,sha256=NvKCuBlWHHiW4bDI4tYZUo3QusvODm1HlW6aAkrllnE,4248
 ctools/sys_log.py,sha256=oqb1S41LosdeZxtogFVgDk8R4sjiHhUeYJLCzHd728E,2805
 ctools/thread_pool.py,sha256=qb68ULHy1K7u3MC7WP49wDhmgUhgWazd9FRuFbClET4,925
-ctools/token.py,sha256=NZSBGF3lJajJFLRIZoeXmpp8h5cKM0dAH2weySgeORc,882
 ctools/upload_tools.py,sha256=sqe6K3ZWiyY58pFE5IO5mNaS1znnS7U4c4UqY8noED4,1068
 ctools/win_canvas.py,sha256=PAxI4i1jalfree9d1YG4damjc2EzaHZrgHZCTgk2GiM,2530
 ctools/win_control.py,sha256=35f9x_ijSyc4ZDkcT32e9ZIhr_ffNxadynrQfFuIdYo,3489
@@ -52,7 +56,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=OmfYu-Jjg2huRY6Su8zJ_2EGFFhtBZFbobYTwbjJtG4,1817
-gomyck_tools-1.2.7.dist-info/METADATA,sha256=uS-JVNCRR951EEMSzzMThWcONySUcNIj-lG-uJhF4M0,1108
-gomyck_tools-1.2.7.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-gomyck_tools-1.2.7.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
-gomyck_tools-1.2.7.dist-info/RECORD,,
+gomyck_tools-1.2.8.dist-info/METADATA,sha256=gUL87nZKJGUAwG9w5FJAMdTMQXDndYMOWKjK0ndbOL8,1376
+gomyck_tools-1.2.8.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+gomyck_tools-1.2.8.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
+gomyck_tools-1.2.8.dist-info/RECORD,,