algo-backend-framework 0.0.1__tar.gz → 0.0.3__tar.gz

{algo_backend_framework-0.0.1 → algo_backend_framework-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: algo-backend-framework
-Version: 0.0.1
+Version: 0.0.3
 Summary: Ctcdn algorithm backend framework
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{algo_backend_framework-0.0.1 → algo_backend_framework-0.0.3}/algo_backend/metrics/time_cost_metrics.py

@@ -84,8 +84,8 @@ class ClientTimeCostMetrics(BasicTimeCostMetrics):
 
 class PrometheusTimeCostMetricSetting:
     __default_metrics = BasicTimeCostMetrics()
-    __api_metrics = None
-    __client_metrics = None
+
+    __metrics_dict = {"default": BasicTimeCostMetrics(), "api": None, "client": None}
 
     @classmethod
     def initialize(
@@ -94,35 +94,42 @@ class PrometheusTimeCostMetricSetting:
         api_metrics_buckets: Optional[List[int]] = None,
         client_metrics_buckets: Optional[List[int]] = None,
     ):
-        if api_metrics_buckets is None:
-            cls.__api_metrics = ApiTimeCostMetrics()
-        elif len(api_metrics_buckets) == 0:
-            cls.__api_metrics = BasicTimeCostMetrics()
-        else:
-            cls.__api_metrics = ApiTimeCostMetrics(buckets=list(api_metrics_buckets))
+        cls.init_metrics("api", ApiTimeCostMetrics, api_metrics_buckets)
+        cls.init_metrics("client", ClientTimeCostMetrics, client_metrics_buckets)
 
-        if client_metrics_buckets is None:
-            cls.__client_metrics = ClientTimeCostMetrics()
-        elif len(client_metrics_buckets) == 0:
-            cls.__client_metrics = BasicTimeCostMetrics()
+    @classmethod
+    def init_metrics(
+        cls, name: str, metrics_class, buckets: Optional[List[int]] = None
+    ):
+        if cls.__metrics_dict[name] is None:
+            cls.__metrics_dict[name] = metrics_class()
+        elif len(buckets) == 0:
+            cls.__metrics_dict[name] = cls.__default_metrics
         else:
-            cls.__client_metrics = ClientTimeCostMetrics(
-                buckets=list(client_metrics_buckets)
-            )
+            cls.__metrics_dict[name] = metrics_class(buckets=list(buckets))
+
+    @classmethod
+    def get_metrics(cls, name: str) -> BasicTimeCostMetrics:
+        return cls.__metrics_dict.get(name, cls.__default_metrics)
 
     @classmethod
     def api_metrics_instance(cls) -> BasicTimeCostMetrics:
-        return cls.__api_metrics or cls.__default_metrics
+        return cls.get_metrics("api")
 
     @classmethod
     def client_metrics_instance(cls) -> BasicTimeCostMetrics:
-        return cls.__client_metrics or cls.__default_metrics
+        return cls.get_metrics("client")
 
     @classmethod
-    def metrics_handler(cls, key: str, metrics: BasicTimeCostMetrics):
+    def metrics_handler(cls, key: str, metrics_cls_name: str):
+        """
+        装饰器只会初始化一次，因此要使用动态方式获取指标类，否则初始化装饰器时，指标类还没有被初始化
+        """
+
         def decorator(func: Callable[..., Awaitable]) -> Callable[..., Awaitable]:
             @wraps(func)
             async def wrapper(*args, **kwargs):
+                metrics = cls.get_metrics(metrics_cls_name)
                 try:
                     start = time.perf_counter()
                     result = await func(*args, **kwargs)
@@ -139,8 +146,8 @@ class PrometheusTimeCostMetricSetting:
 
     @classmethod
     def client_metrics_handler(cls, client_name: str):
-        return cls.metrics_handler(client_name, cls.client_metrics_instance())
+        return cls.metrics_handler(client_name, "client")
 
     @classmethod
     def api_metrics_handler(cls, api_name: str):
-        return cls.metrics_handler(api_name, cls.api_metrics_instance())
+        return cls.metrics_handler(api_name, "api")

{algo_backend_framework-0.0.1 → algo_backend_framework-0.0.3}/algo_backend/starter/default_app_generator.py

@@ -87,7 +87,7 @@ class DefaultAlgoAppGenerator:
         """
         初始化开始事件
         """
-        self.start_event_list.add(self.log_starter.setup_log())
+        self.start_event_list.add(self.__set_up_logger)
         # 启动系统指标、gc指标的定时采集写入以供多进程时的汇总
         self.start_event_list.add(MetricsScheduleMonitor().run_monitor)
         # 接口计时器和客户端解释器的初始化
@@ -96,6 +96,12 @@ class DefaultAlgoAppGenerator:
         for event in custom_event or []:
             self.start_event_list.add(event)
 
+    def __set_up_logger(self):
+        """
+        初始化日志
+        """
+        self.log_starter.setup_log()
+
     def init_end_event(self, custom_event):
         """
         初始化结束事件

{algo_backend_framework-0.0.1 → algo_backend_framework-0.0.3}/algo_backend_framework.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: algo-backend-framework
-Version: 0.0.1
+Version: 0.0.3
 Summary: Ctcdn algorithm backend framework
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{algo_backend_framework-0.0.1 → algo_backend_framework-0.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "algo-backend-framework"
-version = "0.0.1"
+version = "0.0.3"
 description = "Ctcdn algorithm backend framework"
 readme = "README.md"
 requires-python = ">=3.10"