Merge branch 'main' into main

labelme/__init__.py

@@ -13,7 +13,7 @@
 # 2. MINOR version when you add functionality in a backwards-compatible manner;
 # 3. PATCH version when you make backwards-compatible bug fixes.
 # e.g., 1.0.0a0, 1.0.0a1, 1.0.0b0, 1.0.0rc0, 1.0.0, 1.0.0.post0
-__version__ = "5.6.0a0"
+__version__ = "5.6.0"
 
 QT4 = QT_VERSION[0] == "4"
 QT5 = QT_VERSION[0] == "5"

labelme/__main__.py

@@ -1,22 +1,52 @@
 import argparse
 import codecs
-import logging
 import os
 import os.path as osp
 import sys
 
 import yaml
+from loguru import logger
 from qtpy import QtCore
 from qtpy import QtWidgets
 
 from labelme import __appname__
 from labelme import __version__
 from labelme.app import MainWindow
 from labelme.config import get_config
-from labelme.logger import logger
 from labelme.utils import newIcon
 
 
+def _setup_loguru(logger_level: str) -> None:
+    try:
+        logger.remove(handler_id=0)
+    except ValueError:
+        pass
+
+    if sys.stderr:
+        logger.add(sys.stderr, level=logger_level)
+
+    cache_dir: str
+    if os.name == "nt":
+        cache_dir = os.path.join(os.environ["LOCALAPPDATA"], "labelme")
+    else:
+        cache_dir = os.path.expanduser("~/.cache/labelme")
+
+    os.makedirs(cache_dir, exist_ok=True)
+
+    log_file = os.path.join(cache_dir, "labelme.log")
+    logger.add(
+        log_file,
+        colorize=True,
+        level="DEBUG",
+        rotation="10 MB",
+        retention="30 days",
+        compression="gz",
+        enqueue=True,
+        backtrace=True,
+        diagnose=True,
+    )
+
+
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument("--version", "-V", action="store_true", help="show version")
@@ -109,7 +139,7 @@ def main():
         print("{0} {1}".format(__appname__, __version__))
         sys.exit(0)
 
-    logger.setLevel(getattr(logging, args.logger_level.upper()))
+    _setup_loguru(logger_level=args.logger_level.upper())
 
     if hasattr(args, "flags"):
         if os.path.isfile(args.flags):
@@ -177,9 +207,10 @@ def main():
         win.settings.clear()
         sys.exit(0)
 
-    win.show()
-    win.raise_()
-    sys.exit(app.exec_())
+    with logger.catch():
+        win.show()
+        win.raise_()
+        sys.exit(app.exec_())
 
 
 # this main block is required to generate executable by pyinstaller

labelme/ai/_utils.py

@@ -1,8 +1,7 @@
 import imgviz
 import numpy as np
 import skimage
-
-from labelme.logger import logger
+from loguru import logger
 
 
 def _get_contour_length(contour):

labelme/ai/efficient_sam.py

@@ -5,8 +5,8 @@
 import numpy as np
 import onnxruntime
 import skimage
+from loguru import logger
 
-from ..logger import logger
 from . import _utils
 
 

labelme/ai/segment_anything_model.py

@@ -5,8 +5,8 @@
 import numpy as np
 import onnxruntime
 import skimage
+from loguru import logger
 
-from ..logger import logger
 from . import _utils
 
 

labelme/ai/text_to_annotation.py

@@ -3,8 +3,7 @@
 
 import numpy as np
 import osam
-
-from labelme.logger import logger
+from loguru import logger
 
 
 def get_rectangles_from_texts(

labelme/app.py

@@ -11,6 +11,7 @@
 import imgviz
 import natsort
 import numpy as np
+from loguru import logger
 from qtpy import QtCore
 from qtpy import QtGui
 from qtpy import QtWidgets
@@ -23,7 +24,6 @@
 from labelme.config import get_config
 from labelme.label_file import LabelFile
 from labelme.label_file import LabelFileError
-from labelme.logger import logger
 from labelme.shape import Shape
 from labelme.widgets import AiPromptWidget
 from labelme.widgets import BrightnessContrastDialog

labelme/cli/draw_label_png.py

@@ -4,8 +4,7 @@
 import imgviz
 import matplotlib.pyplot as plt
 import numpy as np
-
-from labelme.logger import logger
+from loguru import logger
 
 
 def main():

labelme/cli/export_json.py

@@ -6,9 +6,9 @@
 
 import imgviz
 import PIL.Image
+from loguru import logger
 
 from labelme import utils
-from labelme.logger import logger
 
 
 def main():

labelme/cli/json_to_dataset.py

@@ -6,9 +6,9 @@
 
 import imgviz
 import PIL.Image
+from loguru import logger
 
 from labelme import utils
-from labelme.logger import logger
 
 
 def main():

labelme/config/__init__.py

@@ -2,8 +2,7 @@
 import shutil
 
 import yaml
-
-from labelme.logger import logger
+from loguru import logger
 
 here = osp.dirname(osp.abspath(__file__))
 

labelme/label_file.py

@@ -5,12 +5,12 @@
 import os.path as osp
 
 import PIL.Image
+from loguru import logger
 
 from labelme import PY2
 from labelme import QT4
 from labelme import __version__
 from labelme import utils
-from labelme.logger import logger
 
 PIL.Image.MAX_IMAGE_PIXELS = None
 

labelme/shape.py

@@ -2,11 +2,11 @@
 
 import numpy as np
 import skimage.measure
+from loguru import logger
 from qtpy import QtCore
 from qtpy import QtGui
 
 import labelme.utils
-from labelme.logger import logger
 
 # TODO(unknown):
 # - [opt] Store paths instead of creating new ones at each paint.

labelme/utils/shape.py

@@ -7,8 +7,7 @@
 import numpy as np
 import PIL.Image
 import PIL.ImageDraw
-
-from labelme.logger import logger
+from loguru import logger
 
 
 def polygons_to_mask(img_shape, polygons, shape_type=None):

labelme/widgets/canvas.py

@@ -1,12 +1,14 @@
+import contextlib
+
 import imgviz
+from loguru import logger
 from qtpy import QtCore
 from qtpy import QtGui
 from qtpy import QtWidgets
 
 import labelme.ai
 import labelme.utils
 from labelme import QT5
-from labelme.logger import logger
 from labelme.shape import Shape
 
 import numpy as np
@@ -142,7 +144,18 @@ def initializeAiModel(self, name):
             logger.debug("AI model is already initialized: %r" % model.name)
         else:
             logger.debug("Initializing AI model: %r" % model.name)
-            self._ai_model = model()
+
+            class LoggerIO:
+                def write(self, message: str):
+                    if message := message.strip():
+                        logger.debug(message)
+
+                def flush(self):
+                    pass
+
+            # NOTE: gdown.download uses sys.stderr, so redirect it to logger.debug
+            with contextlib.redirect_stderr(new_target=LoggerIO()):
+                self._ai_model = model()
 
         if self.pixmap is None:
             logger.warning("Pixmap is not set yet")

labelme/widgets/label_dialog.py

@@ -1,12 +1,12 @@
 import re
 
+from loguru import logger
 from qtpy import QT_VERSION
 from qtpy import QtCore
 from qtpy import QtGui
 from qtpy import QtWidgets
 
 import labelme.utils
-from labelme.logger import logger
 
 QT5 = QT_VERSION[0] == "5"
 

setup.py

@@ -23,6 +23,7 @@ def get_install_requires():
     install_requires = [
         "gdown",
         "imgviz>=1.7.5",
+        "loguru",
         "matplotlib",
         "natsort>=7.1.0",
         "numpy",