gomyck-tools 1.2.3__tar.gz → 1.2.5__tar.gz

{gomyck-tools-1.2.3 → gomyck-tools-1.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.2.3
+Version: 1.2.5
 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.3 → gomyck-tools-1.2.5}/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,13 @@ 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, 'gomyck', ['g_label1', 'g_label2'], 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)

{gomyck-tools-1.2.3 → gomyck-tools-1.2.5}/gomyck_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.2.3
+Version: 1.2.5
 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.3 → gomyck-tools-1.2.5}/gomyck_tools.egg-info/requires.txt

@@ -15,3 +15,4 @@ paho-mqtt~=2.1.0
 fuzzywuzzy~=0.18.0
 pymysql~=1.1.1
 pyzipper==0.3.6
+prometheus_client==0.21.1

{gomyck-tools-1.2.3 → gomyck-tools-1.2.5}/setup.py

@@ -11,7 +11,7 @@ requirements = parse_requirements(os.path.join(os.path.dirname(__file__), 'requi
 
 setup(
   name="gomyck-tools",
-  version="1.2.3",
+  version="1.2.5",
   author="gomyck",
   author_email="hao474798383@163.com",
   description="A ctools for python development by hao474798383",