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

ctools/api_result.py

@@ -29,7 +29,7 @@ class R(object):
     self.message = message
     self.data = data
 
-  def _to_json(self):
+  def _to_json_str(self):
     return cjson.unify_to_str(cjson.dumps(self))
 
   @staticmethod
@@ -37,13 +37,19 @@ class R(object):
     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()
+  def ok(data=None, resp=Code.SUCCESS, msg=None, to_json_str=True):
+    if not to_json_str:
+      return R(resp.code, msg if msg is not None else resp.message, data)
+    return R(resp.code, msg if msg is not None else resp.message, data)._to_json_str()
 
   @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()
+  def fail(msg=None, resp=Code.FAIL, data=None, to_json_str=True):
+    if not to_json_str:
+      return R(resp.code, msg if msg is not None else resp.message, data)
+    return R(resp.code, msg if msg is not None else resp.message, data)._to_json_str()
 
   @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()
+  def error(msg=None, resp=Code.ERROR, data=None, to_json_str=True):
+    if not to_json_str:
+      return R(resp.code, msg if msg is not None else resp.message, data)
+    return R(resp.code, msg if msg is not None else resp.message, data)._to_json_str()

ctools/bottle_web_base.py

@@ -4,6 +4,8 @@ from functools import wraps
 
 import bottle
 from bottle import response, Bottle, request
+
+from ctools import token
 from ctools.dict_wrapper import DictWrapper
 from ctools.api_result import R
 from ctools.sys_log import flog as log
@@ -14,13 +16,15 @@ func_has_params = {}
 class GlobalState:
   lock = threading.Lock()
   withOutLoginURI = [
-    '/login',
-    '/get_sys_version'
+    '/',
+    '/index',
+    '/login'
   ]
   allowRemoteCallURI = [
 
   ]
   token = {}
+  interceptors = []
 
 def init_app(context_path=None):
   app = Bottle()
@@ -28,20 +32,21 @@ def init_app(context_path=None):
 
   @app.hook('before_request')
   def before_request():
-    # abort(401, '系统时间被篡改, 请重新校时!')
-    pass
+    for interceptor in GlobalState.interceptors:
+      res: R = interceptor['func']()
+      if res.code != 200: bottle.abort(res.code, res.message)
 
   @app.error(401)
   def unauthorized(error):
     after_request()
-    response.status = 200
+    response.status = 401
     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
+    response.status = 403
     log.error("访问受限: {} {} {}".format(error.body, request.method, request.fullpath))
     return R.error(resp=R.Code.cus_code(8888, "访问受限: {}".format(error.body)))
 
@@ -49,7 +54,7 @@ def init_app(context_path=None):
   def cors_error(error):
     if request.method == 'OPTIONS':
       after_request()
-      response.status = 200
+      response.status = 405
       return
     log.error("请求方法错误: {} {} {}".format(error.status_line, request.method, request.fullpath))
     return R.error(msg='请求方法错误: {}'.format(error.status_line))
@@ -57,7 +62,7 @@ def init_app(context_path=None):
   @app.error(500)
   def cors_error(error):
     after_request()
-    response.status = 200
+    response.status = 500
     log.error("系统发生错误: {} {} {}".format(error.body, request.method, request.fullpath))
     return R.error(msg='系统发生错误: {}'.format(error.exception))
 
@@ -75,6 +80,14 @@ def enable_cors():
   response.headers['Access-Control-Allow-Headers'] = request_headers if request_headers else ''
   response.headers['Access-Control-Expose-Headers'] = '*'
 
+# annotation
+def before_intercept(order=0):
+  def decorator(func):
+    log.info("add before interceptor: {}".format(func.__name__))
+    GlobalState.interceptors.append({'order': order, 'func': func})
+    GlobalState.interceptors = sorted(GlobalState.interceptors, key=lambda x: x['order'])
+  return decorator
+
 # annotation
 def rule(key):
   def return_func(func):
@@ -142,4 +155,14 @@ class FormDataParams:
     except Exception:
       return self.files[key]
 
-
+# 通用的鉴权方法
+def common_auth_verify(aes_key):
+  if request.path.startswith('/static') or request.path in GlobalState.withOutLoginURI:
+    return R.ok(to_json_str=False)
+  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)
+  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,18 +2,11 @@ import sys
 from socketserver import ThreadingMixIn
 from wsgiref.simple_server import WSGIServer, WSGIRequestHandler, make_server
 
-from bottle import ServerAdapter, Bottle, template, static_file
+from bottle import ServerAdapter, Bottle, template, static_file, abort
 
 from ctools import sys_info
 
-"""
-app = bottle_web_base.init_app('子模块写 context_path, 主模块就不用写任何东西')
 
-@app.get('/queryList')
-@bottle_web_base.rule('DOC:DOWNLOAD')
-def query_list(params):
-  print(123)
-"""
 
 """
 module_names = list(globals().keys())
@@ -31,10 +24,26 @@ def get_ws_modules():
 """
 
 """
-http_app = bottle_webserver.init_bottle() # 这里可以传 APP 当做主模块
-http_app.mount(app.context_path, app)
-http_app.set_index(r'轨迹点位压缩.html')
-http_app.run()
+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)
+
+@app.post('/login')
+def login(params):
+  return R.ok(token.gen_token({'username': 'xxx'}, aes_key, 3600))
+
+@app.get('/queryList')
+@bottle_web_base.rule('DOC:DOWNLOAD')
+def query_list(params):
+  print(123)
+
+main_app = bottle_webserver.init_bottle() # 这里可以传 APP 当做主模块, 但是 context_path 就不好使了, 上下文必须是 /
+main_app.mount(app.context_path, app)
+main_app.set_index(r'轨迹点位压缩.html')
+main_app.run()
 """
 
 class CBottle:
@@ -49,20 +58,32 @@ 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, path, **kwargs):
+  def set_index(self, filename='index.html', root='./', **kwargs):
     @self.bottle.route(['/', '/index'])
     def index():
-      return template(path, kwargs)
+      try:
+        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):
-      return static_file(filepath, root=root)
-
-  def set_download(self, root, download_prefix=True):
-    @self.bottle.route('/download/<filename>')
-    def download(filename):
-      return static_file(filename, root=root, download=download_prefix)
+      try:
+        return static_file(filepath, root=root)
+      except FileNotFoundError:
+        abort(404, "File not found...")
+
+  def set_download(self, root):
+    @self.bottle.route('/download/<filepath:path>')
+    def download(filepath):
+      return static_file(filepath, root=root, download=True)
 
   def mount(self, context_path, app, **kwargs):
     self.bottle.mount(context_path, app, **kwargs)

ctools/metrics.py

@@ -1,6 +1,5 @@
 import os
 import threading
-import time
 from enum import Enum
 
 from prometheus_client import Counter, Gauge, Summary, Histogram, start_http_server
@@ -12,7 +11,7 @@ _metrics_port = 8011
 _persistent_json = {}
 _metrics_initial = {}
 _lock = threading.Lock()
-
+_metrics_persistent_path = os.path.join(work_path.get_user_work_path('metrics', True), 'persistent.json')
 
 # 认证中间件
 # @app.before_request
@@ -30,8 +29,7 @@ class MetricType(Enum):
   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 = ""):
+  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
     self.metric_key = metric_key
     self.metric_labels = metric_labels
@@ -54,9 +52,8 @@ class Metric:
 
 @call.once
 def init(reset_persistent: bool = False):
-  persistent_path = os.path.join(work_path.get_current_path(), 'persistent.json')
-  if os.path.exists(persistent_path) and not reset_persistent:
-    with open(persistent_path, 'r') as persistent_file:
+  if os.path.exists(_metrics_persistent_path) and not reset_persistent:
+    with open(_metrics_persistent_path, 'r') as persistent_file:
       global _persistent_json
       try:
         content = persistent_file.readline()
@@ -66,6 +63,7 @@ def init(reset_persistent: bool = False):
         log.error('persistent.json is not valid json!!!!!')
         _persistent_json = {}
   _init_all_metrics()
+  _persistent_json = _persistent_json or {}
   for key, item in _persistent_json.items():
     metrics_key = key.split("-")[0]
     if '_labels' in key or metrics_key not in _metrics_initial: continue
@@ -77,7 +75,7 @@ def init(reset_persistent: bool = False):
 def persistent_metrics():
   if _persistent_json and not _lock.locked():
     log.info('begin persistent metrics to file...')
-    with open(os.path.join(work_path.get_current_path(), 'persistent.json'), 'w') as persistent_file:
+    with open(_metrics_persistent_path, 'w') as persistent_file:
       persistent_file.write(cjson.dumps(_persistent_json))
       persistent_file.flush()
 
@@ -100,14 +98,16 @@ def opt(metric_key: str, label_values: [], metric_value: int):
     if metric_entity.metric_type == MetricType.COUNTER or metric_entity.metric_type == MetricType.GAUGE:
       if label_values is None or len(label_values) == 0:
         if metric_entity.metric_type == MetricType.COUNTER and metric_entity.reset:
-          metric_entity.metric.reset()
-        metric_entity.metric.inc(metric_value)
+          metric_entity.metric.labels('').reset()
+        if metric_entity.metric_type == MetricType.GAUGE and metric_entity.reset:
+          metric_entity.metric.labels('').set(0)
+        metric_entity.metric.labels('').inc(metric_value)
       else:
         if metric_entity.reset:
-          try:
-            metric_entity.metric.remove(*label_values)
-          except Exception:
-            pass
+          if metric_entity.metric_type == MetricType.COUNTER and metric_entity.reset:
+            metric_entity.metric.labels(*label_values).reset()
+          if metric_entity.metric_type == MetricType.GAUGE and metric_entity.reset:
+            metric_entity.metric.labels(*label_values).set(0)
         metric_entity.metric.labels(*label_values).inc(metric_value)
     else:
       if label_values is None or len(label_values) == 0:

ctools/token.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+__author__ = 'haoyang'
+__date__ = '2025/1/21 16:01'
+
+import time
+import jwt
+from bottle import request
+
+from ctools.dict_wrapper import DictWrapper
+
+token_header = 'Authorization'
+
+def gen_token(payload: {}, secret_key, expired: int=3600) -> str:
+  payload.update({'exp': time.time() + expired})
+  return jwt.encode(payload, secret_key, algorithm='HS256')
+
+def get_payload(token, secret_key):
+  try:
+    payload = jwt.decode(token, secret_key, algorithms=['HS256'])
+    return DictWrapper(payload)
+  except Exception as e:
+    return None
+
+def get_token(key):
+  return get_payload(request.get_header(token_header), key)
+
+def is_valid(key):
+  return get_payload(request.get_header(token_header), key) is not None
+
+# if __name__ == '__main__':
+#   token = gen_token({"xx": 123}, '123')
+#   xx = get_payload(token, '123')
+#   print(xx.xx)

ctools/work_path.py

@@ -33,13 +33,16 @@ def get_app_path(subPath: str = '') -> str:
   return os.path.join(base_path, subPath)
 
 
-def get_user_work_path(subPath: str = '') -> str:
+def get_user_work_path(subPath: str = '', mkdir: bool = False):
   """
   获取用户工作目录
   :param subPath: 拼接的子路径
+  :param mkdir: 是否创建目录
   :return: 用户工作目录
   """
-  return os.path.join(os.path.expanduser("~"), subPath)
+  path = os.path.join(os.path.expanduser("~"), subPath)
+  if mkdir and not os.path.exists(path): os.makedirs(path, exist_ok=True)
+  return path
 
 
 def get_user_temp_path(subPath: str = '') -> str:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.2.5
+Version: 1.2.7
 Summary: A ctools for python development by hao474798383
 Home-page: https://blog.gomyck.com
 Author: gomyck
@@ -28,5 +28,7 @@ Requires-Dist: fuzzywuzzy ~=0.18.0
 Requires-Dist: pymysql ~=1.1.1
 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
 
 this package is for python development

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

@@ -1,11 +1,11 @@
 ctools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ctools/aes_tools.py,sha256=ylUgyhlx7bNCTGrbWEZVwCObzYdJTQtwEc4ZMidL2Fo,563
-ctools/api_result.py,sha256=BLoJiTHFAIFRPCc4zer7NHTsRQFMY1TH-qmxSMk8iLU,1208
+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=pP4lgaVVZZQBMg-9QZJ145kDv4F-hdSCSfH4BDeqyWU,4904
-ctools/bottle_webserver.py,sha256=hyTJrfJHAh4XXQ3zPMoF6lmdJ8FTatEpEASPfGrAa2s,2779
+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/browser_element_tools.py,sha256=IFR_tWu5on0LxhuC_4yT6EOjwCsC-juIoU8KQRDqR7E,9952
 ctools/call.py,sha256=BCr8wzt5qd70okv8IZn-9-EpjywleZgvA3u1vfZ_Kt8,1581
@@ -26,7 +26,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=5wC3luUmZKhDSN-0XMJzlfhk792u_tw0IBR6g3YHbHI,4893
+ctools/metrics.py,sha256=xKy1uWqvg2BnS14dQxvs_qUQtMuVLlUKECSyErFnBtk,5247
 ctools/mqtt_utils.py,sha256=ZWSZiiNJLLlkHF95S6LmRmkYt-iIL4K73VdN3b1HaHw,10702
 ctools/obj.py,sha256=GYS1B8NyjtUIh0HlK9r8avC2eGbK2SJac4C1CGnfGhI,479
 ctools/pacth.py,sha256=MJ9Du-J9Gv62y4cZKls1jKbl5a5kL2y9bD-gzYUCveQ,2604
@@ -44,14 +44,15 @@ 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
 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=i4MTUobqNW2WMrT3mwEC_XYQ0_IhFmKoNpTX2W6A8Tc,1680
-gomyck_tools-1.2.5.dist-info/METADATA,sha256=EkR8czXmSe8KiXedT-SxkqIKQAXelkBo4YOjoJuFkIg,1046
-gomyck_tools-1.2.5.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-gomyck_tools-1.2.5.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
-gomyck_tools-1.2.5.dist-info/RECORD,,
+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,,