Skip to content

Commit 30b7a9a

Browse files
committed
Add sa logger
1 parent 0e5aa97 commit 30b7a9a

40 files changed

+131
-119
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
@@ -108,6 +107,7 @@
108107
)
109108
from superannotate.lib.app.interface.sdk_interface import validate_annotations
110109
from superannotate.version import __version__
110+
from superannotate.logger import get_default_logger
111111

112112
__all__ = [
113113
"__version__",
@@ -208,48 +208,12 @@
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": { # root logger
242-
"level": "DEBUG",
243-
"handlers": ["console", "fileHandler"],
244-
},
245-
}
246-
)
247-
211+
logger = get_default_logger()
248212

249213
def log_version_info():
250214
local_version = parse(__version__)
251215
if local_version.is_prerelease:
252-
logging.info(constances.PACKAGE_VERSION_INFO_MESSAGE.format(__version__))
216+
logger.info(constances.PACKAGE_VERSION_INFO_MESSAGE.format(__version__))
253217
req = requests.get("https://pypi.python.org/pypi/superannotate/json")
254218
if req.ok:
255219
releases = req.json().get("releases", [])
@@ -259,13 +223,13 @@ def log_version_info():
259223
if not ver.is_prerelease or local_version.is_prerelease:
260224
pip_version = max(pip_version, ver)
261225
if pip_version.major > local_version.major:
262-
logging.warning(
226+
logger.warning(
263227
constances.PACKAGE_VERSION_MAJOR_UPGRADE.format(
264228
local_version, pip_version
265229
)
266230
)
267231
elif pip_version > local_version:
268-
logging.warning(
232+
logger.warning(
269233
constances.PACKAGE_VERSION_UPGRADE.format(local_version, pip_version)
270234
)
271235

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import copy
22
import json
3-
import logging
3+
from superannotate.logger import get_default_logger
44
from pathlib import Path
55
from typing import List
66
from typing import Optional
@@ -14,7 +14,7 @@
1414
from lib.core import PIXEL_ANNOTATION_POSTFIX
1515
from lib.core import VECTOR_ANNOTATION_POSTFIX
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,4 +1,4 @@
1-
import logging
1+
from superannotate.logger import get_default_logger
22
from pathlib import Path
33

44
import pandas as pd
@@ -9,7 +9,7 @@
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import json
2-
import logging
2+
from superannotate.logger import get_default_logger
33
from pathlib import Path
44

55
import pandas as pd
@@ -8,7 +8,7 @@
88
from lib.core import DEPRICATED_DOCUMENT_VIDEO_MESSAGE
99

1010

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

1313

1414
def aggregate_image_annotations_as_df(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/usr/bin/env python3
2-
import logging
2+
from superannotate.logger import get_default_logger
33

44
import fire
55
from lib.app.interface.cli_interface import CLIFacade
66

7-
logger = logging.getLogger()
7+
logger = get_default_logger()
88

99

1010
def main():

src/superannotate/lib/app/common.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import json
2-
import logging
2+
from superannotate.logger import get_default_logger
33
import os
44
import sys
55
import time
@@ -8,7 +8,7 @@
88
from PIL import Image
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,7 +1,7 @@
11
"""
22
"""
33
import json
4-
import logging
4+
from superannotate.logger import get_default_logger
55
from collections import namedtuple
66
from datetime import datetime
77
from pathlib import Path
@@ -14,7 +14,7 @@
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,6 +1,6 @@
11
"""
22
"""
3-
import logging
3+
from superannotate.logger import get_default_logger
44
import threading
55
from pathlib import Path
66

@@ -11,7 +11,7 @@
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,7 +2,7 @@
22
COCO to SA conversion method
33
"""
44
import json
5-
import logging
5+
from superannotate.logger import get_default_logger
66
import threading
77
from pathlib import Path
88

@@ -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)