funboost 44.0__tar.gz → 44.2__tar.gz

{funboost-44.0/funboost.egg-info → funboost-44.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funboost
-Version: 44.0
+Version: 44.2
 Summary: pip install funboost，python全功能分布式函数调度框架,。支持python所有类型的并发模式和一切知名消息队列中间件，支持如 celery dramatiq等框架整体作为funboost中间件，python函数加速器，框架包罗万象，用户能想到的控制功能全都有。一统编程思维，兼容50% python业务场景，适用范围广。只需要一行代码即可分布式执行python一切函数，99%用过funboost的pythoner 感受是　简易 方便 强劲 强大，相见恨晚 
 Home-page: https://github.com/ydf0509/funboost
 Author: bfzs
@@ -27,6 +27,7 @@ Classifier: Topic :: Software Development :: Libraries
 Description-Content-Type: text/markdown
 Provides-Extra: all
 Provides-Extra: extra_brokers
+Provides-Extra: flask
 License-File: LICENSE
 
 
@@ -46,7 +47,7 @@ License-File: LICENSE
 
 
 <pre style="color: greenyellow;background-color: #0c1119; font-size: medium;">
-pip install funboost ,python全功能分布式函数调度框架,。 
+pip install funboost ,python全功能分布式函数调度框架,。  用法例子见文档1.3
 支持python所有类型的并发模式和全球一切知名消息队列中间件，
 同时funboost支持celery整个框架作为核心来发布和消费消息，使用funboost的极简api方式来自动化配置和利用celery调度,
 也支持huey dramatiq rq等任务队列框架作为funboost的broker。 
@@ -148,8 +149,7 @@ pip install funboost --upgrade
 [//]: # ([img-46.png]&#40;https://postimg.cc/hfW0VhCX&#41;)
 
 funboost示图：
-![](https://i.niupic.com/images/2024/02/03/g3tr.png)
-
+<a href="https://imgse.com/i/pkFFghj"><img src="https://s21.ax1x.com/2024/04/29/pkFFghj.png" alt="pkFFghj.png" border="0" /></a>
 
 [//]: # ([![img-46.png]&#40;https://i.postimg.cc/tC7mQxWN/img-46.png&#41;]&#40;https://postimg.cc/hfW0VhCX&#41;)
 
@@ -159,7 +159,7 @@ funboost示图：
 
 也就是这种非常普通的流程图,一样的意思
 
-![](https://i.niupic.com/images/2023/12/18/dVaP.png)
+<a href="https://imgse.com/i/pkFFcNQ"><img src="https://s21.ax1x.com/2024/04/29/pkFFcNQ.png" alt="pkFFcNQ.png" border="0" /></a>
 
 ### 1.2.1 框架支持5种并发模式
 
@@ -238,7 +238,7 @@ if __name__ == '__main__':
 [3.1 各种中间件选择的场景和优势](https://funboost.readthedocs.io/zh/latest/articles/c3.html#id2) 
 
 
-### 1.2.3 框架对任务支持20种控制功能。
+### 1.2.3 框架对任务支持30种控制功能。
 
 <pre>
 
@@ -421,12 +421,10 @@ if __name__ == "__main__":
 
 运行截图:
 
-![](https://i.niupic.com/images/2023/12/18/dVbn.png)
-
-![](https://i.niupic.com/images/2023/12/18/dVbz.png)
+<a href="https://imgse.com/i/pkFkP4H"><img src="https://s21.ax1x.com/2024/04/29/pkFkP4H.png" alt="pkFkP4H.png" border="0" /></a>
 
-![](https://i.niupic.com/images/2019/09/20/_331.png)
 
+<a href="https://imgse.com/i/pkFkCUe"><img src="https://s21.ax1x.com/2024/04/29/pkFkCUe.png" alt="pkFkCUe.png" border="0" /></a>
 
 
 ## 1.4  python分布式函数执行为什么重要？
@@ -493,3 +491,4 @@ funboost通过支持celery作为broker_kind,使celer框架变成了funboost的
 ![](https://visitor-badge.glitch.me/badge?page_id=distributed_framework)
 
 <div> </div>
+

{funboost-44.0 → funboost-44.2}/README.md

@@ -15,7 +15,7 @@
 
 
 <pre style="color: greenyellow;background-color: #0c1119; font-size: medium;">
-pip install funboost ,python全功能分布式函数调度框架,。 
+pip install funboost ,python全功能分布式函数调度框架,。  用法例子见文档1.3
 支持python所有类型的并发模式和全球一切知名消息队列中间件，
 同时funboost支持celery整个框架作为核心来发布和消费消息，使用funboost的极简api方式来自动化配置和利用celery调度,
 也支持huey dramatiq rq等任务队列框架作为funboost的broker。 
@@ -117,8 +117,7 @@ pip install funboost --upgrade
 [//]: # ([img-46.png]&#40;https://postimg.cc/hfW0VhCX&#41;)
 
 funboost示图：
-![](https://i.niupic.com/images/2024/02/03/g3tr.png)
-
+<a href="https://imgse.com/i/pkFFghj"><img src="https://s21.ax1x.com/2024/04/29/pkFFghj.png" alt="pkFFghj.png" border="0" /></a>
 
 [//]: # ([![img-46.png]&#40;https://i.postimg.cc/tC7mQxWN/img-46.png&#41;]&#40;https://postimg.cc/hfW0VhCX&#41;)
 
@@ -128,7 +127,7 @@ funboost示图：
 
 也就是这种非常普通的流程图,一样的意思
 
-![](https://i.niupic.com/images/2023/12/18/dVaP.png)
+<a href="https://imgse.com/i/pkFFcNQ"><img src="https://s21.ax1x.com/2024/04/29/pkFFcNQ.png" alt="pkFFcNQ.png" border="0" /></a>
 
 ### 1.2.1 框架支持5种并发模式
 
@@ -207,7 +206,7 @@ if __name__ == '__main__':
 [3.1 各种中间件选择的场景和优势](https://funboost.readthedocs.io/zh/latest/articles/c3.html#id2) 
 
 
-### 1.2.3 框架对任务支持20种控制功能。
+### 1.2.3 框架对任务支持30种控制功能。
 
 <pre>
 
@@ -390,12 +389,10 @@ if __name__ == "__main__":
 
 运行截图:
 
-![](https://i.niupic.com/images/2023/12/18/dVbn.png)
-
-![](https://i.niupic.com/images/2023/12/18/dVbz.png)
+<a href="https://imgse.com/i/pkFkP4H"><img src="https://s21.ax1x.com/2024/04/29/pkFkP4H.png" alt="pkFkP4H.png" border="0" /></a>
 
-![](https://i.niupic.com/images/2019/09/20/_331.png)
 
+<a href="https://imgse.com/i/pkFkCUe"><img src="https://s21.ax1x.com/2024/04/29/pkFkCUe.png" alt="pkFkCUe.png" border="0" /></a>
 
 
 ## 1.4  python分布式函数执行为什么重要？

{funboost-44.0 → funboost-44.2}/funboost/__init__.py

@@ -13,7 +13,7 @@ set_frame_config这个模块的 use_config_form_funboost_config_module() 是核
 这段注释说明和使用的用户无关,只和框架开发人员有关.
 '''
 
-__version__ = "44.0"
+__version__ = "44.2"
 
 from funboost.set_frame_config import show_frame_config
 
@@ -65,3 +65,4 @@ from funboost.core.current_task import funboost_current_task
 
 # 有的包默认没加handlers，原始的日志不漂亮且不可跳转不知道哪里发生的。这里把warnning级别以上的日志默认加上handlers。
 # nb_log.get_logger(name='', log_level_int=30, _log_filename='pywarning.log')
+

{funboost-44.0 → funboost-44.2}/funboost/consumers/base_consumer.py

@@ -49,7 +49,7 @@ from funboost.concurrent_pool.single_thread_executor import SoloExecutor
 
 from funboost.core.function_result_status_saver import ResultPersistenceHelper, FunctionResultStatus, RunStatus
 
-from funboost.core.helper_funs import delete_keys_and_return_new_dict, get_publish_time, generate_task_id
+from funboost.core.helper_funs import delete_keys_and_return_new_dict, get_publish_time, MsgGenerater
 
 from funboost.concurrent_pool.async_helper import simple_run_in_executor
 from funboost.concurrent_pool.async_pool_executor import AsyncPoolExecutor
@@ -383,8 +383,11 @@ class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
         """
         raise NotImplementedError
 
-    def _auto_fill_msg(self, msg: dict):
-        """填充消息,消息没有使用funboost来发送,并且没有extra相关字段时候"""
+    def convert_msg_before_run(self, msg: dict):
+        """
+        转换消息,消息没有使用funboost来发送,并且没有extra相关字段时候
+        用户也可以按照4.21文档,继承任意Consumer类,并实现这个方法 convert_msg_before_run,先转换消息.
+        """
         """ 一般消息至少包含这样
         {
           "a": 42,
@@ -405,11 +408,11 @@ class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
             msg['extra'] = {'is_auto_fill_extra': True}
         extra = msg['extra']
         if 'task_id' not in extra:
-            extra['task_id'] = generate_task_id(self._queue_name)
+            extra['task_id'] = MsgGenerater.generate_task_id(self._queue_name)
         if 'publish_time' not in extra:
-            extra['publish_time'] = round(time.time(), 4)
+            extra['publish_time'] = MsgGenerater.generate_publish_time()
         if 'publish_time_format':
-            extra['publish_time_format'] = time.strftime('%Y-%m-%d %H:%M:%S')
+            extra['publish_time_format'] = MsgGenerater.generate_publish_time_format()
 
     def _submit_task(self, kw):
         while 1:  # 这一块的代码为支持暂停消费。
@@ -426,7 +429,7 @@ class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
             self._requeue(kw)
             time.sleep(self.time_interval_for_check_do_not_run_time)
             return
-        self._auto_fill_msg(kw['body'])
+        self.convert_msg_before_run(kw['body'])
         function_only_params = delete_keys_and_return_new_dict(kw['body'], )
         if self._get_priority_conf(kw, 'do_task_filtering') and self._redis_filter.check_value_exists(
                 function_only_params):  # 对函数的参数进行检查，过滤已经执行过并且成功的任务。
@@ -820,7 +823,7 @@ class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
                 self.logger.critical(msg=log_msg)
                 # noinspection PyProtectedMember,PyUnresolvedReferences
                 os._exit(444)
-            if self.consumer_params.function_timeout == 0:
+            if not self.consumer_params.function_timeout :
                 rs = await corotinue_obj
                 # rs = await asyncio.wait_for(corotinue_obj, timeout=4)
             else:

{funboost-44.0 → funboost-44.2}/funboost/consumers/http_consumer.py

@@ -4,11 +4,11 @@
 import asyncio
 import json
 
-from aiohttp import web
-from aiohttp.web_request import Request
+# from aiohttp import web
+# from aiohttp.web_request import Request
 
 from funboost.consumers.base_consumer import AbstractConsumer
-
+from funboost.core.lazy_impoter import AioHttpImporter
 
 class HTTPConsumer(AbstractConsumer, ):
     """
@@ -38,26 +38,26 @@ class HTTPConsumer(AbstractConsumer, ):
         #
         # flask_app.run('0.0.0.0', port=self._port,debug=False)
 
-        routes = web.RouteTableDef()
+        routes = AioHttpImporter().web.RouteTableDef()
 
         # noinspection PyUnusedLocal
         @routes.get('/')
         async def hello(request):
-            return web.Response(text="Hello, from funboost")
+            return AioHttpImporter().web.Response(text="Hello, from funboost")
 
         @routes.post('/queue')
-        async def recv_msg(request: Request):
+        async def recv_msg(request: AioHttpImporter().Request):
             data = await request.post()
             msg = data['msg']
             kw = {'body': json.loads(msg)}
             self._submit_task(kw)
-            return web.Response(text="finish")
+            return AioHttpImporter().web.Response(text="finish")
 
-        app = web.Application()
+        app = AioHttpImporter().web.Application()
         app.add_routes(routes)
         loop = asyncio.new_event_loop()
         asyncio.set_event_loop(loop)
-        web.run_app(app, host='0.0.0.0', port=self._port, )
+        AioHttpImporter().web.run_app(app, host='0.0.0.0', port=self._port, )
 
     def _confirm_consume(self, kw):
         pass  # 没有确认消费的功能。

{funboost-44.0 → funboost-44.2}/funboost/consumers/kafka_consumer.py

@@ -3,16 +3,14 @@
 # @Time    : 2022/8/8 0008 13:32
 import json
 # noinspection PyPackageRequirements
-from kafka import KafkaConsumer as OfficialKafkaConsumer, KafkaProducer, KafkaAdminClient
-# noinspection PyPackageRequirements
-from kafka.admin import NewTopic
-# noinspection PyPackageRequirements
-from kafka.errors import TopicAlreadyExistsError
+
 from funboost.constant import BrokerEnum
 from funboost.consumers.base_consumer import AbstractConsumer
+from funboost.core.lazy_impoter import KafkaPythonImporter
 from funboost.funboost_config_deafult import BrokerConnConfig
 # from nb_log import get_logger
 from funboost.core.loggers import get_funboost_file_logger
+
 # LogManager('kafka').get_logger_and_add_handlers(30)
 get_funboost_file_logger('kafka', log_level_int=30)
 
@@ -36,18 +34,18 @@ class KafkaConsumer(AbstractConsumer):
 
     def _shedual_task(self):
         try:
-            admin_client = KafkaAdminClient(bootstrap_servers=BrokerConnConfig.KAFKA_BOOTSTRAP_SERVERS)
-            admin_client.create_topics([NewTopic(self._queue_name, 10, 1)])
+            admin_client = KafkaPythonImporter().KafkaAdminClient(bootstrap_servers=BrokerConnConfig.KAFKA_BOOTSTRAP_SERVERS)
+            admin_client.create_topics([KafkaPythonImporter().NewTopic(self._queue_name, 10, 1)])
             # admin_client.create_partitions({self._queue_name: NewPartitions(total_count=16)})
-        except TopicAlreadyExistsError:
+        except KafkaPythonImporter().TopicAlreadyExistsError:
             pass
 
-        self._producer = KafkaProducer(bootstrap_servers=BrokerConnConfig.KAFKA_BOOTSTRAP_SERVERS)
-        consumer = OfficialKafkaConsumer(self._queue_name, bootstrap_servers=BrokerConnConfig.KAFKA_BOOTSTRAP_SERVERS,
-                                         group_id=self.consumer_params.broker_exclusive_config["group_id"],
-                                         enable_auto_commit=True,
-                                         auto_offset_reset=self.consumer_params.broker_exclusive_config["auto_offset_reset"],
-                                         )
+        self._producer = KafkaPythonImporter().KafkaProducer(bootstrap_servers=BrokerConnConfig.KAFKA_BOOTSTRAP_SERVERS)
+        consumer = KafkaPythonImporter().OfficialKafkaConsumer(self._queue_name, bootstrap_servers=BrokerConnConfig.KAFKA_BOOTSTRAP_SERVERS,
+                                                               group_id=self.consumer_params.broker_exclusive_config["group_id"],
+                                                               enable_auto_commit=True,
+                                                               auto_offset_reset=self.consumer_params.broker_exclusive_config["auto_offset_reset"],
+                                                               )
         #  auto_offset_reset (str): A policy for resetting offsets on
         #             OffsetOutOfRange errors: 'earliest' will move to the oldest
         #             available message, 'latest' will move to the most recent. Any

{funboost-44.0 → funboost-44.2}/funboost/consumers/kafka_consumer_manually_commit.py

@@ -10,13 +10,10 @@ from collections import defaultdict, OrderedDict
 import time
 
 # noinspection PyPackageRequirements
-from kafka import KafkaProducer, KafkaAdminClient
+# pip install kafka-python==2.0.2
 
-# noinspection PyPackageRequirements
-from kafka.admin import NewTopic
-# noinspection PyPackageRequirements
-from kafka.errors import TopicAlreadyExistsError
 from funboost.consumers.base_consumer import AbstractConsumer
+from funboost.core.lazy_impoter import KafkaPythonImporter
 from funboost.funboost_config_deafult import BrokerConnConfig
 from confluent_kafka.cimpl import TopicPartition
 from confluent_kafka import Consumer as ConfluentConsumer  # 这个包在win下不好安装，用户用这个中间件的时候自己再想办法安装。win用户需要安装c++ 14.0以上环境。
@@ -39,13 +36,13 @@ class KafkaConsumerManuallyCommit(AbstractConsumer):
     def _shedual_task(self):
 
         try:
-            admin_client = KafkaAdminClient(bootstrap_servers=BrokerConnConfig.KAFKA_BOOTSTRAP_SERVERS)
-            admin_client.create_topics([NewTopic(self._queue_name, 10, 1)])
+            admin_client = KafkaPythonImporter().KafkaAdminClient(bootstrap_servers=BrokerConnConfig.KAFKA_BOOTSTRAP_SERVERS)
+            admin_client.create_topics([KafkaPythonImporter().NewTopic(self._queue_name, 10, 1)])
             # admin_client.create_partitions({self._queue_name: NewPartitions(total_count=16)})
-        except TopicAlreadyExistsError:
+        except KafkaPythonImporter().TopicAlreadyExistsError:
             pass
 
-        self._producer = KafkaProducer(bootstrap_servers=BrokerConnConfig.KAFKA_BOOTSTRAP_SERVERS)
+        self._producer = KafkaPythonImporter().KafkaProducer(bootstrap_servers=BrokerConnConfig.KAFKA_BOOTSTRAP_SERVERS)
         # consumer 配置 https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md
         self._confluent_consumer = ConfluentConsumer({
             'bootstrap.servers': ','.join(BrokerConnConfig.KAFKA_BOOTSTRAP_SERVERS),
@@ -130,14 +127,14 @@ class SaslPlainKafkaConsumer(KafkaConsumerManuallyCommit):
     def _shedual_task(self):
 
         try:
-            admin_client = KafkaAdminClient(
+            admin_client = KafkaPythonImporter().KafkaAdminClient(
                 **BrokerConnConfig.KFFKA_SASL_CONFIG)
-            admin_client.create_topics([NewTopic(self._queue_name, 10, 1)])
+            admin_client.create_topics([KafkaPythonImporter().NewTopic(self._queue_name, 10, 1)])
             # admin_client.create_partitions({self._queue_name: NewPartitions(total_count=16)})
-        except TopicAlreadyExistsError:
+        except KafkaPythonImporter().TopicAlreadyExistsError:
             pass
 
-        self._producer = KafkaProducer(
+        self._producer = KafkaPythonImporter().KafkaProducer(
             **BrokerConnConfig.KFFKA_SASL_CONFIG)
         # consumer 配置 https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md
         self._confluent_consumer = ConfluentConsumer({

{funboost-44.0 → funboost-44.2}/funboost/consumers/mqtt_consumer.py

@@ -5,8 +5,9 @@ import json
 # import time
 from funboost.constant import BrokerEnum
 from funboost.consumers.base_consumer import AbstractConsumer
+from funboost.core.lazy_impoter import PahoMqttImporter
 from funboost.funboost_config_deafult import BrokerConnConfig
-import paho.mqtt.client as mqtt
+# import paho.mqtt.client as mqtt
 
 
 class MqttConsumer(AbstractConsumer):
@@ -23,7 +24,7 @@ class MqttConsumer(AbstractConsumer):
 
     # noinspection DuplicatedCode
     def _shedual_task(self):
-        client = mqtt.Client()
+        client = PahoMqttImporter().mqtt.Client()
         # client.username_pw_set('admin', password='public')
         client.on_connect = self._on_connect
         client.on_message = self._on_message

{funboost-44.0 → funboost-44.2}/funboost/consumers/nats_consumer.py

@@ -1,7 +1,8 @@
 import json
-from pynats import NATSClient, NATSMessage  # noqa
-from funboost.constant import BrokerEnum
+# from pynats import NATSClient, NATSMessage  # noqa
+
 from funboost.consumers.base_consumer import AbstractConsumer
+from funboost.core.lazy_impoter import NatsImporter
 from funboost.funboost_config_deafult import BrokerConnConfig
 
 
@@ -13,10 +14,10 @@ class NatsConsumer(AbstractConsumer):
 
     def _shedual_task(self):
         # print(88888888888888)
-        nats_client = NATSClient(BrokerConnConfig.NATS_URL, socket_timeout=600, socket_keepalive=True)
+        nats_client = NatsImporter().NATSClient(BrokerConnConfig.NATS_URL, socket_timeout=600, socket_keepalive=True)
         nats_client.connect()
 
-        def callback(msg: NATSMessage):
+        def callback(msg: NatsImporter().NATSMessage):
             # print(type(msg))
             # print(msg.reply)
             # print(f"Received a message with subject {msg.subject}: {msg.payload}")

{funboost-44.0 → funboost-44.2}/funboost/consumers/nsq_consumer.py

@@ -2,8 +2,10 @@
 # @Author  : ydf
 # @Time    : 2022/8/8 0008 13:32
 import json
-from gnsq import Consumer, Message
-from funboost.constant import BrokerEnum
+
+from funboost.core.lazy_impoter import GnsqImporter
+# from gnsq import Consumer, Message
+
 from funboost.funboost_config_deafult import BrokerConnConfig
 from funboost.consumers.base_consumer import AbstractConsumer
 # from nb_log import LogManager
@@ -19,11 +21,11 @@ class NsqConsumer(AbstractConsumer):
 
 
     def _shedual_task(self):
-        consumer = Consumer(self._queue_name, 'frame_channel', BrokerConnConfig.NSQD_TCP_ADDRESSES,
+        consumer = GnsqImporter().Consumer(self._queue_name, 'frame_channel', BrokerConnConfig.NSQD_TCP_ADDRESSES,
                             max_in_flight=self.consumer_params.concurrent_num, heartbeat_interval=60, timeout=600, )  # heartbeat_interval 不能设置为600
 
         @consumer.on_message.connect
-        def handler(consumerx: Consumer, message: Message):
+        def handler(consumerx: GnsqImporter().Consumer, message: GnsqImporter().Message):
             # 第一条消息不能并发，第一条消息之后可以并发。
             self._print_message_get_from_broker('nsq', message.body.decode())
             # self.logger.debug(f'从nsq的 [{self._queue_name}] 主题中 取出的消息是：  {message.body.decode()}')

{funboost-44.0 → funboost-44.2}/funboost/consumers/zeromq_consumer.py

@@ -4,10 +4,11 @@ import os
 import socket
 import json
 # import time
-import zmq
+# import zmq
 import multiprocessing
 from funboost.constant import BrokerEnum
 from funboost.consumers.base_consumer import AbstractConsumer
+from funboost.core.lazy_impoter import ZmqImporter
 # from nb_log import get_logger
 from funboost.core.loggers import get_funboost_file_logger
 
@@ -32,17 +33,17 @@ logger_zeromq_broker = get_funboost_file_logger('zeromq_broker')
 # noinspection PyUnresolvedReferences
 def start_broker(port_router: int, port_dealer: int):
     try:
-        context = zmq.Context()
+        context = ZmqImporter().zmq.Context()
         # noinspection PyUnresolvedReferences
-        frontend = context.socket(zmq.ROUTER)
-        backend = context.socket(zmq.DEALER)
+        frontend = context.socket(ZmqImporter().zmq.ROUTER)
+        backend = context.socket(ZmqImporter().zmq.DEALER)
         frontend.bind(f"tcp://*:{port_router}")
         backend.bind(f"tcp://*:{port_dealer}")
 
         # Initialize poll set
-        poller = zmq.Poller()
-        poller.register(frontend, zmq.POLLIN)
-        poller.register(backend, zmq.POLLIN)
+        poller = ZmqImporter().zmq.Poller()
+        poller.register(frontend, ZmqImporter().zmq.POLLIN)
+        poller.register(backend, ZmqImporter().zmq.POLLIN)
         logger_zeromq_broker.info(f'broker 绑定端口  {port_router}   {port_dealer}  成功')
 
         # Switch messages between sockets
@@ -50,11 +51,11 @@ def start_broker(port_router: int, port_dealer: int):
         while True:
             socks = dict(poller.poll())  # 轮询器 循环接收
 
-            if socks.get(frontend) == zmq.POLLIN:
+            if socks.get(frontend) == ZmqImporter().zmq.POLLIN:
                 message = frontend.recv_multipart()
                 backend.send_multipart(message)
 
-            if socks.get(backend) == zmq.POLLIN:
+            if socks.get(backend) == ZmqImporter().zmq.POLLIN:
                 message = backend.recv_multipart()
                 frontend.send_multipart(message)
     except BaseException as e:
@@ -87,9 +88,9 @@ class ZeroMqConsumer(AbstractConsumer):
     # noinspection DuplicatedCode
     def _shedual_task(self):
         self.start_broker_queue_name_as_port()
-        context = zmq.Context()
+        context = ZmqImporter().zmq.Context()
         # noinspection PyUnresolvedReferences
-        zsocket = context.socket(zmq.REP)
+        zsocket = context.socket(ZmqImporter().zmq.REP)
         zsocket.connect(f"tcp://localhost:{int(self._queue_name) + 1}")
 
         while True:

{funboost-44.0 → funboost-44.2}/funboost/core/fabric_deploy_helper.py

@@ -103,7 +103,7 @@ def fabric_deploy(booster: Booster, host, port, user, password,
         process_mark = f'funboost_fabric_mark__{queue_name}__{func_name}'
         conn = Connection(host, port=port, user=user, connect_kwargs={"password": password}, )
         kill_shell = f'''ps -aux|grep {process_mark}|grep -v grep|awk '{{print $2}}' |xargs kill -9'''
-        logger.warning(f'{kill_shell} 命令杀死 {process_mark} 标识的进程')
+        logger.warning(f'使用linux命令 {kill_shell} 命令杀死 {process_mark} 标识的进程')
         # uploader.ssh.exec_command(kill_shell)
         conn.run(kill_shell, encoding='utf-8', warn=True)  # 不想提示，免得烦扰用户以为有什么异常了。所以用上面的paramiko包的ssh.exec_command
 
@@ -113,7 +113,7 @@ def fabric_deploy(booster: Booster, host, port, user, password,
         if not extra_shell_str2.endswith(';') and extra_shell_str != '':
             extra_shell_str2 += ';'
         shell_str = extra_shell_str2 + shell_str
-        logger.warning(f'使用语句 {shell_str} 在远程机器 {host} 上启动任务消费')
+        logger.warning(f'使用linux命令 {shell_str} 在远程机器 {host} 上启动任务消费')
         conn.run(shell_str, encoding='utf-8', **invoke_runner_kwargs)
         # uploader.ssh.exec_command(shell_str)
 
@@ -125,6 +125,6 @@ def kill_all_remote_tasks(host, port, user, password):
     uploader = ParamikoFolderUploader(host, port, user, password, '', '')
     funboost_fabric_mark_all = 'funboost_fabric_mark__'
     kill_shell = f'''ps -aux|grep {funboost_fabric_mark_all}|grep -v grep|awk '{{print $2}}' |xargs kill -9'''
-    logger.warning(f'{kill_shell} 命令杀死 {funboost_fabric_mark_all} 标识的进程')
+    logger.warning(f'使用linux命令 {kill_shell} 命令杀死 {funboost_fabric_mark_all} 标识的进程')
     uploader.ssh.exec_command(kill_shell)
     logger.warning(f'杀死 {host}  机器所有的 {funboost_fabric_mark_all} 标识的进程')

funboost-44.2/funboost/core/funboost_config_getter.py

@@ -0,0 +1,7 @@
+def _try_get_user_funboost_common_config(funboost_common_conf_field:str):
+    try:
+        import funboost_config  # 第一次启动funboost前还没这个文件,或者还没有初始化配置之前,就要使用使用配置.
+        return getattr(funboost_config.FunboostCommonConfig,funboost_common_conf_field)
+    except Exception as e:
+        print(e)
+        return None

funboost-44.2/funboost/core/funboost_time.py

@@ -0,0 +1,28 @@
+import pytz
+import time
+
+import datetime
+
+import typing
+
+from nb_time import NbTime
+from funboost.funboost_config_deafult import FunboostCommonConfig
+
+class FunboostTime(NbTime):
+    default_formatter = NbTime.FORMATTER_DATETIME_NO_ZONE
+    def get_time_zone_str(self,time_zone: typing.Union[str, datetime.tzinfo,None] = None):
+        return time_zone or self.default_time_zone or  FunboostCommonConfig.TIMEZONE  or self.get_localzone_name()
+
+
+
+if __name__ == '__main__':
+    print(NbTime())
+    for i in range(100000):
+        # print(generate_publish_time())
+        # print(generate_publish_time_format())
+        # generate_publish_time()
+        # generate_publish_time_format()
+
+        datetime.datetime.now(tz=pytz.timezone(FunboostCommonConfig.TIMEZONE)).strftime(NbTime.FORMATTER_DATETIME_NO_ZONE)
+        datetime.datetime.now(tz=pytz.timezone(FunboostCommonConfig.TIMEZONE)).timestamp()
+    print(NbTime())

{funboost-44.0 → funboost-44.2}/funboost/core/func_params_model.py

@@ -123,7 +123,7 @@ class BoosterParams(BaseJsonAbleModel):
     由于有很好用的qps控制运行频率和智能扩大缩小的线程池，此框架建议不需要理会和设置并发数量只需要关心qps就行了，框架的并发是自适应并发数量，这一点很强很好用。"""
     concurrent_mode: str = ConcurrentModeEnum.THREADING  # 并发模式,支持THREADING,GEVENT,EVENTLET,ASYNC,SINGLE_THREAD并发,multi_process_consume 支持协程/线程 叠加多进程并发,性能炸裂.
     concurrent_num: int = 50  # 并发数量，并发种类由concurrent_mode决定
-    specify_concurrent_pool: FunboostBaseConcurrentPool = None  # 使用指定的线程池/携程池，可以多个消费者共使用一个线程池,节约线程.不为None时候。threads_num失效
+    specify_concurrent_pool: typing.Optional[FunboostBaseConcurrentPool] = None  # 使用指定的线程池/携程池，可以多个消费者共使用一个线程池,节约线程.不为None时候。threads_num失效
     specify_async_loop: asyncio.AbstractEventLoop = None  # 指定的async的loop循环，设置并发模式为async才能起作用。 有些包例如aiohttp,请求和httpclient的实例化不能处在两个不同的loop中,可以传过来.
 
     """qps:
@@ -159,7 +159,7 @@ class BoosterParams(BaseJsonAbleModel):
     msg_expire_senconds: typing.Union[float, int] = None  # 消息过期时间,可以设置消息是多久之前发布的就丢弃这条消息,不运行. 为None则永不丢弃
 
     do_task_filtering: bool = False  # 是否对函数入参进行过滤去重.
-    task_filtering_expire_seconds: int = 0  # 任务过滤的失效期，为0则永久性过滤任务。例如设置过滤过期时间是1800秒 ， 30分钟前发布过1 + 2 的任务，现在仍然执行，如果是30分钟以内发布过这个任务，则不执行1 + 2
+    task_filtering_expire_seconds: int = 0  # 任务过滤的失效期，为0则永久性过滤任务。例如设置过滤过期时间是1800秒 ， 30分钟前发布过1 + 2 的任务，现在仍然执行，如果是30分钟以内执行过这个任务，则不执行1 + 2
 
     function_result_status_persistance_conf: FunctionResultStatusPersistanceConfig = FunctionResultStatusPersistanceConfig(
         is_save_result=False, is_save_status=False, expire_seconds=7 * 24 * 3600, is_use_bulk_insert=False)  # 是否保存函数的入参，运行结果和运行状态到mongodb。这一步用于后续的参数追溯，任务统计和web展示，需要安装mongo。
@@ -183,7 +183,7 @@ class BoosterParams(BaseJsonAbleModel):
     broker_exclusive_config: dict = {}  # 加上一个不同种类中间件非通用的配置,不同中间件自身独有的配置，不是所有中间件都兼容的配置，因为框架支持30种消息队列，消息队列不仅仅是一般的先进先出queue这么简单的概念，
     # 例如kafka支持消费者组，rabbitmq也支持各种独特概念例如各种ack机制 复杂路由机制，有的中间件原生能支持消息优先级有的中间件不支持,每一种消息队列都有独特的配置参数意义，可以通过这里传递。每种中间件能传递的键值对可以看consumer类的 BROKER_EXCLUSIVE_CONFIG_DEFAULT
 
-    should_check_publish_func_params: bool = True # 消息发布时候是否校验消息发布内容,比如有的人发布消息,函数只接受a,b两个入参,他去传2个入参,或者传参不存在的参数名字,  如果消费函数你非要写*args,**kwargs,那就需要关掉发布消息时候的函数入参检查
+    should_check_publish_func_params: bool = True  # 消息发布时候是否校验消息发布内容,比如有的人发布消息,函数只接受a,b两个入参,他去传2个入参,或者传参不存在的参数名字,  如果消费函数你非要写*args,**kwargs,那就需要关掉发布消息时候的函数入参检查
 
     auto_generate_info: dict = {}  # 自动生成的信息,不需要用户主动传参.
 
@@ -277,3 +277,4 @@ if __name__ == '__main__':
     # print(PriorityConsumingControlConfig().get_str_dict())
 
     print(BoosterParams(queue_name='3213', specify_concurrent_pool=FlexibleThreadPool(100)).json_pre())
+    print(PublisherParams.schema_json())

{funboost-44.0 → funboost-44.2}/funboost/core/helper_funs.py

@@ -2,6 +2,8 @@ import copy
 import time
 import uuid
 
+from funboost.core.funboost_time import FunboostTime
+
 
 def get_publish_time(paramsx: dict):
     """
@@ -37,13 +39,23 @@ def block_python_main_thread_exit():
 run_forever = block_python_main_thread_exit
 
 
-def _try_get_user_funboost_common_config(funboost_common_conf_field:str):
-    try:
-        import funboost_config  # 第一次启动funboost前还没这个文件,或者还没有初始化配置之前,就要使用使用配置.
-        return getattr(funboost_config.FunboostCommonConfig,funboost_common_conf_field)
-    except Exception as e:
-        print(e)
-        return None
+class MsgGenerater:
+    @staticmethod
+    def generate_task_id(queue_name:str) -> str:
+        return f'{queue_name}_result:{uuid.uuid4()}'
+
+    @staticmethod
+    def generate_publish_time() -> float:
+        return round(FunboostTime().timestamp,4)
+
+    @staticmethod
+    def generate_publish_time_format() -> str:
+        return FunboostTime().get_str()
+
+    @classmethod
+    def generate_pulish_time_and_task_id(cls,queue_name:str,task_id=None):
+        extra_params = {'task_id': task_id or cls.generate_task_id(queue_name), 'publish_time': cls.generate_publish_time(),
+                        'publish_time_format': cls.generate_publish_time_format()}
+        return extra_params
+
 
-def generate_task_id(queue_name:str):
-    return f'{queue_name}_result:{uuid.uuid4()}'