From ceb7c227f57c52ea9c33e3a6b281a84624230334 Mon Sep 17 00:00:00 2001 From: shab Date: Tue, 31 Aug 2021 11:55:40 +0400 Subject: [PATCH 1/2] fix logger --- src/superannotate/__init__.py | 1 + src/superannotate/lib/app/analytics/class_analytics.py | 2 +- src/superannotate/lib/app/analytics/common.py | 2 +- src/superannotate/lib/app/bin/superannotate.py | 2 +- src/superannotate/lib/app/common.py | 2 +- src/superannotate/lib/app/convertors/baseStrategy.py | 2 +- .../lib/app/convertors/coco_converters/coco_converter.py | 2 +- .../lib/app/convertors/coco_converters/coco_strategies.py | 2 +- .../lib/app/convertors/coco_converters/coco_to_sa_pixel.py | 2 +- .../app/convertors/coco_converters/coco_to_sa_vector.py | 2 +- .../app/convertors/coco_converters/sa_vector_to_coco.py | 2 +- .../dataloop_converters/dataloop_to_sa_vector.py | 2 +- .../googlecloud_converters/googlecloud_to_sa_vector.py | 2 +- .../app/convertors/labelbox_converters/labelbox_helper.py | 2 +- .../convertors/labelbox_converters/labelbox_to_sa_pixel.py | 2 +- .../labelbox_converters/labelbox_to_sa_vector.py | 2 +- .../sagemaker_converters/sagemaker_to_sa_pixel.py | 2 +- .../sagemaker_converters/sagemaker_to_sa_vector.py | 2 +- .../supervisely_converters/supervisely_to_sa_pixel.py | 2 +- .../supervisely_converters/supervisely_to_sa_vector.py | 2 +- .../lib/app/convertors/vgg_converters/vgg_to_sa_vector.py | 2 +- .../lib/app/convertors/voc_converters/voc_to_sa_pixel.py | 2 +- .../lib/app/convertors/voc_converters/voc_to_sa_vector.py | 2 +- .../app/convertors/vott_converters/vott_to_sa_vector.py | 2 +- .../app/convertors/yolo_converters/yolo_to_sa_vector.py | 2 +- .../lib/app/input_converters/converters/baseStrategy.py | 2 +- .../converters/coco_converters/coco_converter.py | 2 +- .../converters/coco_converters/coco_strategies.py | 2 +- .../converters/coco_converters/coco_to_sa_pixel.py | 2 +- .../converters/coco_converters/coco_to_sa_vector.py | 2 +- .../converters/coco_converters/sa_vector_to_coco.py | 2 +- .../dataloop_converters/dataloop_to_sa_vector.py | 2 +- .../googlecloud_converters/googlecloud_to_sa_vector.py | 2 +- .../converters/labelbox_converters/labelbox_helper.py | 2 +- .../converters/labelbox_converters/labelbox_to_sa_pixel.py | 2 +- .../labelbox_converters/labelbox_to_sa_vector.py | 2 +- .../sagemaker_converters/sagemaker_to_sa_pixel.py | 2 +- .../sagemaker_converters/sagemaker_to_sa_vector.py | 2 +- .../supervisely_converters/supervisely_to_sa_pixel.py | 2 +- .../supervisely_converters/supervisely_to_sa_vector.py | 2 +- .../converters/vgg_converters/vgg_to_sa_vector.py | 2 +- .../converters/voc_converters/voc_to_sa_pixel.py | 2 +- .../converters/voc_converters/voc_to_sa_vector.py | 2 +- .../converters/vott_converters/vott_to_sa_vector.py | 2 +- .../converters/yolo_converters/yolo_to_sa_vector.py | 2 +- .../lib/app/input_converters/export_from_sa_conversions.py | 2 +- .../lib/app/input_converters/import_to_sa_conversions.py | 2 +- .../lib/app/input_converters/sa_conversion.py | 2 +- src/superannotate/lib/app/interface/base_interface.py | 2 +- src/superannotate/lib/app/interface/cli_interface.py | 2 +- src/superannotate/lib/app/interface/sdk_interface.py | 6 ++++-- src/superannotate/lib/app/mixp/decorators.py | 2 +- src/superannotate/lib/app/mixp/utils/parsers.py | 2 +- src/superannotate/lib/core/usecases.py | 2 +- src/superannotate/logging.conf | 7 +++---- 55 files changed, 60 insertions(+), 58 deletions(-) diff --git a/src/superannotate/__init__.py b/src/superannotate/__init__.py index 24a41592c..45fdc4282 100644 --- a/src/superannotate/__init__.py +++ b/src/superannotate/__init__.py @@ -292,3 +292,4 @@ file_dir = os.path.split(os.path.realpath(__file__))[0] logging.config.fileConfig(os.path.join(file_dir, "logging.conf")) +logger = logging.getLogger() diff --git a/src/superannotate/lib/app/analytics/class_analytics.py b/src/superannotate/lib/app/analytics/class_analytics.py index 1a096b1c8..2fa566d8e 100644 --- a/src/superannotate/lib/app/analytics/class_analytics.py +++ b/src/superannotate/lib/app/analytics/class_analytics.py @@ -8,7 +8,7 @@ from .common import aggregate_annotations_as_df -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() @Trackable diff --git a/src/superannotate/lib/app/analytics/common.py b/src/superannotate/lib/app/analytics/common.py index cd035da4e..fdae2704e 100644 --- a/src/superannotate/lib/app/analytics/common.py +++ b/src/superannotate/lib/app/analytics/common.py @@ -10,7 +10,7 @@ from shapely.geometry import Polygon -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def df_to_annotations(df, output_dir): diff --git a/src/superannotate/lib/app/bin/superannotate.py b/src/superannotate/lib/app/bin/superannotate.py index 886e47a9b..5de3cd967 100644 --- a/src/superannotate/lib/app/bin/superannotate.py +++ b/src/superannotate/lib/app/bin/superannotate.py @@ -4,7 +4,7 @@ import fire from lib.app.interface.cli_interface import CLIFacade -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() # TODO Add help text HELP_TEXT = "" diff --git a/src/superannotate/lib/app/common.py b/src/superannotate/lib/app/common.py index 99b597ede..d24337ef2 100644 --- a/src/superannotate/lib/app/common.py +++ b/src/superannotate/lib/app/common.py @@ -10,7 +10,7 @@ from PIL import Image from tqdm import tqdm -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() DEFAULT_IMAGE_EXTENSIONS = ("jpg", "jpeg", "png", "tif", "tiff", "webp", "bmp") DEFAULT_FILE_EXCLUDE_PATTERNS = ("___save.png", "___fuse.png") diff --git a/src/superannotate/lib/app/convertors/baseStrategy.py b/src/superannotate/lib/app/convertors/baseStrategy.py index 429c8c993..ed858711f 100644 --- a/src/superannotate/lib/app/convertors/baseStrategy.py +++ b/src/superannotate/lib/app/convertors/baseStrategy.py @@ -38,7 +38,7 @@ from .vott_converters.vott_to_sa_vector import vott_to_sa from .yolo_converters.yolo_to_sa_vector import yolo_object_detection_to_sa_vector -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() CONVERSION_ALGORITHMS = { "from": { diff --git a/src/superannotate/lib/app/convertors/coco_converters/coco_converter.py b/src/superannotate/lib/app/convertors/coco_converters/coco_converter.py index 9eac00041..15e3dfca3 100644 --- a/src/superannotate/lib/app/convertors/coco_converters/coco_converter.py +++ b/src/superannotate/lib/app/convertors/coco_converters/coco_converter.py @@ -14,7 +14,7 @@ from ....common import write_to_json from ..baseStrategy import baseStrategy -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() class CocoBaseStrategy(baseStrategy): diff --git a/src/superannotate/lib/app/convertors/coco_converters/coco_strategies.py b/src/superannotate/lib/app/convertors/coco_converters/coco_strategies.py index ea0e13c2a..18a7258e0 100644 --- a/src/superannotate/lib/app/convertors/coco_converters/coco_strategies.py +++ b/src/superannotate/lib/app/convertors/coco_converters/coco_strategies.py @@ -11,7 +11,7 @@ from ....common import write_to_json from .coco_converter import CocoBaseStrategy -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() class CocoPanopticConverterStrategy(CocoBaseStrategy): diff --git a/src/superannotate/lib/app/convertors/coco_converters/coco_to_sa_pixel.py b/src/superannotate/lib/app/convertors/coco_converters/coco_to_sa_pixel.py index 548b9366a..eae0ee91d 100644 --- a/src/superannotate/lib/app/convertors/coco_converters/coco_to_sa_pixel.py +++ b/src/superannotate/lib/app/convertors/coco_converters/coco_to_sa_pixel.py @@ -19,7 +19,7 @@ from .coco_api import _maskfrRLE from .coco_api import decode -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def annot_to_bitmask(annot): diff --git a/src/superannotate/lib/app/convertors/coco_converters/coco_to_sa_vector.py b/src/superannotate/lib/app/convertors/coco_converters/coco_to_sa_vector.py index 64681bf52..f12ffd6e0 100644 --- a/src/superannotate/lib/app/convertors/coco_converters/coco_to_sa_vector.py +++ b/src/superannotate/lib/app/convertors/coco_converters/coco_to_sa_vector.py @@ -16,7 +16,7 @@ from .coco_api import _maskfrRLE from .coco_api import decode -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def annot_to_polygon(annot): diff --git a/src/superannotate/lib/app/convertors/coco_converters/sa_vector_to_coco.py b/src/superannotate/lib/app/convertors/coco_converters/sa_vector_to_coco.py index c2fd03e3b..94f8fea49 100644 --- a/src/superannotate/lib/app/convertors/coco_converters/sa_vector_to_coco.py +++ b/src/superannotate/lib/app/convertors/coco_converters/sa_vector_to_coco.py @@ -10,7 +10,7 @@ from .coco_api import _polytoMask from .coco_api import _toBbox -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def sa_vector_to_coco_object_detection( diff --git a/src/superannotate/lib/app/convertors/dataloop_converters/dataloop_to_sa_vector.py b/src/superannotate/lib/app/convertors/dataloop_converters/dataloop_to_sa_vector.py index 08c0ea401..dbbf131bb 100644 --- a/src/superannotate/lib/app/convertors/dataloop_converters/dataloop_to_sa_vector.py +++ b/src/superannotate/lib/app/convertors/dataloop_converters/dataloop_to_sa_vector.py @@ -13,7 +13,7 @@ from .dataloop_helper import _create_attributes_list from .dataloop_helper import _update_classes_dict -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def dataloop_to_sa(input_dir, task, output_dir): diff --git a/src/superannotate/lib/app/convertors/googlecloud_converters/googlecloud_to_sa_vector.py b/src/superannotate/lib/app/convertors/googlecloud_converters/googlecloud_to_sa_vector.py index ab9795ace..fe4605f2a 100644 --- a/src/superannotate/lib/app/convertors/googlecloud_converters/googlecloud_to_sa_vector.py +++ b/src/superannotate/lib/app/convertors/googlecloud_converters/googlecloud_to_sa_vector.py @@ -13,7 +13,7 @@ from ..sa_json_helper import _create_sa_json from ..sa_json_helper import _create_vector_instance -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def googlecloud_to_sa_vector(path, output_dir): diff --git a/src/superannotate/lib/app/convertors/labelbox_converters/labelbox_helper.py b/src/superannotate/lib/app/convertors/labelbox_converters/labelbox_helper.py index ed7140578..7abca5b73 100644 --- a/src/superannotate/lib/app/convertors/labelbox_converters/labelbox_helper.py +++ b/src/superannotate/lib/app/convertors/labelbox_converters/labelbox_helper.py @@ -2,7 +2,7 @@ import requests -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def image_downloader(url, file_name): diff --git a/src/superannotate/lib/app/convertors/labelbox_converters/labelbox_to_sa_pixel.py b/src/superannotate/lib/app/convertors/labelbox_converters/labelbox_to_sa_pixel.py index 7e39dbe86..22e31186f 100644 --- a/src/superannotate/lib/app/convertors/labelbox_converters/labelbox_to_sa_pixel.py +++ b/src/superannotate/lib/app/convertors/labelbox_converters/labelbox_to_sa_pixel.py @@ -18,7 +18,7 @@ from .labelbox_helper import _create_classes_id_map from .labelbox_helper import image_downloader -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def labelbox_instance_segmentation_to_sa_pixel(json_data, output_dir, input_dir): diff --git a/src/superannotate/lib/app/convertors/labelbox_converters/labelbox_to_sa_vector.py b/src/superannotate/lib/app/convertors/labelbox_converters/labelbox_to_sa_vector.py index 8c17996fc..54693b9c4 100644 --- a/src/superannotate/lib/app/convertors/labelbox_converters/labelbox_to_sa_vector.py +++ b/src/superannotate/lib/app/convertors/labelbox_converters/labelbox_to_sa_vector.py @@ -13,7 +13,7 @@ from .labelbox_helper import _create_attributes_list from .labelbox_helper import _create_classes_id_map -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def labelbox_to_sa(json_data, output_dir, task): diff --git a/src/superannotate/lib/app/convertors/sagemaker_converters/sagemaker_to_sa_pixel.py b/src/superannotate/lib/app/convertors/sagemaker_converters/sagemaker_to_sa_pixel.py index 6492c0b95..245330c87 100644 --- a/src/superannotate/lib/app/convertors/sagemaker_converters/sagemaker_to_sa_pixel.py +++ b/src/superannotate/lib/app/convertors/sagemaker_converters/sagemaker_to_sa_pixel.py @@ -16,7 +16,7 @@ from ..sa_json_helper import _create_pixel_instance from ..sa_json_helper import _create_sa_json -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def sagemaker_instance_segmentation_to_sa_pixel(data_path, output_dir): diff --git a/src/superannotate/lib/app/convertors/sagemaker_converters/sagemaker_to_sa_vector.py b/src/superannotate/lib/app/convertors/sagemaker_converters/sagemaker_to_sa_vector.py index a261fdcb7..aea6a8c2f 100644 --- a/src/superannotate/lib/app/convertors/sagemaker_converters/sagemaker_to_sa_vector.py +++ b/src/superannotate/lib/app/convertors/sagemaker_converters/sagemaker_to_sa_vector.py @@ -11,7 +11,7 @@ from ..sa_json_helper import _create_sa_json from ..sa_json_helper import _create_vector_instance -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def sagemaker_object_detection_to_sa_vector(data_path, main_key, output_dir): diff --git a/src/superannotate/lib/app/convertors/supervisely_converters/supervisely_to_sa_pixel.py b/src/superannotate/lib/app/convertors/supervisely_converters/supervisely_to_sa_pixel.py index 1389ec1e7..bfd9113bd 100644 --- a/src/superannotate/lib/app/convertors/supervisely_converters/supervisely_to_sa_pixel.py +++ b/src/superannotate/lib/app/convertors/supervisely_converters/supervisely_to_sa_pixel.py @@ -18,7 +18,7 @@ from .supervisely_helper import _base64_to_polygon from .supervisely_helper import _create_attribute_list -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def supervisely_instance_segmentation_to_sa_pixel(json_files, class_id_map, output_dir): diff --git a/src/superannotate/lib/app/convertors/supervisely_converters/supervisely_to_sa_vector.py b/src/superannotate/lib/app/convertors/supervisely_converters/supervisely_to_sa_vector.py index 62ce710b6..fff1b9fa8 100644 --- a/src/superannotate/lib/app/convertors/supervisely_converters/supervisely_to_sa_vector.py +++ b/src/superannotate/lib/app/convertors/supervisely_converters/supervisely_to_sa_vector.py @@ -13,7 +13,7 @@ from .supervisely_helper import _base64_to_polygon from .supervisely_helper import _create_attribute_list -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def supervisely_to_sa(json_files, class_id_map, task, output_dir): diff --git a/src/superannotate/lib/app/convertors/vgg_converters/vgg_to_sa_vector.py b/src/superannotate/lib/app/convertors/vgg_converters/vgg_to_sa_vector.py index 70826a223..8439e94db 100644 --- a/src/superannotate/lib/app/convertors/vgg_converters/vgg_to_sa_vector.py +++ b/src/superannotate/lib/app/convertors/vgg_converters/vgg_to_sa_vector.py @@ -13,7 +13,7 @@ from ..sa_json_helper import _create_vector_instance from .vgg_helper import _create_attribute_list -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def vgg_to_sa(json_data, task, output_dir): diff --git a/src/superannotate/lib/app/convertors/voc_converters/voc_to_sa_pixel.py b/src/superannotate/lib/app/convertors/voc_converters/voc_to_sa_pixel.py index 6a74b9f30..612032d16 100644 --- a/src/superannotate/lib/app/convertors/voc_converters/voc_to_sa_pixel.py +++ b/src/superannotate/lib/app/convertors/voc_converters/voc_to_sa_pixel.py @@ -17,7 +17,7 @@ from .voc_helper import _get_voc_instances_from_xml from .voc_helper import _iou -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def _generate_polygons(object_mask_path): diff --git a/src/superannotate/lib/app/convertors/voc_converters/voc_to_sa_vector.py b/src/superannotate/lib/app/convertors/voc_converters/voc_to_sa_vector.py index 8008fc6cd..0b8681a3e 100644 --- a/src/superannotate/lib/app/convertors/voc_converters/voc_to_sa_vector.py +++ b/src/superannotate/lib/app/convertors/voc_converters/voc_to_sa_vector.py @@ -15,7 +15,7 @@ from .voc_helper import _get_voc_instances_from_xml from .voc_helper import _iou -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def _generate_polygons(object_mask_path): diff --git a/src/superannotate/lib/app/convertors/vott_converters/vott_to_sa_vector.py b/src/superannotate/lib/app/convertors/vott_converters/vott_to_sa_vector.py index 392f2c49f..f6ac02c14 100644 --- a/src/superannotate/lib/app/convertors/vott_converters/vott_to_sa_vector.py +++ b/src/superannotate/lib/app/convertors/vott_converters/vott_to_sa_vector.py @@ -10,7 +10,7 @@ from ..sa_json_helper import _create_sa_json from ..sa_json_helper import _create_vector_instance -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def vott_to_sa(file_list, task, output_dir): diff --git a/src/superannotate/lib/app/convertors/yolo_converters/yolo_to_sa_vector.py b/src/superannotate/lib/app/convertors/yolo_converters/yolo_to_sa_vector.py index 2d209b1b2..62e751c62 100644 --- a/src/superannotate/lib/app/convertors/yolo_converters/yolo_to_sa_vector.py +++ b/src/superannotate/lib/app/convertors/yolo_converters/yolo_to_sa_vector.py @@ -13,7 +13,7 @@ from ..sa_json_helper import _create_sa_json from ..sa_json_helper import _create_vector_instance -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def yolo_object_detection_to_sa_vector(data_path, output_dir): diff --git a/src/superannotate/lib/app/input_converters/converters/baseStrategy.py b/src/superannotate/lib/app/input_converters/converters/baseStrategy.py index 429c8c993..ed858711f 100644 --- a/src/superannotate/lib/app/input_converters/converters/baseStrategy.py +++ b/src/superannotate/lib/app/input_converters/converters/baseStrategy.py @@ -38,7 +38,7 @@ from .vott_converters.vott_to_sa_vector import vott_to_sa from .yolo_converters.yolo_to_sa_vector import yolo_object_detection_to_sa_vector -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() CONVERSION_ALGORITHMS = { "from": { diff --git a/src/superannotate/lib/app/input_converters/converters/coco_converters/coco_converter.py b/src/superannotate/lib/app/input_converters/converters/coco_converters/coco_converter.py index 9eac00041..15e3dfca3 100644 --- a/src/superannotate/lib/app/input_converters/converters/coco_converters/coco_converter.py +++ b/src/superannotate/lib/app/input_converters/converters/coco_converters/coco_converter.py @@ -14,7 +14,7 @@ from ....common import write_to_json from ..baseStrategy import baseStrategy -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() class CocoBaseStrategy(baseStrategy): diff --git a/src/superannotate/lib/app/input_converters/converters/coco_converters/coco_strategies.py b/src/superannotate/lib/app/input_converters/converters/coco_converters/coco_strategies.py index ea0e13c2a..18a7258e0 100644 --- a/src/superannotate/lib/app/input_converters/converters/coco_converters/coco_strategies.py +++ b/src/superannotate/lib/app/input_converters/converters/coco_converters/coco_strategies.py @@ -11,7 +11,7 @@ from ....common import write_to_json from .coco_converter import CocoBaseStrategy -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() class CocoPanopticConverterStrategy(CocoBaseStrategy): diff --git a/src/superannotate/lib/app/input_converters/converters/coco_converters/coco_to_sa_pixel.py b/src/superannotate/lib/app/input_converters/converters/coco_converters/coco_to_sa_pixel.py index 548b9366a..eae0ee91d 100644 --- a/src/superannotate/lib/app/input_converters/converters/coco_converters/coco_to_sa_pixel.py +++ b/src/superannotate/lib/app/input_converters/converters/coco_converters/coco_to_sa_pixel.py @@ -19,7 +19,7 @@ from .coco_api import _maskfrRLE from .coco_api import decode -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def annot_to_bitmask(annot): diff --git a/src/superannotate/lib/app/input_converters/converters/coco_converters/coco_to_sa_vector.py b/src/superannotate/lib/app/input_converters/converters/coco_converters/coco_to_sa_vector.py index 64681bf52..f12ffd6e0 100644 --- a/src/superannotate/lib/app/input_converters/converters/coco_converters/coco_to_sa_vector.py +++ b/src/superannotate/lib/app/input_converters/converters/coco_converters/coco_to_sa_vector.py @@ -16,7 +16,7 @@ from .coco_api import _maskfrRLE from .coco_api import decode -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def annot_to_polygon(annot): diff --git a/src/superannotate/lib/app/input_converters/converters/coco_converters/sa_vector_to_coco.py b/src/superannotate/lib/app/input_converters/converters/coco_converters/sa_vector_to_coco.py index c2fd03e3b..94f8fea49 100644 --- a/src/superannotate/lib/app/input_converters/converters/coco_converters/sa_vector_to_coco.py +++ b/src/superannotate/lib/app/input_converters/converters/coco_converters/sa_vector_to_coco.py @@ -10,7 +10,7 @@ from .coco_api import _polytoMask from .coco_api import _toBbox -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def sa_vector_to_coco_object_detection( diff --git a/src/superannotate/lib/app/input_converters/converters/dataloop_converters/dataloop_to_sa_vector.py b/src/superannotate/lib/app/input_converters/converters/dataloop_converters/dataloop_to_sa_vector.py index 08c0ea401..dbbf131bb 100644 --- a/src/superannotate/lib/app/input_converters/converters/dataloop_converters/dataloop_to_sa_vector.py +++ b/src/superannotate/lib/app/input_converters/converters/dataloop_converters/dataloop_to_sa_vector.py @@ -13,7 +13,7 @@ from .dataloop_helper import _create_attributes_list from .dataloop_helper import _update_classes_dict -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def dataloop_to_sa(input_dir, task, output_dir): diff --git a/src/superannotate/lib/app/input_converters/converters/googlecloud_converters/googlecloud_to_sa_vector.py b/src/superannotate/lib/app/input_converters/converters/googlecloud_converters/googlecloud_to_sa_vector.py index ab9795ace..fe4605f2a 100644 --- a/src/superannotate/lib/app/input_converters/converters/googlecloud_converters/googlecloud_to_sa_vector.py +++ b/src/superannotate/lib/app/input_converters/converters/googlecloud_converters/googlecloud_to_sa_vector.py @@ -13,7 +13,7 @@ from ..sa_json_helper import _create_sa_json from ..sa_json_helper import _create_vector_instance -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def googlecloud_to_sa_vector(path, output_dir): diff --git a/src/superannotate/lib/app/input_converters/converters/labelbox_converters/labelbox_helper.py b/src/superannotate/lib/app/input_converters/converters/labelbox_converters/labelbox_helper.py index ed7140578..7abca5b73 100644 --- a/src/superannotate/lib/app/input_converters/converters/labelbox_converters/labelbox_helper.py +++ b/src/superannotate/lib/app/input_converters/converters/labelbox_converters/labelbox_helper.py @@ -2,7 +2,7 @@ import requests -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def image_downloader(url, file_name): diff --git a/src/superannotate/lib/app/input_converters/converters/labelbox_converters/labelbox_to_sa_pixel.py b/src/superannotate/lib/app/input_converters/converters/labelbox_converters/labelbox_to_sa_pixel.py index 7e39dbe86..22e31186f 100644 --- a/src/superannotate/lib/app/input_converters/converters/labelbox_converters/labelbox_to_sa_pixel.py +++ b/src/superannotate/lib/app/input_converters/converters/labelbox_converters/labelbox_to_sa_pixel.py @@ -18,7 +18,7 @@ from .labelbox_helper import _create_classes_id_map from .labelbox_helper import image_downloader -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def labelbox_instance_segmentation_to_sa_pixel(json_data, output_dir, input_dir): diff --git a/src/superannotate/lib/app/input_converters/converters/labelbox_converters/labelbox_to_sa_vector.py b/src/superannotate/lib/app/input_converters/converters/labelbox_converters/labelbox_to_sa_vector.py index 8c17996fc..54693b9c4 100644 --- a/src/superannotate/lib/app/input_converters/converters/labelbox_converters/labelbox_to_sa_vector.py +++ b/src/superannotate/lib/app/input_converters/converters/labelbox_converters/labelbox_to_sa_vector.py @@ -13,7 +13,7 @@ from .labelbox_helper import _create_attributes_list from .labelbox_helper import _create_classes_id_map -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def labelbox_to_sa(json_data, output_dir, task): diff --git a/src/superannotate/lib/app/input_converters/converters/sagemaker_converters/sagemaker_to_sa_pixel.py b/src/superannotate/lib/app/input_converters/converters/sagemaker_converters/sagemaker_to_sa_pixel.py index e4f984301..179e3240b 100644 --- a/src/superannotate/lib/app/input_converters/converters/sagemaker_converters/sagemaker_to_sa_pixel.py +++ b/src/superannotate/lib/app/input_converters/converters/sagemaker_converters/sagemaker_to_sa_pixel.py @@ -16,7 +16,7 @@ from ..sa_json_helper import _create_pixel_instance from ..sa_json_helper import _create_sa_json -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def sagemaker_instance_segmentation_to_sa_pixel(data_path, output_dir): diff --git a/src/superannotate/lib/app/input_converters/converters/sagemaker_converters/sagemaker_to_sa_vector.py b/src/superannotate/lib/app/input_converters/converters/sagemaker_converters/sagemaker_to_sa_vector.py index a261fdcb7..aea6a8c2f 100644 --- a/src/superannotate/lib/app/input_converters/converters/sagemaker_converters/sagemaker_to_sa_vector.py +++ b/src/superannotate/lib/app/input_converters/converters/sagemaker_converters/sagemaker_to_sa_vector.py @@ -11,7 +11,7 @@ from ..sa_json_helper import _create_sa_json from ..sa_json_helper import _create_vector_instance -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def sagemaker_object_detection_to_sa_vector(data_path, main_key, output_dir): diff --git a/src/superannotate/lib/app/input_converters/converters/supervisely_converters/supervisely_to_sa_pixel.py b/src/superannotate/lib/app/input_converters/converters/supervisely_converters/supervisely_to_sa_pixel.py index 1389ec1e7..bfd9113bd 100644 --- a/src/superannotate/lib/app/input_converters/converters/supervisely_converters/supervisely_to_sa_pixel.py +++ b/src/superannotate/lib/app/input_converters/converters/supervisely_converters/supervisely_to_sa_pixel.py @@ -18,7 +18,7 @@ from .supervisely_helper import _base64_to_polygon from .supervisely_helper import _create_attribute_list -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def supervisely_instance_segmentation_to_sa_pixel(json_files, class_id_map, output_dir): diff --git a/src/superannotate/lib/app/input_converters/converters/supervisely_converters/supervisely_to_sa_vector.py b/src/superannotate/lib/app/input_converters/converters/supervisely_converters/supervisely_to_sa_vector.py index 62ce710b6..fff1b9fa8 100644 --- a/src/superannotate/lib/app/input_converters/converters/supervisely_converters/supervisely_to_sa_vector.py +++ b/src/superannotate/lib/app/input_converters/converters/supervisely_converters/supervisely_to_sa_vector.py @@ -13,7 +13,7 @@ from .supervisely_helper import _base64_to_polygon from .supervisely_helper import _create_attribute_list -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def supervisely_to_sa(json_files, class_id_map, task, output_dir): diff --git a/src/superannotate/lib/app/input_converters/converters/vgg_converters/vgg_to_sa_vector.py b/src/superannotate/lib/app/input_converters/converters/vgg_converters/vgg_to_sa_vector.py index 29de32f77..cdd0917f1 100644 --- a/src/superannotate/lib/app/input_converters/converters/vgg_converters/vgg_to_sa_vector.py +++ b/src/superannotate/lib/app/input_converters/converters/vgg_converters/vgg_to_sa_vector.py @@ -13,7 +13,7 @@ from ..sa_json_helper import _create_vector_instance from .vgg_helper import _create_attribute_list -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def vgg_to_sa(json_data, task, output_dir): diff --git a/src/superannotate/lib/app/input_converters/converters/voc_converters/voc_to_sa_pixel.py b/src/superannotate/lib/app/input_converters/converters/voc_converters/voc_to_sa_pixel.py index 6a74b9f30..612032d16 100644 --- a/src/superannotate/lib/app/input_converters/converters/voc_converters/voc_to_sa_pixel.py +++ b/src/superannotate/lib/app/input_converters/converters/voc_converters/voc_to_sa_pixel.py @@ -17,7 +17,7 @@ from .voc_helper import _get_voc_instances_from_xml from .voc_helper import _iou -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def _generate_polygons(object_mask_path): diff --git a/src/superannotate/lib/app/input_converters/converters/voc_converters/voc_to_sa_vector.py b/src/superannotate/lib/app/input_converters/converters/voc_converters/voc_to_sa_vector.py index 8008fc6cd..0b8681a3e 100644 --- a/src/superannotate/lib/app/input_converters/converters/voc_converters/voc_to_sa_vector.py +++ b/src/superannotate/lib/app/input_converters/converters/voc_converters/voc_to_sa_vector.py @@ -15,7 +15,7 @@ from .voc_helper import _get_voc_instances_from_xml from .voc_helper import _iou -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def _generate_polygons(object_mask_path): diff --git a/src/superannotate/lib/app/input_converters/converters/vott_converters/vott_to_sa_vector.py b/src/superannotate/lib/app/input_converters/converters/vott_converters/vott_to_sa_vector.py index 392f2c49f..f6ac02c14 100644 --- a/src/superannotate/lib/app/input_converters/converters/vott_converters/vott_to_sa_vector.py +++ b/src/superannotate/lib/app/input_converters/converters/vott_converters/vott_to_sa_vector.py @@ -10,7 +10,7 @@ from ..sa_json_helper import _create_sa_json from ..sa_json_helper import _create_vector_instance -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def vott_to_sa(file_list, task, output_dir): diff --git a/src/superannotate/lib/app/input_converters/converters/yolo_converters/yolo_to_sa_vector.py b/src/superannotate/lib/app/input_converters/converters/yolo_converters/yolo_to_sa_vector.py index 2d209b1b2..62e751c62 100644 --- a/src/superannotate/lib/app/input_converters/converters/yolo_converters/yolo_to_sa_vector.py +++ b/src/superannotate/lib/app/input_converters/converters/yolo_converters/yolo_to_sa_vector.py @@ -13,7 +13,7 @@ from ..sa_json_helper import _create_sa_json from ..sa_json_helper import _create_vector_instance -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def yolo_object_detection_to_sa_vector(data_path, output_dir): diff --git a/src/superannotate/lib/app/input_converters/export_from_sa_conversions.py b/src/superannotate/lib/app/input_converters/export_from_sa_conversions.py index 2c1a8ebc3..044a3afa9 100644 --- a/src/superannotate/lib/app/input_converters/export_from_sa_conversions.py +++ b/src/superannotate/lib/app/input_converters/export_from_sa_conversions.py @@ -12,7 +12,7 @@ from .converters.converters import Converter -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def _load_files(path_to_imgs, task, ptype): diff --git a/src/superannotate/lib/app/input_converters/import_to_sa_conversions.py b/src/superannotate/lib/app/input_converters/import_to_sa_conversions.py index 6aa0b33a8..2875490fe 100644 --- a/src/superannotate/lib/app/input_converters/import_to_sa_conversions.py +++ b/src/superannotate/lib/app/input_converters/import_to_sa_conversions.py @@ -8,7 +8,7 @@ from .converters.converters import Converter -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def _load_files(path_to_imgs, ptype, extensions): diff --git a/src/superannotate/lib/app/input_converters/sa_conversion.py b/src/superannotate/lib/app/input_converters/sa_conversion.py index c82bc8219..cca24318c 100644 --- a/src/superannotate/lib/app/input_converters/sa_conversion.py +++ b/src/superannotate/lib/app/input_converters/sa_conversion.py @@ -13,7 +13,7 @@ from ..common import hex_to_rgb from ..common import write_to_json -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() def copy_file(src_path, dst_path): diff --git a/src/superannotate/lib/app/interface/base_interface.py b/src/superannotate/lib/app/interface/base_interface.py index 96218d84a..e9bbfdf59 100644 --- a/src/superannotate/lib/app/interface/base_interface.py +++ b/src/superannotate/lib/app/interface/base_interface.py @@ -4,7 +4,7 @@ from lib.infrastructure.repositories import ConfigRepository -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() class BaseInterfaceFacade: diff --git a/src/superannotate/lib/app/interface/cli_interface.py b/src/superannotate/lib/app/interface/cli_interface.py index 7632d5db6..9ad1a3ed1 100644 --- a/src/superannotate/lib/app/interface/cli_interface.py +++ b/src/superannotate/lib/app/interface/cli_interface.py @@ -24,7 +24,7 @@ from lib.infrastructure.repositories import ConfigRepository from tqdm import tqdm -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() class CLIFacade(BaseInterfaceFacade): diff --git a/src/superannotate/lib/app/interface/sdk_interface.py b/src/superannotate/lib/app/interface/sdk_interface.py index 9ee2cb24a..5710743cc 100644 --- a/src/superannotate/lib/app/interface/sdk_interface.py +++ b/src/superannotate/lib/app/interface/sdk_interface.py @@ -46,8 +46,7 @@ from tqdm import tqdm -logger = logging.getLogger("superannotate-python-sdk") - +logger = logging.getLogger() controller = Controller(logger) @@ -1144,6 +1143,9 @@ def assign_images(project: Union[str, dict], image_names: List[str], user: str): logger.warning( f"Skipping {user}. {user} is not a verified contributor for the {project_name}" ) + + + return controller.assign_images(project_name, folder_name, image_names, user) diff --git a/src/superannotate/lib/app/mixp/decorators.py b/src/superannotate/lib/app/mixp/decorators.py index 1cbf11b8a..20cb32683 100644 --- a/src/superannotate/lib/app/mixp/decorators.py +++ b/src/superannotate/lib/app/mixp/decorators.py @@ -11,7 +11,7 @@ mp = Mixpanel(TOKEN) -controller = Controller(logger=logging.getLogger("superannotate-python-sdk")) +controller = Controller(logger=logging.getLogger()) res = controller.get_team() user_id, team_name = res.data.creator_id, res.data.name diff --git a/src/superannotate/lib/app/mixp/utils/parsers.py b/src/superannotate/lib/app/mixp/utils/parsers.py index 1b0397654..84de10a19 100644 --- a/src/superannotate/lib/app/mixp/utils/parsers.py +++ b/src/superannotate/lib/app/mixp/utils/parsers.py @@ -5,7 +5,7 @@ from superannotate.lib.core.enums import ProjectType from superannotate.lib.infrastructure.controller import Controller -controller = Controller(logger=logging.getLogger("superannotate-python-sdk")) +controller = Controller(logger=logging.getLogger()) def get_project_name(project): diff --git a/src/superannotate/lib/core/usecases.py b/src/superannotate/lib/core/usecases.py index cde3e6e9d..646cf3e65 100644 --- a/src/superannotate/lib/core/usecases.py +++ b/src/superannotate/lib/core/usecases.py @@ -56,7 +56,7 @@ from lib.core.serviceproviders import SuerannotateServiceProvider from PIL import UnidentifiedImageError -logger = logging.getLogger("superannotate-python-sdk") +logger = logging.getLogger() class BaseUseCase(ABC): diff --git a/src/superannotate/logging.conf b/src/superannotate/logging.conf index 1264db0e7..4a9e29229 100644 --- a/src/superannotate/logging.conf +++ b/src/superannotate/logging.conf @@ -8,14 +8,13 @@ keys=consoleHandler keys=consoleFormatter [logger_root] -level=DEBUG +level=INFO handlers=consoleHandler [logger_superannotate-python-sdk] -level=DEBUG +level=INFO handlers=consoleHandler qualname=consoleFormatter -propagate=0 [handler_consoleHandler] class=StreamHandler @@ -23,6 +22,6 @@ level=INFO formatter=consoleFormatter args=(sys.stdout,) + [formatter_consoleFormatter] format=SA-PYTHON-SDK - %(levelname)s - %(message)s -datefmt= From 0e2fa076dbd018edfc68e0ffc714d00547f20fca Mon Sep 17 00:00:00 2001 From: shab Date: Tue, 31 Aug 2021 12:04:35 +0400 Subject: [PATCH 2/2] Fix logger - version --- src/superannotate/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/superannotate/__init__.py b/src/superannotate/__init__.py index 15ca01b32..cba437065 100644 --- a/src/superannotate/__init__.py +++ b/src/superannotate/__init__.py @@ -1,7 +1,7 @@ import os import logging.config -from version import __version__ +from superannotate.version import __version__ from superannotate.lib.app.analytics.class_analytics import attribute_distribution from superannotate.lib.app.analytics.class_analytics import class_distribution from superannotate.lib.app.annotation_helpers import add_annotation_bbox_to_json