gomyck-tools 1.2.2__py3-none-any.whl → 1.2.4__py3-none-any.whl

ctools/bottle_web_base.py

@@ -112,7 +112,7 @@ def params_resolve(func):
     elif request.method == 'POST':
       content_type = request.get_header('content-type')
       if content_type == 'application/json':
-        params = request.json
+        params = request.json or {}
         return func(params=DictWrapper(params), *args, **kwargs)
       elif content_type and 'multipart/form-data' in content_type:
         form_data = request.forms.decode()

ctools/bottle_webserver.py

@@ -1,8 +1,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 ctools import sys_info
+
 """
 app = bottle_web_base.init_app('子模块写 context_path, 主模块就不用写任何东西')
 
@@ -43,6 +46,7 @@ class CBottle:
 
   def run(self):
     http_server = WSGIRefServer(port=self.port)
+    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):

ctools/database.py

@@ -31,7 +31,13 @@ def _init():
   Base = declarative_base()
 
 # 密码里的@  要替换成 %40
-# sqlite connect_args={"check_same_thread": False}  sqlite:///{}.format(db_url)
+
+# sqlite connect_args={"check_same_thread": False}  db_url=sqlite:///{}.format(db_url)
+# sqlite 数据库, 初始化之后, 优化一下配置
+# $ sqlite3 app.db
+# > 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):
   if db_url.startswith('mysql'):
     import pymysql
@@ -63,7 +69,8 @@ def _create_connection(db_url: str, pool_size: int=5, max_overflow: int=25, conn
 def generate_custom_id():
   return str(string_tools.get_snowflake_id())
 
-class BaseMixin:
+class BaseMixin(Base):
+  __abstract__ = True
   obj_id = Column(Integer, primary_key=True, default=generate_custom_id)
   # ext1 = Column(String)
   # ext2 = Column(String)

ctools/metrics.py

@@ -1,29 +1,34 @@
 import os
 import threading
+import time
 from enum import Enum
 
-from prometheus_client import Counter, Gauge, Summary, Histogram
-
-from ctools import call, cjson, sys_log
-from ctools.application import Server
+from prometheus_client import Counter, Gauge, Summary, Histogram, start_http_server
+from ctools import call, cjson, sys_log, work_path
 
 log = sys_log.flog
 
-metrics = {}
+_metrics_port = 8011
+_persistent_json = {}
 _metrics_initial = {}
-persistent_json = {}
-temp_metrics_json = {}
-is_metrics_init: bool = True
 _lock = threading.Lock()
 
 
+# 认证中间件
+# @app.before_request
+# def check_authentication():
+#   auth = request.authorization
+#   if not auth or auth.username != USERNAME or auth.password != PASSWORD:
+#     return Response(
+#       "Unauthorized", 401, {"WWW-Authenticate": 'Basic realm="Login Required"'}
+#     )
+
 class MetricType(Enum):
   COUNTER = 'counter'
   GAUGE = 'gauge'
   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 = ""):
@@ -47,60 +52,51 @@ class Metric:
       raise Exception('metric type not found')
     _metrics_initial[metric_key] = self
 
-
 @call.once
-def init():
-  global is_metrics_init
-  global temp_metrics_json
-  persistent_path = os.path.join(Server.indicatorsPath, 'persistent.json')
-  if os.path.exists(persistent_path):
+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:
-      global persistent_json
+      global _persistent_json
       try:
         content = persistent_file.readline()
-        # log.info("persistent初始化: %s" % content)
-        persistent_json = cjson.loads(content)
+        log.info("persistent初始化: %s" % content)
+        _persistent_json = cjson.loads(content)
       except Exception:
         log.error('persistent.json is not valid json!!!!!')
-        persistent_json = {}
+        _persistent_json = {}
   _init_all_metrics()
-  for key, item in persistent_json.items():
+  for key, item in _persistent_json.items():
     metrics_key = key.split("-")[0]
     if '_labels' in key or metrics_key not in _metrics_initial: continue
-    opt(metrics_key, persistent_json[key + '_labels'], persistent_json[key])
+    opt(metrics_key, _persistent_json[key + '_labels'], _persistent_json[key])
   persistent_metrics()
-  is_metrics_init = False
+  start_http_server(port=_metrics_port)
 
-
-@call.schd(60, start_by_call=True)
+@call.schd(5, start_by_call=True)
 def persistent_metrics():
-  if persistent_json and not _lock.locked():
-    with open(os.path.join(Server.indicatorsPath, 'persistent.json'), 'w') as persistent_file:
-      persistent_file.write(cjson.dumps(persistent_json))
+  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:
+      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:
     persistent_key = "%s-%s" % (metric_key, "_".join(map(str, label_values)))
-    metric_entity: Metric = metrics.get(persistent_key)
-    if not metric_entity:
-      metric_entity = metrics[persistent_key] = _metrics_initial[metric_key]
-
+    metric_entity: Metric = _metrics_initial[metric_key]
     if metric_entity.persistent:
-      if not is_metrics_init and not metric_entity.reset and persistent_key in persistent_json:
-        persistent_json[persistent_key] += metric_value
+      if not metric_entity.reset and persistent_key in _persistent_json:
+        _persistent_json[persistent_key] += metric_value
       else:
-        persistent_json[persistent_key] = metric_value
-      persistent_json[persistent_key + '_labels'] = label_values
+        _persistent_json[persistent_key] = metric_value
+      _persistent_json[persistent_key + '_labels'] = label_values
 
-      if persistent_json[persistent_key] < 0:
-        persistent_json[persistent_key] = 0
+      if _persistent_json[persistent_key] < 0:
+        _persistent_json[persistent_key] = 0
         metric_value = 0
 
-    temp_metrics_json[persistent_key] = metric_value
-
     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:
@@ -123,4 +119,15 @@ def opt(metric_key: str, label_values: [], metric_value: int):
   _lock.release()
 
 def _init_all_metrics():
-  Metric(MetricType.COUNTER, 'demo123123', ['asdasd', 'sdfsdf'], persistent=True)
+  Metric(MetricType.GAUGE, 'data_reported_time', ['asdasd', 'sdfsdf'], persistent=True, reset=True)
+  Metric(MetricType.GAUGE, 'data_received_time', ['asdasd', 'sdfsdf'], persistent=True, reset=True)
+  Metric(MetricType.GAUGE, 'data_insert_time',   ['asdasd', 'sdfsdf'], persistent=True, reset=True)
+
+if __name__ == '__main__':
+  init()
+  import random
+  while True:
+    opt('data_reported_time', ['123', '123'], random.randint(1, 10))
+    opt('data_received_time', ['123', '123'], random.randint(1, 10))
+    opt('data_insert_time',   ['123', '123'], random.randint(1, 10))
+    time.sleep(1)

ctools/string_tools.py

@@ -1,24 +1,20 @@
-import hashlib
-import random
-import uuid
-from typing import Union
-
-import chardet
-
 from ctools.snow_id import SnowId
 
 idWorker = SnowId(1, 2, 0)
 
-def get_random_str(size: int = 10):
-  return "".join(random.sample('abcdefghijklmnopqrstuvwxyz0123456789', size))
+def get_random_str(size: int = 10) -> str:
+  import random
+  return "".join(random.sample('abcdefghjklmnpqrstuvwxyz123456789', size))
 
-def get_uuid():
+def get_uuid() -> str:
+  import uuid
   return str(uuid.uuid1()).replace("-", "")
 
 def get_snowflake_id():
   return idWorker.get_id()
 
-def decode_bytes(bytes_str: Union[bytes, bytearray]):
+def decode_bytes(bytes_str):
+  import chardet
   res_str = ""
   if bytes_str:
     detect = chardet.detect(bytes_str)
@@ -41,6 +37,7 @@ def decode_bytes(bytes_str: Union[bytes, bytearray]):
 
 
 def check_sum(content: str):
+  import hashlib
   try:
     algorithm = hashlib.sha256()
     algorithm.update(content.encode())
@@ -78,7 +75,7 @@ def dict_to_params(obj: dict):
     if k == 'varname':
       continue
     v = str(v)
-    if not is_list(v) and not is_digit(v) and not is_bool(v) and not is_obj(k):
+    if not is_list(v) and not is_digit(v) and not is_bool(v):
       if k == "path" and v[:4] != "http":
         v = "r'%s'" % v
       else:

ctools/sys_info.py

@@ -1,20 +1,16 @@
-import getpass
 import hashlib
 import os
 import platform
-import socket
-import uuid
-from bottle import request
 
 from ctools import cjson, sm_tools, work_path
 
 MACHINE_KEY = b'EnrGffoorbFyTYoS0902YyT1Fhehj4InpbezIDUuPOg='
 
-
 class MachineInfo:
   machine_code = None
 
 def get_user():
+  import getpass
   return getpass.getuser()
 
 def get_machine_code():
@@ -72,27 +68,46 @@ def get_origin_machine_code():
 
 
 def get_hash_machine_code(origin_code):
+  import uuid
   code = origin_code + uuid.uuid1().hex
   machine_code = hashlib.md5(code.encode()).hexdigest()
   return machine_code.upper()
 
+def get_public_ip():
+  import requests
+  try:
+    response = requests.get("https://api.ipify.org?format=json")
+    ip = response.json()["ip"]
+    return ip
+  except Exception as e:
+    return f"Failed to get public IP: {e}"
 
 def get_local_ipv4():
-  ip = socket.gethostname()
+  import psutil
+  import socket
+  interfaces = psutil.net_if_addrs()
+  for interface, addresses in interfaces.items():
+    for address in addresses:
+      if address.family == socket.AF_INET and not address.address.startswith("127."):
+        return address.address
+  print("Failed to get local IPv4 address, try another way...")
+  s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
   try:
-    ip = socket.gethostbyname_ex(ip)[2][-1]
+    s.connect(("8.8.8.8", 80))
+    ip = s.getsockname()[0]
   except Exception:
-    pass
+    ip = '127.0.0.1'
+  finally:
+    s.close()
   return ip
 
-
 def get_remote_ipv4():
+  from bottle import request
   try:
     return request.remote_route[0]
   except:
     return '127.0.0.1'
 
-
 def get_proc_pid_by(cmdline):
   import psutil
   """
@@ -111,7 +126,6 @@ def get_proc_pid_by(cmdline):
       pass
   return pid_list
 
-
 def get_os_architecture():
   if '64' in platform.machine():
     return '64'

{gomyck_tools-1.2.2.dist-info → gomyck_tools-1.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.2.2
+Version: 1.2.4
 Summary: A ctools for python development by hao474798383
 Home-page: https://blog.gomyck.com
 Author: gomyck
@@ -27,5 +27,6 @@ Requires-Dist: paho-mqtt ~=2.1.0
 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
 
 this package is for python development

{gomyck_tools-1.2.2.dist-info → gomyck_tools-1.2.4.dist-info}/RECORD

@@ -4,8 +4,8 @@ ctools/api_result.py,sha256=BLoJiTHFAIFRPCc4zer7NHTsRQFMY1TH-qmxSMk8iLU,1208
 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=7hXCh2gkw2Nct6U_jweW_5qCtGB6iXcgmsnMVr4_pzE,4898
-ctools/bottle_webserver.py,sha256=8w1oj6_P09an6Pdnr5dH9ClBiD-A6k27IBCSvqVfcTs,2550
+ctools/bottle_web_base.py,sha256=pP4lgaVVZZQBMg-9QZJ145kDv4F-hdSCSfH4BDeqyWU,4904
+ctools/bottle_webserver.py,sha256=hyTJrfJHAh4XXQ3zPMoF6lmdJ8FTatEpEASPfGrAa2s,2779
 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
@@ -14,7 +14,7 @@ ctools/ckafka.py,sha256=EiiGCFkSbq8yRjQKVjc2_V114hKb8fJAVIOks_XbQ3w,5944
 ctools/compile_tools.py,sha256=Nybh3vnkurIKnPnubdYzigjnzFu4GaTMKPvqFdibxmE,510
 ctools/console.py,sha256=EZumuyynwteKUhUxB_XoulHswDxHd75OQB34RiZ-OBM,1807
 ctools/cron_lite.py,sha256=f9g7-64GsCxcAW-HUAvT6S-kooScl8zaJyqwHY-X_rE,8308
-ctools/database.py,sha256=7YzkO2tzV1KUQLHND8g9PkQwTyGd3clhgPiZ5SbC-HA,5447
+ctools/database.py,sha256=M28inDYU4X69BFeVGCOwzKFtYHuQFgEm9_aoTXmrTzY,5803
 ctools/date_utils.py,sha256=qkIvn2TGQ97vUw2ppBfHE7IyCUqg0s1FzrB0BJAsaBo,868
 ctools/dict_wrapper.py,sha256=6lZUyHomdn5QdjQTg7EL1sC_I6tOlh8ofMRQT3XGQjM,398
 ctools/douglas_rarefy.py,sha256=43WRjGGsQ_o1yPEXypA1Xv_yuo90RVo7qaYGRslx5gQ,4890
@@ -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=vq9Fnq2fhmhS4yoHS4gO7ArKS033Eou8vpA779Uue0I,4414
+ctools/metrics.py,sha256=BKNtOEskq5fvSkGX1MbAO1aG9DWjBBN9PDQZ8e-zaVM,5085
 ctools/mqtt_utils.py,sha256=ZWSZiiNJLLlkHF95S6LmRmkYt-iIL4K73VdN3b1HaHw,10702
 ctools/obj.py,sha256=GYS1B8NyjtUIh0HlK9r8avC2eGbK2SJac4C1CGnfGhI,479
 ctools/pacth.py,sha256=MJ9Du-J9Gv62y4cZKls1jKbl5a5kL2y9bD-gzYUCveQ,2604
@@ -39,9 +39,9 @@ ctools/screenshot_tools.py,sha256=KoljfgqW5x9aLwKdIfz0vR6v-fX4XjE92HudkDxC2hE,45
 ctools/sign.py,sha256=JOkgpgsMbk7T3c3MOj1U6eiEndUG9XQ-uIX9e615A_Y,566
 ctools/sm_tools.py,sha256=CDfgupqs_nrZs-135ZvDu6QIx4aamJVdg7vuLs9_0yw,1678
 ctools/snow_id.py,sha256=hYinnRN-aOule4_9vfgXB7XnsU-56cIS3PhzAwWBc5E,2270
-ctools/strDiff.py,sha256=QUtXOfsRLTFozH_zByqsC39JeuG3eZtrwGVeLyaHYUI,429
-ctools/string_tools.py,sha256=p_O3HiqlHCgzJVXHUeeDYZK2_WrqetD0eYijQFXWkGg,1938
-ctools/sys_info.py,sha256=p5Erxn0Rv5HRSXlqDt7ffIWCBQU66G-sdW6doMAeAks,3627
+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/upload_tools.py,sha256=sqe6K3ZWiyY58pFE5IO5mNaS1znnS7U4c4UqY8noED4,1068
@@ -51,7 +51,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=i4MTUobqNW2WMrT3mwEC_XYQ0_IhFmKoNpTX2W6A8Tc,1680
-gomyck_tools-1.2.2.dist-info/METADATA,sha256=CzDE6NMxpgyVbq_51yDC0b4mEE0IBkcuNI85aat7t7M,1004
-gomyck_tools-1.2.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-gomyck_tools-1.2.2.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
-gomyck_tools-1.2.2.dist-info/RECORD,,
+gomyck_tools-1.2.4.dist-info/METADATA,sha256=q9kd9ZRTLTnINHKnwzRXOIcjTo8an74RmCBjW57AT0Y,1046
+gomyck_tools-1.2.4.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+gomyck_tools-1.2.4.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
+gomyck_tools-1.2.4.dist-info/RECORD,,