pybaseutils 2.4.33__tar.gz → 2.4.34__tar.gz

{pybaseutils-2.4.33 → pybaseutils-2.4.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pybaseutils
-Version: 2.4.33
+Version: 2.4.34
 Summary: pybaseutils
 Home-page: https://github.com/PanJinquan/base-utils
 Author: PanJinquan

{pybaseutils-2.4.33 → pybaseutils-2.4.34}/pybaseutils/__init__.py

@@ -8,4 +8,4 @@
 # --------------------------------------------------------
 """
 
-__version__ = '2.4.33'
+__version__ = '2.4.34'

{pybaseutils-2.4.33 → pybaseutils-2.4.34}/pybaseutils/log.py

@@ -52,17 +52,17 @@ def set_logger(name=None, level="debug", logfile=None, format="simple", is_main_
             record["extra"]["time"] = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
     f = LOG_FORMAT.get(format, LOG_FORMAT.get("simple"))
     logger.remove()  # 去除默认的LOG，避免重复打印
-    logger_ = logger.patch(call_time)
+    logger.configure(patcher=call_time)  # 原地修改全局logger，使所有 from loguru import logger 的文件都生效
     if is_main_process:
-        if logfile: logger_.add(logfile, level=level.upper(), rotation=rotation, retention=retention, format=f,
-                                enqueue=True,  # 异步写入，会重新打开文件
-                                watch=True,  # 避免误删日志文件
-                                catch=True,
-                                )
-        logger_.add(sys.stderr, level=level.upper(), format=f)
+        if logfile: logger.add(logfile, level=level.upper(), rotation=rotation, retention=retention, format=f,
+                               enqueue=True,  # 异步写入，会重新打开文件
+                               watch=True,  # 避免误删日志文件
+                               catch=True,
+                               )
+        logger.add(sys.stderr, level=level.upper(), format=f)
     else:
-        logger_.add(sys.stderr, level="ERROR", format=f)
-    return logger_
+        logger.add(sys.stderr, level="ERROR", format=f)
+    return logger
 
 
 def get_logger():
@@ -74,18 +74,13 @@ if __name__ == '__main__':
     import time
 
     logfile = "./log.log"
-    logger = set_logger(name="demo", is_main_process=True, format="precise", level="debug", logfile=logfile)
-    # logger = set_logger(name="demo", is_main_process=True, format="module", level="debug", logfile=logfile)
-
-    for i in range(1000):
-        try:
-            t = time.time()
-            date = datetime.datetime.fromtimestamp(t).strftime("%H:%M:%S.%f")[:-3]
-            logger.debug(f"{date} debug {i}")
-            # logger.info(f"info {i}")
-            # logger.warning(f"warning {i}")
-            # logger.error(f"error {i}")
-            time.sleep(0.01)
-        except Exception as e:
-            e = traceback.format_exc()
-            logger.error(e)
+    # 初始化logger，设置日志级别为debug，日志格式为precise，日志文件路径为log.log
+    set_logger(name="demo", is_main_process=True, format="precise", level="debug", logfile=logfile)
+    for i in range(10):
+        t = time.time()
+        date = datetime.datetime.fromtimestamp(t).strftime("%H:%M:%S.%f")[:-3]
+        logger.debug(f"{date} debug {i}")
+        # logger.info(f"info {i}")
+        # logger.warning(f"warning {i}")
+        # logger.error(f"error {i}")
+        time.sleep(0.01)

{pybaseutils-2.4.33 → pybaseutils-2.4.34}/pybaseutils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pybaseutils
-Version: 2.4.33
+Version: 2.4.34
 Summary: pybaseutils
 Home-page: https://github.com/PanJinquan/base-utils
 Author: PanJinquan

{pybaseutils-2.4.33 → pybaseutils-2.4.34}/test_py/demo4.py

@@ -65,13 +65,6 @@ def openai2gradio_style(msgs):
 
 
 if __name__ == "__main__":
-    image_file = "/media/PKing/dev2/SDK/base-utils/data/mask.png"
-    msgs = [{"role": "user", "content": "你好"},
-            {"role": "assistant", "content": "你好，有什么我可以帮助你的吗？"},
-            {"role": "user", "content": [image_file]},
-            {"role": "user", "content": "请根据图片描述"},
-            {"role": "assistant", "content": "这张图是描述....."},
-            ]
-    out1 = gradio2openai_style(msgs)
-    out2 = openai2gradio_style(out1)
-    print(json_utils.formatting(out2))
+
+    a = 123456.123456
+    print("{:.0f}".format(a))