gomyck-tools 1.0.0__py3-none-any.whl → 1.0.2__py3-none-any.whl

ctools/api_result.py

@@ -0,0 +1,51 @@
+from ctools import cjson
+
+cjson.str_value_keys = [
+  "obj_id",
+  "script_id",
+  "template_id"
+]
+
+
+class _ResEnum(object):
+  def __init__(self, code: int, message: str):
+    self.code = code
+    self.message = message
+
+  def __eq__(self, o: object) -> bool:
+    return self.code == o
+
+class R(object):
+  class Code:
+
+    @staticmethod
+    def cus_code(code, msg):
+      return _ResEnum(code, msg)
+
+    SUCCESS = _ResEnum(200, "成功")
+    FAIL    = _ResEnum(400, "失败")
+    ERROR   = _ResEnum(500, "异常")
+
+  def __init__(self, code: int, message: str, data=""):
+    self.code = code
+    self.message = message
+    self.data = data
+
+  def _to_json(self):
+    return cjson.unify_to_str(cjson.dumps(self))
+
+  @staticmethod
+  def parser(r_json: str):
+    return R(**cjson.loads(r_json))
+
+  @staticmethod
+  def ok(data=None, resp=Code.SUCCESS, msg=None):
+    return R(resp.code, msg if msg is not None else resp.message, data)._to_json()
+
+  @staticmethod
+  def fail(msg=None, resp=Code.FAIL, data=None):
+    return R(resp.code, msg if msg is not None else resp.message, data)._to_json()
+
+  @staticmethod
+  def error(msg=None, resp=Code.ERROR, data=None):
+    return R(resp.code, msg if msg is not None else resp.message, data)._to_json()

ctools/bottle_server.py

@@ -4,6 +4,39 @@ from wsgiref.simple_server import WSGIServer, WSGIRequestHandler, make_server
 from geventwebsocket.handler import WebSocketHandler
 from ctools import sys_log
 
+"""
+app = init_app('/doc_download')
+
+@app.get('/queryList')
+@mvc.parameter_handler()
+@rule('DOC:DOWNLOAD')
+def query_list(params, pageInfo):
+"""
+
+"""
+module_names = list(globals().keys())
+def get_modules():
+  mods = []
+  for modname in module_names:
+    if modname == 'base' or modname == 'online' or modname.startswith('__') or modname == 'importlib': continue
+    module = globals()[modname]
+    mods.append(module)
+  return mods
+
+def get_ws_modules():
+  from . import websocket
+  return [websocket]
+"""
+
+"""
+http_app = Bottle()
+for module in controller.get_modules():
+  log.debug('正在挂载http路由: {}'.format(module.app.context_path))
+  http_app.mount(module.app.context_path, module.app)
+http_server = bottle_server.WSGIRefServer(port=application.Server.port)
+http_app.run(server=http_server, quiet=True)
+"""
+
 class ThreadedWSGIServer(ThreadingMixIn, WSGIServer): pass
 
 class CustomWSGIHandler(WSGIRequestHandler):
@@ -36,7 +69,7 @@ class WSGIRefServer(ServerAdapter):
 
 class WebSocketServer(ServerAdapter):
 
-  def __init__(self, host='0.0.0.0', port=8012):
+  def __init__(self, host='0.0.0.0', port=8011):
     super().__init__(host, port)
     self.server = None
 

ctools/call.py

@@ -3,7 +3,7 @@ import threading
 import time
 from functools import wraps
 
-
+# annotation
 def once(func):
   """
   decorator to initialize a function once
@@ -24,7 +24,7 @@ def once(func):
 
   return wrapper
 
-
+# annotation
 def init(func):
   """
   decorator to initialize a function automic
@@ -38,7 +38,7 @@ def init(func):
 
   return wrapper
 
-
+# annotation
 def schd(interval_seconds, start_by_call: bool = False):
   start_flag = False
   run_flag = False

ctools/cjson.py

@@ -1,10 +1,11 @@
 import jsonpickle
 
+# 需要转换成str的属性
+str_value_keys = []
 jsonpickle.set_preferred_backend('json')
 jsonpickle.set_encoder_options('json', ensure_ascii=False)
 jsonpickle.set_decoder_options('json', encoding='utf-8')
 
-
 def dumps(obj) -> str:
   """
   将对象转换为json字符串
@@ -12,9 +13,9 @@ def dumps(obj) -> str:
   :return: json 字符串
   """
   if obj is None: return None
+  if type(obj) == str: return obj
   return f'{jsonpickle.encode(obj, unpicklable=False)}'
 
-
 def loads(json_str: str) -> dict:
   """
   将json字符串转换为对象
@@ -23,11 +24,6 @@ def loads(json_str: str) -> dict:
   """
   return jsonpickle.decode(json_str)
 
-
-# 需要转换成str的属性
-str_value_keys = []
-
-
 def unify_to_str(json_str: str) -> str:
   if not str_value_keys: return json_str
   obj = loads(json_str)
@@ -37,7 +33,6 @@ def unify_to_str(json_str: str) -> str:
     _handle_dict(obj)
   return dumps(obj)
 
-
 def _handle_list(data):
   for o in data:
     if isinstance(o, list):
@@ -45,7 +40,6 @@ def _handle_list(data):
     elif isinstance(o, dict):
       _handle_dict(o)
 
-
 def _handle_dict(data):
   for k, v in data.items():
     if isinstance(v, list):

ctools/ckafka.py

@@ -0,0 +1,152 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+__author__ = 'haoyang'
+__date__ = '2024/9/5 10:39'
+
+import signal
+import sys
+import time
+from threading import Thread, Lock
+
+from kafka import KafkaProducer, errors, KafkaConsumer
+from kafka.producer.future import FutureRecordMetadata
+
+from ctools import thread_pool
+from ctools.cjson import dumps
+
+"""
+import time
+
+from ctools import thread_pool
+from ctools.ckafka import CKafka
+
+c = CKafka(kafka_url='192.168.3.160:9094', secure=True)
+
+def send_msg():
+  while True:
+    time.sleep(3)
+    c.send_msg('test', 'test')
+
+thread_pool.submit(send_msg)
+c.get_msg('test')
+"""
+
+class CKafka:
+
+  def __init__(self, kafka_url: str = '127.0.0.1:9092', secure: bool = False, username: str = 'client', password: str = 'hylink_user_password', consumer_group: str = 'ck-py-kafka-consumer'):
+    self.consumer: KafkaConsumer = None
+    self.producer: KafkaProducer = None
+    self.start_consumer = False
+    self.consumer_callback = {"topic_key": []}
+    self.consumer_group = consumer_group
+    self.kafka_url = kafka_url
+    self.init_producer = False
+    self.init_consumer = False
+    self.secure = secure
+    self.username = username
+    self.password = password
+    self.locker = Lock()
+    self.quited = False
+
+  def _create_producer(self) -> KafkaProducer:
+    print("[ Producer ] Connecting to Kafka brokers")
+    for i in range(0, 6):
+      try:
+        if self.secure:
+          self.producer = KafkaProducer(
+            bootstrap_servers=self.kafka_url,
+            sasl_plain_username=self.username,
+            sasl_plain_password=self.password,
+            security_protocol='SASL_PLAINTEXT',
+            sasl_mechanism='PLAIN',
+            value_serializer=lambda x: dumps(x).encode('utf-8'))
+        else:
+          self.producer = KafkaProducer(
+            bootstrap_servers=self.kafka_url,
+            value_serializer=lambda x: dumps(x).encode('utf-8'))
+        print("[ Producer ] Connected to Kafka...")
+        self.init_producer = True
+        return self.producer
+      except errors.NoBrokersAvailable:
+        print("[ Producer ] Waiting for brokers to become available...")
+        time.sleep(3)
+    raise RuntimeError("[ Producer ] Failed to connect to brokers within 60 seconds")
+
+  def _create_consumer(self) -> KafkaProducer:
+    print("[ Consumer ] Connecting to Kafka brokers")
+    for i in range(0, 6):
+      try:
+        if self.secure:
+          self.consumer = KafkaConsumer(
+            group_id=self.consumer_group,
+            bootstrap_servers=self.kafka_url,
+            sasl_plain_username=self.username,
+            sasl_plain_password=self.password,
+            security_protocol='SASL_PLAINTEXT',
+            sasl_mechanism='PLAIN',
+            value_deserializer=lambda x: x.decode('utf-8'))
+        else:
+          self.consumer = KafkaProducer(
+            bootstrap_servers=self.kafka_url,
+            value_deserializer=lambda x: x.decode('utf-8'))
+        print("[ Consumer ] Connected to Kafka...")
+        self.init_consumer = True
+        return self.consumer
+      except errors.NoBrokersAvailable:
+        print("[ Consumer ] Waiting for brokers to become available...")
+        time.sleep(3)
+    raise RuntimeError("[ Consumer ] Failed to connect to brokers within 60 seconds")
+
+  # FutureRecordMetadata 可以添加回调, 来监听是否发送成功
+  # r.add_callback(lambda x: print(x))
+  # r.get() 可以同步获取结果
+  def send_msg(self, topic, msg, key: str=None, partition:int=None) -> FutureRecordMetadata:
+    if self.quited: return None
+    if not self.init_producer:
+      with self.locker:
+        if not self.init_producer:
+          self._create_producer()
+    return self.producer.send(topic=topic, value=msg, key=None if key is None else key.encode('utf-8'), partition=partition)
+
+  def get_msg(self, topics: str, callBack=print):
+    if not self.init_consumer:
+      with self.locker:
+        if not self.init_consumer:
+          self._create_consumer()
+    for topic in topics.split(','):
+      if topic not in self.consumer_callback.keys():
+        self.consumer_callback[topic] = []
+        self.consumer.subscribe(self.consumer_callback.keys())
+      self.consumer_callback[topic].append(callBack)
+    if not self.start_consumer:
+      t = Thread(target=self._start_consumer_poll)
+      t.start()
+
+  def _start_consumer_poll(self):
+    self.start_consumer = True
+    for msg in self.consumer:
+      if self.quited: break
+      taskList = []
+      funcList = []
+      begin_time = time.time()
+      for func in self.consumer_callback[msg.topic]:
+        if self.quited: break
+        f = thread_pool.submit(func, (msg, ))
+        taskList.append(f)
+        funcList.append(func.__name__)
+      for f in taskList:
+        if self.quited: break
+        f.result()
+      end_time = time.time()
+      if end_time - begin_time > 1: print(f"kafka consume too slow!!! {funcList} time cost: ", f'{round(end_time - begin_time, 2)}s')
+      taskList.clear()
+      funcList.clear()
+
+  def shutdown(self):
+    self.quited = True
+    try: self.consumer.close()
+    except Exception: pass
+    try: self.producer.close()
+    except Exception: pass
+    thread_pool.shutdown(wait=True)
+

ctools/cron_lite.py

@@ -7,10 +7,26 @@ import traceback
 from datetime import datetime
 from functools import wraps
 from typing import Optional, Dict
-
 import pytz
 from croniter import croniter
 
+"""
+@cron_lite.cron_task('0/1 * * * * ? *')
+def demo():
+  print('hello world')
+
+@cron_lite.cron_task('0/1 * * * * ? *')
+def demo1():
+  print('hello world111')
+
+def demo2(xx, fff):
+  print('hello world222', xx, fff)
+
+cron_lite.apply_cron_task('0/1 * * * * ? *', demo2, (123123123, 34534534))
+print(123123)
+
+cron_lite.start_all()
+"""
 
 class SchedulerMeta:
   timer_task_name: str = None
@@ -22,8 +38,8 @@ class SchedulerMeta:
 
 scheduler_map: Dict[str, SchedulerMeta] = {}  # {timer_task_name: SchedulerMeta}
 _switch = False
+_info_handler  = print
 _error_handler = print
-_info_handler = print
 _time_zone: Optional[pytz.BaseTzInfo] = None
 
 
@@ -31,75 +47,8 @@ def set_time_zone(time_zone_name: str):
   global _time_zone
   _time_zone = pytz.timezone(time_zone_name)
 
-
-def _register_next(timer_task_name, base_func, cron_expr, till_time_stamp):
-  cron_obj = croniter(cron_expr)
-  if _time_zone:
-    cron_obj.set_current(datetime.now(tz=_time_zone))
-  next_time = int(cron_obj.get_next())
-  if scheduler_map.get(timer_task_name) is None:
-    scheduler_meta = SchedulerMeta()
-    scheduler_meta.timer_task_name = timer_task_name
-    scheduler_meta.switch = True
-    scheduler_meta.scheduler = sched.scheduler(time.time, time.sleep)
-    scheduler_map[timer_task_name] = scheduler_meta
-  if till_time_stamp is None or next_time <= till_time_stamp:
-    scheduler_map[timer_task_name].event = scheduler_map[timer_task_name].scheduler.enterabs(next_time, 0, base_func)
-
-
-def _run_sched(scheduler_meta: SchedulerMeta):
-  active(scheduler_meta.timer_task_name)
-  while True:
-    scheduler = scheduler_meta.scheduler
-    if not _switch or not scheduler_meta.switch:
-      scheduler.empty()
-      inactive(scheduler_meta.timer_task_name)
-      return
-    t = scheduler.run(False)
-    if t is None:
-      inactive(scheduler_meta.timer_task_name)
-      return
-    st = time.time()
-    while time.time() - st < t:
-      if not _switch or not scheduler_meta.switch:
-        scheduler.empty()
-        inactive(scheduler_meta.timer_task_name)
-        return
-      time.sleep(0.5)
-
-
-def _start():
-  global _switch
-  _info_handler("cron started")
-  tl = []
-  for timer_task_name, scheduler_meta in scheduler_map.items():
-    print("Registering Job:", timer_task_name)
-    t = threading.Thread(target=_run_sched, args=(scheduler_meta,), daemon=True)
-    # 有些task非常耗时，会影响退出。目前设计改为退出时不保证task完成
-    t.start()
-    tl.append(t)
-
-  for t in tl:
-    t.join()
-  _info_handler("cron finished")
-  _switch = False  # ensure close when there are no more tasks with switch open
-  scheduler_map.clear()
-
-
-def convert_cron(cron_expr):
-  res_cron = ""
-  cron_list = cron_expr.split(" ")
-  if len(cron_list) > 6:
-    for cron in cron_list[1:]:
-      if cron != "?":
-        res_cron += "%s " % cron
-    res_cron += "%s" % cron_list[0]
-  else:
-    res_cron = cron_expr
-  return res_cron
-
-
-def cron_task(cron_expr: str, till_time_stamp: int = None):
+# @annotation
+def cron_task(cron_expr: str, task_name: str = None, till_time_stamp: int = None):
   """
   cron_task decorator to register a function as crontab task
   :param cron_expr: the croniter accepted cron_expression. NOTICE: the default timezone is UTC and can be changed by
@@ -107,7 +56,7 @@ def cron_task(cron_expr: str, till_time_stamp: int = None):
   :param till_time_stamp: run this jog till when. None means forever
   :return: the real decorator
   """
-  cron_expr = convert_cron(cron_expr)
+  cron_expr = _convert_cron(cron_expr)
   assert len(cron_expr.split(" ")) in (5, 6), \
     "only supported <min hour day month weekday> and <min hour day month weekday sec>"
 
@@ -121,15 +70,15 @@ def cron_task(cron_expr: str, till_time_stamp: int = None):
           _error_handler(f"run {func.__name__} failed\n" + traceback.format_exc())
         except Exception:
           _error_handler(f"run {func.__name__} failed\n")
-      _register_next(inner, inner, cron_expr, till_time_stamp)
+      _register_next(inner.__name__ if task_name is None else task_name, inner, cron_expr, till_time_stamp)
 
-    _register_next(inner, inner, cron_expr, till_time_stamp)
+    _register_next(inner.__name__ if task_name is None else task_name, inner, cron_expr, till_time_stamp, init=True)
     return inner
 
   return deco
 
 
-def apply_cron_task(timer_task_name, func, params, cron_expr, till_time_stamp=None):
+def apply_cron_task(cron_expr, func, params, timer_task_name=None, till_time_stamp=None):
   """
   cron_task decorator to register a function as crontab task
   :param func: task callback function
@@ -140,37 +89,32 @@ def apply_cron_task(timer_task_name, func, params, cron_expr, till_time_stamp=No
   :param till_time_stamp: run this jog till when. None means forever
   :return: the real decorator
   """
-  cron_expr = convert_cron(cron_expr)
-  assert len(cron_expr.split(" ")) in (5, 6), \
-    "Only supported <minute hour day month weekday> and <minute hour day month weekday second>"
-
+  cron_expr = _convert_cron(cron_expr)
+  assert len(cron_expr.split(" ")) in (5, 6),  "Only supported <minute hour day month weekday> and <minute hour day month weekday second>"
+  task_name = func.__name__ if timer_task_name is None else timer_task_name
   @wraps(func)
   def wrapper(*args, **kwargs):
     try:
-      func(timer_task_name, params, *args, **kwargs)
+      nonlocal params
+      func.__taskName__ = task_name
+      func(*params, *args, **kwargs)
     except Exception as exc:
       _error_handler(f"Run {func.__name__} failed with error: {str(exc)}")
     finally:
-      _register_next(timer_task_name, wrapper, cron_expr, till_time_stamp)
+      _register_next(task_name, wrapper, cron_expr, till_time_stamp)
 
-  _register_next(timer_task_name, wrapper, cron_expr, till_time_stamp)
+  _register_next(task_name, wrapper, cron_expr, till_time_stamp, init=True)
+  # 不使用 submit, 因为提交的任务, 不是 daemon 线程
+  t = threading.Thread(target=_start, args=(timer_task_name, ))
+  t.setDaemon(True)
+  t.start()
+  return t
 
-  global _switch
-  _switch = True
-
-  scheduler = scheduler_map.get(timer_task_name)
-  if scheduler:
-    scheduler.switch = True
-    t = threading.Thread(target=_run_sched, name=timer_task_name, args=(scheduler,), daemon=True)
-    # 有些task非常耗时，会影响退出。目前设计改为退出时不保证task完成
-    t.start()
-  return wrapper
-
-
-def start_all(spawn: bool = True, info_handler=None, error_handler=None) -> Optional[threading.Thread]:
+def start_all(spawn: bool = True, daemon: bool = True, info_handler=None, error_handler=None) -> Optional[threading.Thread]:
   """
   start_all starts all cron tasks registered before.
   :param spawn: whether to start a new thread for scheduler. If not, the action will block the current thread
+  :param daemon: the new thread is daemon if True
   :param info_handler: handle info output (scheduler start / stop), default = print, can use logging.info
   :param error_handler: handle error output (task execute exception), default = print, can use logging.error
   :raise RuntimeError: if the tasks are already started and still running we cannot start again. The feature is not
@@ -179,16 +123,14 @@ def start_all(spawn: bool = True, info_handler=None, error_handler=None) -> Opti
   """
   global _switch, _info_handler, _error_handler
   if _switch:
-    raise RuntimeError("the crontab was already started")
+    raise RuntimeError("the crontab was already started...")
   if info_handler:
     _info_handler = info_handler
   if error_handler:
     _error_handler = error_handler
-
-  _switch = True
   if spawn:
     t = threading.Thread(target=_start)
-    t.setDaemon(True)
+    t.setDaemon(daemon)
     t.start()
     return t
   else:
@@ -237,3 +179,73 @@ def stop_all(wait_thread: Optional[threading.Thread] = None):
     scheduler_map.get(timer_task_name).switch = False
   if wait_thread:
     wait_thread.join()
+
+
+def _register_next(timer_task_name, base_func, cron_expr, till_time_stamp, init: bool = False):
+  cron_obj = croniter(cron_expr)
+  if _time_zone:
+    cron_obj.set_current(datetime.now(tz=_time_zone))
+  next_time = int(cron_obj.get_next())
+  if scheduler_map.get(timer_task_name) is None:
+    scheduler_meta = SchedulerMeta()
+    scheduler_meta.timer_task_name = timer_task_name
+    scheduler_meta.switch = True
+    scheduler_meta.scheduler = sched.scheduler(time.time, time.sleep)
+    scheduler_map[timer_task_name] = scheduler_meta
+  elif init:
+    raise ValueError(f"task name: {timer_task_name} already exists!!!!!")
+  if till_time_stamp is None or next_time <= till_time_stamp:
+    scheduler_map[timer_task_name].event = scheduler_map[timer_task_name].scheduler.enterabs(next_time, 0, base_func)
+
+
+def _run_sched(scheduler_meta: SchedulerMeta):
+  active(scheduler_meta.timer_task_name)
+  while True:
+    scheduler = scheduler_meta.scheduler
+    if not _switch or not scheduler_meta.switch:
+      scheduler.empty()
+      inactive(scheduler_meta.timer_task_name)
+      return
+    t = scheduler.run(False)
+    if t is None:
+      inactive(scheduler_meta.timer_task_name)
+      return
+    st = time.time()
+    while time.time() - st < t:
+      if not _switch or not scheduler_meta.switch:
+        scheduler.empty()
+        inactive(scheduler_meta.timer_task_name)
+        return
+      time.sleep(0.5)
+
+
+def _start(taskName: str = None):
+  global _switch
+  _switch = True
+  _info_handler("cron job begin start...")
+  taskList = []
+  for timer_task_name, scheduler_meta in scheduler_map.items():
+    if taskName is not None and timer_task_name != taskName: continue
+    print("register job: ", timer_task_name)
+    thread = threading.Thread(target=_run_sched, args=(scheduler_meta, ))
+    thread.setDaemon(True)
+    thread.start()
+    taskList.append(thread)
+  for task in taskList: task.join()
+  _info_handler("cron job execute finished...")
+  _switch = False
+  scheduler_map.clear()
+
+
+def _convert_cron(cron_expr):
+  res_cron = ""
+  cron_list = cron_expr.split(" ")
+  if len(cron_list) > 6:
+    for cron in cron_list[1:]:
+      if cron != "?":
+        res_cron += "%s " % cron
+    res_cron += "%s" % cron_list[0]
+  else:
+    res_cron = cron_expr
+  return res_cron
+

ctools/database.py

@@ -8,6 +8,13 @@ from sqlalchemy.sql import text
 from ctools import call, string_tools
 from ctools.thread_pool import thread_local
 
+"""
+database.init_db('postgresql://postgres:123456@192.168.3.107:32566/abc', default_schema='public', db_key='source', pool_size=100)
+with database.get_session('source') as s:
+  s.execute(text('insert into xxx (name) values (:name)'), {'name': string_tools.get_random_str(5)})
+  s.commit()
+"""
+
 Base = None
 inited_db = {}
 engines = {}
@@ -21,11 +28,8 @@ def _init():
   global Base
   Base = declarative_base()
 
-def set_search_path(dbapi_connection, default_schema):
-  with dbapi_connection.cursor() as cursor:
-    cursor.execute(f'SET search_path TO {default_schema}')
-
 # 密码里的@  要替换成 %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 inited_db.get(db_key): raise Exception('db {} already init!!!'.format(db_key))
   global engines, sessionMakers
@@ -33,7 +37,11 @@ def init_db(db_url: str, db_key: str='default', connect_args: dict={}, default_s
   engines[db_key] = engine
   sessionMakers[db_key] = sessionMaker
   inited_db[db_key] = True
-  if default_schema: event.listen(engine, 'connect', lambda dbapi_connection, connection_record: set_search_path(dbapi_connection, default_schema))
+  if default_schema: event.listen(engine, 'connect', lambda dbapi_connection, connection_record: _set_search_path(dbapi_connection, default_schema))
+
+def _set_search_path(dbapi_connection, default_schema):
+  with dbapi_connection.cursor() as cursor:
+    cursor.execute(f'SET search_path TO {default_schema}')
 
 def _create_connection(db_url: str, pool_size: int=5, max_overflow: int=25, connect_args={}, echo: bool=False):
   engine = create_engine('{}'.format(db_url),

ctools/douglas_rarefy.py

@@ -0,0 +1,130 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+__author__ = 'haoyang'
+__date__ = '2024/9/19 14:02'
+
+import math
+from ctools import cjson
+from ctools.sys_log import flog as log
+from jsonpath_ng import parser
+
+class THIN_LEVEL:
+  L1 = 0.00001
+  L2 = 0.00003
+  L3 = 0.00009
+  L4 = 0.0002
+  L5 = 0.0004
+  L6 = 0.0007
+  L7 = 0.0011
+  L8 = 0.0017
+  L9 = 0.0022
+
+class Point:
+  def __init__(self, lng, lat, origin_data):
+    self.lng = lng
+    self.lat = lat
+    self.origin_data = origin_data
+
+def _get_line_by_point(xy1, xy2):
+  """
+  根据两个点求直线方程 ax + by + c = 0
+  :param xy1: 点1, 例如 {'lat': 1, 'lng': 1}
+  :param xy2: 点2, 例如 {'lat': 2, 'lng': 2}
+  :return: 直线方程的三个参数 [a, b, c]
+  """
+  x1 = xy1.lng
+  y1 = xy1.lat
+  x2 = xy2.lng
+  y2 = xy2.lat
+  a = y2 - y1
+  b = x1 - x2
+  c = (y1 - y2) * x1 - y1 * (x1 - x2)
+  return [a, b, c]
+
+
+def _get_distance_from_point_to_line(a, b, c, xy):
+  """
+  点到直线的距离，直线方程为 ax + by + c = 0
+  :param a: 直线参数a
+  :param b: 直线参数b
+  :param c: 直线参数c
+  :param xy: 点坐标，例如 {'lat': 2, 'lng': 2}
+  :return: 距离
+  """
+  x = xy.lng
+  y = xy.lat
+  return abs((a * x + b * y + c) / math.sqrt(a * a + b * b))
+
+
+class DouglasRarefy:
+  """
+  DouglasRarefy Use Guide:
+    points must be arrays, element can be dict or arrays, when element is arrays, index 0 must be lng, index 1 must be lat, and element can be use max column num is 2 (lng, lat) in ret_tpl
+    level default is L2, this level can be hold most of the points detail
+    ret_tpl is the result tpl, can be arrays and json or some can be json loads, exp: [{lng}, {lat}] OR {{"lng": {lng}, "lat": {lat}}}
+  """
+  def __init__(self, points:[], level=THIN_LEVEL.L2, ret_tpl=None, get_lng=None, get_lat=None):
+    if not isinstance(points, list): raise Exception('points must be list obj !!')
+    if len(points) < 3: raise Exception('points length must be gt 2 !!')
+    self.points = points
+    self.threshold = THIN_LEVEL.L2 if level is None else (getattr(THIN_LEVEL, "L{}".format(int(level))) if int(level) >= 1 else level)
+    log.debug("threshold is: {}".format(self.threshold))
+    self.is_json = isinstance(points[0], dict)
+    self.get_lng = get_lng
+    self.get_lat = get_lat
+    if self.is_json:
+      if not self.get_lng: self.get_lng = '$.lng'
+      if not self.get_lat: self.get_lat = '$.lat'
+    else:
+      if not self.get_lng: self.get_lng = '$.[0]'
+      if not self.get_lat: self.get_lat = '$.[1]'
+    log.debug("get_lng is: {}, get_lat is: {}".format(self.get_lng, self.get_lat))
+    self.lng_parser = parser.parse(self.get_lng)
+    self.lat_parser = parser.parse(self.get_lat)
+    log.debug("is_json is: {}".format(self.is_json))
+    self.ret_tpl = ret_tpl
+    log.debug("ret_tpl is: {}".format(self.ret_tpl))
+    self.data = [Point(self.lng_parser.find(p)[0].value, self.lat_parser.find(p)[0].value, p) for p in self.points]
+
+  def _sparse_points(self, points):
+    """
+    点位压缩
+    :return: 稀疏后的点集
+    """
+    if len(points) < 3:
+      if not self.ret_tpl:
+        return [points[0].origin_data, points[-1].origin_data]
+      else:
+        if self.is_json:
+          return [cjson.loads(self.ret_tpl.format(**points[0].origin_data)), cjson.loads(self.ret_tpl.format(**points[-1].origin_data))]
+        else:
+          return [cjson.loads(self.ret_tpl.format(lng=points[0].lng, lat=points[0].lat)), cjson.loads(self.ret_tpl.format(lng=points[-1].lng, lat=points[-1].lat))]
+
+    xy_first = points[0]   # 第一个点
+    xy_end   = points[-1]  # 最后一个点
+    a, b, c  = _get_line_by_point(xy_first, xy_end)  # 获取直线方程的 a, b, c 值
+    d_max = 0   # 记录点到直线的最大距离
+    split = 0   # 分割位置
+    for i in range(1, len(points) - 1):
+      d = _get_distance_from_point_to_line(a, b, c, points[i])
+      if d > d_max:
+        split = i
+        d_max = d
+    if d_max > self.threshold:
+      # 如果存在点到首位点连成直线的距离大于 max_distance 的, 即需要再次划分
+      child_left  = self._sparse_points(points[:split + 1])  # 递归处理左边部分
+      child_right = self._sparse_points(points[split:])      # 递归处理右边部分
+      # 合并结果，避免重复
+      return child_left + child_right[1:]
+    else:
+      if not self.ret_tpl:
+        return [points[0].origin_data, points[-1].origin_data]
+      else:
+        if self.is_json:
+          return [cjson.loads(self.ret_tpl.format(**points[0].origin_data)), cjson.loads(self.ret_tpl.format(**points[-1].origin_data))]
+        else:
+          return [cjson.loads(self.ret_tpl.format(lng=points[0].lng, lat=points[0].lat)), cjson.loads(self.ret_tpl.format(lng=points[-1].lng, lat=points[-1].lat))]
+
+  def sparse_points(self):
+    return self._sparse_points(self.data)
+

ctools/ex.py

@@ -2,7 +2,7 @@ import time
 import traceback
 from functools import wraps
 
-
+# annotation
 def exception_handler(fail_return, retry_num=0, delay=3, catch_e=Exception, print_exc=False):
   def decorator(func):
     @wraps(func)

ctools/http_utils.py

@@ -4,7 +4,7 @@ import requests
 def get(url, params=None, headers=None):
   result = ""
   try:
-    response = requests.get(url, params=params, headers=headers, timeout=5)
+    response = requests.get(url, params=params, headers=headers, timeout=60)
     response.raise_for_status()
     if response.status_code == 200:
       result = response.content
@@ -15,7 +15,7 @@ def get(url, params=None, headers=None):
 
 def post(url, data=None, json=None, headers=None, files=None):
   result = ""
-  response = requests.post(url, data=data, json=json, files=files, headers=headers, timeout=5)
+  response = requests.post(url, data=data, json=json, files=files, headers=headers, timeout=60)
   response.raise_for_status()
   if response.status_code == 200:
     result = response.content

ctools/metrics.py

@@ -4,7 +4,6 @@ from enum import Enum
 
 from prometheus_client import Counter, Gauge, Summary, Histogram
 
-from business.common.constant import MetricKey
 from ctools import call, cjson, sys_log
 from ctools.application import Server
 
@@ -123,23 +122,5 @@ def opt(metric_key: str, label_values: [], metric_value: int):
     log.error("添加指标信息异常: %s" % e)
   _lock.release()
 
-
 def _init_all_metrics():
   Metric(MetricType.COUNTER, 'demo123123', ['asdasd', 'sdfsdf'], persistent=True)
-  Metric(MetricType.GAUGE, MetricKey.ASSETS_TPL_COUNT.value, [], persistent=True, desc="模版数量")
-  Metric(MetricType.GAUGE, MetricKey.ASSETS_FLOW_COUNT.value, [], persistent=True, desc="流程数量")
-  Metric(MetricType.GAUGE, MetricKey.ASSETS_SCHEDULE_COUNT.value, [], persistent=True, desc="调度任务数量")
-
-  Metric(MetricType.COUNTER, MetricKey.CLIENT_STATUS_RUNNING_STATE.value, [], reset=True, desc="运行状态")
-  Metric(MetricType.COUNTER, MetricKey.CLIENT_STATUS_AUTHORIZED_DAYS.value, [], reset=True, desc="已授权天数")
-  Metric(MetricType.COUNTER, MetricKey.CLIENT_STATUS_PROGRESS.value, ['process_id'], reset=True, desc="流程运行进度[0-100]")
-
-  Metric(MetricType.COUNTER, MetricKey.WORKLOAD_PROCESS_EXEC_COUNT.value, ['process_id'], persistent=True, desc="流程执行次数")
-  Metric(MetricType.COUNTER, MetricKey.WORKLOAD_PROCESS_HOURS.value, ['process_id'], persistent=True, desc="全部流程工作时长")
-  Metric(MetricType.COUNTER, MetricKey.WORKLOAD_PROCESS_HOURS_SINGLE.value, ['process_id'], reset=True, desc="单次流程工作时长")
-  Metric(MetricType.COUNTER, MetricKey.WORKLOAD_PROCESS_COLLECT_DATA_TOTAL.value, ['process_id'], persistent=True, desc="全部流程采集数据总量")
-  Metric(MetricType.COUNTER, MetricKey.WORKLOAD_PROCESS_COLLECT_DATA_TOTAL_SINGLE.value, ['process_id'], reset=True, desc="单次流程采集数据总量")
-  Metric(MetricType.COUNTER, MetricKey.WORKLOAD_PROCESS_SEND_DATA_TOTAL.value, ['process_id'], persistent=True, desc="全部流程发送数据总量")
-  Metric(MetricType.COUNTER, MetricKey.WORKLOAD_PROCESS_SEND_DATA_TOTAL_SINGLE.value, ['process_id'], reset=True, desc="单次流程发送数据总量")
-
-  Metric(MetricType.COUNTER, MetricKey.ERROR_SCHEDULE_COUNT.value, ['process_id'], persistent=True, desc="出错任务数")

ctools/pacth.py

@@ -3,7 +3,7 @@ import shutil
 
 from sqlalchemy.sql import text
 
-from business.persistent import database
+from ctools import database
 
 class Patch:
 

ctools/process_pool.py

@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+__author__ = 'haoyang'
+__date__ = '2024/9/20 12:00'
+import os
+import time
+from concurrent.futures import ProcessPoolExecutor
+from ctools import call
+
+_process_pool: ProcessPoolExecutor = None
+
+@call.init
+def init():
+  global _process_pool
+  max_workers = min(32, os.cpu_count()) # 最多 32 个
+  _process_pool = ProcessPoolExecutor(max_workers=max_workers)
+
+def cb(f, callback):
+  exc = f.exception()
+  if exc:
+    if callback: callback(exc)
+    raise exc
+  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)
+  future.add_done_callback(lambda f: cb(f, callback))
+  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/sys_log.py

@@ -2,21 +2,15 @@ import logging
 import os
 import sys
 import time
+import traceback
 
-from ctools import application, call
+from ctools import call, work_path
 
-application.sync_config()
-
-clog, flog = None, None
+clog: logging.Logger = None
+flog: logging.Logger = None
 
 neglect_keywords = [
   "OPTIONS",
-  '/scheduleInfo/list',
-  '/sys/get_sys_state',
-  '/scheduleInfo/tmpList',
-  '/sys/getSysLog',
-  '/downloadManage/static_file',
-  '/downloadManage/static_images'
 ]
 
 
@@ -27,7 +21,7 @@ def _file_log(sys_log_path: str = './', log_level: int = logging.INFO, mixin: bo
     os.mkdir(sys_log_path)
   except Exception:
     pass
-  log_file = sys_log_path + os.path.sep + "log-" + time.strftime("%Y-%m-%d-%H-%M-%S", time.localtime(time.time())) + ".log"
+  log_file = sys_log_path + os.path.sep + "log-" + time.strftime("%Y-%m-%d-%H", time.localtime(time.time())) + ".log"
   if mixin:
     handlers = [logging.FileHandler(filename=log_file, encoding='utf-8'), logging.StreamHandler()]
   else:
@@ -56,14 +50,28 @@ class GlobalLogger(object):
   def __init__(self, logger):
     sys.stdout = self
     sys.stderr = self
+    sys.excepthook = self.handle_exception
     self.log = logger
 
   def write(self, message):
-    if message == '\n': return
+    if message == '\n' or message == '\r\n': return
     global neglect_keywords
     for neglect_keyword in neglect_keywords:
       if neglect_keyword in message: return
-    self.log.info(message)
+    try:
+      stack = traceback.extract_stack(limit=3)
+      caller = stack[-2]
+      location = f"{os.path.splitext(os.path.basename(caller.filename))[0]}({caller.name}:{caller.lineno})"
+      self.log.info(f"{location} {message.strip()}")
+    except Exception:
+      self.log.info(message.strip())
+
+  def handle_exception(self, exc_type, exc_value, exc_traceback):
+    if issubclass(exc_type, KeyboardInterrupt):
+      sys.__excepthook__(exc_type, exc_value, exc_traceback)
+      return
+    formatted_exception = ''.join(traceback.format_exception(exc_type, exc_value, exc_traceback))
+    self.log.error(f"An error occurred:\n{formatted_exception.strip()}")
 
   def flush(self):
     pass
@@ -72,6 +80,10 @@ class GlobalLogger(object):
 @call.init
 def _init_log() -> None:
   global flog, clog
-  flog = _file_log(sys_log_path=application.Server.sysLogPath, mixin=True, log_level=logging.INFO if application.Authorization.enabled else logging.DEBUG)
+  flog = _file_log(sys_log_path='{}/ck-py-log/'.format(work_path.get_user_work_path()), mixin=True, log_level=logging.DEBUG)
   clog = _console_log()
   GlobalLogger(flog)
+
+def setLevel(log_level=logging.INFO):
+  flog.setLevel(log_level)
+  clog.setLevel(log_level)

ctools/thread_pool.py

@@ -28,3 +28,7 @@ def submit(func, *args, callback=None, **kwargs):
   future.add_done_callback(lambda f: cb(f, callback))
   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/web_base.py

@@ -0,0 +1,143 @@
+import threading
+from functools import wraps
+
+import bottle
+from bottle import response, Bottle, abort, request
+from ctools.api_result import R
+from ctools.sys_log import flog as log
+
+bottle.BaseRequest.MEMFILE_MAX = 1024 * 1024 * 50
+
+class GlobalState:
+  lock = threading.Lock()
+  withOutLoginURI = [
+    '/login',
+    '/get_sys_version'
+  ]
+  allowRemoteCallURI = [
+
+  ]
+  token = {}
+
+def init_app(context_path):
+  app = Bottle()
+  app.context_path = context_path
+
+  @app.hook('before_request')
+  def before_request():
+    # abort(401, '系统时间被篡改, 请重新校时!')
+    pass
+
+  @app.error(401)
+  def unauthorized(error):
+    after_request()
+    response.status = 200
+    log.error("系统未授权: {} {} {}".format(error.body, request.method, request.fullpath))
+    return R.error(resp=R.Code.cus_code(9999, "系统未授权! {}".format(error.body)))
+
+  @app.error(403)
+  def unauthorized(error):
+    after_request()
+    response.status = 200
+    log.error("访问受限: {} {} {}".format(error.body, request.method, request.fullpath))
+    return R.error(resp=R.Code.cus_code(8888, "访问受限: {}".format(error.body)))
+
+  @app.error(405)
+  def cors_error(error):
+    if request.method == 'OPTIONS':
+      after_request()
+      response.status = 200
+      return
+    log.error("请求方法错误: {} {} {}".format(error.status_line, request.method, request.fullpath))
+    return R.error(msg='请求方法错误: {}'.format(error.status_line))
+
+  @app.error(500)
+  def cors_error(error):
+    after_request()
+    response.status = 200
+    log.error("系统发生错误: {} {} {}".format(error.body, request.method, request.fullpath))
+    return R.error(msg='系统发生错误: {}'.format(error.exception))
+
+  @app.hook('after_request')
+  def after_request():
+    enable_cors()
+  return app
+
+# annotation
+def rule(key):
+  def return_func(func):
+    @wraps(func)
+    def decorated(*args, **kwargs):
+      # if GlobalState.licenseInfo is not None and key not in GlobalState.licenseInfo.access_module:
+      #   log.error("系统未授权! {} {}".format(request.fullpath, '当前请求的模块未授权!请联系管理员!'))
+      #   return R.error(resp=R.Code.cus_code(9999, "系统未授权! {}".format('当前请求的模块未授权!请联系管理员!')))
+      return func(*args, **kwargs)
+    return decorated
+  return return_func
+
+
+def enable_cors():
+  response.headers['Access-Control-Allow-Origin'] = '*'
+  response.headers['Access-Control-Allow-Methods'] = 'GET, POST, PUT, DELETE, OPTIONS'
+  request_headers = request.headers.get('Access-Control-Request-Headers')
+  response.headers['Access-Control-Allow-Headers'] = request_headers if request_headers else ''
+  response.headers['Access-Control-Expose-Headers'] = '*'
+
+# annotation
+def params_resolve(func):
+  """
+  Use guide:
+    @params_resolve
+    def xxx(params):
+      print(params.a)
+      print(params.b)
+  """
+  @wraps(func)
+  def decorated(*args, **kwargs):
+    if request.method == 'GET':
+      queryStr = request.query.decode('utf-8')
+      pageInfo = PageInfo(
+        page_size=10 if request.headers.get('page_size') is None else int(request.headers.get('page_size')),
+        page_index=1 if request.headers.get('page_index') is None else int(request.headers.get('page_index'))
+      )
+      queryStr.pageInfo = pageInfo
+      return func(params=queryStr, *args, **kwargs)
+    elif request.method == 'POST':
+      content_type = request.get_header('content-type')
+      if content_type == 'application/json':
+        params = request.json
+        return func(params=DictWrapper(params), *args, **kwargs)
+      elif content_type and 'multipart/form-data' in content_type:
+        form_data = request.forms.decode()
+        form_files = request.files.decode()
+        params = FormDataParams(data=DictWrapper(form_data), files=form_files)
+        return func(params=params, *args, **kwargs)
+      else:
+        params = request.query.decode('utf-8')
+        return func(params=params, *args, **kwargs)
+    else:
+      return func(*args, **kwargs)
+  return decorated
+
+class PageInfo:
+  def __init__(self, page_size, page_index):
+    self.page_size = page_size
+    self.page_index = page_index
+
+class FormDataParams:
+  def __init__(self, data, files):
+    self.data = data
+    self.files = files
+
+  def __getattr__(self, key):
+    try:
+      return self.data[key]
+    except Exception:
+      return self.files[key]
+
+class DictWrapper(dict):
+  def __getattr__(self, key):
+    return self.get(key)
+
+  def __setattr__(self, key, value):
+    self[key] = value

{gomyck_tools-1.0.0.dist-info → gomyck_tools-1.0.2.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.0.0
-Summary: A ctools for python development
+Version: 1.0.2
+Summary: A ctools for python development by hao474798383
 Home-page: https://blog.gomyck.com
 Author: gomyck
 Author-email: hao474798383@163.com
@@ -10,11 +10,13 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Requires-Dist: jieba ==0.42.1
-Requires-Dist: jsonpickle ==3.2.2
-Requires-Dist: SQLAlchemy ==2.0.32
-Requires-Dist: paddlepaddle ==2.6.1
-Requires-Dist: chardet ==5.2.0
-Requires-Dist: psycopg2-binary ==2.9.9
+Requires-Dist: jsonpickle >=3.2.2
+Requires-Dist: SQLAlchemy >=2.0.32
+Requires-Dist: chardet >=5.2.0
+Requires-Dist: psycopg2-binary >=2.9.9
+Requires-Dist: croniter >=3.0.3
+Requires-Dist: pyautogui >=0.9.54
+Requires-Dist: gmssl >=3.2.2
+Requires-Dist: psutil >=6.0.0
 
 this package is for python development

{gomyck_tools-1.0.0.dist-info → gomyck_tools-1.0.2.dist-info}/RECORD

@@ -1,34 +1,36 @@
 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/b64.py,sha256=_BdhX3p3-MaSSlU2wivN5qPxQfacR3VRBr1WC456tU0,194
 ctools/bashPath.py,sha256=BCN_EhYzqvwsxYso81omMNd3SbEociwSOyb9kLvu8V4,337
-ctools/bottle_server.py,sha256=1FngczUlovRpS8HGx7_q2-jrnGmS0g2UUxbILaMmsR8,1482
+ctools/bottle_server.py,sha256=9gmw1og_8ZaOfmF8X9pwDlRxxeo648QmFvLl0shV0Dk,2303
 ctools/browser_element_tools.py,sha256=tWNxUJ9m-hNTYtS0NRvmH9r5I-Qw55uKekwDYgt49bc,9951
-ctools/call.py,sha256=v1QGKo8UeWDs1zASJSHUUuFkYZ5zb8Pzd0vEYzAi4d8,1545
-ctools/cjson.py,sha256=n7Q3k5-1F30uIKRsRoizXdDTsIC-wAyt338B_FzktdE,1236
+ctools/call.py,sha256=BCr8wzt5qd70okv8IZn-9-EpjywleZgvA3u1vfZ_Kt8,1581
+ctools/cjson.py,sha256=hFw-Ue3sUxHd_RAA5Yp1vIyf79KnlxiISOSHCKQQnF8,1263
+ctools/ckafka.py,sha256=win6iV9-7FJDzcmqwQ5httN_NWjrBlWHc5b7N9E5tCQ,5187
 ctools/compile_tools.py,sha256=Nybh3vnkurIKnPnubdYzigjnzFu4GaTMKPvqFdibxmE,510
 ctools/console.py,sha256=1VAq_-fSGgHKYv6Qe53kHaJL0-3NpFRUZljahbJPcfk,1807
-ctools/cron_lite.py,sha256=ehayjzS9HHNc9ub9BY4aBJglXS01PJCGYvOrQyr3X8Y,7713
-ctools/database.py,sha256=33MWjA536g3JltpQ_Xi8QfLjwiVWpe_prfvqEa1ZEMc,4983
+ctools/cron_lite.py,sha256=L3Le_ScIuKiLAfzdaCf8qoPUbFIMT9ASallQkmwJTfc,8307
+ctools/database.py,sha256=xUiJbRRgHkGqwTzFUhAguFfDkW1dVfG2HVPFPzNpkmk,5360
 ctools/date_utils.py,sha256=-xI2anEzAonOvYwVmM1hCnkuLKodZ8pb33dS3dRxEIc,865
+ctools/douglas_rarefy.py,sha256=2zjUa5nLkStsAsttVqe3PiJWpk108pw1m3CIRNm-Z94,4820
 ctools/download_tools.py,sha256=h12HGr2IaVvl8IDAvpDftHycSACI5V7HF0Yk9kV4bVY,1750
 ctools/enums.py,sha256=QbHa3j7j4-BDdwaga5Y0nYfA2uNSVJDHumYdIZdKVkM,118
-ctools/ex.py,sha256=vIkSWzHuNFslDFeBZCzCmbOefgLTEeScJp0vKeNm_P8,783
+ctools/ex.py,sha256=_UtbmDLrC7uZsoBtTdecuCZAlf2DA7fvojUf5fGZDVo,795
 ctools/excelOpt.py,sha256=q3HLAb1JScTrMCvx_x-4WWnqKhyTEzQ-m5vtqFy8NZU,1138
 ctools/html_soup.py,sha256=LabCo4yWI58fbFBPhunk3THWBf0BbHEWLgwyvSpTGR4,1903
-ctools/http_utils.py,sha256=5tW_MV8JUfA4hMLh4cup0kyBsiiTK1l6sgdHVdc8p5g,614
+ctools/http_utils.py,sha256=4dt7OTRZluB9wCK4HL0TBqVZrV3cj_AIs4-9mGDC1zA,616
 ctools/id_worker_tools.py,sha256=xtfxpL8q4hHLT02JFx2jVXEXpasHq44ZFsOhO580JmE,2357
 ctools/images_tools.py,sha256=hjYu-3tpjZ96yMqAM3XrFSUEOiUcyGk4DbAsz2_OeIs,669
 ctools/imgDialog.py,sha256=DSq5cFofyP_el80AFConht_ZYRqxZhIz4CWjqBlJ0cw,1385
 ctools/license.py,sha256=0Kh7lXL7LD1PQqyijHajFL0GbmZGNB88PA2WskbQn_s,1066
-ctools/log.py,sha256=kLlT67by9kTV6UlFXuYPg5AkNnqFRZknoUqLGGIKj14,1097
-ctools/metrics.py,sha256=wHRw1qBFqjDdRXWQQgIJdXUKQgocRlIoTsjNDA9t0SU,6288
+ctools/metrics.py,sha256=vq9Fnq2fhmhS4yoHS4gO7ArKS033Eou8vpA779Uue0I,4414
 ctools/mqtt_utils.py,sha256=9q_5CGvEhhvy8fZxaioguPSz8mvkdpCxnZ86GxjwTE0,10676
-ctools/mvc.py,sha256=MgOaM7Jg_tUwVoBSzTgr12E3bX4-IQnIqBwDC-1BO08,1792
 ctools/obj.py,sha256=GYS1B8NyjtUIh0HlK9r8avC2eGbK2SJac4C1CGnfGhI,479
-ctools/pacth.py,sha256=D2bTpYZ05MvLJ9aPwsRPo3ze2jV-siKQ6s0zDUCg82E,2616
+ctools/pacth.py,sha256=4TNWbgNqFSY_BBXKF4KzKauxL8W937wDkoqt84rU-Qg,2603
 ctools/plan_area_tools.py,sha256=yyFWIAvVe_p1e8HugR_h7r_W7dW9dQ-CGtgMz_Hz5QQ,3396
+ctools/process_pool.py,sha256=LTXU8pxEhnf8dDD23z0OoMlru5z-hKr8EFNH3xYDvCs,950
 ctools/pty_tools.py,sha256=H-j2xlZ5A0Q75NMop1ghCs2C0BZPKOPjilRujnh5Ngg,1602
 ctools/resource_bundle_tools.py,sha256=8zW1-aj6jAYFBCoyslz5bL-5916G6Aif1RUy_ObbiVU,3793
 ctools/screenshot_tools.py,sha256=-DzWgguxTOTolzQXdZfUIHTOU3HNhp74fdomeSTBxKs,4538
@@ -38,17 +40,17 @@ ctools/ssh.py,sha256=3Oo4Lf6UyX-F_u_c1icHHDNzvVDHMKiWIO1u7E22QkM,217
 ctools/strDiff.py,sha256=QUtXOfsRLTFozH_zByqsC39JeuG3eZtrwGVeLyaHYUI,429
 ctools/string_tools.py,sha256=qjFn47lM27ISAa2Q4OKO7WOBdhyWC5lLHbME-uSeICE,2142
 ctools/sys_info.py,sha256=podW43pcn7z2f6FW2w1L9bU1HfeVjC3D34BdN_H6rf4,3625
-ctools/sys_log.py,sha256=S-H8z3Gf2lZPu8KL-N6h5Y-bGGcg3BIVEiCDk1DV9eM,2192
-ctools/thread_pool.py,sha256=1u7zOfXqrn426rC3knfk8TE1aDutDhvmsukP9NlGg68,795
-ctools/token_tools.py,sha256=yFMAtdoGWAPQexqilX6mLER7h2_OxzIdcUL-LqZ-56o,316
+ctools/sys_log.py,sha256=oqb1S41LosdeZxtogFVgDk8R4sjiHhUeYJLCzHd728E,2805
+ctools/thread_pool.py,sha256=pPtKCE1BjagbhqtWjKo5HA2LktcSQ5KQUJz9Fn2Jl0w,924
 ctools/upload_tools.py,sha256=sqe6K3ZWiyY58pFE5IO5mNaS1znnS7U4c4UqY8noED4,1068
+ctools/web_base.py,sha256=lrEANgUluyxGu2nCxuk94HMuS2-VFpLXsyw870PxB6g,4545
 ctools/win_canvas.py,sha256=PAxI4i1jalfree9d1YG4damjc2EzaHZrgHZCTgk2GiM,2530
 ctools/win_control.py,sha256=zNu06wNCtOnfIg12LIMMy2hBb1rskVQ8QIZu9qx4CNY,3487
 ctools/wordFill.py,sha256=dB1OLt6GLmWdkDV8H20VWbJmY4ggNNI8iHD1ocae2iM,875
 ctools/word_fill.py,sha256=aIkzjAF2soSW6w2dO2CRZlveDcuIdr6v9DtyyyB8uxM,18216
 ctools/word_fill_entity.py,sha256=eX3G0Gy16hfGpavQSEkCIoKDdTnNgRRJrFvKliETZK8,985
 ctools/work_path.py,sha256=i4MTUobqNW2WMrT3mwEC_XYQ0_IhFmKoNpTX2W6A8Tc,1680
-gomyck_tools-1.0.0.dist-info/METADATA,sha256=QMUSjOazj7W24mtjuwh79X11mgZ1ALWQy2r2d_TQrg4,636
-gomyck_tools-1.0.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-gomyck_tools-1.0.0.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
-gomyck_tools-1.0.0.dist-info/RECORD,,
+gomyck_tools-1.0.2.dist-info/METADATA,sha256=di1uIqHBSRqYIzKZFrQZ_FJsp_BJ3Yi26POCoxFwDqk,711
+gomyck_tools-1.0.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+gomyck_tools-1.0.2.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
+gomyck_tools-1.0.2.dist-info/RECORD,,

ctools/log.py

@@ -1,28 +0,0 @@
-import logging
-import os
-import time
-
-
-# 文件日志
-def flog(base_work_path: str = './', log_level: int = logging.INFO, mixin: bool = False) -> logging:
-  try:
-    os.mkdir(base_work_path + ".logs")
-  except Exception:
-    pass
-  log_file = base_work_path + ".logs" + os.path.sep + "log-" + time.strftime("%Y-%m-%d-%H-%M-%S", time.localtime(time.time())) + ".ck"
-  if mixin:
-    handlers = [logging.FileHandler(filename=log_file, encoding='utf-8'), logging.StreamHandler()]
-  else:
-    handlers = [logging.FileHandler(filename=log_file, encoding='utf-8')]
-  logging.basicConfig(level=log_level,
-                      format='%(asctime)s-%(levelname)s-%(thread)d-%(funcName)s-%(lineno)d - %(message)s',
-                      handlers=handlers)
-  return logging.getLogger("ck-flog")
-
-
-# 控制台日志
-def clog(log_level: int = logging.INFO) -> logging:
-  logging.basicConfig(level=log_level,
-                      format='%(asctime)s-%(levelname)s-%(thread)d-%(funcName)s-%(lineno)d - %(message)s',
-                      handlers=[logging.StreamHandler()])
-  return logging.getLogger("ck-clog")

ctools/mvc.py

@@ -1,56 +0,0 @@
-from functools import wraps
-
-from bottle import request
-
-
-class PageInfo:
-  def __init__(self, page_size, page_index):
-    self.page_size = page_size
-    self.page_index = page_index
-
-
-class FormDataParams:
-  def __init__(self, data, files):
-    self.data = data
-    self.files = files
-
-class DictWrapper(dict):
-  def __getattr__(self, key):
-    return self.get(key)
-
-  def __setattr__(self, key, value):
-    self[key] = value
-
-def parameter_handler():
-  def return_func(func):
-    @wraps(func)
-    def decorated(*args, **kwargs):
-      if request.method == 'GET':
-        queryStr = request.query.decode('utf-8')
-        pageInfo = PageInfo(
-          page_size=10 if request.headers.get('page_size') is None else int(request.headers.get('page_size')),
-          page_index=1 if request.headers.get('page_index') is None else int(request.headers.get('page_index'))
-        )
-        try:
-          return func(params=queryStr, *args, **kwargs)
-        except TypeError:
-          return func(params=queryStr, pageInfo=pageInfo, *args, **kwargs)
-      elif request.method == 'POST':
-        content_type = request.get_header('content-type')
-        if content_type == 'application/json':
-          params = request.json
-          return func(params=DictWrapper(params), *args, **kwargs)
-        elif content_type and 'multipart/form-data' in content_type:
-          form_data = request.forms.decode()
-          form_files = request.files.decode()
-          params = FormDataParams(data=DictWrapper(form_data), files=form_files)
-          return func(params=params, *args, **kwargs)
-        else:
-          params = request.query.decode('utf-8')
-          return func(params=params, *args, **kwargs)
-      else:
-        return func(*args, **kwargs)
-
-    return decorated
-
-  return return_func

ctools/token_tools.py

@@ -1,13 +0,0 @@
-from business.controller.base import GlobalState
-from ctools import string_tools
-
-
-def get_tmp_token():
-  tmp_token = string_tools.get_uuid()
-  GlobalState.tmp_token.append(tmp_token)
-  return tmp_token
-
-
-def remove_tmp_token(token: str):
-  if token in GlobalState.tmp_token:
-    GlobalState.tmp_token.remove(token)