Skip to content

Commit c16bf6e

Browse files
authored
Merge pull request #555 from superannotateai/1719_config
Added ini file handeling
2 parents 87e6d91 + d9cefd3 commit c16bf6e

File tree

202 files changed

+1790
-1192
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

202 files changed

+1790
-1192
lines changed

src/superannotate/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import logging
12
import os
23
import sys
34
import typing
@@ -23,7 +24,6 @@
2324
from superannotate.lib.core import PACKAGE_VERSION_INFO_MESSAGE # noqa
2425
from superannotate.lib.core import PACKAGE_VERSION_MAJOR_UPGRADE # noqa
2526
from superannotate.lib.core import PACKAGE_VERSION_UPGRADE # noqa
26-
from superannotate.logger import get_default_logger # noqa
2727
import superannotate.lib.core.enums as enums # noqa
2828

2929
SESSIONS = {}
@@ -55,13 +55,13 @@ def create_app(apps: typing.List[str] = None) -> SAServer:
5555
__author__ = "Superannotate"
5656

5757
logging.getLogger("botocore").setLevel(logging.CRITICAL)
58-
logger = get_default_logger()
5958

6059

6160
def log_version_info():
61+
logging.StreamHandler(sys.stdout)
6262
local_version = parse(__version__)
6363
if local_version.is_prerelease:
64-
logger.info(PACKAGE_VERSION_INFO_MESSAGE.format(__version__))
64+
logging.info(PACKAGE_VERSION_INFO_MESSAGE.format(__version__))
6565
req = requests.get("https://pypi.org/pypi/superannotate/json")
6666
if req.ok:
6767
releases = req.json().get("releases", [])
@@ -71,11 +71,11 @@ def log_version_info():
7171
if not ver.is_prerelease or local_version.is_prerelease:
7272
pip_version = max(pip_version, ver)
7373
if pip_version.major > local_version.major:
74-
logger.warning(
74+
logging.warning(
7575
PACKAGE_VERSION_MAJOR_UPGRADE.format(local_version, pip_version)
7676
)
7777
elif pip_version > local_version:
78-
logger.warning(PACKAGE_VERSION_UPGRADE.format(local_version, pip_version))
78+
logging.warning(PACKAGE_VERSION_UPGRADE.format(local_version, pip_version))
7979

8080

8181
if not os.environ.get("SA_VERSION_CHECK", "True").lower() == "false":

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import copy
22
import json
3+
import logging
34
from dataclasses import dataclass
45
from pathlib import Path
56
from typing import List
@@ -11,9 +12,8 @@
1112
from lib.app.exceptions import AppException
1213
from lib.core import PIXEL_ANNOTATION_POSTFIX
1314
from lib.core import VECTOR_ANNOTATION_POSTFIX
14-
from superannotate.logger import get_default_logger
1515

16-
logger = get_default_logger()
16+
logger = logging.getLogger("sa")
1717

1818

1919
@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
12
from pathlib import Path
23

34
import pandas as pd
45
import plotly.express as px
56
from lib.app.interface.base_interface import Tracker
67
from superannotate.lib.app.exceptions import AppException
78
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 = get_default_logger()
12+
logger = logging.getLogger("sa")
1313

1414

1515
@Tracker

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

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

45
import pandas as pd
56
import plotly.express as px
67
from lib.app.exceptions import AppException
7-
from superannotate.logger import get_default_logger
88

99

10-
logger = get_default_logger()
10+
logger = logging.getLogger("sa")
1111

1212

1313
def aggregate_image_annotations_as_df(

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

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

6-
logger = get_default_logger()
7+
logger = logging.getLogger("sa")
78

89

910
def main():

src/superannotate/lib/app/common.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import json
2+
import logging
23

34
import numpy as np
4-
from superannotate.logger import get_default_logger
55
from tqdm import tqdm
66

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

99

1010
def hex_to_rgb(hex_string):

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-
from superannotate.logger import get_default_logger
3+
import logging
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 = get_default_logger()
41+
logger = logging.getLogger("sa")
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
45
from collections import namedtuple
56
from datetime import datetime
67
from pathlib import Path
78

89
import cv2
910
import numpy as np
1011
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 = get_default_logger()
17+
logger = logging.getLogger("sa")
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
34
import threading
45
from pathlib import Path
56

67
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 = get_default_logger()
14+
logger = logging.getLogger("sa")
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
56
import threading
67
from pathlib import Path
78

89
import cv2
910
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 = get_default_logger()
22+
logger = logging.getLogger("sa")
2323

2424

2525
def annot_to_bitmask(annot):

0 commit comments

Comments
 (0)