Skip to content

Commit e22a863

Browse files
authored
Merge pull request #364 from superannotateai/logger
Logger
2 parents e87b084 + db43320 commit e22a863

40 files changed

+139
-130
lines changed

src/superannotate/__init__.py

Lines changed: 5 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import logging.config
22
import os
33
import sys
4-
from os.path import expanduser
54

65
import requests
76
import superannotate.lib.core as constances
@@ -107,6 +106,7 @@
107106
upload_videos_from_folder_to_project,
108107
)
109108
from superannotate.lib.app.interface.sdk_interface import validate_annotations
109+
from superannotate.logger import get_default_logger
110110
from superannotate.version import __version__
111111

112112
__all__ = [
@@ -208,49 +208,13 @@
208208
WORKING_DIR = os.path.split(os.path.realpath(__file__))[0]
209209
sys.path.append(WORKING_DIR)
210210
logging.getLogger("botocore").setLevel(logging.CRITICAL)
211-
212-
logging.config.dictConfig(
213-
{
214-
"version": 1,
215-
"disable_existing_loggers": False,
216-
"handlers": {
217-
"console": {
218-
"class": "logging.StreamHandler",
219-
"level": "INFO",
220-
"formatter": "consoleFormatter",
221-
"stream": "ext://sys.stdout",
222-
},
223-
"fileHandler": {
224-
"class": "logging.handlers.RotatingFileHandler",
225-
"level": "DEBUG",
226-
"formatter": "fileFormatter",
227-
"filename": expanduser(constances.LOG_FILE_LOCATION),
228-
"mode": "a",
229-
"maxBytes": 5 * 1024 * 1024,
230-
"backupCount": 5,
231-
},
232-
},
233-
"formatters": {
234-
"consoleFormatter": {
235-
"format": "SA-PYTHON-SDK - %(levelname)s - %(message)s",
236-
},
237-
"fileFormatter": {
238-
"format": "SA-PYTHON-SDK - %(levelname)s - %(asctime)s - %(message)s"
239-
},
240-
},
241-
"root": {
242-
# "level": "INFO",
243-
"level": "DEBUG",
244-
"handlers": ["console", "fileHandler"],
245-
},
246-
}
247-
)
211+
logger = get_default_logger()
248212

249213

250214
def log_version_info():
251215
local_version = parse(__version__)
252216
if local_version.is_prerelease:
253-
logging.info(constances.PACKAGE_VERSION_INFO_MESSAGE.format(__version__))
217+
logger.info(constances.PACKAGE_VERSION_INFO_MESSAGE.format(__version__))
254218
req = requests.get("https://pypi.python.org/pypi/superannotate/json")
255219
if req.ok:
256220
releases = req.json().get("releases", [])
@@ -260,13 +224,13 @@ def log_version_info():
260224
if not ver.is_prerelease or local_version.is_prerelease:
261225
pip_version = max(pip_version, ver)
262226
if pip_version.major > local_version.major:
263-
logging.warning(
227+
logger.warning(
264228
constances.PACKAGE_VERSION_MAJOR_UPGRADE.format(
265229
local_version, pip_version
266230
)
267231
)
268232
elif pip_version > local_version:
269-
logging.warning(
233+
logger.warning(
270234
constances.PACKAGE_VERSION_UPGRADE.format(local_version, pip_version)
271235
)
272236

src/superannotate/lib/app/analytics/aggregators.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import copy
22
import json
3-
import logging
3+
from dataclasses import dataclass
44
from pathlib import Path
55
from typing import List
66
from typing import Optional
77
from typing import Union
88

99
import lib.core as constances
1010
import pandas as pd
11-
from dataclasses import dataclass
1211
from lib.app.exceptions import AppException
1312
from lib.core import ATTACHED_VIDEO_ANNOTATION_POSTFIX
1413
from lib.core import PIXEL_ANNOTATION_POSTFIX
1514
from lib.core import VECTOR_ANNOTATION_POSTFIX
15+
from superannotate.logger import get_default_logger
1616

17-
logger = logging.getLogger("root")
17+
logger = get_default_logger()
1818

1919

2020
@dataclass

src/superannotate/lib/app/analytics/class_analytics.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import logging
21
from pathlib import Path
32

43
import pandas as pd
54
import plotly.express as px
65
from lib.app.mixp.decorators import Trackable
76
from superannotate.lib.app.exceptions import AppException
87
from superannotate.lib.core import DEPRICATED_DOCUMENT_VIDEO_MESSAGE
8+
from superannotate.logger import get_default_logger
99

1010
from .common import aggregate_image_annotations_as_df
1111

12-
logger = logging.getLogger()
12+
logger = get_default_logger()
1313

1414

1515
@Trackable

src/superannotate/lib/app/analytics/common.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import json
2-
import logging
32
from pathlib import Path
43

54
import pandas as pd
65
import plotly.express as px
76
from lib.app.exceptions import AppException
87
from lib.core import DEPRICATED_DOCUMENT_VIDEO_MESSAGE
8+
from superannotate.logger import get_default_logger
99

10-
logger = logging.getLogger("root")
10+
11+
logger = get_default_logger()
1112

1213

1314
def aggregate_image_annotations_as_df(

src/superannotate/lib/app/bin/superannotate.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
#!/usr/bin/env python3
2-
import logging
3-
42
import fire
53
from lib.app.interface.cli_interface import CLIFacade
4+
from superannotate.logger import get_default_logger
65

7-
logger = logging.getLogger()
6+
logger = get_default_logger()
87

98

109
def main():

src/superannotate/lib/app/common.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import json
2-
import logging
32
import os
43
import sys
54
import time
65

76
import numpy as np
87
from PIL import Image
8+
from superannotate.logger import get_default_logger
99
from tqdm import tqdm
1010

11-
logger = logging.getLogger()
11+
logger = get_default_logger()
1212

1313
_PROJECT_TYPES = {"Vector": 1, "Pixel": 2}
1414

src/superannotate/lib/app/input_converters/converters/baseStrategy.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
"""
3-
import logging
3+
from superannotate.logger import get_default_logger
44

55
from .coco_converters.coco_to_sa_pixel import coco_instance_segmentation_to_sa_pixel
66
from .coco_converters.coco_to_sa_pixel import coco_panoptic_segmentation_to_sa_pixel
@@ -38,7 +38,7 @@
3838
from .vott_converters.vott_to_sa_vector import vott_to_sa
3939
from .yolo_converters.yolo_to_sa_vector import yolo_object_detection_to_sa_vector
4040

41-
logger = logging.getLogger()
41+
logger = get_default_logger()
4242

4343
CONVERSION_ALGORITHMS = {
4444
"from": {

src/superannotate/lib/app/input_converters/converters/coco_converters/coco_converter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
"""
22
"""
33
import json
4-
import logging
54
from collections import namedtuple
65
from datetime import datetime
76
from pathlib import Path
87

98
import cv2
109
import numpy as np
1110
from PIL import Image
11+
from superannotate.logger import get_default_logger
1212

1313
from ....common import id2rgb
1414
from ....common import write_to_json
1515
from ..baseStrategy import baseStrategy
1616

17-
logger = logging.getLogger()
17+
logger = get_default_logger()
1818

1919

2020
class CocoBaseStrategy(baseStrategy):

src/superannotate/lib/app/input_converters/converters/coco_converters/coco_strategies.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
"""
22
"""
3-
import logging
43
import threading
54
from pathlib import Path
65

76
from PIL import Image
7+
from superannotate.logger import get_default_logger
88

99
from ....common import id2rgb
1010
from ....common import tqdm_converter
1111
from ....common import write_to_json
1212
from .coco_converter import CocoBaseStrategy
1313

14-
logger = logging.getLogger()
14+
logger = get_default_logger()
1515

1616

1717
class CocoPanopticConverterStrategy(CocoBaseStrategy):

src/superannotate/lib/app/input_converters/converters/coco_converters/coco_to_sa_pixel.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
COCO to SA conversion method
33
"""
44
import json
5-
import logging
65
import threading
76
from pathlib import Path
87

98
import cv2
109
import numpy as np
10+
from superannotate.logger import get_default_logger
1111

1212
from ....common import blue_color_generator
1313
from ....common import hex_to_rgb
@@ -19,7 +19,7 @@
1919
from .coco_api import _maskfrRLE
2020
from .coco_api import decode
2121

22-
logger = logging.getLogger()
22+
logger = get_default_logger()
2323

2424

2525
def annot_to_bitmask(annot):

0 commit comments

Comments
 (0)