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

ctools/cjson.py

@@ -6,6 +6,7 @@ jsonpickle.set_preferred_backend('json')
 jsonpickle.set_encoder_options('json', ensure_ascii=False)
 jsonpickle.set_decoder_options('json')
 
+
 def dumps(obj, **kwargs) -> str:
   """
   将对象转换为json字符串
@@ -17,6 +18,7 @@ def dumps(obj, **kwargs) -> str:
   if type(obj) == str: return obj
   return f'{jsonpickle.encode(obj, unpicklable=False, make_refs=False, **kwargs)}'
 
+
 def loads(json_str: str, **kwargs) -> dict:
   """
   将json字符串转换为对象
@@ -25,6 +27,7 @@ def loads(json_str: str, **kwargs) -> dict:
   """
   return jsonpickle.decode(json_str, **kwargs)
 
+
 def unify_to_str(json_str: str) -> str:
   if not str_value_keys and len(str_value_keys) == 0: return json_str
   obj = loads(json_str)
@@ -34,6 +37,7 @@ 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):
@@ -41,6 +45,7 @@ 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/cron_lite.py

@@ -29,6 +29,7 @@ print(123123)
 cron_lite.start_all()
 """
 
+
 class SchedulerMeta:
   timer_task_name: str = None
   switch: bool = True
@@ -40,7 +41,7 @@ class SchedulerMeta:
 
 scheduler_map: Dict[str, SchedulerMeta] = {}  # {timer_task_name: SchedulerMeta}
 _switch = False
-_info_handler  = print
+_info_handler = print
 _error_handler = print
 _time_zone: Optional[pytz.BaseTzInfo] = pytz.timezone("Asia/Shanghai")
 
@@ -49,6 +50,7 @@ def set_time_zone(time_zone_name: str):
   global _time_zone
   _time_zone = pytz.timezone(time_zone_name)
 
+
 # @annotation
 def cron_task(cron_expr: str, task_name: str = None, till_time_stamp: int = None):
   """
@@ -92,8 +94,9 @@ def reg_cron_task(cron_expr, func, params, timer_task_name=None, till_time_stamp
   :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>"
+  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:
@@ -107,6 +110,7 @@ def reg_cron_task(cron_expr, func, params, timer_task_name=None, till_time_stamp
 
   _register_next(task_name, wrapper, cron_expr, till_time_stamp, init=True)
 
+
 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.
@@ -144,6 +148,7 @@ def active(timer_task_name):
   if timer_task_name in scheduler_map:
     scheduler_map.get(timer_task_name).status = True
 
+
 def get_switch(timer_task_name):
   switch = True
   if timer_task_name in scheduler_map:
@@ -215,6 +220,7 @@ def _run_sched(scheduler_meta: SchedulerMeta):
         return
       time.sleep(0.5)
 
+
 def _start(taskName: str = None):
   global _switch
   _switch = True
@@ -223,7 +229,7 @@ def _start(taskName: str = None):
   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, ", cron: ", scheduler_meta.cron_str)
-    thread = threading.Thread(target=_run_sched, args=(scheduler_meta, ), daemon=True)
+    thread = threading.Thread(target=_run_sched, args=(scheduler_meta,), daemon=True)
     thread.start()
     taskList.append(thread)
   for task in taskList: task.join()
@@ -231,6 +237,7 @@ def _start(taskName: str = None):
   _switch = False
   scheduler_map.clear()
 
+
 def _convert_cron(cron_expr):
   res_cron = ""
   cron_list = cron_expr.split(" ")
@@ -242,4 +249,3 @@ def _convert_cron(cron_expr):
   else:
     res_cron = cron_expr
   return res_cron
-

ctools/database/database.py

@@ -1,15 +1,17 @@
 import contextlib
 import datetime
-
 import math
-from sqlalchemy import create_engine, Integer, Column, event
+import threading
+
+from sqlalchemy import create_engine, BigInteger, Column, event
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker, Session
 from sqlalchemy.sql import text
 
 from ctools import call
-from ctools.pools.thread_pool import thread_local
 from ctools import cid
+from ctools.pools.thread_pool import thread_local
+from ctools.web.bottle_web_base import PageInfo
 
 """
 class XXXX(BaseMixin):
@@ -30,14 +32,17 @@ inited_db = {}
 engines = {}
 sessionMakers = {}
 
-def getEngine(db_key: str='default'):
+
+def getEngine(db_key: str = 'default'):
   return engines[db_key]
 
+
 @call.init
 def _init():
   global Base
   Base = declarative_base()
 
+
 """
 The string form of the URL is
 dialect[+driver]://user:password@host/dbname[?key=value..]
@@ -45,6 +50,7 @@ where ``dialect`` is a database name such as ``mysql``, ``oracle``, ``postgresql
 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)
@@ -53,41 +59,47 @@ and ``driver`` the name of a DBAPI such as ``psycopg2``, ``pyodbc``, ``cx_oracle
 # > PRAGMA journal_mode=WAL; 设置事务的模式, wal 允许读写并发, 但是会额外创建俩文件
 # > PRAGMA synchronous=NORMAL; 设置写盘策略, 默认是 FULL, 日志,数据都落, 设置成 NORMAL, 日志写完就算事务完成
 
-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):
+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, auto_gen_table: bool = False):
   if db_url.startswith('mysql'):
     import pymysql
     pymysql.install_as_MySQLdb()
   if inited_db.get(db_key): raise Exception('db {} already init!!!'.format(db_key))
   global engines, sessionMakers
+  if default_schema: connect_args.update({'options': '-csearch_path={}'.format(default_schema)})
   engine, sessionMaker = _create_connection(db_url=db_url, connect_args=connect_args, pool_size=pool_size, max_overflow=max_overflow, echo=echo)
   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))
-  Base.metadata.create_all(engine)
+  # 这个有并发问题, 高并发会导致卡顿, 可以考虑去做一些别的事儿
+  #if default_schema: event.listen(engine, 'connect', lambda dbapi_connection, connection_record: _set_search_path(dbapi_connection, default_schema))
+  if auto_gen_table: Base.metadata.create_all(engine)
+
 
 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):
+
+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),
-                               echo=echo,
-                               future=True,
-                               pool_size=pool_size,
-                               max_overflow=max_overflow,
-                               pool_pre_ping=True,
-                               pool_recycle=3600,
-                               connect_args=connect_args)
-  sm = sessionmaker(bind=engine)
+                         echo=echo,
+                         future=True,
+                         pool_size=pool_size,
+                         max_overflow=max_overflow,
+                         pool_pre_ping=True,
+                         pool_recycle=3600,
+                         connect_args=connect_args)
+  sm = sessionmaker(bind=engine, expire_on_commit=False)
   return engine, sm
 
+
 def generate_custom_id():
   return str(cid.get_snowflake_id())
 
+
 class BaseMixin(Base):
   __abstract__ = True
-  obj_id = Column(Integer, primary_key=True, default=generate_custom_id)
+  obj_id = Column(BigInteger, primary_key=True, default=generate_custom_id)
 
   # ext1 = Column(String)
   # ext2 = Column(String)
@@ -112,10 +124,16 @@ class BaseMixin(Base):
           ret_state[key] = state[key]
     return ret_state
 
+  @classmethod
+  def init(cls, data: dict):
+    valid_keys = cls.__table__.columns.keys()
+    filtered = {k: v for k, v in data.items() if k in valid_keys}
+    return cls(**filtered)
+
 @contextlib.contextmanager
-def get_session(db_key: str='default') -> Session:
+def get_session(db_key: str = 'default') -> Session:
   thread_local.db_key = db_key
-  if sm:=sessionMakers.get(db_key):
+  if sm := sessionMakers.get(db_key):
     s = sm()
   else:
     raise ValueError("Invalid db_key: {}".format(db_key))
@@ -127,22 +145,32 @@ def get_session(db_key: str='default') -> Session:
   finally:
     s.close()
 
+
 class PageInfoBuilder:
 
-  def __init__(self, pageInfo, total_count, records):
+  def __init__(self, pageInfo: PageInfo, total_count, records):
     self.page_size = pageInfo.page_size
     self.page_index = pageInfo.page_index
     self.total_count = total_count
     self.total_page = math.ceil(total_count / int(pageInfo.page_size))
     self.records = records
 
-def query_by_page(query, pageInfo):
+
+def query_by_page(query, pageInfo) -> PageInfoBuilder:
+  """
+  使用方法:
+    with database.get_session() as s:
+      query = s.query(AppInfoEntity).filter(AppInfoEntity.app_name.contains(params.app_name))
+      result = database.query_by_page(query, params.page_info)
+      return R.ok(result)
+  """
   records = query.offset((pageInfo.page_index - 1) * pageInfo.page_size).limit(pageInfo.page_size).all()
   rs = []
   for r in records:
     rs.append(r)
   return PageInfoBuilder(pageInfo, query.count(), rs)
 
+
 def query4_crd_sql(session, sql: str, params: dict) -> []:
   records = session.execute(text(sql), params).fetchall()
   rs = []
@@ -153,6 +181,7 @@ def query4_crd_sql(session, sql: str, params: dict) -> []:
     rs.append(data)
   return rs
 
+
 sqlite_and_pg_page_sql = """
  limit :limit offset :offset
 """
@@ -160,7 +189,8 @@ mysql_page_sql = """
  limit :offset, :limit
 """
 
-def query_by_page4_crd_sql(session, sql: str, params: dict, pageInfo) -> []:
+
+def query_by_page4_crd_sql(session, sql: str, params: dict, pageInfo: PageInfo) -> []:
   db_name = engines[thread_local.db_key].name
   if db_name == 'postgresql' or db_name == 'sqlite':
     page_sql = sqlite_and_pg_page_sql

ctools/dict_wrapper.py

@@ -3,6 +3,7 @@
 __author__ = 'haoyang'
 __date__ = '2024/10/25 09:42'
 
+
 class DictWrapper(dict):
 
   def __getattr__(self, key):

ctools/ex.py

@@ -2,6 +2,10 @@ import time
 import traceback
 from functools import wraps
 
+"""
+@exception_handler(fail_return=['解析错误'], print_exc=True)
+"""
+
 # annotation
 def exception_handler(fail_return, retry_num=0, delay=3, catch_e=Exception, print_exc=False):
   def decorator(func):

ctools/geo/coord_trans.py

@@ -6,122 +6,122 @@ 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]
+  """
+  火星坐标系(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]
+  """
+  百度坐标系(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]
+  """
+  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]
+  """
+  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)
+  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)
+  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
+  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
+  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)
-
+  """
+  判断是否在国内，不在国内不做偏移
+  :param lng:
+  :param lat:
+  :return:
+  """
+  return not (lng > 73.66 and lng < 135.05 and lat > 3.86 and lat < 53.55)

ctools/geo/douglas_rarefy.py

@@ -4,6 +4,7 @@ __author__ = 'haoyang'
 __date__ = '2024/9/19 14:02'
 
 import math
+
 from jsonpath_ng import parser
 
 from ctools import cjson
@@ -13,6 +14,7 @@ from ctools.sys_log import flog as log
 douglas_rarefy.DouglasRarefy(res, level=3).sparse_points()
 """
 
+
 class THIN_LEVEL:
   L1 = 0.00001
   L2 = 0.00003
@@ -24,12 +26,14 @@ class THIN_LEVEL:
   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
@@ -68,7 +72,8 @@ class DouglasRarefy:
     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):
+
+  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
@@ -105,11 +110,11 @@ class DouglasRarefy:
         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   # 分割位置
+    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:
@@ -117,8 +122,8 @@ class DouglasRarefy:
         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:])      # 递归处理右边部分
+      child_left = self._sparse_points(points[:split + 1])  # 递归处理左边部分
+      child_right = self._sparse_points(points[split:])  # 递归处理右边部分
       # 合并结果，避免重复
       return child_left + child_right[1:]
     else:
@@ -132,4 +137,3 @@ class DouglasRarefy:
 
   def sparse_points(self):
     return self._sparse_points(self.data)
-

ctools/metrics.py

@@ -14,6 +14,7 @@ _metrics_initial = {}
 _lock = threading.Lock()
 _metrics_persistent_path = os.path.join(path_info.get_user_work_path('metrics', True), 'persistent.json')
 
+
 # 认证中间件
 # @app.before_request
 # def check_authentication():
@@ -29,6 +30,7 @@ class MetricType(Enum):
   SUMMARY = 'summary'
   HISTOGRAM = 'histogram'
 
+
 class Metric:
   def __init__(self, metric_type: MetricType, metric_key: str, metric_labels: [], persistent: bool = False, buckets: [] = None, reset: bool = False, desc: str = ""):
     self.metric_type = metric_type
@@ -51,6 +53,7 @@ class Metric:
       raise Exception('metric type not found')
     _metrics_initial[metric_key] = self
 
+
 @call.once
 def init(reset_persistent: bool = False):
   if os.path.exists(_metrics_persistent_path) and not reset_persistent:
@@ -72,6 +75,7 @@ def init(reset_persistent: bool = False):
   persistent_metrics()
   start_http_server(port=_metrics_port)
 
+
 @call.schd(5, start_by_call=True)
 def persistent_metrics():
   if _persistent_json and not _lock.locked():
@@ -80,6 +84,7 @@ def persistent_metrics():
       persistent_file.write(cjson.dumps(_persistent_json))
       persistent_file.flush()
 
+
 def opt(metric_key: str, label_values: [], metric_value: int):
   _lock.acquire(timeout=5)
   try:
@@ -119,6 +124,7 @@ def opt(metric_key: str, label_values: [], metric_value: int):
     log.error("添加指标信息异常: %s" % e)
   _lock.release()
 
+
 def _init_all_metrics():
   Metric(MetricType.GAUGE, 'gomyck', ['g_label1', 'g_label2'], persistent=True, reset=True)