gomyck-tools 1.1.4__py3-none-any.whl → 1.1.6__py3-none-any.whl

ctools/ckafka.py

@@ -101,7 +101,7 @@ class CKafka:
     self.password = password
 
   def init_producer(self, acks=1) -> KafkaInstance:
-    print("[ Producer ] Connecting to Kafka brokers")
+    print("[ Producer ] Connecting to Kafka [{}]".format(self.kafka_url))
     for i in range(0, 6):
       try:
         if self.secure:
@@ -120,15 +120,15 @@ class CKafka:
             bootstrap_servers=self.kafka_url,
             value_serializer=lambda x: dumps(x).encode('utf-8')
           )
-        print("[ Producer ] Connected to Kafka...")
+        print("[ Producer ] Success Connected to Kafka [{}]".format(self.kafka_url))
         return KafkaInstance(producer=producer, consumer=None)
       except errors.NoBrokersAvailable:
-        print("[ Producer ] Waiting for brokers to become available...")
+        print("[ Producer ] Waiting for Kafka [{}] to become available...".format(self.kafka_url))
         time.sleep(3)
-    raise RuntimeError("[ Producer ] Failed to connect to brokers within 60 seconds")
+    raise RuntimeError("[ Producer ] Failed to connect to Kafka [{}] within 60 seconds".format(self.kafka_url))
 
   def init_consumer(self, client_id: str = 'ck-py-kafka-consumer', consumer_group: str = 'ck-py-kafka-consumer', enable_auto_commit: bool = True) -> KafkaInstance:
-    print("[ Consumer ] Connecting to Kafka brokers")
+    print("[ Consumer ] Connecting to Kafka [{}]".format(self.kafka_url))
     for i in range(0, 6):
       try:
         if self.secure:
@@ -151,9 +151,9 @@ class CKafka:
             bootstrap_servers=self.kafka_url,
             value_deserializer=lambda x: x.decode('utf-8')
           )
-        print("[ Consumer ] Connected to Kafka...")
+        print("[ Consumer ] Success Connected to Kafka [{}]".format(self.kafka_url))
         return KafkaInstance(producer=None, consumer=consumer)
       except errors.NoBrokersAvailable:
-        print("[ Consumer ] Waiting for brokers to become available...")
+        print("[ Consumer ] Waiting for Kafka [{}] to become available...".format(self.kafka_url))
         time.sleep(3)
-    raise RuntimeError("[ Consumer ] Failed to connect to brokers within 60 seconds")
+    raise RuntimeError("[ Consumer ] Failed to connect to Kafka [{}] within 60 seconds".format(self.kafka_url))

ctools/http_utils.py

@@ -10,7 +10,8 @@ def get(url, params=None, headers=None):
       result = response.content
   except Exception as e:
     print("GET请求异常:", e)
-  return result.decode('utf-8')
+  if isinstance(result, bytes): return result.decode('utf-8')
+  return result
 
 
 def post(url, data=None, json=None, headers=None, files=None):
@@ -19,4 +20,5 @@ def post(url, data=None, json=None, headers=None, files=None):
   response.raise_for_status()
   if response.status_code == 200:
     result = response.content
-  return result.decode('utf-8')
+  if isinstance(result, bytes): return result.decode('utf-8')
+  return result

ctools/id_worker_tools.py

@@ -4,28 +4,22 @@ import time
 WORKER_ID_BITS = 5
 DATACENTER_ID_BITS = 5
 SEQUENCE_BITS = 12
-
 # 最大取值计算
 MAX_WORKER_ID = -1 ^ (-1 << WORKER_ID_BITS)  # 2**5-1 0b11111
 MAX_DATACENTER_ID = -1 ^ (-1 << DATACENTER_ID_BITS)
-
 # 移位偏移计算
 WOKER_ID_SHIFT = SEQUENCE_BITS
 DATACENTER_ID_SHIFT = SEQUENCE_BITS + WORKER_ID_BITS
 TIMESTAMP_LEFT_SHIFT = SEQUENCE_BITS + WORKER_ID_BITS + DATACENTER_ID_BITS
-
 # 序号循环掩码
 SEQUENCE_MASK = -1 ^ (-1 << SEQUENCE_BITS)
-
 # Twitter元年时间戳
 TWEPOCH = 1288834974657
 
-
 class IdWorker(object):
   """
   用于生成IDs
   """
-
   def __init__(self, datacenter_id, worker_id, sequence=0):
     """
     初始化
@@ -36,17 +30,15 @@ class IdWorker(object):
     # sanity check
     if worker_id > MAX_WORKER_ID or worker_id < 0:
       raise ValueError('worker_id值越界')
-
     if datacenter_id > MAX_DATACENTER_ID or datacenter_id < 0:
       raise ValueError('datacenter_id值越界')
-
     self.worker_id = worker_id
     self.datacenter_id = datacenter_id
     self.sequence = sequence
-
     self.last_timestamp = -1  # 上次计算的时间戳
 
-  def _gen_timestamp(self):
+  @staticmethod
+  def _gen_timestamp():
     """
     生成整数时间戳
     :return:int timestamp
@@ -59,21 +51,17 @@ class IdWorker(object):
     :return:
     """
     timestamp = self._gen_timestamp()
-
     # 时钟回拨
     if timestamp < self.last_timestamp:
       print('clock is moving backwards. Rejecting requests until {}'.format(self.last_timestamp))
       raise
-
     if timestamp == self.last_timestamp:
       self.sequence = (self.sequence + 1) & SEQUENCE_MASK
       if self.sequence == 0:
         timestamp = self._til_next_millis(self.last_timestamp)
     else:
       self.sequence = 0
-
     self.last_timestamp = timestamp
-
     new_id = ((timestamp - TWEPOCH) << TIMESTAMP_LEFT_SHIFT) | (self.datacenter_id << DATACENTER_ID_SHIFT) | \
              (self.worker_id << WOKER_ID_SHIFT) | self.sequence
     return new_id

{gomyck_tools-1.1.4.dist-info → gomyck_tools-1.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.1.4
+Version: 1.1.6
 Summary: A ctools for python development by hao474798383
 Home-page: https://blog.gomyck.com
 Author: gomyck

{gomyck_tools-1.1.4.dist-info → gomyck_tools-1.1.6.dist-info}/RECORD

@@ -10,7 +10,7 @@ ctools/bottle_websocket.py,sha256=IRY17SpDFjihLeU8c_aUIMAfUNZzurqfrOyNFojOQHQ,18
 ctools/browser_element_tools.py,sha256=IFR_tWu5on0LxhuC_4yT6EOjwCsC-juIoU8KQRDqR7E,9952
 ctools/call.py,sha256=BCr8wzt5qd70okv8IZn-9-EpjywleZgvA3u1vfZ_Kt8,1581
 ctools/cjson.py,sha256=M2XrXnFXTJyKsXP2JRos2Bse4b6WXjr6TrA6y-EF_Ig,1245
-ctools/ckafka.py,sha256=XPH3yvfOZjsAXFwARdjF-iOaPSKwf5ZbWf-VKE49Q7Y,5755
+ctools/ckafka.py,sha256=jD9n9sscKrU5spDlPGco681jhqVGRIXqwPiJUas3gpo,5965
 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
@@ -23,8 +23,8 @@ ctools/enums.py,sha256=QbHa3j7j4-BDdwaga5Y0nYfA2uNSVJDHumYdIZdKVkM,118
 ctools/ex.py,sha256=_UtbmDLrC7uZsoBtTdecuCZAlf2DA7fvojUf5fGZDVo,795
 ctools/excelOpt.py,sha256=q3HLAb1JScTrMCvx_x-4WWnqKhyTEzQ-m5vtqFy8NZU,1138
 ctools/html_soup.py,sha256=LabCo4yWI58fbFBPhunk3THWBf0BbHEWLgwyvSpTGR4,1903
-ctools/http_utils.py,sha256=A2Nue8VjDIsEJmezjGnDsujob7utSHrm7-2zyzqbGyc,676
-ctools/id_worker_tools.py,sha256=jBKkoHoezH_X3Qj_GIKQjJOnIxnzKjnYdRQdd37_3Mw,2357
+ctools/http_utils.py,sha256=dG26aci1_YxAyKwYqMKFw4wZAryLkDyvnQ3hURjB6Lk,768
+ctools/id_worker_tools.py,sha256=M4ehNKbVIrBhPs-GlVKEZ43WQArNb9s4UoVGgRit4YM,2356
 ctools/images_tools.py,sha256=TapXYCPqC7GesgrALecxxa_ApuT_dxUG5fqQIJF2bNY,670
 ctools/imgDialog.py,sha256=zFeyPmpnEn9Ih7-yuJJrePqW8Myj3jC9UYMTDk-umTs,1385
 ctools/license.py,sha256=0Kh7lXL7LD1PQqyijHajFL0GbmZGNB88PA2WskbQn_s,1066
@@ -51,7 +51,7 @@ ctools/wordFill.py,sha256=dB1OLt6GLmWdkDV8H20VWbJmY4ggNNI8iHD1ocae2iM,875
 ctools/word_fill.py,sha256=aIkzjAF2soSW6w2dO2CRZlveDcuIdr6v9DtyyyB8uxM,18216
 ctools/word_fill_entity.py,sha256=eX3G0Gy16hfGpavQSEkCIoKDdTnNgRRJrFvKliETZK8,985
 ctools/work_path.py,sha256=i4MTUobqNW2WMrT3mwEC_XYQ0_IhFmKoNpTX2W6A8Tc,1680
-gomyck_tools-1.1.4.dist-info/METADATA,sha256=m99IZeUQ-v12RDdtP2MC0OhYVRi3pot_XVsUlo2D-cs,940
-gomyck_tools-1.1.4.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-gomyck_tools-1.1.4.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
-gomyck_tools-1.1.4.dist-info/RECORD,,
+gomyck_tools-1.1.6.dist-info/METADATA,sha256=FtquWWxsN-ePwUGQcR7qMBA4dBwKIbF_rCNFqKgzFNM,940
+gomyck_tools-1.1.6.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+gomyck_tools-1.1.6.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
+gomyck_tools-1.1.6.dist-info/RECORD,,