funboost 48.1__tar.gz → 48.2__tar.gz

{funboost-48.1/funboost.egg-info → funboost-48.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funboost
-Version: 48.1
+Version: 48.2
 Summary: pip install funboost，python全功能分布式函数调度框架,funboost的功能是全面性重量级，用户能想得到的功能99%全都有;funboost的使用方式是轻量级，只有@boost一行代码需要写。支持python所有类型的并发模式和一切知名消息队列中间件，支持如 celery dramatiq等框架整体作为funboost中间件，python函数加速器，框架包罗万象，用户能想到的控制功能全都有。一统编程思维，兼容50% python业务场景，适用范围广。只需要一行代码即可分布式执行python一切函数，99%用过funboost的pythoner 感受是　简易 方便 强劲 强大，相见恨晚 
 Home-page: https://github.com/ydf0509/funboost
 Author: bfzs

{funboost-48.1 → funboost-48.2}/funboost/__init__.py

@@ -13,7 +13,7 @@ set_frame_config这个模块的 use_config_form_funboost_config_module() 是核
 这段注释说明和使用的用户无关,只和框架开发人员有关.
 '''
 
-__version__ = "48.1"
+__version__ = "48.2"
 
 from funboost.set_frame_config import show_frame_config
 

{funboost-48.1 → funboost-48.2}/funboost/consumers/base_consumer.py

@@ -1131,47 +1131,53 @@ class MetricCalculation:
         self.execute_task_times_every_unit_time_temp = 0  # 每单位时间执行了多少次任务。
         self.execute_task_times_every_unit_time_temp_fail =0  # 每单位时间执行了多少次任务失败。
         self.current_time_for_execute_task_times_every_unit_time = time.time()
-        self.consuming_function_cost_time_total_every_unit_time = 0
+        self.consuming_function_cost_time_total_every_unit_time_tmp = 0
         self.last_execute_task_time = time.time()  # 最近一次执行任务的时间。
         self.last_x_s_execute_count = 0
         self.last_x_s_execute_count_fail = 0
+        self.last_x_s_avarage_function_spend_time = None
         self.last_show_remaining_execution_time = 0
         self.show_remaining_execution_time_interval = 300
         self.msg_num_in_broker = 0
         self.last_get_msg_num_ts = 0
         self.last_timestamp_when_has_task_in_queue = 0
         self.last_timestamp_print_msg_num = 0
-        self.avarage_function_spend_time = None
+
         self.total_consume_count_from_start =0
         self.total_consume_count_from_start_fail =0
+        self.total_cost_time_from_start = 0  # 函数运行累计花费时间
+        self.last_x_s_total_cost_time = None
 
     def cal(self,t_start_run_fun:float,current_function_result_status:FunctionResultStatus):
+        self.last_execute_task_time = time.time()
+        current_msg_cost_time = time.time() - t_start_run_fun
         self.execute_task_times_every_unit_time_temp += 1
         self.total_consume_count_from_start  +=1
+        self.total_cost_time_from_start += current_msg_cost_time
         if current_function_result_status.success is False:
             self.execute_task_times_every_unit_time_temp_fail += 1
             self.total_consume_count_from_start_fail +=1
-        self.consuming_function_cost_time_total_every_unit_time += time.time() - t_start_run_fun
-        self.last_execute_task_time = time.time()
+        self.consuming_function_cost_time_total_every_unit_time_tmp += current_msg_cost_time
+        
         if time.time() - self.current_time_for_execute_task_times_every_unit_time > self.unit_time_for_count:
             self.last_x_s_execute_count = self.execute_task_times_every_unit_time_temp
             self.last_x_s_execute_count_fail = self.execute_task_times_every_unit_time_temp_fail
-            self.avarage_function_spend_time = round(self.consuming_function_cost_time_total_every_unit_time / self.last_x_s_execute_count, 4)
+            self.last_x_s_total_cost_time = self.consuming_function_cost_time_total_every_unit_time_tmp
+            self.last_x_s_avarage_function_spend_time = round(self.last_x_s_total_cost_time / self.last_x_s_execute_count, 3)
             msg = f'{self.unit_time_for_count} 秒内执行了 {self.last_x_s_execute_count} 次函数 [ {self.consumer.consuming_function.__name__} ] ,' \
-                  f'失败了{self.last_x_s_execute_count_fail} 次,函数平均运行耗时 {self.avarage_function_spend_time} 秒。 '
+                  f'失败了{self.last_x_s_execute_count_fail} 次,函数平均运行耗时 {self.last_x_s_avarage_function_spend_time} 秒。 '
             self.consumer.logger.info(msg)
             if time.time() - self.last_show_remaining_execution_time > self.show_remaining_execution_time_interval:
                 self.msg_num_in_broker = self.consumer.publisher_of_same_queue.get_message_count()
                 self.last_get_msg_num_ts = time.time()
                 if self.msg_num_in_broker != -1:  # 有的中间件无法统计或没实现统计队列剩余数量的，统一返回的是-1，不显示这句话。
-                    # msg += f''' ，预计还需要 {time_util.seconds_to_hour_minute_second(self._msg_num_in_broker * avarage_function_spend_time / active_consumer_num)} 时间 才能执行完成 {self._msg_num_in_broker}个剩余的任务'''
                     need_time = time_util.seconds_to_hour_minute_second(self.msg_num_in_broker / (self.execute_task_times_every_unit_time_temp / self.unit_time_for_count) /
                                                                         self.consumer._distributed_consumer_statistics.active_consumer_num)
                     msg += f''' 预计还需要 {need_time} 时间 才能执行完成 队列 {self.consumer.queue_name} 中的 {self.msg_num_in_broker} 个剩余任务'''
                     self.consumer.logger.info(msg)
                     self.last_show_remaining_execution_time = time.time()
             self.current_time_for_execute_task_times_every_unit_time = time.time()
-            self.consuming_function_cost_time_total_every_unit_time = 0
+            self.consuming_function_cost_time_total_every_unit_time_tmp = 0
             self.execute_task_times_every_unit_time_temp = 0
             self.execute_task_times_every_unit_time_temp_fail = 0
 
@@ -1181,14 +1187,16 @@ class MetricCalculation:
             'last_x_s_execute_count':self.last_x_s_execute_count,
             'last_x_s_execute_count_fail':self.last_x_s_execute_count_fail,
             'last_execute_task_time':self.last_execute_task_time,
+            'last_x_s_avarage_function_spend_time':self.last_x_s_avarage_function_spend_time,
             # 'last_show_remaining_execution_time':self.last_show_remaining_execution_time,
-            # 'msg_num_in_broker':self.msg_num_in_broker,
+            'msg_num_in_broker':self.msg_num_in_broker,
             'current_time_for_execute_task_times_every_unit_time':self.current_time_for_execute_task_times_every_unit_time,
             'last_timestamp_when_has_task_in_queue':self.last_timestamp_when_has_task_in_queue,
-            'avarage_function_spend_time':self.avarage_function_spend_time,
             'total_consume_count_from_start':self.total_consume_count_from_start,
-            'total_consume_count_from_start_fail':self.total_consume_count_from_start_fail
-
+            'total_consume_count_from_start_fail':self.total_consume_count_from_start_fail,
+            'total_cost_time_from_start':self.total_cost_time_from_start,
+            'last_x_s_total_cost_time':self.last_x_s_total_cost_time,
+            'avarage_function_spend_time_from_start':round(self.total_cost_time_from_start / self.total_consume_count_from_start,3) if self.total_consume_count_from_start else None,
         }
 
 

{funboost-48.1 → funboost-48.2}/funboost/core/active_cousumer_info_getter.py

@@ -112,6 +112,16 @@ class QueueConusmerParamsGetter(RedisMixin, FunboostFileLoggerMixin):
             if info_dict['report_ts'] > time.time() - 15 and info_dict['last_get_msg_num_ts'] > time.time() - 1200:
                 queue__msg_count_dict[queue_name] = info_dict['msg_num_in_broker']
         return queue__msg_count_dict
+
+    @staticmethod
+    def _sum_filed_from_active_consumers(active_consumers:typing.List[dict],filed:str):
+        s = 0
+        for c in active_consumers:
+            # print(c)
+            if c[filed]:
+                # print(c[filed])
+                s+=c[filed]
+        return s
     
     def get_queue_params_and_active_consumers(self):
         queue__active_consumers_map = ActiveCousumerProcessInfoGetter().get_all_hearbeat_info_partition_by_queue_name()
@@ -121,19 +131,29 @@ class QueueConusmerParamsGetter(RedisMixin, FunboostFileLoggerMixin):
         queue_params_and_active_consumers = {}
 
         for queue, consumer_params in  queue__consumer_params_map.items():
+            
             active_consumers = queue__active_consumers_map.get(queue, [])
-            all_consumers_last_x_s_execute_count = 0
-            all_consumers_last_x_s_execute_count_fail =0
-            for c in active_consumers:
-                all_consumers_last_x_s_execute_count += c['last_x_s_execute_count']
-                all_consumers_last_x_s_execute_count_fail += c['last_x_s_execute_count_fail']
+            # print(queue,active_consumers)
+            all_consumers_last_x_s_execute_count = self._sum_filed_from_active_consumers(active_consumers,'last_x_s_execute_count')
+            all_consumers_last_x_s_execute_count_fail = self._sum_filed_from_active_consumers(active_consumers, 'last_x_s_execute_count_fail')
+            all_consumers_last_x_s_total_cost_time = self._sum_filed_from_active_consumers(active_consumers, 'last_x_s_total_cost_time')
+            all_consumers_last_x_s_avarage_function_spend_time = round( all_consumers_last_x_s_total_cost_time / all_consumers_last_x_s_execute_count,3) if all_consumers_last_x_s_execute_count else None
+            
+            all_consumers_total_consume_count_from_start = self._sum_filed_from_active_consumers(active_consumers, 'total_consume_count_from_start')
+            all_consumers_total_cost_time_from_start =self._sum_filed_from_active_consumers(active_consumers, 'total_cost_time_from_start')
+            all_consumers_avarage_function_spend_time_from_start = round(all_consumers_total_cost_time_from_start / all_consumers_total_consume_count_from_start,3) if all_consumers_total_consume_count_from_start else None
+
             queue_params_and_active_consumers[queue] = {
-            'queue_params':consumer_params,
-            'active_consumers':active_consumers,
-            'pause_flag':queue__pause_map.get(queue,-1),
-            'msg_num_in_broker':queue__msg_count_dict.get(queue,None),
+                'queue_params':consumer_params,
+                'active_consumers':active_consumers,
+                'pause_flag':queue__pause_map.get(queue,-1),
+                'msg_num_in_broker':queue__msg_count_dict.get(queue,None),
                 'all_consumers_last_x_s_execute_count':all_consumers_last_x_s_execute_count,
                 'all_consumers_last_x_s_execute_count_fail':all_consumers_last_x_s_execute_count_fail,
+                'all_consumers_last_x_s_avarage_function_spend_time':all_consumers_last_x_s_avarage_function_spend_time,
+                'all_consumers_avarage_function_spend_time_from_start':all_consumers_avarage_function_spend_time_from_start,
+                'all_consumers_total_consume_count_from_start':self._sum_filed_from_active_consumers(active_consumers, 'total_consume_count_from_start'),
+                'all_consumers_total_consume_count_from_start_fail':self._sum_filed_from_active_consumers(active_consumers, 'total_consume_count_from_start_fail'),
             }
         return queue_params_and_active_consumers
 

{funboost-48.1 → funboost-48.2}/funboost/function_result_web/static/css/content_page_style.css

@@ -35,5 +35,5 @@ max-height: 600px !important;  /* 确保覆盖默认样式 */
     max-width: 100%;
 }
 .tabulator {
-    min-width: 1500px;
+    /* min-width: 1500px; */
 }

{funboost-48.1 → funboost-48.2}/funboost/function_result_web/templates/queue_op.html

@@ -57,10 +57,11 @@
         var table = new Tabulator("#queue-table", {
             theme: "bootstrap3",
             ajaxURL: "/queue/params_and_active_consumers",
-            layout: "fitColumns",
-            responsiveLayout: "collapse",
+            layout: "fitDataTable",
+            responsiveLayout: false,
             pagination: true,
             paginationSize: 1000,
+            height: "auto",
             locale: true,
             langs: {
                 "zh-cn": {
@@ -77,11 +78,15 @@
                 }
             },
             columns: [
-                { title: "<br>队列名字", field: "queue_name", sorter: "string", width: 250 },
-                { title: "broker<br>类型", field: "broker_kind", sorter: "string", width: 100 },
-                { title: "近10秒<br>完成", field: "all_consumers_last_x_s_execute_count", sorter: "number", width: 100 },
-                { title: "近10秒<br>失败", field: "all_consumers_last_x_s_execute_count_fail", sorter: "int", width: 100 },
-                { title: "<br>消息数量", field: "msg_count", sorter: "number", width: 170,
+                { title: "<br><br>队列名字", field: "queue_name", sorter: "string", headerSort: true, headerHozAlign: "center", hozAlign: "left", minWidth: 200, headerWordWrap: true },
+                { title: "<br>broker<br>类型", field: "broker_kind", sorter: "string"  },
+                { title: "<br>近10秒<br>完成", field: "all_consumers_last_x_s_execute_count", sorter: "number", width: 100 },
+                { title: "<br>近10秒<br>失败", field: "all_consumers_last_x_s_execute_count_fail", sorter: "number", width: 100 },
+
+                { title: "近10秒<br>函数运行<br>平均耗时", field: "all_consumers_last_x_s_avarage_function_spend_time", sorter: "number", width: 100 },
+                { title: "累计<br>函数运行<br>平均耗时", field: "all_consumers_avarage_function_spend_time_from_start", sorter: "number", width: 100 },
+
+                { title: "<br><br>消息数量", field: "msg_count", sorter: "number", width: 170,
                     formatter: function(cell) {
                         const row = cell.getRow().getData();
                         return `
@@ -92,7 +97,7 @@
                         `;
                     }
                 },
-                { title: "<br>consumer数量", field: "consumer_count", sorter: "number", width: 200,
+                { title: "<br><br>consumer数量", field: "consumer_count", sorter: "number", width: 200,
                     formatter: function(cell) {
                         const row = cell.getRow().getData();
                         var consumers = row.active_consumers;
@@ -107,7 +112,7 @@
                     }
                 },
                 { 
-                    title: "暂停消<br>费状态",
+                    title: "暂停<br>消费<br>状态",
                     field: "pause_flag",
                     width: 100,
                     formatter: function(cell) {
@@ -115,7 +120,7 @@
                     }
                 },
                 {
-                    title: "<br>操作",
+                    title: "<br><br>操作",
                     width: 400,
                     formatter: function(cell) {
                         const row = cell.getRow().getData();
@@ -139,7 +144,9 @@
                     consumer_count: data.active_consumers.length,
                     active_consumers: data.active_consumers,
                     queue_params: data.queue_params,
-                    pause_flag: data.pause_flag 
+                    pause_flag: data.pause_flag ,
+                    all_consumers_last_x_s_avarage_function_spend_time:data.all_consumers_last_x_s_avarage_function_spend_time,
+                    all_consumers_avarage_function_spend_time_from_start:data.all_consumers_avarage_function_spend_time_from_start
                 }));
             },
         });
@@ -269,15 +276,17 @@
                                 <td>${consumer.code_filename}</td>,
                                 <td>${consumer.last_x_s_execute_count}</td>
                                 <td>${consumer.last_x_s_execute_count_fail}</td>
+                                <td>${consumer.last_x_s_avarage_function_spend_time}</td>
                                 <td>${consumer.total_consume_count_from_start}</td>
                                 <td>${consumer.total_consume_count_from_start_fail}</td>
+                                <td>${consumer.avarage_function_spend_time_from_start}</td>
                             </tr>
                         `;
                     });
                 
                     const modalHtml = `
                         <div class="modal" id="consumerDetailsModal" tabindex="-1" role="dialog">
-                            <div class="modal-dialog" style="width: 80%;" role="document">
+                            <div class="modal-dialog" style="width: 90%;" role="document">
                                 <div class="modal-content">
                                     <div class="modal-header">
                                         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
@@ -296,8 +305,10 @@
                                                         <th>代码文件名</th>
                                                         <th>近10秒<br>运行完成<br>消息个数</th>
                                                         <th>近10秒<br>运行失败<br>消息个数</th>
+                                                        <th>近10秒<br>函数运行<br>平均耗时</th>
                                                         <th>累计<br>运行完成<br>消息个数</th>
                                                         <th>累计<br>运行失败<br>消息个数</th>
+                                                        <th>累计<br>函数运行<br>平均耗时</th>
                                                     </tr>
                                                 </thead>
                                                 <tbody>

{funboost-48.1 → funboost-48.2}/funboost/function_result_web/templates/running_consumer_by_ip.html

@@ -42,7 +42,6 @@
     <script type="text/javascript" src="https://unpkg.com/tabulator-tables@5.5.0/dist/js/tabulator.min.js"></script>
 
     <style>
-       
 
     </style>
 </head>
@@ -133,7 +132,7 @@
                         layout: "fitDataTable",  // 改为 fitDataTable
         responsiveLayout: false, // 禁用响应式布局
                         columns: [
-                        {title: "<br><br>队列名称", field: "queue_name","width":200},
+                        {title: "<br><br>队列名称", field: "queue_name"},
                             {title: "<br><br>消费函数", field: "consuming_function"},
                             {title: "<br><br>主机名", field: "computer_name"},
                             {title: "<br><br>IP地址", field: "computer_ip"},
@@ -143,8 +142,11 @@
                            
                             {title:"近10秒<br>运行完成<br>消息个数",field:"last_x_s_execute_count", formatter:"html","width":100},
                             {title:"近10秒<br>运行失败<br>消息个数",field:"last_x_s_execute_count_fail", formatter:"html","width":100},
+                            {title:"近10秒<br>函数运行<br>平均耗时",field:"last_x_s_avarage_function_spend_time", formatter:"html","width":100},
+                            
                             {title:"累计<br>运行完成<br>消息个数",field:"total_consume_count_from_start", formatter:"html","width":100},
                             {title:"累计<br>运行失败<br>消息个数",field:"total_consume_count_from_start_fail", formatter:"html","width":100},
+                            {title:"累计<br>函数运行<br>平均耗时",field:"avarage_function_spend_time_from_start", formatter:"html","width":100},
                              
                             {title: "<br><br>代码文件", field: "code_filename"},
                             // {title: "<br><br>consumer_id", field: "consumer_id"},
@@ -168,9 +170,6 @@
                             }
                         }
                     });
-
-<!--                    $("#result-table").css("width", "150%");-->
-
                     /* result 例如 [
   {
     "code_filename": "d:/codes/funboost/test_frame/test_function_status_result_persist/test_persist.py", 

{funboost-48.1 → funboost-48.2}/funboost/function_result_web/templates/running_consumer_by_queue_name.html

@@ -132,7 +132,7 @@
                          layout: "fitDataTable",  // 改为 fitDataTable
         responsiveLayout: false, // 禁用响应式布局
                         columns: [
-                        {title: "<br><br>队列名称", field: "queue_name","width":200},
+                        {title: "<br><br>队列名称", field: "queue_name"},
                             {title: "<br><br>消费函数", field: "consuming_function"},
                             {title: "<br><br>主机名", field: "computer_name"},
                             {title: "<br><br>IP地址", field: "computer_ip"},
@@ -142,8 +142,12 @@
                             
                             {title:"近10秒<br>运行完成<br>消息个数",field:"last_x_s_execute_count", formatter:"html","width":100},
                             {title:"近10秒<br>运行失败<br>消息个数",field:"last_x_s_execute_count_fail", formatter:"html","width":100},
+                            {title:"近10秒<br>函数运行<br>平均耗时",field:"last_x_s_avarage_function_spend_time", formatter:"html","width":100},
+                            
                             {title:"累计<br>运行完成<br>消息个数",field:"total_consume_count_from_start", formatter:"html","width":100},
                             {title:"累计<br>运行失败<br>消息个数",field:"total_consume_count_from_start_fail", formatter:"html","width":100},
+                            {title:"累计<br>函数运行<br>平均耗时",field:"avarage_function_spend_time_from_start", formatter:"html","width":100},
+
                             {title: "<br><br>代码文件", field: "code_filename"},
                             // {title: "<br><br>consumer_id", field: "consumer_id"},
                             {title: "<br><br>consumer_uuid", field: "consumer_uuid"},

{funboost-48.1 → funboost-48.2/funboost.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funboost
-Version: 48.1
+Version: 48.2
 Summary: pip install funboost，python全功能分布式函数调度框架,funboost的功能是全面性重量级，用户能想得到的功能99%全都有;funboost的使用方式是轻量级，只有@boost一行代码需要写。支持python所有类型的并发模式和一切知名消息队列中间件，支持如 celery dramatiq等框架整体作为funboost中间件，python函数加速器，框架包罗万象，用户能想到的控制功能全都有。一统编程思维，兼容50% python业务场景，适用范围广。只需要一行代码即可分布式执行python一切函数，99%用过funboost的pythoner 感受是　简易 方便 强劲 强大，相见恨晚 
 Home-page: https://github.com/ydf0509/funboost
 Author: bfzs